From f02508c786f24bccf7dcf50579cb50158503c713 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 16:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasePlanMain/index.ts         | 15 +++++++++
 .../productreceiptRequestMain/index.vue       |  2 ++
 .../index.vue                                 |  1 +
 .../supplierinvoiceRequestMain.data.ts        | 33 ++++++++++++++++---
 4 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/src/api/wms/purchasePlanMain/index.ts b/src/api/wms/purchasePlanMain/index.ts
index 9d5e42230..ce1e68df6 100644
--- a/src/api/wms/purchasePlanMain/index.ts
+++ b/src/api/wms/purchasePlanMain/index.ts
@@ -87,19 +87,34 @@ export const exportPurchasePlanMain = async (params) => {
 }
 // 导出明细要货计划主 Excel
 export const exportDetailsPurchasePlanMain = async (params) => {
+
   if (params.isSearch) {
     const data = {...params}
     return await request.downloadPost({ url: `/wms/purchase-plan-main/export-excel-senior`, data })
   } else {
+    params = getPageParams(params)
     return await request.download({ url: `/wms/purchase-plan-main/export-excel-detail`, params })
   }
 }
+// 要货预测-列表和头部请求参数
+const getPageParams = (params)=>{
+
+  console.log('params.status',params.status)
+  // 状态
+  if(params.status&&params.status.length>0){
+    params.statuss = params.status.join(',')
+  }
+  params.status = ''
+  return params
+}
 // 导出要货计划二维表 Excel
 export const exportTablePurchasePlanMain = async (params) => {
+  params = getPageParams(params)
   // if (params.isSearch) {
   //   const data = {...params}
   //   return await request.downloadPost({ url: `/wms/purchase-plan-main/export-excel-senior`, data })
   // } else {
+
     return await request.download({ url: `/wms/purchase-plan-main/export-excel`, params })
   //}
 }
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 46c2e7a7b..ac11bd065 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -233,6 +233,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow[formField] = item[searchField]
+          newRow.batch = formatTime(new Date(), 'yyyyMMdd')
+
           tableData.value.push(newRow)
         })
       }else{
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index cc0ccf7cf..be07c0b41 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -234,6 +234,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow[formField] = item[searchField]
+          newRow.batch = formatTime(new Date(), 'yyyyMMdd')
           tableData.value.push(newRow)
         })
       }else{
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 1eafe9afa..18b8a915b 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -765,13 +765,13 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '采购价格审批人',
-    field: 'procurementCreatorName',
+    field: 'procurementCreator',
     table: {
       width: 150
     },
     sortTableDefault:14,
     isForm: true,
-    isTable:true,
+    isTable:false,
     isDetail:false,
     form: {
       component: 'Select',
@@ -800,7 +800,27 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       // }
     }
   },
-
+  {
+    label: '采购价格审批人',
+    field: 'procurementCreatorName',
+    table: {
+      width: 150
+    },
+    sortTableDefault:14,
+    isForm: false,
+    isTable:true,
+    isDetail:false,
+    form: {
+      component: 'Select',
+      api: () => procurementCreators.list,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'nickname',
+          valueField: 'id'
+        }
+      },
+    }
+  },
   {
     label: '采购审批人',
     field: 'procurementCreatorName',
@@ -1251,6 +1271,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
   {
     label: '采购价格审批时间',
     field: 'procurementCreateTime',
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sortTableDefault: 1003,
     isForm: false,
     isTable: false,
@@ -1345,7 +1368,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     label: '财务审批时间',
     field: 'financialCreateTime',
     formatter: dateFormatter,
-    
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,