From f2f590847fb3e1ffe447a95d05b1c2ef0101b575 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 28 Feb 2024 09:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      |  8 ++++
 .../supplierdeliverRequestMain.data.ts        | 48 +++++++++----------
 .../purchaseclaimRequestMain/index.vue        | 26 ++++++----
 3 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index f9912cbae..5001e209f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -73,6 +73,7 @@
     :apiDelete="SupplierdeliverRequestDetailApi.deleteSupplierdeliverRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    @formFormDateChange="formFormDateChange"
   />
 
   <!-- 导入 -->
@@ -668,6 +669,13 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const formFormDateChange = (field, val,row, index) => {
+  console.log("AAAAA",field)
+  console.log("BBBBB",row)
+  console.log("CCCCC",val)
+  console.log("DDDDD",index)
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 8c5540bf2..796cfab5b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -547,26 +547,8 @@ export const SupplierdeliverRequestMainRules = reactive({
  */
 export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '替代批次',
-    field: 'altBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '到货日期',
-    field: 'arriveDate',
+    label: '生产日期',
+    field: 'produceDate',
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -575,7 +557,6 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
-    isForm: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -585,7 +566,6 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         valueFormat: 'x',
       }
     },
-    isTableForm: false,
     tableForm: {
       type: 'FormDate',
       dateFormat: 'YYYY-MM-DD',
@@ -593,8 +573,26 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '生产日期',
-    field: 'produceDate',
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -603,6 +601,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    isForm: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -612,6 +611,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         valueFormat: 'x',
       }
     },
+    isTableForm: false,
     tableForm: {
       type: 'FormDate',
       dateFormat: 'YYYY-MM-DD',
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
index 6bbadf7de..4d982d1b6 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
@@ -29,23 +29,34 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="formRef" @success="getList" :rules="PurchaseclaimRequestMainRules"
-    :formAllSchemas="PurchaseclaimRequestMain.allSchemas" :tableAllSchemas="PurchaseclaimRequestDetail.allSchemas"
+  <BasicForm 
+    ref="formRef" 
+    :rules="PurchaseclaimRequestMainRules"
+    :formAllSchemas="PurchaseclaimRequestMain.allSchemas" 
+    :tableAllSchemas="PurchaseclaimRequestDetail.allSchemas"
     :tableFormRules="PurchaseclaimRequestDetailRules" :tableData="tableData"
     :apiUpdate="PurchaseclaimRequestMainApi.updatePurchaseclaimRequestMain"
-    :apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain" :isBusiness="true"
-    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
+    :apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain" 
+    :isBusiness="true"
+    @success="getList" 
+    @handleAddTable="handleAddTable" 
+    @handleDeleteTable="handleDeleteTable" 
+    @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     @inputStringBlur="inputStringBlur"/>
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="false" :allSchemas="PurchaseclaimRequestMain.allSchemas"
-    :detailAllSchemas="PurchaseclaimRequestDetail.allSchemas" :detailAllSchemasRules="PurchaseclaimRequestDetailRules"
+  <Detail ref="detailRef" 
+    :isBasic="false" 
+    :allSchemas="PurchaseclaimRequestMain.allSchemas"
+    :detailAllSchemas="PurchaseclaimRequestDetail.allSchemas" 
+    :detailAllSchemasRules="PurchaseclaimRequestDetailRules"
     :apiCreate="PurchaseclaimRequestDetailApi.createPurchaseclaimRequestDetail"
     :apiUpdate="PurchaseclaimRequestDetailApi.updatePurchaseclaimRequestDetail"
     :apiPage="PurchaseclaimRequestDetailApi.getPurchaseclaimRequestDetailPage"
     :apiDelete="PurchaseclaimRequestDetailApi.deletePurchaseclaimRequestDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail" />
+    @searchTableSuccessDetail="searchTableSuccessDetail" 
+    />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/purchaseclaim-request-main/import" :importTemplateData="importTemplateData"
@@ -63,7 +74,6 @@
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
-  import {mainListDocumentPrintBtn} from "@/utils/disposition/defaultButtons";
 
   // 供应商索赔申请
   defineOptions({ name: 'PurchaseclaimRequestMain' })