From 9c70118512103b625dc998bbf6a0d9dd49bf453a Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Fri, 30 Apr 2021 09:49:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/qualityinspect/inspecttaskdo.vue    | 205 ++----------------
 client/src/views/qualityinspect/mytask.vue    |   7 +-
 client/src/views/qualityinspect/mytaskdo.vue  |  90 +++++++-
 3 files changed, 107 insertions(+), 195 deletions(-)

diff --git a/client/src/views/qualityinspect/inspecttaskdo.vue b/client/src/views/qualityinspect/inspecttaskdo.vue
index 8bb0b1a..687a152 100644
--- a/client/src/views/qualityinspect/inspecttaskdo.vue
+++ b/client/src/views/qualityinspect/inspecttaskdo.vue
@@ -52,7 +52,7 @@
    
     <el-card style="margin-top: 2px">
       <div slot="header" class="clearfix">
-        <el-button type="primary" icon="el-icon-plus" @click="dialogVisible = true"
+        <el-button type="primary" icon="el-icon-plus" @click="createChildtask()"
         >创建子任务</el-button
       >
       </div>
@@ -64,7 +64,6 @@
         stripe
         highlight-current-row
         max-height="300"
-        @row-click="clickRow"
       >
         <el-table-column type="index" width="50" />
          <el-table-column align="center" label="子任务">
@@ -96,6 +95,7 @@
           fixed="right"
         >
           <template slot-scope="scope">
+               <el-button @click="handleClick(scope)"   type="primary">执行</el-button>
             <el-button
               type="primary"
               size="small"
@@ -113,133 +113,7 @@
       </el-table>
     </el-card>
 
-  
-   <el-card style="float:left;width: 30%;margin-top:4px">
-      <!-- <el-button  type="primary" icon="el-icon-plus" @click="adddept">增加巡检组织</el-button> -->
-  <el-table
-    :data="recordList"
-    max-height="300"
-        fit
-        stripe
-        highlight-current-row
-    style="width: 100%"
-    @row-click="recorclickRow"
-    >
-    <el-table-column
-      label="组织名称">
-      <template slot-scope="scope">
-       
-      {{ scope.row.dept__name }}
-          
-      </template>
-    </el-table-column>
-      <el-table-column
-      label="检查状态">
-      <template slot-scope="scope">
-       
-       <el-tag size="medium">{{ scope.row.state }}</el-tag>
-          
-      </template>
-    </el-table-column>
-    
-   
-  </el-table>
-   </el-card>
-   <el-card class="box-card" style="float:right;width: 70%;margin-top:4px;">
-      <el-button  type="primary" @click="dialogFormVisible=true">指派任务</el-button>
- <el-table
-    :data="inspectitemList"
-    max-height="300"
-        fit
-        stripe
-        highlight-current-row
-    style="width: 100%"
-     @selection-change="handleSelectionChange">
-    <el-table-column
-      type="selection"
-      width="55">
-    </el-table-column>
-    <el-table-column
-      label="检查类别">
-      <template slot-scope="scope">
-       
-     {{ scope.row.item_.cate_name }}
-          
-      </template>
-    </el-table-column>
-    <el-table-column
-      label="检查要点">
-      <template slot-scope="scope">
-       
-     {{ scope.row.item_.name }}
-          
-      </template>
-    </el-table-column>
- <el-table-column
-      label="检查类型">
-      <template slot-scope="scope">
-       
-     {{ scope.row.item_.type }}
-          
-      </template>
-    </el-table-column>
-    <el-table-column
-      label="检查人">
-      <template slot-scope="scope" v-if="scope.row.checker_">
-       
-     {{ scope.row.checker_.name }}
-          
-      </template>
-    </el-table-column>
-   <el-table-column
-      label="是否检查">
-      <template slot-scope="scope">
-       <el-tag v-if="scope.row.checked" effect="plain">是</el-tag>
-      <el-tag type="danger" effect="plain" v-else>否</el-tag>
-          
-      </template>
-    </el-table-column>
-   
-  </el-table>
-   </el-card>
-
- <el-dialog
-      :visible.sync="dialogFormVisible"
-       :title="dialogType === 'edit' ? '编辑任务' : '指派人员'"
-    >
-      <el-form
-        ref="Forms"
-        :model="mbersData"
-        label-width="80px"
-        label-position="right"
-      >
-       
-         <el-form-item label="负责人" prop="checker">
-            <el-select
-              v-model="mbersData.checker"
-              style="width: 100%"
-              allow-create
-              default-first-option
-              placeholder="请选择组长">
-              <el-option
-                 v-for="item in leaders"
-                  :key="item.member"
-                  :label="item.member__name"
-                 :value="item.member">
-               </el-option>
-           </el-select>
-            
-        
-        </el-form-item>
-          
-       
-      </el-form>
-      <div style="text-align: right">
-        <el-button type="danger" @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="sendconfirm('Forms')">确认</el-button>
-      </div>
-    </el-dialog>
-
+ 
 
    <el-dialog
       :visible.sync="dialogVisible"
@@ -364,9 +238,7 @@ const defaulttask = {
   members:"",
   depts:"",
 };
-const mbersData = {
-  checker:""
-}
+
 export default {
   components: { Pagination},
   
@@ -382,13 +254,10 @@ export default {
       ids:[],
       subinsecttask:[],
       memberOptions:[],
-      inspectitemList:[],
-      mbersData:mbersData,
       deptOptions:[],
       leaders:[],
       dialogType: "new",
       data: {},
-      listQuery:{},
     };
   },
   created() {
@@ -455,7 +324,7 @@ export default {
     },
      //创建子任务
     async confirm(form) {
-      console.log(this.inspecttask)
+     
       this.inspecttask.inspecttask=this.$route.params.id;
       
          createsubinspecttask(this.inspecttask).then((res) => {
@@ -496,65 +365,29 @@ export default {
         })
      
     },
-
+    createChildtask()
+    {
+      
+      this.inspecttask = Object.assign({}, defaulttask);
+      this.dialogVisible = true;
+      
+    },
     clickRow(row, col, e) {
       this.listLoading2 = true;
       this.id =  row.id;
-      this.subtask=row.id;
-
-      this.getsubinspecttaskdep();
-
-      this.leaders = row.members;
-
+      this.$router.push({name: "myTaskdos", params: { id:  this.id,leaders:row.members }, })
+   
       
     },
-    //增加巡检组织
-    adddept()
-    {
+  
 
-    },
-    //点击组织弹出清单
-     getinspectrecordlist() {
-      getinspectrecordlist(this.listQuery)
-        .then((res) => {
-          this.inspectitemList = res.data;
-          
-        })
-     
-    },
-
-    recorclickRow(row, col, e) {
+     handleClick(scope) {
       this.listLoading2 = true;
-       this.listQuery = {pageoff:true, subtask: this.subtask, dept: row.dept }
-      this.getinspectrecordlist();
+      this.$router.push({name: "myTaskdos", params: { id: scope.row.id,leaders:scope.row.members }, })
     },
     
-    handleSelectionChange(val){
-          
-　　　　　 this.multipleSelection = val;
-    },
-    sendconfirm(){
-
-      
-       const lengths = this.multipleSelection.length;
-        for (let i = 0; i < lengths; i++) {
-               this.ids.push(this.multipleSelection[i].id);
-         }
-     console.log(lengths)
-      //let data = { records: this.ids };//检查项ID
-
-       
-      this.mbersData.records=this.ids
-       console.log(this.mbersData)
-         addappoint(this.mbersData).then((res) => {
-             
-                this.dialogFormVisible = false;
-                 this.getinspectrecordlist();
-                this.$message.success("成功");
-              
-            });
-
-    }
+   
+   
   },
 };
 </script>
\ No newline at end of file
diff --git a/client/src/views/qualityinspect/mytask.vue b/client/src/views/qualityinspect/mytask.vue
index 92cd75e..ba02b51 100644
--- a/client/src/views/qualityinspect/mytask.vue
+++ b/client/src/views/qualityinspect/mytask.vue
@@ -12,7 +12,7 @@
         max-height="600"
       >
         <el-table-column type="index" width="50" />
-         <el-table-column align="center" label="父级任务">
+         <el-table-column align="center" label="批级任务">
           <template slot-scope="scope">{{ scope.row.inspecttask_.name }}</template>
         </el-table-column>
          <el-table-column align="center" label="开始巡查时间">
@@ -26,7 +26,8 @@
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
          <el-table-column align="center" label="任务状态">
-          <template slot-scope="scope">{{ scope.row.state }}</template>
+          <template slot-scope="scope">
+            {{ scope.row.state }}</template>
         </el-table-column>
          <el-table-column align="center" label="巡查公司数">
           <template slot-scope="scope">{{ scope.row.depts_count }}</template>
@@ -107,7 +108,7 @@ export default {
       });
     },
    handleClick(scope){
-       this.$router.push({name: "myTaskdos", params: { id: scope.row.id }, })
+       this.$router.push({name: "myTaskdos", params: { id: scope.row.id,leaders:scope.row.members }, })
    },
 
     handleFilter() {
diff --git a/client/src/views/qualityinspect/mytaskdo.vue b/client/src/views/qualityinspect/mytaskdo.vue
index 2153224..d0d3eff 100644
--- a/client/src/views/qualityinspect/mytaskdo.vue
+++ b/client/src/views/qualityinspect/mytaskdo.vue
@@ -37,7 +37,9 @@
             "  
           @click="handleStartup(scope)">开始检查</el-button>
        
-        <el-button type="primary"   
+        <el-button type="primary"  v-if="
+               scope.row.state == '检测中'
+            "    
           @click="handleCheckup(scope)">组长提交</el-button>
        
        
@@ -47,18 +49,24 @@
   </el-table>
    </el-card>
    <el-card class="box-card" style="float:right;width: 55%;">
-     
+      <el-button  type="primary" @click="dialogFormVisible=true">指派任务</el-button>
  <el-table
     :data="inspectitemList"
         fit
         stripe
         highlight-current-row
-    style="width: 100%">
+    style="width: 100%"
+     @selection-change="handleSelectionChange">
+    <el-table-column
+      type="selection"
+      width="55">
+    </el-table-column>
+    
     
     
     <el-table-column
       label="检查要点"
-      width="280">
+      width="230">
       <template slot-scope="scope">
        
      {{ scope.row.item_.name }}
@@ -104,6 +112,42 @@
     </el-table-column>
    
   </el-table>
+<el-dialog
+      :visible.sync="dialogFormVisible"
+       :title="dialogType === 'edit' ? '编辑任务' : '指派人员'"
+    >
+      <el-form
+        ref="Forms"
+        :model="mbersData"
+        label-width="80px"
+        label-position="right"
+      >
+       
+         <el-form-item label="负责人" prop="checker">
+            <el-select
+              v-model="mbersData.checker"
+              style="width: 100%"
+              allow-create
+              default-first-option
+              placeholder="请选择组长">
+              <el-option
+                 v-for="item in leaders"
+                  :key="item.member"
+                  :label="item.member__name"
+                 :value="item.member">
+               </el-option>
+           </el-select>
+            
+        
+        </el-form-item>
+          
+       
+      </el-form>
+      <div style="text-align: right">
+        <el-button type="danger" @click="dialogFormVisible = false">取消</el-button>
+        <el-button type="primary" @click="sendconfirm('Forms')">确认</el-button>
+      </div>
+    </el-dialog>
 
   <el-drawer
   title="任务检查"
@@ -167,7 +211,8 @@
  </div>
 </template>
 <script>
-import {getsubinspecttaskdep,getinspectrecordlist,updateinspectrecord,getinspectrecord,upinspectdept,gettaskdepstart} from "@/api/subinspecttask";
+import {getsubinspecttaskdep,getinspectrecordlist,updateinspectrecord,getinspectrecord,upinspectdept,gettaskdepstart,addappoint} from "@/api/subinspecttask";
+
 import { upUrl, upHeaders } from "@/api/file";
 import Pagination from "@/components/Pagination";
 import checkPermission from "@/utils/permission";
@@ -184,6 +229,7 @@ export default {
       listLoading: true,
       dialog:false,
       recordList:[],
+       dialogFormVisible:false,
       inspectitemList:[],
       deptOptions:[],
       leaders:[],
@@ -191,6 +237,8 @@ export default {
       listQuery:{},
       inspectrecord:null,
       require:"",
+       ids:[],
+      mbersData:mbersData,
       upHeaders: upHeaders(),
       upUrl: upUrl(),
       fileList: [],
@@ -213,6 +261,8 @@ export default {
   },
   created() {
     this.id = this.$route.params.id;
+    this.leaders = this.$route.params.leaders;
+    console.log(this.leaders)
     this.getsubinspecttaskdep();//主任务信息
   },
   
@@ -340,8 +390,35 @@ export default {
       
       upinspectdept(scope.row.id).then((res) => {
           this.$message.success("提交成功");
+           this.getinspectrecordlist();
+               this.getsubinspecttaskdep()
           
         })
+    },
+     handleSelectionChange(val){
+          
+　　　　　 this.multipleSelection = val;
+    },
+    //组长指派人员
+      sendconfirm(){
+
+      
+       const lengths = this.multipleSelection.length;
+        for (let i = 0; i < lengths; i++) {
+               this.ids.push(this.multipleSelection[i].id);
+         }
+   
+       
+      this.mbersData.records=this.ids
+      console.log()
+         addappoint(this.mbersData).then((res) => {
+             
+                this.dialogFormVisible = false;
+                 this.getinspectrecordlist();
+                this.$message.success("成功");
+              
+            });
+
     },
     //组长提交开始检查
     handleStartup(scope){
@@ -350,7 +427,8 @@ export default {
            this.getinspectrecordlist();
                this.getsubinspecttaskdep()
         })
-    }
+    },
+    
   },