From 291acc374bfe726c11c433f3eb34a93f0edb7a6a Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 28 Feb 2024 10:41:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E7=94=9F=E4=BA=A7=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue        | 17 +++++++++++------
 .../supplierdeliverRequestMain.data.ts          |  7 ++++---
 .../purchaseclaimRequestMain/index.vue          |  4 ++--
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 5001e209f..29377c3c5 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -58,6 +58,7 @@
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @formFormDateChange="formFormDateChange"
   />
 
   <!-- 详情 -->
@@ -73,7 +74,6 @@
     :apiDelete="SupplierdeliverRequestDetailApi.deleteSupplierdeliverRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
-    @formFormDateChange="formFormDateChange"
   />
 
   <!-- 导入 -->
@@ -599,7 +599,12 @@ const handleDeleteTable = (item, index) => {
 // 主子数据 提交
 const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
-  let isHave = data.subList.some((item) => item.produceDate > item.expireDate)
+  let isHave = data.subList.some((item) => {
+    console.log("CCCCC",item.expireDate)
+    if(item.expireDate != null){
+      item.produceDate > item.expireDate
+    }
+  })
   if (isHave) {
     message.error('生产日期不可以大于过期日期')
     formRef.value.formLoading = false
@@ -670,10 +675,10 @@ const searchFormClick = (searchData) => {
 }
 
 const formFormDateChange = (field, val,row, index) => {
-  console.log("AAAAA",field)
-  console.log("BBBBB",row)
-  console.log("CCCCC",val)
-  console.log("DDDDD",index)
+  if(field == 'produceDate'){
+    let produceDateStr = formatDate(val,'YYYYMMDD');
+    row.batch = produceDateStr
+  }
 }
 
 /** 初始化 **/
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 796cfab5b..e1a09b3b5 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -25,6 +25,7 @@ const requestsettingData = data?.list[0] || {}
  // 获取当前操作人的部门
  import { useUserStore } from '@/store/modules/user'
  import { TableColumn } from '@/types/table'
+import { tr } from 'element-plus/es/locale'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
  // id 转str 否则form回显匹配不到
@@ -579,6 +580,9 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '替代批次',
@@ -1084,9 +1088,6 @@ export const SupplierdeliverRequestDetailRules = reactive({
   produceDate: [
     { required: true, message: '请输入生产日期', trigger: 'blur' }
   ],
-  expireDate: [
-    { required: true, message: '请输入过期日期', trigger: 'blur' }
-  ],
   packQty: [
     { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
index 4d982d1b6..b87fbab5f 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
@@ -481,8 +481,8 @@
     getList() // 刷新当前列表
   }
   const inputStringBlur =(headerItem,index,row) =>{
-    console.log("headerItem:",headerItem)
-    console.log("row:",row)
+    // console.log("headerItem:",headerItem)
+    //console.log("row:",row)
     if(headerItem == 'singlePrice'){
       // 输入完单价离开事件（金额 = 数量 乘以 单价）
       row.amount = row.qty * row.singlePrice