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

src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue

@@ -81,8 +81,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([SaleShipmentMainRecord.allSchemas.tableColumns,...SaleShipmentDetailRecord.allSchemas.tableMainColumns])
-// const tableColumns = ref(SaleShipmentMainRecord.allSchemas.tableColumns)
+const tableColumns = ref([...SaleShipmentMainRecord.allSchemas.tableColumns,...SaleShipmentDetailRecord.allSchemas.tableMainColumns])
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
@@ -98,7 +97,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: SaleShipmentMainRecordApi.getSaleShipmentMainRecordPage // 分页接口
+  getListApi: SaleShipmentDetailRecordApi.getSaleShipmentDetailRecordPage // 分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts

@@ -11,17 +11,26 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 200,
+    }
   },
   {
     label: '申请单号',
     field: 'requestNumber',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 200,
+    }
   },
   {
     label: '客户代码',
     field: 'customerCode',
     sort: 'custom',
+    table: {
+      width: 150,
+    }
   },
   {
     label: '发票时间',
@@ -36,6 +45,9 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    table: {
+      width: 200,
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -64,6 +76,9 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x'
       }
     },
+    table: {
+      width: 200,
+    }
   },
   {
     label: '是否可用',
@@ -75,13 +90,14 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
-
+    isTable:false
   },
   
   {
     label: '业务类型',
     field: 'businessType',
     sort: 'custom',
+    isTable:false
   },
   {
     label: '创建时间',
@@ -122,35 +138,41 @@ export const SaleShipmentDetailRecordRules = reactive({
 })
 
 export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-  },
   {
     label: '销售订单号',
     field: 'soNumber',
     sort: 'custom',
+    table: {
+      width: 200,
+    }
   },
   {
     label: '销售订单行',
     field: 'soLine',
     sort: 'custom',
+    table: {
+      width: 150,
+    }
   },
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
     sort: 'custom',
+    isTable:false
   },
   {
     label: '包装号',
     field: 'packingNumber',
     sort: 'custom',
+    isTable:false
   },
   {
     label: '批次',
     field: 'batch',
     sort: 'custom',
+    table: {
+      width: 150,
+    }
   },
   {
     label: '库存状态',
@@ -159,11 +181,15 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'Radio'
     },
+    isTable:false
   },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
     sort: 'custom',
+    table: {
+      width: 130,
+    }
   },
   {
     label: '主表ID',
@@ -173,31 +199,41 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       value: 0
     },
+    isTable:false
   },
   {
     label: '物品代码',
     field: 'itemCode',
     sort: 'custom',
+    table: {
+      width: 150,
+    }
   },
   {
     label: '物品名称',
     field: 'itemName',
     sort: 'custom',
+    table: {
+      width: 150,
+    }
   },
   {
     label: '物品描述1',
     field: 'itemDesc1',
     sort: 'custom',
+    isTable:false
   },
   {
     label: '物品描述2',
     field: 'itemDesc2',
     sort: 'custom',
+    isTable:false
   },
   {
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
+    isTable:false
   },
   {
     label: '数量',
@@ -207,12 +243,22 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计量单位',
     field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTable:false
   },
   {
     label: '创建时间',
@@ -227,12 +273,13 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isForm: false,
+    isTable: false,
   },
   {
     label: '并发乐观锁',
     field: 'concurrencyStamp',
     sort: 'custom',
+    isTable:false
   },
   {
     label: '地点ID',
@@ -242,11 +289,14 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       value: 0
     },
+    isTable:false
   },
   {
     label: '操作',
     field: 'action',
     isForm: false,
+    hiddenInMain:true,
+    isTable:false,
     table: {
       width: 150,
       fixed: 'right'