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

src/api/wms/inspectJobMain/index.ts

@@ -82,7 +82,12 @@ export const deleteInspectJobMain = async (id: number) => {
 
 // 导出检验任务主 Excel
 export const exportInspectJobMain = async (params) => {
-  return await request.download({ url: `/wms/inspect-job-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/inspect-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/inspect-job-main/export-excel`, params})
+  }
 }
 
 // 下载用户导入模板

src/api/wms/inspectRecordMain/index.ts

@@ -73,7 +73,12 @@ export const deleteInspectRecordMain = async (id: number) => {
 
 // 导出检验记录主 Excel
 export const exportInspectRecordMain = async (params) => {
-  return await request.download({ url: `/wms/inspect-record-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/inspect-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/inspect-record-main/export-excel`, params})
+  }
 }
 
 // 下载用户导入模板

src/api/wms/inspectRequestMain/index.ts

@@ -67,7 +67,12 @@ export const deleteInspectRequestMain = async (id: number) => {
 
 // 导出检验申请主 Excel
 export const exportInspectRequestMain = async (params) => {
-  return await request.download({ url: `/wms/inspect-request-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/inspect-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/inspect-request-main/export-excel`, params})
+  }
 }
 
 // 下载用户导入模板

src/api/wms/purchasereturnJobMain/index.ts

@@ -81,7 +81,12 @@ export const deletePurchasereturnJobMain = async (id: number) => {
 
 // 导出采购退货任务主 Excel
 export const exportPurchasereturnJobMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereturn-job-main/export-excel-senior`, data })
+  } else {
     return await request.download({ url: `/wms/purchasereturn-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/purchasereturnRecordMain/index.ts

@@ -67,7 +67,12 @@ export const deletePurchasereturnRecordMain = async (id: number) => {
 
 // 导出采购退货记录主 Excel
 export const exportPurchasereturnRecordMain = async (params) => {
-  return await request.download({ url: `/wms/purchasereturn-record-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereturn-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/purchasereturn-record-main/export-excel`, params})
+  }
 }
 
 // 下载用户导入模板

src/api/wms/purchasereturnRequestMain/index.ts

@@ -65,7 +65,12 @@ export const deletePurchasereturnRequestMain = async (id: number) => {
 
 // 导出采购退货申请主 Excel
 export const exportPurchasereturnRequestMain = async (params) => {
-  return await request.download({ url: `/wms/purchasereturn-request-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereturn-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/purchasereturn-request-main/export-excel`, params})
+  }
 }
 
 // 下载用户导入模板

src/api/wms/putawayJobMain/index.ts

@@ -74,7 +74,12 @@ export const deletePutawayJobMain = async (id: number) => {
 
 // 导出上架任务主 Excel
 export const exportPutawayJobMain = async (params) => {
-  return await request.download({ url: `/wms/putaway-job-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/putaway-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/putaway-job-main/export-excel`, params})
+  }
 }
 
 // 下载用户导入模板

src/api/wms/putawayRecordMain/index.ts

@@ -60,7 +60,12 @@ export const deletePutawayRecordMain = async (id: number) => {
 
 // 导出上架记录主 Excel
 export const exportPutawayRecordMain = async (params) => {
-  return await request.download({ url: `/wms/putaway-record-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/putaway-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/putaway-record-main/export-excel`, params})
+  }
 }
 
 // 下载用户导入模板

src/api/wms/putawayRequestMain/index.ts

@@ -58,7 +58,12 @@ export const deletePutawayRequestMain = async (id: number) => {
 
 // 导出上架申请主 Excel
 export const exportPutawayRequestMain = async (params) => {
-  return await request.download({ url: `/wms/putaway-request-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/putaway-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/putaway-request-main/export-excel`, params})
+  }
 }
 
 // 下载用户导入模板

src/utils/dict.ts

@@ -272,4 +272,5 @@ export enum DICT_TYPE {
   LABEL_STATUS = 'label_status', // 标签状态
   BIND_TYPE = 'bind_type', // 器具绑定类型
   CONTAINER_STATUS = 'container_status', // 容器状态
+  PREDICT_TIME_TYPE = 'predict_time_type', // 预测时间类型
 }

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@@ -11,6 +11,9 @@ import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/item
 import * as CustomerdockApi from '@/api/wms/customerdock'
 import { Customerdock } from '@/views/wms/basicDataManage/customerManage/customerdock/customerdock.data'
 
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
+
 import * as CarrierApi from '@/api/wms/carrier'
 import { Carrier } from '@/views/wms/basicDataManage/orderManage/carrier/carrier.data'
 
@@ -110,8 +113,20 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        disabled: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户信息', // 查询弹窗标题
+        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     }
   },

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -100,7 +100,7 @@ const tableColumns = ref(DeliverRequestMain.allSchemas.tableColumns)
 
 const isShowButton = ref(true)
 //定义  展示子表数据时是否显示新增/修改/删除按钮
-const trueFalse = ref()
+const trueFalse = ref(true)
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -124,7 +124,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         // 获取子表数据 getBomDisassemble
         DeliverPlanDetailApi.selectDetailByMasterID(val[0]['id'])
         .then(res => {
-          console.log(120,res)
           res.forEach(item => {
             item.qty = item.planQty
           })
@@ -374,19 +373,26 @@ const handleDeleteTable = (item, index) => {
 }
 
 //为true表示子表数据中存在数量为0的数据
-const flag = ref()
+const flag = ref(false)
 
 // 主子数据 提交
 const submitForm = async (formType, data) => {
+  if(tableData.value.length <= 0){
+    message.warning(`子表明细不能为空!`)
+      flag.value = true
+      formRef.value.formLoading = false
+      return;
+  }
   data.subList = tableData.value // 拼接子表数据参数
   data.subList.forEach(obj => {
     if(obj.qty == 0){
-      message.error(`数量不能为0!`)
+      message.warning(`数量不能为0!`)
       flag.value = true
+      formRef.value.formLoading = false
       return;
     }
   })
-  if(flag){
+  if(flag.value){
     return
   }
   try {

src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue

@@ -218,7 +218,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await InspectJobMainApi.exportInspectJobMain(setSearchParams)
+    const data = await InspectJobMainApi.exportInspectJobMain(tableObject.params)
     download.excel(data, '检验任务主.xlsx')
   } catch {
   } finally {

src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue

@@ -147,7 +147,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await InspectRecordMainApi.exportInspectRecordMain(setSearchParams)
+    const data = await InspectRecordMainApi.exportInspectRecordMain(tableObject.params)
     download.excel(data, '检验记录主.xlsx')
   } catch {
   } finally {

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@@ -284,7 +284,7 @@
       await message.exportConfirm()
       // 发起导出
       exportLoading.value = true
-      const data = await InspectRequestMainApi.exportInspectRequestMain(setSearchParams)
+      const data = await InspectRequestMainApi.exportInspectRequestMain(tableObject.params)
       download.excel(data, '检验申请主.xlsx')
     } catch {
     } finally {

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue

@@ -218,7 +218,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(setSearchParams)
+    const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(tableObject.params)
     download.excel(data, '采购退货任务主.xlsx')
   } catch {
   } finally {

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue

@@ -141,7 +141,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(setSearchParams)
+    const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params)
     download.excel(data, '采购退货记录主.xlsx')
   } catch {
   } finally {

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@@ -445,7 +445,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(setSearchParams)
+    const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(tableObject.params)
     download.excel(data, '采购退货申请主.xlsx')
   } catch {
   } finally {

src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@@ -218,7 +218,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PutawayJobMainApi.exportPutawayJobMain(setSearchParams)
+    const data = await PutawayJobMainApi.exportPutawayJobMain(tableObject.params)
     download.excel(data, '上架任务主.xlsx')
   } catch {
   } finally {

src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue

@@ -141,7 +141,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PutawayRecordMainApi.exportPutawayRecordMain(setSearchParams)
+    const data = await PutawayRecordMainApi.exportPutawayRecordMain(tableObject.params)
     download.excel(data, '上架记录主.xlsx')
   } catch {
   } finally {

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@@ -314,7 +314,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PutawayRequestMainApi.exportPutawayRequestMain(setSearchParams)
+    const data = await PutawayRequestMainApi.exportPutawayRequestMain(tableObject.params)
     download.excel(data, '上架申请主.xlsx')
   } catch {
   } finally {

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@@ -254,10 +254,17 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '预测时间类型',
     field: 'predictTimeType',
+    dictType: DICT_TYPE.PREDICT_TIME_TYPE,
     sort: 'custom',
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     table: {
       width: 150
     },
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '预测日期',