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

README.md

@@ -7,6 +7,7 @@ form: {
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      hiddenFilterButton:true,//是否隐藏筛选按钮
       searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
       searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
       searchCondition: [{

src/api/mes/itemRequestDetail/index.ts

@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface ItemRequestDetailVO {
+  deleteTime: Date
+  id: number
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  requestBillNo: string
+  itemBasicCode: string
+  itemCounts: number
+  itemUom: string
+  siteId: number
+}
+
+// 查询叫料申请明细列表
+export const getItemRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/item-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/mes/item-request-detail/page`, params })
+  }
+}
+
+// 查询叫料申请明细详情
+export const getItemRequestDetail = async (id: number) => {
+  return await request.get({ url: `/mes/item-request-detail/get?id=` + id })
+}
+
+// 新增叫料申请明细
+export const createItemRequestDetail = async (data: ItemRequestDetailVO) => {
+  return await request.post({ url: `/mes/item-request-detail/create`, data })
+}
+
+// 修改叫料申请明细
+export const updateItemRequestDetail = async (data: ItemRequestDetailVO) => {
+  return await request.put({ url: `/mes/item-request-detail/update`, data })
+}
+
+// 删除叫料申请明细
+export const deleteItemRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/mes/item-request-detail/delete?id=` + id })
+}
+
+// 导出叫料申请明细 Excel
+export const exportItemRequestDetail = async (params) => {
+  return await request.download({ url: `/mes/item-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/item-request-detail/get-import-template' })
+}

src/api/mes/workScheduling/index.ts

@@ -48,3 +48,25 @@ export const exportWorkScheduling = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/mes/workScheduling/get-import-template' })
 }
+// 完工
+export const completeHandle = async (data) => {
+  return await request.post({ url: `/mes/workScheduling/completeHandle`, data })
+}
+//报工
+export const reportWorkByProcess = async (data) => {
+  return await request.post({ url: `/mes/work-scheduling-detail/reportWorkByProcess`, data })
+}
+//检查当前节点是否可以完工
+export const getNodePosition = async (params) => {
+  return await request.get({ url: `/mes/workScheduling/getNodePosition`, params })
+}
+//获取当前工序的员工列表
+export const getCurrentWorkerList = async (params) => {
+  return await request.get({ url: `/mes/workScheduling/getCurrentWorkerList`, params })
+}
+//获取当前工单的工序列表
+export const getProcessList = async (params) => {
+  return await request.get({ url: `/mes/workScheduling/getProcessList`, params })
+}
+
+

src/api/qms/inspectionJob/inspectionJobMain/index.ts

@@ -22,6 +22,11 @@ export const createInspectionJobMain = async (data) => {
   return await request.post({ url: `/qms/inspection-job-main/create`, data })
 }
 
+// 暂存检验任务
+export const stagingInspectionJobMain = async (data) => {
+  return await request.post({ url: `/qms/inspection-job-main/staging`, data })
+}
+
 // 修改检验任务
 export const updateInspectionJobMain = async (data) => {
   return await request.put({ url: `/qms/inspection-job-main/update`, data })
@@ -46,6 +51,7 @@ export const abandonInspectionJobMain = async (id) => {
 export const closeInspectionJobMain = async (id) => {
   return await request.put({ url: `/qms/inspection-job-main/close?id=` + id })
 }
+
 // 导出检验申请 Excel
 export const exportInspectionJobMain = async (params) => {
   return await request.download({ url: `/qms/inspection-job-main/export-excel`, params })

src/api/wms/invoicingcalendar/index.ts

@@ -0,0 +1,54 @@
+import request from '@/config/axios'
+
+export interface InvoicingcalendarVO {
+  id: number
+  beginDay: string
+  endDay: string
+  descriiption: string
+  available: string
+  remark: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询开票日历列表
+export const getInvoicingcalendarPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/invoicingcalendar/senior', data })
+  } else {
+    return await request.get({ url: `/wms/invoicingcalendar/page`, params })
+  }
+}
+
+// 查询开票日历详情
+export const getInvoicingcalendar = async (id: number) => {
+  return await request.get({ url: `/wms/invoicingcalendar/get?id=` + id })
+}
+
+// 新增开票日历
+export const createInvoicingcalendar = async (data: InvoicingcalendarVO) => {
+  return await request.post({ url: `/wms/invoicingcalendar/create`, data })
+}
+
+// 修改开票日历
+export const updateInvoicingcalendar = async (data: InvoicingcalendarVO) => {
+  return await request.put({ url: `/wms/invoicingcalendar/update`, data })
+}
+
+// 删除开票日历
+export const deleteInvoicingcalendar = async (id: number) => {
+  return await request.delete({ url: `/wms/invoicingcalendar/delete?id=` + id })
+}
+
+// 导出开票日历 Excel
+export const exportInvoicingcalendar = async (params) => {
+  return await request.download({ url: `/wms/invoicingcalendar/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/invoicingcalendar/get-import-template' })
+}

src/api/wms/productreceiptJobDetail/index.ts

@@ -53,6 +53,19 @@ export const getProductreceiptJobDetailPageAssemble = async (params) => {
   }
 }
 
+
+// 查询制品收货任务子列表
+export const getProductreceiptJobDetailPageScarp = async (params) => {
+  params.type = 'scrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-job-detail/page`, params })
+  }
+}
+
 // 查询制品收货任务子详情
 export const getProductreceiptJobDetail = async (id: number) => {
   return await request.get({ url: `/wms/productreceipt-job-detail/get?id=` + id })

src/api/wms/productreceiptRecordDetail/index.ts

@@ -58,6 +58,18 @@ export const getProductreceiptRecordDetailPageAssemble = async (params) => {
   }
 }
 
+// 查询制品收货记录子列表
+export const getProductreceiptRecordDetailPageScrap = async (params) => {
+  params.type = 'scrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-record-detail/page`, params })
+  }
+}
+
 // 查询制品收货记录子详情
 export const getProductreceiptRecordDetail = async (id: number) => {
   return await request.get({ url: `/wms/productreceipt-record-detail/get?id=` + id })

src/api/wms/productreceiptRequestDetail/index.ts

@@ -54,6 +54,18 @@ export const getProductreceiptRequestDetailPageAssemble = async (params) => {
   }
 }
 
+// 查询报废收货申请子列表
+export const getProductreceiptRequestDetailPageScrap = async (params) => {
+  params.type = 'scrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-request-detail/page`, params })
+  }
+}
+
 // 查询制品收货申请子详情
 export const getProductreceiptRequestDetail = async (id: number) => {
   return await request.get({ url: `/wms/productreceipt-request-detail/get?id=` + id })

src/api/wms/relegateRequest/index.ts

@@ -0,0 +1,73 @@
+import request from '@/config/axios'
+
+export interface RelegateRequestVO {
+  id: number
+  itemCode: string
+  downItemCode: string
+  businessType: string
+  uom: string
+  qty: number
+  fromBatch: string
+  fromPackingNumber: string
+  fromLocationCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  fromWarehouseCode: string
+  toPackingNumber: string
+  toBatch: string
+  toLocationCode: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  number: string
+  available: string
+  remark: string
+  departmentCode: string
+  siteId: number
+  extraProperties: string
+  status: string
+  concurrencyStamp: number
+  serialNumber: string
+  ruleUserId: number
+}
+
+// 查询物料降级信息列表
+export const getRelegateRequestPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/relegate-request/senior', data })
+  } else {
+    return await request.get({ url: `/wms/relegate-request/page`, params })
+  }
+}
+
+// 查询物料降级信息详情
+export const getRelegateRequest = async (id: number) => {
+  return await request.get({ url: `/wms/relegate-request/get?id=` + id })
+}
+
+// 新增物料降级信息
+export const createRelegateRequest = async (data: RelegateRequestVO) => {
+  return await request.post({ url: `/wms/relegate-request/create`, data })
+}
+
+// 修改物料降级信息
+export const updateRelegateRequest = async (data: RelegateRequestVO) => {
+  return await request.put({ url: `/wms/relegate-request/update`, data })
+}
+
+// 删除物料降级信息
+export const deleteRelegateRequest = async (id: number) => {
+  return await request.delete({ url: `/wms/relegate-request/delete?id=` + id })
+}
+
+// 导出物料降级信息 Excel
+export const exportRelegateRequest = async (params) => {
+  return await request.download({ url: `/wms/relegate-request/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/relegate-request/get-import-template' })
+}

src/api/wms/saleShipmentDetailRecord/index.ts

@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface SaleShipmentDetailRecordVO {
+  id: number
+  soNumber: string
+  soLine: string
+  fromOwnerCode: string
+  packingNumber: string
+  batch: string
+  inventoryStatus: string
+  fromLocationCode: string
+  masterId: number
+  number: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  remark: string
+  concurrencyStamp: string
+  siteId: number
+}
+
+// 查询销售发运记录子列表
+export const getSaleShipmentDetailRecordPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/sale-shipment-detail-record/senior', data })
+  } else {
+    return await request.get({ url: `/wms/sale-shipment-detail-record/page`, params })
+  }
+}
+
+// 查询销售发运记录子详情
+export const getSaleShipmentDetailRecord = async (id: number) => {
+  return await request.get({ url: `/wms/sale-shipment-detail-record/get?id=` + id })
+}
+
+// 新增销售发运记录子
+export const createSaleShipmentDetailRecord = async (data: SaleShipmentDetailRecordVO) => {
+  return await request.post({ url: `/wms/sale-shipment-detail-record/create`, data })
+}
+
+// 修改销售发运记录子
+export const updateSaleShipmentDetailRecord = async (data: SaleShipmentDetailRecordVO) => {
+  return await request.put({ url: `/wms/sale-shipment-detail-record/update`, data })
+}
+
+// 删除销售发运记录子
+export const deleteSaleShipmentDetailRecord = async (id: number) => {
+  return await request.delete({ url: `/wms/sale-shipment-detail-record/delete?id=` + id })
+}
+
+// 导出销售发运记录子 Excel
+export const exportSaleShipmentDetailRecord = async (params) => {
+  return await request.download({ url: `/wms/sale-shipment-detail-record/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/sale-shipment-detail-record/get-import-template' })
+}

src/api/wms/saleShipmentMain/index.ts

@@ -62,3 +62,33 @@ export const exportSaleShipmentMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/sale-shipment-main-request/get-import-template' })
 }
+
+// 关闭-销售发运申请
+export const closeSaleShipmentMain = async (id) => {
+  return await request.put({ url: `/wms/sale-shipment-main-request/close?id=` + id })
+}
+
+// 重新添加-销售发运申请
+export const reAddSaleShipmentMain = async (id) => {
+  return await request.put({ url: `/wms/sale-shipment-main-request/reAdd?id=` + id })
+}
+
+// 提交审批-销售发运申请
+export const submitSaleShipmentMain = async (id) => {
+  return await request.put({ url: `/wms/sale-shipment-main-request/submit?id=` + id })
+}
+
+// 审批驳回-销售发运申请
+export const refusedSaleShipmentMain = async (id) => {
+  return await request.put({ url: `/wms/sale-shipment-main-request/refused?id=` + id })
+}
+
+// 审批通过-销售发运申请
+export const agreeSaleShipmentMain = async (id) => {
+  return await request.put({ url: `/wms/sale-shipment-main-request/agree?id=` + id })
+}
+
+// 处理-销售发运申请
+export const handleSaleShipmentMain = async (id) => {
+  return await request.put({ url: `/wms/sale-shipment-main-request/handle?id=` + id })
+}

src/api/wms/saleShipmentMainRecord/index.ts

@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface SaleShipmentMainRecordVO {
+  id: number
+  requestNumber: string
+  customerCode: string
+  invoiceTime: Date
+  executeTime: Date
+  available: string
+  departmentCode: string
+  number: string
+  businessType: string
+  extraProperties: string
+  siteId: string
+}
+
+// 查询销售发运记录主列表
+export const getSaleShipmentMainRecordPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/sale-shipment-main-record/senior', data })
+  } else {
+    return await request.get({ url: `/wms/sale-shipment-main-record/page`, params })
+  }
+}
+
+// 查询销售发运记录主详情
+export const getSaleShipmentMainRecord = async (id: number) => {
+  return await request.get({ url: `/wms/sale-shipment-main-record/get?id=` + id })
+}
+
+// 新增销售发运记录主
+export const createSaleShipmentMainRecord = async (data: SaleShipmentMainRecordVO) => {
+  return await request.post({ url: `/wms/sale-shipment-main-record/create`, data })
+}
+
+// 修改销售发运记录主
+export const updateSaleShipmentMainRecord = async (data: SaleShipmentMainRecordVO) => {
+  return await request.put({ url: `/wms/sale-shipment-main-record/update`, data })
+}
+
+// 删除销售发运记录主
+export const deleteSaleShipmentMainRecord = async (id: number) => {
+  return await request.delete({ url: `/wms/sale-shipment-main-record/delete?id=` + id })
+}
+
+// 导出销售发运记录主 Excel
+export const exportSaleShipmentMainRecord = async (params) => {
+  return await request.download({ url: `/wms/sale-shipment-main-record/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/sale-shipment-main-record/get-import-template' })
+}

src/api/wms/supplierinvoiceRequestMain/index.ts

@@ -56,6 +56,12 @@ export const deleteSupplierinvoiceRequestMain = async (id: number) => {
   return await request.delete({ url: `/wms/supplierinvoice-request-main/delete?id=` + id })
 }
 
+// 校验控制是否可以开票逻辑
+export const checkInvoicingCalendar = async (params) => {
+  return await request.get({ url: `/wms/supplierinvoice-request-main/checkInvoicingCalendar`, params })
+}
+
+
 // 打开供应商发货申请主
 export const opeSupplierinvoiceRequestMain = async (id: number) => {
   return await request.post({ url: `/wms/supplierinvoice-request-main/open?id=` + id })
@@ -124,3 +130,9 @@ export const exportSupplierinvoiceRequestDetail = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplierinvoice-request-main/get-import-template' })
 }
+
+// 根据角色编码获取用户列表
+export const queryUserInfoByRoleCode = async (params) => {
+  return await request.get({ url: `/wms/supplierinvoice-request-main/queryUserInfoByRoleCodePage`, params })
+  
+}

src/components/Annex/src/Annex.vue

@@ -3,7 +3,7 @@
   <div class="annex">
     <div class="title flex items-center">
       <!-- <div class="title-txt">附件</div> -->
-      <UploadFile :isShowFile="false" :isShowTip="false" title="添加附件" :upData="upData" :limit="10"
+      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" title="添加附件" :upData="upData" :limit="10"
         @update:modelValue="handleAnnexSuccess" v-if="annexData.annexList.length<5"/>
     </div>
     <div class="list">
@@ -16,17 +16,20 @@
               <div>{{ item.size }}KB</div>
               <div>来自 {{ item.nickname }}</div>
             </div>
-            <Icon icon="ep:download" v-if="showDownload" class="cursor-pointer mr-2" size="18" @click="downFile(item)" />
+            <Icon icon="ep:picture" v-if="showPreview" class="cursor-pointer mr-2" :size="18" @click="preview(item)"/>
-            <Icon icon="ep:delete" class="cursor-pointer" v-if="!hiddenDelete" size="18" @click="deleteAnnex(item.id)" />
+            <Icon icon="ep:download" v-if="showDownload" class="cursor-pointer mr-2" :size="18" @click="downFile(item)" />
+            <Icon icon="ep:delete" class="cursor-pointer" v-if="!hiddenDelete" :size="18" @click="deleteAnnex(item.id)" />
           </div>
           <div class="time mt-6px ">{{ formatDate(item.createTime) }}</div>
         </div>
       </div>
     </div>
   </div>
+  <PreviewPDF ref="previewRef" />
 </template>
 
 <script lang="ts" setup>
+import PreviewPDF from '@/components/PreviewPDF/index.vue'
 import UploadFile from '@/components/UploadFile/src/UploadFile.vue'
 import { formatDate } from '@/utils/formatTime'
 import * as FileApi from '@/api/wms/file'
@@ -45,6 +48,17 @@ const props = defineProps({
     type: Object,
     required: true
   },
+  fileType:{
+    type:Array,
+    required: false,
+    default: () => {
+      return ['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg']
+    }
+  },
+  showPreview: {
+    type: Boolean,
+    required: false
+  },
   showDownload: {
     type: Boolean,
     required: false
@@ -55,7 +69,7 @@ const props = defineProps({
   },
 })
 // 子传父的时候需要先定义好emit这个方法
-const emit = defineEmits(['handleAnnexSuccess', 'deleteAnnexSuccess'])
+const emit = defineEmits(['handleAnnexSuccess', 'deleteAnnexSuccess','previewAnnexHandle'])
 // 添加附件
 const handleAnnexSuccess = () => {
   emit('handleAnnexSuccess')
@@ -75,6 +89,18 @@ const deleteAnnex = async (id) => {
 const downFile = (item)=>{
    window.open(import.meta.env.VITE_BASE_URL + '/admin-api/infra/file/0/get/' + item.path)
 }
+const previewRef = ref<InstanceType<typeof PreviewPDF>>()
+
+const preview = (item)=>{
+  console.log('preview==',item)
+  if(item.url.endsWith('.pdf')){
+    previewRef.value?.openPreview(item.url)
+  }else{
+    let imageArray = props.annexData.annexList.map(item=>item.url)
+    imageArray = imageArray.filter(item=>!item.endsWith('.pdf'))
+    previewRef.value?.openPreview(imageArray)
+  }
+}
 </script>
 
 

src/components/BasicForm/src/BasicForm.vue

@@ -15,6 +15,7 @@
       :schema="formSchema"
       :is-col="true"
       @opensearchTable="opensearchTable"
+      @hiddenFilterButton="hiddenSearchTableFilterButton"
       @clearSearchInput="clearSearchInput"
       @onChange="onChange"
       @onBlur="onBlur"
@@ -433,7 +434,9 @@ const opensearchTable = (
     searchDetailSchemas
   )
 }
-
+const hiddenSearchTableFilterButton = ()=>{
+  searchTableRef.value.hiddenFilterButton()
+}
 const clearSearchInput = (field)=>{
   emit('clearSearchInput',field)
 }

src/components/Detail/src/Detail.vue

@@ -103,6 +103,8 @@
             <ElScrollbar ref="scrollbar" :style="{height:annexItem.hasSubDetail?'100%':(remarkHeight-40)+'px'}">
               <Annex v-show="tabsList[current].label==annexItem.label"
                   :annexData="annexItem"
+                  :fileType="annexItem.fileType"
+                  :showPreview="annexItem.showPreview"
                   :showDownload = "annexItem.showDownload"
                   :hiddenDelete = "annexItem.hiddenDelete"
                   @handleAnnexSuccess="updateAnnexTableHandle"
@@ -223,6 +225,7 @@ const props = defineProps({
     default: ()=>({
       label: '附件',
       showDownload:false,
+      showPreview:false,
       hiddenDelete:false
     })
   },
@@ -460,10 +463,14 @@ const getFileList = async () => {
   }
 }
 // 获取其他附件列表篇
-const getAnnexFileList =  async (row:id) => {
+const getAnnexFileList =  async (row) => {
-  console.log('getAnnexFileList')
   props.annexTable?.forEach(async (item) => {
     let requstData = {...remarksData.data,tableName: item?.tableName} 
+    if(item?.queryParams){
+      item?.queryParams?.forEach(queryItem => {
+        requstData[queryItem.queryField] = row[queryItem.rowField]
+      });
+    }
     const annexList = await FileApi.getFileList(requstData)
     const annexData = annexTableData.value.find(annex=>annex.label === item.label)
     if(annexData){
@@ -476,6 +483,8 @@ const getAnnexFileList =  async (row:id) => {
         annexList,
         hasSubDetail:item.hasSubDetail||false,
         subDetailTableData:item.subDetailTableData,
+        fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'],
+        showPreview:item.showPreview||false, // 是否展示预览按钮
         showDownload:item.showDownload||false, // 是否展示下载按钮
         hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮
       })

src/components/Form/src/Form.vue

@@ -55,7 +55,7 @@ export default defineComponent({
     vLoading: propTypes.bool.def(false),
     labelPosition: propTypes.string.def('left'),
   },
-  emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter'],
+  emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter','hiddenFilterButton'],
   setup(props, { slots, expose, emit }) {
     // element form 实例
     const elFormRef = ref<ComponentRef<typeof ElForm>>()
@@ -173,8 +173,15 @@ export default defineComponent({
           // 如果是 Divider 组件，需要自己占用一行
           const isDivider = item.component === 'Divider'
           const Com = componentMap['Divider'] as ReturnType<typeof defineComponent>
+          let labelName = item?.label || '' 
+          if(item?.label){
+            labelName = t(`ts.${item?.label}`)
+            if(labelName === 'ts.' + item?.label){
+              labelName = item?.label
+            }
+          }
           return isDivider ? (
-            <Com {...{ contentPosition: 'left', ...item.componentProps }}>{item?.label}</Com>
+            <Com {...{ contentPosition: 'left', ...item.componentProps }}>{labelName}</Com>
           ) : isCol ? (
             // 如果需要栅格，需要包裹 ElCol
             <ElCol  {...setGridProp(item.colProps)}>{renderFormItem(item)}</ElCol>
@@ -218,13 +225,28 @@ export default defineComponent({
       const formItemSlots: Recordable = setFormItemSlots(slots, item.field)
       // 如果有 labelMessage，自动使用插槽渲染
       if (item?.labelMessage) {
+        let labelName = item.label || '' 
+        if(item.label){
+          labelName = t(`ts.${item.label}`)
+          if(labelName === 'ts.' + item.label){
+            labelName = item.label
+          }
+        }
+
+        let labelMessage = item.labelMessage || ''
+        if(item.labelMessage){
+          labelMessage = t(`ts.${item.labelMessage}`)
+          if(labelMessage === 'ts.' + item.labelMessage){
+            labelMessage = item.labelMessage
+          }
+        }
         formItemSlots.label = () => {
           return (
             <>
-              <span>{item.label}</span>
+              <span>{labelName}</span>
               <ElTooltip placement="right" raw-content>
                 {{
-                  content: () => <span v-dompurify-html={item.labelMessage}></span>,
+                  content: () => <span v-dompurify-html={labelMessage}></span>,
                   default: () => (
                     <Icon
                       icon="ep:warning"
@@ -244,12 +266,11 @@ export default defineComponent({
       const formItemSlotsSearchList: Recordable = setFormItemSlots(slots, item.field)
       if (item?.componentProps?.isSearchList) {
         if(item?.componentProps?.multiple){
-
           formItemSlotsSearchList[item.field] = () => {
           return (
             <>
               <ElTooltip placement="top"  content={formModel.value[item.field]} >
-                <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} disabled={item?.componentProps?.enterSearch?false:true} onKeyup={(event)=>{
+                <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={t(`ts.${item?.componentProps?.searchListPlaceholder}`).replace('ts.','') || ''} disabled={item?.componentProps?.enterSearch?false:true} onKeyup={(event)=>{
                   if(event.keyCode === 13){
                     //回车
                     emit('onEnter',item.field,formModel.value[item.field],event)
@@ -278,7 +299,14 @@ export default defineComponent({
                   item?.componentProps?.multiple,
                   item?.componentProps?.isConcatDetailSchemas,
                   item?.componentProps?.searchDetailSchemas,
-                )}}/>
+                )
+                
+                //隐藏筛选按钮
+                if(item?.componentProps?.hiddenFilterButton){
+                  emit('hiddenFilterButton')
+                }
+                
+                }}/>
               </>
             )
           }
@@ -286,7 +314,7 @@ export default defineComponent({
           formItemSlotsSearchList[item.field] = () => {
           return (
             <>
-              <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} onKeyup={(event)=>{
+              <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={t(`ts.${item?.componentProps?.searchListPlaceholder}`).replace('ts.','') || ''} onKeyup={(event)=>{
                   if(event.keyCode === 13){
                     //回车
                     emit('onEnter',item.field,formModel.value[item.field],event)
@@ -316,7 +344,12 @@ export default defineComponent({
                   item?.componentProps?.multiple,
                   item?.componentProps?.isConcatDetailSchemas,
                   item?.componentProps?.searchDetailSchemas,
-                )}}/>
+                )
+                //隐藏筛选按钮
+                if(item?.componentProps?.hiddenFilterButton){
+                  emit('hiddenFilterButton')
+                }
+                }}/>
               </>
             )
           }

src/components/Form/src/components/useRenderSelect.tsx

@@ -3,6 +3,7 @@ import { ComponentOptions } from '@/types/components'
 import { ElOption, ElOptionGroup } from 'element-plus'
 import { getSlot } from '@/utils/tsxHelper'
 import { Slots } from 'vue'
+const { t } = useI18n()
 
 export const useRenderSelect = (slots: Slots) => {
   // 渲染 select options
@@ -33,11 +34,16 @@ export const useRenderSelect = (slots: Slots) => {
     const valueAlias = item?.componentProps?.optionsAlias?.valueField
 
     const { label, value, ...other } = option
+    const zhName = labelAlias ? option[labelAlias] : label;//中文名称
+    let labelName = t(`ts.${zhName}`)
+    if(labelName === 'ts.' + zhName){
+      labelName = zhName
+    }
 
     return (
       <ElOption
         {...other}
-        label={labelAlias ? option[labelAlias] : label}
+        label={labelName}
         value={valueAlias ? option[valueAlias] : value}
       >
         {{

src/components/ImportForm/src/ImportForm.vue

@@ -1,6 +1,6 @@
 <!-- 导入组件 -->
 <template>
-  <Dialog v-model="dialogVisible" title="导入" width="600" :close-on-click-modal="false">
+  <Dialog v-model="dialogVisible" :title="t('ts.导入')" width="600" :close-on-click-modal="false">
     <el-upload
       ref="uploadRef"
       v-model:file-list="fileList"
@@ -30,29 +30,29 @@
       style="width: 300px; margin: 0 auto"
       v-loading="formLoading"
     >
-      <Icon icon="ep:upload-filled" color="#c0c4cc" size="60" />
+      <Icon icon="ep:upload-filled" color="#c0c4cc" :size="60" />
-      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      <div class="el-upload__text">{{t('ts.将文件拖到此处，或')}}<em>{{t('ts.点击上传')}}</em></div>
       <template #tip>
         <div class="el-upload__tip ml--126px mr--80px">
           <div class="flex">
             <div
               class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right"
               style="line-height: 32px"
-              >导入模式</div
+              >{{t('ts.导入模式')}}</div
             >
             <div class="">
               <div class="radio">
                 <el-radio-group v-model="mode">
-                  <el-radio :label="1" :disabled="updateIsDisable">更新</el-radio>
+                  <el-radio :label="1" :disabled="updateIsDisable">{{ t('ts.更新')}}</el-radio>
-                  <el-radio :label="2" :disabled="appendIsDisable">追加</el-radio>
+                  <el-radio :label="2" :disabled="appendIsDisable">{{ t('ts.追加') }}</el-radio>
-                  <el-radio :label="3" :disabled="coverIsDisable">覆盖</el-radio>
+                  <el-radio :label="3" :disabled="coverIsDisable">{{ t('ts.覆盖') }}</el-radio>
                 </el-radio-group>
               </div>
 
               <div class="tips color-#acaeb3 font-size-14px">
-                <div class="mt-2">更新：新增并修改</div>
+                <div class="mt-2">{{t('ts.更新：新增并修改')}}</div>
-                <div class="mt-2">追加：只新增，不修改</div>
+                <div class="mt-2">{{ t('ts.追加：只新增，不修改') }}</div>
-                <div class="mt-2">覆盖：只修改不新增</div>
+                <div class="mt-2">{{ t('ts.覆盖：只修改不新增') }}</div>
               </div>
             </div>
           </div>
@@ -60,15 +60,15 @@
             <div
               class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right"
               style="line-height: 32px"
-              >部分保存</div
+              >{{ t('ts.部分保存') }}</div
             >
             <div class="">
               <div class="switch">
                 <el-switch v-model="updatePart" />
               </div>
               <div class="tips color-#acaeb3 font-size-14px">
-                <div class="mt-2">部分保存：如存在错误数据，正确数据正常导入</div>
+                <div class="mt-2">{{ t('ts.部分保存：如存在错误数据，正确数据正常导入') }}</div>
-                <div class="mt-2">全部保存：全部数据正确，才能导入</div>
+                <div class="mt-2">{{ t('ts.全部保存：全部数据正确，才能导入') }}</div>
               </div>
             </div>
           </div>
@@ -92,11 +92,11 @@
         <div class="flex-1 text-left">
           <el-button type="primary" plain @click="importTemplate">
             <Icon icon="ep:download" />
-            下载模板
+            {{ t('ts.下载模板') }}
           </el-button>
         </div>
-        <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button :disabled="formLoading" type="primary" @click="submitForm">{{ t('ts.确 定') }}</el-button>
-        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button @click="dialogVisible = false">{{ t('ts.取 消') }}</el-button>
       </div>
     </template>
   </Dialog>
@@ -106,6 +106,7 @@ import { getAccessToken, getTenantId } from '@/utils/auth'
 import download from '@/utils/download'
 
 defineOptions({ name: 'ImportForm' })
+const { t } = useI18n()
 
 const message = useMessage() // 消息弹窗
 

src/components/PreviewPDF/index.vue

@@ -0,0 +1,60 @@
+<template>
+    <el-dialog class="preview" v-model="showDialog" style=""  @close="closeView">
+        <iframe v-if="isPDF" ref="pdfRef" width="100%" :height="frameHeight" :src="pdfUrl" frameborder="0"></iframe>
+        <el-carousel justify="center" v-else indicator-position="outside">
+            <el-carousel-item class="carousel-item" v-for="url in imageArray" :key="url">
+                    <el-image style="height:100%" fit="contain" :src="url" loading="lazy" />
+            </el-carousel-item>
+        </el-carousel>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue'
+const showDialog = ref(false) // 弹窗控制
+const message = useMessage() // 消息弹窗
+const isPDF = ref(false) // 是否是pdf
+const pdfUrl = ref<string>('') // pdf地址
+const pdfRef = ref() // pdf组件
+const frameHeight = ref(0)
+const imageArray = ref<string[]>([]) // 图片数组
+const closeView = () => {
+  showDialog.value = false
+}
+// 打开预览
+const openPreview = async (data:string[]|string)=>{
+    showDialog.value = true
+    if(Array.isArray(data)){
+        //图片数组
+        isPDF.value = false
+        pdfUrl.value = ''
+        imageArray.value = data.filter(item=>(item.replace('/get/','/show/')))
+    }else{
+        isPDF.value = true
+        pdfUrl.value = data.replace('/get/','/show/')
+        nextTick(()=>{
+            frameHeight.value = window.innerHeight - 2*pdfRef.value.getBoundingClientRect().top
+        })
+    }
+}
+
+defineExpose({openPreview})
+
+</script>
+
+<style>
+/* .preview .el-dialog__headerbtn .el-dialog__close{
+    color: white !important;
+    font-size: 20px !important;
+}
+.preview.el-dialog {
+    --el-dialog-box-shadow:null;
+} */
+</style>
+<style lang="scss" scoped>
+.carousel-item{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+</style>

src/components/SearchHigh/src/SearchHigh.vue

@@ -1,42 +1,42 @@
 <template>
   <!-- 高级筛选界面 -->
-  <Dialog title="筛选" v-model="popoverVisible" :width="'50%'" >
+  <Dialog :title="t('ts.筛选')" v-model="popoverVisible" :width="'50%'" >
     <el-form id="moreListElForm" size="default" labelWidth="0" :searchData="moreListData">
       <el-form-item v-for="(item, index) in moreListData.filters" :key="index" :prop="item.column" >
         <!-- 第一列 label-->
         <div class="rowInnerItem">
-          <el-select v-model="item.column" placeholder="请选择筛选对象" :disabled="item.hide" :filterable="true" @change="resetSelect(item)" >
+          <el-select v-model="item.column" :placeholder="t('ts.请选择筛选对象')" :disabled="item.hide" :filterable="true" @change="resetSelect(item)" >
-            <el-option v-for="(item, index) in searchOption_high" :key="index" :label="item.label" :value="item.field" />
+            <el-option v-for="(item, index) in searchOption_high" :key="index" :label="t(`ts.${item.label}`).replace('ts.','')" :value="item.field" />
           </el-select>
         </div>
         <!-- 第二列 条件-->
         <div class="rowInnerItem">
-          <el-select v-model="item.action" placeholder="请选择条件" :disabled="item.column == '' || item.hide ? true : false" @change="actionSelect(item)" >
+          <el-select v-model="item.action" :placeholder="t('ts.请选择条件')" :disabled="item.column == '' || item.hide ? true : false" @change="actionSelect(item)" >
-            <el-option v-for="item in formatMoreListActions(item) " :key="item.value" :label="item.label"
+            <el-option v-for="item in formatMoreListActions(item) " :key="item.value" :label="t(`ts.${item.label}`).replace('ts.','')"
               :value="item.value" />
           </el-select>
         </div>
         <!-- 第三列 值 -->
         <div class="rowInnerItem1">
           <!-- 输入框 -->
-          <el-input v-if="getInputType(item.column) == 'input'" v-model="item.value" placeholder="请输入内容" clearable :disabled="item.disabled"/>
+          <el-input v-if="getInputType(item.column) == 'input'" v-model="item.value" :placeholder="t('ts.请输入内容')" clearable :disabled="item.disabled"/>
           <!-- 数字输入框 -->
           <el-input-number v-else-if="getInputType(item.column) == 'inputNumber'" v-model="item.value" :precision="getInputPrecision(item.column)"  :disabled="item.disabled"/>
           <!-- 下拉框 -->
-          <el-select v-else-if="getInputType(item.column) == 'select'" v-model="item.value1" placeholder="请选择内容" :filterable="true" clearable :disabled="item.disabled" :multiple="item.action=='in' || item.action=='notIn' ? true : false" collapse-tags collapse-tags-tooltip :key="item.action">
+          <el-select v-else-if="getInputType(item.column) == 'select'" v-model="item.value1" :placeholder="t('ts.请选择内容')" :filterable="true" clearable :disabled="item.disabled" :multiple="item.action=='in' || item.action=='notIn' ? true : false" collapse-tags collapse-tags-tooltip :key="item.action">
-            <el-option v-for="dict in initSelectOptions(item.column)" :key="dict.value" :label="dict.label"
+            <el-option v-for="dict in initSelectOptions(item.column)" :key="dict.value" :label="t(`ts.${dict.label}`).replace('ts.','')"
             :value="dict.value" />
             <!-- <el-option v-for="(op, index) in initSelectOptions(item.column)" :label="op[item.optionsLabel] || op.label"
               :value="op[item.optionsValue] || op.value" :key="index" /> -->
           </el-select>
           <!-- 时间 -->
-          <el-time-picker v-else-if="getInputType(item.column) == 'time'" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" v-model="item.value1"  style="width:  calc(100% - 20px);margin-right: 10px;" :disabled="item.disabled"/>
+          <el-time-picker v-else-if="getInputType(item.column) == 'time'" range-separator="-" :start-placeholder="t('ts.开始时间')" :end-placeholder="t('ts.结束时间')" v-model="item.value1"  style="width:  calc(100% - 20px);margin-right: 10px;" :disabled="item.disabled"/>
           <!-- 日期 -->
           <el-date-picker v-else-if="getInputType(item.column) == 'date'" v-model="item.value1" type="daterange"
-           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" style="width:  calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item,'daterange')" value-format="YYYY-MM-DD"  format="YYYY/MM/DD" :disabled="item.disabled"/>
+           range-separator="-" :start-placeholder="t('ts.开始日期')" :end-placeholder="t('ts.结束日期')" style="width:  calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item,'daterange')" value-format="YYYY-MM-DD"  format="YYYY/MM/DD" :disabled="item.disabled"/>
           <!-- 日期时间 -->
           <el-date-picker v-else-if="getInputType(item.column) == 'datePicker'" v-model="item.value1" type="datetimerange"
-            range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间"  style="width: calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item, 'datetimerange')" value-format="x"  format="YYYY/MM/DD HH:mm:ss" :disabled="item.disabled"/>
+            range-separator="-" :start-placeholder="t('ts.开始时间')" :end-placeholder="t('ts.结束时间')"  style="width: calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item, 'datetimerange')" value-format="x"  format="YYYY/MM/DD HH:mm:ss" :disabled="item.disabled"/>
         </div>
         <!-- 删除条件按钮 -->
         <el-button type="danger" :icon="Minus" circle size="small"
@@ -45,7 +45,7 @@
     </el-form>
     <!-- 添加筛选条件 -->
     <div class="moreListPush-btn">
-      <span @click="moreListPush">+ 添加筛选条件</span>
+      <span @click="moreListPush">+ {{ t('ts.添加筛选条件') }}</span>
     </div>
     <!-- 按钮 -->
     <div class="moreListBaseBts" >
@@ -57,6 +57,7 @@
 import { Minus } from '@element-plus/icons-vue'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+const { t } = useI18n()
 
 const props = defineProps({
   // 主组件name值
@@ -92,46 +93,46 @@ const moreListOptions = ref({
   action: [
     {
       value: '==',
-      label: '等于'
+      label: t('ts.等于')
     }, {
       value: '!=',
-      label: '不等于'
+      label: t('ts.不等于')
     }, {
       value: '>',
-      label: '大于'
+      label: t('ts.大于')
     }, {
       value: '<',
-      label: '小于'
+      label: t('ts.小于')
     }, {
       value: '>=',
-      label: '大于等于'
+      label: t('ts.大于等于')
     }, {
       value: '<=',
-      label: '小于等于'
+      label: t('ts.小于等于')
     }, {
       value: 'like',
-      label: '模糊'
+      label: t('ts.模糊')
     }, {
       value: 'in',
-      label: '包含'
+      label: t('ts.包含')
     }, {
       value: 'notIn',
-      label: '不包含'
+      label: t('ts.不包含')
     }, {
       value: 'betweeen',
-      label: '区间'
+      label: t('ts.区间')
     }, {
       value: 'isNull',
-      label: '是空'
+      label: t('ts.是空')
     }, {
       value: 'isNotNull',
-      label: '不是空'
+      label: t('ts.不是空')
     }, {
       value: 'isStr',
-      label: '是空字符串'
+      label: t('ts.是空字符串')
     }, {
       value: 'isNotStr',
-      label: '不是空字符串'
+      label: t('ts.不是空字符串')
     }
   ]
 })
@@ -178,9 +179,9 @@ const formatMoreListActions = (val) => {
 // 高级筛选列表-删除筛选条件行
 const moreListDelete = (val,item,$event) => {
   if (moreListData.value.filters.length == 1) {
-    message.warning('必须保留一条筛选条件!')
+    message.warning(t('ts.必须保留一条筛选条件!'))
   } else {
-    message.confirm('您确定删除吗, 是否继续?').then(() => {
+    message.confirm(t('ts.您确定删除吗, 是否继续?')).then(() => {
       moreListData.value.filters.splice(val, 1)
     })    
   }

src/components/SearchTable/src/SearchTable.vue

@@ -38,7 +38,7 @@
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-// const { t } = useI18n() // 国际化
+const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const route = useRoute() // 路由信息
@@ -50,9 +50,9 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 
 // 列表头部按钮
-const HeadButttondata = [
+const HeadButttondata = ref([
   defaultButtons.defaultFilterBtn(null), // 筛选
-]
+])
 
 /** 打开弹窗 */
 const getListRef = ref()
@@ -70,7 +70,10 @@ const multipleBol = ref(false)
 const searchConditionRef = ref()
 
 const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => {
-  dialogTitle.value = titleName
+  HeadButttondata.value = [
+    defaultButtons.defaultFilterBtn(null), // 筛选
+  ]
+  dialogTitle.value = t(`ts.${titleName}`).replace('ts.','')
   tableObjectRef.value = tableObject
   searchDialogVisible.value = true
   multipleBol.value = multiple
@@ -79,6 +82,10 @@ const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any
   tableColumns.value = allSchemas.tableColumns
 }
 const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isConcatDetailSchemas=false,detailSchemas: any) => {
+  HeadButttondata.value = [
+    defaultButtons.defaultFilterBtn(null), // 筛选
+  ] 
+
   searchDialogVisible.value = true
   formFieldRef.value = formField
   searchFieldRef.value = searchField
@@ -96,7 +103,8 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   rowRef.value = row
   multipleBol.value = multiple
   // dialogTitle.value = t('action.' + type)
-  dialogTitle.value = titleName
+  dialogTitle.value = t(`ts.${titleName}`).replace('ts.','')
+
   const {tableObject, tableMethods } = useTable({
     getListApi: getPage.value // 分页接口
   })
@@ -112,6 +120,10 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   getList()
 }
 
+const hiddenFilterButton = ()=>{
+  HeadButttondata.value = []
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   console.log(99, rowRef.value)
@@ -153,7 +165,7 @@ const searchFormClick = (searchData) => {
   getListRef.value() // 刷新当前列表
 }
 
-defineExpose({ open,openData }) // 提供 open 方法，用于打开弹窗
+defineExpose({ open,openData,hiddenFilterButton }) // 提供 open 方法，用于打开弹窗
 
 // Table 组件 ref
 const searchTableRef = ref()

src/components/TableForm/src/TableForm.vue

@@ -19,7 +19,7 @@
         v-if="isShowReduceButton" 
         v-slot="{ row, $index }"
       >
-        <Icon icon="ep:remove" color="#757575" size="26" style="cursor: pointer;margin-top: -16px;" @click="handleDeleteTable (row, $index)" />
+        <Icon icon="ep:remove" color="#757575" :size="26" style="cursor: pointer;margin-top: -16px;" @click="handleDeleteTable (row, $index)" />
       </el-table-column>
       <!-- 多选 -->
       <el-table-column 
@@ -33,7 +33,7 @@
       <el-table-column 
         type="index" 
         fixed="left" 
-        label="序号" 
+        :label="t(`ts.序号`)" 
         width="80" 
         :align="'center'" 
         v-if="isShowIndex" 
@@ -43,7 +43,7 @@
         v-for="(headerItem) in tableFields" 
         :key="headerItem"
         :fixed="headerItem.tableForm?.fixed" 
-        :label="headerItem.label" :prop="headerItem.field"
+        :label="t(`ts.${headerItem.label}`).replace('ts.','')" :prop="headerItem.field"
         :align="headerItem?.tableForm?.align || 'center'" 
         :sortable="headerItem?.tableForm?.sortable || false"
         :width="headerItem?.tableForm?.width || '200px'" 
@@ -122,7 +122,7 @@
               @blur="tableFormSelectOnBlur(headerItem.field, $event,row, $index)">
               <el-option 
                 v-for="op in initSelectOptions(headerItem)" 
-                :label="op.label" 
+                :label="t(`ts.${op.label}`).replace('ts.','')" 
                 :value="op.value"
                 :key="op.value" />
             </el-select>
@@ -149,12 +149,12 @@
                <el-option-group
                   v-for="group in initSelectOptions(headerItem)"
                   :key="group.type"
-                  :label="group.name"
+                  :label="t(`ts.${group.name}`).replace('ts.','')"
                 >
                   <el-option
                     v-for="item in group.options"
                     :key="item.value"
-                    :label="item.label"
+                    :label="t(`ts.${item.label}`).replace('ts.','')"
                     :value="item.value"
                   />
                 </el-option-group>
@@ -250,7 +250,7 @@
               <el-radio 
                 v-for="(item, index) in initSelectOptions(headerItem)" 
                 :key="index" 
-                :label="item.value"
+                :label="t(`ts.${item.value}`).replace('ts.','')"
                 :size="headerItem?.tableForm?.size" 
                 :disabled="itemIsDisabled(headerItem, row)"
                 :border="headerItem?.tableForm?.border">
@@ -273,10 +273,10 @@
               <el-checkbox 
                 v-for="(item, index) in initSelectOptions(headerItem)" 
                 :key="index" 
-                :label="item.value"
+                :label="t(`ts.${item.value}`).replace('ts.','')"
                 :disabled="itemIsDisabled(headerItem, row)" 
-                :true-label="headerItem?.tableForm?.trueLabel"
+                :true-label="t(`ts.${headerItem?.tableForm?.trueLabel}`).replace('ts.','')"
-                :false-label="headerItem?.tableForm?.falseLabel" 
+                :false-label="t(`ts.${headerItem?.tableForm?.falseLabel}`).replace('ts.','')" 
                 :border="headerItem?.tableForm?.border"
                 :size="headerItem?.tableForm?.size" 
                 :name="headerItem?.tableForm?.name"
@@ -310,6 +310,7 @@
 </template>
 
 <script lang="ts" setup>
+const { t } = useI18n() // 国际化
 import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
 const props = defineProps({
   // 是否显示添加按钮

src/components/UploadFile/src/UploadFile.vue

@@ -56,7 +56,7 @@ const props = defineProps({
   title: propTypes.string.def('文件上传'),
   updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
   upData: propTypes.object.def(),
-  fileType: propTypes.array.def(['apk','doc', 'xls', 'ppt', 'txt', 'pdf', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg']
+  fileType: propTypes.array.def(['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg']
   fileSize: propTypes.number.def(5), // 大小限制(MB)
   limit: propTypes.number.def(5), // 数量限制
   autoUpload: propTypes.bool.def(true), // 自动上传

src/components/rowDrop/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- <Dialog title="字段设置"  width="270" v-model="popoverVisible" :scroll="true" :maxHeight="500"> -->
     <div class="test_wrapper" @dragover="dragover($event)">
-      <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handlecheckallchange">全部</el-checkbox>
+      <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handlecheckallchange">{{  t('ts.全部') }}</el-checkbox>
       <el-checkbox-group v-model="checkedDataList" @change="handlecheckedchange">
         <draggable :list="allData" :force-fallback="true" chosen-class="chosen" animation="300" @end="dragend" @update="dragenter" >
           <template #item="{element}">
@@ -12,8 +12,8 @@
     </div>
     <div class="footer">
     <!-- <template #footer> -->
-      <el-button size="small" @click="reset">重置</el-button>
+      <el-button size="small" @click="reset">{{ t('ts.重置') }} </el-button>
-      <el-button size="small" @click="closeRowDrop">关闭</el-button>
+      <el-button size="small" @click="closeRowDrop"> {{ t('ts.关闭') }}</el-button>
     <!-- </template> -->
   </div>
   <!-- </Dialog> -->
@@ -25,6 +25,7 @@ import draggable from "vuedraggable";
 
 defineOptions({ name: 'RowDrop' })
 
+const { t } = useI18n()
 
 const props = defineProps({
   allSchemas: {
@@ -58,9 +59,9 @@ const handlecheckedchange = (value: string[]) => {
 }
 
 const reset = () => {
-  ElMessageBox.confirm('重置后，字段设置将恢复初始设置，是否继续?', '提示', {
+  ElMessageBox.confirm(t('ts.重置后，字段设置将恢复初始设置，是否继续?'), t('ts.提示'), {
-    confirmButtonText: '确定',
+    confirmButtonText: t('ts.确定'),
-    cancelButtonText: '取消',
+    cancelButtonText: t('ts.取消'),
     type: 'warning'
   }).then(() => {
     RedisApi.deleteRedis(routeName.value).then(() => {
@@ -148,10 +149,11 @@ const initSelectSta = () => {
           if (item.field != 'action') {
             checkedDataList.value.push(item.label)
             _showTableColumns.push(_myTableColumns.find(myItem => (myItem.label == item.label)))
-            allData.value.push(item.label)
+            allData.value.push(t(`ts.${item.label}`))
           }
         }
       })
+
       // 字段设置 显示全部字段
       _myTableColumns?.forEach((myTableItem, index) => {
         // 列表字段第一个不能参与排序及显隐操作（详情弹窗必备）
@@ -159,7 +161,7 @@ const initSelectSta = () => {
         if (!myTableItem.fixed) {
           if (myTableItem.field != 'action') {
             if (allData.value.indexOf(myTableItem.label) == -1) {
-              allData.value.push(myTableItem.label)
+              allData.value.push(t(`ts.${myTableItem.label}`))
             }
           }
         }
@@ -189,7 +191,7 @@ const initSelectSta = () => {
         if (!item.fixed) {
           if (item.field != 'action') {
             checkedDataList.value.push(item.label)
-            allData.value.push(item.label)
+            allData.value.push(t(`ts.${item.label}`))
           }
         }
       })

src/layout/components/Breadcrumb/src/Breadcrumb.vue

@@ -54,10 +54,10 @@ export default defineComponent({
             {meta?.icon && breadcrumbIcon.value ? (
               <>
                 <Icon icon={meta.icon} class="mr-[2px]" svgClass="inline-block"></Icon>
-                {t(v?.meta?.title)}
+                {t(`ts.${v?.meta?.title}`).replace('ts.','')}
               </>
             ) : (
-              t(v?.meta?.title)
+              t(`ts.${v?.meta?.title}`).replace('ts.','')
             )}
           </ElBreadcrumbItem>
         )

src/layout/components/Menu/src/components/useRenderMenuTitle.tsx

@@ -9,10 +9,10 @@ export const useRenderMenuTitle = () => {
     return icon ? (
       <>
         <Icon icon={meta.icon}></Icon>
-        <span class="v-menu__title">{t(title as string)}</span>
+        <span class="v-menu__title">{t(`ts.${title}` as string).replace('ts.','')}</span>
       </>
     ) : (
-      <span class="v-menu__title">{t(title as string)}</span>
+      <span class="v-menu__title">{t(`ts.${title}` as string).replace('ts.','')}</span>
     )
   }
 

src/layout/components/TagsView/src/TagsView.vue

@@ -367,7 +367,7 @@ watch(
                     :size="12"
                     class="mr-5px"
                   />
-                  {{ t(item?.meta?.title as string) }}
+                  {{ t(`ts.${item?.meta?.title}` as string).replace('ts.','') }}
                   <Icon
                     :class="`${prefixCls}__item--close`"
                     color="#333"

src/locales/en-US.ts

@@ -611,6 +611,11 @@ export default {
     code:'Code',
     name:'Name',
   },
+ 
+ 
+ 
+ 
+ 
   ts: {
     代码:'Code',
     全部:'All',
@@ -628,14 +633,14 @@ export default {
     单据号:'Document Number',
     订单类型:'Order Type',
     状态:'State',
-    采购订单号:'Purchase Order Number',
+    采购订单号:'Purchase order number',
     日程:'Schedule',
-    离散:'Discrete',
+    离散:'Disperse',
     准备:'Get ready',
     发布:'Punblish',
     关闭:'Close',
     已完成:'Finished',
-    发货单号:'Invoice number',
+    发货单号:'Shipment tracking number',
     从批次:'Source Batch',
     到批次:'Destination Batch',
     从包装号:'Source Package Number',
@@ -653,11 +658,12 @@ export default {
     联系人邮件:'Contact Email',
     银行:'Bank',
     币种:'Currency Kind',
-    税率:'Tax rate',
+    税率:'Tax Rate',
+    '税率(%)':'Tax Rate(%)',
     生效时间:'Effective Time',
     失效时间:'Expiration Time',
     供应商物料代码:'Supplier material code',
-    供应商计量单位:'Supplier measuring Unit',
+    供应商计量单位:'Supplier measuring unit',
     转换率:'Conversion Rate',
     默认收货库位:'Default receiving warehouse location',
     创建人:'Creater',
@@ -684,10 +690,10 @@ export default {
     最后更新时间:'Last update time',
     最后更新者:'Last Updater',
     要货计划:'Demand plan',
-    申请单号:'Request number',
+    申请单号:'Application Number',
     从仓库代码:'Code from the repository',
-    到仓库代码:'to the repository code',
+    到仓库代码:'Destination Warehouse Code',
-    到月台代码:'to the dock code',
+    到月台代码:'Destination dock code',
     时间窗口:'Time window',
     计划到货时间:'Scheduled arrival time',
     承运商:'Carriers',
@@ -696,19 +702,19 @@ export default {
     出库事务类型:'The type of outbound transaction',
     入库事务类型:'Inbound transaction type',
     执行时间:'Execution time',
-    申请时间:'Application timeline',
+    申请时间:'Application Time',
     截止时间:'Deadline',
     部门:'department',
     接口类型:'Interface type',
-    包装号:'Package number',
+    包装号:'Package Number',
-    订单号:'Order number',
+    订单号:'Order Number',
     订单数量:'Order quantity',
-    数量:'quantity',
+    数量:'Quantity',
     包装数量:'Packing quantity',
     供应商计量数量:'The quantity measured by the supplier',
-    供应商:'vendor',
+    供应商:'Supplier',
-    从库位代码:'From the location code',
+    从库位代码:'Source Location Area Code',
-    到库位代码:'to the location code',
+    到库位代码:'Destination Location Area Code',
     从库位组代码:'From the bin location group code',
     到库位组代码:'to the bin location group code',
     从库区代码:'Code from the depot',
@@ -719,10 +725,10 @@ export default {
     包装规格:'Packing specifications',
     单据打印:'Document printing',
     明细列表:'Itemized list',
-    暂无数据:'No data yet',
+    暂无数据:'No Data',
     供应商发货申请:'supplier Shipping Request',
     查询字段:'Query Field',
-    供应商批次:'Measuring UnitSupplier batchDate of production',
+    供应商批次:'Supplier Batch',
     生产日期:'Production Date',
     发货数量:'Number of shipments',
     主数据:'Primary data',
@@ -733,75 +739,64 @@ export default {
     供应商发货仓库代码:'Supplier shipments Repository code',
     运输方式车牌号:'Shipping method License plate number',
     自动提交:'Auto-submit',
-    自动通过:'Automatically passed',
+    自动通过:'Auto-execute',
     自动执行:'Automated',
     直接生成记录:'Generate records directly',
     明细:'Details',
     批次:'Batch',
-    生产日期:'Date of manufacture',
     到货日期:'Arrival date',
     过期日期:'Expiration date',
-    供应商计量单位 :'Supplier unit of measure',
-    转换率:'Conversion rate',
     物料名称:'Material Name',
     物料描述1:'Material Description1',
     物料描述2:'Material Description2',
     项目代码:'Item Code',
     质检明细:'Quality inspection details',
     添加附件:'Add Attachment',
-    请输入备注:'Please enter a comment',
+    变更记录:'Change Record',
-    变更记录:'Changelog',
+    添加明细:'Add Detail',
-    添加明细:'Add details',
     上传质量报告:'Upload quality report',
     上传质检报告:'Upload the quality inspection report',
-    供应商批次:'Supplier lots',
     个:'piece',
     张:'sheet',
-    克:'gram',
+    克:'g',
     公斤:'kg',
-    吨:'ton',
+    吨:'t',
-    米:'rice',
+    米:'m',
-    平方米:'square metre',
+    平方米:'㎡',
-    生成标签:'Generate labels',
+    生成标签:'Generate label',
-    创建标签:'Create a label',
+    创建标签:'Create label',
     包装规格1:'Packing Specification1',
     包装规格2:'Package Specification2',
     包装数量1:'Package Quantity1',
     包装数量2:'Package Quantity2',
     物品包装信息:'Item packaging information',
-    系统提示:'System prompts',
+    系统提示:'System Prompt',
     是否为此数据生成标签:'Do you generate labels for this data?',
     是否处理所选中数据:'Do you process the selected data?',
     发货:'shipments',
-    包装号:'Package number',
     标签信息:'Label information',
-    采购收货记录:'Purchase receipt records',
+    采购收货记录:'Purchase receipt record',
-    表单数据:'Form data',
+    表单数据:'Form Data',
-    任务单号:'Task ticket number',
+    任务单号:'Task order number',
     ERP单据号:'ERP document number',
     检验申请单号:'Inspection requisition number',
-    采购订单号:'Purchase order number',
+    数据来源:'Data Source',
-    物料名称:'The name of the item',
+    从库区类型范围:'Source Location Type Range',
-    数据来源:'Data source',
+    到库区类型范围:'Destination Location Type Range',
-    从库区类型范围:'From the range of reservoir types',
+    从库区代码范围:'Source Location Area Code Range',
-    到库区类型范围:'to the depot type range',
+    到库区代码范围:'Destination Location Area Code Range',
-    从库区代码范围:'From the range of depot codes',
-    到库区代码范围:'to the range of codes in the reservoir',
     生效日期:'Effective Date',
-    收货明细:'Receipt details',
+    收货明细:'Receipt Detail',
-    缺货明细:'Out-of-stock details',
+    缺货明细:'Stockout Detail',
-    行类型:'Row type',
+    行类型:'Row Type',
-    收货数量:'The quantity received',
+    收货数量:'Quantity Received',
-    到批次:'to the batch',
+    库存状态:'Inventory Status',
-    从包装号:'From the package number',
+    从库位组:'Source Location Group',
-    到包装号:'to the package number',
+    到库位组:'Destination Location Group',
-    库存状态:'Inventory status',
+    从库区:'Source Location Area',
-    从库位组:'From the bin location group',
+    到库区:'Destination Location Area',
-    到库位组:'to the bin location group',
+    从货主:'Source Shipper',
-    从库区:'From the reservoir area',
+    到货主:'Destination Shipper',
-    到库区:'to the reservoir area',
-    从货主:'from the owner of the goods',
-    到货主:'to the owner of the goods',
     采购退货记录:'Purchase return records',
     采购收货记录单号:'Purchase receipt record number',
     qad采购退货记录单号:'QAD purchase return record number',
@@ -809,8 +804,56 @@ export default {
     原因:'Cause',
     退货数量:'Number of returns',
     单位:'unit',
-    金额:'amount',
+    金额:'Amount',
     客户代码:'Customer Code',
+    供应商发票申请:'Supplier invoice request',
+    供应商名称:'Supplier Name',
+    税额:'Tax',
+    税后金额:'After-tax Amount',
+    折扣金额:'Discount Amount',
+    调整税额:'Adjusted Tax',
+    总差额:'Under Coverage',
+    金税票号:'Gold tax ticket number',
+    发票日期:'Invoice Date',
+    过账日期:'Posting Date',
+    财务审批人:'Financial Approver',
+    单据类型:'Document Type',
+    合同价格:'Contract Price',
+    采购价格:'Orocurement Price',
+    未税差额:'Untaxed Difference',
+    含税差额:'Difference including tax',
+    可开票数量:'Number of tickets available',
+    采购审批人:'Procurement Approver',
+    采购审批时间:'Purchase approval time',
+    财务审批时间:'Financial approval time',
+    供应商发票记录:'Supplier invoice record',
+    发票号:'Invoice Number',
+    价税合计:'Total price with tax',
+    价差:'Margin',
+    索赔金额:'Claim Amount',
+    发票时间:'Invoice Time',
+    差额:'Difference',
+    收货日期:'Date of taking the delivery',
+    开票数量:'Invoice Quantity',
+    财务审批用户名:'Financial approval user name',
+    物流审核:'Logistics Audit',
+    供应商送货日期:'Supplier delivery date',
+    物流收货日期:'Supplier receiving date',
+    物流单据号:'Logistics document number',
+    零件号:'Part Number',
+    供应商用户关联管理:'Supplier user association management',
+    用户ID:'User ID',
+    用户账号:'User Account',
+    用户昵称:'User Nickname',
+    订单:'Order',
+    计划:'Plan',
+    申请:'Request',
+    任务:'Job',
+    记录:'Record',
+    编号:'Number',
+    库位代码:'Location Code',
+    库位组代码:'Location  Group Code',
+    库区代码:'Location Area Code',
     查询:'Query',
     重置:'Reset',
     新增:'Add',
@@ -820,45 +863,206 @@ export default {
     筛选:'Filter',
     设置:'Settings',
     确定:'Confirm',
+    '确 定':'Confirm',
     取消:'Cancel',
+    '取 消':'Cancel',
     编辑:'Edit',
     删除:'Delete',
     添加筛选条件:'Add Filter',
+    前往:'Go to',
+    页:'Page',
+    共:'Total',
     打开:'Open',
     保存:'Save',
-    //--------
+    请选择筛选对象:'Please select filter',
-    // 单据打印:'Document Print',
+    请输入内容:'Please inputr content',
-    // 上传质量报告:'Upload Quality Report',
+    附件:'Attachment',
-    // 打印标签:'Print Label',
+    '更新：新增并修改':'Update：Add and modify',
-    // 发货:'Delivery',
+    '追加：只新增，不修改':'Add：Add，no modify',
-    // 生成标签:'Generate Label',
+    '覆盖：只修改不新增':'Cover：Modify，not add',
-    // 发送到货检验申请:'Send Arrival Inspection Application',
+    下载模板:'Download Template',
-    // 生成采购上架申请:'Generate Purchase Putaway Application',
+    更新:'Update',
-    // 生成生产计划单:'Generate Production Plan',
+    追加:'Add',
-    // 提交审批:'Submit Approval',
+    覆盖:'Cover',
-    // 审核通过:'Approve',
+    部分保存:'Save Partial',
-    // 作废:'Invalid',
+    '部分保存：如存在错误数据，正确数据正常导入':'Save Partial ：If incorrect data exists, correct data can be imported',
-    //--------
+    '全部保存：全部数据正确，才能导入':'Save All：Import only when all data is correct',
-    // 生成采购收货申请:'Generate Purchase Receiving Application',
+    '将文件拖到此处，或点击上传':'Drag the file here, or click Upload',
-    // 生成采购退货申请:'Generate Purchase Return Application',
+    '将文件拖到此处，或':'Drag the file here, or',
-    // 生成生产收货申请:'Generate Production Receiving Application',
+    '点击上传':' click Upload',
-    // 生成生产退货申请:'Generate Production Return Application',
+    '是否确认导出数据项？':'Are you sure to export data items?',
-    // 生成生产计划:'Generate Production Plan',
+    '请选择一条数据！':'Please select a piece of data!',
-    // 上传:'Upload',
+    等于:'Equal to',
-    // 打印:'Print',
+    不等于:'Not Equal to',
-    // 打印预览:'Print Preview',
+    大于:'Greater than',
-    // 打印设置:'Print Settings',
+    小于:'Less than',
-    // 打印预览设置:'Print Preview
+    大于等于:'Greater than or equal to',
-    // 上传图片:'Upload Image',
+    小于等于:'Less than or equal to',
-    // 上传文件:'Upload File',
+    模糊:'obscure',
-    // 上传视频:'Upload Video',
+    包含:'contain',
-    // 上传音频:'Upload Audio',
+    不包含:'Not included',
-    // 上传其他:'Upload Other',
+    是空:'is empty',
-    // 上传图片:'Upload Image',
+    不是空:'not empty',
-    // 上传文件:'Upload File',
+    是空字符串:'is an empty string',
-    // 上传视频:'Upload Video',
+    不是空字符串:'Not an empty string',
-    // 上传音频:'Upload Audio',
+    搜索:'Search',
-    // 上传其他:'Upload Other',
+    开始日期:'Start Date',
+    结束日期:'Ending Date',
+    序号:'Serial Number',
+    版本:'Version',
+    地点:'Place',
+    '影响明细中物料代码，需在供应商物料中维护':'The material code in the details is affected ， must be maintained in the supplier\'s material',
+    是否外部资源:'External resource or not',
+    导入模式:'Import Mode',
+    请选择内容:'Please select content',
+    请选择条件:'Please select condition',
+    区间:'Interval',
+    '您确定删除吗, 是否继续?':'Are you sure about deleting it? Do you want to continue？',
+    '必须保留一条筛选条件!':'One filter must be preserved!',
+    '请填写供应商代码！':'Please fill in the supplier code!',
+    供应商信息:'Supplier Integration',
+    物料基础信息:'Material basic information',
+    库位信息:'Location Information',
+    采购订单信息:'Purchase order information',
+    供应商物料信息:'Supplier material information',
+    要货计划信息:'Demand plan information',
+    用户信息:'User Information',
+    请选择供应商:'Please select a supplier',
+    请选择供应商代码:'Please select a vendor code',
+    请选择物料代码:'Please select material code',
+    请输入供应商物料代码:'Please input  the supplier material code',
+    请选择库位代码:'Please input the location code',
+    ERP库位:'ERP Location Code',
+    单价:'Unit Price',
+    '是否发布所选中数据？':'Do you publish the selected data?',
+    '是否关闭所选中数据？':'Do you want to close the selected data?',
+    '发布成功!':'Release Successfully！',
+    '是否下架所选中数据？':'Do you want to remove selected data?',
+    '下架成功!':'Removed Successfully！',
+    '采购订单主':'Purchase order master data',
+    '采购订单主导入模版':'The purchase order leads into the template',
+    '是否打开所选中数据？':'Open the selected data?',
+    '打开成功!':'Open Successfully！',
+    '关闭成功!':'Closed Successfully',
+    '失效时间要大于生效时间':'The expiration time must be longer than the effective time',
+    '供应商导入模版':'Supplier import template',
+    '供应商物料':'Supplier Material',
+    '供应商物料导入模版':'Supplier material import template',
+    '采购价格单':'Purchase price sheet',
+    '采购价格单导入模版':'Purchase price list import template',
+    已计划数量:'Planned Quantity',
+    已发货数量:'Shipped Quantity',
+    已收货数量:'Received Quantity',
+    已退货数量:'Returned Quantity',
+    已上架数量:'Stocked Quantity',
+    启用:'Start Using',
+    禁用:'Disable',
+    中止:'Terminate',
+    领取:'Get',
+    完成:'Accomplish',
+    绑定:'Binding',
+    重新添加:'Readd',
+    下架:'Sold Out',
+    修改:'Amend',
+    不接受:'Reject',
+    接受:'Accept',
+    承接:'Undertake',
+    放弃:'Abandon',
+    收货:'Receiving',
+    包装:'Packaging',
+    打印标签:'print Label',
+    批量打印:'Bulk Print',
+    生成采购收货申请:'Generate purchase receipt request',
+    发送到货检验申请:'Send the arrival inspection request',
+    生成采购上架申请:'Generate a purchase listing request',
+    生成盘点调整申请:'Generate inventory adjustment request',
+    重盘:'New Inventory',
+    解冻:'Unfreeze',
+    更新检验记录:'Update inspection record',
+    使用决策:'Usage Decision',
+    '是否接受所选中数据？':'Do you accept the selected data?',
+    '接受成功!':'Accept Successfully!',
+    '是否驳回所选中数据？':'Do you reject the selected data?',
+    '驳回成功!':'Reject Succussfully!',
+    '要货计划主':'Ask for master data of cargo plan',
+    '要货计划数量不得大于订单数量-已计划数量':'The planned quantity of the requested goods shall not be greater than the order quantity - the planned quantity',
+    '子列表数量不能空':'The number of sublists cannot be empty',
+    '要货计划主导入模版':'The request plan leads into the template',
+    已经存在:'already exists',
+    驳回:'Refusal',
+    审批通过:'Approve',
+    要货预测主:'Demand forecast master data',
+    创建供应商发货申请:'Create a supplier shipping request',
+    '是否重新打开所选中数据？':'Do you want to reopen the selected data?',
+    '请先上传自检报告!':'Please upload the self-test report first!',
+    '提交审批成功!':'Submitted for approval!',
+    '是否提交审批所选中数据？':'Do you want to submit the selected data for approval?',
+    '是否审批通过所选中数据？':'Is the selected data approved?',
+    '审批通过成功!':'Approval is successful!',
+    '是否处理所选中数据？':'Do you process the selected data?',
+    '处理成功!':'Processing success!',
+    供应商发货申请主:'Supplier delivery request master data',
+    '是否为此数据生成标签？':'Are labels generated for this data?',
+    创建标签成功:'Label created successfully',
+    请先选择要打印的数据:'Please first select the data you want to print',
+    创建标签失败:'Failed to create label',
+    生产日期不可以大于过期日期:'The production date cannot be longer than the expiration date',
+    '计划到货时间大于要货计划送达日期是否继续？':'The planned arrival time is greater than the planned delivery date. Do you want to continue?',
+    '子表明细不能为空!':'Subindicates that the detail cannot be empty!',
+    采购申请生成成功:'The purchase request was successfully generated',
+    '确认生成采购申请吗？':'Confirm to generate purchase application?',
+    供应商发货记录主:'Supplier shipment record master data',
+    '确认生成上架申请吗？':'Are you sure to generate a listing application?',
+    上架申请生成成功:'The listing application was successfully generated',
+    '确认生成到货检验申请吗？':'Is the arrival inspection application confirmed to be generated?',
+    到货检验申请生成成功:'The arrival inspection application was successfully generated',
+    采购收货记录主:'Purchase receipt record master data',
+    采购退货记录主:'Purchase return record master data',
+    合同附件:'Appendix to the contract',
+    发票附件:'Invoice Attachment',
+    货运单附件:'Attachment to the waybill',
+    其他附件:'Other Attachment',
+    打印明细:'Print Detail',
+    打印全部发货单:'Print all invoices',
+    导出明细:'Export Details',
+    打印:'Print',
+    采购通过:'Purchase Approval',
+    采购驳回:'Purchase Rejection',
+    供应商确认:'Supplier Confirmation',
+    财务通过:'Financial Approval',
+    财务驳回:'Financial Rejection',
+    '是否确认发票寄出选中数据？':'Do you confirm that the invoice is sent out with selected data?',
+    '发票寄出成功!':'Invoice sent successfully!',
+    供应商发票申请主:'Supplier invoice request master data',
+    请添明细数据:'Please provide detailed data',
+    '明细数据条数已超过最大数量限制【999条】':'The number of detailed data items has exceeded the maximum limit [999 items]',
+    供应商发货申请主导入模版:'Supplier delivery request is led into the template',
+    供应商发票申请明细:'Supplier invoice request details',
+    供应商发票记录主:'Supplier invoice record master data',
+    审核通过:'Pass the audit',
+    作废:'Cancellation',
+    '是否审批拒绝所选中数据？':'Do you want to approve and reject selected data?',
+    '审批成功!':'Approval is successful!',
+    待开票:'To be invoiced',
+    待开票导入模版:'Import template to be invoiced',
+    采购订单:'purchase order',
+    要货预测:'Demand forecast',
+    供应商发货记录:'Supplier shipment record',
+    供应商发票:'Supplier invoice',
+    基础数据:'basic data',
+    router: {
+      login: 'Login',
+      home: 'Home',
+      analysis: 'Analysis',
+      workplace: 'Workplace'
+    },
+    '重置后，字段设置将恢复初始设置，是否继续?':'After reset, the field Settings will be restored to the initial Settings. Do you want to continue?',
+    提示:'Tip',
+    凭证号:'voucher number',
+    采购价格审批人:'Purchasing price approver',
+    供应商发货单号:'Supplier\'s invoice number'
+
+  },
+  
 
-  }
 }

src/locales/zh-CN.ts

@@ -659,6 +659,7 @@ export default {
     银行:'银行',
     币种:'币种',
     税率:'税率',
+    '税率(%)':'税率(%)',
     生效时间:'生效时间',
     失效时间:'失效时间',
     供应商物料代码:'供应商物料代码',
@@ -712,7 +713,6 @@ export default {
     包装数量:'包装数量',
     供应商计量数量:'供应商计量数量',
     供应商:'供应商',
-
     从库位代码:'从库位代码',
     到库位代码:'到库位代码',
     从库位组代码:'从库位组代码',
@@ -742,6 +742,118 @@ export default {
     自动通过:'自动通过',
     自动执行:'自动执行',
     直接生成记录:'直接生成记录',
+    明细:'明细',
+    批次:'批次',
+    到货日期:'到货日期',
+    过期日期:'过期日期',
+    物料名称:'物料名称',
+    物料描述1:'物料描述1',
+    物料描述2:'物料描述2',
+    项目代码:'项目代码',
+    质检明细:'质检明细',
+    添加附件:'添加附件',
+    变更记录:'变更记录',
+    添加明细:'添加明细',
+    上传质量报告:'上传质量报告',
+    上传质检报告:'上传质检报告',
+    个:'个',
+    张:'张',
+    克:'克',
+    公斤:'公斤',
+    吨:'吨',
+    米:'米',
+    平方米:'平方米',
+    生成标签:'生成标签',
+    创建标签:'创建标签',
+    包装规格1:'包装规格1',
+    包装规格2:'包装规格2',
+    包装数量1:'包装数量1',
+    包装数量2:'包装数量2',
+    物品包装信息:'物品包装信息',
+    系统提示:'系统提示',
+    是否为此数据生成标签:'是否为此数据生成标签',
+    是否处理所选中数据:'是否处理所选中数据',
+    发货:'发货',
+    标签信息:'标签信息',
+    采购收货记录:'采购收货记录',
+    表单数据:'表单数据',
+    任务单号:'任务单号',
+    ERP单据号:'ERP单据号',
+    检验申请单号:'检验申请单号',
+    数据来源:'数据来源',
+    从库区类型范围:'从库区类型范围',
+    到库区类型范围:'到库区类型范围',
+    从库区代码范围:'从库区代码范围',
+    到库区代码范围:'到库区代码范围',
+    生效日期:'生效日期',
+    收货明细:'收货明细',
+    缺货明细:'缺货明细',
+    行类型:'行类型',
+    收货数量:'收货数量',
+    库存状态:'库存状态',
+    从库位组:'从库位组',
+    到库位组:'到库位组',
+    从库区:'从库区',
+    到库区:'到库区',
+    从货主:'从货主',
+    到货主:'到货主',
+    采购退货记录:'采购退货记录',
+    采购收货记录单号:'采购收货记录单号',
+    qad采购退货记录单号:'qad采购退货记录单号',
+    从月台代码:'从月台代码',
+    原因:'原因',
+    退货数量:'退货数量',
+    单位:'单位',
+    金额:'金额',
+    客户代码:'客户代码',
+    供应商发票申请:'供应商发票申请',
+    供应商名称:'供应商名称',
+    税额:'税额',
+    税后金额:'税后金额',
+    折扣金额:'折扣金额',
+    调整税额:'调整税额',
+    总差额:'总差额',
+    金税票号:'金税票号',
+    发票日期:'发票日期',
+    过账日期:'过账日期',
+    财务审批人:'财务审批人',
+    单据类型:'单据类型',
+    合同价格:'合同价格',
+    采购价格:'采购价格',
+    未税差额:'未税差额',
+    含税差额:'含税差额',
+    可开票数量:'可开票数量',
+    采购审批人:'采购审批人',
+    采购审批时间:'采购审批时间',
+    财务审批时间:'财务审批时间',
+    供应商发票记录:'供应商发票记录',
+    发票号:'发票号',
+    价税合计:'价税合计',
+    价差:'价差',
+    索赔金额:'索赔金额',
+    发票时间:'发票时间',
+    差额:'差额',
+    收货日期:'收货日期',
+    开票数量:'开票数量',
+    财务审批用户名:'财务审批用户名',
+    物流审核:'物流审核',
+    供应商送货日期:'供应商送货日期',
+    物流收货日期:'物流收货日期',
+    物流单据号:'物流单据号',
+    零件号:'零件号',
+    供应商用户关联管理:'供应商用户关联管理',
+    用户ID:'用户ID',
+    用户账号:'用户账号',
+    用户昵称:'用户昵称',
+    订单:'订单',
+    计划:'计划',
+    申请:'申请',
+    任务:'任务',
+    记录:'记录',
+    编号:'编号',
+    库位代码:'库位代码',
+    库位组代码:'库位组代码',
+    库区代码:'库区代码',
     查询:'查询',
     重置:'重置',
     新增:'新增',
@@ -751,14 +863,98 @@ export default {
     筛选:'筛选',
     设置:'设置',
     确定:'确定',
+    '确 定':'确 定',
     取消:'取消',
+    '取 消':'取 消',
     编辑:'编辑',
     删除:'删除',
-    添加附件:'添加附件',
     添加筛选条件:'添加筛选条件',
+    前往:'前往',
+    页:'页',
+    共:'共',
     打开:'打开',
     保存:'保存',
-    //////
+    请选择筛选对象:'请选择筛选对象',
+    请输入内容:'请输入内容',
+    附件:'附件',
+    '更新：新增并修改':'更新：新增并修改',
+    '追加：只新增，不修改':'追加：只新增，不修改',
+    '覆盖：只修改不新增':'覆盖：只修改不新增',
+    下载模板:'下载模板',
+    更新:'更新',
+    追加:'追加',
+    覆盖:'覆盖',
+    部分保存:'部分保存',
+    '部分保存：如存在错误数据，正确数据正常导入':'部分保存：如存在错误数据，正确数据正常导入',
+    '全部保存：全部数据正确，才能导入':'全部保存：全部数据正确，才能导入',
+    '将文件拖到此处，或点击上传':'将文件拖到此处，或点击上传',
+    '将文件拖到此处，或':'将文件拖到此处，或',
+    '点击上传':'点击上传',
+    '是否确认导出数据项？':'是否确认导出数据项？',
+    '请选择一条数据！':'请选择一条数据！',
+    等于:'等于',
+    不等于:'不等于',
+    大于:'大于',
+    小于:'小于',
+    大于等于:'大于等于',
+    小于等于:'小于等于',
+    模糊:'模糊',
+    包含:'包含',
+    不包含:'不包含',
+    是空:'是空',
+    不是空:'不是空',
+    是空字符串:'是空字符串',
+    不是空字符串:'不是空字符串',
+    搜索:'搜索',
+    开始日期:'开始日期',
+    结束日期:'结束日期',
+    序号:'序号',
+    版本:'版本',
+    地点:'地点',
+    '影响明细中物料代码，需在供应商物料中维护':'影响明细中物料代码，需在供应商物料中维护',
+    是否外部资源:'是否外部资源',
+    导入模式:'导入模式',
+    请选择内容:'请选择内容',
+    请选择条件:'请选择条件',
+    区间:'区间',
+    '您确定删除吗, 是否继续?':'您确定删除吗, 是否继续?',
+    '必须保留一条筛选条件!':'必须保留一条筛选条件!',
+    '请填写供应商代码！':'请填写供应商代码！',
+    供应商信息:'供应商信息',
+    物料基础信息:'物料基础信息',
+    库位信息:'库位信息',
+    采购订单信息:'采购订单信息',
+    供应商物料信息:'供应商物料信息',
+    要货计划信息:'要货计划信息',
+    用户信息:'用户信息',
+    请选择供应商:'请选择供应商',
+    请选择供应商代码:'请选择供应商代码',
+    请选择物料代码:'请选择物料代码',
+    请输入供应商物料代码:'请输入供应商物料代码',
+    请选择库位代码:'请选择库位代码',
+    ERP库位:'ERP库位',
+    单价:'单价',
+    '是否发布所选中数据？':'是否发布所选中数据？',
+    '是否关闭所选中数据？':'是否关闭所选中数据？',
+    '发布成功!':'发布成功!',
+    '是否下架所选中数据？':'是否下架所选中数据？',
+    '下架成功!':'下架成功!',
+    '采购订单主':'采购订单主',
+    '采购订单主导入模版':'采购订单主导入模版',
+    '是否打开所选中数据？':'是否打开所选中数据？',
+    '打开成功!':'打开成功!',
+    '关闭成功!':'关闭成功!',
+    '失效时间要大于生效时间':'失效时间要大于生效时间',
+    '供应商导入模版':'供应商导入模版',
+    '供应商物料':'供应商物料',
+    '供应商物料导入模版':'供应商物料导入模版',
+    '采购价格单':'采购价格单',
+    '采购价格单导入模版':'采购价格单导入模版',
+    已计划数量:'已计划数量',
+    已发货数量:'已发货数量',
+    已收货数量:'已收货数量',
+    已退货数量:'已退货数量',
+    已上架数量:'已上架数量',
     启用:'启用',
     禁用:'禁用',
     中止:'中止',
@@ -781,13 +977,93 @@ export default {
     生成采购上架申请:'生成采购上架申请',
     生成盘点调整申请:'生成盘点调整申请',
     重盘:'重盘',
-    监盘:'监盘',
     解冻:'解冻',
     更新检验记录:'更新检验记录',
-    使用决策:'使用决策'
+    使用决策:'使用决策',
+    '是否接受所选中数据？':'是否接受所选中数据？',
+    '接受成功!':'接受成功!',
+    '是否驳回所选中数据？':'是否驳回所选中数据？',
+    '驳回成功!':'驳回成功!',
+    '要货计划主':'要货计划主',
+    '要货计划数量不得大于订单数量-已计划数量':'要货计划数量不得大于订单数量-已计划数量',
+    '子列表数量不能空':'子列表数量不能空',
+    '要货计划主导入模版':'要货计划主导入模版',
+    已经存在:'已经存在',
+    驳回:'驳回',
+    审批通过:'审批通过',
+    要货预测主:'要货预测主',
+    创建供应商发货申请:'创建供应商发货申请',
+    '是否重新打开所选中数据？':'是否重新打开所选中数据？',
+    '请先上传自检报告!':'请先上传自检报告!',
+    '提交审批成功!':'提交审批成功!',
+    '是否提交审批所选中数据？':'是否提交审批所选中数据？',
+    '是否审批通过所选中数据？':'是否审批通过所选中数据？',
+    '审批通过成功!':'审批通过成功!',
+    '是否处理所选中数据？':'是否处理所选中数据？',
+    '处理成功!':'处理成功!',
+    供应商发货申请主:'供应商发货申请主',
+    '是否为此数据生成标签？':'是否为此数据生成标签？',
+    创建标签成功:'创建标签成功',
+    请先选择要打印的数据:'请先选择要打印的数据',
+    创建标签失败:'创建标签失败',
+    生产日期不可以大于过期日期:'生产日期不可以大于过期日期',
+    '计划到货时间大于要货计划送达日期是否继续？':'计划到货时间大于要货计划送达日期是否继续？',
+    '子表明细不能为空!':'子表明细不能为空!',
+    采购申请生成成功:'采购申请生成成功',
+    '确认生成采购申请吗？':'确认生成采购申请吗？',
+    供应商发货记录主:'供应商发货记录主',
+    '确认生成上架申请吗？':'确认生成上架申请吗？',
+    上架申请生成成功:'上架申请生成成功',
+    '确认生成到货检验申请吗？':'确认生成到货检验申请吗？',
+    到货检验申请生成成功:'到货检验申请生成成功',
+    采购收货记录主:'采购收货记录主',
+    采购退货记录主:'采购退货记录主',
+    合同附件:'合同附件t',
+    发票附件:'发票附件',
+    货运单附件:'货运单附件',
+    其他附件:'其他附件',
+    打印明细:'打印明细',
+    打印全部发货单:'打印全部发货单',
+    导出明细:'导出明细',
+    打印:'打印',
+    采购通过:'采购通过',
+    采购驳回:'采购驳回',
+    供应商确认:'供应商确认',
+    财务通过:'财务通过',
+    财务驳回:'财务驳回',
+    '是否确认发票寄出选中数据？':'是否确认发票寄出选中数据？',
+    '发票寄出成功!':'发票寄出成功!',
+    供应商发票申请主:'供应商发票申请主',
+    请添明细数据:'请添明细数据',
+    '明细数据条数已超过最大数量限制【999条】':'明细数据条数已超过最大数量限制【999条】',
+    供应商发货申请主导入模版:'供应商发货申请主导入模版',
+    供应商发票申请明细:'供应商发票申请明细',
+    供应商发票记录主:'供应商发票记录主',
+    审核通过:'审核通过',
+    作废:'作废',
+    '是否审批拒绝所选中数据？':'是否审批拒绝所选中数据？',
+    '审批成功!':'审批成功!',
+    待开票:'待开票',
+    待开票导入模版:'待开票导入模版',
+    采购订单:'采购订单',
+    要货预测:'要货预测',
+    供应商发货记录:'供应商发货记录',
+    供应商发票:'供应商发票',
+    基础数据:'基础数据',
+    router: {
+      login: '登录',
+      home: '首页',
+      analysis: '分析页',
+      workplace: '工作台'
+    },
+    '重置后，字段设置将恢复初始设置，是否继续?':'重置后，字段设置将恢复初始设置，是否继续?',
+    提示:'提示',
+    凭证号:'凭证号',
+    采购价格审批人:'采购价格审批人',
+    供应商发货单号:'供应商发货单号'
 
+  },
 
 }
-}
 
 

src/utils/dict.ts

@@ -333,4 +333,5 @@ export enum DICT_TYPE {
   BASIC_TEAM_TYPE='basic_team_type',//班组类型
   TAX_RATE_DICT='tax_rate_dict', //税率
   INTERFACE_STATUS = 'interfaceStatus', // 接口调用信息 接口状态
+  SYSTEM_DAY = 'system_day',  // 系统天数
 }

src/utils/disposition/defaultButtons.ts

@@ -187,6 +187,20 @@ export function formCloseBtn(option:any) {
   })
 }
 
+// form表单-关闭按钮
+export function formStagingBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`btn.暂存`).replace('btn.', ''),
+    name: 'staging',
+    hide: false,
+    
+    color: '',
+    float:'right',
+    hasPermi: ''
+  })
+}
+
+
 // drawer抽屉头部-编辑按钮
 export function drawerEditBtn(option:any) {
   return __defaultBtnOption(option,{

src/views/mes/components/Detail.vue

@@ -533,7 +533,8 @@ const change = (item, index) => {
 const masterParmas = ref({
   masterId: '', //主表id
   number: '', //主表单据号
-  status: '' //主表状态 用于控制子表新增编辑按钮显示情况
+  status: '', //主表状态 用于控制子表新增编辑按钮显示情况
+  requestBillNo:'' //自定义
 })
 
 // 列表头部按钮
@@ -578,13 +579,15 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
   }
   count.value++
   // 加载明细列表
-  if (!props.isBasic) {
+  if (!props.isBasic && !props.isBasicMes) {
     // 设置主表id
     masterParmas.value.masterId = row.masterId||row.id
     masterParmas.value.number = row.number
     masterParmas.value.status = row.status
+    masterParmas.value.requestBillNo = row.requestBillNo
     tableObjectRef.value.params = {
-      masterId: row.masterId||row.id
+      masterId: row.masterId||row.id,
+      requestBillNo:row.requestBillNo
     }
     await getList()
   }

src/views/mes/itemRequestMain/index.vue

@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #requestBillNo="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.requestBillNo)">
-          <span>{{ row.code }}</span>
+          <span>{{ row.requestBillNo }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -51,7 +51,23 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="ItemRequestMain.allSchemas" />
+  <Detail ref="detailRef"
+          :isBasic="false"
+          :isBasicMes="false"
+          :allSchemas="ItemRequestMain.allSchemas"
+          :detailAllSchemas="ItemRequestDetail.allSchemas"
+          :detailAllSchemasRules="ItemRequestMainRules"
+          :apiPage="ItemRequestDetailApi.getItemRequestDetailPage"
+          :apiCreate="ItemRequestDetailApi.createItemRequestDetail"
+          :apiUpdate="ItemRequestDetailApi.updateItemRequestDetail"
+          :apiDelete="ItemRequestDetailApi.deleteItemRequestDetail"
+          :detailButtonIsShowAdd="true"
+          :detailButtonIsShowEdit="true"
+          :detailButtonIsShowDelete="true"
+          @handleMainFefresh="handleMainFefresh"
+          @searchTableSuccessDetail="searchTableSuccessDetail"
+          :key="count"
+  />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/item-request-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -59,12 +75,13 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ItemRequestMain,ItemRequestMainRules } from './itemRequestMain.data'
+import { ItemRequestMain,ItemRequestMainRules,ItemRequestDetail,ItemRequestDetailRules } from './itemRequestMain.data'
 import * as ItemRequestMainApi from '@/api/mes/itemRequestMain'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItemRequestDetailApi from '@/api/mes/itemRequestDetail'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
 
 defineOptions({ name: 'MesItemRequestMain' })
 

src/views/mes/itemRequestMain/itemRequestMain.data.ts

@@ -32,6 +32,12 @@ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '申请单号',
+    field: 'requestBillNo',
+    sort: 'custom',
+    isSearch: true,
+  },
   {
     label: '主键',
     field: 'id',
@@ -45,7 +51,10 @@ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '状态',
     field: 'status',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'Radio'
     },
@@ -64,11 +73,73 @@ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '备注',
+    label: '删除用户名',
-    field: 'remark',
+    field: 'deleter',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '位置ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+
+  {
+    label: '计划编码',
+    field: 'planDayCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '工单编码',
+    field: 'workBillNo',
     sort: 'custom',
     isSearch: true,
   },
+  {
+    label: '批次编码',
+    field: 'batchCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '工位编码',
+    field: 'workstationCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '产品编码',
+    field: 'productCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '工序编码',
+    field: 'processCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '类型（1:叫料、2:补料）',
+    field: 'requestType',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                },
+  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -86,8 +157,32 @@ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '删除用户名',
+    label: '备注',
-    field: 'deleter',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+
+export const ItemRequestDetailRules = reactive({
+  concurrencyStamp: [required],
+})
+
+
+export const ItemRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '主键',
+    field: 'id',
     sort: 'custom',
     isSearch: false,
     isTable: false,
@@ -95,8 +190,20 @@ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail:false,
   },
   {
-    label: '位置ID',
+    label: '状态',
-    field: 'siteId',
+    field: 'status',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
     sort: 'custom',
     isSearch: false,
     isTable: false,
@@ -107,56 +214,74 @@ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       value: 0
     },
   },
+
   {
-    label: '计划编码',
+    label: '删除用户名',
-    field: 'planDayCode',
+    field: 'deleter',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
-    label: '工单编码',
+    label: '申请单号',
-    field: 'workBillNo',
+    field: 'requestBillNo',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '批次编码',
+    label: '物料编码',
-    field: 'batchCode',
+    field: 'itemBasicCode',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '申请单号',
+    label: '物料数量',
-    field: 'requestBillNo',
+    field: 'itemCounts',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '工位编码',
+    label: '物料单位',
-    field: 'workstationCode',
+    field: 'itemUom',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '产品编码',
+    label: '位置ID',
-    field: 'productCode',
+    field: 'siteId',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
   },
   {
-    label: '工序编码',
+    label: '创建时间',
-    field: 'processCode',
+    field: 'createTime',
     sort: 'custom',
+    formatter: dateFormatter,
     isSearch: true,
+    search: {
+      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')]
+      }
+    },
+    isForm: false,
   },
   {
-    label: '类型（1:叫料、2:补料）',
+    label: '备注',
-    field: 'requestType',
+    field: 'remark',
     sort: 'custom',
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                },
   },
   {
     label: '操作',

src/views/mes/orderDay/components/schedule.vue

@@ -201,8 +201,8 @@
       </el-dialog>
     </ContentWrap>
     <template #footer>
-      <el-button @click="dialogVisible=false" >关闭</el-button>
+      <el-button @click="handleClose" >关闭</el-button>
-      <el-button @click="publishPlan" >发布计划</el-button>
+      <el-button  type="primary" @click="publishPlan" >发布计划</el-button>
     </template>
     <SearchTable ref="searchTableRef" @search-table-success="searchTableSuccess" />
   </Dialog>
@@ -280,7 +280,7 @@ const showMaterialsData=ref() //物料信息分页展示
 const page=ref({
   total:0,
   current:1,
-  size:5
+  size:7
 })
 /*班组数据*/
 const teamData = ref([])
@@ -327,6 +327,7 @@ const searchTeamList = () => {
 }
 /** 打开弹窗 */
 const open = async (type: string, row?: any, titleName?: any) => {
+  activeName.value = 'workstation'
   currentNode.value.name=''
   currentNode.value.id=''
   //首次打开页面，将数据清空
@@ -470,6 +471,10 @@ const opensearchTable = (
   )
 
 }
+const handleClose=()=>{
+  dialogVisible.value = false,
+  emit('close')
+}
 const publishPlan=()=>{
      message.confirm("确认发布当前计划？","question").then(async () => {
       //isPublish.value=true
@@ -478,10 +483,7 @@ const publishPlan=()=>{
       doPublishPlan() }finally{
         formLoading.value=false;
       }
-     // loading.value = false,
+      handleClose()
-      dialogVisible.value = false,
-      //isPublish.value=false,
-      emit('close')
      }).catch(() => {
       message.info("已取消发布")
      })

src/views/mes/orderDay/components/scheduleDetail.vue

@@ -0,0 +1,318 @@
+<template>
+  <Dialog
+    :title="dialogTitle"
+    v-model="dialogVisible"
+    :width="dialogWidth"
+    :close-on-click-modal="false"
+    :vLoading="formLoading"
+  >
+    <ContentWrap>
+      <Descriptions
+        :data="detailData"
+        labelClassName="label-class-name"
+        label-align="left"
+        direction="vertical"
+        :column="8"
+        :schema="allSchemas.detailSchema"
+        :columns="2"
+        width="200px"
+      />
+    </ContentWrap>
+    <ContentWrap>
+      <el-container>
+        <el-aside width="320px">
+          <el-card>
+            <template #header>
+              <div class="card-header">
+                <span>工艺路线</span>
+              </div>
+            </template>
+            <el-table :data="processData" ref="tableProcess" style="width: 100%; height: 80%" >
+              <el-table-column prop="code" label="工序编码" />
+              <el-table-column prop="name" label="工序名称" />
+            </el-table>
+          </el-card>
+        </el-aside>
+        <el-main style="height: 480px; width: calc(100% - 980px);padding: 0px; margin:0px 20px">
+          <div ref="graphContainer"></div
+          ></el-main>
+        <el-aside width="640px">
+          <el-tag>工序编码：{{currentNode.id}} -工序名称:{{currentNode.name  }}</el-tag>
+          <el-tabs v-model="activeName" >
+            <el-tab-pane label="工序工位" name="workstation">
+              <el-table :data="workstationData" ref="tableWorkstations" style="width: 100%; height: 80%">
+                <el-table-column prop="stationName" label="工位名称" />
+                <el-table-column prop="processCode" label="工序编码" />
+              </el-table>
+
+            </el-tab-pane>
+            <el-tab-pane label="工序物料" name="materials">
+                <el-table :data="showMaterialsData" ref="tableMaterials" style="width: 100%; height: 80%">
+                <el-table-column prop="repMaterialCode" label="物料编码" />
+                <el-table-column prop="repMaterialCounts" label="物料数量" />
+                <el-table-column prop="repMaterialModel" label="物料单位" />
+                <el-table-column prop="sourceMaterialCounts" label="需求物料数">
+                  <template #default="scope">{{ getTotalcounts(scope.row.repMaterialCounts) }}</template>
+                </el-table-column>
+                <el-table-column prop="replaceFlag" label="是否替换" >
+                  <template #default="scope">
+                  <el-switch disabled
+                    v-model="scope.row.replaceFlag"
+                    active-color="#13ce66"
+                    inactive-color="#ff4949"
+                    active-text="是"
+                    inactive-text="否"
+                  />
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-pagination
+              small
+              hide-on-single-page="true"
+              layout="prev, pager, next"
+              :total="page.total"
+              :page-size="page.size"
+              :current-page="page.current"
+              @current-change="handleCurrentChangeM"
+              @prev-click="handlePrevClickM"
+              @next-click="handleNextClickM"
+            />
+            </el-tab-pane>
+            <el-tab-pane label="工序人员" name="workers">
+              
+              <el-table :data="workerData" ref="tableWorker" style="width: 100%; height: 233px;overflow: auto;">
+                <el-table-column prop="groupName" label="所属班组" />
+                <el-table-column prop="workerMonitor" label="班长" />
+                <el-table-column prop="workerCode" label="人员编码" />
+                <el-table-column prop="workerName" label="人员昵称" />
+              </el-table>
+            </el-tab-pane>
+            <el-tab-pane label="工序设备" name="equipments">
+              <el-table :data="equipmentData" ref="tableEquipment" style="width: 100%; height: 80%">
+                <el-table-column prop="equipmentCode" label="设备编码" />
+                <el-table-column prop="equipmentName" label="设备名称" />
+                <el-table-column prop="equipmentType" label="设备类型" />
+                <el-table-column prop="equipmentWorkstation" label="关联工位" />
+              </el-table>
+            </el-tab-pane>
+          </el-tabs>
+        </el-aside>
+      </el-container>
+    </ContentWrap>
+    <template #footer>
+      <el-button @click="handleClose" >关闭</el-button>
+    </template>
+    
+  </Dialog>
+  
+</template>
+
+<script lang="ts" setup>
+
+import {
+  start_node,
+  end_node,
+  createGraph,
+  getNewNode
+} from '@/views/mes/processroute/components/graphbase.data'
+import * as orderDayconfigApi from '@/api/mes/orderDayConfig'
+import * as OrderDayApi from '@/api/mes/orderDay'
+import  {ProcessSearch} from '../../publicUtil/processSearch.data'
+import * as ProcessApi from '@/api/wms/process'
+import {  Graph } from '@antv/x6'
+import * as TeamApi from '@/api/wms/team'
+import {searchUser} from "@/views/wms/basicDataManage/orderManage/team/team.data";
+import {DeviceInfo, OrderDay} from "@/views/mes/orderDay/orderDay.data";
+const graphContainer = ref<HTMLElement | null>(null)
+const graph = ref<Graph>()
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const activeName = ref('workstation')
+const formLoading = ref(false)
+const dialogFormVisibleUser = ref(false)
+const processData = ref([])
+const processCode = ref('')
+//const isPublish=ref(false)
+const queryParams:orderDayconfigApi.OrderDayQueryParamVo=ref()
+const props = defineProps({
+  // 查询弹窗是否显示筛选按钮
+  isSearchFilterButtonHide: {
+    type: Boolean,
+    default: false
+  },
+  // 显示窗口宽度设置
+  basicFormWidth: {
+    type: String,
+    default: ''
+  },
+
+  allSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  }
+})
+const workerData=ref([])
+const detailData = ref(props.allSchemas)
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
+//const updateKey = ref(0)
+const dialogWidth = ref()
+const materialsData = ref()
+const equipmentData=ref([])
+const workstationData=ref([])
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const  graphJson =ref()
+const currentNode = ref({
+  name:'',
+  id:''
+})
+const showMaterialsData=ref() //物料信息分页展示
+const page=ref({
+  total:0,
+  current:1,
+  size:7
+})
+
+/** 打开弹窗 */
+const open =  ( row?: any, titleName?: any) => {
+  //console.log("scheduleDetail-182",row)
+  currentNode.value.name=''
+  currentNode.value.id=''
+  workerData.value=[]
+  equipmentData.value = []
+  materialsData.value = []
+  showMaterialsData.value=[]
+  page.value.total = 0
+  page.value.current = 1
+  workstationData.value = []
+  dialogVisible.value = true
+  detailData.value = row
+  dialogWidth.value = props.basicFormWidth + '%'
+  queryParams.planNoDay=row.planNoDay
+  queryParams.productCode=row.productCode
+  queryParams.workroomCode=row.workroomCode
+  queryParams.lineCode=row.lineCode
+  queryParams.processrouteCode=row.processrouteCode
+  queryParams.batchCode=row.batchCode
+  //获取配置的
+  if (titleName) {
+    dialogTitle.value =  titleName
+  } else {
+    dialogTitle.value =  type
+  }
+  nextTick?.(() => {
+    graph.value = createGraph(graphContainer.value as HTMLElement, true, 240, 320)
+    graph.value.on('node:click', ({ e, x, y, node, view }) => {
+      nodeClick(e, x, y, node, view)
+    })
+    getProcessroute()
+    getConfigProcessRouteNode()
+  })
+}
+const getTotalcounts=(a:any)=>{
+  return detailData.value.planCount*a
+}
+
+//获取工序的BOM
+const getProcessBom=async (code:any) => {
+  queryParams.processCode=code
+  let res = await orderDayconfigApi.getOrderDayBomByOrder(queryParams)
+  materialsData.value=res
+  if(materialsData.value.length>0){
+    page.value.total = materialsData.value.length
+    page.value.current = 1
+    showMaterialsData.value=materialsData.value.slice(0,page.value.size)
+  }
+}
+// const currentStartNode = ref({
+//   id:''
+// })
+//获取配置的工艺路线信息
+const getProcessroute = async () => {
+  let res = await orderDayconfigApi.getConfigProcessRoute(queryParams)
+  graphJson.value=JSON.parse(res.newGraphData)
+  graph.value?.fromJSON(graphJson.value.cells)
+  //首次打开弹窗，默认打开一个工序的数据
+  //currentStartNode.value = graphJson.value.cells[0]
+  currentNode.value = graphJson.value.cells[0]
+  // 手动触发点击事件
+  nodeClick('','','',currentNode.value,'')
+
+}
+//获取配置的工序信息
+const getConfigProcessRouteNode= async () => {
+  let res = await orderDayconfigApi.getConfigProcessRouteNode(queryParams)
+  processData.value=res
+}
+//获取配置的工序工位
+const getConfigProcessWorkstation= async (code:any) => {
+  queryParams.processCode=code
+  workstationData.value = await orderDayconfigApi.getConfigProcessWorkstation(queryParams)
+}
+//获取配置的工序人员
+const getConfigProcessWorker= async (code:any) => {
+  queryParams.processCode=code
+  workerData.value = await orderDayconfigApi.getConfigProcessWorker(queryParams)
+}
+//获取配置的工序设备
+const getConfigProcessEquipment= async (code:any) => {
+  queryParams.processCode=code
+  equipmentData.value = await orderDayconfigApi.getConfigProcessEquipment(queryParams)
+}
+const nodeClick = (e, x, y, node, view) => {
+  //console.log(node.id)
+  getProcessBom(node.id)
+  getConfigProcessWorkstation(node.id)
+  getConfigProcessWorker(node.id)
+  getConfigProcessEquipment(node.id)
+  processCode.value = node.id
+  currentNode.value.id=node.id
+  //console.log(node)
+  currentNode.value.name=node.attrs.title.text
+}
+
+
+const handleClose=()=>{
+  dialogVisible.value = false,
+  emit('close')
+}
+
+
+const handleCurrentChangeM=(value: number)=>{
+      let index=(value-1)*page.value.size
+      page.value.current=value
+      showMaterialsData.value=materialsData.value.slice(index,index+page.value.size)
+
+}
+const handlePrevClickM=(value: number)=>{
+      page.value.current=value-1
+      if(page.value.current==0) {
+        page.value.current=1
+      }
+
+}
+const handleNextClickM=(value: number)=>{
+     page.value.current=value+1
+     if(page.value.current>page.value.total/page.value.size) {
+        page.value.current=page.value.total/page.value.size -1
+      }
+}
+defineOptions({ name: 'SechledDetail' })
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+// 传递给父类
+const emit = defineEmits([
+  'close'
+])
+</script>
+<style lang="scss">
+.el-drawer__body {
+  background: #f5f5f5 !important;
+}
+::v-deep(.label-class-name) {
+  color: #dedede;
+}
+</style>

src/views/mes/orderDay/index.vue

@@ -62,6 +62,7 @@
 
   <!-- 详情 -->
   <orderDetail ref="detailRef" :all-schemas="OrderDay.allSchemas" />
+  <scheduleDetailR ref="sDetailRef"  :all-schemas="OrderDay.allSchemas" :basicFormWidth="75" @close="publishClosed" />
   <scheduleDetail ref="scheduleDetailRef"  :all-schemas="OrderDay.allSchemas" :basicFormWidth="75" @close="publishClosed" />
   <!-- 导入 -->
   <ImportForm
@@ -82,6 +83,9 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import orderDetail from './components/orderDetail.vue'
 import scheduleDetail from './components/schedule.vue'
+import scheduleDetailR from './components/scheduleDetail.vue'
+
+
 
 defineOptions({ name: 'MesOrderDay' })
 
@@ -196,8 +200,11 @@ const buttonBaseClick = (val, item) => {
   }
 }
 const publishClosed=()=>{
-    //console.log('publishClosed')
+    //console.log('orderday-publishClosed-200')
+    nextTick(() => {
       getList()
+    })
+   
 }
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row,val) => {
@@ -242,7 +249,7 @@ const butttondata = (row) => {
 
 
 // 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
+const buttonTableClick =  (val, row) => {
   if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
@@ -252,6 +259,7 @@ const buttonTableClick = async (val, row) => {
   }else if(val=='stopPlan'){  //终止计划
     stopPlan(row.id)
   }
+   getList()
 }
 
 /** 添加/修改操作 */
@@ -282,18 +290,25 @@ const formsSuccess = async (formType,data) => {
   }
   
   basicFormRef.value.dialogVisible = false
-  getList()
+  await getList()
 }
 
 /** 详情操作 */
 const detailRef = ref()
+const sDetailRef=ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  if(row.status=='1'){
     detailRef.value.openDetail(row, titleName, titleValue, 'basicOrderDay')
+  }else{
+    //console.log('orderDay-openDetail-303',row)
+    sDetailRef.value.open(row, titleName)
+  }
+  
 }
 /** 发布操作 */
 const scheduleDetailRef = ref()
-const openScheduledDetail = (row: any, titleName: any, titleValue: any) => {
+const openScheduledDetail = ( titleName: any,row: any, titleValue: any) => {
-  scheduleDetailRef.value.open(row, titleName, titleValue)
+  scheduleDetailRef.value.open( titleName, row,titleValue)
 }
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -323,9 +338,9 @@ const handleExport = async () => {
     exportLoading.value = false
   }
 }
-const stopPlan = async (id) => {
+const stopPlan =  (id) => {
-   await OrderDayApi.stopPlan(id)
+    OrderDayApi.stopPlan(id)
-   getList()
+  
 }
 /** 导入 */
 const importFormRef = ref()

src/views/mes/orderDay/orderDay.data.ts

@@ -11,9 +11,9 @@ export const OrderDayRules = reactive({
   // batchCode: [
   //   { required: false, message: '请输入一个日计划编号', trigger: 'blur' }
   // ],
-  planNoMonth: [
+  // planNoMonth: [
-    { required: true, message: '请输入一个月计划编号', trigger: 'blur' }
+  //   { required: true, message: '请输入一个月计划编号', trigger: 'blur' }
-  ],
+  // ],
   productCode: [
     { required: true, message: '请选择一个产品', trigger: 'blur' }
   ],
@@ -106,7 +106,7 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isTable: true,
     isDetail:true,
-    isSearch: false,
+    isSearch: true,
     width: '80px',
     dictType: DICT_TYPE.MES_PLANDO_STATUS,
     dictClass: 'string',
@@ -214,7 +214,7 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     form: {
       component: 'Switch',
-      value: 'TRUE',
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'

src/views/mes/process/index.vue

@@ -283,13 +283,13 @@ const changeTabs = (data) =>{
     tabsCreateApi = ProcessApi.createPatternRelation
     tmpPopList = PatternPopList.allSchemas
   }
-  else if(data.prop == 'ItembasicTab'){
+  // else if(data.prop == 'ItembasicTab'){
-    apiPage.value = ProcessApi.getItembasicPage
+  //   apiPage.value = ProcessApi.getItembasicPage
-    detailAllSchemas.value = ItembasicTab.allSchemas
+  //   detailAllSchemas.value = ItembasicTab.allSchemas
-    tabsDeleteApi = ProcessApi.deleteItembasicRelation
+  //   tabsDeleteApi = ProcessApi.deleteItembasicRelation
-    tabsCreateApi = ProcessApi.createItembasicRelation
+  //   tabsCreateApi = ProcessApi.createItembasicRelation
-    tmpPopList = ItembasicPopList.allSchemas
+  //   tmpPopList = ItembasicPopList.allSchemas
-  }
+  // }
 }
 
 /** 详情操作 */

src/views/mes/qualityform/index.vue

@@ -53,7 +53,7 @@
   <!-- 详情 -->
   <Detail ref="detailRef" 
           :isBasic="false"
-          :isBasicMes="true"
+          :isBasicMes="false"
           :allSchemas="Qualityform.allSchemas"
           :detailAllSchemas="QualityformDetail.allSchemas"
           :detailAllSchemasRules="QualityformDetailRules"

src/views/mes/workScheduling/components/finish.vue

@@ -0,0 +1,121 @@
+<template>
+  <Dialog
+    :title="dialogTitle"
+    v-model="dialogVisible"
+    :close-on-click-modal="true"
+    :vLoading="formLoading"
+  >
+    <template #title>{{ dialogTitle }}</template>
+    <el-form>
+      <el-form-item label="当前工序">
+        <el-input v-model="currentProcess" disabled></el-input>
+      </el-form-item>
+      <el-form-item label="选择人员">
+        <el-select v-model="personSelected">
+          <el-option v-for="item in personData" :key="item.workerCode" :label="item.workerName" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="报工数量">
+        <el-input-number v-model="reportCount" @change="handleCount"></el-input-number>
+      </el-form-item>
+      <el-form-item label="工时">
+        <el-input-number v-model="workTerm"></el-input-number>
+      </el-form-item>
+      <el-form-item label="是否已质检">
+        <el-switch v-model="checkFlag" active-value="true"> </el-switch>
+      </el-form-item>
+      <el-form-item label="合格数量">
+        <el-input-number
+          v-model="qualified"
+          :disabled="!checkFlag"
+          @change="handleCount"
+        ></el-input-number>
+      </el-form-item>
+      <el-form-item label="不合格数量">
+        <el-input-number disabled v-model="unqualified"></el-input-number>
+      </el-form-item>
+    </el-form>
+
+    <template #footer
+      ><el-button @click="dialogVisible = false">关闭</el-button>
+      <el-button type="primary" @click="saveReport">保存</el-button></template
+    >
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { Dialog } from '@/components/Dialog'
+import * as workschedulingApi from '@/api/mes/workScheduling'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import dayjs from 'dayjs'
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const { wsCache } = useCache()
+const rowData = ref()
+const dialogVisible = ref(false)
+const dialogTitle = ref()
+const formLoading = ref(false)
+const personSelected = ref()
+const currentProcess = ref()
+const personData = ref([{ value: '', label: '' }])
+const reportCount = ref()
+const qualified = ref()
+const checkFlag = ref(false)
+const unqualified = ref(0)
+const workTerm = ref()
+const user = wsCache.get(CACHE_KEY.USER)
+const handleCount = () => {
+    if (reportCount.value > rowData.value.planCount) {
+    message.alert('报工数量不能超出计划数量！计划数【'+rowData.value.planCount+'】')
+    reportCount.value =rowData.value.planCount
+    return
+  }
+
+  if (checkFlag) {
+    if (reportCount.value < qualified.value) {
+      message.alert('合格数不能超出报工数！')
+      return
+    }
+    if (qualified.value == undefined || qualified.value == 0) {
+      qualified.value = reportCount.value
+    }
+    unqualified.value = reportCount.value - qualified.value
+  }
+}
+const openDetail = (row: any, titleName: any) => {
+  //console.log('workscheduling-finishReport-60', user)
+  currentProcess.value = row.workingNode
+  rowData.value = row
+  dialogVisible.value = true
+  dialogTitle.value = titleName
+  getCurrentWorkerList(row)
+}
+const getCurrentWorkerList = async (row) => {
+  let params = {
+    planDayCode: row.planMasterCode,
+    processCode: row.workingNode
+  }
+  personData.value = await workschedulingApi.getCurrentWorkerList(params)
+}
+//提交报工
+const saveReport = () => {
+  let data = {
+    reportDate: dayjs(new Date()).format('YYYY-MM-DD HH:mm:sss'),
+    schedulingCode: rowData.value.schedulingCode,
+    processCode: currentProcess.value,
+    list: [
+      {
+        reportCount: reportCount.value,
+        workTerm: workTerm.value,
+        reportPerson: personSelected.value,
+        qualified: qualified.value,
+        unqualified: unqualified.value
+      }
+    ]
+  }
+  workschedulingApi.completeHandle(data)
+}
+// 传递给父类
+const emit = defineEmits(['success', 'close'])
+
+defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
+</script>

src/views/mes/workScheduling/components/report.vue

@@ -0,0 +1,143 @@
+<template>
+  <Dialog
+    :title="dialogTitle"
+    v-model="dialogVisible"
+    :close-on-click-modal="true"
+    :vLoading="formLoading"
+  >
+    <template #title>{{ dialogTitle }}</template>
+    <el-form>
+      <el-form-item label="选择工序">
+        <el-select v-model="processCodeSelected" @change="processChange" value-key="processCode">
+          <el-option v-for="item in processOption" :key="item.processCode" :label="item.processName" :value="item.processCode" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="选择人员">
+        <el-select v-model="personSelected">
+          <el-option v-for="item in personOption" :key="item.workerCode" :label="item.workerName" :value="item.workerCode" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="报工数量">
+        <el-input-number v-model="reportCount" @change="handleCount"></el-input-number>
+      </el-form-item>
+      <el-form-item label="工时">
+        <el-input-number v-model="workTerm"></el-input-number>
+      </el-form-item>
+      <el-form-item label="是否已质检">
+        <el-switch v-model="checkFlag" active-value="true"> </el-switch>
+      </el-form-item>
+      <el-form-item label="合格数量">
+        <el-input-number
+          v-model="qualified"
+          :disabled="!checkFlag"
+          @change="handleCount"
+        ></el-input-number>
+      </el-form-item>
+      <el-form-item label="不合格数量">
+        <el-input-number disabled v-model="unqualified"></el-input-number>
+      </el-form-item>
+    </el-form>
+
+    <template #footer>
+      <el-button @click="dialogVisible = false">关闭</el-button>
+      <el-button type="primary"  :disabled="saveFlag" @click="saveReport">保存</el-button>
+    </template> </Dialog
+  >+
+</template>
+<script lang="ts" setup>
+import { Dialog } from '@/components/Dialog'
+import * as workschedulingApi from '@/api/mes/workScheduling'
+import dayjs from 'dayjs'
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const rowData = ref()
+const openDetail = async (row: any, titleName: any) => {
+  rowData.value = row
+  dialogVisible.value = true
+  dialogTitle.value = titleName
+  getProcessList(row)
+}
+const dialogVisible = ref(false)
+const dialogTitle = ref()
+const formLoading = ref(false)
+const processOption = ref([])
+const personOption=ref([])
+const processCodeSelected = ref()
+const personSelected = ref()
+const checkFlag = ref(false)
+const unqualified = ref()
+const reportCount = ref()
+const qualified = ref()
+const workTerm = ref()
+const saveFlag=ref(false)
+//获取工序列表
+const getProcessList=async(row)=>{
+    let params={
+    planDayCode:row.planMasterCode,
+    schedulingCode:row.schedulingCode
+  }
+  processOption.value=await workschedulingApi.getProcessList(params)
+}
+const processChange=(val:any)=>{
+     console.log("processChange-81",val)
+     getCurrentWorkerList(val)
+}
+//获取工序人员
+const getCurrentWorkerList = async (val) => {
+console.log("personOption-91",val)
+  let params = {
+    planDayCode: rowData.value.planMasterCode,
+    processCode: val
+  }
+  personOption.value = await workschedulingApi.getCurrentWorkerList(params)
+  
+}
+//报工数量处理
+const handleCount = () => {
+  if (reportCount.value > rowData.value.planCount) {
+    message.alert('报工数量不能超出计划数量！计划数【'+rowData.value.planCount+'】')
+    reportCount.value =rowData.value.planCount
+    return
+  }
+
+  if (checkFlag.value) {
+    if (reportCount.value < qualified.value) {
+      message.alert('合格数不能超出报工数！')
+      qualified.value=0
+      return
+    }
+    if (qualified.value == undefined || qualified.value == 0) {
+      qualified.value = reportCount.value
+    }
+
+    unqualified.value = reportCount.value - qualified.value
+  }
+}
+//提交报工
+const saveReport = async() => {
+  let data = {
+    reportDate: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
+    schedulingCode: rowData.value.schedulingCode,
+    processCode: processCodeSelected.value,
+    list: [
+      {
+        reportCount: reportCount.value,
+        workTerm: workTerm.value,
+        reportPerson: personSelected.value,
+        qualified: qualified.value,
+        unqualified: unqualified.value
+      }
+    ]
+  }
+  saveFlag.value = true
+  //console.log("report-saveReport-82",data)
+  await workschedulingApi.reportWorkByProcess(data)
+  saveFlag.value = false
+  dialogVisible.value = false
+  emit('close')
+}
+// 传递给父类
+const emit = defineEmits(['success', 'close'])
+
+defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
+</script>

src/views/mes/workScheduling/index.vue

@@ -67,7 +67,8 @@
           @searchTableSuccessDetail="searchTableSuccessDetail"
           :key="count"
   />
-
+ <Report ref="reportRef" @close="handleClose"></Report>
+ <Finish ref="reportFinishRef" @close="handleClose"></Finish>
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/work-scheduling/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
@@ -81,7 +82,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from './components/Detail.vue'
-import { async } from '@antv/x6/lib/registry/marker/async'
+import Report from './components/report.vue'
+import Finish from './components/finish.vue'
 
 defineOptions({ name: 'MesWorkScheduling' })
 
@@ -167,14 +169,18 @@ const buttonBaseClick = (val, item) => {
 //     FINISHED("9", "已完成");
 // 列表-操作按钮
 const butttondata=(row) =>{ return [
-  defaultButtons.mainListEditBtn({label:"调序",hasPermi:'mes:workScheduling:update'}), // 编辑
+  defaultButtons.mainListEditBtn({label:"调序",hide: isShowMainButton(row,['-1','0','3']),hasPermi:'mes:workScheduling:update'}), // 编辑
   //defaultButtons.mainListDeleteBtn({hasPermi:'mes:workScheduling:delete'}), // 删除
   defaultButtons.mainListHandleBtn({label:"终止",name:'terminate',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}), //
   defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
   defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}),
-  //defaultButtons.mainListHandleBtn({label:"变更",name:'change', hasPermi:'mes:workScheduling:update'}), //
+  defaultButtons.mainListHandleBtn({label:"开工",name:'start',hide: isShowMainButton(row,['0']),hasPermi:'mes:workScheduling:update'}),
+  defaultButtons.mainListHandleBtn({label:"报工",name:'report',hide: isShowMainButton(row,['1'] ),hasPermi:'mes:workScheduling:update'}),
+  defaultButtons.mainListHandleBtn({label:"完工",name:'finish',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
+  defaultButtons.mainListHandleBtn({label:"叫料",name:'callMaterial',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
 ]}
-
+const reportRef=ref()
+const reportFinishRef=ref()
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
@@ -185,7 +191,16 @@ const buttonTableClick = async (val, row) => {
     changeBillStatus(row,"3")
   }else if (val == 'resume') { // 恢复
     changeBillStatus(row,"1")
+  }else if(val=='start'){
+    changeBillStatus(row,"1")
+  }else if(val=='report'){
+    reportRef.value.openDetail(row,"报工")
+  }else if(val=='finish'){
+    finishReport(row)
+  } else if(val=='callMaterial'){
+    
   }
+  getList()
 }
 
 /** 添加/修改操作 */
@@ -193,7 +208,20 @@ const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
-
+//完工报工
+const finishReport=async(row)=>{
+  let params={
+    planDayCode:row.planMasterCode,
+    processCode:row.workingNode
+  }
+  //console.log("workscheduling-finishReport-213",row)
+  let res=await WorkSchedulingApi.getNodePosition(params)
+  if(res==='end'){
+    reportFinishRef.value.openDetail(row,"完工")
+  }else{
+    message.alert("当前工序不是完工工序，不能进行完工操作！")
+  }
+}
 // form表单提交
 const formsSuccess = async (formType,data) => {
   var isHave =WorkScheduling.allSchemas.formSchema.some(function (item) {
@@ -264,7 +292,9 @@ const importTemplateData = reactive({
 const importSuccess = () => {
   getList()
 }
-
+const handleClose=()=>{
+  getList()
+}
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {

src/views/mes/workScheduling/workScheduling.data.ts

@@ -118,7 +118,8 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '执行状态',
-    field: 'flagDo',
+    // field: 'flagDo',
+    field: 'status',
     sort: 'custom',
     isSearch: true,
     isForm:false,
@@ -163,8 +164,9 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
     label: '操作',
     field: 'action',
     isForm: false,
+    width: '220px',
     table: {
-      width: 150,
+      width: 'wrapContent',
       fixed: 'right'
     }
   }

src/views/qms/inspection/inspectionJob/index.vue → src/views/qms/inspectionJob/index.vue

@@ -59,7 +59,7 @@
 <script setup lang="ts">
   import download from '@/utils/download'
   import { InspectionJobMain, InspectionJobMainRules, InspectionJobDetail, InspectionJobDetailRules,InspectionJobPackage,InspectionJobPackageRules} from './inspectionJobMain.data'
-  import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../../basicDataManage/inspectionTemplate/inspectionTemplate.data'
+  import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../inspectionTemplate/inspectionTemplate.data'
 
   import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
   import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'

src/views/qms/basicDataManage/inspectionScheme/addForm.vue → src/views/qms/inspectionScheme/addForm.vue

@@ -637,7 +637,7 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
 import { SearchTable } from '@/components/SearchTable'
 import { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data'
-import { InspectionTemplateMain } from '@/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data'
+import { InspectionTemplateMain } from '@/views/qms/inspectionTemplate/inspectionTemplate.data'
 import * as InspectionTemplateApi from '@/api/qms/inspectionTemplate'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import * as ItemBasicApi from '@/api/wms/itembasic'
@@ -645,9 +645,9 @@ import * as SamplingProcessApi from '@/api/qms/samplingProcess' //采样过程
 import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //检验方法
 import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //检验方法
 import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则
-import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则
+import { DynamicRule } from '@/views/qms/dynamicRule/dynamicRule.data' //动态修改规则
 import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集
-import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集
+import { SelectedSet } from '@/views/qms/selectedSet/selectedSet.data' //选择集
 import {validateTwoNum} from '@/utils/validator'
 
 const message = useMessage() // 消息弹窗

src/views/qms/basicDataManage/inspectionTemplate/addForm.vue → src/views/qms/inspectionTemplate/addForm.vue

@@ -431,9 +431,9 @@ import * as SamplingProcessApi from '@/api/qms/samplingProcess' //采样过程
 import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //检验方法
 import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //检验方法
 import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则
-import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则
+import { DynamicRule } from '@/views/qms/dynamicRule/dynamicRule.data' //动态修改规则
 import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集
-import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集
+import { SelectedSet } from '@/views/qms/selectedSet/selectedSet.data' //选择集
 import { validateInteger,validateTwoNum,validateMaxNumber5,validateNumSix } from '@/utils/validator'
 const message = useMessage() // 消息弹窗
 

src/views/system/user/UserAssignRoleForm.vue

@@ -1,13 +1,13 @@
 <template>
   <Dialog v-model="dialogVisible" title="分配角色">
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="80px">
       <el-form-item label="用户名称">
         <el-input v-model="formData.username" :disabled="true" />
       </el-form-item>
       <el-form-item label="用户昵称">
         <el-input v-model="formData.nickname" :disabled="true" />
       </el-form-item>
-      <el-form-item label="角色">
+      <el-form-item label="角色" prop="roleIds">
         <el-select v-model="formData.roleIds" multiple placeholder="请选择角色">
           <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
@@ -37,6 +37,9 @@ const formData = ref({
   username: '',
   roleIds: []
 })
+const formRules = reactive({
+  roleIds: [{ required: true, message:'请选择角色', trigger: 'change' }]
+})
 const formRef = ref() // 表单 Ref
 const roleList = ref([]) // 角色的列表
 

src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts

@@ -144,7 +144,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     form: {
       component: 'Switch',
-      value: 'TRUE',
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
@@ -435,7 +435,7 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     form: {
       component: 'Switch',
-      value: 'TRUE',
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'

src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue

@@ -0,0 +1,233 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="RelegateRequest.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="RelegateRequest.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="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 #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="RelegateRequestRules"
+    :formAllSchemas="RelegateRequest.allSchemas"
+    :apiUpdate="RelegateRequestApi.updateRelegateRequest"
+    :apiCreate="RelegateRequestApi.createRelegateRequest"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="RelegateRequest.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/relegate-request/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { RelegateRequest,RelegateRequestRules } from './relegateRequest.data'
+import * as RelegateRequestApi from '@/api/wms/relegateRequest'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'RelegateRequest' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(RelegateRequest.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: RelegateRequestApi.getRelegateRequestPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:relegate-request:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:relegate-request:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:relegate-request:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  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:relegate-request:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:relegate-request:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  if (formType === 'create') {
+    await RelegateRequestApi.createRelegateRequest(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await RelegateRequestApi.updateRelegateRequest(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicRelegateRequest')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RelegateRequestApi.deleteRelegateRequest(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await RelegateRequestApi.exportRelegateRequest(tableObject.params)
+    download.excel(data, '物料降级信息.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '物料降级信息导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await RelegateRequestApi.importTemplate()
+})
+
+</script>

src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts

@@ -0,0 +1,243 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+// 表单校验
+export const RelegateRequestRules = reactive({
+  itemCode: [required],
+  downItemCode: [required],
+  businessType: [required],
+  available: [required],
+  departmentCode: [required],
+  concurrencyStamp: [required],
+})
+
+export const RelegateRequest = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '客户物料基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '降级后物料代码',
+    field: 'downItemCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从库区类型',
+    field: 'fromAreaTypes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到库区类型',
+    field: 'toAreaTypes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm:false,
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      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')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '工作流流水号',
+    field: 'serialNumber',
+    isForm:false,
+    sort: 'custom',
+  },
+  {
+    label: '权限所属人员id',
+    field: 'ruleUserId',
+    sort: 'custom',
+    isForm:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue

@@ -28,7 +28,7 @@
       v-model:sort="tableObject.sort"
     >
       <template #supplierCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '供应商代码', row.supplierCode)">
+        <el-button type="primary" link @click="openDetail(row, t('ts.供应商代码'), row.supplierCode)">
           <span>{{ row.supplierCode }}</span>
         </el-button>
       </template>
@@ -183,7 +183,7 @@ const formsSuccess = async (formType,data) => {
       });
       if(isHave){
         if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-          message.error('失效时间要大于生效时间')
+          message.error(t('ts.失效时间要大于生效时间'))
           return;
         }
       }
@@ -239,7 +239,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasepriceApi.exportPurchaseprice(tableObject.params)
-    download.excel(data, '采购价格单.xlsx')
+    download.excel(data, `${t('ts.采购价格单')}.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -254,7 +254,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '采购价格单导入模版.xlsx'
+  templateTitle: `${t('ts.采购价格单导入模版')}.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {

src/views/wms/basicDataManage/supplierManage/supplier/index.vue

@@ -174,7 +174,7 @@ const formsSuccess = async (formType, data) => {
   })
   if (isHave) {
     if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
-      message.error('失效时间要大于生效时间')
+      message.error(t('ts.失效时间要大于生效时间'))
       return
     }
   }
@@ -221,7 +221,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SupplierApi.exportSupplier(tableObject.params)
-    download.excel(data, '供应商.xlsx')
+    download.excel(data, `${t('ts.供应商')}.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -236,7 +236,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '供应商导入模版.xlsx'
+  templateTitle: `${t('ts.供应商导入模版')}.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {

src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue

@@ -28,7 +28,7 @@
       v-model:sort="tableObject.sort"
     >
       <template #supplierCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '供应商代码', row.supplierCode)">
+        <el-button type="primary" link @click="openDetail(row, t('ts.供应商代码'), row.supplierCode)">
           <span>{{ row.supplierCode }}</span>
         </el-button>
       </template>
@@ -182,7 +182,7 @@ const formsSuccess = async (formType,data) => {
       });
       if(isHave){
         if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-          message.error('失效时间要大于生效时间')
+          message.error(t('ts.失效时间要大于生效时间'))
           return;
         }
       }
@@ -238,7 +238,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SupplieritemApi.exportSupplieritem(tableObject.params)
-    download.excel(data, '供应商物料.xlsx')
+    download.excel(data, `${t('ts.供应商物料')}.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -253,7 +253,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '供应商物料导入模版.xlsx'
+  templateTitle: `${t('ts.供应商物料导入模版')}.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {

src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts

@@ -4,6 +4,9 @@ import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as CustomerApi from '@/api/wms/customer'
 import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
 
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Packageunit } from '@/views/wms/basicDataManage/itemManage/packageunit/packageunit.data'
+
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 
@@ -357,15 +360,28 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
     tableForm:{
-      type: 'Select'
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装规格代码',
+      searchField: 'code',
+      searchTitle: '包装规格信息',
+      searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+      searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+      }
     }
   },
   {

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

@@ -0,0 +1,224 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SaleShipmentMainRecord.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SaleShipmentMainRecord.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="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 #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="SaleShipmentMainRecordRules"
+    :formAllSchemas="SaleShipmentMainRecord.allSchemas"
+    :apiUpdate="SaleShipmentMainRecordApi.updateSaleShipmentMainRecord"
+    :apiCreate="SaleShipmentMainRecordApi.createSaleShipmentMainRecord"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="SaleShipmentMainRecord.allSchemas" />
+
+  <!-- 导入 -->
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SaleShipmentMainRecord,SaleShipmentMainRecordRules } from './saleShipmentMainRecord.data'
+import * as SaleShipmentMainRecordApi from '@/api/wms/saleShipmentMainRecord'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'SaleShipmentMainRecord' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SaleShipmentMainRecord.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SaleShipmentMainRecordApi.getSaleShipmentMainRecordPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:saleShipmentMainRecord:create'}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:'wms:saleShipmentMainRecord:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:saleShipmentMainRecord:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:saleShipmentMainRecord:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =SaleShipmentMainRecord.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await SaleShipmentMainRecordApi.createSaleShipmentMainRecord(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await SaleShipmentMainRecordApi.updateSaleShipmentMainRecord(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSaleShipmentMainRecord')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SaleShipmentMainRecordApi.deleteSaleShipmentMainRecord(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SaleShipmentMainRecordApi.exportSaleShipmentMainRecord(tableObject.params)
+    download.excel(data, '销售发运记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>

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

@@ -0,0 +1,278 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const SaleShipmentMainRecordRules = reactive({
+})
+
+export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '发票时间',
+    field: 'invoiceTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      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: '执行时间',
+    field: 'executeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      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: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      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')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const SaleShipmentDetailRecordRules = reactive({
+})
+
+export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '销售订单号',
+    field: 'soNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '销售订单行',
+    field: 'soLine',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      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')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

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

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="SaleShipmentMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...SaleShipmentMain.allSchemas.searchSchema,...SaleShipmentDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -33,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
+      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -43,7 +43,7 @@
   <BasicForm
     ref="basicFormRef"
     :isOpenSearchTable="true"
-    fieldTableColumn="itemCode"
+    fieldTableColumn="soLine"
     @success="getList"
     :rules="SaleShipmentMainRules"
     :formAllSchemas="SaleShipmentMain.allSchemas"
@@ -79,7 +79,7 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/sale-shipment-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/sale-shipment-main-request/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
@@ -99,14 +99,21 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(SaleShipmentMain.allSchemas.tableColumns)
+const tableColumns = ref([...SaleShipmentMain.allSchemas.tableColumns,...SaleShipmentDetail.allSchemas.tableMainColumns])
 
 //定义  展示子表数据时是否显示新增/修改/删除按钮
 const trueFalse = ref(false)
 
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
+    if (type == 'tableForm') {
+      row['soLine'] = val[0]['lineNumber']
+      row['soNumber'] = val[0]['number']    
+      row['itemCode'] = val[0]['itemCode']
+      row['projectCode'] = val[0]['projectCode']
+      row['uom'] = val[0]['uom']
+    }else {
       const setV = {}
     if(formField == 'CustomerCode') {
       setV['CustomerCode'] = val[0]['CustomerCode']
@@ -114,6 +121,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
         setV[formField] = val[0][searchField]
       }
       formRef.setValues(setV)
+    }
   })
 }
 
@@ -121,7 +129,15 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
+    if(formField == 'soLine') {
+      setV['soLine'] = val[0]['lineNumber']
+      setV['soNumber'] = val[0]['number']    
+      setV['itemCode'] = val[0]['itemCode']
+      setV['projectCode'] = val[0]['projectCode']
+      setV['uom'] = val[0]['uom']
+    }else {
       setV[formField] = val[0][searchField]
+    }
     formRef.setValues(setV)
   })
 }
@@ -134,7 +150,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: SaleShipmentMainApi.getSaleShipmentMainPage // 分页接口
+  getListApi: SaleShipmentDetailApi.getSaleShipmentDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -180,12 +196,34 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
+    return [
   defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-request:update'}), // 编辑
+  defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:sale-shipment-main-request:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:sale-shipment-main-request:reAdd'}), //重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:sale-shipment-main-request:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:update'}), // 编辑
   defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-request:delete'}), // 删除
   ]
-
+}
 const tableData = ref([])
 
 
@@ -247,9 +285,18 @@ const submitForm = async (formType, data) => {
   }
 }
 
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+SaleShipmentDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+
 // 添加明细
 const handleAddTable = () => {
-    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  let tableForm = JSON.parse(JSON.stringify(tableFormKeys))
+    tableData.value.push(tableForm)
   }
 // 删除明细
 const handleDeleteTable = (item, index) => {

src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts

@@ -4,8 +4,8 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as CustomerApi from '@/api/wms/customer'
 import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
 
-import * as SaleMainApi from '@/api/wms/saleMain'
+import * as SaleDetailApi from '@/api/wms/saleDetail'
-import { SaleMain } from '@/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data'
+import { SaleDetail } from '@/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data'
 
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -27,6 +27,9 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'customerCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -51,6 +54,9 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false,
+    table: {
+      width: 150
+    },
   },
   {
     label: '业务类型',
@@ -65,11 +71,15 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isForm: false,
   },
   {
     label: '发票时间',
     field: 'invoiceTime',
     sort: 'custom',
+    table: {
+      width: 180
+    },
     formatter: dateFormatter,
     search: {
       component: 'DatePicker',
@@ -87,6 +97,13 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '地点',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: true,
+        hiddenInMain: true,
+  },
   {
     label: '部门',
     field: 'departmentCode',
@@ -243,33 +260,14 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
     tableForm: {
-      isInpuFocusShow: true, // 开启查询弹窗
+      type: 'Select',
-      searchListPlaceholder: '请选择销售订单号',
+      disabled: true
-      searchField: 'number',
-      searchTitle: '销售订单信息',
-      searchAllSchemas: SaleMain.allSchemas,
-      searchPage: SaleMainApi.getSaleMainPage,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true,
+        disabled: true
-        searchListPlaceholder: '请选择销售订单号',
-        searchField: 'number',
-        searchTitle: '销售订单信息',
-        searchAllSchemas: SaleMain.allSchemas,
-        searchPage: SaleMainApi.getSaleMainPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
       }
     }
   },
@@ -285,8 +283,8 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchListPlaceholder: '请选择销售订单行',
       searchField: 'lineNumber',
       searchTitle: '销售订单信息',
-      searchAllSchemas: SaleMain.allSchemas,
+      searchAllSchemas: SaleDetail.allSchemas,
-      searchPage: SaleMainApi.getSaleMainPage,
+      searchPage: SaleDetailApi.getSaleDetailPage,
       searchCondition: [{
         key: 'available',
         value: 'TRUE',
@@ -300,27 +298,35 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择销售订单行',
         searchField: 'lineNumber',
         searchTitle: '销售订单信息',
-        searchAllSchemas: SaleMain.allSchemas,
+        searchAllSchemas: SaleDetail.allSchemas,
-        searchPage: SaleMainApi.getSaleMainPage,
+        searchPage: SaleDetailApi.getSaleDetailPage,
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+        },
+        {
+          key: 'customerCode',
+          value: 'customerCode',
+          isMainValue: true
         }]
       }
     }
   },
   {
-    label: '从货主代码',
+    label: '物品代码',
-    field: 'fromOwnerCode',
+    field: 'itemCode',
     sort: 'custom',
     isSearch: true,
+    tableForm: {
+      type: 'Select',
+      disabled: true
     },
-  {
+    form: {
-    label: '包装号',
+      componentProps: {
-    field: 'packingNumber',
+        disabled: true
-    sort: 'custom',
+      }
-    isSearch: true,
+    }
   },
   {
     label: '批次',
@@ -329,62 +335,84 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '库存状态',
+    label: '从货主代码',
-    field: 'inventoryStatus',
+    field: 'fromOwnerCode',
     sort: 'custom',
     isSearch: true,
-    form: {
+    isForm: false,
-      component: 'Radio'
+    isTableForm: false
-    },
   },
   {
-    label: '从库位代码',
+    label: '包装号',
-    field: 'fromLocationCode',
+    field: 'packingNumber',
     sort: 'custom',
     isSearch: true,
+    isForm: false,
+    isTableForm: false
   },
+
   {
-    label: '主表ID',
+    label: '库存状态',
-    field: 'masterId',
+    field: 'inventoryStatus',
+    // dictType: DICT_TYPE.INVENTORY_STATUS,
+    // dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    isSearch: true,
+    table: {
-    form: {
+      width: 150
-      component: 'InputNumber',
-      value: 0
     },
+    isTableForm: false,
+    hiddenInMain: true,
+    isForm: false,
   },
   {
-    label: '物品代码',
+    label: '客户库位',
-    field: 'itemCode',
+    field: 'fromLocationCode',
     sort: 'custom',
     isSearch: true,
+    isTableForm: true
   },
+
   {
     label: '物品名称',
     field: 'itemName',
     sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false
   },
   {
     label: '物品描述1',
-    field: 'itemDesc1',
+    field: 'itemName',
     sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false
   },
   {
     label: '物品描述2',
-    field: 'itemDesc2',
+    field: 'itemName',
     sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false
   },
   {
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
     isSearch: true,
+    isTableForm: false,
+    hiddenInMain: true,
   },
   {
-    label: '数量',
+    label: '开票数量',
     field: 'qty',
     sort: 'custom',
     isSearch: true,
@@ -392,14 +420,29 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计量单位',
     field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
     isSearch: true,
+    isTableForm: false
   },
   {
     label: '创建时间',
@@ -416,16 +459,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
-  },
+    isTableForm: false
-  {
-    label: '地点ID',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
   },
   {
     label: '操作',

src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts

@@ -150,6 +150,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -159,7 +160,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -169,6 +170,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '业务类型',
     field: 'businessType',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -177,6 +179,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -185,6 +188,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '创建者',
     field: 'creator',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -200,6 +204,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -230,7 +235,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -240,6 +245,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '从库区代码范围',
     field: 'fromAreaCodes',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -250,7 +256,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -323,6 +329,7 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
     label: '从货主代码',
     field: 'fromOwnerCode',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -456,6 +463,7 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 180
     },
@@ -468,42 +476,7 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
   },
-  {
+  
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '物料名称',
     field: 'itemName',
@@ -532,6 +505,7 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -579,7 +553,43 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
@@ -590,6 +600,7 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
     field: 'action',
     isDetail: false,
     isForm: false ,
+    isTable:false,
     table: {
       width: 150,
       fixed: 'right'

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts

@@ -141,19 +141,20 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    isForm: false
+    isForm: false,
+    isTable:false,
   },
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
     },
-    isForm: false
+    isForm: false,
   },
   {
     label: '从库区代码范围',
@@ -162,7 +163,8 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
     label: '业务类型',
@@ -177,7 +179,8 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isForm: false
+    isForm: false,
+    isTable:false,
   },
   {
     label: '备注',
@@ -208,6 +211,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
         valueFormat: 'x',
       }
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -217,6 +221,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -269,6 +274,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
     isForm:false,
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userDeptArray.find((account) => account.id == cellValue)?.name
@@ -325,6 +331,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
         valueFormat: 'x',
       }
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -334,6 +341,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -341,7 +349,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -362,7 +370,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -383,7 +391,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -782,6 +790,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     table: {
       width: 150
     },
+    isTable:false,
     isTableForm: false,
     isForm: false,
   },
@@ -790,11 +799,11 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     field: 'packUnit',
     // dictType: DICT_TYPE.PACK_UNIT,
     // dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
     isTableForm: false,
     isForm: false,
   },
@@ -805,6 +814,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     table: {
       width: 150
     },
+    isTable:false,
     isTableForm: false,
     isForm: false,
   },
@@ -815,6 +825,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     table: {
       width: 180
     },
+    hiddenInMain:true,
     isTableForm: false,
     form: {
       componentProps: {
@@ -888,6 +899,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    sortTableDefault:1002,
     table: {
       width: 150
     },
@@ -895,6 +907,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
   {
     label: '创建时间',
     field: 'createTime',
+    sortTableDefault:1000,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -919,6 +932,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     label: '创建者',
     field: 'creator',
     sort: 'custom',
+    sortTableDefault:1001,
     table: {
       width: 150
     },
@@ -929,6 +943,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     label: '最后更新时间',
     field: 'updateTime',
     formatter: dateFormatter,
+    isTable:false,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
@@ -952,6 +967,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     label: '最后更新者',
     field: 'updater',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -1014,6 +1030,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       width: 150,
       fixed: 'right'
     },
+    hiddenInMain:true,
     isTableForm:true,
     tableForm: {
       type: 'action',

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue

@@ -62,7 +62,7 @@
     :detailAllSchemas="ProductreceiptJobDetail.allSchemas"
     :detailAllSchemasRules="ProductreceiptJobDetailRules"
     :searchTableParams="searchTableParams"
-    :apiPage="ProductreceiptJobDetailApi.getProductreceiptJobDetailPage"
+    :apiPage="ProductreceiptJobDetailApi.getProductreceiptJobDetailPageScarp"
   />
 </template>
 
@@ -108,7 +108,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptJobDetailApi.getProductreceiptJobDetailPage // 报废收货分页接口
+  getListApi: ProductreceiptJobDetailApi.getProductreceiptJobDetailPageScarp // 报废收货分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue

@@ -57,7 +57,7 @@
     :allSchemas="ProductreceiptRecordMain.allSchemas"
     :detailAllSchemas="ProductreceiptRecordDetail.allSchemas"
     :detailAllSchemasRules="ProductreceiptRecordDetailRules"
-    :apiPage="ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPage"
+    :apiPage="ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPageScrap"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
   />
@@ -128,7 +128,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPage // 报废收货分页接口
+  getListApi: ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPageScrap // 报废收货分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@@ -66,7 +66,7 @@
     :detailAllSchemasRules="ProductreceiptRequestDetailRules"
     :apiCreate="ProductreceiptRequestDetailApi.createProductreceiptRequestDetail"
     :apiUpdate="ProductreceiptRequestDetailApi.updateProductreceiptRequestDetail"
-    :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage"
+    :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageScrap"
     :apiDelete="ProductreceiptRequestDetailApi.deleteProductreceiptRequestDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :buttondataTable="buttondataTable"
@@ -158,7 +158,7 @@ const isCreateLabel = ref(false)
 const formLabelRef = ref()
 const labelType = ref('') // 标签类别 采购还是制造等 
 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
-  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage
+  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageScrap
 })
 const { getList:getDetailList } = detatableMethods
 
@@ -203,7 +203,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage // 报废收货分页接口
+  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageScrap // 报废收货分页接口
 })
 
 // 获得表格的各种操作
@@ -545,9 +545,12 @@ const submitForm = async (formType, data) => {
   }
   try {
     if (formType === 'create') {
+      data.productionLineCode = data.subList[0].productionLineCode;
+      data.type='scrap'
       await ProductreceiptRequestMainApi.createProductreceiptRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
+      data.type='scrap'
       await ProductreceiptRequestMainApi.updateProductreceiptRequestMain(data)
       message.success(t('common.updateSuccess'))
     }

src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue

@@ -589,6 +589,7 @@ const submitForm = async (formType, data) => {
     if (!item.childList) {
       childListRs = false
     }
+    item.productionLineCode = data.productionLineCode
   })
   if (!childListRs) {
     message.warning('请填写Bom信息！')

src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts

@@ -592,9 +592,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: 'Bom来源库位代码',
     field: 'fromLocationCode',
-    sort: 'custom',
     table: {
-      width: 160
+      width: 190
     },
     sortTableDefault:18,
     tableForm: {

src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts

@@ -1,25 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
-import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
+
-import * as WorkshopApi from "@/api/wms/workshop";
-import {Team} from "@/views/wms/basicDataManage/orderManage/team/team.data";
-import * as TeamApi from "@/api/wms/team";
-import {Shift} from "@/views/wms/basicDataManage/orderManage/shift/shift.data";
-import * as ShiftApi from "@/api/wms/shift";
-import {
-  Productionline
-} from "@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data";
-import * as ProductionlineApi from "@/api/wms/productionline";
-import {
-  Workstation
-} from "@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data";
-import * as WorkstationApi from "@/api/wms/workstation";
-import {Process} from "@/views/wms/basicDataManage/factoryModeling/process/process.data";
-import * as ProcessApi from "@/api/wms/process";
-import {
-  Productionlineitem
-} from "@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data";
-import * as ProductionlineitemApi from "@/api/wms/productionlineitem";
 
 /**
  * @returns {Array} 制品报废记录主表
@@ -50,7 +31,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isForm:false,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150

src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

@@ -648,6 +648,7 @@ const submitForm = async (formType, data) => {
     if (!item.childList) {
       childListRs = false
     }
+    item.productionLineCode = data.productionLineCode
   })
   if (!childListRs) {
     message.warning('请填写Bom信息！')

src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

@@ -1053,6 +1053,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isDetail: false,
     isForm: false ,
+    hiddenInMain:true,
     table: {
       width: 150,
       fixed: 'right'

src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue

@@ -151,10 +151,10 @@ const buttonTableClick = async (val, row) => {
 /** 生成采购上架申请按钮操作 */
 const handlePutawayRequest = async (number:string) => {
   try{
-    await message.confirm(t('确认生成上架申请吗？'))
+    await message.confirm(t('ts.确认生成上架申请吗？'))
     tableObject.loading = true
     await InspectRecordMainApi.createPutAwayRequest(number)
-    message.success(t('上架申请生成成功'))
+    message.success(t('ts.上架申请生成成功'))
     await getList()
   }catch{}finally{
     tableObject.loading = false

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@@ -177,10 +177,10 @@ const buttonTableClick = async (val, row) => {
 /** 生成采购上架申请按钮操作 */
 const handleCreatePutawayRequest = async (number:string) => {
   try{
-    await message.confirm(t('确认生成上架申请吗？'))
+    await message.confirm(t('ts.确认生成上架申请吗？'))
     tableObject.loading = true
     await PurchasereceiptRecordMainApi.createPutawayRequest(number)
-    message.success(t('上架申请生成成功'))
+    message.success(t('ts.上架申请生成成功'))
     await getList()
   }catch{}finally{
     tableObject.loading = false
@@ -190,10 +190,10 @@ const handleCreatePutawayRequest = async (number:string) => {
 /** 生成到货检验申请按钮操作 */
 const handleCreateInspectRequest = async (number:string) => {
   try{
-    await message.confirm(t('确认生成到货检验申请吗？'))
+    await message.confirm(t('ts.确认生成到货检验申请吗？'))
     tableObject.loading = true
     await PurchasereceiptRecordMainApi.createInspectRequest(number)
-    message.success(t('到货检验申请生成成功'))
+    message.success(t('ts.到货检验申请生成成功'))
     await getList()
   }catch{}finally{
     tableObject.loading = false
@@ -227,7 +227,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 
 // 详情 table 操作扩展 按钮
 const buttondataTable = ref([{
-    label: '查看其他包装规格',
+    label: t('ts.查看其他包装规格'),
     name: 'viewParentPickingNumber',
     hide: false,
     type: 'primary',
@@ -268,7 +268,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
-    download.excel(data, '采购收货记录主.xlsx')
+    download.excel(data, `${t('ts.采购收货记录主')}.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@@ -402,7 +402,7 @@ const submitFormLabel = async (formType, data) => {
     console.log("data==",data)
     data.subList = detatableData.tableList
     console.log("detatableData",detatableData)
-    await message.confirm('是否为此数据生成标签？')
+    await message.confirm(t('ts.是否为此数据生成标签？'))
     await PurchasereceiptRequestMainApi.genLabel(data) //genLabelId.value
     isCreateLabel.value = true
     message.success('创建标签成功')

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue

@@ -168,7 +168,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params)
-    download.excel(data, '采购退货记录主.xlsx')
+    download.excel(data, `${t('ts.采购退货记录主')}.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

@@ -407,7 +407,7 @@ const { getList:getDetailList } = detatableMethods
 // 生成标签按钮操作
 const submitFormLabel = async (formType, data) => {
   try {
-    await message.confirm('是否为此数据生成标签？')
+    await message.confirm(t('ts.是否为此数据生成标签？'))
     await PurchasereceiptRequestMainApi.genLabel(genLabelId.value)
     isCreateLabel.value = true
     message.success('创建标签成功')

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

@@ -234,11 +234,11 @@ const openForm =async (type: string, row?: number) => {
 const handleClose = async (id : number) => {
     try {
       // 关闭的二次确认
-      await message.confirm('是否关闭所选中数据？')
+      await message.confirm(t('ts.是否关闭所选中数据？'))
       tableObject.loading = true
       // 发起关闭
       await DemandforecastingMainApi.closePurchaseMain(id)
-      message.success(t('关闭成功!'))
+      message.success(t('ts.关闭成功!'))
       tableObject.loading = false
       // 刷新列表
       await getList()
@@ -251,11 +251,11 @@ const handleClose = async (id : number) => {
   const handleOpen = async (id : number) => {
     try {
       // 打开的二次确认
-      await message.confirm('是否打开所选中数据？')
+      await message.confirm(t('ts.是否打开所选中数据？'))
       tableObject.loading = true
       // 发起打开
       await DemandforecastingMainApi.openPurchaseMain(id)
-      message.success(t('打开成功!'))
+      message.success(t('ts.打开成功!'))
       tableObject.loading = false
       // 刷新列表
       await getList()
@@ -268,11 +268,11 @@ const handleClose = async (id : number) => {
   const handlePublish = async (id : number) => {
     try {
       // 发布的二次确认
-      await message.confirm('是否发布所选中数据？')
+      await message.confirm(t('ts.是否发布所选中数据？'))
       tableObject.loading = true
       // 发起发布
       await DemandforecastingMainApi.publishPurchaseMain(id)
-      message.success(t('发布成功!'))
+      message.success(t('ts.发布成功!'))
       tableObject.loading = false
       // 刷新列表
       await getList()
@@ -285,11 +285,11 @@ const handleClose = async (id : number) => {
   const handleWit = async (id : number) => {
     try {
       // 下架的二次确认
-      await message.confirm('是否下架所选中数据？')
+      await message.confirm(t('ts.是否下架所选中数据？'))
       tableObject.loading = true
       // 发起下架
       await DemandforecastingMainApi.witPurchaseMain(id)
-      message.success(t('下架成功!'))
+      message.success(t('ts.下架成功!'))
       tableObject.loading = false
       // 刷新列表
       await getList()
@@ -330,7 +330,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await DemandforecastingMainApi.exportDemandforecastingMain(tableObject.params)
-    download.excel(data, '要货预测主.xlsx')
+    download.excel(data, `${t('ts.要货预测主')}.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -383,7 +383,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '要货预测主导入模版.xlsx'
+  templateTitle: `${t('ts.要货预测主导入模版')}.xlsx`
 })
 
 // 导入成功之后

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue

@@ -44,7 +44,7 @@
   <BasicForm ref="formRef" 
     @success="getList" 
     :isOpenSearchTable="true"
-    :indexTableColumn="1"
+    fieldTableColumn="lineNumber"
     :rules="PurchaseMainRules" 
     :formAllSchemas="PurchaseMain.allSchemas"
     :tableAllSchemas="PurchaseDetail.allSchemas" 
@@ -141,7 +141,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
             })
           }
           if(repeatCode.length>0){
-            message.warning(`物料代码${repeatCode.join(',')}已经存在`);
+            message.warning(`${t('ts.物料代码')}${repeatCode.join(',')}${t('ts.已经存在')}`);
           }
           if(val.length>0){
             //frm表单回显
@@ -367,11 +367,11 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
   const handleClose = async (id : number) => {
     try {
       // 关闭的二次确认
-      await message.confirm('是否关闭所选中数据？')
+      await message.confirm(t('ts.是否关闭所选中数据？'))
       tableObject.loading = true
       // 发起关闭
       await PurchaseMainApi.closePurchaseMain(id)
-      message.success(t('关闭成功!'))
+      message.success(t('ts.关闭成功!'))
       tableObject.loading = false
       // 刷新列表
       await getList()
@@ -384,11 +384,11 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
   const handleOpen = async (id : number) => {
     try {
       // 打开的二次确认
-      await message.confirm('是否打开所选中数据？')
+      await message.confirm(t('ts.是否打开所选中数据？'))
       tableObject.loading = true
       // 发起打开
       await PurchaseMainApi.openPurchaseMain(id)
-      message.success(t('打开成功!'))
+      message.success(t('ts.打开成功!'))
       tableObject.loading = false
       // 刷新列表
       await getList()
@@ -401,11 +401,11 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
   const handlePublish = async (id : number) => {
     try {
       // 发布的二次确认
-      await message.confirm('是否发布所选中数据？')
+      await message.confirm(t('ts.是否发布所选中数据？'))
       tableObject.loading = true
       // 发起发布
       await PurchaseMainApi.publishPurchaseMain(id)
-      message.success(t('发布成功!'))
+      message.success(t('ts.发布成功!'))
       tableObject.loading = false
       // 刷新列表
       await getList()
@@ -418,11 +418,11 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
   const handleWit = async (id : number) => {
     try {
       // 下架的二次确认
-      await message.confirm('是否下架所选中数据？')
+      await message.confirm(t('ts.是否下架所选中数据？'))
       tableObject.loading = true
       // 发起下架
       await PurchaseMainApi.witPurchaseMain(id)
-      message.success(t('下架成功!'))
+      message.success(t('ts.下架成功!'))
       tableObject.loading = false
       // 刷新列表
       await getList()
@@ -440,7 +440,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
       // 发起导出
       exportLoading.value = true
       const data = await PurchaseMainApi.exportPurchaseMain(tableObject.params)
-      download.excel(data, '采购订单主.xlsx')
+      download.excel(data, `${t('ts.采购订单主')}.xlsx`)
     } catch {
     } finally {
       exportLoading.value = false
@@ -493,7 +493,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '采购订单主导入模版.xlsx'
+    templateTitle: `${t(`ts.采购订单主导入模版`)}.xlsx`
   })
 
   // 导入成功之后