执行派工样式调整

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

@@ -131,8 +131,6 @@ export default {
         group: ''
       },
       groupList: [],
-      group: '',
-      groupType: '',
       groupUserList: [],
       activeName: 0,
       defaultPercent: 80,
@@ -148,11 +146,9 @@ export default {
         { title: '指令号', key: 'extProcessPlan.serialNumber', align: 'left' },
         { title: '指令名称', key: 'extProcessPlan.name', align: 'left' },
         { title: '工时定额', key: 'extProcessPlan.workHour', align: 'left' },
-        { title: '工艺员', key: 'extProcessPlan.note', align: 'left' },
+        { title: '工艺员', key: 'extProcessPlan.noteName', align: 'left' },
         { title: '计划开始', key: 'scheduledStart', align: 'left' },
-        { title: '计划结束', key: 'scheduledEnd', align: 'left' },
-        { title: '下达时间', key: 'scheduledStart', align: 'left' },
-        { title: '下达班组长', key: 'scheduledEnd', align: 'left' }
+        { title: '计划结束', key: 'scheduledEnd', align: 'left' }
       ],
       tableData: [],
       pagination: {
@@ -323,6 +319,9 @@ export default {
       this.getTableData()
     },
     getTableData() {
+      this.tableData = []
+      this.groupUserList = []
+      this.mainUserId = null
       if (this.activeName === '1') {
         if (this.$refs.detailComAlready) {
           this.$refs.detailComAlready.$children[0].getData()
@@ -448,7 +447,7 @@ export default {
             this.groupUserList.push(item)
           })
           this.groupUserTotal = res.items.totalElements
-          this.groupUserList[0].isSelect = true
+          // this.groupUserList[0].isSelect = true
         }
       })
     },

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

@@ -101,6 +101,10 @@
               </el-tooltip>
             </div>
           </div>
+          <div class="more-bar">
+            <span v-if="groupDropList.length < groupTotal" class="more" @click="getMoreData">加载更多</span>
+            <span v-else>已全部加载！</span>
+          </div>
         </div>
       </template>
     </split-pane>
@@ -138,7 +142,7 @@ export default {
         { title: '指令号', key: 'extProcessPlan.serialNumber', align: 'left' },
         { title: '指令名称', key: 'extProcessPlan.name', align: 'left' },
         { title: '工时定额', key: 'extProcessPlan.workHour', align: 'left' },
-        { title: '工艺员', key: 'extProcessPlan.note', align: 'left' },
+        { title: '工艺员', key: 'extProcessPlan.noteName', align: 'left' },
         { title: '计划开始', key: 'scheduledStart', align: 'left' },
         { title: '计划结束', key: 'scheduledEnd', align: 'left' }
       ],
@@ -192,7 +196,9 @@ export default {
             }
           }
         }
-      ]
+      ],
+      groupPage: 1,
+      groupTotal: 0
     }
   },
   computed: {
@@ -468,6 +474,8 @@ export default {
     },
     getGroupList() {
       const params = {
+        'pageFrom': this.groupPage,
+        'pageSize': 10,
         'searchItems': {
           'children': [
             {
@@ -524,11 +532,19 @@ export default {
       post('/ExtProcessSkill/getSkillWorkDetail', params).then(res => {
         if (res.items && res.items.content) {
           this.groupDropList = 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 || '')
+          this.groupTotal = res.items.totalElements
+          // 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 || '')
         }
       })
     },
+    getMoreData() {
+      const num = Math.ceil(this.groupTotal / 10)
+      if (this.groupPage <= num) {
+        this.groupPage++
+        this.getGroupList()
+      }
+    },
     getHandledValue(num) {
       return num < 10 ? '0' + num : num
     },
@@ -601,6 +617,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: #cf9236;
+        border-radius: 13px;
+        display: inline-block;
+        cursor: pointer;
+      }
+    }
     .group-list-box{
       box-sizing: border-box;
       background: url("/images/tasks.png") no-repeat;