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

src/views/wms/inventoryManage/expectin/expectin.data.ts

@@ -38,6 +38,7 @@ export const Expectin = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
+    hiddenSearchHigh: true
   },
   {
     label: '批次',

src/views/wms/inventoryManage/expectout/expectout.data.ts

@@ -38,6 +38,7 @@ export const Expectout = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
+    hiddenSearchHigh: true
   },
   {
     label: '包装号',

src/views/wms/inventoryManage/transaction/transaction.data.ts

@@ -98,6 +98,18 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
+    hiddenSearchHigh: true
+  },
   {
     label: '数量',
     field: 'qty',

src/views/wms/inventoryManage/transferlog/transferlog.data.ts

@@ -55,6 +55,18 @@ export const Transferlog = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
+    hiddenSearchHigh: true
+  },
   {
     label: '数量',
     field: 'qty',

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -45,6 +45,7 @@ const queryParams = {
  // 获取当前操作人的部门
  import { useUserStore } from '@/store/modules/user'
  import { TableColumn } from '@/types/table'
+import { table } from 'console'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
  // id 转str 否则form回显匹配不到
@@ -1520,8 +1521,12 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     table: {
       width: 150
     },
-    isTableForm: false,
+    isTableForm: true,
     isForm: false,
+    hiddenSearchHigh: true,
+    tableForm: {
+      disabled:true
+    }
   },
   {
     label: '描述',

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

@@ -250,7 +250,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '订单备注',
-    field: 'poRmks',
+    field: 'remark',
     sort: 'custom',
     isTable: false,
     isForm:false,