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

src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts

@@ -415,6 +415,12 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 //表单校验
 export const ProductrepairRequestMainRules = reactive({
+  workshopCode: [
+    { required: true, message: '请选择车间代码', trigger: 'change' }
+  ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],

src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts

@@ -688,6 +688,7 @@ export const ProdcutscrapRecordBomDismantle = useCrudSchemas(reactive<CrudSchema
     label: '数量',
     field: 'qty',
     tableForm: {
+      disabled: true,
       type: 'InputNumber',
       min: 0,
       precision: 6

src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

@@ -417,6 +417,12 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 //表单校验
 export const ProductscrapRequestMainRules = reactive({
+  workshopCode: [
+    { required: true, message: '请选择车间代码', trigger: 'change' }
+  ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],