Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/wms/stockupMainJob/index.ts

@@ -81,7 +81,13 @@ export const deleteStockupMainJob = async (id: number) => {
 
 // 导出备货任务主 Excel
 export const exportStockupMainJob = async (params) => {
-  return await request.download({ url: `/wms/stockup-main-job/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/stockup-main-job/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/stockup-main-job/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/stockupMainRecord/index.ts

@@ -63,7 +63,13 @@ export const deleteStockupMainRecord = async (id: number) => {
 
 // 导出备货记录主 Excel
 export const exportStockupMainRecord = async (params) => {
-  return await request.download({ url: `/wms/stockup-main-record/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/stockup-main-record/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/stockup-main-record/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/stockupMainRequest/index.ts

@@ -64,7 +64,13 @@ export const deleteStockupMainRequest = async (id: number) => {
 
 // 导出备货申请主 Excel
 export const exportStockupMainRequest = async (params) => {
-  return await request.download({ url: `/wms/stockup-main-request/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/stockup-main-request/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/stockup-main-request/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@@ -132,9 +132,36 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }
     } else {
       const setV = {}
+      setV[formField] = val[0][searchField]      
+      if(formField == 'deliverPlanNumber') {
+        setV['deliverPlanNumber'] = val[0]['number']
+        if(setV['deliverPlanNumber'] != null){
+          isShowButton.value = false
+        }
+        setV['customerCode'] = val[0]['customerCode']
+        // 获取子表数据 getBomDisassemble
+        DeliverPlanDetailApi.selectDetailByMasterID(val[0]['id'])
+        .then(res => {
+          res.forEach(item => {
+            item.qty = item.planQty
+          })
+          if (res) tableData.value = res
+          // 修改 tableform 属性
+          DeliverRequestDetail.allSchemas.tableFormColumns.map(item => {
+            if(item.field == 'itemCode') {
+              item.isInpuFocusShow = false
+              item.tableForm.isInpuFocusShow = false
+              item.tableForm.disabled = true
+            }
+            if(item.field == 'uom') {
+              item.tableForm.disabled = true
+            }
+          })
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
-        }
+        })
+      }
+    }    
   })
 }
 // 查询页面返回——详情