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

applications/dee-mes/src/views/taskExecution/components/TechnicalRequirements/index.vue

@@ -54,15 +54,22 @@ export default {
     open() {
       this.visible = true
       this.$nextTick(() => {
-        this.getTablesData()
+        this.getTablesData(1)
+        this.getTablesData(2)
+        this.getFrockTable()
       })
     },
     handleClose() {},
-    getTablesData() {
+    getTablesData(value) {
       var that = this
+      if (value === 1) {
         this.$refs.table1.loading = true
+      } else {
         this.$refs.table2.loading = true
-      this.$refs.table3.loading = true
+      }
+      this.$refs.table1.loading = true
+      this.$refs.table2.loading = true
+      // this.$refs.table3.loading = true
       const params = {
         'searchItems': {
           'children': [
@@ -71,13 +78,13 @@ export default {
                 {
                   'fieldName': 'extProcessDocLinks.sourceId',
                   'operator': 'EQ',
-                  'value': '249403670569000'
-                  // 'value': this.$parent.headerData.aoId
+                  // 'value': '249403670569000'
+                  'value': this.$parent.headerData.aoId
                 },
                 {
                   'fieldName': 'subTypeName',
-                  'operator': 'EQ',
-                  'value': 'DxProcessPlanDesignView'
+                  'operator': value === 1 ? 'EQ' : 'IN',
+                  'value': value === 1 ? 'DxProcessPlanDesignView' : ['DocInnerRef', 'DocOuterRef']
                 }
               ],
               'operator': 'AND'
@@ -103,16 +110,20 @@ export default {
         params)
         .then((res) => {
           if (res.message.includes('成功')) {
-            this.tableDesign = res.items.designViews || []
-            this.tableFile = res.items.docRefs || []
-            this.tableClothes = res.items.materialVos || []
-            this.versionChangeDesc = res.items.dxProcessPlanVo.versionChangeDesc
-            this.prepareDescription = res.items.dxProcessPlanVo.prepareDescription
-            this.workDescription = res.items.dxProcessPlanVo.workDescription
+            if (value === 1) {
+              this.tableDesign = res.items.content || []
+            } else {
+              this.tableFile = res.items.content || []
+            }
+            // this.versionChangeDesc = res.items.dxProcessPlanVo.versionChangeDesc
+            // this.prepareDescription = res.items.dxProcessPlanVo.prepareDescription
+            // this.workDescription = res.items.dxProcessPlanVo.workDescription
             this.$nextTick(() => {
+              if (value === 1) {
                 this.$refs.table1.init()
+              } else {
                 this.$refs.table2.init()
-              this.$refs.table3.init()
+              }
             })
           } else {
             that.$message({
@@ -124,8 +135,73 @@ export default {
         })
         .catch((err) => console.error(err))
         .finally(() => {
+          if (value === 1) {
             this.$refs.table1.loading = false
+          } else {
             this.$refs.table2.loading = false
+          }
+          // this.$refs.table1.loading = false
+          // this.$refs.table2.loading = false
+          // this.$refs.table3.loading = false
+        })
+    },
+    getFrockTable() {
+      var that = this
+      this.$refs.table3.loading = true
+      const params = {
+        'searchItems': {
+          'children': [
+            {
+              'items': [
+                {
+                  'fieldName': 'source.targetExtProcessUsageLink.sourceId',
+                  'operator': 'EQ',
+                  // 'value': '249391817076000'
+                  'value': this.$parent.headerData.aoId
+                },
+                {
+                  'fieldName': 'subTypeName',
+                  'operator': 'EQ',
+                  'value': 'ExtProcessOperation'
+                }
+              ],
+              'operator': 'AND'
+            }
+          ],
+          'items': [],
+          'operator': 'AND'
+        },
+        'openProps': [
+          {
+            'name': 'target'
+          }
+        ],
+        'sortItem': [
+          {
+            'fieldName': 'modifyTime',
+            'sortOrder': 'desc'
+          }
+        ],
+        'toValidateKeys': ''
+      }
+      post(`/ExtProcessResourceLink/search`,
+        params)
+        .then((res) => {
+          if (res.message.includes('成功')) {
+            this.tableClothes = res.items.content || []
+            this.$nextTick(() => {
+              this.$refs.table3.init()
+            })
+          } else {
+            that.$message({
+              showClose: true,
+              message: '保存失败',
+              type: 'error'
+            })
+          }
+        })
+        .catch((err) => console.error(err))
+        .finally(() => {
           this.$refs.table3.loading = false
         })
     }

applications/dee-mes/src/views/taskExecution/index.vue

@@ -812,23 +812,23 @@ export default {
                 isOKClothesLink: p.joExecuteOpPlan[0].isOKClothesLink,
                 isOKToolLink: p.joExecuteOpPlan[0].isOKToolLink,
                 deviceLink: p.joExecuteOpPlan[0].deviceLink,
-                operator: p.joExecuteOpPlan.length &&
+                operator: p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].jrExecuteOpPlans &&
                   p.joExecuteOpPlan[0].jrExecuteOpPlans.length && p.joExecuteOpPlan[0].jrExecuteOpPlans[0].operatorUser
                   ? p.joExecuteOpPlan[0].jrExecuteOpPlans[0].operatorUser.userName +
                     ' ' +
                     p.joExecuteOpPlan[0].jrExecuteOpPlans[0].operatorTime
                   : '',
                 testor:
-                  p.joExecuteOpPlan.length &&
+                  p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].jrExecuteOpPlans &&
                   p.joExecuteOpPlan[0].jrExecuteOpPlans.length && p.joExecuteOpPlan[0].jrExecuteOpPlans[0].testor ? p.joExecuteOpPlan[0].jrExecuteOpPlans[0].testor.userName +
                     ' ' +
                     p.joExecuteOpPlan[0].jrExecuteOpPlans[0].testorTime : '',
                 dmir: {
                   dmriImg:
-                    p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].jrExecuteOpPlans.length &&
+                    p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].jrExecuteOpPlans && p.joExecuteOpPlan[0].jrExecuteOpPlans.length &&
                     p.joExecuteOpPlan[0].jrExecuteOpPlans[0].dmriImg,
                   dmirTime:
-                    p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].jrExecuteOpPlans.length &&
+                    p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].jrExecuteOpPlans && p.joExecuteOpPlan[0].jrExecuteOpPlans.length &&
                     p.joExecuteOpPlan[0].jrExecuteOpPlans[0].dmirTime
                 },
                 fileList: p.objFileLinks ? p.objFileLinks : []