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{ - 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