Merge remote-tracking branch 'origin/master'

src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts

@@ -691,4 +691,7 @@ export const PreparetoissueDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  dueTime:  [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ]
 })

src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts

@@ -162,7 +162,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '开始日期',
+    label: '开始时间',
     field: 'beginTime',
     formatter: dateFormatter,
     detail: {
@@ -183,7 +183,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '结束日期',
+    label: '结束时间',
     field: 'endTime',
     formatter: dateFormatter,
     detail: {
@@ -276,50 +276,50 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
-  {
-    label: '开始时间',
-    field: 'beginTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '结束时间',
-    field: 'endTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
+  // {
+  //   label: '开始时间',
+  //   field: 'beginTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '结束时间',
+  //   field: 'endTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
   // {
   //   label: '订单号',
   //   field: 'woNumber',
@@ -453,10 +453,10 @@ export const ProductionMainRules = reactive({
     { required: true, message: '请选择状态', trigger: 'change' }
   ],
   beginTime: [
-    { required: true, message: '请输入开始日期', trigger: 'blur' }
+    { required: true, message: '请输入开始时间', trigger: 'blur' }
   ],
   endTime: [
-    { required: true, message: '请输入结束日期', trigger: 'blur' }
+    { required: true, message: '请输入结束时间', trigger: 'blur' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -13,7 +13,7 @@ import * as PurchaseMainApi from '@/api/wms/purchaseMain'
 import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
 import { PurchasePlanDetail, PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
-import {validateHanset,validateEmail} from '@/utils/validator'
+import { validateHanset, validateEmail } from '@/utils/validator'
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -476,30 +476,30 @@ export const SupplierdeliverRequestMainRules = reactive({
   ppNumber: [
     { required: true, message: '请输入要货计划单号', trigger: 'blur' }
   ],
-  asnNumber:  [
+  asnNumber: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  contactName:  [
+  contactName: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  contactPhone:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }, 
-    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
+  contactPhone: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator: validateHanset, message: '请输入正确的手机号', trigger: 'blur' }
   ],
-  contactEmail:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }, 
-    { validator:validateEmail, message: '请输入正确的手机号', trigger: 'blur'}
+  contactEmail: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator: validateEmail, message: '请输入正确的手机号', trigger: 'blur' }
   ],
-  carrierCode:  [
+  carrierCode: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  transferMode:  [
+  transferMode: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  vehiclePlateNumber:  [
+  vehiclePlateNumber: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  remark:  [
+  remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   planArriveTime: [
@@ -646,7 +646,14 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
             key: 'number',
             value: 'ppNumber',
             isMainValue: true
-          }]
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
       }
     },
     tableForm: {
@@ -661,6 +668,11 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
           key: 'number',
           value: 'ppNumber',
           isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
         }]
     }
   },
@@ -808,21 +820,21 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: true
     }
   },
- {
-   label: '计量单位',
-   field: 'uom',
-   sort: 'custom',
-   dictType: DICT_TYPE.UOM,
-   dictClass: 'string',
-   isSearch: true,
-   isTable: true,
-   table: {
-     width: 150
-   },
-   tableForm: {
-     type: 'Select'
-   }
- },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
 
   {
     label: '数量',
@@ -998,8 +1010,8 @@ export const SupplierdeliverRequestDetailRules = reactive({
   //   { required: true, message: '请输入包装号', trigger: 'blur' }
   // ],
   batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' }, 
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }, 
+    { required: true, message: '请输入批次', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
   ],
   produceDate: [
     { required: true, message: '请输入生产日期', trigger: 'blur' }
@@ -1025,7 +1037,7 @@ export const SupplierdeliverRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物品代码', trigger: 'change' }
   ],
-  remark:  [
+  remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
 })