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

applications/dee-mes/src/views/taskExecution/components/LacClaims/header.vue

@@ -41,7 +41,7 @@
             align="center"
           />
           <el-table-column
-            prop="dxProcessMaterial.resCode"
+            prop="extMaterial.resCode"
             align="center"
             label="物料编码"
             :width="120"
@@ -49,7 +49,7 @@
             show-overflow-tooltip
           />
           <el-table-column
-            prop="dxProcessMaterial.modelNo"
+            prop="extMaterial.modelNo"
             align="center"
             label="牌号/规格/GPM号"
             :width="200"
@@ -57,7 +57,7 @@
             show-overflow-tooltip
           />
           <el-table-column
-            prop="dxProcessMaterial.resName"
+            prop="extMaterial.resName"
             align="center"
             label="材料名称"
             :min-width="120"
@@ -65,14 +65,14 @@
             show-overflow-tooltip
           />
           <el-table-column
-            prop="dxProcessMaterial.resType2.typeName"
+            prop="extMaterial.resType2.typeName"
             align="center"
             label="类型"
             :width="90"
             sortable
           />
           <el-table-column
-            prop="dxProcessMaterial.unit.unitCode"
+            prop="extMaterial.extUnit.unitCode"
             align="center"
             label="单位"
             :width="90"
@@ -173,23 +173,46 @@ export default {
       this.loading = true
       this.tableData = []
       const params = {
-        pageFrom: this.tablePagination.currentPage,
-        pageSize: this.tablePagination.pageSize,
-        indices: ['StorageRequestItem'],
-        searchItems: {
-          items: [
+        'pageFrom': this.tablePagination.currentPage,
+        'pageSize': this.tablePagination.pageSize,
+        'searchItems': {
+          'children': [],
+          'items': [
             {
-              fieldName: 'aoId',
-              operator: 'EQ',
-              value: this.$parent.$parent.$parent.$parent.headerData.aoId
+              'fieldName': 'extSupporting.extProcessPlan.id',
+              'operator': 'EQ',
+              // 'value': 249231383474000
+              'value': this.$parent.$parent.$parent.$parent.headerData.aoId
             }
           ],
-          operator: 'AND'
+          'operator': 'AND'
+        },
+        'openProps': [
+          {
+            'name': 'inStorageRequestItems'
+          },
+          {
+            'name': 'extMaterial',
+            'openProps': [
+              {
+                'name': 'resType2'
+              },
+              {
+                'name': 'extUnit'
               }
+            ]
+          }
+        ],
+        'sortItem': [
+          {
+            'fieldName': 'modifyTime',
+            'sortOrder': 'desc'
+          }
+        ]
       }
       // 发送请求
       post(
-        '/StorageRequestItem/getStorageReqItemByAoId',
+        '/ExtSupportingItem/findSupportingItemMaterialByAO',
         params
       )
         .then((res) => {
@@ -238,6 +261,9 @@ export default {
         case ' invalid':
           label = '已失效'
           break
+        case null:
+          label = '未申请'
+          break
         default:
           label = ''
       }
@@ -245,7 +271,7 @@ export default {
     },
     rowClick(row) {
       this.rowData = row
-      this.$parent.$parent.$parent.$refs.footer.getTableData(this.rowData.id)
+      // this.$parent.$parent.$parent.$refs.footer.getTableData(this.rowData.id)
     },
     /**
      * 胶漆使用申请
@@ -253,10 +279,8 @@ export default {
     applyStorageReqItem(row) {
       var that = this
       post(
-        '/StorageRequestItem/applyStorageReqItem',
-        {
-          id: that.rowData.id // 问题id
-        }
+        `/ExtSupportingItem/deal/supportingItem?extSupportingItemVOId=${that.rowData.id}&applyState=true`,
+        {}
       )
         .then((res) => {
           if (res.message.includes('成功')) {
@@ -283,10 +307,8 @@ export default {
     cancelApplyStorageReqItem() {
       var that = this
       post(
-        '/StorageRequestItem/cancelApplyStorageReqItem',
-        {
-          id: that.rowData.id // 问题id
-        }
+        `/ExtSupportingItem/deal/supportingItem?extSupportingItemVOId=${that.rowData.id}&applyState=false`,
+        {}
       )
         .then((res) => {
           if (res.message.includes('成功')) {