修改执行派工和检验派工

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

@@ -2,9 +2,21 @@
   <div class="inspection-disptach">
     <div class="instructions-issued-top">
       <el-form :inline="true" :model="searchFormData" class="instructions-issued-search">
-        <el-col :span="6">
+        <el-col v-if="activeName === '0'" :span="6">
+          <el-form-item label="班组:">
+            <el-select v-model="searchFormData.group" placeholder="班组" @change="changeGroup">
+              <el-option
+                v-for="(item, i) in groupList"
+                :key="item.value + i"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
           <el-form-item label="架次:">
-            <el-select v-model="searchFormData.sorties" placeholder="架次" @change="changeSorties">
+            <el-select v-model="searchFormData.sorties" placeholder="架次" clearable @change="changeSorties">
               <el-option
                 v-for="(item, i) in sortiesList"
                 :key="item.value + i"
@@ -14,9 +26,9 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item label="站位:">
-            <el-select v-model="searchFormData.postion" placeholder="站位" @change="changePostion">
+            <el-select v-model="searchFormData.postion" placeholder="站位" clearable @change="changePostion">
               <el-option
                 v-for="item in postionList"
                 :key="item.id"
@@ -26,23 +38,17 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-if="activeName === '0'" :span="6">
-          <el-form-item label="班组:">
-            <el-select v-model="searchFormData.group" placeholder="班组" @change="changeGroup">
-              <el-option
-                v-for="(item, i) in groupList"
-                :key="item.value + i"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="6">
           <el-form-item label="AO(号/名称):">
             <el-input v-model="searchFormData.aoName" clearable placeholder="请输入AO(号/名称)" @clear="getTableData" @keyup.enter.native="getTableData" />
           </el-form-item>
         </el-col>
+        <el-col :span="2">
+          <el-button
+            type="primary"
+            @click="getTableData"
+          >查询</el-button>
+        </el-col>
       </el-form>
     </div>
     <split-pane
@@ -294,7 +300,9 @@ export default {
     }
   },
   created() {
+    this.getGroup()
     this.getStories()
+    this.getStation()
   },
   methods: {
     getStories() {
@@ -330,33 +338,33 @@ export default {
             label: row.defName
           }
         })
-        this.$set(this.searchFormData, 'sorties', this.sortiesList[0].value)
-        this.$set(this.searchFormData, 'sortiesName', this.sortiesList[0].label)
-        this.getStation()
+        // this.$set(this.searchFormData, 'sorties', this.sortiesList[0].value)
+        // this.$set(this.searchFormData, 'sortiesName', this.sortiesList[0].label)
+        // this.getStation()
       })
     },
     getStation() {
       this.$api.searchApi('ExtStandPosition', {}).then(res => {
         this.postionList = res.items.content
-        this.$set(this.searchFormData, 'postion', this.postionList[0].id)
-        this.$set(this.searchFormData, 'postionName', this.postionList[0].extcode)
-        this.getGroup()
-        this.getTableData()
+        // this.$set(this.searchFormData, 'postion', this.postionList[0].id)
+        // this.$set(this.searchFormData, 'postionName', this.postionList[0].extcode)
+        // this.getGroup()
+        // this.getTableData()
       }).catch(err => console.log(err)).finally(() => {
       })
     },
     changeSorties() {
       const sorties = this.sortiesList.find(r => r.value === this.searchFormData.sorties)
       this.$set(this.searchFormData, 'sortiesName', sorties && sorties.label || '')
-      this.getTableData()
+      // this.getTableData()
     },
     changePostion() {
       const postion = this.postionList.find(r => r.id === this.searchFormData.postion)
       this.$set(this.searchFormData, 'postionName', postion && postion.extcode || '')
-      if (this.activeName === '0') {
-        this.getGroup()
-      }
-      this.getTableData()
+      // if (this.activeName === '0') {
+      //   this.getGroup()
+      // }
+      // this.getTableData()
     },
     getGroup() {
       this.groupList = []
@@ -366,11 +374,11 @@ export default {
           'children': [
             {
               'items': [
-                {
-                  'fieldName': 'extStandPositionId',
-                  'operator': 'EQ',
-                  'value': this.searchFormData.postion
-                },
+                // {
+                //   'fieldName': 'extStandPositionId',
+                //   'operator': 'EQ',
+                //   'value': this.searchFormData.postion
+                // },
                 {
                   'fieldName': 'isValid',
                   'operator': 'EQ',
@@ -388,7 +396,9 @@ export default {
           'items': [],
           'operator': 'AND'
         },
-        'openProps': [],
+        'openProps': [{
+          'name': 'extStandPosition'
+        }],
         'sortItem': [
           {
             'fieldName': 'modifyTime',
@@ -411,6 +421,7 @@ export default {
             this.groupUserPage = 1
             this.groupUserList = []
             this.groupUserTotal = 0
+            this.getTableData()
             this.getGroupUser()
           } else {
             this.groupUserPage = 1
@@ -462,16 +473,16 @@ export default {
           'children': [
             {
               'items': [
-                {
-                  'fieldName': 'extProcessPlan.sorties',
-                  'operator': 'EQ',
-                  'value': this.searchFormData.sortiesName
-                },
-                {
-                  'fieldName': 'extProcessPlan.positionNumber',
-                  'operator': 'EQ',
-                  'value': this.searchFormData.postionName
-                },
+                // {
+                //   'fieldName': 'extProcessPlan.sorties',
+                //   'operator': 'EQ',
+                //   'value': this.searchFormData.sortiesName
+                // },
+                // {
+                //   'fieldName': 'extProcessPlan.positionNumber',
+                //   'operator': 'EQ',
+                //   'value': this.searchFormData.postionName
+                // },
                 {
                   'fieldName': 'planState',
                   'operator': 'IN',
@@ -531,6 +542,20 @@ export default {
           }
         ]
       }
+      if (this.searchFormData.sortiesName) {
+        params.searchItems.children[0].items.push({
+          'fieldName': 'extProcessPlan.sorties',
+          'operator': 'EQ',
+          'value': this.searchFormData.sortiesName
+        })
+      }
+      if (this.searchFormData.postionName) {
+        params.searchItems.children[0].items.push({
+          'fieldName': 'extProcessPlan.positionNumber',
+          'operator': 'EQ',
+          'value': this.searchFormData.postionName
+        })
+      }
       post('/JoExecutePlan/search', params).then(res => {
         if (res.items && res.items.content) {
           this.tableData = res.items.content

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

@@ -2,7 +2,7 @@
   <div class="instructions-disptach">
     <div class="instructions-issued-top">
       <el-form :inline="true" :model="searchFormData" class="instructions-issued-search">
-        <el-col :span="5">
+        <!-- <el-col :span="5">
           <el-form-item label="站位:">
             <el-select v-model="searchFormData.postion" placeholder="站位" @change="changePostion">
               <el-option
@@ -13,7 +13,7 @@
               />
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item label="班组:">
             <el-select v-model="searchFormData.group" placeholder="班组" @change="changeGroup">
@@ -168,7 +168,7 @@
               </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">
+              <div v-show="item.dxUserInfo" class="name">
                 {{ item.dxUserInfo.name }}
               </div>
             </div>
@@ -367,8 +367,8 @@ export default {
   },
   created() {
     this.getStories()
-    this.getStation()
-    // this.getGroup()
+    // this.getStation()
+    this.getGroup()
   },
   // mounted() {
   //   window.addEventListener('scroll', this.handleScroll)
@@ -448,11 +448,11 @@ export default {
           'children': [
             {
               'items': [
-                {
-                  'fieldName': 'extStandPositionId',
-                  'operator': 'EQ',
-                  'value': this.searchFormData.postion
-                },
+                // {
+                //   'fieldName': 'extStandPositionId',
+                //   'operator': 'EQ',
+                //   'value': this.searchFormData.postion
+                // },
                 {
                   'fieldName': 'extProcessSkillUsers.dxUserInfoId',
                   'operator': 'EQ',
@@ -480,7 +480,9 @@ export default {
           'items': [],
           'operator': 'AND'
         },
-        'openProps': [],
+        'openProps': [{
+          'name': 'extStandPosition'
+        }],
         'sortItem': [
           {
             'fieldName': 'modifyTime',
@@ -494,7 +496,7 @@ export default {
           this.groupList = res.items.content.map(row => {
             return {
               value: row.id,
-              label: row.resName
+              label: row.resName + '(' + row.extStandPosition.extcode + '站位)'
             }
           })
           this.$set(this.searchFormData, 'group', this.groupList[0].value)

applications/dee-mes/src/views/assemblyPlanManagement/instructionsIssued/components/stationPlanList.vue

@@ -417,7 +417,7 @@ export default {
           }
           post(`ExtProcessPlan/queryByPosition`, params)
             .then((res) => {
-              res.items.push({
+              res.items.unshift({
                 positionId: node.data.id,
                 type: 'cooperate',
                 serialNumber: '',