执行派工页面接口联调

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

@@ -54,30 +54,25 @@
         </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 class="left">
-              <div class="left-text"> {{ item.resName }}</div>
-            </div>
-            <div class="right">
+            <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>
               <div class="right-text"><span>当月完成工时：</span><span>{{ item.finishWork }}（h）</span></div>
               <div class="right-text"><span>专业：</span><span>{{ item.extProcessSkill.resName }}</span></div>
               <div class="right-text"><span>上岗有效期：</span><span>{{ item.postValidity }}</span></div>
-              <!-- <el-tooltip placement="top">
-                <div slot="content">
-                  <span v-for="user in item.extProcessSkillUsers" :key="user.id">
-                    {{ user.dxUserInfo.name }
-                  </span>
-                </div>
-                <div class="right-text overfllowhind">
-                  <span>班组长：</span>
-                  <span v-for="user in item.extProcessSkillUsers" :key="user.id">
-                    {{ user.dxUserInfo.name }}
-                  </span>
-                </div>
-              </el-tooltip> -->
+            </div>
+            <div class="author">
+              <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">
+                {{ item.dxUserInfo.name }}
+              </div>
             </div>
           </div>
+          <div class="more-bar">
+            <span v-if="groupUserList.length < groupUserTotal" class="more" @click="getMoreData">加载更多</span>
+            <span v-else>已全部加载！</span>
+          </div>
         </div>
       </template>
     </split-pane>
@@ -161,7 +156,9 @@ export default {
             }
           }
         }
-      ]
+      ],
+      groupUserTotal: 0,
+      groupUserPage: 1
     }
   },
   computed: {
@@ -243,8 +240,9 @@ export default {
           })
           this.$set(this.searchFormData, 'group', this.groupList[0].value)
           this.$set(this.searchFormData, 'groupName', this.groupList[0].label)
-          this.getInstructionsDispatchList()
-          this.getGroupUser()
+          this.getTableData()
+          // this.getInstructionsDispatchList()
+          // this.getGroupUser()
         }
       })
     },
@@ -252,8 +250,9 @@ export default {
       const group = this.groupList.find(r => r.value === this.searchFormData.group)
       this.$set(this.searchFormData, 'groupName', group && group.label || '')
       this.$set(this.searchFormData, 'group', group && group.value || '')
-      this.getInstructionsDispatchList()
-      this.getGroupUser()
+      this.getTableData()
+      // this.getInstructionsDispatchList()
+      // this.getGroupUser()
     },
     tabClick(tab) {
       this.activeName = tab.index
@@ -271,6 +270,7 @@ export default {
         }
       } else {
         this.getInstructionsDispatchList()
+        this.getGroupUser()
       }
     },
     getInstructionsDispatchList() {
@@ -353,7 +353,7 @@ export default {
     },
     getGroupUser() {
       const params = {
-        'pageFrom': 1,
+        'pageFrom': this.groupUserPage,
         'pageSize': 10,
         'searchItems': {
           'children': [
@@ -386,11 +386,21 @@ export default {
       }
       post('/ExtProcessSkillUser/getSkillUser', params).then(res => {
         if (res.items && res.items.content) {
-          this.groupUserList = res.items.content
-          this.$set(this, 'group', res.items.content[0] && res.items.content[0].id || '')
-          this.$set(this, 'groupType', res.items.content[0] && res.items.content[0].subTypeName || '')
+          res.items.content.forEach(item => {
+            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 || '')
         }
       })
+    },
+    getMoreData() {
+      const num = Math.ceil(this.groupUserTotal / 10)
+      if (this.groupUserPage <= num) {
+        this.groupUserPage++
+        this.getGroupUser()
+      }
     }
   }
 }
@@ -403,6 +413,23 @@ export default {
     height: calc(100% - 100px);
     overflow-y: scroll;
     margin-bottom: 20px;
+    .more-bar {
+      margin: 10px auto;
+      text-align: center;
+      font-size: 12px;
+      color: #999;
+      .more {
+        margin: auto;
+        margin-top: 20px;
+        height: 26px;
+        line-height: 26px;
+        padding: 0 20px;
+        background: rgba(64,87,141, 1);
+        border-radius: 13px;
+        display: inline-block;
+        cursor: pointer;
+      }
+    }
     .group-list-box{
       box-sizing: border-box;
       background: url("/images/dispatching.png") no-repeat;
@@ -413,14 +440,26 @@ export default {
       border-radius: 10px;
       font-size: 14px;
       border: 3px solid #fff;
-      .left{
-        text-align: center;
-        .left-text{
-          font-size: 16px;
-          font-weight: 500;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .author{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+        .icon-author {
+          width: 71px;
+          height: 94.5px;
+        }
+        .icon-author2{
+          width: 71px;
+        }
+        .name {
+          margin-top: 10px;
         }
       }
-      .right{
+      .message{
         .right-text{
           padding-top: 8px;
         }

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

@@ -344,11 +344,13 @@ export default {
               id: row.source.id
             }
           })
-          this.$set(this.searchFormData, 'postion', this.postionList[0].value)
-          this.$set(this.searchFormData, 'postionName', this.postionList[0].label)
-          this.$set(this.searchFormData, 'postionId', this.postionList[0].id)
-          this.getSortiesList()
-          this.getGroupList()
+          if (this.postionList.length > 0) {
+            this.$set(this.searchFormData, 'postion', this.postionList[0].value)
+            this.$set(this.searchFormData, 'postionName', this.postionList[0].label)
+            this.$set(this.searchFormData, 'postionId', this.postionList[0].id)
+            this.getSortiesList()
+            this.getGroupList()
+          }
         }
       })
     },