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

src/views/eam/basic/item/item.data.ts

@@ -17,6 +17,9 @@ export const ItemRules = reactive({
   minInventory: [
     { required: true, message: '请输入最高库存', trigger: 'blur' }
   ],
+  classification: [
+    { required: true, message: '请输入ABC分类', trigger: 'blur' }
+  ],
 })
 
 export const ItemSearchTable = useCrudSchemas(reactive<CrudSchema[]>([
@@ -143,10 +146,12 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     label: 'ABC分类',
     field: 'classification',
     sort: 'custom',
-    isSearch: false,
+    dictType: DICT_TYPE.CLASSIFICATION,
+    dictClass: 'string',
+    isTable: true,
     table: {
-      width: 110
+      width: 100
-    },
+    } ,
   },
   {
     label: '使用地点',

src/views/eam/item/countadjustPlan/countadjustPlan.data.ts

@@ -7,7 +7,9 @@ export const CountadjustPlanRules = reactive({
   classification: [
     { required: true, message: '请选择盘点类型', trigger: 'blur' }
   ],
-  
+  type: [
+    { required: true, message: '请选择库位类型', trigger: 'blur' }
+  ],
 })
 
 export const CountadjustPlan = useCrudSchemas(reactive<CrudSchema[]>([
@@ -42,29 +44,15 @@ export const CountadjustPlan = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '是否账内库',
+    label: '库存类型',
-    field: 'isInAccount',
+    field: 'type',
-    dictType: DICT_TYPE.TRUE_FALSE,
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_ACCOUNT_LOCATION_TYPE,
     dictClass: 'string',
-    isSearch: false,
     isTable: true,
-    sort: 'custom',
     table: {
-      width: 140
+      width: 100
-    },
+    } ,
-    tableForm: {
-      type: 'Select',
-      inactiveValue: 'FALSE',
-      disabled: true
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    }
   },
   {
     label: '操作',

src/views/eam/item/itemAccounts/itemAccounts.data.ts

@@ -18,10 +18,10 @@ export const ItemAccountsRules = reactive({
   areaNumber: [required],
   type: [required],
   locationNumber: [required],
-  qty: [
+  // qty: [
-    required,
+  //   required,
-    { validator: validateNumber, message: '数量不能等于0', trigger: 'blur' },
+  //   { validator: validateNumber, message: '数量不能等于0', trigger: 'blur' },
-  ],
+  // ],
 })
 
 export const ItemAccounts = useCrudSchemas(