Merge branch 'intex' into intex_online_yejiaxing

src/views/wms/inventoryManage/differenceRecord/differenceRecord.data.ts

@@ -189,7 +189,20 @@ export const DifferenceRecordDetail = useCrudSchemas(
           defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
         }
       },
-      isForm: false
-    }
+      isTableForm: false,
+      isForm: false,
+      tableForm: {
+        disabled: true
+      },
+      form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    },
   ])
 )

src/views/wms/inventoryManage/differenceRequest/differenceRequest.data.ts

@@ -312,8 +312,17 @@ export const DifferenceRequestDetail = useCrudSchemas(
       isForm: false,
       tableForm: {
         disabled: true
+      },
+      form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
+    },
     {
       label: '创建人',
       field: 'creator',

src/views/wms/inventoryManage/differenceRequest/index.vue

@@ -315,6 +315,11 @@ const submitForm = async (formType,submitData) => {
   data.subList = tableData.value
   try {
     if (formType === 'create') {
+      for (const item of data.subList) {
+  if (item.requestQty <= 0) {
+    message.warning('数量必须大于0')
+    return // 这会从整个 submitForm 函数返回
+  }}
       await DifferenceRequestMainApi.createMain(data)
       message.success(t('common.createSuccess'))
     } else {