Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/dee-mes/src/views/assemblyPlanManagement/instructionIdentification/components/right/index.vue

@@ -135,7 +135,7 @@
                 >
                   <el-option v-for="(item, i) in wpOptions" :key="i" :label="item.name" :value="item.id" />
                 </el-select>
-                <span v-else>{{ $utils.getParamsFromLists(wpOptions, 'id', scope.row[scope.column.property], 'name') }}</span>
+                <span v-else>{{ $utils.getParamsFromLists(wpDictionary, 'id', scope.row[scope.column.property], 'name') }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -305,8 +305,10 @@ export default {
         total: 0,
         pageSizes: [5, 10, 20, 50]
       },
-      // 工作包数据
+      // 工作包数据(有效)
       wpOptions: [],
+      // 工作包数据字典（包含有效和无效）
+      wpDictionary: [],
       // 加载中
       loading: false,
       curRowId: null,
@@ -375,10 +377,6 @@ export default {
           'children': [],
           'items': [
             {
-              'fieldName': 'workState',
-              'operator': 'EQ',
-              'value': 'Y'
-            }, {
               'fieldName': 'sorties',
               'operator': 'EQ',
               'value': data.serialNo
@@ -400,10 +398,16 @@ export default {
       }
       post('/ExtWorkPackage/search', params).then(res => {
         this.wpOptions = res.items.content.map(row => {
-          return {
+          if (row.workState === 'Y') {
+            this.wpOptions.push({
               name: row.name,
               id: row.id
+            })
           }
+          this.wpDictionary.push({
+            name: row.name,
+            id: row.id
+          })
         })
       })
     },