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

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

@@ -142,6 +142,28 @@ export const AdjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 2
     }
   },
+  {
+    label: '差异数量',
+    field: 'differenceQty',
+    sort: 'custom',
+    isForm: false,
+    isSearch: true,
+    table: {
+      width: 180,
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 2
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 2
+    }
+  },
   {
     label: '操作',
     field: 'action',

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

@@ -182,6 +182,28 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 2
     }
   },
+  {
+    label: '差异数量',
+    field: 'differenceQty',
+    sort: 'custom',
+    isForm: false,
+    isSearch: true,
+    table: {
+      width: 180,
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 2
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 2
+    }
+  },
   {
     label: '操作',
     field: 'action',

src/views/eam/item/countRecord/index.vue

@@ -152,7 +152,7 @@
   
   // 根据状态返回该按钮是否显示
   const isShowMainButton = (row, val) => {
-    if (val.indexOf(row.available) > -1) {
+    if (val.indexOf(row.status) > -1) {
       return false
     } else {
       return true
@@ -162,7 +162,7 @@
   // 列表-操作按钮
   const butttondata = (row) => {
     return [
-      defaultButtons.mainAdjust(null),// 盘点调整
+      defaultButtons.mainAdjust({ hide: isShowMainButton(row, ['CANGENERATE']) }),// 盘点调整
     ]
   }