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

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

@@ -313,15 +313,15 @@ export default {
             return {
               value: row.defCode,
               label: row.defName,
-              status: row.extPosition && row.extPosition.length && row.extPosition[0].extPositionPlans && row.extPosition[0].extPositionPlans[0] ? row.extPosition[0].extPositionPlans[0].planState : '',
               postionId: row.extPosition && row.extPosition.length && row.extPosition[0].extPositionPlans && row.extPosition[0].extPositionPlans[0] ? row.extPosition[0].extPositionPlans[0].id : ''
             }
           })
           this.$set(this.searchFormData, 'sorties', this.sortiesData[0].value)
           this.$set(this.searchFormData, 'sortiesName', this.sortiesData[0].label)
           this.$set(this.searchFormData, 'workId', this.sortiesData[0].postionId)
-          this.$set(this, 'status', this.sortiesData[0].status)
+          // this.$set(this, 'status', this.sortiesData[0].status)
           // this.status = res.items.content[0].extPosition[0].extPositionPlans[0].planState
+          this.getWorkStatus()
           this.getTableData()
         }
       })
@@ -396,9 +396,45 @@ export default {
       const sorties = this.sortiesData.find(r => r.value === this.searchFormData.sorties)
       this.$set(this.searchFormData, 'sortiesName', sorties && sorties.label || '')
       this.$set(this.searchFormData, 'workId', sorties && sorties.postionId || '')
-      this.status = sorties.status
+      this.getWorkStatus()
+      // this.status = sorties.status
       this.getTableData()
     },
+    getWorkStatus() {
+      const params = {
+        'searchItems': {
+          'children': [
+            {
+              'items': [
+                {
+                  'fieldName': 'aircraftSorties.defCode',
+                  'operator': 'EQ',
+                  'value': this.searchFormData.sortiesName
+                },
+                {
+                  'fieldName': 'extPosition.serialNumber',
+                  'operator': 'EQ',
+                  'value': this.searchFormData.postionName
+                }
+              ],
+              'operator': 'AND'
+            }
+          ],
+          'items': [],
+          'operator': 'AND'
+        },
+        'openProps': []
+      }
+      this.$api.searchApi('ExtPositionPlan', params).then(res => {
+        if (res.items.content) {
+          if (res.items.content.length > 0) {
+            this.status = res.items.content[0].planState
+          } else {
+            this.status = ''
+          }
+        }
+      })
+    },
     tabClick(tab) {
       this.activeName = tab.index
       if (this.activeName === '1') {