Merge remote-tracking branch 'remotes/origin/intex_online20250509' into intex

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

@@ -655,7 +655,8 @@ export const DeliverRequestMain = useCrudSchemas(
           valueFormat: 'x'
         }
       },
-      isTableForm: false
+      isTableForm: false,
+      isForm: false
     },
     {
       label: '最后更新者',
@@ -689,6 +690,9 @@ export const DeliverRequestMainRules = reactive({
   deliverType: [
     { required: true, message: '发货库区类型不能为空', trigger: 'change' }
   ],
+  dueTime: [
+    { required: false, message: '截止时间不能为空', trigger: 'change' }
+  ],
   customerDockCode: [
     { required: true, message: '请选择客户月台代码', trigger: 'change' }
   ],

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

@@ -131,12 +131,56 @@ const { tableObject, tableMethods } = useTable({
 /**
  * DeliverRequestMain 成品发货申请
  */
+ DeliverRequestMain.allSchemas.formSchema.forEach(item => {
+  if (item.field == 'dueTime') {
+    item.label = '截止时间'
+  }
+})
+DeliverRequestMain.allSchemas.tableColumns.forEach(item => {
+  if (item.field == 'dueTime') {
+    item.label = '截止时间'
+  }
+})
+DeliverRequestMain.allSchemas.detailSchema.forEach(item => {
+  if (item.field == 'dueTime') {
+    item.label = '截止时间'
+  }
+})
+DeliverRequestMain.allSchemas.searchSchema.forEach(item => {
+  if (item.field == 'dueTime') {
+    item.label = '截止时间'
+  }
+})
+DeliverRequestMainRules.dueTime[0].required = false
+DeliverRequestMainRules.dueTime[0].message = '截止时间不能为空'
  if ( routeName.value == 'DeliverRequestMain') {
   tableObject.params = {
     businessType: 'Deliver'
   }
   businessType.value = 'Deliver'
   importFileName.value = '成品发货申请'
+  DeliverRequestMain.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'dueTime') {
+      item.label = '发货日期'
+    }
+  })
+  DeliverRequestMain.allSchemas.tableColumns.forEach(item => {
+    if (item.field == 'dueTime') {
+      item.label = '发货日期'
+    }
+  })
+  DeliverRequestMain.allSchemas.detailSchema.forEach(item => {
+    if (item.field == 'dueTime') {
+      item.label = '发货日期'
+    }
+  })
+  DeliverRequestMain.allSchemas.searchSchema.forEach(item => {
+    if (item.field == 'dueTime') {
+      item.label = '发货日期'
+    }
+  })
+  DeliverRequestMainRules.dueTime[0].required = true
+  DeliverRequestMainRules.dueTime[0].message = '发货日期不能为空'
 } else if ( routeName.value == 'ZZBJDeliverRequestMain') {
   tableObject.params = {
     businessType: 'ZZBJDeliver'

src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue

@@ -100,6 +100,26 @@ const { tableObject, tableMethods } = useTable({
 
 importUrl.value = '/wms/deliver-record-main/import-shipment-zip'
 // 判断 路由名称 进行条件过滤
+DeliverRecordMain.allSchemas.formSchema.forEach(item => {
+  if (item.field == 'dueTime') {
+    item.label = '截止时间'
+  }
+})
+DeliverRecordMain.allSchemas.tableColumns.forEach(item => {
+  if (item.field == 'dueTime') {
+    item.label = '截止时间'
+  }
+})
+DeliverRecordMain.allSchemas.detailSchema.forEach(item => {
+  if (item.field == 'dueTime') {
+    item.label = '截止时间'
+  }
+})
+DeliverRecordMain.allSchemas.searchSchema.forEach(item => {
+  if (item.field == 'dueTime') {
+    item.label = '截止时间'
+  }
+})
 if (routeName.value == 'ToyotaSupplies') {
   tableObject.params = {
     businessType: 'ToyotaSupplies'
@@ -107,6 +127,26 @@ if (routeName.value == 'ToyotaSupplies') {
   businessType.value = 'ToyotaSupplies'
   importFileName.value = '丰田补给品发货记录'
   importExtend.value = 'ToyotaSupplies'
+  DeliverRecordMain.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'dueTime') {
+      item.label = '发货日期'
+    }
+  })
+  DeliverRecordMain.allSchemas.tableColumns.forEach(item => {
+    if (item.field == 'dueTime') {
+      item.label = '发货日期'
+    }
+  })
+  DeliverRecordMain.allSchemas.detailSchema.forEach(item => {
+    if (item.field == 'dueTime') {
+      item.label = '发货日期'
+    }
+  })
+  DeliverRecordMain.allSchemas.searchSchema.forEach(item => {
+    if (item.field == 'dueTime') {
+      item.label = '发货日期'
+    }
+  })
 } else if (routeName.value == 'SSProduct') {
   tableObject.params = {
     businessType: 'SSProduct'