已发未结界面优化

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

@@ -15,32 +15,23 @@ export const UnfinishedShipmentDetailRules = reactive({
 })
 
 export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
+  
-    label: '自增主键',
-    field: 'id',
-    sort: 'custom',
-    isForm: false
-  },
-  {
-    label: '父主键',
-    field: 'masterId',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
   {
     label: '物料代码',
     field: 'materialCode',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     isSearch: true
   },
   {
     label: '物料名称',
     field: 'materialName',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     isSearch: true
   },
   {
@@ -88,22 +79,22 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       value: 0
     }
   },
-  {
+  // {
-    label: '是否可用',
+  //   label: '是否可用',
-    field: 'available',
+  //   field: 'available',
-    sort: 'custom',
+  //   sort: 'custom',
-      dictType: DICT_TYPE.TRUE_FALSE,
+  //     dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+  //     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
+  //   isSearch: true,
-                form: {
+  //               form: {
-                  component: 'Switch',
+  //                 component: 'Switch',
-                  value: 'TRUE',
+  //                 value: 'TRUE',
-                  componentProps: {
+  //                 componentProps: {
-                    inactiveValue: 'FALSE',
+  //                   inactiveValue: 'FALSE',
-                    activeValue: 'TRUE'
+  //                   activeValue: 'TRUE'
-                  }
+  //                 }
-                }
+  //               }
-  },
+  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -120,63 +111,13 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false
   },
-  {
+  // {
-    label: '删除时间',
+  //   label: '操作',
-    field: 'deletionTime',
+  //   field: 'action',
-    sort: 'custom',
+  //   isForm: false,
-    formatter: dateFormatter,
+  //   table: {
-    isSearch: true,
+  //     width: 150,
-    search: {
+  //     fixed: 'right'
-      component: 'DatePicker',
+  //   }
-      componentProps: {
+  // }
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    }
-  },
-  {
-    label: '删除者ID',
-    field: 'deleterId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '扩展属性',
-    field: 'extraProperties',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
-  {
-    label: '地点id',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
 ]))

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

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="UnfinishedShipmentMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...UnfinishedShipmentMain.allSchemas.searchSchema,...UnfinishedShipmentDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="UnfinishedShipmentMain.allSchemas"
+      :detailAllSchemas="UnfinishedShipmentDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -57,6 +58,7 @@
     :allSchemas="UnfinishedShipmentMain.allSchemas" 
     :detailAllSchemas="UnfinishedShipmentDetail.allSchemas"
     :detailAllSchemasRules="UnfinishedShipmentDetailRules"
+    :apiPage="UnfinishedShipmentDetailApi.getUnfinishedShipmentDetailPage"
   />
 
   <!-- 导入 -->
@@ -82,7 +84,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(UnfinishedShipmentMain.allSchemas.tableColumns)
+const tableColumns = ref([...UnfinishedShipmentMain.allSchemas.tableColumns,...UnfinishedShipmentDetail.allSchemas.tableMainColumns])
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
@@ -99,7 +101,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: UnfinishedShipmentMainApi.getUnfinishedShipmentMainPage // 分页接口
+  getListApi: UnfinishedShipmentDetailApi.getUnfinishedShipmentDetailPage // 分页接口
 })
 
 // 获得表格的各种操作