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

src/api/wms/accountcalendar/index.ts

@@ -42,3 +42,8 @@ export const deleteAccountcalendar = async (id: number) => {
 export const exportAccountcalendar = async (params) => {
   return await request.download({ url: `/wms/accountcalendar/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/accountcalendar/get-import-template' })
+}

src/api/wms/areabasic/index.ts

@@ -42,3 +42,8 @@ export const deleteArea = async (id: number) => {
 export const exportArea = async (params) => {
   return await request.download({ url: `/wms/areabasic/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/areabasic/get-import-template' })
+}

src/api/wms/businesstype/index.ts

@@ -52,3 +52,8 @@ export const deleteBusinesstype = async (id: number) => {
 export const exportBusinesstype = async (params) => {
   return await request.download({ url: `/wms/businesstype/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/businesstype/get-import-template' })
+}

src/api/wms/carrier/index.ts

@@ -50,3 +50,8 @@ export const deleteCarrier = async (id: number) => {
 export const exportCarrier = async (params) => {
   return await request.download({ url: `/wms/carrier/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/carrier/get-import-template' })
+}

src/api/wms/condition/index.ts

@@ -38,3 +38,8 @@ export const deleteCondition = async (id: number) => {
 export const exportCondition = async (params) => {
   return await request.download({ url: `/wms/condition/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/condition/get-import-template' })
+}

src/api/wms/configuration/index.ts

@@ -38,3 +38,8 @@ export const deleteConfiguration = async (id: number) => {
 export const exportConfiguration = async (params) => {
   return await request.download({ url: `/wms/configuration/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/configuration/get-import-template' })
+}

src/api/wms/configurationsetting/index.ts

@@ -40,3 +40,8 @@ export const deleteConfigurationsetting = async (id: number) => {
 export const exportConfigurationsetting = async (params) => {
   return await request.download({ url: `/wms/configurationsetting/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/configurationsetting/get-import-template' })
+}

src/api/wms/currencyexchange/index.ts

@@ -39,3 +39,8 @@ export const deleteCurrencyexchange = async (id: number) => {
 export const exportCurrencyexchange = async (params) => {
   return await request.download({ url: `/wms/currencyexchange/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/currencyexchange/get-import-template' })
+}

src/api/wms/customer/index.ts

@@ -50,3 +50,8 @@ export const deleteCustomer = async (id: number) => {
 export const exportCustomer = async (params) => {
   return await request.download({ url: `/wms/customer/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customer/get-import-template' })
+}

src/api/wms/customerdock/index.ts

@@ -46,3 +46,8 @@ export const deleteCustomerdock = async (id: number) => {
 export const exportCustomerdock = async (params) => {
   return await request.download({ url: `/wms/customerdock/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customerdock/get-import-template' })
+}

src/api/wms/customeritem/index.ts

@@ -46,3 +46,8 @@ export const deleteCustomeritem = async (id: number) => {
 export const exportCustomeritem = async (params) => {
   return await request.download({ url: `/wms/customeritem/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customeritem/get-import-template' })
+}

src/api/wms/detail/index.ts

@@ -0,0 +1,35 @@
+import request from '@/config/axios'
+
+
+// 查询备注列表
+export const getRemarkPage = async (params) => {
+  return await request.get({ url: `/infra/remark/list`, params })
+}
+
+// // 查询库区详情
+// export const getArea = async (id: number) => {
+//   return await request.get({ url: `/wms/areabasic/get?id=` + id })
+// }
+
+// 新增备注
+export const createRemark= async (data) => {
+  return await request.post({ url: `/infra/remark/create`, data })
+}
+// 查询变更记录列表
+export const getChangeRecordPage = async (params) => {
+  return await request.get({ url: `/infra/trends/list`, params })
+}
+// // 修改库区
+// export const updateArea = async (data: AreaVO) => {
+//   return await request.put({ url: `/wms/areabasic/update`, data })
+// }
+
+// // 删除库区
+// export const deleteArea = async (id: number) => {
+//   return await request.delete({ url: `/wms/areabasic/delete?id=` + id })
+// }
+
+// // 导出库区 Excel
+// export const exportArea = async (params) => {
+//   return await request.download({ url: `/wms/areabasic/export-excel`, params })
+// }

src/api/wms/dock/index.ts

@@ -46,3 +46,8 @@ export const deleteDock = async (id: number) => {
 export const exportDock = async (params) => {
   return await request.download({ url: `/wms/dock/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/dock/get-import-template' })
+}

src/api/wms/documentsetting/index.ts

@@ -47,3 +47,8 @@ export const deleteDocumentsetting = async (id: number) => {
 export const exportDocumentsetting = async (params) => {
   return await request.download({ url: `/wms/documentsetting/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/documentsetting/get-import-template' })
+}

src/api/wms/jobsetting/index.ts

@@ -49,3 +49,8 @@ export const deleteJobsetting = async (id: number) => {
 export const exportJobsetting = async (params) => {
   return await request.download({ url: `/wms/jobsetting/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/jobsetting/get-import-template' })
+}

src/api/wms/location/index.ts

@@ -53,3 +53,8 @@ export const deleteLocation = async (id: number) => {
 export const exportLocation = async (params) => {
   return await request.download({ url: `/wms/location/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/location/get-import-template' })
+}

src/api/wms/locationgroup/index.ts

@@ -41,3 +41,8 @@ export const deleteLocationgroup = async (id: number) => {
 export const exportLocationgroup = async (params) => {
   return await request.download({ url: `/wms/locationgroup/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/locationgroup/get-import-template' })
+}

src/api/wms/owner/index.ts

@@ -50,3 +50,8 @@ export const deleteOwner = async (id: number) => {
 export const exportOwner = async (params) => {
   return await request.download({ url: `/wms/owner/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/owner/get-import-template' })
+}

src/api/wms/paramsetting/index.ts

@@ -41,3 +41,8 @@ export const deleteParamsetting = async (id: number) => {
 export const exportParamsetting = async (params) => {
   return await request.download({ url: `/wms/paramsetting/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/paramsetting/get-import-template' })
+}

src/api/wms/process/index.ts

@@ -42,3 +42,8 @@ export const deleteProcess = async (id: number) => {
 export const exportProcess = async (params) => {
   return await request.download({ url: `/wms/process/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/process/get-import-template' })
+}

src/api/wms/productionline/index.ts

@@ -43,3 +43,8 @@ export const deleteProductionline = async (id: number) => {
 export const exportProductionline = async (params) => {
   return await request.download({ url: `/wms/productionline/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionline/get-import-template' })
+}

src/api/wms/project/index.ts

@@ -40,3 +40,8 @@ export const deleteProject = async (id: number) => {
 export const exportProject = async (params) => {
   return await request.download({ url: `/wms/project/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/project/get-import-template' })
+}

src/api/wms/purchaseprice/index.ts

@@ -40,3 +40,8 @@ export const deletePurchaseprice = async (id: number) => {
 export const exportPurchaseprice = async (params) => {
   return await request.download({ url: `/wms/purchaseprice/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchaseprice/get-import-template' })
+}

src/api/wms/recordsetting/index.ts

@@ -39,3 +39,8 @@ export const deleteRecordsetting = async (id: number) => {
 export const exportRecordsetting = async (params) => {
   return await request.download({ url: `/wms/recordsetting/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/recordsetting/get-import-template' })
+}

src/api/wms/requestsetting/index.ts

@@ -43,3 +43,8 @@ export const deleteRequestsetting = async (id: number) => {
 export const exportRequestsetting = async (params) => {
   return await request.download({ url: `/wms/requestsetting/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/requestsetting/get-import-template' })
+}

src/api/wms/rule/index.ts

@@ -39,3 +39,8 @@ export const deleteRule = async (id: number) => {
 export const exportRule = async (params) => {
   return await request.download({ url: `/wms/rule/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/rule/get-import-template' })
+}

src/api/wms/saleprice/index.ts

@@ -40,3 +40,8 @@ export const deleteSaleprice = async (id: number) => {
 export const exportSaleprice = async (params) => {
   return await request.download({ url: `/wms/saleprice/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/saleprice/get-import-template' })
+}

src/api/wms/shift/index.ts

@@ -42,3 +42,8 @@ export const deleteShift = async (id: number) => {
 export const exportShift = async (params) => {
   return await request.download({ url: `/wms/shift/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/shift/get-import-template' })
+}

src/api/wms/supplier/index.ts

@@ -50,3 +50,8 @@ export const deleteSupplier = async (id: number) => {
 export const exportSupplier = async (params) => {
   return await request.download({ url: `/wms/supplier/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplier/get-import-template' })
+}

src/api/wms/supplieritem/index.ts

@@ -49,3 +49,8 @@ export const deleteSupplieritem = async (id: number) => {
 export const exportSupplieritem = async (params) => {
   return await request.download({ url: `/wms/supplieritem/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplieritem/get-import-template' })
+}

src/api/wms/systemcalendar/index.ts

@@ -39,3 +39,8 @@ export const deleteSystemcalendar = async (id: number) => {
 export const exportSystemcalendar = async (params) => {
   return await request.download({ url: `/wms/systemcalendar/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/systemcalendar/get-import-template' })
+}

src/api/wms/team/index.ts

@@ -40,3 +40,8 @@ export const deleteTeam = async (id: number) => {
 export const exportTeam = async (params) => {
   return await request.download({ url: `/wms/team/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/team/get-import-template' })
+}

src/api/wms/transactiontype/index.ts

@@ -42,3 +42,8 @@ export const deleteTransactiontype = async (id: number) => {
 export const exportTransactiontype = async (params) => {
   return await request.download({ url: `/wms/transactiontype/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transactiontype/get-import-template' })
+}

src/api/wms/warehouse/index.ts

@@ -40,3 +40,8 @@ export const deleteWarehouse = async (id: number) => {
 export const exportWarehouse = async (params) => {
   return await request.download({ url: `/wms/warehouse/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/warehouse/get-import-template' })
+}

src/api/wms/workshop/index.ts

@@ -40,3 +40,8 @@ export const deleteWorkshop = async (id: number) => {
 export const exportWorkshop = async (params) => {
   return await request.download({ url: `/wms/workshop/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/workshop/get-import-template' })
+}

src/api/wms/workstation/index.ts

@@ -49,3 +49,8 @@ export const exportWorkstation = async (params) => {
 export const importWorkstationTemplate = () => {
   return request.download({ url: '/wms/workstation/get-import-template' })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/workstation/get-import-template' })
+}

src/components/BasicForm/src/BasicForm.vue

@@ -84,6 +84,16 @@
           <el-input v-model="form['inAreaCodes']" :placeholder="'请选择库区代码'" @click="opensearchTable('inAreaCodes', 'code')" />
         </div>
       </template>
+      <template #customercode="form">
+        <div class="w-[100%] flex">
+          <el-input v-model="form['customercode']" :placeholder="'请选择客户代码'" @click="opensearchTable('customercode', 'code')" />
+        </div>
+      </template>
+      <template #itemcode="form">
+        <div class="w-[100%] flex">
+          <el-input v-model="form['itemcode']" :placeholder="'请选择物料代码'" @click="opensearchTable('itemcode', 'code')" />
+        </div>
+      </template>
     </Form>
     <div class="table" v-if="isBusiness">
       <TableForm ref="tableFormRef" 

src/components/Detail/src/Detail.vue

@@ -1,12 +1,13 @@
 <template>
-  <el-drawer v-model="isShowDrawer" title="详情" direction="rtl" size="80%" v-loading="detailLoading" >
+  <el-drawer v-model="isShowDrawer" title="详情" direction="rtl" size="80%" v-loading="detailLoading">
     <template #header>
       <div class="font-size-18px">
         {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
       </div>
     </template>
     <ContentWrap v-if="!isBasic">
-      <Descriptions :data="detailData" labelClassName="label-class-name" label-align="left" direction="vertical" :column="8" :schema="allSchemas.detailSchema" :columns="2" width="200px"/>
+      <Descriptions :data="detailData" labelClassName="label-class-name" label-align="left" direction="vertical"
+        :column="8" :schema="allSchemas.detailSchema" :columns="2" width="200px" />
     </ContentWrap>
     <Tabs :tabsList="tabsList" :current="current" @change="change" />
     <div class="flex" v-if="current == 0">
@@ -18,20 +19,16 @@
         <!-- 附件组件 -->
         <Annex :data="annexData" @handleImport="handleImport" @deleteAnnex="deleteAnnexSuccess" />
         <!-- 备注组件 -->
-        <Remarks :data="remarksData" class="mt-20px" @submitSucss="remarksSubmitSucss" />
+        <Remarks :remarksData="remarksData"  class="mt-20px"
+          @remarksSubmitScuess="remarksSubmitScuess" />
         <!-- 变更记录组件 -->
         <ChangeRecord :data="changeRecordData" class="mt-20px" />
       </ContentWrap>
     </div>
     <ContentWrap v-else>
-      <Table 
-        :columns="allSchemas.tableColumns"
-        :data="tableObject.tableList"
-        :loading="tableObject.loading"
-        :pagination="{total: tableObject.total}"
-        v-model:pageSize="tableObject.pageSize"
-        v-model:currentPage="tableObject.currentPage"
-      /> 
+      <Table :columns="allSchemas.tableColumns" :data="tableObject.tableList" :loading="tableObject.loading"
+        :pagination="{ total: tableObject.total }" v-model:pageSize="tableObject.pageSize"
+        v-model:currentPage="tableObject.currentPage" />
     </ContentWrap>
   </el-drawer>
 </template>
@@ -41,7 +38,8 @@ import Annex from '@/components/Annex/src/Annex.vue'
 import Remarks from '@/components/Remarks/src/Remarks.vue'
 import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
 import Tabs from '@/components/Tabs/src/Tabs.vue'
-import * as ItembasicApi from '@/api/wms/itembasic'
+import * as DetailApi from '@/api/wms/detail'
+
 
 defineOptions({ name: 'Detail' })
 
@@ -64,29 +62,15 @@ const props = defineProps({
     required: true,
     default: null
   },
-  // // 可以导入的文件类型
-  // accept: {
-  //   type: String,
-  //   required: false,
-  //   default:'.xlsx,.xls'
-  // },
-  // // 是否更新已经存在的用户数据.默认值是1
-  // mode: {
-  //   type: Number,
-  //   required: false,
-  //   default: 1
-  // },
-  // url:{
-  //   type: String,
-  //   required: false,
-  // }
 })
 
 const isShowDrawer = ref(false)
 
-const tabsList = ref(JSON.parse(JSON.stringify(props.tabs?props.tabs:'')))
+const detailLoading = ref(false)
+
+const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
 
-if (tabsList.value&& tabsList.value.length>0) {
+if (tabsList.value && tabsList.value.length > 0) {
   tabsList.value.unshift({
     label: '详情',
     prop: 'Detail'
@@ -112,17 +96,11 @@ const annexData = reactive({
     time: '2022年12月12日 17:16:00',
   }]
 })
-// 备注默认数据
+
+// 备注数据
 const remarksData = reactive({
-  remarksList: [{
-    name: '诸葛亮',
-    text: '转朱阁，低绮户，照无眠。不应有恨，何事长向别时圆？人有悲欢离合，月有阴晴圆缺，此事古难全。但愿人长久，千里共婵娟。',
-    time: '2023年5月6日 17:16:00',
-  }, {
-    name: '刘备',
-    text: '转朱阁，低绮户，照无眠。不应有恨，何事长向别时圆？人有悲欢离合，月有阴晴圆缺，此事古难全。但愿人长久，千里共婵娟。',
-    time: '2022年12月12日 17:16:00',
-  }]
+  remarksList: [],
+  data:{}
 })
 
 // 变更记录默认数据
@@ -151,13 +129,10 @@ const changeRecordData = reactive({
 const detailData = ref("")//详情数据
 
 // 导入成功之后
-const importSuccess = () => {
+const importSuccess = () => {}
 
-
-}
 /** 搜索按钮操作 */
 const handleQuery = () => {
-
   importFormRef.value.open()
 }
 
@@ -176,64 +151,69 @@ const handleImport = () => {
 const deleteAnnexSuccess = async () => {
   console.log('删除成功');
 }
-// 备注提交成功之后
-const remarksSubmitSucss = () => {
-  console.log('提交成功');
-}
-// 供应商物品数据
-// const supplierItems = reactive({
-//   supplierItemsList: [{
-//     code: '646456',
-//     name: '978978'
-//   }],
-//   total: 20,
-//   pageSize: 1,
-//   currentPage: 2
-// })
-
 
+// Tabs当前选择
 const current = ref(0)
-const detailLoading = ref(false)
-// 获取表格数据
-const { tableObject, tableMethods } = useTable({
-  getListApi: ItembasicApi.getItembasicPage // 分页接口
-})
 const change = (item, index) => {
   current.value = index
 }
 
-// 获得表格的各种操作
-const { getList } = tableMethods
-getList()
+
 
 /** 打开弹窗 */
 const titleNameRef = ref()
 const titleValueRef = ref()
-const openDetail = async (row: any, titleName: any, titleValue: any) => {
+const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
   titleNameRef.value = titleName
   titleValueRef.value = titleValue
+  remarksData.data = {
+    tableId: row.id,
+    tableName: tableName,
+  }
   isShowDrawer.value = true
-  console.log(216, row)
   if (row) {
     detailLoading.value = true
     try {
-      //  detailData.value = await ItembasicApi.getItembasic(id)
       detailData.value = row
+      console.log(detailData.value);
+      getRemarkList()
+      getChangeRecordList()
+
     } finally {
       detailLoading.value = false
     }
   }
 }
 defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
+
+// 获取备注列表
+const getRemarkList = async () => {
+  detailLoading.value = true
+  try {
+    remarksData.remarksList = await DetailApi.getRemarkPage(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+// 备注提交成功之后
+const remarksSubmitScuess = async (remark) => {
+  detailLoading.value = false
+  getRemarkList()
+  getChangeRecordList()
+}
+// 获取变更记录
+const getChangeRecordList = async () => {
+  remarksData.data.tableId = '1679654720693248010'
+  remarksData.remarksList = await DetailApi.getChangeRecordPage(remarksData.data)
+}
 </script>
 <style lang="scss">
-    .el-drawer__body{
-      background: #f5f5f5!important;
-    }
-    ::v-deep(.label-class-name){
-    color: #dedede;
-  }
-</style>
-<style scoped lang="scss">
+.el-drawer__body {
+  background: #f5f5f5 !important;
+}
 
+::v-deep(.label-class-name) {
+  color: #dedede;
+}
 </style>
+<style scoped lang="scss"></style>

src/components/Remarks/src/Remarks.vue

@@ -5,22 +5,23 @@
       <div class="title-txt">备注</div>
     </div>
     <div class="list">
-      <div class="item flex items-start" v-for="(item, index) in data.remarksList" :key="index">
+      <div class="item flex items-start" v-for="(item, index) in remarksData.remarksList" :key="index">
         <div class="user-icon mt-4px">
-          <Icon icon="fa-solid:user" color="#fff" size="16" />
+          <img :src="item.avatar" v-if="item.avatar" alt="" class="w-[100%] h-[100%]"/>
+          <Icon icon="fa-solid:user" color="#fff" v-else size="16"/>
         </div>
         <div class="item-center">
           <div class="item-title">
-            <div class="item-title-txt">{{ item.name }}</div>
-            <div class="time">{{ item.time }}</div>
+            <div class="item-title-txt">{{ item.nickname }}</div>
+            <div class="time">{{formatDate(item.createTime)}}</div>
           </div>
-          <div class="mt-8px color-#303133 font-size-14px">{{ item.text }}</div>
+          <div class="mt-8px color-#303133 font-size-14px">{{ item.remark }}</div>
         </div>
       </div>
     </div>
     <div class="add-remarks flex items-center mt-20px">
-       <el-input v-model="remark" placeholder="请输入备注" />
-       <el-button class="ml-16px" type="primary" @click="handleSubmit" >
+       <el-input v-model="data.remark" placeholder="请输入备注" />
+       <el-button class="ml-16px" type="primary" @click="handleSubmitrRemarks" >
           确定
         </el-button>
     </div>
@@ -28,30 +29,39 @@
 </template>
 
 <script lang="ts" setup>
-import { getCurrentInstance } from 'vue'
 const message = useMessage() // 消息弹窗
-const { proxy } = getCurrentInstance()
+import * as DetailApi from '@/api/wms/detail'
+import { formatDate } from '@/utils/formatTime'
+
 defineComponent({
   name: 'Annex'
 })
 
-const remark = ref('')
 // 接受父级数据
 const props = defineProps({
-  data: {
+  remarksData: {
     type: Object,
     required: true
   }
 })
+const data = ref(props.remarksData.data)
 
 // 子传父的时候需要先定义好emit这个方法
-const emit = defineEmits(['remarksSubmitSucss'])
+const emit = defineEmits(['remarksSubmitScuess'])
 // 提交备注
-const handleSubmit = ()=>{
-  if(!remark.value){
+const handleSubmitrRemarks =async ()=>{
+  if(!data.value.remark){
     message.error('请填写备注')
+    return;
+  }
+  try {
+    await DetailApi.createRemark(data.value)
+    message.success('提交成功')
+  } finally {
+    emit('remarksSubmitScuess') //成功之后给父组件的数据
+    data.value.remark = ''
   }
-  emit('remarksSubmitSucss') //成功之后给父组件的数据
+  
 }
 </script>
 
@@ -82,6 +92,7 @@ const handleSubmit = ()=>{
     display: flex;
     align-items: center;
     justify-content: center;
+    overflow: hidden;
   }
 
   .item-center {

src/components/Search/src/Search.vue

@@ -7,6 +7,9 @@ import { findIndex } from '@/utils'
 import { cloneDeep } from 'lodash-es'
 import { FormSchema } from '@/types/form'
 
+import { useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache()
+
 defineOptions({ name: 'Search' })
 
 const { t } = useI18n()
@@ -97,44 +100,49 @@ const setVisible = () => {
   unref(elFormRef)?.resetFields()
   visible.value = !unref(visible)
 }
+const Search = ref()
+onMounted(() => {
+  nextTick(() => {
+    console.log(4)
+    console.log(Search.value.offsetHeight)
+    wsCache.set('SearchoffsetHeight', Search.value.offsetHeight)
+    console.log(wsCache.get('SearchoffsetHeight'))
+    console.log(4)
+  })
+})
 </script>
 
 <template>
   <!-- update by 芋艿：class="-mb-15px" 用于降低和 ContentWrap 组件的底部距离，避免空隙过大 -->
-  <Form
-    :inline="inline"
-    :is-col="isCol"
-    :is-custom="false"
-    :label-width="labelWidth"
-    :schema="newSchema"
-    class="-mb-15px"
-    hide-required-asterisk
-    @register="register"
-  >
-    <template #action>
-      <div v-if="layout === 'inline'">
-        <!-- update by 芋艿：去除搜索的 type="primary"，颜色变淡一点 -->
-        <ElButton type="info" plain  v-if="showSearch" @click="search">
-          <Icon class="mr-5px" icon="ep:search" />
-          {{ t('common.query') }}
-        </ElButton>
-        <!-- update by 芋艿：将 icon="ep:refresh-right" 修改成 icon="ep:refresh"，和 ruoyi-vue 搜索保持一致  -->
-        <ElButton type="info" plain  v-if="showReset" @click="reset">
-          <Icon class="mr-5px" icon="ep:refresh" />
-          {{ t('common.reset') }}
-        </ElButton>
-        <ElButton  type="info" plain  v-if="expand" text @click="setVisible">
-          {{ t(visible ? 'common.shrink' : 'common.expand') }}
-          <Icon :icon="visible ? 'ep:arrow-up' : 'ep:arrow-down'" />
-        </ElButton>
-        <!-- add by 芋艿：补充在搜索后的按钮 -->
-        <slot name="actionMore"></slot>
-      </div>
-    </template>
-    <template v-for="name in Object.keys($slots)" :key="name" #[name]>
-      <slot :name="name"></slot>
-    </template>
-  </Form>
+  <div ref="Search">
+    <Form :inline="inline" :is-col="isCol" :is-custom="false" :label-width="labelWidth" :schema="newSchema"
+      class="-mb-15px" hide-required-asterisk @register="register">
+      <template #action>
+        <div v-if="layout === 'inline'">
+          <!-- update by 芋艿：去除搜索的 type="primary"，颜色变淡一点 -->
+          <ElButton type="info" plain v-if="showSearch" @click="search">
+            <Icon class="mr-5px" icon="ep:search" />
+            {{ t('common.query') }}
+          </ElButton>
+          <!-- update by 芋艿：将 icon="ep:refresh-right" 修改成 icon="ep:refresh"，和 ruoyi-vue 搜索保持一致  -->
+          <ElButton type="info" plain v-if="showReset" @click="reset">
+            <Icon class="mr-5px" icon="ep:refresh" />
+            {{ t('common.reset') }}
+          </ElButton>
+          <ElButton type="info" plain v-if="expand" text @click="setVisible">
+            {{ t(visible ? 'common.shrink' : 'common.expand') }}
+            <Icon :icon="visible ? 'ep:arrow-up' : 'ep:arrow-down'" />
+          </ElButton>
+          <!-- add by 芋艿：补充在搜索后的按钮 -->
+          <slot name="actionMore"></slot>
+        </div>
+      </template>
+      <template v-for="name in Object.keys($slots)" :key="name" #[name]>
+        <slot :name="name"></slot>
+      </template>
+    </Form>
+  </div>
+
 
   <template v-if="layout === 'bottom'">
     <div :style="bottonButtonStyle">

src/components/Table/src/Table.vue

@@ -7,6 +7,9 @@ import { getSlot } from '@/utils/tsxHelper'
 import type { TableProps } from './types'
 import { set } from 'lodash-es'
 import { Pagination, TableColumn, TableSetPropsType, TableSlotDefault } from '@/types/table'
+import { useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache()
+let SearchoffsetHeight =(wsCache.get('SearchoffsetHeight') + 310 )+'px'
 
 export default defineComponent({
   // eslint-disable-next-line vue/no-reserved-component-names
@@ -14,6 +17,7 @@ export default defineComponent({
   props: {
     pageSize: propTypes.number.def(10),
     currentPage: propTypes.number.def(1),
+    height: propTypes.string.def('calc(100vh  - '+SearchoffsetHeight+')'),
     // 是否多选
     selection: propTypes.bool.def(false),
     // 是否所有的超出隐藏，优先级低于schema中的showOverflowTooltip,
@@ -289,6 +293,7 @@ export default defineComponent({
           // @ts-ignore
           ref={elTableRef}
           data={unref(getProps).data}
+          height={unref(getProps).height}
           onSelection-change={selectionChange}
           onSort-change={sortChange}
           {...unref(getBindValue)}

src/views/wms/accountcalendar/index.vue

@@ -177,7 +177,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await AccountcalendarApi.importTemplate()
 })
 </script>

src/views/wms/areabasic/index.vue

@@ -48,7 +48,7 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Area.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/area/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/areabasic/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
@@ -138,10 +138,6 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
-  console.log(145, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
@@ -200,7 +196,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await AreaApi.importTemplate()
 })
 </script>

src/views/wms/businesstype/index.vue

@@ -143,10 +143,6 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
-  console.log(145, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
@@ -182,7 +178,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BusinesstypeApi.exportBusinesstype(setSearchParams)
-    download.excel(data, '仓库.xls')
+    download.excel(data, '业务类型.xls')
   } catch {
   } finally {
     exportLoading.value = false
@@ -197,7 +193,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '仓库导入模版.xls'
+  templateTitle: '业务类型导入模版.xls'
 })
 // 导入成功之后
 const importSuccess = () => {
@@ -205,7 +201,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await BusinesstypeApi.importTemplate()
 })
 </script>

src/views/wms/carrier/index.vue

@@ -177,7 +177,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await CarrierApi.importTemplate()
 })
 </script>

src/views/wms/condition/index.vue

@@ -180,7 +180,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await ConditionApi.importTemplate()
 })
 </script>

src/views/wms/configuration/index.vue

@@ -157,7 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ConfigurationApi.exportConfiguration(setSearchParams)
-    download.excel(data, '仓库.xls')
+    download.excel(data, '配置.xls')
   } catch {
   } finally {
     exportLoading.value = false
@@ -172,7 +172,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '仓库导入模版.xls'
+  templateTitle: '配置导入模版.xls'
 })
 // 导入成功之后
 const importSuccess = () => {
@@ -180,7 +180,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await ConfigurationApi.importTemplate()
 })
 </script>

src/views/wms/configurationsetting/index.vue

@@ -180,7 +180,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await ConfigurationsettingApi.importTemplate()
 })
 </script>

src/views/wms/currencyexchange/index.vue

@@ -177,7 +177,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await CurrencyexchangeApi.importTemplate()
 })
 </script>

src/views/wms/customer/index.vue

@@ -177,7 +177,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await CustomerApi.importTemplate()
 })
 </script>

src/views/wms/customerdock/index.vue

@@ -150,10 +150,6 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
-  console.log(145, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
@@ -212,7 +208,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await CustomerdockApi.importTemplate()
 })
 </script>

src/views/wms/customeritem/index.vue

@@ -144,10 +144,6 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
-  console.log(145, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
@@ -206,7 +202,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await CustomeritemApi.importTemplate()
 })
 </script>

src/views/wms/dock/index.vue

@@ -144,10 +144,6 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
-  console.log(145, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
@@ -206,7 +202,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await DockApi.importTemplate()
 })
 </script>

src/views/wms/documentsetting/index.vue

@@ -180,7 +180,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await DocumentsettingApi.importTemplate()
 })
 </script>

src/views/wms/itembasic/index.vue

@@ -14,7 +14,7 @@
         total: tableObject.total
       }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage">
       <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code,'basicItembasic')">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
@@ -53,7 +53,6 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import { ItemBasic, ItemBasicRules } from '@/utils/disposition/tableColumns'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { ItemBasicTabsList } from '@/utils/disposition/tabsList'
-
 defineOptions({ name: 'Itembasic' })
 
 const { tableObject, tableMethods } = useTable({
@@ -142,8 +141,8 @@ const openForm = (type: string, id?: number) => {
   basicFormRef.value.open(type, id)
 }
 const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+const openDetail = (row: any, titleName: any, titleValue: any, tableNameRef: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, tableNameRef)
 }
 
 /** 删除按钮操作 */

src/views/wms/jobsetting/index.vue

@@ -180,7 +180,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await JobsettingApi.importTemplate()
 })
 </script>

src/views/wms/location/index.vue

@@ -212,7 +212,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await LocationApi.importTemplate()
 })
 </script>

src/views/wms/locationgroup/index.vue

@@ -144,10 +144,6 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
-  console.log(145, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
@@ -206,7 +202,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await LocationgroupApi.importTemplate()
 })
 </script>

src/views/wms/owner/index.vue

@@ -177,7 +177,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await OwnerApi.importTemplate()
 })
 </script>

src/views/wms/paramsetting/index.vue

@@ -180,7 +180,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await ParamsettingApi.importTemplate()
 })
 </script>

src/views/wms/process/index.vue

@@ -144,10 +144,6 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
-  console.log(145, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
@@ -206,7 +202,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await ProcessApi.importTemplate()
 })
 </script>

src/views/wms/productionline/index.vue

@@ -149,10 +149,6 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
-  console.log(145, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
@@ -211,7 +207,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await ProductionlineApi.importTemplate()
 })
 </script>

src/views/wms/project/index.vue

@@ -138,10 +138,6 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
-  console.log(145, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
@@ -200,7 +196,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await ProjectApi.importTemplate()
 })
 </script>

src/views/wms/purchaseclaimRequestMain/index.vue

@@ -1,304 +1,56 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="发货单号" prop="asnNumber">
-        <el-input
-          v-model="queryParams.asnNumber"
-          placeholder="请输入发货单号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="要货计划单号" prop="ppNumber">
-        <el-input
-          v-model="queryParams.ppNumber"
-          placeholder="请输入要货计划单号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="供应商代码" prop="supplierCode">
-        <el-input
-          v-model="queryParams.supplierCode"
-          placeholder="请输入供应商代码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="单据号" prop="number">
-        <el-input
-          v-model="queryParams.number"
-          placeholder="请输入单据号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="业务类型" prop="businessType">
-        <el-input
-          v-model="queryParams.businessType"
-          placeholder="请输入业务类型"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建者用户名" prop="creator">
-        <el-input
-          v-model="queryParams.creator"
-          placeholder="请输入创建者用户名"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="申请时间" prop="requestTime">
-        <el-date-picker
-          v-model="queryParams.requestTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="截止时间" prop="dueTime">
-        <el-date-picker
-          v-model="queryParams.dueTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="部门" prop="departmentCode">
-        <el-input
-          v-model="queryParams.departmentCode"
-          placeholder="请输入部门"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.REQUEST_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="最后更新时间" prop="updateTime">
-        <el-date-picker
-          v-model="queryParams.updateTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="最后更新者用户名" prop="updater">
-        <el-input
-          v-model="queryParams.updater"
-          placeholder="请输入最后更新者用户名"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="自动提交" prop="autoCommit">
-        <el-input
-          v-model="queryParams.autoCommit"
-          placeholder="请输入自动提交"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="自动通过" prop="autoAgree">
-        <el-input
-          v-model="queryParams.autoAgree"
-          placeholder="请输入自动通过"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="自动执行" prop="autoExecute">
-        <el-input
-          v-model="queryParams.autoExecute"
-          placeholder="请输入自动执行"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="直接生成记录" prop="directCreateRecord">
-        <el-input
-          v-model="queryParams.directCreateRecord"
-          placeholder="请输入直接生成记录"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="info" plain  @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button type="info" plain  @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          @click="openForm('create')"
-          v-hasPermi="['wms:purchaseclaim-request-main:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['wms:purchaseclaim-request-main:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form>
+    <Search :schema="PurchaseclaimRequestMain.allSchemas.searchSchema" @search="setSearchParams"
+      @reset="setSearchParams" />
   </ContentWrap>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :tableColumns="PurchaseclaimRequestMain.allSchemas.tableColumns"/>
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="发货单号" align="center" prop="asnNumber" width="150px" />
-      <el-table-column label="要货计划单号" align="center" prop="ppNumber" width="150px" />
-      <el-table-column label="供应商代码" align="center" prop="supplierCode" width="150px" />
-      <el-table-column label="单据号" align="center" prop="number" width="150px" />
-      <el-table-column label="业务类型" align="center" prop="businessType" width="150px" />
-      <el-table-column label="备注" align="center" prop="remark" width="150px" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="150px"
-      />
-      <el-table-column label="创建者用户名" align="center" prop="creator" width="150px" />
-      <el-table-column
-        label="申请时间"
-        align="center"
-        prop="requestTime"
-        :formatter="dateFormatter"
-        width="150px"
-      />
-      <el-table-column
-        label="截止时间"
-        align="center"
-        prop="dueTime"
-        :formatter="dateFormatter"
-        width="150px"
-      />
-      <el-table-column label="部门" align="center" prop="departmentCode" width="150px" />
-      <el-table-column label="状态" align="center" prop="status" width="150px">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.REQUEST_STATUS" :value="scope.row.status" />
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="最后更新时间"
-        align="center"
-        prop="updateTime"
-        :formatter="dateFormatter"
-        width="150px"
-      />
-      <el-table-column label="最后更新者用户名" align="center" prop="updater" width="150px" />
-      <el-table-column label="自动提交" align="center" prop="autoCommit" width="150px" />
-      <el-table-column label="自动通过" align="center" prop="autoAgree" width="150px" />
-      <el-table-column label="自动执行" align="center" prop="autoExecute" width="150px" />
-      <el-table-column label="直接生成记录" align="center" prop="directCreateRecord" width="150px" />
-      <el-table-column label="操作" align="center" width="150px"  fixed="right">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['wms:purchaseclaim-request-main:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['wms:purchaseclaim-request-main:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <Table :columns="PurchaseclaimRequestMain.allSchemas.tableColumns" :data="tableObject.tableList"
+      :loading="tableObject.loading" :pagination="{
+        total: tableObject.total
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort">
+      <template #itemCode="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
+          <span>{{ row.itemCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+      </template>
+    </Table>
   </ContentWrap>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <PurchaseclaimRequestMainForm ref="formRef" @success="getList" />
+   <!-- 表单弹窗：添加/修改 -->
+    <BasicForm 
+      ref="formRef" 
+      @success="getList" 
+      :rules="PurchaseclaimRequestMainRules" 
+      :formAllSchemas="PurchaseclaimRequestMain.allSchemas" 
+      :apiUpdate="PurchaseclaimRequestMain.updateItempackaging"
+      :apiCreate="PurchaseclaimRequestMain.createItempackaging"
+      :isBusiness="false"
+    />
 </template>
 
 <script setup lang="ts">
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
-import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain/index.ts'
+import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain'
 import PurchaseclaimRequestMainForm from './PurchaseclaimRequestMainForm.vue'
+import { PurchaseclaimRequestMain, PurchaseclaimRequestMainRules } from '@/utils/disposition/tableColumns'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'PurchaseclaimRequestMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
-const loading = ref(true) // 列表的加载中
-const total = ref(0) // 列表的总页数
-const list = ref([]) // 列表的数据
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -325,17 +77,72 @@ const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
 /** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await PurchaseclaimRequestMainApi.getPurchaseclaimRequestMainPage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
+// const getList = async () => {
+//   loading.value = true
+//   try {
+//     const data = await PurchaseclaimRequestMainApi.getPurchaseclaimRequestMainPage(queryParams)
+//     list.value = data.list
+//     total.value = data.total
+//   } finally {
+//     loading.value = false
+//   }
+// }
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchaseclaimRequestMainApi.getPurchaseclaimRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:itempackaging:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:itempackaging:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:itempackaging:export' }), // 导出
+  // defaultButtons.defaultFilterBtn(), // 筛选
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  console.log(104, val)
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
   }
 }
 
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itempackaging:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackaging:delete' }), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await ItempackagingApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
@@ -364,7 +171,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 
 /** 导出按钮操作 */

src/views/wms/purchaseprice/index.vue

@@ -144,10 +144,6 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
-  console.log(145, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
@@ -206,7 +202,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await PurchasepriceApi.importTemplate()
 })
 </script>

src/views/wms/recordsetting/index.vue

@@ -180,7 +180,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await RecordsettingApi.importTemplate()
 })
 </script>

src/views/wms/requestsetting/index.vue

@@ -180,7 +180,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await RequestsettingApi.importTemplate()
 })
 </script>

src/views/wms/rule/index.vue

@@ -180,7 +180,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await RuleApi.importTemplate()
 })
 </script>

src/views/wms/saleprice/index.vue

@@ -70,12 +70,12 @@ const { t } = useI18n() // 国际化
 
 // 查询列表参数设置 
 const searchTableParams = ref([{
-  formField: 'customerCode',
+  formField: 'customercode',
   searchTableTitle: '客户信息',
   searchTableAllSchemas: Customer.allSchemas,
   searchTablePage: CustomerApi.getCustomerPage
 },{
-  formField: 'itemCode',
+  formField: 'itemcode',
   searchTableTitle: '物料信息',
   searchTableAllSchemas: ItemBasic.allSchemas,
   searchTablePage: ItembasicApi.getItembasicPage
@@ -144,10 +144,6 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
-  console.log(145, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
@@ -206,7 +202,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await SalepriceApi.importTemplate()
 })
 </script>

src/views/wms/shift/index.vue

@@ -177,7 +177,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await ShiftApi.importTemplate()
 })
 </script>

src/views/wms/supplier/index.vue

@@ -177,7 +177,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await SupplierApi.importTemplate()
 })
 </script>

src/views/wms/supplieritem/index.vue

@@ -48,7 +48,7 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Supplieritem.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/Supplieritem/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/supplieritem/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
@@ -156,10 +156,6 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
-  console.log(145, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
@@ -218,7 +214,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await SupplieritemApi.importTemplate()
 })
 </script>

src/views/wms/systemcalendar/index.vue

@@ -177,7 +177,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await SystemcalendarApi.importTemplate()
 })
 </script>

src/views/wms/team/index.vue

@@ -177,7 +177,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await TeamApi.importTemplate()
 })
 </script>

src/views/wms/transactiontype/index.vue

@@ -180,7 +180,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await TransactiontypeApi.importTemplate()
 })
 </script>

src/views/wms/warehouse/index.vue

@@ -176,7 +176,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await WarehouseApi.importTemplate()
 })
 </script>

src/views/wms/workshop/index.vue

@@ -176,7 +176,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await WorkshopApi.importTemplate()
 })
 </script>

src/views/wms/workstation/index.vue

@@ -155,10 +155,6 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
-  console.log(145, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
@@ -217,7 +213,8 @@ const importSuccess = () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await WorkstationApi.importTemplate()
 })
 </script>