调试派工接口

applications/dee-mes/src/views/assemblyPlanManagement/instructionsDispatch/index.vue

@@ -53,7 +53,7 @@
           执行派工
         </div>
         <div class="group-list">
-          <div v-for="(item, index) in groupUserList" :key="index" class="group-list-box" :class="{'active': group===item.id}" @click="changeGroupUser(item)">
+          <div v-for="(item, index) in groupUserList" :key="index" class="group-list-box" :class="{'active': item.isSelect}" @click="changeGroupUser(item)">
             <div class="message">
               <div class="right-text"><span>未完成任务：</span><span>{{ item.notFinishCount }}项</span></div>
               <div class="right-text"><span>未完成工时：</span><span>{{ item.notFinishWork }}（h）</span></div>
@@ -62,6 +62,50 @@
               <div class="right-text"><span>上岗有效期：</span><span>{{ item.postValidity }}</span></div>
             </div>
             <div class="author">
+              <div style="cursor:pointer" @click.stop="changeMain(item)">
+                <el-tooltip
+                  v-if="mainUserId!==item.id"
+                  content="主操作手"
+                  placement="right"
+                >
+                  <svg
+                    title=""
+                    t="1622864082296"
+                    class="icon"
+                    viewBox="0 0 1024 1024"
+                    version="1.1"
+                    xmlns="http://www.w3.org/2000/svg"
+                    p-id="2387"
+                    width="20"
+                    height="20"
+                  >
+                    <path
+                      d="M808.533333 102.058667l-166.613333 166.613333 25.514667 95.146667 95.146666 25.514666 166.656-166.570666a256.085333 256.085333 0 0 1-341.418666 341.418666l-312.021334 311.978667a85.333333 85.333333 0 0 1-120.704-120.661333l312.021334-312.021334a256.085333 256.085333 0 0 1 341.461333-341.418666zM185.301333 785.664a42.666667 42.666667 0 1 0 60.373334 60.330667 42.666667 42.666667 0 0 0-60.373334-60.330667z"
+                      fill="#707070"
+                      p-id="2388"
+                    />
+                  </svg>
+                </el-tooltip>
+                <el-tooltip v-else content="主操作手" placement="right">
+                  <svg
+                    title=""
+                    t="1622864082296"
+                    class="icon"
+                    viewBox="0 0 1024 1024"
+                    version="1.1"
+                    xmlns="http://www.w3.org/2000/svg"
+                    p-id="2387"
+                    width="20"
+                    height="20"
+                  >
+                    <path
+                      d="M808.533333 102.058667l-166.613333 166.613333 25.514667 95.146667 95.146666 25.514666 166.656-166.570666a256.085333 256.085333 0 0 1-341.418666 341.418666l-312.021334 311.978667a85.333333 85.333333 0 0 1-120.704-120.661333l312.021334-312.021334a256.085333 256.085333 0 0 1 341.461333-341.418666zM185.301333 785.664a42.666667 42.666667 0 1 0 60.373334 60.330667 42.666667 42.666667 0 0 0-60.373334-60.330667z"
+                      fill="#d81e06"
+                      p-id="2388"
+                    />
+                  </svg>
+                </el-tooltip>
+              </div>
               <el-image v-if="item.router" class="icon-author" :src="getUrl()+'/file-download/' +item.router" alt="" />
               <img v-else class="icon-author2" src="/icons/author.png" alt="">
               <div class="name">
@@ -130,24 +174,42 @@ export default {
                 type: 'warning'
               }).then(() => {
                 const arr = []
+                const user = []
+                this.groupUserList.forEach(item => {
+                  if (item.isSelect) {
+                    if (item.id === this.mainUserId) {
+                      item.isMasterOperator = true
+                    } else {
+                      item.isMasterOperator = false
+                    }
+                    user.push({
+                      subTypeName: 'FitOut',
+                      operator: 'ADD',
+                      extProcessSkillUserId: item.id,
+                      extProcessSkillUserIdType: item.subTypeName,
+                      isMasterOperator: item.isMasterOperator,
+                      taskState: 'N',
+                      extProcessSkillId: item.extProcessSkillId,
+                      extProcessSkillIdType: item.extProcessSkillIdType
+                    })
+                  }
+                })
                 this.selectionRow.map(item => {
                   arr.push(
                     {
                       id: item.id,
                       operator: 'MODIFY',
-                      planState: 'Issued',
-                      extProcessSkillId: item.skill,
-                      extProcessSkillIdType: item.skillType
+                      prodTask: user
                     }
                   )
                 })
-                post('/JoExecutePlan/recursions', arr)
+                post('/ProdTask/prodTaskSave?dmirStatus=N', arr)
                   .then((res) => {
                     this.$message({
                       type: 'success',
                       message: '提交成功!'
                     })
-                    this.getInstructionsIssuedListTo()
+                    this.getTableData()
                   })
                   .catch((err) => console.log(err))
                   .finally(() => {})
@@ -158,7 +220,8 @@ export default {
         }
       ],
       groupUserTotal: 0,
-      groupUserPage: 1
+      groupUserPage: 1,
+      mainUserId: null
     }
   },
   computed: {
@@ -241,8 +304,6 @@ export default {
           this.$set(this.searchFormData, 'group', this.groupList[0].value)
           this.$set(this.searchFormData, 'groupName', this.groupList[0].label)
           this.getTableData()
-          // this.getInstructionsDispatchList()
-          // this.getGroupUser()
         }
       })
     },
@@ -251,8 +312,6 @@ export default {
       this.$set(this.searchFormData, 'groupName', group && group.label || '')
       this.$set(this.searchFormData, 'group', group && group.value || '')
       this.getTableData()
-      // this.getInstructionsDispatchList()
-      // this.getGroupUser()
     },
     tabClick(tab) {
       this.activeName = tab.index
@@ -322,6 +381,7 @@ export default {
       post('/JoExecutePlan/search', params).then(res => {
         if (res.items && res.items.content) {
           this.tableData = res.items.content
+          this.pagination.total = res.items.totalElements
         }
       })
     },
@@ -335,20 +395,17 @@ export default {
       this.getInstructionsIssuedListTo()
     },
     selectionChange(val) {
-      val.forEach(element => {
-        element.skill = this.group
-        element.skillType = this.groupType
-      })
       this.selectionRow = val
     },
     changeGroupUser(val) {
-      this.$set(this, 'group', val.id || '')
-      this.$set(this, 'groupType', val.subTypeName || '')
-      if (this.selectionRow.length > 0) {
-        this.selectionRow.forEach(element => {
-          element.skill = this.group
-          element.skillType = this.groupType
-        })
+      val.isSelect = !val.isSelect
+      if (!val.isSelect && val.id === this.mainUserId) {
+        this.mainUserId = null
+      }
+    },
+    changeMain(val) {
+      if (val.isSelect) {
+        this.$set(this, 'mainUserId', val.id || '')
       }
     },
     getGroupUser() {
@@ -387,11 +444,11 @@ export default {
       post('/ExtProcessSkillUser/getSkillUser', params).then(res => {
         if (res.items && res.items.content) {
           res.items.content.forEach(item => {
+            item.isSelect = false
             this.groupUserList.push(item)
           })
           this.groupUserTotal = res.items.totalElements
-          this.$set(this, 'group', this.groupUserList[0] && this.groupUserList[0].id || '')
-          this.$set(this, 'groupType', this.groupUserList[0] && this.groupUserList[0].subTypeName || '')
+          this.groupUserList[0].isSelect = true
         }
       })
     },
@@ -446,7 +503,7 @@ export default {
       .author{
         display: flex;
         justify-content: center;
-        align-items: center;
+        align-items: flex-end;
         flex-direction: column;
         .icon-author {
           width: 71px;
@@ -457,6 +514,8 @@ export default {
         }
         .name {
           margin-top: 10px;
+          width: 100%;
+          text-align: center
         }
       }
       .message{