Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts

@@ -139,6 +139,7 @@ export const WorkshopRules = reactive({
     { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
   name: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   remark: [

src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts

@@ -291,6 +291,7 @@ export const WorkstationRules = reactive({
     { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
   name: [
+    { required: true, message: '请输入名称', trigger: 'change' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   remark: [

src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts

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

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts

@@ -837,21 +837,21 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault: 18,
     hiddenInMain:true,
   },
-  {
+  // {
-    label: '数量',
+  //   label: '数量',
-    field: 'qty',
+  //   field: 'qty',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    form: {
+  //   form: {
-      component: 'InputNumber',
+  //     component: 'InputNumber',
-    },
+  //   },
-    sortTableDefault: 12,
+  //   sortTableDefault: 12,
-  },
+  // },
   {
     label: '退货数量',
-    field: 'returnedQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@@ -484,7 +484,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '退货数量',
-    field: 'returnedQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -733,19 +733,19 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortSearchDefault: 7,
     hiddenInMain: true
   },
-  {
+  // {
-    label: '数量',
+  //   label: '数量',
-    field: 'qty',
+  //   field: 'qty',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTable:true,
+  //   isTable:true,
-    sortTableDefault: 1005,
+  //   sortTableDefault: 1005,
-    form: {
+  //   form: {
-      component: 'InputNumber',
+  //     component: 'InputNumber',
-    }
+  //   }
-  },
+  // },
   {
     label: '计量单位',
     field: 'uom',