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

.env.development

@@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html'
 VITE_JMREPORT_BASE_URL='http://localhost:12080'
 
 # 租户配置
-VITE_TENANT='["长春1379","成都1397","长春2379"]'
+VITE_TENANT='["英泰"]'
 
 # 查看质检报告环境
 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

.env.prod

@@ -4,10 +4,10 @@ NODE_ENV=production
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://dev.ccwin-in.com:25300/api'
+VITE_BASE_URL='http://dev.ccwin-in.com:28050/api'
 
 # 上传路径
-VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://dev.ccwin-in.com:28050/api/admin-api/infra/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=
@@ -31,24 +31,23 @@ VITE_BASE_PATH=/
 VITE_OUT_DIR=sfms3.0-ui
 
 # 自定义接口路径
-VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
+VITE_INTERFACE_URL='http://dev.ccwin-in.com:28050/api/magic/web/index.html'
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'
+VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:28050'
 
 # 租户配置
-VITE_TENANT='["长春1379","成都1397","长春2379"]'
+VITE_TENANT='["英泰"]'
 
 # 查看质检报告环境
-VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'
+VITE_REPORT_URL = 'http://dev.ccwin-in.com:28050'
 
 # 登录系统升级的提示
 VITE_SYSTERM_UPDATE_ALERT = true
-VITE_SYSTERM_UPDATE_URL = 'https://scptest.faway-hella.com/'
+VITE_SYSTERM_UPDATE_URL = 'https://dev.ccwin-in.com:28050/'
 
 # 是否需要验证码
 VITE_NEED_CODE = true
 
-
 # 是否需要下载PDA链接
 VITE_PDA_URL = false

.env.test

@@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:29000/magic/web/index.html'
 VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:29000'
 
 # 租户配置
-VITE_TENANT='["长春","成都"]'
+VITE_TENANT='["英泰"]'
 
 # 查看质检报告环境
 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

.env.wyf

@@ -3,11 +3,29 @@ NODE_ENV=development
 
 VITE_DEV=false
 
-# 请求路径
+
-VITE_BASE_URL='http://192.168.1.35:12080'
+
+# SCP 28040
+# WMS 28050
+# # 请求路径
+# VITE_BASE_URL='http://dev.ccwin-in.com:28040/api'
+
+# # 上传路径
+# VITE_UPLOAD_URL='http://dev.ccwin-in.com:28040/admin-api/infra/file/upload'
+
+
+# # 请求路径
+VITE_BASE_URL='http://192.168.1.196:12080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://192.168.1.35:12080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://192.168.1.196:12080/admin-api/infra/file/upload'
+
+# # 请求路径
+# VITE_BASE_URL='http://192.168.1.35:12080'
+
+# # 上传路径
+# VITE_UPLOAD_URL='http://192.168.1.35:12080/admin-api/infra/file/upload'
+
 
 # 接口前缀
 VITE_API_BASEPATH=/dev-api

src/api/wms/customerSaleInvoiceMain/index.ts

@@ -57,3 +57,14 @@ export const exportCustomerSaleInvoiceMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/customer-sale-invoice-main/get-import-template' })
 }
+
+// 查询客户销售开票记录列表
+export const getCustomerSaleInvoiceRecodeMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    // const data = {...params}
+    // return await request.post({ url: '/wms/customer-sale-invoice-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customer-sale-invoice-record-main/page`, params })
+  }
+}

src/api/wms/demandforecastingDetail/index.ts

@@ -125,3 +125,14 @@ export const getPageTableHead = async (params) => {
 export const queryVersion = async (params) => {
   return await request.get({ url: `/wms/demandforecasting-detail/queryVersion`, params })
 }
+
+// 预览要货计划
+export const getPreviewPlan = async (params) => {
+  return await request.get({ url: `/wms/demandforecasting-detail/preview`, params })
+}
+
+
+// 预览要货计划-保存
+export const generateOrderPlan = async (data) => {
+  return await request.post({ url: '/wms/demandforecasting-detail/generateOrderPlan', data })
+}

src/api/wms/productredressRequestDetail/index.ts

@@ -27,9 +27,11 @@ export interface ProductredressRequestDetailVO {
   itemDesc2: string
   projectCode: string
   qty: number
+  inventoryQty: number
   uom: string
   toOwnerCode: string
 }
+const message = useMessage() // 消息弹窗
 
 // 查询制品回收申请子列表
 export const getProductredressRequestDetailPage = async (params) => {
@@ -54,6 +56,10 @@ export const createProductredressRequestDetail = async (data: ProductredressRequ
 
 // 修改制品回收申请子
 export const updateProductredressRequestDetail = async (data: ProductredressRequestDetailVO) => {
+  if(parseFloat(data.inventoryQty) < parseFloat(data.qty)){
+    message.warning("回收数量不能大于库存数量")
+    return
+  }
   return await request.put({ url: `/wms/productredress-request-detail/update`, data })
 }
 

src/api/wms/purchasereceiptJobDetail/index.ts

@@ -43,6 +43,71 @@ export const getPurchasereceiptJobDetailPage = async (params) => {
     return await request.get({ url: `/wms/purchasereceipt-job-detail/page`, params })
   }
 }
+// 查询采购收货任务子列表
+export const getASNPurchasereceiptJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "ASN"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-job-detail/senior', data })
+  } else {
+    params.sourceType = "ASN"
+    delete params.source_type
+    return await request.get({ url: `/wms/purchasereceipt-job-detail/page`, params })
+  }
+}
+
+// 查询协定品收货任务子列表
+export const getToolPurchasereceiptJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "TOOL"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-job-detail/senior', data })
+  } else {
+    params.sourceType = "TOOL"
+    delete params.source_type
+    return await request.get({ url: `/wms/purchasereceipt-job-detail/page`, params })
+  }
+}
+
+// 查询号试品收货任务子列表
+export const getDevelopPurchasereceiptJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "Develop"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-job-detail/senior', data })
+  } else {
+    params.sourceType = "Develop"
+    delete params.source_type
+    return await request.get({ url: `/wms/purchasereceipt-job-detail/page`, params })
+  }
+}
 
 // 查询备件收货任务子列表
 export const getPurchasereceiptJobDetailPageSapre = async (params) => {

src/api/wms/purchasereceiptJobMain/index.ts

@@ -99,6 +99,72 @@ export const exportPurchasereceiptJobMain = async (params) => {
     return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel`, params })
   }
 }
+// 导出采购收货任务主 Excel
+export const exportASNPurchasereceiptJobMain = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "ASN"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-job-main/export-excel-senior`, data })
+  } else {
+    params.sourceType = "ASN"
+    delete params.source_type
+    return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel`, params })
+  }
+}
+// 导出协定品收货任务主 Excel
+export const exportToolPurchasereceiptJobMain = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "TOOL"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-job-main/export-excel-senior`, data })
+  } else {
+    params.sourceType = "TOOL"
+    delete params.source_type
+    return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel`, params })
+  }
+}
+
+// 导出号试品收货任务主 Excel
+export const exportDevelopPurchasereceiptJobMain = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "Develop"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-job-main/export-excel-senior`, data })
+  } else {
+    params.sourceType = "Develop"
+    delete params.source_type
+    return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel`, params })
+  }
+}
+
+
 
 
 // 导出备件收货任务

src/api/wms/purchasereceiptRecordDetail/index.ts

@@ -61,6 +61,74 @@ export const getPurchasereceiptRecordDetailPage = async (params) => {
   }
 }
 
+
+// 查询采购收货记录子列表
+export const getASNPurchasereceiptRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "ASN"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    delete params.isSearch
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/wms/purchasereceipt-record-detail/senior', data })
+  } else {
+    params.sourceType = "ASN"
+    delete params.source_type
+    return await request.get({ url: `/wms/purchasereceipt-record-detail/page`, params })
+  }
+}
+
+
+// 查询协定品收货记录子列表
+export const getToolPurchasereceiptRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "TOOL"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/wms/purchasereceipt-record-detail/senior', data })
+  } else {
+    params.sourceType = "TOOL"
+    delete params.source_type
+    return await request.get({ url: `/wms/purchasereceipt-record-detail/page`, params })
+  }
+}
+// 查询号试品收货记录子列表
+export const getDevelopPurchasereceiptRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "Develop"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/wms/purchasereceipt-record-detail/senior', data })
+  } else {
+    params.sourceType = "Develop"
+    delete params.source_type
+    return await request.get({ url: `/wms/purchasereceipt-record-detail/page`, params })
+  }
+}
+
 // 查询采购拒收记录
 export const getPurchasereceiptRecordDetailRefusePage = async (params) => {
   if (params.isSearch) {

src/api/wms/purchasereceiptRecordMain/index.ts

@@ -88,6 +88,67 @@ export const exportPurchasereceiptRecordMain = async (params) => {
     return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params })
   }
 }
+// 导出采购收货记录主 Excel
+export const exportASNPurchasereceiptRecordMain = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "ASN"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior`, data })
+  } else {
+    params.sourceType = "ASN"
+    delete params.source_type
+    return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params })
+  }
+}
+// 导出协定品收货记录主 Excel
+export const exportToolPurchasereceiptRecordMain = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "TOOL"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior`, data })
+  } else {
+    params.sourceType = "TOOL"
+    delete params.source_type
+    return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params })
+  }
+}
+
+// 导出号试品收货记录主 Excel
+export const exportDevelopPurchasereceiptRecordMain = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "Develop"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior`, data })
+  } else {
+    params.sourceType = "Develop"
+    delete params.source_type
+    return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params })
+  }
+}
 
 // 导出采购收货记录主 Excel
 export const exportPurchasereceiptRecordRefuseMain = async (params) => {

src/api/wms/purchasereceiptRequestDetail/index.ts

@@ -46,6 +46,77 @@ export const getPurchasereceiptRequestDetailPage = async (params) => {
   }
 }
 
+// 查询采购收货申请子列表
+export const getASNPurchasereceiptRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "ASN"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-request-detail/senior', data })
+  } else {
+    params.sourceType = "ASN"
+    delete params.source_type
+    return await request.get({ url: `/wms/purchasereceipt-request-detail/page`, params })
+  }
+}
+
+// 查询协定品收货申请子列表
+export const getTOOLPurchasereceiptRequestDetailPage = async (params) => {
+  
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "TOOL"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    delete params.isSearch
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-request-detail/senior', data })
+  } else {
+    params.sourceType = "TOOL"
+    delete params.source_type
+    return await request.get({ url: `/wms/purchasereceipt-request-detail/page`, params })
+  }
+}
+
+
+// 查询号试品收货申请子列表
+export const getDevelopPurchasereceiptRequestDetailPage = async (params) => {
+  
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "Develop"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-request-detail/senior', data })
+  } else {
+    delete params.source_type
+    params.sourceType = "Develop"
+    return await request.get({ url: `/wms/purchasereceipt-request-detail/page`, params })
+  }
+}
+
+
 // 查询备件收货申请子列表
 export const getPurchasereceiptRequestDetailPageSpare = async (params) => {
   if (params.isSearch) {

src/api/wms/purchasereceiptRequestMain/index.ts

@@ -87,6 +87,68 @@ export const exportPurchasereceiptRequestMain = async (params) => {
     return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel`, params })
   }
 }
+// 导出采购收货申请主 Excel
+export const exportASNPurchasereceiptRequestMain = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "ASN"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-senior`, data })
+  } else {
+    params.sourceType = "ASN"
+    delete params.source_type
+    return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel`, params })
+  }
+}
+
+// 导出协定品收货申请主 Excel
+export const exportToolPurchasereceiptRequestMain = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "TOOL"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-senior`, data })
+  } else {
+    params.sourceType = "TOOL"
+    delete params.source_type
+    return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel`, params })
+  }
+}
+
+// 导出号试品收货申请主 Excel
+export const exportDevelopPurchasereceiptRequestMain = async (params) => {
+  if (params.isSearch) {
+    if(!params.filters.find(item=>item.column=='source_type')){
+      params.filters.push({
+        column : "source_type",
+        action : '==',
+        value : "Develop"
+      })
+    }
+    delete params.source_type
+    delete params.sourceType
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-senior`, data })
+  } else {
+    params.sourceType = "Develop"
+    delete params.source_type
+    return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel`, params })
+  }
+}
 
 
 // 导出采购M型收货申请主 Excel

src/components/BasicForm/src/BasicForm.vue

@@ -445,16 +445,22 @@ routeName.value = route.name
 const formHeight = ref({})
 if (!wsCache.get('ShowPackingNumber')) {
   if (formSchema.value) {
-      formSchema.value = formSchema.value.filter(item => item.field != 'packingNumber')
+      formSchema.value = formSchema.value.filter(item => item.field != 'packingNumber' &&  item.field != 'fromPackingNumber')
   }
   if (rules.value && rules.value.packingNumber) {
       delete rules.value.packingNumber
   }
+  if (rules.value && rules.value.fromPackingNumber) {
+      delete rules.value.fromPackingNumber
+  }
   if (props.tableAllSchemas) {
-    tableAllSchemas.value.tableFormColumns = props.tableAllSchemas.tableFormColumns.filter(item => item.field != 'packingNumber')
+    tableAllSchemas.value.tableFormColumns = props.tableAllSchemas.tableFormColumns.filter(item => item.field != 'packingNumber' &&  item.field != 'fromPackingNumber')
     if (tableFormRules.value && tableFormRules.value.packingNumber) {
       delete tableFormRules.value.packingNumber
     }
+     if (tableFormRules.value && tableFormRules.value.fromPackingNumber) {
+      delete tableFormRules.value.fromPackingNumber
+    }
   }
 
 }
@@ -840,6 +846,7 @@ const submitForm = async () => {
         const data = unref(formRef)?.formModel
           if (!wsCache.get('ShowPackingNumber')  ) {
           data.packingNumber=''
+          data.fromPackingNumber=''
         }
         emit('submitForm', formType.value, data)
       } finally {
@@ -851,6 +858,7 @@ const submitForm = async () => {
         const data = unref(formRef)?.formModel
         if (!wsCache.get('ShowPackingNumber')  ) {
           data.packingNumber=''
+          data.fromPackingNumber=''
         }
         console.log(data);
         
@@ -867,6 +875,7 @@ const submitForm = async () => {
       // 清空包装号
        if (!wsCache.get('ShowPackingNumber') ) {
           data.packingNumber=''
+          data.fromPackingNumber=''
         }
       emit('success', formType.value, data)
     } finally {

src/directives/permission/clientTable.ts

@@ -27,18 +27,21 @@ export function clientTable(app: App<Element>) {
   
   app.directive('clientSearchTable', (el, binding) => {
     nextTick(() => {
-      const top = el.getBoundingClientRect().top
+  
-      const qustionHeight = 150
+      setTimeout(() => {
-      let paginationHeight = 0
+        const top = el.getBoundingClientRect().top
-      if(el.children&&el.children.length>1){
+        const qustionHeight = 260
-        paginationHeight = 70
+        let paginationHeight = 0
-      }
+        if (el.children && el.children.length > 1) {
-      const height = window.innerHeight - top - paginationHeight - qustionHeight
+          paginationHeight = 70
-      if(el.getBoundingClientRect().height>height){
+        }
-        console.log('高度',el.getBoundingClientRect().height)
+        const height = window.innerHeight  - paginationHeight - qustionHeight
-        el.style.height = height + 'px'
+        if (el.getBoundingClientRect().height > height) {
-        el.firstChild.style.height = '100%'
+          el.style.height = height + 'px'
-      }
+          el.firstChild.style.height = '100%'
+        }
+      })
+      
     })
   })
   app.directive('clientTableForm', (el, binding) => {

src/layout/components/Collapse/src/Collapse.vue

@@ -26,7 +26,7 @@ const toggleCollapse = () => {
 <template>
   <div :class="prefixCls">
     <Icon
-      :color="color"
+      color="#ffffff" 
       :icon="collapse ? 'ep:expand' : 'ep:fold'"
       :size="18"
       class="cursor-pointer"

src/layout/components/Menu/src/Menu.vue

@@ -1,12 +1,13 @@
 <script lang="tsx">
 import { PropType } from 'vue'
-import { ElMenu, ElScrollbar } from 'element-plus'
+import { ElMenu, ElScrollbar, ElButton } from 'element-plus'
 import { useAppStore } from '@/store/modules/app'
 import { usePermissionStore } from '@/store/modules/permission'
 import { useRenderMenuItem } from './components/useRenderMenuItem'
 import { isUrl } from '@/utils/is'
 import { useDesign } from '@/hooks/web/useDesign'
 import { LayoutType } from '@/types/layout'
+import { Search } from '@element-plus/icons-vue'
 
 const { getPrefixCls } = useDesign()
 
@@ -99,7 +100,18 @@ export default defineComponent({
         return <ElScrollbar>{renderMenu()}</ElScrollbar>
       }
     }
+    const renderMenuWrapAddButton = () => {
+      return (
+        <div style='position:relative'>
+            <ElButton type="text" icon={Search} style="color:var(--el-button-text-color);position:absolute;right:-20px;top:120px;z-index:999" ></ElButton>
+            <ElScrollbar>
+         
+          {renderMenu()}
+        </ElScrollbar>
+        </div>
       
+      )
+    }
     const renderMenu = () => {
       return (
         <ElMenu
@@ -113,6 +125,7 @@ export default defineComponent({
           activeTextColor="var(--left-menu-text-active-color)"
           onSelect={menuSelect}
         >
+     
           {{
             default: () => {
               const { renderMenuItem } = useRenderMenuItem(unref(menuMode))

src/layout/components/ToolHeader.vue

@@ -54,14 +54,14 @@ export default defineComponent({
           'dark:bg-[var(--el-bg-color)]'
         ]}
       >
-        {/* {layout.value !== 'top' ? (
+        {layout.value !== 'top' ? (
           <div class="h-full flex items-center">
             {hamburger.value && layout.value !== 'cutMenu' ? (
-              <Collapse class="custom-hover" color="var(--top-header-text-color)"></Collapse>
+              <Collapse class="custom-hover custom-hover1" color="var(--top-header-text-color)"></Collapse>
             ) : undefined}
-            {breadcrumb.value ? <Breadcrumb class="lt-md:hidden"></Breadcrumb> : undefined}
+            {/* {breadcrumb.value ? <Breadcrumb class="lt-md:hidden"></Breadcrumb> : undefined} */}
           </div>
-        ) : undefined} */}
+        ) : undefined}
         <div class="h-full flex items-center">
           {search.value ? (<RouterSearch isModal={false} />) : undefined}
           {/* {screenfull.value ? (

src/layout/components/UserInfo/src/UserInfo.vue

@@ -29,11 +29,13 @@ const user = wsCache.get(CACHE_KEY.USER)
 const avatar = user.user.avatar ? user.user.avatar : avatarImg
 
 const userName = user.user.nickname ? user.user.nickname : 'Admin'
-const names =[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]
+const names =[{"text":"英泰","value":1}]
-const tenant = names.find(item=>item.value == getTenantId())
+const tenant = names.find(item => item.value == getTenantId())
+console.log(344,getTenantId())
+console.log(344,tenant)
 const language = wsCache.get('lang')
 if('en-US'==language){
-  tenant.text=tenant.text.replace('长春','ChangChun').replace('成都','ChengDu')
+  tenant.text=tenant.text.replace('英泰','YingTai')
 }
 const loginOut = () => {
   ElMessageBox.confirm(t('common.loginOutMessage'), t('common.reminder'), {

src/locales/en-US.ts

@@ -1120,7 +1120,8 @@ export default {
     批量删除:'Batch delete',
     查看质检报告:'Check the quality inspection report',
     长春:'ChangChun',
-    成都:'ChengDu',
+    成都: 'ChengDu',
+    英泰: 'Yingtai',
     天津英泰智慧工厂管理平台:'TIANJIN YINGTAI Smart Factory Management Platform',
     采购未收货记录:'Purchase unreceived record',
     请选择要货计划单号:'Please select the desired shipment tracking number',
@@ -1314,6 +1315,7 @@ export default {
     退回成功: 'Returned successfully',
     是否确认分摊金额: 'Do you want to confirm the allocation amount?',
     创建开票申请: 'Create an invoice request?',
+    详情:'Detail'
   },
 
 

src/locales/zh-CN.ts

@@ -1127,6 +1127,7 @@ export default {
     查看质检报告:'查看质检报告',
     长春:'长春',
     成都:'成都',
+    英泰: '英泰',
     天津英泰智慧工厂管理平台:'天津英泰智慧工厂管理平台',
     采购未收货记录:'采购未收货记录',
     请选择要货计划单号:'请选择要货计划单号',
@@ -1315,6 +1316,7 @@ export default {
     退回成功: '退回成功',
     是否确认分摊金额: '是否确认分摊金额？',
     创建开票申请: '创建开票申请',
+    详情:'详情'
   },
 
 }

src/utils/dict.ts

@@ -249,6 +249,7 @@ export enum DICT_TYPE {
   WORK_ORDER_DETAIL_STATUS = 'work_order_detail_status', // 生产订单明细状态
   PURCHASE_PLAN_STATUS = 'purchase_plan_status', // 要货计划状态
   PURCHASE_PLAN_DETAIL_STATUS = 'purchase_plan_detail_status', // 要货计划明细状态
+  PURCHASE_PLAN_SOURCE = 'purchase_plan_source', // 要货计划来源
   PLAN_STATUS = 'plan_status', // 计划状态
   PRODUCTION_PLAN_DETAIL_STATUS = 'production_plan_detail_status', // 计划明细状态
   // PREPARE_TO_ISSUE_PLAN_STATUS = 'prepare_to_issue_plan_status', // 备料计划状态

src/views/login/components/LoginForm.vue

@@ -130,7 +130,7 @@ import { getSwitchByCode } from '@/api/wms/switch'
   if('en-US'==language){
     tenantArray.value = tenantArray.value.map(item => ({
       name: item,
-      aliasName:item.replace('长春','ChangChun').replace('成都','ChengDu')
+      aliasName:item.replace('英泰','YingTai')
     }));
   }else{
     tenantArray.value = tenantArray.value.map(item => ({

src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts

@@ -174,6 +174,14 @@ export const Area = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '备注',
     field: 'remark',

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

@@ -9,7 +9,7 @@ import {validateYS} from '@/utils/validator'
  */
 export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '代码',
+    label: '品番',
     field: 'code',
     sort: 'custom',
     isSearch: true,
@@ -18,6 +18,15 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'left'
     },
   },
+  {
+    label: '品名',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '品号',
     field: 'articleNumber',
@@ -46,25 +55,74 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '名称',
+    label: '描述1',
-    field: 'name',
+    field: 'desc1',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
-    },
+    } ,
+    // isTableForm:false
   },
   {
-    label: '是否可用',
+    label: '描述2',
-    field: 'available',
+    field: 'desc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    } ,
+  },
+  {
+    label: '物料类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+  },
+  {
+    label: '物料状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 120
+    }
+  },
+  {
+    label: '可采购',
+    field: 'enableBuy',
     sort: 'custom',
-    isSearch:true,
-    isForm: false,
     dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictClass: 'string',
-    search: {
+    isTable: true,
+    table: {
+      width: 100
+    },
+    form: {
+      component: 'Switch',
       value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
     },
+  },
+  {
+    label: '可制造',
+    field: 'enableMake',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -73,41 +131,70 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
+  },
+  {
+    label: '虚零件',
+    field: 'isPhantom',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
     table: {
-      width: 110
+      width: 100
-    }
+    } ,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
   },
   {
-    label: '描述1',
+    label: 'ABC类',
-    field: 'desc1',
+    field: 'abcClass',
     sort: 'custom',
+    dictType: DICT_TYPE.ABC_CLASS,
+    dictClass: 'string',
+    isTable: true,
     table: {
-      width: 150
+      width: 100
     } ,
-    // isTableForm:false
   },
   {
-    label: '描述2',
+    label: '默认包装规格',
-    field: 'desc2',
+    field: 'defaultPackUnit',
     sort: 'custom',
     table: {
       width: 150
     } ,
   },
   {
-    label: '受入号',
+    label: '默认包装数量',
-    field: 'receivedNumber',
+    field: 'defaultPackQty',
     sort: 'custom',
-    isSearch: false,
     table: {
       width: 150
-    },
+    } ,
   },
   {
-    label: '受入地',
+    label: '计量单位',
-    field: 'receivedLocation',
+    field: 'uom',
     sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
     isSearch: true,
+    isTable: true,
+    table: {
+      width: 120
+    }
+  },
+  {
+    label: '受入号',
+    field: 'receivedNumber',
+    sort: 'custom',
+    isSearch: false,
     table: {
       width: 150
     },
@@ -131,7 +218,7 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '再订货点',
+    label: '再订货点数量',
     field: 'reorderPoint',
     sort: 'custom',
     isSearch: false,
@@ -148,15 +235,6 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '生产线分区',
-    field: 'productionLineZoning',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 150
-    },
-  },
   {
     label: '采购员',
     field: 'purchaser',
@@ -167,73 +245,42 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '状态',
+    label: '项目',
-    field: 'status',
+    field: 'project',
-    sort: 'custom',
-    dictType: DICT_TYPE.ITEM_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    table: {
-      width: 120
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    table: {
-      width: 120
-    }
-  },
-  {
-    label: '替代计量单位',
-    field: 'altUom',
     sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
     table: {
-      width: 150
+      width: 100
     } ,
   },
   {
-    label: '是否标包',
+    label: '是否脱离ERP管理',
-    field: 'isStdPack',
+    field: 'isOutErp',
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    // colorType: 'danger',
     isTable: true,
     table: {
-      width: 120
+      width: 100
     },
     form: {
       component: 'Switch',
-      value: 'TRUE',
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
       }
     },
-    // tableForm:{
-    //   width: 180,
-    //   type:'Radio',
-    // }
   },
   {
-    label: '可采购',
+    label: '是否可用',
-    field: 'enableBuy',
+    field: 'available',
     sort: 'custom',
+    isSearch:true,
+    isForm: false,
     dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isTable: true,
+    search: {
-    table: {
+      value: 'TRUE',
-      width: 100
     },
     form: {
       component: 'Switch',
@@ -243,129 +290,245 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
+    table: {
+      width: 110
+    }
   },
   {
-    label: '可制造',
+    label: '生效时间',
-    field: 'enableMake',
+    field: 'activeTime',
     sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
     isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     table: {
-      width: 100
+      width: 180
     } ,
     form: {
-      component: 'Switch',
+      component: 'DatePicker',
-      value: 'TRUE',
       componentProps: {
-        inactiveValue: 'FALSE',
+        style: {width:'100%'},
-        activeValue: 'TRUE'
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
+    // tableForm:{
+    //   width: 200,
+    //   type:'FormDateTime',
+    // }
   },
   {
-    label: '可委外加工',
+    label: '失效时间',
-    field: 'enableOutsourcing',
+    field: 'expireTime',
     sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
     isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     table: {
-      width: 120
+      width: 180
     } ,
     form: {
-      component: 'Switch',
+      component: 'DatePicker',
-      value: 'TRUE',
+      value:'activeTime',
       componentProps: {
-        inactiveValue: 'FALSE',
+        style: {width:'100%'},
-        activeValue: 'TRUE'
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
   },
   {
-    label: '回收件',
+    label: '备注',
-    field: 'isRecycled',
+    field: 'remark',
     sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
+    isTable: false
-    dictClass: 'string',
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isForm: false,
     isTable: true,
     table: {
-      width: 100
+      width: 180
     },
-    form: {
+  },
-      component: 'Switch',
+  {
-      value: 'TRUE',
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    isTable: true,
+    formatter: dateFormatter,
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
       componentProps: {
-        inactiveValue: 'FALSE',
+        style: {width:'100%'},
-        activeValue: 'TRUE'
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 180
     },
   },
   {
-    label: '虚零件',
+    label: '最后更新时间',
-    field: 'isPhantom',
+    field: 'updateTime',
     sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
     isTable: true,
+    isDetail: true,
+    formatter: dateFormatter,
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     table: {
-      width: 100
+      width: 180
-    } ,
+    },
     form: {
-      component: 'Switch',
+      component: 'DatePicker',
-      value: 'TRUE',
       componentProps: {
-        inactiveValue: 'FALSE',
+        style: {width:'100%'},
-        activeValue: 'TRUE'
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
+    }
+  },
+
+  // {
+  //   label: '受入地',
+  //   field: 'receivedLocation',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+
+  {
+    label: '生产线分区',
+    field: 'productionLineZoning',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isDetail:false,
+    table: {
+      width: 150
     },
   },
+
+
+
   {
-    label: '是否脱离ERP管理',
+    label: '替代计量单位',
-    field: 'isOutErp',
+    field: 'altUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: false,
+    isDetail:false,
+    table: {
+      width: 150
+    } ,
+  },
+  {
+    label: '是否标包',
+    field: 'isStdPack',
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    // colorType: 'danger',
+    isTable: false,
+    isDetail:false,
     table: {
-      width: 100
+      width: 120
     },
     form: {
       component: 'Switch',
-      value: 'FALSE',
+      value: 'TRUE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
       }
     },
+    // tableForm:{
+    //   width: 180,
+    //   type:'Radio',
+    // }
   },
+
   {
-    label: 'ABC类',
+    label: '可委外加工',
-    field: 'abcClass',
+    field: 'enableOutsourcing',
     sort: 'custom',
-    dictType: DICT_TYPE.ABC_CLASS,
+    dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
+    isDetail:false,
     table: {
-      width: 100
+      width: 120
     } ,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
   },
   {
-    label: '类型',
+    label: '回收件',
-    field: 'type',
+    field: 'isRecycled',
     sort: 'custom',
-    dictType: DICT_TYPE.ITEM_TYPE,
+    dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
+    isDetail:false,
     table: {
       width: 100
-    } ,
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
   },
+
+
+
+
   {
     label: '产品类',
     field: 'prodCla',
     sort: 'custom',
     isForm:false,
+    isTable: false,
+    isDetail:false,
     table: {
       width: 100
     } ,
@@ -376,7 +539,8 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.ITEM_CATEGORY,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
+    isDetail:false,
     table: {
       width: 100
     } ,
@@ -387,7 +551,8 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.ITEM_GROUP,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
+    isDetail:false,
     table: {
       width: 100
     } ,
@@ -398,7 +563,8 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.ITEM_COLOR,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
+    isDetail:false,
     table: {
       width: 100
     } ,
@@ -409,7 +575,8 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.ITEM_CONFIGURATION,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
+    isDetail:false,
     table: {
       width: 100
     } ,
@@ -420,26 +587,21 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.SETTLEMENT_TYPE,
     dictClass: 'string',
     sort: 'custom',
-    isTable: true,
+    isTable: false,
+    isDetail:false,
     table: {
       width: 120
     } ,
   },
-  {
+
-    label: '项目',
-    field: 'project',
-    sort: 'custom',
-    table: {
-      width: 100
-    } ,
-  },
   {
     label: '质量等级',
     field: 'eqLevel',
     sort: 'custom',
     dictType: DICT_TYPE.EQ_LEVEL,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
+    isDetail:false,
     table: {
       width: 120
     } ,
@@ -448,6 +610,8 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     label: '有效天数',
     field: 'validityDays',
     sort: 'custom',
+    isTable: false,
+    isDetail:false,
     table: {
       width: 120
     },
@@ -459,122 +623,9 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
+
-    label: '生效时间',
+
-    field: 'activeTime',
+
-    sort: 'custom',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
-    } ,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    // tableForm:{
-    //   width: 200,
-    //   type:'FormDateTime',
-    // }
-  },
-  {
-    label: '失效时间',
-    field: 'expireTime',
-    sort: 'custom',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
-    } ,
-    form: {
-      component: 'DatePicker',
-      value:'activeTime',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    isTable: true,
-    formatter: dateFormatter,
-    isForm: false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    }
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    isForm: false,
-    isTable: true,
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    sort: 'custom',
-    isTable: true,
-    isDetail: true,
-    formatter: dateFormatter,
-    isForm: false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    }
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    isDetail: true,
-    isForm: false,
-    isTable: true,
-    table: {
-      width: 180
-    },
-  },
-  { label: '备注', field: 'remark', sort: 'custom', isTable: false},
   // {
   //   label: '操作',
   //   field: 'action',

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

@@ -168,13 +168,21 @@ const isShowMainButton = (row, val) => {
   }
 }
 
+const isShowMainButton2 = (row, val) => {
+  if (val.indexOf(row.dataSource) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
 const butttondata = (row) => {
   return[
-  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itempackage:update' }), // 编辑
+  defaultButtons.mainListEditBtn({hide: isShowMainButton2(row, ['WMS']), hasPermi: 'wms:itempackage:update' }), // 编辑
-  defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:itempackage:enable'}),
+  defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE'] ) || isShowMainButton2(row, ['WMS']),hasPermi: 'wms:itempackage:enable'}),
-  defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:itempackage:disable'}),
+  defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']) || isShowMainButton2(row, ['WMS']),hasPermi: 'wms:itempackage:disable'}),
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackage:delete' }) // 删除
+  defaultButtons.mainListDeleteBtn({hide: isShowMainButton2(row, ['WMS']), hasPermi: 'wms:itempackage:delete' }) // 删除
 ]}
 
 // 列表-操作按钮事件

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

@@ -144,6 +144,9 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isTable: false,
+    isDetail:false,
+    isForm:false,
     table: {
       width: 120
     },
@@ -223,6 +226,15 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '数据来源',
+    field: 'dataSource',
+    sort: 'custom',
+    isForm:false,
+    table: {
+      width: 180
+    },
+  },
   {
     label: '创建时间',
     field: 'createTime',

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

@@ -39,7 +39,9 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      componentProps: {
+        min: 0,
+      },
     },
   },
   {
@@ -48,7 +50,9 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      componentProps: {
+        min: 0,
+      },
     },
   },
   {
@@ -57,7 +61,9 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      componentProps: {
+        min: 0,
+      },
     },
   },
   {
@@ -66,7 +72,9 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      componentProps: {
+        min: 0,
+      },
     },
   },
   {
@@ -114,6 +122,8 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: false,
+    isTable: false,
+    isDetail:false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -133,6 +143,8 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: false,
+    isTable: false,
+    isDetail:false,
     form: {
       component: 'Switch',
       value: 'FALSE',
@@ -327,7 +339,9 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     label: '父包装代码',
     field: 'parentCode',
     sort: 'custom',
-    isTable:false,
+    isTable: false,
+    isDetail:false,
+    isForm:false,
     table: {
       width: 150
     },
@@ -383,7 +397,9 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      componentProps: {
+        min: 0,
+      },
     },
   },
   {
@@ -392,7 +408,9 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      componentProps: {
+        min: 0,
+      },
     },
   },
   {
@@ -401,7 +419,9 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      componentProps: {
+        min: 0,
+      },
     },
   },
   {
@@ -410,7 +430,9 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      componentProps: {
+        min: 0,
+      },
     },
   },
   {
@@ -463,6 +485,9 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: false,
+    isTable: false,
+    isDetail:false,
+    isForm:false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -482,6 +507,9 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: false,
+    isTable: false,
+    isDetail:false,
+    isForm:false,
     form: {
       component: 'Switch',
       value: 'FALSE',
@@ -697,9 +725,9 @@ export const PackageunitRules = reactive({
   type: [
     { required: true, message: '请选择包装类型', trigger: 'change' }
   ],
-  reuse: [
+  // reuse: [
-    { required: true, message: '请选择是否重复使用', trigger: 'change' }
+  //   { required: true, message: '请选择是否重复使用', trigger: 'change' }
-  ],
+  // ],
   available: [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
@@ -757,7 +785,9 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      componentProps: {
+        min: 0,
+      },
     },
   },
   {
@@ -766,7 +796,9 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      componentProps: {
+        min: 0,
+      },
     },
   },
   {
@@ -775,7 +807,9 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      componentProps: {
+        min: 0,
+      },
     },
   },
   {
@@ -784,7 +818,9 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      componentProps: {
+        min: 0,
+      },
     },
   },
   {

src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue

@@ -9,6 +9,7 @@
         :rules="rules"
         label-width="120px"
         label-position="left"
+        :disabled="detailStatus"
       >
         <!-- 规则 -->
         <div class="item">
@@ -81,13 +82,10 @@
                     :key="'仓库和库区Operator'+cur.value"
                   />
                 </el-select>
-                <el-input key="仓库和库区Value" style="flex:1" placeholder="请选择仓库或者库区"  v-model="item.Value" @blur="blurWarehouseByCodes">
+                <el-input key="仓库和库区Value" style="flex:1" placeholder="请选择仓库或者库区" v-model="item.Value" @blur="blurWarehouseByCodes" />
-                  <template #suffix>
+                <el-button :disabled="formData.name=='默认规则'&&formType=='update'" type="info" plain @click="searchWarehouse">
-                    <el-button :disabled="formData.name=='默认规则'&&formType=='update'" type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
+                  <Icon icon="ep:search" /> 
-                      <Icon icon="ep:search" class="mr-5px" /> 
+                </el-button> 
-                    </el-button> 
-                  </template>
-                </el-input>
               </el-form-item>
               <!-- 供应商代码 -->
               <el-form-item key="供应商代码formItem"
@@ -109,13 +107,10 @@
                     :key="'供应商代码Operator'+cur.value"
                   />
                 </el-select>
-                <el-input key="供应商代码Value" style="flex:1" placeholder="请选择供应商代码" v-model="item.Value" @blur="blurSupplierCode">
+                <el-input key="供应商代码Value" style="flex:1" placeholder="请选择供应商代码" v-model="item.Value" @blur="blurSupplierCode" />
-                  <template #suffix>
+                <el-button :disabled="formData.name=='默认规则'&&formType=='update'" type="info" plain @click="searchSupplier">
-                    <el-button :disabled="formData.name=='默认规则'&&formType=='update'" type="text" plain style="color:var(--el-button-text-color)" @click="searchSupplier">
+                  <Icon icon="ep:search" /> 
-                      <Icon icon="ep:search" class="mr-5px" /> 
+                </el-button> 
-                    </el-button> 
-                  </template>
-                </el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -149,14 +144,11 @@
                 />
               </el-form-item>
               <!-- 月台 -->
-              <el-form-item key="月台formItem" :label="t('ts.月台').replace('ts.','')" prop="DockCode">
+              <el-form-item key="月台formItem" :label="t('ts.月台').replace('ts.','')" prop="configuration.DockCode">
-                <el-input key="月台Value" style="flex:1" placeholder="请选择月台" v-model="formData.configuration.DockCode" @blur="blurDockCode">
+                <el-input key="月台Value" style="flex:1" placeholder="请选择月台" v-model="formData.configuration.DockCode" @blur="blurDockCode"/>
-                  <template #suffix>
+                <el-button :disabled="formData.name=='默认规则'&&formType=='update'" type="info" plain @click="searchDockCode">
-                    <el-button :disabled="formData.name=='默认规则'&&formType=='update'" type="text" plain style="color:var(--el-button-text-color)" @click="searchDockCode">
+                  <Icon icon="ep:search" /> 
-                      <Icon icon="ep:search" class="mr-5px" /> 
+                </el-button> 
-                    </el-button> 
-                  </template>
-                </el-input>
               </el-form-item>
               <!-- 收货人 -->
               <el-form-item key="收货人formItem" :label="t('ts.收货人').replace('ts.','')" prop="Receiver">
@@ -181,7 +173,9 @@
     </div>
     <template #footer>
       <!-- 按钮-->
-      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+      <TableHead v-if="detailStatus" :HeadButttondata="[ defaultButtons.formCloseBtn(null) ]" @buttonBaseClick="buttonBaseClick" />
+      <TableHead v-else :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+      
     </template>
   </Dialog>
   <SearchTable
@@ -256,7 +250,8 @@ const rules = ref({
   description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
   'configuration.PhoneNumber': [{ max: 11, message: '不得超过11个字符', trigger: 'blur' },
-  {message: '请输入正确格式的电话', trigger: 'blur' ,validator:validateHanset}]
+    { message: '请输入正确格式的电话', trigger: 'blur', validator: validateHanset }],
+  'configuration.DockCode': [{ required: true, message: '请输入月台', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
 })
 
 // 所有的范围类型
@@ -313,6 +308,7 @@ const querySupplierParams = ref({
 })
 
 
+const WarehouseCodeOrArea = ref('WarehouseCode')
 /** 打开弹窗 */
 const open = async (type: string, strategyCode: string, id?: number) => {
   formStrategyCode.value = strategyCode
@@ -351,7 +347,8 @@ const open = async (type: string, strategyCode: string, id?: number) => {
         //     item.Value = item.Value.split(',')
         //   }
         // })
-        warehouseCodeObj.value = formData.value.condition.find(item => item['ParamCode'] == 'WarehouseCode') || ''
+        warehouseCodeObj.value = formData.value.condition.find(item => item['ParamCode'] == 'WarehouseCode' || item['ParamCode'] == 'Area') || ''
+  WarehouseCodeOrArea.value= formData.value.condition.find(item => item['ParamCode'] == 'WarehouseCode') ? 'WarehouseCode' : 'Area'
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -361,6 +358,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formLoading.value = false
     }
   } else {
+  WarehouseCodeOrArea.value='WarehouseCode'
 
     Butttondata.value = [
       defaultButtons.formSaveBtn(null), // 保存
@@ -368,7 +366,14 @@ const open = async (type: string, strategyCode: string, id?: number) => {
     ]
   }
 }
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+const  detailStatus = ref(false) // 是否是详情模式
+const setDetailStatus = (status)=>{
+  if(status){
+    dialogTitle.value = t('ts.详情')
+  }
+  detailStatus.value= status
+}
+defineExpose({ open,setDetailStatus }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
@@ -456,6 +461,7 @@ const resetForm = () => {
       PutAway:'TRUE'
     }
   }
+
 }
 
 const searchTableRef = ref()
@@ -474,7 +480,7 @@ const searchWarehouse = () => {
       undefined,
       undefined
     )
-  } else if (WarehouseCodeOrArea.value == 'Area') {
+  } else if (WarehouseCodeOrArea.value == 'AreaCode') {
     searchTableRef.value.open(
       '请选择库区',
       Area.allSchemas,
@@ -509,13 +515,13 @@ const searchDockCode = () => {
   //   return;
   // }
   let filters = []
-  if (warehouseCodeObj.value?.Value) {
+  // if (warehouseCodeObj.value?.Value) {
-    filters = [{
+  //   filters = [{
-      action: warehouseCodeObj.value.ScreenOperator,
+  //     action: warehouseCodeObj.value.ScreenOperator,
-      column: 'warehouseCode',
+  //     column: 'warehouseCode',
-      value: warehouseCodeObj.value.Value
+  //     value: warehouseCodeObj.value.Value
-    }]
+  //   }]
-  }
+  // }
   
   searchTableRef.value.open(
     '请选择月台',
@@ -538,7 +544,7 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
     warehouseCodeObj.value = formData.value.condition.find(item => item['ParamCode'] == 'WarehouseCode')
     if(warehouseCodeObj.value){
       warehouseCodeObj.value.Value = val.map(item => (item['code'])).join(',')
-      formData.value.configuration['DockCode']=''
+      // formData.value.configuration['DockCode']=''
     }
   }else if (formField=='Area') {
     let Area = formData.value.condition.find(item => item['ParamCode'] == 'Area')
@@ -574,23 +580,23 @@ const blurWarehouseByCodes = async ()=>{
         ].join(',')
         message.alert('代码' + str + '没有找到对应数据')
         WarehouseCode.Value = ''
-        formData.value.configuration.DockCode=''
+        // formData.value.configuration.DockCode=''
-        formData.value.configuration.Receiver=''
+        // formData.value.configuration.Receiver=''
-        formData.value.configuration.PhoneNumber=''
+        // formData.value.configuration.PhoneNumber=''
         return
       }
     } else {
       WarehouseCode.Value = ''
-      formData.value.configuration.DockCode=''
+      // formData.value.configuration.DockCode=''
-      formData.value.configuration.Receiver=''
+      // formData.value.configuration.Receiver=''
-      formData.value.configuration.PhoneNumber=''
+      // formData.value.configuration.PhoneNumber=''
       message.alert('暂无数据')
     }
   }else{
     WarehouseCode.Value = ''
-    formData.value.configuration.DockCode=''
+    // formData.value.configuration.DockCode=''
-    formData.value.configuration.Receiver=''
+    // formData.value.configuration.Receiver=''
-    formData.value.configuration.PhoneNumber=''
+    // formData.value.configuration.PhoneNumber=''
   }
 }
 // 供应商失去焦点
@@ -625,13 +631,13 @@ const blurSupplierCode = async ()=>{
 const blurDockCode = async () => {
   if (formData.value.configuration.DockCode) {
     let filters = []
-      if (warehouseCodeObj.value?.Value) {
+    // if (warehouseCodeObj.value?.Value) {
-      filters.push({
+    //   filters.push({
-        action:  warehouseCodeObj.value.ScreenOperator,
+    //     action:  warehouseCodeObj.value.ScreenOperator,
-        column: 'warehouseCode',
+    //     column: 'warehouseCode',
-        value: warehouseCodeObj.value.Value
+    //     value: warehouseCodeObj.value.Value
-      })
+    //   })
-    }
+    // }
     if (formData.value.configuration.DockCode) {
       filters.push({
         action: '==',
@@ -655,15 +661,14 @@ const blurDockCode = async () => {
 const OperatorChange = (e, item) => {
   item.ScreenOperator =  rangeOptions.find((item) =>item.value === e)?.screenValue
 }
-const WarehouseCodeOrArea = ref('WarehouseCode')
 // 选择客户还是承运商
 const changeWarehouseArea = (e) => {
   formData.value.condition[0].Value = ''
   WarehouseCodeOrArea.value = e
   if (e == 'WarehouseCode') {
-        formData.value.configuration.DockCode=''
+        // formData.value.configuration.DockCode=''
-        formData.value.configuration.Receiver=''
+        // formData.value.configuration.Receiver=''
-        formData.value.configuration.PhoneNumber=''
+        // formData.value.configuration.PhoneNumber=''
   } else if (e == 'Area') {
     // getFormSupplierList()
   }

src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue

@@ -26,7 +26,15 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-clientTable v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }">
-      <el-table-column align="center" :label="t('ts.策略代码')" prop="strategyCode"  show-overflow-tooltip width="150px" />
+      <el-table-column align="center" :label="t('ts.策略代码')" prop="strategyCode"  show-overflow-tooltip width="150px">
+        <template #default="{row}">
+          <el-button type="primary" link @click="openDetail(row, '策略代码', row.strategyCode)">
+            <span>{{ row.strategyCode }}</span>
+          </el-button>
+        </template>
+      </el-table-column>
+
+
       <el-table-column align="center" :label="t('ts.策略名称')" prop="name" show-overflow-tooltip width="150px" />
       <el-table-column align="center" :label="t('ts.策略描述')" prop="description"  show-overflow-tooltip width="150px" />
       <el-table-column align="center" :label="t('ts.优先级')" prop="priority" sortable width="120"/>
@@ -68,7 +76,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as RuleApi from '@/api/wms/rule'
 import AddForm from './AddForm.vue'
 import dayjs from 'dayjs'
-
+// 采购策略
 defineOptions({ name: 'SupplieDeliveryStrategy' })
 const queryFormRef = ref() // 搜索的表单
 
@@ -110,8 +118,14 @@ const resetQuery = () => {
 const formRef = ref()
 const openForm = (type: string, strategyCode: string, id: number) => {
   formRef.value.open(type, strategyCode, id)
-}
+  formRef.value.setDetailStatus(false)
 
+}
+ /** 详情操作 */
+const openDetail = (row : any, titleName : any, titleValue : any) => {
+  openForm('update', queryParams.strategyCode, row.id)
+  formRef.value.setDetailStatus(true)
+}
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
@@ -126,7 +140,7 @@ const handleDelete = async (id: number) => {
 }
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultAddBtn({hasPermi:'wms:strategy:create'}), // 新增
 ]
 
 

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

@@ -0,0 +1,343 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import {
+  CustomerStatementMain,
+} from '../moldAllocation/customerStatement/customerStatementMain.data'
+import * as CustomerStatementMainApi from '@/api/wms/customerStatementMain'
+
+// 表单校验
+export const CustomerSaleInvoiceMainRules = reactive({
+  customerStatementNumber: [required],
+  customerCode: [required],
+  customerName: [required],
+  mainBeforeTaxAmount: [required],
+  taxRate: [required],
+  mainTaxAmount: [required],
+  mainAdTaxAmount: [required],
+})
+
+export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    isForm:false,
+    // 0：新增1：已发布2已作废
+  },
+  {
+    label: '客户对账单',
+    field: 'customerStatementNumber',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户对账单', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '客户对账单信息', // 查询弹窗标题
+        searchAllSchemas: CustomerStatementMain.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerStatementMainApi.getCustomerStatementMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '客户名称',
+    field: 'customerName',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '未税金额',
+    field: 'mainBeforeTaxAmount',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '税率(%)',
+    field: 'taxRate',
+    dictType: DICT_TYPE.TAX_RATE_DICT,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '税额',
+    field: 'mainTaxAmount',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '价税合计金额',
+    field: 'mainAdTaxAmount',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '金税票号',
+    field: 'goldenTaxInvoiceNumber',
+    sort: 'custom',
+  },
+  {
+    label: '开票日期',
+    field: 'invoiceTime',
+    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')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    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,
+  },
+]))
+// 表单校验
+export const CustomerSaleInvoiceDetailRules = reactive({
+  beforeTaxAmount: [required],
+  taxRate: [required],
+  taxAmount: [required],
+  adTaxAmount: [required],
+})
+
+export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '品番',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    tableForm:{
+      disabled:true,
+    //   multiple:true,
+    //   isInpuFocusShow: true, // 开启查询弹窗
+    //   searchListPlaceholder: '请选择物料代码',
+    //   searchField: 'code',
+    //   searchTitle: '物料基础信息',
+    //   searchAllSchemas: Itembasic.allSchemas,
+    //   searchPage: CustomerStatementDetailApi.getCustomerStatementDetailPage,
+    //   searchCondition: [{
+    //     key: 'available',
+    //     value: 'TRUE',
+    //     isMainValue: false
+    //   }],
+    //   verificationPage: ItembasicApi.getItemListByCodes, // 失去焦点校验输入框的数据内容存在
+    //   isShowTableFormSearch: true,
+    //   verificationParams: [{
+    //     key: 'code',
+    //     action: '==',
+    //     value: '',
+    //     isMainValue: false,
+    //     isSearch: 'true',
+    //     isFormModel: true
+    //   }], // 失去焦点校验参数
+    },
+    // form: {
+    //   // labelMessage: '信息提示说明！！！',
+    //   componentProps: {
+    //     isSearchList: true, // 开启查询弹窗
+    //     searchListPlaceholder: '请选择物料代码',
+    //     searchField: 'code',
+    //     searchTitle: '物料基础信息',
+    //     searchAllSchemas: Itembasic.allSchemas,
+    //     searchPage: ItembasicApi.getItembasicPage,
+    //     searchCondition: [{
+    //       key: 'available',
+    //       value: 'TRUE',
+    //       isMainValue: false
+    //     }]
+    //   }
+    // }
+    
+  },
+  {
+    label: '品号',
+    field: 'articleNumber',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户对账单', // 输入框占位文本
+        searchField: '', // 查询弹窗赋值字段
+        searchTitle: '客户对账单信息', // 查询弹窗标题
+        searchAllSchemas: CustomerStatementMain.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerStatementMainApi.getCustomerStatementMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
+  {
+    label: '销售单价',
+    field: 'price',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+    }
+  },
+  {
+    label: '模具分摊单价',
+    field: 'allocationPrice',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
+  {
+    label: '合计单价',
+    field: 'sumPrice',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+    }
+  },
+  {
+    label: '未税金额',
+    field: 'beforeTaxAmount',
+    sort: 'custom',
+    tableForm: {
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
+  {
+    label: '税额',
+    field: 'taxAmount',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
+  {
+    label: '含税金额',
+    field: 'afterTaxAmount',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 2,
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+    }
+  },
+
+]))

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

@@ -0,0 +1,191 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="CustomerSaleInvoiceMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="CustomerSaleInvoiceMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :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 #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+    </Table>
+  </ContentWrap>
+
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CustomerSaleInvoiceMain.allSchemas"
+    :detailAllSchemas="CustomerSaleInvoiceDetail.allSchemas"
+    :detailAllSchemasRules="CustomerSaleInvoiceDetailRules"
+    :apiCreate="CustomerSaleInvoiceDetailApi.createCustomerSaleInvoiceDetail"
+    :apiUpdate="CustomerSaleInvoiceDetailApi.updateCustomerSaleInvoiceDetail"
+    :apiPage="CustomerSaleInvoiceDetailApi.getCustomerSaleInvoiceDetailPage"
+    :apiDelete="CustomerSaleInvoiceDetailApi.deleteCustomerSaleInvoiceDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/deliver-plan-main/import" :importTemplateData="importTemplateData"
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend= "businessType"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CustomerSaleInvoiceMain,CustomerSaleInvoiceDetailRules,CustomerSaleInvoiceDetail} from './customerSaleInvoiceRecordMain.data'
+import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain'
+import * as CustomerSaleInvoiceDetailApi from '@/api/wms/customerSaleInvoiceDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
+// 销售开票记录
+defineOptions({ name: 'customerSaleInvoiceRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const businessType = ref()
+const tableColumns = ref(CustomerSaleInvoiceMain.allSchemas.tableColumns)
+const { tableObject, tableMethods } = useTable({
+  getListApi: CustomerSaleInvoiceMainApi.getCustomerSaleInvoiceRecodeMainPage // 分页接口
+})
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    // setV['soLine'] = val[0]['lineNumber']
+    // setV['lineNumber'] = val[0]['lineNumber']
+    // setV['itemCode'] = val[0]['itemCode']
+    setV['remark'] = val[0]['remark']
+    setV['uom'] = val[0]['customerUom']
+    formRef.setValues(setV)
+  })
+}
+
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultImportBtn({hasPermi:`wms:customer-sale-invoice-main:import` }), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:`wms:customer-sale-invoice-main:export` }), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'planDeliverMain')
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await CustomerSaleInvoiceMainApi.exportCustomerSaleInvoiceMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await CustomerSaleInvoiceMainApi.importTemplate()
+})
+</script>

src/views/wms/deliversettlementManage/customerSaleInvoiceMain/customerSaleInvoiceMain.data.ts → src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts

@@ -2,15 +2,18 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import {
   CustomerStatementMain,
-} from '../../deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data'
+} from '../moldAllocation/customerStatement/customerStatementMain.data'
 import * as CustomerStatementMainApi from '@/api/wms/customerStatementMain'
 
 // 表单校验
 export const CustomerSaleInvoiceMainRules = reactive({
-  beforeTaxAmount: [required],
+  customerStatementNumber: [required],
+  customerCode: [required],
+  customerName: [required],
+  mainBeforeTaxAmount: [required],
   taxRate: [required],
-  taxAmount: [required],
+  mainTaxAmount: [required],
-  adTaxAmount: [required],
+  mainAdTaxAmount: [required],
 })
 
 export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
@@ -53,7 +56,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '客户代码',
-    field: 'customer',
+    field: 'customerCode',
     sort: 'custom',
     isSearch: true,
     form: {
@@ -74,7 +77,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '未税金额',
-    field: 'beforeTaxAmount',
+    field: 'mainBeforeTaxAmount',
     sort: 'custom',
     form: {
       componentProps: {
@@ -87,7 +90,6 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'taxRate',
     dictType: DICT_TYPE.TAX_RATE_DICT,
     dictClass: 'string',
-    sortTableDefault: 3,
     isTable: true,
     sort: 'custom',
     table: {
@@ -96,7 +98,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '税额',
-    field: 'taxAmount',
+    field: 'mainTaxAmount',
     sort: 'custom',
     form: {
       componentProps: {
@@ -106,7 +108,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '价税合计金额',
-    field: 'adTaxAmount',
+    field: 'mainAdTaxAmount',
     sort: 'custom',
     form: {
       componentProps: {
@@ -146,13 +148,6 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
   },
-  {
-    label: '是否可用默认TRUE',
-    field: 'available',
-    sort: 'custom',
-    isTable: false,
-    isForm:false
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -189,13 +184,52 @@ export const CustomerSaleInvoiceDetailRules = reactive({
 export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '品番',
-    field: 'number',
+    field: 'itemCode',
     sort: 'custom',
     isSearch: true,
     isForm: false,
-    tableForm: {
+    tableForm:{
-      disabled:true
+      disabled:true,
-    }
+    //   multiple:true,
+    //   isInpuFocusShow: true, // 开启查询弹窗
+    //   searchListPlaceholder: '请选择物料代码',
+    //   searchField: 'code',
+    //   searchTitle: '物料基础信息',
+    //   searchAllSchemas: Itembasic.allSchemas,
+    //   searchPage: CustomerStatementDetailApi.getCustomerStatementDetailPage,
+    //   searchCondition: [{
+    //     key: 'available',
+    //     value: 'TRUE',
+    //     isMainValue: false
+    //   }],
+    //   verificationPage: ItembasicApi.getItemListByCodes, // 失去焦点校验输入框的数据内容存在
+    //   isShowTableFormSearch: true,
+    //   verificationParams: [{
+    //     key: 'code',
+    //     action: '==',
+    //     value: '',
+    //     isMainValue: false,
+    //     isSearch: 'true',
+    //     isFormModel: true
+    //   }], // 失去焦点校验参数
+    },
+    // form: {
+    //   // labelMessage: '信息提示说明！！！',
+    //   componentProps: {
+    //     isSearchList: true, // 开启查询弹窗
+    //     searchListPlaceholder: '请选择物料代码',
+    //     searchField: 'code',
+    //     searchTitle: '物料基础信息',
+    //     searchAllSchemas: Itembasic.allSchemas,
+    //     searchPage: ItembasicApi.getItembasicPage,
+    //     searchCondition: [{
+    //       key: 'available',
+    //       value: 'TRUE',
+    //       isMainValue: false
+    //     }]
+    //   }
+    // }
+    
   },
   {
     label: '品号',
@@ -203,7 +237,9 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false,
-    // 0：新增1：已发布2已作废
+    tableForm:{
+      disabled: true
+    }
   },
   {
     label: '数量',
@@ -225,6 +261,10 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
           isMainValue: false
         }]
       }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 2,
     }
   },
   {
@@ -236,6 +276,9 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         disabled: true
       }
+    },
+    tableForm: {
+      type: 'InputNumber',
     }
   },
   {
@@ -246,22 +289,35 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         disabled: true
       }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 2,
     }
   },
   {
     label: '合计单价',
-    field: 'beforeTaxAmount',
+    field: 'sumPrice',
     sort: 'custom',
     form: {
       componentProps: {
         disabled: true
       }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
     }
   },
   {
     label: '未税金额',
-    field: 'taxRate',
+    field: 'beforeTaxAmount',
     sort: 'custom',
+    tableForm: {
+      type: 'InputNumber',
+      precision: 2,
+    }
   },
   {
     label: '税额',
@@ -271,16 +327,25 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         disabled: true
       }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 2,
     }
   },
   {
     label: '含税金额',
-    field: 'adTaxAmount',
+    field: 'afterTaxAmount',
     sort: 'custom',
     form: {
       componentProps: {
-        disabled: true
+        disabled: true,
+        precision: 2,
       }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
     }
   },
 

src/views/wms/deliversettlementManage/customerSaleInvoiceMain/index.vue → src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...CustomerSaleInvoiceMain.allSchemas.searchSchema,...CustomerSaleInvoiceDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="CustomerSaleInvoiceMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,7 +12,6 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CustomerSaleInvoiceMain.allSchemas"
-      :detailAllSchemas="CustomerSaleInvoiceDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -58,6 +57,16 @@
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @inputNumberChange="inputNumberChange"
+    @onChange="onChange"
+    :sumFormDataByTableCustom="
+      (formRef, formModel, tableData) => {
+        tableData.forEach(item=>{
+
+        })
+      }
+    "
+
   />
 
   <!-- 详情 -->
@@ -82,7 +91,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { CustomerSaleInvoiceMain,CustomerSaleInvoiceMainRules,CustomerSaleInvoiceDetailRules,CustomerSaleInvoiceDetail} from './customerSaleInvoiceMain.data'
+import { CustomerSaleInvoiceMain,CustomerSaleInvoiceMainRules,CustomerSaleInvoiceDetailRules,CustomerSaleInvoiceDetail} from './customerSaleInvoiceRequestMain.data'
 import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain'
 import * as CustomerSaleInvoiceDetailApi from '@/api/wms/customerSaleInvoiceDetail'
 import * as CustomerStatementDetailApi from '@/api/wms/customerStatementDetail'
@@ -91,8 +100,7 @@ import * as AreabasicApi from '@/api/wms/areabasic'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
-// 发货计划
+// 销售开票申请
-// 自制备件发货计划
 defineOptions({ name: 'customerSaleInvoiceMain' })
 
 const message = useMessage() // 消息弹窗
@@ -105,10 +113,10 @@ const businessType = ref()
 const importFileName = ref()
 console.log(99 ,  routeName.value)
 const customerCode = ref()
-const tableColumns = ref([...CustomerSaleInvoiceMain.allSchemas.tableColumns,...CustomerSaleInvoiceDetail.allSchemas.tableMainColumns])
+const tableColumns = ref(CustomerSaleInvoiceMain.allSchemas.tableColumns)
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: CustomerSaleInvoiceDetailApi.getCustomerSaleInvoiceDetailPage // 分页接口
+  getListApi: CustomerSaleInvoiceMainApi.getCustomerSaleInvoiceMainPage // 分页接口
 })
 
 
@@ -135,7 +143,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           row[formField] = item[searchField]
           newRow['uom'] = item['customerUom']
           newRow['id'] = item['id']
-           .push(newRow)
+          tableData.value.push(newRow)
         })
       }else{
         row[formField] = val[0][searchField]
@@ -157,7 +165,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           masterId:val[0]['id']
         }).then((res) => {
           console.log(55,res)
-        tableData.value = res.list && res.list.length > 0 ?res.list : []
+          tableData.value = res.list && res.list.length > 0 ?res.list : []
+          tableData.value.forEach(item=>{
+            item['sumPrice'] = item['price'] + item['allocationPrice']
+            // 未税金额 默认等于数量*合计单价，可修改，必填，最多可输入2位小数
+            item['beforeTaxAmount'] = item['sumPrice']*item['qty']
+            item['afterTaxAmount'] = item['beforeTaxAmount'] + item['taxAmount'] //含税金额
+
+            // 税额：taxAmount  未税价格*税率/100,四舍五入保留2位小数
+            item['taxAmount'] = (item['beforeTaxAmount'] * formRef.formModel['taxRate'])/100 //含税金额
+
+
+          })
+
        })
         // tableData.value = []
        
@@ -181,33 +201,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   })
 }
 
-// 修改 tableform 属性
-CustomerSaleInvoiceDetail.allSchemas.tableFormColumns.map(item => {
-  if(item.field == 'itemCode') {
-      item.tableForm.searchCondition = [
-      {
-        key: 'businessType',
-        value: businessType.value ,
-        isMainValue: false
-      },
-      {
-        key: 'customerCode',
-        value: 'customerCode' ,
-        isMainValue: true
-      }]
-      item.form.componentProps.searchCondition = [
-      {
-        key: 'businessType',
-        value: businessType.value,
-        isMainValue: false
-      },
-      {
-        key: 'customerCode',
-        value: 'customerCode' ,
-        isMainValue: true
-      }]
-      }
-  })
 
 // 子表新增的时候选择表格之后需要会显得字段
 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
@@ -215,12 +208,11 @@ const Echo =  []
 
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
-
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create` }), // 新增
+  defaultButtons.defaultAddBtn({hasPermi:`wms:customer-sale-invoice-main:create` }), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import` }), // 导入
+  defaultButtons.defaultImportBtn({hasPermi:`wms:customer-sale-invoice-main:import` }), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export` }), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:`wms:customer-sale-invoice-main:export` }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -435,6 +427,32 @@ const handleDeleteTable = (item, index) => {
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
+
+const onChange = (field, cur, formRef)=>{
+  
+  console.log('onChange',field, cur, formRef)
+
+  if(field == 'taxRate'){
+    // 税额：taxAmount  未税价格*税率/100,四舍五入保留2位小数
+    tableData.value.forEach(item=>{
+      item['taxAmount'] = (item['beforeTaxAmount'] * cur)/100 //含税金额
+    })
+  }
+}
+
+const inputNumberChange = (field, index, row, val) => {
+  console.log('inputNumberChange',field, index, row, val)
+  // 合计单价 = 销售单价 + 模具分摊单价
+  row['sumPrice'] = row['price'] + row['allocationPrice']
+  
+  // 含税金额 = 未税价格+税额,四舍五入保留2位小数
+  row['afterTaxAmount'] = row['beforeTaxAmount'] + row['taxAmount']
+
+  // 模具分摊单价 默认从模具分摊对账单带出，未税金额修改后重新计算，等于未税金额/数量-销售单价
+  row['allocationPrice'] = row['beforeTaxAmount']/row['qty'] - row['price']
+
+  
+}
 //为true表示子表数据中存在数量为0的数据
 const flag = ref(false)
 

src/views/wms/inventoryManage/balance/index.vue

@@ -137,7 +137,7 @@ const HeadButttondata = [
   // defaultButtons.defaultAddBtn({hasPermi:'wms:balance:create'}), // 新增
   // defaultButtons.defaultImportBtn({hasPermi:'wms:balance:import'}), // 导入
   defaultButtons.defaultExportBtn({ hasPermi: 'wms:balance:export' }), // 导出
-  defaultButtons.mainLisSelectiontPointBtn(null), // 批量标签打印
+  // defaultButtons.mainLisSelectiontPointBtn(null), // 批量标签打印
   defaultButtons.defaultFreshBtn(null), //刷新
   defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null) // 设置

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts

@@ -488,14 +488,14 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
+  // {
-    label: '货主代码',
+  //   label: '货主代码',
-    field: 'ownerCode',
+  //   field: 'ownerCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
   // {
   //   label: '替代批次',
   //   field: 'altBatch',

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@@ -543,28 +543,28 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       disabled: true
     }
   },
-  {
+  // {
-    label: '包装数量',
+  //   label: '包装数量',
-    field: 'packQty',
+  //   field: 'packQty',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    form: {
+  //   form: {
-      component: 'InputNumber',
+  //     component: 'InputNumber',
-      componentProps: {
+  //     componentProps: {
-        min: 1,
+  //       min: 1,
-        precision: 6
+  //       precision: 6
-      }
+  //     }
-    },
+  //   },
-    tableForm: {
+  //   tableForm: {
-      type: 'InputNumber',
+  //     type: 'InputNumber',
-      min: 1,
+  //     min: 1,
-      precision: 6
+  //     precision: 6
-    },
+  //   },
-    isTableForm: false,
+  //   isTableForm: false,
-    isForm: false,
+  //   isForm: false,
-  },
+  // },
   {
     label: '包装规格',
     field: 'packUnit',
@@ -680,61 +680,61 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm: false,
     isForm: false,
   },
-  {
+  // {
-    label: '货主代码',
+  //   label: '货主代码',
-    field: 'ownerCode',
+  //   field: 'ownerCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    tableForm: {
+  //   tableForm: {
-      enterSearch: true,
+  //     enterSearch: true,
-      isInpuFocusShow: true, // 开启查询弹窗
+  //     isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择货主代码',
+  //     searchListPlaceholder: '请选择货主代码',
-      searchField: 'code',
+  //     searchField: 'code',
-      searchTitle: '货主信息',
+  //     searchTitle: '货主信息',
-      searchAllSchemas: Owner.allSchemas,
+  //     searchAllSchemas: Owner.allSchemas,
-      searchPage: OwnerApi.getOwnerPage,
+  //     searchPage: OwnerApi.getOwnerPage,
-      searchCondition: [{
+  //     searchCondition: [{
-        key: 'available',
+  //       key: 'available',
-        value: 'TRUE',
+  //       value: 'TRUE',
-        isMainValue: false
+  //       isMainValue: false
-      }],
+  //     }],
-      verificationParams: [{
+  //     verificationParams: [{
-        key: 'code',
+  //       key: 'code',
-        action: '==',
+  //       action: '==',
-        value: '',
+  //       value: '',
-        isMainValue: false,
+  //       isMainValue: false,
-        isSearch: 'true',
+  //       isSearch: 'true',
-        isFormModel: true
+  //       isFormModel: true
-      }], // 失去焦点校验参数
+  //     }], // 失去焦点校验参数
-    },
+  //   },
-    form: {
+  //   form: {
-      // labelMessage: '信息提示说明！！！',
+  //     // labelMessage: '信息提示说明！！！',
-      componentProps: {
+  //     componentProps: {
-        enterSearch: true,
+  //       enterSearch: true,
-        isSearchList: true, // 开启查询弹窗
+  //       isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择货主代码',
+  //       searchListPlaceholder: '请选择货主代码',
-        searchField: 'code',
+  //       searchField: 'code',
-        searchTitle: '货主信息',
+  //       searchTitle: '货主信息',
-        searchAllSchemas: Owner.allSchemas,
+  //       searchAllSchemas: Owner.allSchemas,
-        searchPage: OwnerApi.getOwnerPage,
+  //       searchPage: OwnerApi.getOwnerPage,
-        searchCondition: [{
+  //       searchCondition: [{
-          key: 'available',
+  //         key: 'available',
-          value: 'TRUE',
+  //         value: 'TRUE',
-          isMainValue: false
+  //         isMainValue: false
-        }],
+  //       }],
-        verificationParams: [{
+  //       verificationParams: [{
-          key: 'code',
+  //         key: 'code',
-          action: '==',
+  //         action: '==',
-          value: '',
+  //         value: '',
-          isMainValue: false,
+  //         isMainValue: false,
-          isSearch: 'true',
+  //         isSearch: 'true',
-          isFormModel: true
+  //         isFormModel: true
-        }], // 失去焦点校验参数
+  //       }], // 失去焦点校验参数
-      }
+  //     }
-    }
+  //   }
-  },
+  // },
   {
     label: '项目代码',
     field: 'projectCode',
@@ -832,7 +832,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '包装规格1',
+    label: '默认包装规格',
     field: 'packUnit',
     isTable: true,
     sort: 'custom',
@@ -906,7 +906,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '包装数量1',
+    label: '默认包装数量',
     field: 'packQty',
     sort: 'custom',
     table: {
@@ -919,168 +919,168 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     tableForm: {
     }
   },
-  {
+  // {
-    label: '包装规格2',
+  //   label: '包装规格2',
-    field: 'secondPackUnit',
+  //   field: 'secondPackUnit',
-    isTable: true,
+  //   isTable: true,
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    form: {
+  //   form: {
-      componentProps: {
+  //     componentProps: {
-        enterSearch: true,
+  //       enterSearch: true,
-        disabled: true,
+  //       disabled: true,
-        isSearchList: true,
+  //       isSearchList: true,
-        searchListPlaceholder: '请选择包装',
+  //       searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
+  //       searchField: 'packUnit',
-        searchTitle: '物品包装信息',
+  //       searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
+  //       searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPage,
+  //       searchPage: ItemPackageApi.getItempackagingPage,
-        searchCondition: [
+  //       searchCondition: [
-          {
+  //         {
-            key: 'itemCode',
+  //           key: 'itemCode',
-            value: 'itemCode',
+  //           value: 'itemCode',
-            message: '请选择订单行',
+  //           message: '请选择订单行',
-            isMainValue: true
+  //           isMainValue: true
-          },
+  //         },
-          {
+  //         {
-            key: 'available',
+  //           key: 'available',
-            value: 'TRUE',
+  //           value: 'TRUE',
-            isMainValue: false
+  //           isMainValue: false
-          }
+  //         }
-        ],
+  //       ],
-        verificationParams: [{
+  //       verificationParams: [{
-          key: 'packUnit',
+  //         key: 'packUnit',
-          action: '==',
+  //         action: '==',
-          value: '',
+  //         value: '',
-          isMainValue: false,
+  //         isMainValue: false,
-          isSearch: true,
+  //         isSearch: true,
-          isFormModel: true,
+  //         isFormModel: true,
-        }], // 失去焦点校验参数
+  //       }], // 失去焦点校验参数
 
-      }
+  //     }
-    },
+  //   },
-    tableForm: {
+  //   tableForm: {
-      enterSearch: true,
+  //     enterSearch: true,
-      clearable: true,
+  //     clearable: true,
-      disabled: true,
+  //     disabled: true,
-      isInpuFocusShow: true,
+  //     isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
+  //     searchListPlaceholder: '请选择包装',
-      searchField: 'packUnit',
+  //     searchField: 'packUnit',
-      searchTitle: '物品包装信息',
+  //     searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
+  //     searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPage,
+  //     searchPage: ItemPackageApi.getItempackagingPage,
-      searchCondition: [
+  //     searchCondition: [
-        {
+  //       {
-          key: 'itemCode',
+  //         key: 'itemCode',
-          value: 'itemCode',
+  //         value: 'itemCode',
-          message: '请选择订单行',
+  //         message: '请选择订单行',
-          isTableRowValue: true,
+  //         isTableRowValue: true,
-          isMainValue:false
+  //         isMainValue:false
-        },
+  //       },
-        {
+  //       {
-          key: 'available',
+  //         key: 'available',
-          value: 'TRUE',
+  //         value: 'TRUE',
-          isMainValue: false
+  //         isMainValue: false
-        }],
+  //       }],
-        verificationParams: [{
+  //       verificationParams: [{
-          key: 'packUnit',
+  //         key: 'packUnit',
-          action: '==',
+  //         action: '==',
-          value: '',
+  //         value: '',
-          isMainValue: false,
+  //         isMainValue: false,
-          isSearch: true,
+  //         isSearch: true,
-          isFormModel: true,
+  //         isFormModel: true,
-        }], // 失去焦点校验参数
+  //       }], // 失去焦点校验参数
-    }
+  //   }
-  },
+  // },
-  {
+  // {
-    label: '包装数量2',
+  //   label: '包装数量2',
-    field: 'secondPackQty',
+  //   field: 'secondPackQty',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    form: {
+  //   form: {
-      componentProps: {
+  //     componentProps: {
-      }
+  //     }
-    },
+  //   },
-    tableForm: {
+  //   tableForm: {
-    }
+  //   }
-  },
+  // },
-  {
+  // {
-    label: '入库存包装规格',
+  //   label: '入库存包装规格',
-    field: 'balancePackUnit',
+  //   field: 'balancePackUnit',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    form: {
+  //   form: {
-      componentProps: {
+  //     componentProps: {
-        enterSearch: true,
+  //       enterSearch: true,
-        disabled: true,
+  //       disabled: true,
-        isSearchList: true,
+  //       isSearchList: true,
-        searchListPlaceholder: '请选择包装',
+  //       searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
+  //       searchField: 'packUnit',
-        searchTitle: '物品包装信息',
+  //       searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
+  //       searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPage,
+  //       searchPage: ItemPackageApi.getItempackagingPage,
-        searchCondition: [
+  //       searchCondition: [
-          {
+  //         {
-            key: 'itemCode',
+  //           key: 'itemCode',
-            value: 'itemCode',
+  //           value: 'itemCode',
-            message: '请选择订单行',
+  //           message: '请选择订单行',
-            isMainValue: true
+  //           isMainValue: true
-          },
+  //         },
-          {
+  //         {
-            key: 'available',
+  //           key: 'available',
-            value: 'TRUE',
+  //           value: 'TRUE',
-            isMainValue: false
+  //           isMainValue: false
-          }
+  //         }
-        ],
+  //       ],
-        verificationParams: [{
+  //       verificationParams: [{
-          key: 'packUnit',
+  //         key: 'packUnit',
-          action: '==',
+  //         action: '==',
-          value: '',
+  //         value: '',
-          isMainValue: false,
+  //         isMainValue: false,
-          isSearch: true,
+  //         isSearch: true,
-          isFormModel: true,
+  //         isFormModel: true,
-        }], // 失去焦点校验参数
+  //       }], // 失去焦点校验参数
 
-      }
+  //     }
-    },
+  //   },
-    tableForm: {
+  //   tableForm: {
-      enterSearch: true,
+  //     enterSearch: true,
-      disabled: true,
+  //     disabled: true,
-      isInpuFocusShow: true,
+  //     isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
+  //     searchListPlaceholder: '请选择包装',
-      searchField: 'packUnit',
+  //     searchField: 'packUnit',
-      searchTitle: '物品包装信息',
+  //     searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
+  //     searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPage,
+  //     searchPage: ItemPackageApi.getItempackagingPage,
-      searchCondition: [
+  //     searchCondition: [
-        {
+  //       {
-          key: 'itemCode',
+  //         key: 'itemCode',
-          value: 'itemCode',
+  //         value: 'itemCode',
-          message: '请选择订单行',
+  //         message: '请选择订单行',
-          isTableRowValue: true,
+  //         isTableRowValue: true,
-          isMainValue:false
+  //         isMainValue:false
-        },
+  //       },
-        {
+  //       {
-          key: 'available',
+  //         key: 'available',
-          value: 'TRUE',
+  //         value: 'TRUE',
-          isMainValue: false
+  //         isMainValue: false
-        }],
+  //       }],
-    verificationParams: [{
+  //   verificationParams: [{
-      key: 'packUnit',
+  //     key: 'packUnit',
-      action: '==',
+  //     action: '==',
-      value: '',
+  //     value: '',
-      isMainValue: false,
+  //     isMainValue: false,
-      isSearch: true,
+  //     isSearch: true,
-      isFormModel: true,
+  //     isFormModel: true,
-    }], // 失去焦点校验参数
+  //   }], // 失去焦点校验参数
-    }
+  //   }
-  },
+  // },
   {
     label: '是否线边',
     field: 'dataTypeLine',

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@@ -965,7 +965,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm:{
       multiple:true,
-      isInpuFocusShow: true, // 开启查询弹窗
+      isInpuFocusShow: false, // 开启查询弹窗
       searchListPlaceholder: '请选择批次',
       searchField: 'batch',
       searchTitle: '库存余额信息',
@@ -1284,9 +1284,9 @@ export const ScrapRequestDetailRules = reactive({
   // packingNumber: [
   //   { required: true, message: '请选择包装号', trigger: 'change' }
   // ],
-  batch: [
+  // batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' }
+  //   { required: true, message: '请输入批次', trigger: 'blur' }
-  ],
+  // ],
   fromLocationCode: [
     { required: true, message: '请选择从库位代码', trigger: 'change' }
   ],

src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue

@@ -123,6 +123,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['packingNumber'] = item['packingNumber']
           newRow['containerNumber'] = item['containerNumber']
           newRow['batch'] = item['batch']
+          newRow['qty'] = item['qty']
           newRow['inventoryStatus'] = item['inventoryStatus']
           newRow['fromLocationCode'] = item['locationCode']
           newRow['itemCode'] = item['itemCode']
@@ -161,6 +162,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
     setV[formField] = val[0][searchField]
     setV['packingNumber'] = val[0]['packingNumber']
     setV['containerNumber'] = val[0]['containerNumber']
+    setV['qty'] = val[0]['qty']
     setV['batch'] = val[0]['batch']
     setV['inventoryStatus'] = val[0]['inventoryStatus']
     setV['fromLocationCode'] = val[0]['locationCode']

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue

@@ -133,20 +133,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           fromManagementPrecision.value = res[0].ManagementPrecision
         })
         if (fromManagementPrecision.value == 'BY_QUANTITY') {//如果从批次+物料管理精度是按数量
-          if(newRow['batch']==''){
+          // if(newRow['batch']==''){
-            newRow['batch'] = getFormattedDate(); // 获取 YYYYMMDD 格式的日期
+          //   newRow['batch'] = getFormattedDate(); // 获取 YYYYMMDD 格式的日期
-          }
+          // }
           newRow['batchFormItemType'] = 'FormDate'
-          newRow['disabled_batch'] = false
+          // newRow['disabled_batch'] = false
           
         }else {
           newRow['bathFormItemType'] = ''
-          newRow['disabled_batch'] = true
+          // newRow['disabled_batch'] = true
         }
-
-
-
-
           newRow['inventoryStatus'] = item['inventoryStatus']
           newRow['fromLocationCode'] = item['locationCode']
           newRow['itemCode'] = item['itemCode']

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts

@@ -207,12 +207,15 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      },{
+      },
-        key: 'costcentreType',
+      // {
-        value: 'costCenterType',
+      //   key: 'costcentreType',
-        message: '成本中心类型不能为空!',
+      //   value: 'costCenterType',
-        isMainValue: true
+      //   message: '成本中心类型不能为空!',
-        }],
+      //   isMainValue: true
+      //   }
+      
+      ],
       verificationParams: [{
         key: 'code',
         action: '==',
@@ -236,12 +239,14 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
+        },
-          key: 'costcentreType',
+        // {
-          value: 'costCenterType',
+        //   key: 'costcentreType',
-          message: '成本中心类型不能为空!',
+        //   value: 'costCenterType',
-          isMainValue: true
+        //   message: '成本中心类型不能为空!',
-          }],
+        //   isMainValue: true
+        //   }
+        ],
         verificationParams: [{
           key: 'code',
           action: '==',
@@ -669,7 +674,7 @@ export const UnplannedissueRequestMainRules = reactive({
     { required: true, message: '请输入成本中心代码', trigger: 'blur' }
   ],
   costCenterType: [
-    { required: true, message: '请输入成本中心类型', trigger: 'blur' }
+    { required: false, message: '请输入成本中心类型', trigger: 'blur' }
   ],
   reasonCodeRequisition: [
     { required: true, message: '请输入领用原因代码', trigger: 'blur' }
@@ -707,12 +712,13 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     tableForm:{
       multiple:true,//多选
-      isInpuFocusShow: true, // 开启查询弹窗
+      isInpuFocusShow: false, // 开启查询弹窗
       searchListPlaceholder: '请输入包装号',
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
       searchPage: BalanceApi.getBalanceItemPage,
+      disabled:true,
       searchCondition: [{
         key: 'available',
         value: 'TRUE',
@@ -736,6 +742,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        disabled: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请输入包装号',
         searchField: 'packingNumber',

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

@@ -207,12 +207,14 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      },{
+      },
-        key: 'costcentreType',
+      // {
-        value: 'costCenterType',
+      //   key: 'costcentreType',
-        message: '成本中心类型不能为空!',
+      //   value: 'costCenterType',
-        isMainValue: true
+      //   message: '成本中心类型不能为空!',
-        }],
+      //   isMainValue: true
+      //   }
+      ],
       verificationParams: [{
         key: 'code',
         action: '==',
@@ -236,12 +238,14 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
+        },
-          key: 'costcentreType',
+        // {
-          value: 'costCenterType',
+        //   key: 'costcentreType',
-          message: '成本中心类型不能为空!',
+        //   value: 'costCenterType',
-          isMainValue: true
+        //   message: '成本中心类型不能为空!',
-          }],
+        //   isMainValue: true
+        //   }
+        ],
         verificationParams: [{
           key: 'code',
           action: '==',
@@ -648,7 +652,7 @@ export const UnplannedreceiptRequestMainRules = reactive({
     { required: true, message: '请输入成本中心代码', trigger: 'blur' }
   ],
   costCenterType: [
-    { required: true, message: '请输入成本中心类型', trigger: 'blur' }
+    { required: false, message: '请输入成本中心类型', trigger: 'blur' }
   ],
   projectCode: [
     { required: false, message: '请输入项目代码', trigger: 'blur' }

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@@ -54,7 +54,7 @@
   <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
-    fieldTableColumn="fromPackingNumber"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="InventorychangeRequestMainRules"
     :formAllSchemas="InventorychangeRequestMain.allSchemas"
@@ -135,13 +135,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField=='toOwnerCode'){
         //到货主代码
         row['toOwnerCode'] = val[0]['code']
-      }else if(formField == 'fromPackingNumber'){
+      }else if(formField == 'itemCode'){
-        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['locationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['locationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
         if(val.length==0) return
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow[formField] = item[searchField]
-          newRow['fromPackingNumber'] = item['packingNumber']
           newRow['toPackingNumber'] = item['packingNumber']
           newRow['fromBatch'] = item['batch']
           newRow['toBatch'] = item['batch']
@@ -173,7 +172,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      setV['fromPackingNumber'] = val[0]['fromPackingNumber']
       setV['toPackingNumber'] = val[0]['packingNumber']
       setV['fromBatch'] = val[0]['batch']
       setV['toBatch'] = val[0]['batch']
@@ -204,8 +202,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-      if(formField == 'fromPackingNumber') {
+      if(formField == 'itemCode') {
-      setV['fromPackingNumber'] = val[0]['packingNumber']
       setV['itemCode'] = val[0]['itemCode']
       setV['fromBatch'] = val[0]['batch']
       setV['toBatch'] = val[0]['batch']

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts

@@ -391,38 +391,12 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
-      multiple:true,
+      disabled: true
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择从包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
-      searchCondition: [{
-        key: 'businessType',
-        value: businessTypeData.code,
-      },{
-        key: 'noCheckExpireDateFlag',
-        value: 'TRUE',
-      }]
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
+        disabled: true
-        searchListPlaceholder: '请选择从包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
-        searchCondition: [{
-          key: 'businessType',
-          value: businessTypeData.code,
-        },{
-          key: 'noCheckExpireDateFlag',
-          value: 'TRUE',
-        }]
       }
     }
   },
@@ -443,12 +417,39 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+  
     tableForm: {
-      disabled: true
+      multiple: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
+      searchCondition: [{
+        key: 'businessType',
+        value: businessTypeData.code,
+      }, {
+        key: 'noCheckExpireDateFlag',
+        value: 'TRUE',
+      }]
     },
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
+        searchCondition: [{
+          key: 'businessType',
+          value: businessTypeData.code,
+        }, {
+          key: 'noCheckExpireDateFlag',
+          value: 'TRUE',
+        }]
       }
     }
   },

src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts

@@ -16,6 +16,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'left'
     },
     isSearch: true,
+    sortTableDefault:1,
   },
   {
     label: '申请单号',
@@ -24,6 +25,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:2,
   },
   {
     label: '状态',
@@ -36,16 +38,17 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:3,
   },
-  {
+  // {
-    label: '发货单号',
+  //   label: '发货单号',
-    field: 'asnNumber',
+  //   field: 'asnNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isForm: false,
+  //   isForm: false,
-  },
+  // },
   // {
   //   label: '使用在途库',
   //   field: 'useOnTheWayLocation',
@@ -65,46 +68,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     }
   //   }
   // },
-  {
+  
-    label: '申请时间',
-    field: 'requestTime',
-    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: 'requestDueTime',
-    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: 'expiredTime',
@@ -133,6 +97,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:4,
   },
   {
     label: '到仓库代码',
@@ -141,6 +106,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:5,
   },
   // {
   //   label: '从库区代码范围',
@@ -234,6 +200,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable: true,
+    sortTableDefault:6,
   },
   // {
   //   label: '自动完成',
@@ -485,6 +452,48 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   //   isTable: false,
   // },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    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',
+      }
+    },
+    sortTableDefault:20,
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    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',
+      }
+    },
+    sortTableDefault:21,
+  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -514,6 +523,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    sortTableDefault:22,
   },
   {
     label: '创建者',
@@ -523,6 +533,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable: false,
+    sortTableDefault:23,
   },
   {
     label: '最后更新时间',
@@ -649,6 +660,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:7,
   },
   {
     label: '物料名称',
@@ -657,6 +669,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:8,
   },
   {
     label: '物料描述1',
@@ -665,6 +678,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9,
   },
   {
     label: '物料描述2',
@@ -673,6 +687,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:10,
   },
   {
     label: '批次',
@@ -681,6 +696,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:11,
   },
   {
     label: '供应商代码',
@@ -690,6 +706,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
     },
+    sortTableDefault:12,
   },
   {
     label: '供应商名称',
@@ -698,6 +715,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault:13,
   },
   {
     label: '供应商批次',
@@ -706,6 +724,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:14,
   },
   {
     label: '包装号',
@@ -732,7 +751,8 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    sortTableDefault:15,
   },
   {
     label: '计量单位',
@@ -744,6 +764,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:16,
   },
   {
     label: '从库位代码',
@@ -752,6 +773,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:17,
   },
   {
     label: '到库位代码',
@@ -760,6 +782,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:18,
   },
   {
     label: '库存状态',
@@ -771,6 +794,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:19,
   },
   // {
   //   label: '到库存状态',

src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts

@@ -13,7 +13,8 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
-    isSearch: true
+    isSearch: true,
+    sortTableDefault:1,
   },
   {
     label: '申请单号',
@@ -22,8 +23,8 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    sortTableDefault:996,
+    isSearch: true,
-    isSearch: true
+    sortTableDefault:2,
   },
   {
     label: '任务单号',
@@ -32,8 +33,8 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    sortTableDefault:997,
+    isSearch: true,
-    isSearch: true
+    sortTableDefault:3,
   },
   // {
   //   label: '使用在途库',
@@ -135,15 +136,15 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     }
   //   },
   // },
-  {
+  // {
-    label: '发货单号',
+  //   label: '发货单号',
-    field: 'asnNumber',
+  //   field: 'asnNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isForm: false,
+  //   isForm: false,
-  },
+  // },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
@@ -151,6 +152,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:5,
   },
   {
     label: '到仓库代码',
@@ -159,6 +161,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:6,
   },
   // {
   //   label: '从库区类型范围',
@@ -205,6 +208,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:7,
   },
   {
     label: '入库事务类型',
@@ -213,6 +217,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:8,
   },
   {
     label: '业务类型',
@@ -221,6 +226,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9,
   },
 
   // {
@@ -249,6 +255,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:32,
   },
   {
     label: '创建时间',
@@ -278,6 +285,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    sortTableDefault:33,
   },
   {
     label: '创建者',
@@ -286,6 +294,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:34,
   },
   {
     label: '最后更新时间',
@@ -425,11 +434,11 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.RECEIVE_STATUS,
     dictClass: 'string',
-    sortTableDefault:998,
     isTable: true,
     table: {
       width: 150
     },
+    sortTableDefault:4,
   },
   {
     label: '物料代码',
@@ -438,6 +447,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:10,
   },
   {
     label: '物料名称',
@@ -446,6 +456,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:11,
   },
   {
     label: '物料描述1',
@@ -454,6 +465,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:12,
   },
   {
     label: '物料描述2',
@@ -462,6 +474,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:13,
   },
   // {
   //   label: '在途库库位',
@@ -478,6 +491,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:14,
   },
   {
     label: '到批次',
@@ -486,6 +500,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:15,
   },
   {
     label: '供应商代码',
@@ -495,6 +510,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
     },
+    sortTableDefault:16,
   },
   {
     label: '供应商名称',
@@ -503,6 +519,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault:17,
   },
   {
     label: '供应商批次',
@@ -511,6 +528,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:18,
   },
   {
     label: '从包装号',
@@ -519,6 +537,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:19,
   },
   {
     label: '到包装号',
@@ -527,6 +546,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:20,
   },
   // {
   //   label: '从器具号',
@@ -553,7 +573,8 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    sortTableDefault:21,
   },
   {
     label: '计量单位',
@@ -565,6 +586,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:22,
   },
   {
     label: '从库位代码',
@@ -573,6 +595,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:23,
   },
   {
     label: '到库位代码',
@@ -581,6 +604,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:24,
   },
   {
     label: '从库存状态',
@@ -592,6 +616,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:25,
   },
   {
     label: '到库存状态',
@@ -603,6 +628,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:26,
   },
   {
     label: '从库位组代码',
@@ -611,6 +637,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:27,
   },
   {
     label: '到库位组代码',
@@ -619,6 +646,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:28,
   },
   {
     label: '从库区代码',
@@ -627,6 +655,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:29,
   },
   {
     label: '到库区代码',
@@ -635,6 +664,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:30,
   },
   // {
   //   label: '项目代码',
@@ -670,6 +700,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:31,
   },
   // {
   //   label: '备注',

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -43,7 +43,7 @@
   <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
-    fieldTableColumn="fromPackingNumber"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="InventorymoveRequestMainRules"
     :formAllSchemas="InventorymoveRequestMain.allSchemas"
@@ -251,7 +251,7 @@ InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
 })
 // 修改 tableform 属性
 InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
-  if(item.field == 'fromPackingNumber') {
+  if(item.field == 'itemCode') {
     if (fromInventoryStatus.value) {
       item.tableForm.searchCondition = [
       {
@@ -354,12 +354,12 @@ const fromManagementPrecision = ref('')
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async() => {
     if (type == 'tableForm') {
-      if(formField == 'fromPackingNumber'){
+      if (formField == 'itemCode') {
-        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
         if(val.length==0) return
         val.forEach(async item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-          newRow['fromPackingNumber'] = item['packingNumber']
+          // newRow['fromPackingNumber'] = item['packingNumber']
           newRow['fromContainerNumber'] = item['containerNumber']
           newRow['itemCode'] = item['itemCode']
           if (item['batch'] != '') {
@@ -406,14 +406,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     } else {
       const setV = {}
       if (formField == 'fromWarehouseCode') {
-        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        if(InventorymoveRequestDetail?.allSchemas?.tableFormColumns?.find(item => (item.field == 'itemCode'))?.tableForm?.searchCondition?.find(item => (item.key == 'warehouseCode')) == undefined){
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.push({
+        InventorymoveRequestDetail?.allSchemas?.tableFormColumns?.find(item => (item.field == 'itemCode'))?.tableForm?.searchCondition?.push({
           key: 'warehouseCode',
           value: val[0]["code"],
           isMainValue: false
         })
       } else {
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => {
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.find(item => {
           if (item.key == 'warehouseCode') {
             item.value = val[0]["code"]
           }
@@ -429,8 +429,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-    if(formField == 'fromPackingNumber') {
+    if(formField == 'itemCode') {
-      setV['fromPackingNumber'] = val[0]['packingNumber']
       setV['fromContainerNumber'] = val[0]['containerNumber']
       setV['itemCode'] = val[0]['itemCode']
       setV['fromBatch'] = val[0]['batch']
@@ -625,14 +624,14 @@ const detailOpenForm = (type, row) => {
       item.componentProps.disabled = routeName.value == "HoldtookRequestMain"
     }
   })
-    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
-        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.push({
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.push({
           key: 'warehouseCode',
           value: fromWarehouseCodeMain.value,
           isMainValue: false
         })
       } else {
-        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => {
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.find(item => {
           if (item.key == 'warehouseCode') {
             item.value = fromWarehouseCodeMain.value
           }
@@ -739,17 +738,17 @@ const submitForm = async (formType, submitData) => {
   }
   data.businessType = businessType.value
   data.subList = tableData.value // 拼接子表数据参数
-  let isExist = false
+  // let isExist = false
-  tableData.value.forEach(item => {
+  // tableData.value.forEach(item => {
-    let rs =  tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber)   )
+  //   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
-    console.log(rs,5666);
+  //   console.log(rs,5666);
-   if(rs.length > 1) isExist = true
+  //  if(rs.length > 1) isExist = true
-  })
+  // })
-  if (isExist) {
+  // if (isExist) {
-    formRef.value.formLoading = false
+  //   formRef.value.formLoading = false
-    isExist = false
+  //   isExist = false
-    return message.warning('包装号重复')
+  //   return message.warning('物料号重复')
-  }
+  // }
   flag.value = false
   data.subList.forEach(item => {
     console.log(556565,item);

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@@ -512,11 +512,23 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
-      disabled: true
+      multiple: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.selectLocationTypeToBalance,
     },
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.selectLocationTypeToBalance,
       }
     }
   },
@@ -588,23 +600,14 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm:{
-      multiple:true,
+      disabled: true,
-      isInpuFocusShow: true, // 开启查询弹窗
+      placeholder: '请选择从包装号',
-      searchListPlaceholder: '请选择从包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.selectLocationTypeToBalance,
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
+        disabled: true,
-        searchListPlaceholder: '请选择从包装号',
+        placeholder: '请选择从包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.selectLocationTypeToBalance,
       }
     }
   },

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue

@@ -43,7 +43,7 @@
   <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
-    fieldTableColumn="fromPackingNumber"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="InventorymoveRequestMainRules"
     :formAllSchemas="InventorymoveRequestMain.allSchemas"
@@ -206,7 +206,7 @@ InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
 })
 // 修改 tableform 属性
 InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
-  if(item.field == 'fromPackingNumber') {
+  if(item.field == 'itemCode') {
     if (fromInventoryStatus.value) {
       item.tableForm.searchCondition = [
       {
@@ -296,12 +296,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(async () => {
     console.log(formField)
     if (type == 'tableForm') {
-      if (formField == 'fromPackingNumber') {
+      if (formField == 'itemCode') {
-        val = val.filter(item => !tableData.value.find(item1 => item1['itemCode'] == item['itemCode'] && item1['fromBatch'] == item['batch'] && item1['fromPackingNumber'] == item['packingNumber'] && item1['fromLocationCode'] == item['locationCode'] && item1['fromInventoryStatus'] == item['inventoryStatus']))
+        val = val.filter(item => !tableData.value.find(item1 => item1['itemCode'] == item['itemCode']  && item1['fromLocationCode'] == item['locationCode'] && item1['fromInventoryStatus'] == item['inventoryStatus']))
         if (val.length == 0) return
         val.forEach(item => {
           const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...item }))
-          newRow['fromPackingNumber'] = item['packingNumber']
           newRow['fromContainerNumber'] = item['containerNumber']
           newRow['itemCode'] = item['itemCode']
           newRow['fromBatch'] = item['batch']
@@ -349,14 +348,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       const setV = {}
       if (formField == 'fromWarehouseCode') {
         tableData.value = []
-        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.push({
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.push({
           key: 'warehouseCode',
           value: val[0]["code"],
           isMainValue: false
         })
       } else {
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => {
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.find(item => {
           if (item.key == 'warehouseCode') {
             item.value = val[0]["code"]
           }
@@ -372,8 +371,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-    if(formField == 'fromPackingNumber') {
+    if(formField == 'itemCode') {
-      setV['fromPackingNumber'] = val[0]['packingNumber']
       setV['fromContainerNumber'] = val[0]['containerNumber']
       setV['itemCode'] = val[0]['itemCode']
       setV['fromBatch'] = val[0]['batch']
@@ -546,14 +544,14 @@ const openForm =async (type: string, row?: number) => {
  * 详情 新增/编辑事件
  */
 const detailOpenForm = (type, row) => {
-    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
-        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.push({
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.push({
           key: 'warehouseCode',
           value: fromWarehouseCodeMain.value,
           isMainValue: false
         })
       } else {
-        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => {
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.find(item => {
           if (item.key == 'warehouseCode') {
             item.value = fromWarehouseCodeMain.value
           }
@@ -644,17 +642,17 @@ const submitForm = async (formType, submitData) => {
   }
   data.businessType = businessType.value
   data.subList = tableData.value // 拼接子表数据参数
-  let isExist = false
+  // let isExist = false
-  tableData.value.forEach(item => {
+  // tableData.value.forEach(item => {
-    let rs =  tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber)   )
+  //   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
-    console.log(rs,5666);
+  //   console.log(rs,5666);
-   if(rs.length > 1) isExist = true
+  //  if(rs.length > 1) isExist = true
-  })
+  // })
-  if (isExist) {
+  // if (isExist) {
-    formRef.value.formLoading = false
+  //   formRef.value.formLoading = false
-    isExist = false
+  //   isExist = false
-    return message.warning('包装号重复')
+  //   return message.warning('物料号重复')
-  }
+  // }
   flag.value = false
   data.subList.forEach(item => {
     console.log(556565,item);

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts

@@ -510,12 +510,25 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    tableForm: {
+    
-      disabled: true
+      tableForm: {
+      multiple: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.selectLocationTypeToBalance,
     },
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.selectLocationTypeToBalance,
       }
     }
   },
@@ -586,24 +599,12 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
-      multiple:true,
+      disabled: true
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择从包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.selectLocationTypeToBalance,
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
+        disabled: true
-        searchListPlaceholder: '请选择从包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.selectLocationTypeToBalance,
       }
     }
   },

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue

@@ -43,7 +43,7 @@
   <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
-    fieldTableColumn="fromPackingNumber"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="InventorymoveRequestMainRules"
     :formAllSchemas="InventorymoveRequestMain.allSchemas"
@@ -197,7 +197,7 @@ InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
 })
 // 修改 tableform 属性
 InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
-  if(item.field == 'fromPackingNumber') {
+  if(item.field == 'itemCode') {
     if (fromInventoryStatus.value) {
       item.tableForm.searchCondition = [
       {
@@ -311,12 +311,11 @@ let toManagementPrecision =  ref('')
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async() => {
     if (type == 'tableForm') {
-      if(formField == 'fromPackingNumber'){
+      if(formField == 'itemCode'){
-        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
         if(val.length==0) return
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-          newRow['fromPackingNumber'] = item['packingNumber']
           newRow['fromContainerNumber'] = item['containerNumber']
           newRow['itemCode'] = item['itemCode']
           newRow['fromBatch'] = item['batch']
@@ -354,14 +353,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     } else {
       const setV = {}
       if (formField == 'fromWarehouseCode') {
-        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.push({
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.push({
           key: 'warehouseCode',
           value: val[0]["code"],
           isMainValue: false
         })
       } else {
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => {
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.find(item => {
           if (item.key == 'warehouseCode') {
             item.value = val[0]["code"]
           }
@@ -377,8 +376,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
   nextTick(async() => {
     const setV = {}
-    if(formField == 'fromPackingNumber') {
+    if(formField == 'itemCode') {
-      setV['fromPackingNumber'] = val[0]['packingNumber']
       setV['fromContainerNumber'] = val[0]['containerNumber']
       setV['itemCode'] = val[0]['itemCode']
       setV['fromBatch'] = val[0]['batch']
@@ -576,14 +574,14 @@ const openForm =async (type: string, row?: number) => {
  * 详情 新增/编辑事件
  */
 const detailOpenForm =async (type, row) => {
-  if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+  if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
-    InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.push({
+    InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.push({
       key: 'warehouseCode',
       value: fromWarehouseCodeMain.value,
       isMainValue: false
     })
   } else {
-    InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => {
+    InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.find(item => {
       if (item.key == 'warehouseCode') {
         item.value = fromWarehouseCodeMain.value
       }
@@ -710,16 +708,16 @@ const submitForm = async (formType, submitData) => {
     return
   }
   data.subList = tableData.value // 拼接子表数据参数
-  let isExist = false
+  // let isExist = false
-  tableData.value.forEach(item => {
+  // tableData.value.forEach(item => {
-    let rs =  tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber)   )
+  //   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
-   if(rs.length > 1) isExist = true
+  //  if(rs.length > 1) isExist = true
-  })
+  // })
-  if (isExist) {
+  // if (isExist) {
-    formRef.value.formLoading = false
+  //   formRef.value.formLoading = false
-    isExist = false
+  //   isExist = false
-    return message.warning('包装号重复')
+  //   return message.warning('物料号重复')
-  }
+  // }
   flag.value = false
   data.subList.forEach(item => {
     if(fromInventoryStatus.value){

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts

@@ -511,11 +511,23 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
-      disabled: true
+      multiple: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.selectLocationTypeToBalance,
     },
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.selectLocationTypeToBalance,
       }
     }
   },
@@ -619,24 +631,12 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
-      multiple:true,
+      disabled: true
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择从包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.selectLocationTypeToBalance,
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
+        disabled: true
-        searchListPlaceholder: '请选择从包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.selectLocationTypeToBalance,
       }
     }
   },

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue

@@ -317,7 +317,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(async() => {
     if (type == 'tableForm') {
       if(formField == 'fromBatch'){
-        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
         if(val.length==0) return
 
         const toLocationCode =formRef.formModel.toLocationCode//主数据选择的到库位代码
@@ -712,18 +712,18 @@ const submitForm = async (formType, submitData) => {
     message.warning("数量不能大于库存数量")
     return
   }
-  let isExist = false
+  // let isExist = false
-  tableData.value.forEach(item => {
+  // tableData.value.forEach(item => {
-    item['toLocationCode'] = toLocationCode
+  //   item['toLocationCode'] = toLocationCode
-    let rs =  tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber)   )
+  //   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
-    console.log(rs,5666);
+  //   console.log(rs,5666);
-   if(rs.length > 1) isExist = true
+  //  if(rs.length > 1) isExist = true
-  })
+  // })
-  if (isExist) {
+  // if (isExist) {
-    formRef.value.formLoading = false
+  //   formRef.value.formLoading = false
-    isExist = false
+  //   isExist = false
-    return message.warning('包装号重复')
+  //   return message.warning('物料号重复')
-  }
+  // }
   flag.value = false
   data.subList.forEach(item => {
     console.log(556565,item);

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts

@@ -50,6 +50,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isSearch: true,
+    sortTableDefault:1,
   },
   {
     label: '状态',
@@ -68,7 +69,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         disabled: true
       }
-    }
+    },
+    sortTableDefault:2,
   },
   {
     label: '从仓库代码',
@@ -113,7 +115,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           isFormModel: true,
         }], // 失去焦点校验参数
       }
-    }
+    },
+    sortTableDefault:3,
   },
   {
     label: '到仓库代码',
@@ -126,15 +129,15 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm:false,
     isForm: false,
   },
-  {
+  // {
-    label: '发货单号',
+  //   label: '发货单号',
-    field: 'asnNumber',
+  //   field: 'asnNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isForm: false,
+  //   isForm: false,
-  },
+  // },
   {
     label: '申请时间',
     field: 'requestTime',
@@ -558,28 +561,28 @@ export const BalanceShow = useCrudSchemas(
       },
       isSearch: false
     },
-    {
+    // {
-      label: '供应商代码',
+    //   label: '供应商代码',
-      field: 'supplierCode',
+    //   field: 'supplierCode',
-      sort: 'custom',
+    //   sort: 'custom',
-      isSearch: false,
+    //   isSearch: false,
-      table: {
+    //   table: {
-        width: 150,
+    //     width: 150,
-      },
+    //   },
-    },
+    // },
-    {
+    // {
-      label: '供应商名称',
+    //   label: '供应商名称',
-      field: 'supplierName',
+    //   field: 'supplierName',
-      isForm:true,
+    //   isForm:true,
-      form:{
+    //   form:{
-        componentProps:{
+    //     componentProps:{
-          disabled: true
+    //       disabled: true
-        }
+    //     }
-      },
+    //   },
-      table: {
+    //   table: {
-        width: 180
+    //     width: 180
-      }
+    //   }
-    },
+    // },
     {
       label: '库存数量',
       field: 'qty',
@@ -1072,6 +1075,67 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         disabled: true
       }
+    },
+    sortTableDefault:4,
+  },
+
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:false,
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled:false,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    },
+    sortTableDefault:13,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    sortTableDefault:14,
+  },
+  {
+    label: '库存数量 ',
+    field: 'inventoryQty',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    tableForm: {
+      disabled: true
+    },
+    form:{
+      componentProps:{
+        disabled:true
+      }
     }
   },
   {
@@ -1083,6 +1147,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isTableForm: false,
     isForm: false,
+    sortTableDefault:5,
   },
   {
     label: '物料描述1',
@@ -1093,6 +1158,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isTableForm: false,
     isForm: false,
+    sortTableDefault:6,
   },
   {
     label: '物料描述2',
@@ -1103,6 +1169,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isTableForm: false,
     isForm: false,
+    sortTableDefault:7,
   },
   {
     label: '从批次',
@@ -1136,7 +1203,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         searchAllSchemas: BalanceShow.allSchemas,
         searchPage: BalanceApi.selectLocationTypeToBalance,
       }
-    }
+    },
+    sortTableDefault:8,
   },
   {
     label: '到批次',
@@ -1145,55 +1213,58 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTableForm: false,
+    isTableForm: true,
-    isForm: false,
+    isForm: true,
-  },
+    sortTableDefault:9,
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    isSearch: false,
-    isDetail: true,
-    table: {
-      width: 150,
-    },
-    tableForm: {
-      // isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择供应商',
-      searchField: 'code',
-      searchTitle: '供应商信息',
-      searchAllSchemas: Supplieritem.allSchemas,
-      searchPage: SupplierItemApi.getSupplieritemPage,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key: 'itemCode',
-        value: 'itemCode',
-        message: '物料代码不能为空!',
-        isTableRowValue: true, //查询当前searchTable表中行数据的值
-        isMainValue:false
-      }]
-    }
-  },
-  {
-    label: '供应商名称',
-    field: 'supplierName',
-    isForm:true,
-    isDetail: true,
-    form:{
-      componentProps:{
-        disabled: true
-      }
-    },
-    table: {
-      width: 180
-    },
-    tableForm: {
-      disabled: true
-    }
   },
+  // {
+  //   label: '供应商代码',
+  //   field: 'supplierCode',
+  //   sort: 'custom',
+  //   isSearch: false,
+  //   isDetail: true,
+  //   table: {
+  //     width: 150,
+  //   },
+  //   tableForm: {
+  //     // isInpuFocusShow: true, // 开启查询弹窗
+  //     searchListPlaceholder: '请选择供应商',
+  //     searchField: 'code',
+  //     searchTitle: '供应商信息',
+  //     searchAllSchemas: Supplieritem.allSchemas,
+  //     searchPage: SupplierItemApi.getSupplieritemPage,
+  //     searchCondition: [{
+  //       key: 'available',
+  //       value: 'TRUE',
+  //       isMainValue: false
+  //     },{
+  //       key: 'itemCode',
+  //       value: 'itemCode',
+  //       message: '物料代码不能为空!',
+  //       isTableRowValue: true, //查询当前searchTable表中行数据的值
+  //       isMainValue:false
+  //     }]
+  //   },
+  //   sortTableDefault:10,
+  // },
+  // {
+  //   label: '供应商名称',
+  //   field: 'supplierName',
+  //   isForm:true,
+  //   isDetail: true,
+  //   form:{
+  //     componentProps:{
+  //       disabled: true
+  //     }
+  //   },
+  //   table: {
+  //     width: 180
+  //   },
+  //   tableForm: {
+  //     disabled: true
+  //   },
+  //   sortTableDefault:11,
+  // },
   {
     label: '到包装号',
     field: 'toPackingNumber',
@@ -1203,6 +1274,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isTableForm: false,
     isForm: false,
+    sortTableDefault:12,
   },
   // {
   //   label: '从器具号',
@@ -1230,63 +1302,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
   //   isTableForm: false,
   //   isForm: false,
   // },
-  {
+ 
-    label: '库存数量 ',
+  
-    field: 'inventoryQty',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    tableForm: {
-      disabled: true
-    },
-    form:{
-      componentProps:{
-        disabled:true
-      }
-    }
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        disabled:false,
-        min: 0,
-        precision: 6
-      }
-    },
-    tableForm: {
-      disabled:false,
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
@@ -1301,75 +1318,77 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         disabled: true
       }
-    }
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm:false, //放在主表展示了--喜婷
-    tableForm: {
-      enterSearch: true,
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择到库位代码',
-      searchField: 'code',
-      searchTitle: '库位信息',
-      searchAllSchemas: Location.allSchemas,
-      searchPage: LocationApi.selectBusinessTypeToLocation,
-      searchCondition: [
-      {
-        key: 'type',
-        value: 'businessType',
-        isMainValue: true
-      },{
-        key: 'isIn',
-        value: 'in',
-        isMainValue: false
-        }],
-      isRepeat:true,
-      verificationParams: [{
-        key: 'code',
-        action: '==',
-        value: '',
-        isMainValue: false,
-        isSearch: true,
-        isFormModel: true,
-      }], // 失去焦点校验参数
     },
-    form: {
+    sortTableDefault:15,
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择到库位代码',
-        searchField: 'code',
-        searchTitle: '库位信息',
-        searchAllSchemas: Location.allSchemas,
-        searchPage: LocationApi.selectBusinessTypeToLocation,
-        searchCondition: [
-          {
-            key: 'type',
-            value: 'businessType',
-            isMainValue: true
-          },{
-            key: 'isIn',
-            value: 'in',
-            isMainValue: false
-            }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
-      }
-    }
   },
+  // {
+  //   label: '到库位代码',
+  //   field: 'toLocationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm:false, //放在主表展示了--喜婷
+  //   tableForm: {
+  //     enterSearch: true,
+  //     isInpuFocusShow: true, // 开启查询弹窗
+  //     searchListPlaceholder: '请选择到库位代码',
+  //     searchField: 'code',
+  //     searchTitle: '库位信息',
+  //     searchAllSchemas: Location.allSchemas,
+  //     searchPage: LocationApi.selectBusinessTypeToLocation,
+  //     searchCondition: [
+  //     {
+  //       key: 'type',
+  //       value: 'businessType',
+  //       isMainValue: true
+  //     },{
+  //       key: 'isIn',
+  //       value: 'in',
+  //       isMainValue: false
+  //       }],
+  //     isRepeat:true,
+  //     verificationParams: [{
+  //       key: 'code',
+  //       action: '==',
+  //       value: '',
+  //       isMainValue: false,
+  //       isSearch: true,
+  //       isFormModel: true,
+  //     }], // 失去焦点校验参数
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       enterSearch: true,
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择到库位代码',
+  //       searchField: 'code',
+  //       searchTitle: '库位信息',
+  //       searchAllSchemas: Location.allSchemas,
+  //       searchPage: LocationApi.selectBusinessTypeToLocation,
+  //       searchCondition: [
+  //         {
+  //           key: 'type',
+  //           value: 'businessType',
+  //           isMainValue: true
+  //         },{
+  //           key: 'isIn',
+  //           value: 'in',
+  //           isMainValue: false
+  //           }],
+  //       verificationParams: [{
+  //         key: 'code',
+  //         action: '==',
+  //         value: '',
+  //         isMainValue: false,
+  //         isSearch: true,
+  //         isFormModel: true,
+  //       }], // 失去焦点校验参数
+  //     }
+  //   },
+  //   sortTableDefault:16,
+  // },
   {
     label: '从库存状态',
     field: 'fromInventoryStatus',
@@ -1388,7 +1407,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         disabled: true
       }
-    }
+    },
+    sortTableDefault:17,
   },
   {
     label: '到库存状态',
@@ -1408,7 +1428,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         disabled: true
       }
-    }
+    },
+    sortTableDefault:18,
   },
   // {
   //   label: '从货主代码',

src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts

@@ -640,9 +640,9 @@ export const ProductionMainRules = reactive({
   productionLine: [
     { required: true, message: '请选择生产线', trigger: 'change' }
   ],
-  // shift: [
+  shift: [
-  //   { required: true, message: '请选择班次', trigger: 'change' }
+    { required: true, message: '请选择班次', trigger: 'change' }
-  // ],
+  ],
   // team: [
   //   { required: true, message: '请选择班组', trigger: 'change' }
   // ],

src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts

@@ -639,9 +639,9 @@ export const ProductionMainRules = reactive({
   productionLine: [
     { required: true, message: '请选择生产线', trigger: 'change' }
   ],
-  // shift: [
+  shift: [
-  //   { required: true, message: '请选择班次', trigger: 'change' }
+    { required: true, message: '请选择班次', trigger: 'change' }
-  // ],
+  ],
   // team: [
   //   { required: true, message: '请选择班组', trigger: 'change' }
   // ],

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@@ -102,6 +102,10 @@
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
     :detailValidate="detailValidate"
+    @detailOpenForm="detailOpenForm"
+    :detailButtonIsShowAdd=false
+    :detailButtonIsShowEdit=false
+    :detailButtonIsShowDelete=false
   />
 
   <!-- 创建标签 -->
@@ -190,6 +194,7 @@ import * as WorkshopApi from '@/api/wms/workshop'
 import * as ConfigApi from '@/api/infra/config'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import {exportProductreceiptRequestMainPredict} from "@/api/wms/productreceiptRequestMain";
+import * as ItemPackageApi from "@/api/wms/itempackage";
 const { loadStart, loadDone } = usePageLoading()
 // 制品收货申请
 // 预生产收货申请
@@ -324,8 +329,39 @@ const setTableFormsValues = async (val, index1) => {
 }
 // 查询页面返回——详情
 const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-  nextTick(() => {
+  nextTick(async () => {
     const setV = {}
+      if (formField == 'secondPackUnit') {
+      setV['secondPackUnit'] = val[0]['packUnit']
+      setV['secondPackQty'] = val[0]['packQty']
+    } else if (formField == 'packUnit') {
+      setV['packUnit'] = val[0]['packUnit']
+      setV['packQty'] = val[0]['packQty']
+    } else if (formField == 'itemCode') {
+      if(detailRef.value.tableObjectRef.tableList.find(item1=>item1['itemCode'] == val[0]['itemCode'])){
+        message.warning(`物料${val[0]['itemCode']}已经存在`)
+        return
+      }
+      setV['itemCode'] = val[0]['itemCode']
+      setV['uom'] = val[0]['uom']
+      setV['produceDate'] = dayjs().valueOf()
+      setV['batch'] = formatTime(new Date(), 'yyyyMMdd')
+      setV['expireDate'] = val[0]['expireTime']? addDay( val[0]['produceDate'],  val[0]['expireTime']) : dayjs('2099-12-31').valueOf()
+      const param1 = {
+        productItemCode: val[0]['itemCode'],
+        available: 'TRUE',
+        pageSize: 20,
+        pageNo: 1,
+        sort: '',
+        by: 'ASC'
+      }
+      await BomApi.getBomPage(param1).then((res) => {
+        console.log(res)
+        if (res?.list?.length > 0) {
+          setV['bomVersion'] = res.list[0].version
+        }
+      })
+    }
     setV[formField] = val[0][searchField]
     formRef.setValues(setV)
   })
@@ -633,7 +669,7 @@ const openForm = async (type: string, row?: number) => {
   if (type == 'update') {
     // 修改 tableform 属性
     ProductreceiptRequestMain.allSchemas.formSchema.map((itemColumns) => {
-      if (itemColumns.field == 'workshopCode') {
+      if (itemColumns.field == 'workshopCode' || itemColumns.field == 'productionLineCode') {
         itemColumns.componentProps.isSearchList = false
         itemColumns.componentProps.disabled = true
       }
@@ -641,7 +677,7 @@ const openForm = async (type: string, row?: number) => {
   } else {
     // 修改 tableform 属性
     ProductreceiptRequestMain.allSchemas.formSchema.map((itemColumns) => {
-      if (itemColumns.field == 'workshopCode') {
+      if (itemColumns.field == 'workshopCode' || itemColumns.field == 'productionLineCode') {
         itemColumns.componentProps.isSearchList = true
         itemColumns.componentProps.disabled = false
       }
@@ -654,7 +690,9 @@ const openForm = async (type: string, row?: number) => {
 const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
+const mainData = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  mainData.value = row
   const departmentCode = wsCache
     .get(CACHE_KEY.DEPT)
     .find((account) => account.id == row.departmentCode)?.name
@@ -952,6 +990,12 @@ const getDefaultWorkshopCode = async () => {
     })
   }
 }
+const detailOpenForm = (type, row) => {
+  console.log(mainData.value)
+  nextTick(() => {
+    detailRef.value.formRef.formRef.formModel.productionLineCode = mainData.value.productionLineCode
+  })
+ }
 /** 初始化 **/
 onMounted(async () => {
   getDefaultWorkshopCode()

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@@ -722,7 +722,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         enterSearch: true,
-        isInpuFocusShow: true,
+        isSearchList: true,
         searchListPlaceholder: '请选择工位代码',
         searchField: 'code',
         searchTitle: '工位信息',
@@ -1164,6 +1164,11 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     tableForm: {
       type: 'Select',
       disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
 
   },
@@ -1217,10 +1222,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: { width: '100%' },
+        disabled:true
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
       }
     },
   },
@@ -1695,52 +1697,40 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
  */
 export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '生产线代码',
+    label: '物料代码',
-    field: 'productionLineCodePackage',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
     tableForm: {
       disabled: true
-      // isInpuFocusShow: true,
+    },
-      // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+    form: {
-      // searchField: 'productionLineCode', // 查询弹窗赋值字段
+      componentProps: {
-      // searchTitle: '生产线物料关系信息', // 查询弹窗标题
+        disabled: true
-      // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      }
-      // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
-      // searchCondition:[{
-      //   key: 'itemCode',
-      //   value: 'itemCode',
-      //   isMainValue: true
-      // }]
     }
   },
   {
-    label: '供应商代码',
+    label: '批次',
-    field: 'supplierItemCode',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
     tableForm: {
-      isInpuFocusShow: true,
+      disabled: true,
-      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+    },
-      searchField: 'supplierCode', // 查询弹窗赋值字段
+    form: {
-      searchTitle: '供应商信息', // 查询弹窗标题
+      componentProps: {
-      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+        disabled: true
-      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      }
-      searchCondition: [{
-        key: 'itemCode',
-        value: 'itemCode',
-        message: '请填写物料代码！',
-        isMainValue: true
-      }]
     }
   },
   {
-    label: '物料代码',
+    label: '数量',
-    field: 'itemCode',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -1755,38 +1745,132 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料名称',
+    label: '计量单位',
-    field: 'itemName',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
+    tableForm: {
-    isForm: false,
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
-    label: '物料描述1',
+    label: '包装规格',
-    field: 'itemDesc1',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      enterSearch: true,
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
+    form: {
-    isForm: false,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
-    label: '物料描述2',
+    label: '标签生产线代码',
-    field: 'itemDesc2',
+    field: 'productionLineCodePackage',
     sort: 'custom',
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
     isTableForm: false,
     isForm: false,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
   },
+
   {
-    label: '项目代码',
+    label: '物料名称',
-    field: 'projectCode',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
@@ -1795,56 +1879,36 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '批次',
+    label: '物料描述1',
-    field: 'batch',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
+    isTableForm: false,
-      disabled: true,
+    isForm: false,
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
-    label: '数量',
+    label: '物料描述2',
-    field: 'qty',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
+    isTableForm: false,
-      disabled: true
+    isForm: false,
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
-    label: '计量单位',
+    label: '项目代码',
-    field: 'uom',
+    field: 'projectCode',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
+    isTableForm: false,
-      disabled: true
+    isForm: false,
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
   },
+
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -1852,6 +1916,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -1869,22 +1935,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '来源生产线代码',
     field: 'productionLineCode',
     sort: 'custom',
-    table: {
+    isTableForm: false,
-      width: 150
+    isForm: false,
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
     table: {
       width: 150
     },
@@ -1901,6 +1953,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '来源工位代码',
     field: 'workStationCode',
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -1917,6 +1971,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '来源库位代码',
     field: 'fromLocationCode',
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -1943,79 +1999,13 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '包装规格1',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
-        disabled: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
 
-      }
-    },
-    tableForm: {
-      enterSearch: true,
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'packUnit',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isMainValue: true
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    },
-  },
-  {
-    label: '包装数量1',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
   {
     label: '包装规格2',
     field: 'secondPackUnit',
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150,
       componentProps: {
@@ -2069,6 +2059,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '包装数量2',
     field: 'secondPackQty',
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },

src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts

@@ -574,7 +574,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位代码',
+    label: '来源库位代码',
     field: 'toLocationCode',
     sort: 'custom',
     table: {

src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts

@@ -460,7 +460,7 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '到库位代码',
+    label: '来源库位代码',
     field: 'toLocationCode',
     sort: 'custom',
     table: {

src/views/wms/productionManage/productredress/productredressRequestMain/index.vue

@@ -155,6 +155,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow['itemCode'] = item['itemCode']
           newRow['qty'] = item['qty']
+          newRow['inventoryQty'] = item['qty']
           newRow['uom'] = item['uom']
           newRow['packingNumber'] = item['packingNumber']
           newRow['batch'] = item['batch']
@@ -189,6 +190,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
     if (formField == 'itemCode') {
         setV['itemCode'] = val[0]['itemCode']
         setV['qty'] = val[0]['qty']
+        setV['inventoryQty'] = val[0]['qty']
         setV['uom'] = val[0]['uom']
         setV['packingNumber'] = val[0]['packingNumber']
         setV['batch'] = val[0]['batch']
@@ -450,8 +452,15 @@ const submitForm = async (formType, submitData) => {
   data.subList.forEach(item=>{
     item['workStationCode'] = data['workStationCode']
   })
+  const cmdExists = data.subList.some(filter =>
+    parseFloat(filter.inventoryQty) < parseFloat(filter.qty)
+  );
+  if(cmdExists){
+    message.warning("回收数量不能大于库存数量")
+    return
+  }
   if(data.subList.find(item => (item.qty <= 0))) {
-    message.warning('数量必须大于0')
+    message.warning('回收数量必须大于0')
     formRef.value.formLoading = false
     return
   }

src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts

@@ -644,6 +644,21 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
+  {
+    label: '库存数量 ',
+    field: 'inventoryQty',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    tableForm: {
+      disabled: true
+    },
+    form:{
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
   {
     label: '回收数量',
     field: 'qty',
@@ -651,13 +666,17 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
-    },
     form: {
+      component: 'InputNumber',
       componentProps: {
-        disabled: true
+        min: 0,
+        precision: 6,
       }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
     }
   },
   // {
@@ -818,7 +837,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '库位',
+    label: '来源库位',
     field: 'toLocationCode',
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/index.vue

@@ -0,0 +1,428 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="[
+        ...PurchasereceiptJobMain.allSchemas.searchSchema,
+        ...PurchasereceiptJobDetail.allSchemas.searchSchema
+      ]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="PurchasereceiptJobMain.allSchemas"
+    :detailAllSchemas="PurchasereceiptJobDetail.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      v-clientTable
+      :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 #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row, $index }">
+        <ButtonBase
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasereceiptJobMainRules"
+    :formAllSchemas="PurchasereceiptJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="PurchasereceiptJobDetail.allSchemas"
+    :tableFormRules="PurchasereceiptJobDetailRules"
+    :apiUpdate="PurchasereceiptJobMainApi.updatePurchasereceiptJobMain"
+    :apiCreate="PurchasereceiptJobMainApi.createPurchasereceiptJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptJobMain.allSchemas"
+    :detailAllSchemas="PurchasereceiptJobDetail.allSchemas"
+    :detailAllSchemasRules="PurchasereceiptJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="PurchasereceiptJobDetailApi.getDevelopPurchasereceiptJobDetailPage"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 子包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptJobDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptJobDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <el-dialog
+    v-model="showQualityReport"
+    :title="t('质检明细')"
+    :append-to-body="false"
+    destroy-on-close
+    fullscreen
+  >
+    <iframe :height="reportHeight" width="100%" :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import {
+  PurchasereceiptJobMain,
+  PurchasereceiptJobMainRules,
+  PurchasereceiptJobDetail,
+  PurchasereceiptJobDetailRules,
+  PurchasereceiptJobDetailPackingNumber
+} from './purchasereceiptJobMain.data'
+import * as PurchasereceiptJobMainApi from '@/api/wms/purchasereceiptJobMain'
+import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { getSwitchByCode } from '@/api/wms/switch'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { getReportUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
+// 协定品收货任务主
+defineOptions({ name: 'DevelopPurchasereceiptJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([
+  ...PurchasereceiptJobMain.allSchemas.tableColumns,
+  ...PurchasereceiptJobDetail.allSchemas.tableMainColumns
+])
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+  //{
+  //  formField: 'productItemCode',
+  //  searchTableTitle: '物料信息',
+  //  searchTableAllSchemas: Itembasic.allSchemas,
+  //  searchTablePage: ItembasicApi.getItembasicPage
+  //}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo = []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi:  PurchasereceiptJobDetailApi.getDevelopPurchasereceiptJobDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:develop-purchasereceipt-job-main:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 根据收货来源判断该按钮是否显示,根据QMS开关判断该按钮是否显示(检验相关)
+const EnableQms = ref(true)
+const isShowSourceTypeButton = (row) => {
+  if (EnableQms.value) {
+    if (row.sourceType == 'EDI' || row.sourceType == 'ASN_ExternalReceipt') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row, $index) => {
+  const findIndex = row['masterId']
+    ? tableObject.tableList.findIndex((item) => item['masterId'] == row['masterId'])
+    : -1
+  if (findIndex > -1 && findIndex < $index) {
+    return []
+  }
+  return [
+    defaultButtons.mainListJobAccBtn({ hide: isShowMainButton(row, ['1']) }), // 承接
+    defaultButtons.mainListJobCloBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'wms:develop-purchasereceipt-job-main:close'
+    }), // 关闭
+    defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    {
+      label: '拒收',
+      name: 'mainJobRefusal',
+      hide: isShowMainButton(row, ['2']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: 'wms:develop-purchasereceipt-job-main:refusal',
+      link: true // 文本展现按钮
+    },
+    defaultButtons.mainListPlanCheckQualityReportBtn({ hide: isShowSourceTypeButton(row) }) // 查看质检报告
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') {
+    // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') {
+    // 放弃
+    console.log('列表-操作按钮事件-放弃')
+    await PurchasereceiptJobMainApi.abandonPurchasereceiptJobMainSpare(row.masterId)
+    buttonBaseClick('refresh', null)
+  } else if (val == 'mainJobClo') {
+    // 拒收
+    handleClose(row.masterId)
+    buttonBaseClick('refresh', null)
+  } else if (val == 'mainJobAcc') {
+    // 承接
+    console.log('列表-操作按钮事件-承接')
+    await PurchasereceiptJobMainApi.acceptPurchasereceiptJobMain(row.masterId)
+    buttonBaseClick('refresh', null)
+  }
+  // else if(val == 'mainPlanCheckQualityReport'){
+  //   // 查看质检报告
+  //   checkQualityReport(row)
+  // }
+  else if (val == 'mainJobRefusal') {
+    // handleRefusal(row.masterId)
+    resonSubmit(row)
+  }
+}
+// 查看质检报告
+const showQualityReport = ref(false)
+const reportHeight = ref(window.innerHeight - 120)
+const qualityReport = ref('')
+const checkQualityReport = async (row) => {
+  showQualityReport.value = true
+  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await PurchasereceiptJobMainApi.closePurchasereceiptJobMain(id)
+    message.success(t('common.closeSuccess'))
+    buttonBaseClick('refresh', null)
+  } catch {}
+}
+const resonSubmit = async (row) => {
+  ElMessageBox.prompt(t('ts.请输入拒收原因'), t('ts.提示'), {
+    confirmButtonText: t('common.ok'),
+    cancelButtonText: t('common.cancel'),
+    inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+    inputErrorMessage: t(`ts.${'驳回原因不能为空，且不超过256字'}`),
+    inputType: 'textarea',
+    inputValidator: (value) => {
+      if (value.length > 60 || value.length == 0) {
+        return false
+      } else {
+        return true
+      }
+    }
+  })
+    .then(({ value }) => {
+      // 驳回原因
+      handleRefusal(row.masterId, value)
+    })
+    .catch(() => {})
+}
+/** 拒收按钮操作 */
+const handleRefusal = async (id: number, refuseReason: string) => {
+  // refuseReason
+  try {
+    await PurchasereceiptJobMainApi.refusalPurchasereceiptJobMain({ id, refuseReason })
+    message.success(t('common.refusalSuccess'))
+    buttonBaseClick('refresh', null)
+  } catch {}
+}
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PurchasereceiptJobDetailApi.queryPurchaseceiptChildPackingNumber
+})
+const { getList: queryDetailList } = packDetatableMethods
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache
+    .get(CACHE_KEY.DEPT)
+    .find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue, 'jobPurchasereceiptMain')
+}
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([
+  {
+    label: '查看子包装',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true // 文本展现按钮
+  }
+])
+
+// 查看其他包装规格
+const tableFormButton = async (val, row) => {
+  if (val == 'viewParentPickingNumber') {
+    //查看其他包装规格
+    packingDetatableData.params = {
+      masterId: row.masterId,
+      parentPackingNumber: row.packingNumber
+    }
+    await queryDetailList()
+    detailParenPackingRef.value.open('create', row, null, 'viewDetail') //查看明细数据
+  }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await PurchasereceiptJobMainApi.exportDevelopPurchasereceiptJobMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  await getSwitchByCode('EnableQms').then((res) => {
+    EnableQms.value = res == 'TRUE' ? true : false
+  })
+})
+</script>

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue

@@ -0,0 +1,466 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="[
+        ...PurchasereceiptRecordMain.allSchemas.searchSchema,
+        ...PurchasereceiptRecordDetail.allSchemas.searchSchema
+      ]"
+      @search="searchList"
+      @reset="searchList"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="PurchasereceiptRecordMain.allSchemas"
+    :detailAllSchemas="PurchasereceiptRecordDetail.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      v-clientTable
+      :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 #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row, $index }">
+        <ButtonBase
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasereceiptRecordMainRules"
+    :formAllSchemas="PurchasereceiptRecordMain.allSchemas"
+    :tableAllSchemas="PurchasereceiptRecordDetail.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptRecordMain.allSchemas"
+    :detailAllSchemas="detailAllSchemas"
+    :detailAllSchemasRules="PurchasereceiptRecordDetailRules"
+    :apiPage="apiPage"
+    :tabs="PurchasereceiptRequestTabsList"
+    @changeTabs="changeTabs"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 记录子包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRecordDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
+  <!-- 缺货子包装弹窗 -->
+  <BasicForm
+    ref="outStockDetailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRecordDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :tableData="outStockPackingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <el-dialog
+    v-model="showQualityReport"
+    :title="t('质检明细')"
+    :append-to-body="false"
+    destroy-on-close
+    fullscreen
+  >
+    <iframe :height="reportHeight" width="100%" :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import {
+  PurchasereceiptRecordMain,
+  PurchasereceiptRecordMainRules,
+  PurchasereceiptRecordDetail,
+  PurchasereceiptRecordDetailRules,
+  PurchasereceiptRecordDetailPackingNumber
+} from './purchasereceiptRecordMain.data'
+import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain'
+import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { getSwitchByCode } from '@/api/wms/switch'
+import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { getJmreportBaseUrl, getReportUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { mainListPointBtn, mainListPrintInspectionBtn } from '@/utils/disposition/defaultButtons'
+import { getAccessToken } from '@/utils/auth'
+const { loadStart, loadDone } = usePageLoading()
+// 采购收货记录主
+defineOptions({ name: 'PurchasereceiptRecordMain' })
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const apiPage = ref(PurchasereceiptRecordDetailApi.getDevelopPurchasereceiptRecordDetailPage
+)
+const tableColumns = ref([
+  ...PurchasereceiptRecordMain.allSchemas.tableColumns,
+  ...PurchasereceiptRecordDetail.allSchemas.tableMainColumns
+])
+const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereceiptRecordDetailApi.getDevelopPurchasereceiptRecordDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:develop-purchasereceipt-record-main:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据收货来源判断该按钮是否显示,根据QMS开关判断该按钮是否显示(检验相关)
+const EnableQms = ref(true)
+const isShowSourceTypeButton = (row) => {
+  if (EnableQms.value) {
+    if (row.sourceType == 'EDI' || row.sourceType == 'ASN_ExternalReceipt') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 根据QMS开关判断该按钮是否显示(检验相关)
+const isShowSCPAndQMSButton = () => {
+  if (EnableQms.value) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 根据QMS开关判断该按钮是否显示(检验相关)
+const isShowputawayRequestFlagButton = (row) => {
+  if (EnableQms.value) {
+    if (row.inspectRequestFlag == 'FALSE') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row, $index) => {
+  const findIndex = row['masterId']
+    ? tableObject.tableList.findIndex((item) => item['masterId'] == row['masterId'])
+    : -1
+  if (findIndex > -1 && findIndex < $index) {
+    return [defaultButtons.mainListPrintInspectionBtn({ hide: isShowSCPAndQMSButton() })]
+  }
+  return [
+    defaultButtons.mainInspectRequestBtn({
+      hasPermi: 'wms:develop-purchasereceipt-record-main:createInspectRequest',
+      hide: isShowputawayRequestFlagButton(row)
+    }), // 生成到货检验申请
+    defaultButtons.mainPutawayRequestBtn({
+      hasPermi: 'wms:develop-purchasereceipt-record-main:createPutawayRequest',
+      hide: row.putawayRequestFlag == 'FALSE'
+    }), // 生成采购上架申请
+    defaultButtons.mainPurchasereturnRecordBtn({
+      hasPermi: 'wms:develop-purchasereceipt-record-main:createPurchasereturnRecord',
+      hide: row.purchasereturnRecordFlag == 'FALSE'
+    }), // 生成采购退后记录申请
+    //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告
+    defaultButtons.mainListPlanCheckQualityReportBtn({ hide: isShowSourceTypeButton(row) }), // 查看质检报告
+    defaultButtons.mainListPrintInspectionBtn({ hide: isShowSCPAndQMSButton() })
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'putawayRequest') {
+    // 生成采购上架申请
+    handleCreatePutawayRequest(row.number)
+  } else if (val == 'inspectRequest') {
+    //生成到货检验申请
+    handleCreateInspectRequest(row.number)
+  } else if (val == 'purchasereturnRecord') {
+    //生成采购退后记录申请
+    handleCreatePurchasereturnRecord(row.number)
+  } else if (val == 'mainPlanCheckQualityReport') {
+    // 查看质检报告
+    checkQualityReport(row)
+  } else if (val == 'printInspection') {
+    handlePrint(row)
+  }
+}
+const searchList = (model) => {
+  let params = { ...model }
+  if (Array.isArray(params.itemType) && params.itemType.length > 0) {
+    params.itemTypes = params.itemType.join(',')
+    params.itemType = ''
+  } else {
+    params.itemTypes = ''
+    params.itemType = ''
+  }
+  setSearchParams(params)
+}
+
+// 查看质检报告
+const reportHeight = ref(window.innerHeight - 120)
+const showQualityReport = ref(false)
+const qualityReport = ref('')
+const checkQualityReport = async (row) => {
+  showQualityReport.value = true
+  // qualityReport.value = "http://localhost/purchasereceiptReport?asnNumber=ASNS20240720-0002"
+  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+}
+
+const BASE_URL = getJmreportBaseUrl()
+const src = ref(BASE_URL + '/jmreport/view/986481894320525312?token=' + getAccessToken())
+const handlePrint = async (row) => {
+  window.open(src.value + '&jobNumber=' + row.jobNumber)
+}
+
+/** 生成采购上架申请按钮操作 */
+const handleCreatePutawayRequest = async (number: string) => {
+  try {
+    await message.confirm(t('ts.确认生成上架申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPutawayRequest(number)
+    message.success(t('ts.上架申请生成成功'))
+    buttonBaseClick('refresh', null)
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
+
+/** 生成到货检验申请按钮操作 */
+const handleCreateInspectRequest = async (number: string) => {
+  try {
+    await message.confirm(t('ts.确认生成到货检验申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createInspectRequest(number)
+    message.success(t('ts.到货检验申请生成成功'))
+    buttonBaseClick('refresh', null)
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
+
+/** 生成采购退货记录按钮操作 */
+const handleCreatePurchasereturnRecord = async (number: string) => {
+  try {
+    await message.confirm(t('ts.确认生成采购退货记录吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPurchasereturnRecord(number)
+    message.success(t('ts.采购退货记录生成成功'))
+    buttonBaseClick('refresh', null)
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PurchasereceiptRecordDetailApi.queryPurchaseceiptChildPackingNumber
+})
+const { getList: queryDetailList } = packDetatableMethods
+
+// 缺货子包装数据
+const outStockDetailParenPackingRef = ref()
+const { tableObject: outStockPackingDetatableData, tableMethods: outStockPackDetatableMethods } =
+  useTable({
+    getListApi: PurchasereceiptRecordDetailApi.queryPurchaseshortageChildPackingNumber
+  })
+const { getList: queryOutStockDetailList } = outStockPackDetatableMethods
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache
+    .get(CACHE_KEY.DEPT)
+    .find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue, 'recordPurchasereceiptMain')
+}
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([
+  {
+    label: t('ts.查看子包装'),
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true // 文本展现按钮
+  }
+])
+
+const tabeKey = ref('receiptDetail')
+// 查看其他包装规格
+const tableFormButton = async (val, row) => {
+  if (val == 'viewParentPickingNumber' && tabeKey.value == 'receiptDetail') {
+    //查看其他包装规格
+    packingDetatableData.params = {
+      masterId: row.masterId,
+      parentPackingNumber: row.packingNumber
+    }
+    await queryDetailList()
+    detailParenPackingRef.value.open('create', row, null, 'viewDetail') //查看明细数据
+  }
+  if (val == 'viewParentPickingNumber' && tabeKey.value == 'scarceGoodsDetail') {
+    //查看其他包装规格
+    outStockPackingDetatableData.params = {
+      masterId: row.masterId,
+      parentPackingNumber: row.packingNumber
+    }
+    await queryOutStockDetailList()
+    outStockDetailParenPackingRef.value.open('create', row, null, 'viewDetail') //查看明细数据
+  }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await PurchasereceiptRecordMainApi.exportDevelopPurchasereceiptRecordMain(
+      tableObject.params
+    )
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+// tabs 切换事件
+const changeTabs = (data) => {
+  if (data.prop == 'receiptDetail') {
+    console.log(data)
+    apiPage.value = PurchasereceiptRecordDetailApi.getDevelopPurchasereceiptRecordDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    tabeKey.value = 'receiptDetail'
+  } else if (data.prop == 'scarceGoodsDetail') {
+    apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    tabeKey.value = 'scarceGoodsDetail'
+  }
+  detailAllSchemas.value.tableColumns.forEach((item) => {
+    if (item['field'] == 'qty') {
+      item['label'] = data.prop == 'scarceGoodsDetail' ? '缺货数量' : '收货数量'
+    }
+  })
+
+  console.log('detailAllSchemas', detailAllSchemas.value)
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  
+  await getSwitchByCode('EnableQms').then((res) => {
+    EnableQms.value = res == 'TRUE' ? true : false
+  })
+  getList()
+})
+onActivated(() => {
+  
+  getList()
+})
+</script>

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue

@@ -0,0 +1,915 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...PurchasereceiptRequestMain.allSchemas.searchSchema,...PurchasereceiptRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereceiptRequestMain.allSchemas"
+      :detailAllSchemas="PurchasereceiptRequestDetail.allSchemas"
+    />
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :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 #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :isOpenSearchTable="true"
+    fieldTableColumn="poNumber"
+    :rules="PurchasereceiptRequestMainRules"
+    :formAllSchemas="PurchasereceiptRequestMain.allSchemas"
+    :tableAllSchemas="PurchasereceiptRequestDetail.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain"
+    :apiCreate="PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @formFormDateChange="formFormDateChange"
+    @onEnter="onEnter"
+  >
+  <template  v-slot="{row}">
+    <el-date-picker v-bind:modelValue="row['expireTime']?addDay(row['produceDate'],row['expireTime']):dayjs('2099-12-31').valueOf()"
+    :clearable="true"
+    style="width: 100%"
+    :disabled="true" 
+    :placeholder="t('ts.选择日期')"/>
+    </template>
+  </BasicForm>
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptRequestMain.allSchemas"
+    :detailAllSchemas="detailAllSchemas"
+    :detailAllSchemasRules="PurchasereceiptRequestDetailRules"
+    :apiCreate="PurchasereceiptRequestDetailApi.createPurchasereceiptRequestDetail"
+    :apiUpdate="PurchasereceiptRequestDetailApi.updatePurchasereceiptRequestDetail"
+    :apiPage="apiPage"
+    :apiDelete="PurchasereceiptRequestDetailApi.deletePurchasereceiptRequestDetail"
+    fromeWhere="purchasereceipt"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 导入 -->
+  <ImportForm 
+    ref="importFormRef" 
+    url="/wms/purchasereceipt-request-main/import" 
+    :importTemplateData="importTemplateData" 
+    @success="importSuccess" 
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
+
+  <!-- 创建标签 -->
+  <BasicForm
+    ref="formLabelRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRequestDetailLabel.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    @submitForm="submitFormLabel"
+    @searchTableSuccess="searchTableSuccessLabel"
+    @formFormDateChange="onChangeLabel"
+  />
+  
+    <!-- 子包装弹窗 -->
+    <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRequestDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <!-- 标签打印 -->
+  <SearchTable width="905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" >
+    <template #searchQuery>
+      <el-form :inline="true">
+        <el-form-item>
+          <el-input v-model="printItemCode" placeholder="请输入物料代码"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="searchPrint">
+            <Icon class="mr-5px" icon="ep:search" />查询
+          </el-button>
+          <el-button type="primary" @click="resetPrint">
+            <Icon class="mr-5px" icon="ep:refresh" />重置
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </template>
+  </SearchTable>
+  <el-dialog
+      v-model="showQualityReport"
+      :title="t('质检明细')"
+      :append-to-body="false"
+      destroy-on-close
+      fullscreen
+    >
+    <iframe :height="reportHeight" width="100%"  :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
+  
+</template>
+
+<script setup lang="ts">
+import dayjs from 'dayjs'
+import { addDay } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { 
+  PurchasereceiptRequestMain,
+  PurchasereceiptRequestMainRules,
+  PurchasereceiptRequestDetail,
+  PurchasereceiptRequestDetailRules,
+  PurchasereceiptRequestDetailLabel,
+  PurchasereceiptRequestDetailPackingNumber
+ } from './purchasereceiptRequestMain.data'
+ import {
+  SupplierdeliverRequestPackage
+} from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
+ import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
+ import * as PackageApi from '@/api/wms/package'
+import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
+import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { getAccessToken } from '@/utils/auth'
+import { getSwitchByCode } from '@/api/wms/switch'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { getReportUrl } from '@/utils/systemParam'
+import { dateFormatter2 } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
+// 协定品收货申请
+defineOptions({ name: 'DevelopPurchasereceiptRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const genLabelId = ref(); //主表ID
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...PurchasereceiptRequestMain.allSchemas.tableColumns,...PurchasereceiptRequestDetail.allSchemas.tableMainColumns])
+
+const apiPage = ref(PurchasereceiptRequestDetailApi.getDevelopPurchasereceiptRequestDetailPage)
+const detailAllSchemas = ref(PurchasereceiptRequestDetail.allSchemas)
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      if (formField == 'packUnit' || formField == 'packQty') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      }
+      if (formField == 'secondPackUnit') {
+        row['secondPackUnit'] = val[0]['packUnit']
+        row['secondPackQty'] = val[0]['packQty']
+      }
+    } 
+  })
+}
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  //console.log("formRef",formRef)
+  console.log("searchTableSuccess",formField, searchField, val, formRef, type, row)
+  nextTick(async () => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      if(formField == 'itemCode') {
+        row['itemCode'] = val[0]['code']
+      } else if(formField == 'poNumber') {
+        updateTableData(val)
+        // row['poNumber'] = val[0]['number']
+
+      } else if(formField == 'poLine'){
+        //添加费用明细--点击确定
+        val.forEach(item=>{
+          if(tableData.value.find(item1=>item1['id'] == item['id'])) return
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
+          newRow['poLine'] = item['lineNumber']
+          newRow['itemCode'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          newRow['poNumber'] = item['number']
+          newRow['poLineType'] = item['poLineType']
+          let supplierCode = formRef.formModel.supplierCode;
+          let queryData = {
+            supplierCode:supplierCode,
+            itemCode: item['itemCode']
+          } 
+          SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{
+            newRow['defaultToLocationCode'] = res
+            tableData.value.push(newRow)
+          })
+        })
+      }else if (formField == 'packQty'){
+        row['packQty'] = val[0]['packQty']
+        row['packUnit'] = val[0]['packUnit']
+      }else if(formField == 'defaultToLocationCode'){
+        row['defaultToLocationCode'] = val[0]['code']
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      if(formField == 'supplierCode'){
+        setV['supplierCode'] = val[0]['code']
+      }else if(formField == 'poNumber') {
+        //新增--采购订单--
+        setV['supplierCode'] = val[0]['supplierCode']
+        setV['poNumber'] = val[0]['number']
+        let res = await PurchasereceiptRequestMainApi.queryPurchasePlan({
+          "poNumber": val[0]['number']//采购订单号
+        })
+        console.log('默认到库位res',res)
+        if(res&&res['toLocationCode']){
+          setV['onlyDefaultToLocationCode'] = res['toLocationCode'] // 仅仅用来存储数据--用于给子表赋值
+        }
+
+        // 请求明细数据
+        getSearchTableData(val[0]['number'])
+        // tableData.value = [newRow]
+        // formRef.handleAddTable()
+      }
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if(formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+    } else {
+      setV['poNumber'] = val[0]['number']
+      setV['poLine'] = val[0]['lineNumber']
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereceiptRequestDetailApi.getDevelopPurchasereceiptRequestDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:develop-purchasereceipt-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {// 新增
+    openForm('create')
+  } else if (val == 'import') {// 导入
+    handleImport()
+  }else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 根据收货来源判断该按钮是否显示,根据QMS开关判断该按钮是否显示(检验相关)
+const EnableQms = ref(true)
+const isShowSourceTypeButton = (row) => {
+  if (EnableQms.value) {
+    if (row.sourceType == 'EDI' || row.sourceType == 'ASN_ExternalReceipt') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isASNShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if(row.sourceType == 'ASN_ExternalReceipt'){
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+
+// 根据状态返回该按钮是否显示
+const isASNShowMainButtonCreateLabel = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if(row.sourceType == 'ASN_ExternalReceipt' && row.asnOutLabel == '2'){
+      return true;
+    }else{
+      return false;
+    }
+  } else {
+    return true;
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+  return [
+    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:develop-purchasereceipt-request-main:reAdd'}), //重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:develop-purchasereceipt-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:develop-purchasereceipt-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:develop-purchasereceipt-request-main:agree'}), // 审批通过
+    // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
+    {
+      label: '生成标签',
+      name: 'ssbq',
+      hide: isASNShowMainButtonCreateLabel(row, ['3']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    },
+    defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','6','8']) }), // 标签打印
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:develop-purchasereceipt-request-main:handle'}), // 处理
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:develop-purchasereceipt-request-main:close'}), // 关闭
+    defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告
+      ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    handleClose(row.masterId)
+  } else if (val == 'mainReAdd') { // 重新添加
+    handleReAdd(row.masterId)
+  } else if (val == 'mainSubmit') { // 提交审批
+    handleSubmit(row.masterId)
+  } else if (val == 'mainTurnDown') { // 驳回
+    handleRefused(row.masterId)
+  } else if (val == 'mainApprove') { // 审批通过
+    handleAgree(row.masterId)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.masterId)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if(val == 'ssbq'){ // 生成标签
+     // 生成标签
+     detatableData.params = {
+      masterId:row.masterId
+     }
+    genLabelId.value = row.masterId
+    // 数据来源是EDI默认让输入生产日期
+    if (row.sourceType == 'EDI') {
+      PurchasereceiptRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
+          if (item.field == 'produceDate') {
+          item.tableForm.disabled = false
+        }
+      })
+    } else {
+      PurchasereceiptRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
+          if (item.field == 'produceDate') {
+          item.tableForm.disabled = true
+        }
+      })
+    }
+    await getDetailList()
+    formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
+  }else if (val == 'point') {
+    // 标签打印
+    labelPrint(row)
+  }
+  else if(val == 'mainPlanCheckQualityReport'){
+    // 查看质检报告
+    checkQualityReport(row)
+  }
+}
+// 生成标签选择
+const onChangeLabel =(field,e,row, index) => {
+  const arr = dateFormatter2('', '', e)?.split('-')
+  const str = arr[0]+arr[1]+arr[2]
+  row.batch = str
+}
+// 查看质检报告
+const showQualityReport = ref(false)
+const reportHeight = ref(window.innerHeight - 120)
+const qualityReport = ref('')
+const checkQualityReport = async (row)=>{
+  showQualityReport.value = true
+  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+}
+
+// 生成标签
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: PurchasereceiptRequestDetailApi.getDevelopPurchasereceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// 生成标签按钮操作
+const submitFormLabel = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+  try {
+    console.log("formType==",formType)
+    console.log("data==",data)
+    data.subList = detatableData.tableList
+    console.log("detatableData",detatableData)
+    await message.confirm(t('ts.是否为此数据生成标签？'))
+    await PurchasereceiptRequestMainApi.genLabel(data) //genLabelId.value
+    isCreateLabel.value = true
+    message.success('创建标签成功')
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+    buttonBaseClick('refresh',null);
+  }
+}
+
+const BASE_URL = getJmreportBaseUrl()
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+
+// 标签打印
+const searchTableRef = ref()
+
+// 本地筛选
+const printTableList = ref([])
+const printItemCode = ref('')
+const searchPrint = ()=>{
+  printItemCode.value = printItemCode.value.trim()
+  if(printItemCode.value == ''){
+    searchTableRef.value.updateData(printTableList.value)
+  }else{
+    console.log(printItemCode.value)
+    let printItemCodes = printItemCode.value.split(',')
+    console.log(printItemCodes)
+    let itemCodesList = printTableList.value.filter(item=>!!printItemCodes.find(item1=>item['itemCode']==item1)) 
+    searchTableRef.value.updateData(itemCodesList)
+  }
+  
+}
+const resetPrint = ()=>{
+  printItemCode.value = ''
+  searchPrint()
+}
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  const defaultParams = {'moduleName':'purchasereceipt_request','recordNumber':row.asnNumber}
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  await getListPrint()
+  tableObject.loading = false
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width
+  })
+  printItemCode.value = ''
+  printTableList.value = JSON.parse(JSON.stringify(tableObjectPrint.tableList))
+  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
+
+// 批量打印---采购收货申请
+const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印',val)
+  // let rows:any = []
+  // val.forEach(item=>{
+  //   rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
+  // })
+  if(val.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
+  }
+  // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
+
+  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+      console.log(res)
+      window.open(src.value + '&asn_number=' + res)
+  }).catch(err => {
+    console.log(err)
+    message.error('创建标签失败')
+  })
+}
+
+const updateTableData = (tableList)=>{
+  let itemCodes = tableList.filter(item=>tableData.value.find(item1=>item1['poNumber']==item['number']&&item1['supplierCode']==item['supplierCode']&&item1['poLine']==item['lineNumber']&&item1['itemCode']==item['itemCode']))
+  if(itemCodes.length>0){
+    itemCodes = itemCodes.map(item=>(item.itemCode))
+    message.warning(`物料${itemCodes.join(',')}已经存在`)
+  }
+  tableList = tableList.filter(item=>!tableData.value.find(item1=>item1['poNumber']==item['number']&&item1['supplierCode']==item['supplierCode']&&item1['poLine']==item['lineNumber']&&item1['itemCode']==item['itemCode']))
+  if(tableList.length==0) return
+  tableList.forEach(row=>{
+    //poNumber poLine itemCode batch
+    const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
+    newRow['poLine'] = row['lineNumber']
+    newRow['itemCode'] = row['itemCode']
+    newRow['uom'] = row['uom']
+    newRow['poNumber'] =row['number']
+    newRow['supplierCode'] =row['supplierCode']
+    //生产日期 到货日期 默认当天
+    newRow['produceDate'] = dayjs().valueOf()
+    newRow['arriveDate'] = dayjs().valueOf()
+    //批次
+    newRow['batch'] = formatDate(newRow['produceDate'],'YYYYMMDD');
+    // newRow['defaultToLocationCode'] =row['defaultLocation']
+    if(!newRow['defaultToLocationCode']){
+      newRow['defaultToLocationCode'] = formRef.value.formRef.formModel['onlyDefaultToLocationCode']
+    }
+    
+    if(!tableData.value.find((item:object)=>item.poNumber == newRow.poNumber&&item.itemCode == newRow.itemCode&&item.poLine == newRow.poLine&&item.batch == newRow.batch)){
+      tableData.value.push(newRow)
+    }
+  })
+}
+
+const getSearchTableData = async (number,isEnter=false)=>{
+  const {tableObject ,tableMethods} = useTable({
+    defaultParams:{number},
+    getListApi: PurchaseDetailApi.getPurchaseDetailPageWMS // 分页接口
+  })
+  tableObject.pageSize = 500
+  // 获得表格的各种操作
+  const { getList:getList1 } = tableMethods
+  await getList1()
+  const tableColumns = PurchaseDetail.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  tableData.value = []
+  updateTableData(tableObject.tableList)
+  const itemCodes = []
+  tableObject.tableList.forEach(row=>{
+    itemCodes.push(row['itemCode'])
+    if(isEnter){
+      //回车--供应商代码
+      const setV = {}
+      setV['poNumber'] = number
+      setV['supplierCode'] = row.supplierCode
+      formRef.value.formRef.setValues(setV)
+    }
+  })
+  //有效期
+  ItembasicApi.getItembasicPage({
+    code:itemCodes.join(',')
+  }).then((res)=>{
+    res.list.forEach((item,index)=>{
+      const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+      findItem['expireTime'] = item['expireTime']
+    })
+  })
+}
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PurchasereceiptRequestDetailApi.queryPurchaseceiptChildPackingNumber
+})
+const { getList:queryDetailList } = packDetatableMethods
+
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestPurchasereceiptMain')
+}
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: '查看子包装',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+        packingDetatableData.params = {
+          masterId:row.masterId,
+          parentPackingNumber:row.packingNumber
+        }
+        await queryDetailList()
+        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.closePurchasereceiptRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    buttonBaseClick('refresh',null)
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.reAddPurchasereceiptRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    buttonBaseClick('refresh',null)
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.agreePurchasereceiptRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.refusedPurchasereceiptRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.handlePurchasereceiptRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.submitPurchasereceiptRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await PurchasereceiptRequestMainApi.exportDevelopPurchasereceiptRequestMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+PurchasereceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
+}
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter(item => !selection.includes(item))
+}
+const onEnter = async (field,value)=>{
+  console.log(field,value)
+  getSearchTableData(value,true)
+}
+// 主子数据 提交
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+  tableData.value.forEach((row, index) => {
+    row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
+  })
+  let alalQty = 0
+  tableData.value.forEach(item => {
+    alalQty += item.qty ?  parseFloat(item.qty) : 0
+  })
+  if (alalQty == 0) {
+    message.error('收货总数量不可以为0')
+    return
+  }
+  data.subList = tableData.value.filter(item => parseFloat(item.qty) > 0) // 拼接子表数据参数
+  formRef.value.formLoading = true
+  try {
+    if (formType === 'create') {
+      data.orderTypeM='1';
+      await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      data.orderTypeM='1';
+      await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+
+const formFormDateChange = (field, val,row, index) => {
+  if(field == 'produceDate'){
+    let produceDateStr = formatDate(val,'YYYYMMDD');
+    row.batch = produceDateStr
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getSwitchByCode('EnableQms').then((res) => {
+    EnableQms.value = res == 'TRUE' ? true : false
+  })
+  getList()
+  importTemplateData.templateUrl = await PurchasereceiptRequestMainApi.importTemplate()
+})
+</script>

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

@@ -73,7 +73,7 @@
     :detailAllSchemas="PurchasereceiptJobDetail.allSchemas"
     :detailAllSchemasRules="PurchasereceiptJobDetailRules"
     :searchTableParams="searchTableParams"
-    :apiPage="PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage"
+    :apiPage="PurchasereceiptJobDetailApi.getASNPurchasereceiptJobDetailPage"
     :detailButtonIsShowEdit="false"
     :detailButtonIsShowDelete="false"
     :buttondataTable="buttondataTable"
@@ -187,7 +187,7 @@ const Echo = []
 const { tableObject, tableMethods } = useTable({
   getListApi: routeName.value.includes('SCP')
     ? PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPageSCP
-    : PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage // 分页接口
+    : PurchasereceiptJobDetailApi.getASNPurchasereceiptJobDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -407,7 +407,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params)
+    const data = await PurchasereceiptJobMainApi.exportASNPurchasereceiptJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -385,15 +385,15 @@ export const PurchasereceiptJobMain = useCrudSchemas(
       },
       isTable: false
     },
-    {
+    // {
-      label: '创建者',
+    //   label: '创建者',
-      field: 'creator',
+    //   field: 'creator',
-      sort: 'custom',
+    //   sort: 'custom',
-      table: {
+    //   table: {
-        width: 150
+    //     width: 150
-      },
+    //   },
-      isTable: false
+    //   isTable: false
-    },
+    // },
     {
       label: '创建时间',
       field: 'createTime',
@@ -669,15 +669,15 @@ export const PurchasereceiptJobMain = useCrudSchemas(
       },
       isTable:false,
     },
-    {
+    // {
-      label: '创建者',
+    //   label: '创建者',
-      field: 'creator',
+    //   field: 'creator',
-      table: {
+    //   table: {
-        width: 130
+    //     width: 130
-      },
+    //   },
-      isForm: false,
+    //   isForm: false,
-      isTable: true
+    //   isTable: true
-    }
+    // }
   ])
 )
 
@@ -733,7 +733,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
     },
     {
       label: '包装数量',
-      field: 'qty',
+      field: 'packQty',
       sort: 'custom',
       table: {
         width: 150

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

@@ -142,7 +142,7 @@ routeName.value = route.name
 const apiPage = ref(
   routeName.value.includes('SCP')
     ? PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageSCP
-    : PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage
+    : PurchasereceiptRecordDetailApi.getASNPurchasereceiptRecordDetailPage
 )
 const tableColumns = ref([
   ...PurchasereceiptRecordMain.allSchemas.tableColumns,
@@ -158,7 +158,7 @@ const updataTableColumns = (val) => {
 const { tableObject, tableMethods } = useTable({
   getListApi: routeName.value.includes('SCP')
     ? PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageSCP
-    : PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage // 分页接口
+    : PurchasereceiptRecordDetailApi.getASNPurchasereceiptRecordDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -427,7 +427,7 @@ const handleExport = async () => {
       )
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     } else {
-      const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(
+      const data = await PurchasereceiptRecordMainApi.exportASNPurchasereceiptRecordMain(
         tableObject.params
       )
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
@@ -457,7 +457,7 @@ const changeTabs = (data) => {
     console.log(data)
     apiPage.value = routeName.value.includes('SCP')
       ? PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageSCP
-      : PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage
+      : PurchasereceiptRecordDetailApi.getASNPurchasereceiptRecordDetailPage
     detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
     tabeKey.value = 'receiptDetail'
   } else if (data.prop == 'scarceGoodsDetail') {

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -466,7 +466,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:6,
   },
   {
-    label: '数量',
+    label: '发货数量',
+    field: 'shippedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:12,
+  },
+  {
+    label: '收货数量',
     field: 'qty',
     sort: 'custom',
     table: {
@@ -1526,7 +1535,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
   //   }
   // },
   {
-    label: '数量',
+    label: '数量123',
     field: 'qty',
     sort: 'custom',
     table: {

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

@@ -200,7 +200,7 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...PurchasereceiptRequestMain.allSchemas.tableColumns,...PurchasereceiptRequestDetail.allSchemas.tableMainColumns])
 
-const apiPage = ref(PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage)
+const apiPage = ref(PurchasereceiptRequestDetailApi.getASNPurchasereceiptRequestDetailPage)
 const detailAllSchemas = ref(PurchasereceiptRequestDetail.allSchemas)
 
 
@@ -310,7 +310,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage // 分页接口
+  getListApi: PurchasereceiptRequestDetailApi.getASNPurchasereceiptRequestDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -491,7 +491,7 @@ const checkQualityReport = async (row)=>{
 const isCreateLabel = ref(false)
 const formLabelRef = ref()
 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
-  getListApi: PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage
+  getListApi: PurchasereceiptRequestDetailApi.getASNPurchasereceiptRequestDetailPage
 })
 const { getList:getDetailList } = detatableMethods
 
@@ -794,7 +794,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
+    const data = await PurchasereceiptRequestMainApi.exportASNPurchasereceiptRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
@@ -899,7 +899,7 @@ const searchFormClick = (searchData) => {
 // tabs 切换事件
 // const changeTabs = (data) =>{
 //   if(data.prop == 'receiptDetail'){
-//     apiPage.value = PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage
+//     apiPage.value = PurchasereceiptRequestDetailApi.getASNPurchasereceiptRequestDetailPage
 //     detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas    
 //   }else if(data.prop == 'scarceGoodsDetail'){
 //     apiPage.value = PurchasereceiptRequestDetailApi.getScarceGoodsDetailPage

src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@@ -169,7 +169,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-job-main:export'}), // 导出
-  defaultButtons.mainLisSelectiontPointBtn(null), // 批量标签打印
+  // defaultButtons.mainLisSelectiontPointBtn(null), // 批量标签打印
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -259,7 +259,7 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    defaultButtons.mainListDocumentPrintBtn(null), // 单据打印
+    // defaultButtons.mainListDocumentPrintBtn(null), // 单据打印
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
     defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃

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

@@ -272,6 +272,14 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 '), new Date('1 ')]
       }
     },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
   }
 ]))
 
@@ -501,3 +509,72 @@ export const DemandforecastingDetailRules = reactive({
   ],
   poLine: [{required:true, message: '请选择订单行', trigger: 'blur'}]
 })
+
+
+export const DemandforecastingMainPlan = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '版本号',
+    field: 'detailVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'detailSupplierCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计划日期',
+    field: 'dueDate',
+    formatter: dateFormatter,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'planQty',
+    sort: 'custom',
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  }
+]))

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

@@ -17,6 +17,8 @@
   <!-- 列表 -->
   <ContentWrap>
     <Table v-clientTable
+      ref="tableRef"
+      :selection="true"
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -26,24 +28,55 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      @getSelectionRows="getSelectionRows"
     >
     <template v-for="name in tableObjectHead.tableList" :key="name" #[name]="{row}">
       <span :class="{'success-text':row['planType_F'].indexOf(name)>-1}">{{ row[name] }}</span>
     </template>
+    <template #action="{ row,$index }">
+      <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+    </template>
     </Table>
   </ContentWrap>
+  <!-- :vLoading="formLoadingPlan" -->
+  <Dialog title="预览要货计划"
+    v-model="dialogVisiblePlan"
+    width="80%"
+    :close-on-click-modal="false"
+  >
+    <Table 
+      ref="tablePlanRef"
+      :selection="true"
+      :columns="tableColumnsPlan"
+      :data="tableObjectPlan.tableList"
+      :loading="tableObjectPlan.loading"
+      v-model:pageSize="tableObjectPlan.pageSize"
+      v-model:currentPage="tableObjectPlan.currentPage"
+      v-model:sort="tableObjectPlan.sort"
+      @getSelectionRows="getSelectionRowsPlan"
+    />
+    <template #footer>
+      <slot name="foorter"></slot>
+      <ButtonBase :Butttondata="[
+        defaultButtons.formSaveBtn(null), // 保存
+        defaultButtons.formCloseBtn(null) // 关闭
+      ]" @button-base-click="buttonBaseClickPlan" />
+    </template>
+  </Dialog>
 
 
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { DemandforecastingMain,DemandforecastingMainRules,DemandforecastingDetail,DemandforecastingDetailRules } from './demandforecastingMain.data'
+import { DemandforecastingMain,DemandforecastingMainRules,DemandforecastingDetail,DemandforecastingDetailRules,DemandforecastingMainPlan } from './demandforecastingMain.data'
 import * as DemandforecastingMainApi from '@/api/wms/demandforecastingMain'
 import * as DemandforecastingDetailApi from '@/api/wms/demandforecastingDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { isString } from '@/utils/is'
+
 const { loadStart, loadDone } = usePageLoading()
 // 要货预测
 defineOptions({ name: 'DemandforecastingMain' })
@@ -128,8 +161,17 @@ watch(()=>tableObject.currentPage,async ()=>{
 })
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), // 导出
+defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
+{
+  label: t(`ts.批量生成要货计划`).replace('ts.', ''),
+  name: 'selectionPlan',
+  hide: false,
+  type: 'primary',
+  icon: '',
+  color: '',
+  hasPermi: ''
+},
+defaultButtons.defaultFreshBtn(null), // 刷新
   // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
 ]
@@ -139,6 +181,7 @@ const buttonBaseClick = async (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
+    selectionRows.value = []
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({
         filters: tableObject.params.filters
@@ -150,10 +193,134 @@ const buttonBaseClick = async (val, item) => {
 
     }
   } else if (val == 'filtrate') { // 筛选
+  } else if (val == 'selectionPlan') { // 批量生成要货计划
+    selectionPlan()
   } else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+  return [
+    {
+      label: t(`ts.生成要货计划`).replace('ts.', ''),
+      name: 'previewPlan',
+      hide: !(row['planType_F'].length>0&&(!tableObject.params.version || tableObject.params.version.length == 0)),
+      type: 'primary',
+      color: '',
+      link: true, // 文本展现按钮
+      hasPermi: ''
+    }
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'previewPlan') { // 生成要货计划
+    tableObjectPlan.params.masterIds = row.mainId
+    handlePreviewPlan()
+  } 
+}
+
+
+
+
+
+
+const dialogVisiblePlan = ref(false)
+// 批量
+const selectionRows = ref<any>([])
+const tableRef = ref()
+const getSelectionRows = (currentPage, currentPageSelectionRows) => {
+  console.log('getSelectionRows', currentPage, currentPageSelectionRows)
+  const currentRows = selectionRows.value.find((item) => item.currentPage == currentPage)
+  if (currentRows) {
+    currentRows.selectionRows = currentPageSelectionRows
+  } else {
+    selectionRows.value.push({
+      currentPage,
+      selectionRows: currentPageSelectionRows
+    })
+  }
+}
+const tableColumnsPlan = ref(DemandforecastingMainPlan.allSchemas.tableColumns)
+const { tableObject:tableObjectPlan, tableMethods:tableMethodsPlan } = useTable({
+  getListApi: DemandforecastingDetailApi.getPreviewPlan // 分页接口
+})
+// 获得表格的各种操作
+const { getList:getListPlan} = tableMethodsPlan
+// 批量生成要货计划
+const selectionPlan = async ()=>{
+  let rows: any = []
+  selectionRows.value.forEach((item) => {
+    rows = [...rows, ...item.selectionRows.map((item1) => item1.mainId)]
+  })
+  console.log('批量生成要货计划', rows.join(','))
+  tableObjectPlan.params.masterIds = rows.join(',')
+  handlePreviewPlan()
+}
+const handlePreviewPlan = async ()=>{
+
+  if(tableObject.params.dueDate&&tableObject.params.dueDate.length>0){
+    if(isString(tableObject.params.dueDate[0])){
+      tableObjectPlan.params.startDate = tableObject.params.dueDate[0]
+    }else{
+      tableObjectPlan.params.startDate = tableObject.params.dueDate[0].format('YYYY-MM-DD')
+    }
+  }
+  if(tableObject.params.dueDate&&tableObject.params.dueDate.length>1){
+    if(isString(tableObject.params.dueDate[1])){
+      tableObjectPlan.params.endDate = tableObject.params.dueDate[1]
+    }else{
+      tableObjectPlan.params.endDate = tableObject.params.dueDate[1].format('YYYY-MM-DD')
+    }
+  }
+  if (!tableObject.params.dueDate || tableObject.params.dueDate.length == 0) {
+    tableObjectPlan.params.startDate = ''
+    tableObjectPlan.params.endDate = ''
+  }
+
+  await getListPlan()
+  selectionPlanRows.value = []
+  dialogVisiblePlan.value = true
+}
+
+const buttonBaseClickPlan = async (val)=>{
+  if (val == 'save') {
+    // 保存
+    dialogVisiblePlan.value = false
+    let rows: any = []
+    selectionPlanRows.value.forEach((item) => {
+      rows = [...rows, ...item.selectionRows.map((item1) => item1.id)]
+    })
+    console.log('预览要货计划', selectionPlanRows.value)
+    console.log('预览要货计划', rows.join(','))
+    let res = await DemandforecastingDetailApi.generateOrderPlan(rows)
+    message.success(t('common.submitSuccess'))
+    buttonBaseClick('refresh', null)
+    console.log('保存',res)
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisiblePlan.value = false
+  }
+}
+// 预览要货计划-批量
+const selectionPlanRows = ref<any>([])
+const tablePlanRef = ref()
+const getSelectionRowsPlan = (currentPage, currentPageSelectionRows) => {
+  const currentRows = selectionPlanRows.value.find((item) => item.currentPage == currentPage)
+  if (currentRows) {
+    currentRows.selectionRows = currentPageSelectionRows
+  } else {
+    selectionPlanRows.value.push({
+      currentPage,
+      selectionRows: currentPageSelectionRows
+    })
+  }
+}
+
+
 
 
 const seachRef = ref()

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

@@ -161,6 +161,27 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '订单备注',
+    field: 'poRmks',
+    sort: 'custom',
+    isTable:true,
+    isForm:false,
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '管理编号',
+    field: 'poContract',
+    sort: 'custom',
+    isTable:true,
+    isForm:false,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '版本',
     field: 'version',
@@ -555,6 +576,11 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
     isTableForm: false,
     isForm: false,
     isTable: true,
@@ -565,6 +591,11 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
     isTableForm: false,
     isForm: false,
     isTable: true,

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

@@ -416,7 +416,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
     const model1 = {
       ...model
     }
-    model1.itemTypeList =model.itemTypeList.filter(item=>item)
+    // model1.itemTypeList =model.itemTypeList.filter(item=>item)
     setSearchParams(model1)
   }
   const selectionRows = ref<any>([])

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

@@ -161,6 +161,27 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '订单备注',
+    field: 'poRmks',
+    sort: 'custom',
+    isTable:true,
+    isForm:false,
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '管理编号',
+    field: 'poContract',
+    sort: 'custom',
+    isTable:true,
+    isForm:false,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '版本',
     field: 'version',

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

@@ -88,9 +88,9 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailValidate="detailValidate" 
     :detailButtonIsShowAddStatusArray="['1','3','4','5','6']"
-    :detailButtonIsShowEdit="true"
+    :detailButtonIsShowEdit="detailData.type == 'SCHEDULE'&& detailData.status  != 4"
-    :detailButtonIsShowDelete="true"
+    :detailButtonIsShowDelete="detailData.type == 'SCHEDULE'&& detailData.status  != 4"
-    :detailButtonIsShowAdd="true"
+    :detailButtonIsShowAdd="detailData.type == 'SCHEDULE'&& detailData.status  != 4"
     addHasPermi="wms:purchase-plan-main:create"
     editHasPermi="wms:purchase-plan-main:update"
     deleteHasPermi="wms:purchase-plan-main:delete"
@@ -375,7 +375,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
   // 列表头部按钮
   const HeadButttondata = [
     defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), // 新增
-    defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入
+    // defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入
     // defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出
     defaultButtons.defaultExportDetailsBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出明细
     defaultButtons.defaultExportTableBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出二维表
@@ -425,12 +425,23 @@ const getSearchTableData = async (number,formField,searchField)=>{
 
   // 根据状态返回该按钮是否显示
   const isShowMainButton = (row, val) => {
+   if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+const isShowMainButton1 = (row, val) => {
+  if (row.type == 'DISCRETE') {
+    return true
+  } else {
     if (val.indexOf(row.status) > -1) {
       return false
     } else {
       return true
     }
-  }
+   }
+}
 
   // 列表-操作按钮
   const butttondata = (row,$index) => {
@@ -446,7 +457,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
       defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受
       defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) }), // 下架
       defaultButtons.mainListPurchasePlanModBtn({ hide: isShowMainButton(row, ['5']) }), // 修改
-      defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1','3','5']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑
+      defaultButtons.mainListEditBtn({ hide: isShowMainButton1(row, ['1','3','5']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑
       // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除
       {
         label: t('ts.创建供应商发货申请'),
@@ -537,8 +548,10 @@ const getSearchTableData = async (number,formField,searchField)=>{
   }
 // 获取部门 用于详情 部门回显
   /** 详情操作 */
-  const detailRef = ref()
+const detailRef = ref()
-  const openDetail = (row : any, titleName : any, titleValue : any) => {
+const detailData = ref({})
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+    detailData.value = row
     detailRef.value.openDetail(row, titleName, titleValue,'planPurchaseMain')
     const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
     if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
@@ -967,5 +980,8 @@ const handleSelectionPublish = async ()=>{
   onMounted(async () => {
     getList()
     importTemplateData.templateUrl = await PurchasePlanMainApi.importTemplate()
+    nextTick(()=>{
+      tableColumns.value=tableColumns.value.filter(item=>item.field!='shippedQty')
+    })
   })
 </script>

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

@@ -243,6 +243,29 @@ export const PurchasePlanMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '预测版本',
+      field: 'activeVersion',
+      isTable: true,
+      isForm: false,
+      sortTableDefault: 13,
+      table: {
+        width: 150
+      },
+    },
+    {
+      label: '来源',
+      field: 'source',
+      sort: 'custom',
+      dictType: DICT_TYPE.PURCHASE_PLAN_SOURCE,
+      dictClass: 'string',
+      isTable: true,
+      isForm: false,
+      sortTableDefault: 13,
+      table: {
+        width: 150
+      },
+    },
     {
       label: '收货人',
       field: 'contacts',
@@ -700,6 +723,14 @@ export const PurchasePlanDetail = useCrudSchemas(
       table: {
         width: 150
       },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
+      },
       sortTableDefault: 7,
       isTableForm: true,
       isForm: true,
@@ -711,9 +742,17 @@ export const PurchasePlanDetail = useCrudSchemas(
       table: {
         width: 150
       },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
+      },
       isTableForm: true,
       isForm: true,
-      isTable: true
+      isTable: false
     },
     {
       label: '受入号',
@@ -784,21 +823,20 @@ export const PurchasePlanDetail = useCrudSchemas(
       },
       isTableForm: false,
       isForm: false,
-      isTable: false
+      isTable: true,
-    },
-
-    {
-      label: '在途数量',
-      field: 'notReceiveQty',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      isTableForm: false,
-      isForm: false,
-      isTable: false,
-      sortTableDefault: 7
     },
+    // {
+    //   label: '在途数量',
+    //   field: 'notReceiveQty',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTableForm: false,
+    //   sortTableDefault: 7,
+    //   isForm: false,
+    //   isTable: true,
+    // },
     {
       label: '计量单位',
       field: 'uom',

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

@@ -271,9 +271,6 @@ const planArriveTimeStr = ref()
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
-    console.log('type:', type)
-    console.log('formField:', formField)
-    console.log(formField, searchField, val, formRef, type, row)
     if (type == 'tableForm') {
       // 明细查询页赋值
       // row[formField] = val[0][searchField]
@@ -333,7 +330,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
 }
 //供应商代码 回车搜索
 const onEnter = async (field, value) => {
-  console.log(field, value)
   formRef.value.opensearchTable(
     'supplierCode',
     'code',
@@ -402,8 +398,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
 // 查询页面返回
 const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
-    console.log('formField:', formField)
-    console.log('val:', val)
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
@@ -656,7 +650,6 @@ const buttonTableClick = async (val, row) => {
       tableObject.loading = false
     }
   } else if (val == 'ressbq') {
-    console.log('重新生成标签')
     // ElMessageBox.confirm(`<div style="color:red">
     //   重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！
     //   </div>`,'提示',{
@@ -696,7 +689,6 @@ const buttonTableClick = async (val, row) => {
         }
       })
       .catch(() => {
-        console.info('操作取消')
         tableObject.loading = false
       })
   } else if (val == 'point') {
@@ -722,6 +714,7 @@ const getGenerateLabelList = async (row) => {
   }
   await SupplierdeliverRequestDetailApi.getGenerateLabelList(params1).then((res) => {
     detatableData1.value = res
+    console.log(999,detatableData1.value)
     detatableData1.value.forEach((item) => {
       item.boxPackaging = item.boxPackaging ? item.boxPackaging : []
       item.packUnitInitOptions = item.boxPackaging
@@ -730,6 +723,24 @@ const getGenerateLabelList = async (row) => {
       if (obj) {
         item.packUnit = obj.packUnit
         item.packQty = obj.packQty
+        if (!item.packQty) {
+          // 如果没有数量可以输入
+          SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
+            if (item.field == 'packQty') {
+              item.tableForm.disabled = false
+            }
+          })
+        } else {
+          // 有数量不可以输入
+           SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
+            if (item.field == 'packQty') {
+              item.tableForm.disabled = true
+            }
+          })
+        }
+      } else {
+        item.packUnit = ''
+        item.packQty = ''
       }
       // 有托规格显示托规格，没有显示第一条规格
       item.secondPackUnit = obj?.parentPackUnit
@@ -779,6 +790,21 @@ const formSelectChangeLabel = (field, val, row) => {
     let obj = row.boxPackaging.find((item) => item.packUnit == val)
     if (obj) {
       row.packQty = obj.packQty
+      // 如果没有数量可以输入
+      if (!row.packQty) {
+        SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
+          if (item.field == 'packQty') {
+            item.tableForm.disabled = false
+          }
+        })
+      } else {
+        // 有数量不可以输入
+          SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
+          if (item.field == 'packQty') {
+            item.tableForm.disabled = true
+          }
+        })
+      }
       // 获取托规格
       const params1 = {
         itemCode: row.itemCode,
@@ -938,16 +964,13 @@ const handleAddQualityReport = () => {
     tableFormKeys[item.field] = item.default ? item.default : ''
   })
   uploadQualityReportTableData.value.push(tableFormKeys)
-  console.log('handleAddQualityReport')
 }
 const handleDeleteQualityReport = (row, index) => {
   uploadQualityReportTableData.value.splice(index, 1)
-  console.log('handleDeleteQualityReport', row)
 }
 
 /** 上传质量报告 */
 const handleUploadQualityReport = async (row) => {
-  console.log('SupplierdeliverInspectionDetail', SupplierdeliverInspectionDetail.allSchemas)
   const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(
     (item) => item.field == 'uploadFile'
   )
@@ -969,7 +992,6 @@ const handleUploadQualityReport = async (row) => {
   await SupplierdeliverInspectionDetailApi.getSupplierdeliverDetailInfo(row.masterId).then(
     (res) => {
       if (res) {
-        // console.log("返回结果:",res)
         uploadQualityReportTableData.value = res
       }
     }
@@ -1059,17 +1081,14 @@ const genRecords = async (id: number) => {
   SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
     .then((res) => {
       message.success(t('ts.处理成功!'))
-      console.log('resresresresres', res)
       // 刷新列表
       getList()
-      console.log('刷新列表')
       getLoading?.close()
 
       // 单据打印
       handleDocumentPrint(res)
     })
     .catch((err) => {
-      console.log('发起处理', err)
       getLoading?.close()
     })
    
@@ -1094,23 +1113,19 @@ const genRecords = async (id: number) => {
 //         SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
 //           .then((res) => {
 //             message.success(t('ts.处理成功!'))
-//             console.log('resresresresres', res)
 //             // 刷新列表
 //             getList()
-//             console.log('刷新列表')
 //             getLoading?.close()
 
 //             // 单据打印
 //             handleDocumentPrint(res)
 //           })
 //           .catch((err) => {
-//             console.log('发起处理', err)
 //             getLoading?.close()
 //           })
 //       }
 //     })
 //     .catch((err) => {
-//       console.log('自检报告校验异常', err)
 //       getLoading?.close()
 //     })
 // }
@@ -1199,7 +1214,6 @@ const printAllClick = () => {}
 
 // 批量打印--供应商发货申请
 const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
-  console.log('批量打印', val)
   // let rows:any = []
   // val.forEach(item=>{
   //   rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
@@ -1212,11 +1226,9 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
 
   await PackageApi.batchPrintingLable(val.map((item1) => item1.number).join(','))
     .then((res) => {
-      console.log(res)
       window.open(src.value + '&asn_number=' + res)
     })
     .catch((err) => {
-      console.log(err)
       message.error(t('ts.创建标签失败'))
     })
 }
@@ -1259,7 +1271,6 @@ const submitForm = async (formType, submitData) => {
   }
   data.subList = tableData.value // 拼接子表数据参数
   let isHave = data.subList.some((item) => {
-    console.log('CCCCC', item.expireDate)
     if (item.expireDate != null) {
       item.produceDate > item.expireDate
     }
@@ -1277,12 +1288,10 @@ const submitForm = async (formType, submitData) => {
         await message
           .confirm(`${t('ts.计划到货时间大于')}${planArriveTimeStr.value}${t('ts.是否继续？')}`)
           .then(() => {
-            console.log('选择了OK')
             //选择OK
           })
           .catch(() => {
             //选择取消
-            console.log('选择了cancel')
             confirmFlag = true
             formRef.value.formLoading = false
             return
@@ -1351,7 +1360,6 @@ const getDefaultSupplier = async () => {
   } else {
     defaultSupplierCode.value = ''
   }
-  console.log('defaultSupplierCode', defaultSupplierCode)
 }
 
 /** 初始化 **/

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue

@@ -154,15 +154,15 @@
       </el-table-column>
       <el-table-column label="物料代码" width="150" prop="itemCode" align="center" />
       <el-table-column label="批次" width="150" prop="batch" align="center" />
-      <el-table-column label="数量" width="100" prop="qty" align="center" />
+      <el-table-column label="数量" width="150" prop="qty" align="center" />
-      <el-table-column label="计量单位" width="100" prop="uom" align="center">
+      <el-table-column label="计量单位" width="150" prop="uom" align="center">
         <template #default="scope"> {{ uomLabel(scope.row) }}</template>
       </el-table-column>
-      <el-table-column label="托个数" width="100" prop="allTuoQty" align="center" />
+      <!-- <el-table-column label="托个数" width="100" prop="allTuoQty" align="center" />
       <el-table-column label="托规格" width="100" prop="secondPackUnit" align="center" />
-      <el-table-column label="托数量" width="100" prop="secondPackQty" align="center" />
+      <el-table-column label="托数量" width="100" prop="secondPackQty" align="center" /> -->
-      <el-table-column label="箱规格" width="100" prop="packUnit" align="center" />
+      <el-table-column label="箱规格" width="200" prop="packUnit" align="center" />
-      <el-table-column label="箱数量" width="100" prop="packQty" align="center" />
+      <el-table-column label="箱数量" width="200" prop="packQty" align="center" />
     </el-table>
     <el-pagination
       v-show="tableData.length > 10"

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/index.vue

@@ -0,0 +1,428 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="[
+        ...PurchasereceiptJobMain.allSchemas.searchSchema,
+        ...PurchasereceiptJobDetail.allSchemas.searchSchema
+      ]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="PurchasereceiptJobMain.allSchemas"
+    :detailAllSchemas="PurchasereceiptJobDetail.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      v-clientTable
+      :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 #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row, $index }">
+        <ButtonBase
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasereceiptJobMainRules"
+    :formAllSchemas="PurchasereceiptJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="PurchasereceiptJobDetail.allSchemas"
+    :tableFormRules="PurchasereceiptJobDetailRules"
+    :apiUpdate="PurchasereceiptJobMainApi.updatePurchasereceiptJobMain"
+    :apiCreate="PurchasereceiptJobMainApi.createPurchasereceiptJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptJobMain.allSchemas"
+    :detailAllSchemas="PurchasereceiptJobDetail.allSchemas"
+    :detailAllSchemasRules="PurchasereceiptJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="PurchasereceiptJobDetailApi.getToolPurchasereceiptJobDetailPage"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 子包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptJobDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptJobDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <el-dialog
+    v-model="showQualityReport"
+    :title="t('质检明细')"
+    :append-to-body="false"
+    destroy-on-close
+    fullscreen
+  >
+    <iframe :height="reportHeight" width="100%" :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import {
+  PurchasereceiptJobMain,
+  PurchasereceiptJobMainRules,
+  PurchasereceiptJobDetail,
+  PurchasereceiptJobDetailRules,
+  PurchasereceiptJobDetailPackingNumber
+} from './purchasereceiptJobMain.data'
+import * as PurchasereceiptJobMainApi from '@/api/wms/purchasereceiptJobMain'
+import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { getSwitchByCode } from '@/api/wms/switch'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { getReportUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
+// 协定品收货任务主
+defineOptions({ name: 'ToolPurchasereceiptJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([
+  ...PurchasereceiptJobMain.allSchemas.tableColumns,
+  ...PurchasereceiptJobDetail.allSchemas.tableMainColumns
+])
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+  //{
+  //  formField: 'productItemCode',
+  //  searchTableTitle: '物料信息',
+  //  searchTableAllSchemas: Itembasic.allSchemas,
+  //  searchTablePage: ItembasicApi.getItembasicPage
+  //}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo = []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi:  PurchasereceiptJobDetailApi.getToolPurchasereceiptJobDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:tool-purchasereceipt-job-main:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 根据收货来源判断该按钮是否显示,根据QMS开关判断该按钮是否显示(检验相关)
+const EnableQms = ref(true)
+const isShowSourceTypeButton = (row) => {
+  if (EnableQms.value) {
+    if (row.sourceType == 'EDI' || row.sourceType == 'ASN_ExternalReceipt') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row, $index) => {
+  const findIndex = row['masterId']
+    ? tableObject.tableList.findIndex((item) => item['masterId'] == row['masterId'])
+    : -1
+  if (findIndex > -1 && findIndex < $index) {
+    return []
+  }
+  return [
+    defaultButtons.mainListJobAccBtn({ hide: isShowMainButton(row, ['1']) }), // 承接
+    defaultButtons.mainListJobCloBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'wms:tool-purchasereceipt-job-main:close'
+    }), // 关闭
+    defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    {
+      label: '拒收',
+      name: 'mainJobRefusal',
+      hide: isShowMainButton(row, ['2']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: 'wms:tool-purchasereceipt-job-main:refusal',
+      link: true // 文本展现按钮
+    },
+    defaultButtons.mainListPlanCheckQualityReportBtn({ hide: isShowSourceTypeButton(row) }) // 查看质检报告
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') {
+    // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') {
+    // 放弃
+    console.log('列表-操作按钮事件-放弃')
+    await PurchasereceiptJobMainApi.abandonPurchasereceiptJobMainSpare(row.masterId)
+    buttonBaseClick('refresh', null)
+  } else if (val == 'mainJobClo') {
+    // 拒收
+    handleClose(row.masterId)
+    buttonBaseClick('refresh', null)
+  } else if (val == 'mainJobAcc') {
+    // 承接
+    console.log('列表-操作按钮事件-承接')
+    await PurchasereceiptJobMainApi.acceptPurchasereceiptJobMain(row.masterId)
+    buttonBaseClick('refresh', null)
+  }
+  // else if(val == 'mainPlanCheckQualityReport'){
+  //   // 查看质检报告
+  //   checkQualityReport(row)
+  // }
+  else if (val == 'mainJobRefusal') {
+    // handleRefusal(row.masterId)
+    resonSubmit(row)
+  }
+}
+// 查看质检报告
+const showQualityReport = ref(false)
+const reportHeight = ref(window.innerHeight - 120)
+const qualityReport = ref('')
+const checkQualityReport = async (row) => {
+  showQualityReport.value = true
+  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await PurchasereceiptJobMainApi.closePurchasereceiptJobMain(id)
+    message.success(t('common.closeSuccess'))
+    buttonBaseClick('refresh', null)
+  } catch {}
+}
+const resonSubmit = async (row) => {
+  ElMessageBox.prompt(t('ts.请输入拒收原因'), t('ts.提示'), {
+    confirmButtonText: t('common.ok'),
+    cancelButtonText: t('common.cancel'),
+    inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+    inputErrorMessage: t(`ts.${'驳回原因不能为空，且不超过256字'}`),
+    inputType: 'textarea',
+    inputValidator: (value) => {
+      if (value.length > 60 || value.length == 0) {
+        return false
+      } else {
+        return true
+      }
+    }
+  })
+    .then(({ value }) => {
+      // 驳回原因
+      handleRefusal(row.masterId, value)
+    })
+    .catch(() => {})
+}
+/** 拒收按钮操作 */
+const handleRefusal = async (id: number, refuseReason: string) => {
+  // refuseReason
+  try {
+    await PurchasereceiptJobMainApi.refusalPurchasereceiptJobMain({ id, refuseReason })
+    message.success(t('common.refusalSuccess'))
+    buttonBaseClick('refresh', null)
+  } catch {}
+}
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PurchasereceiptJobDetailApi.queryPurchaseceiptChildPackingNumber
+})
+const { getList: queryDetailList } = packDetatableMethods
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache
+    .get(CACHE_KEY.DEPT)
+    .find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue, 'jobPurchasereceiptMain')
+}
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([
+  {
+    label: '查看子包装',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true // 文本展现按钮
+  }
+])
+
+// 查看其他包装规格
+const tableFormButton = async (val, row) => {
+  if (val == 'viewParentPickingNumber') {
+    //查看其他包装规格
+    packingDetatableData.params = {
+      masterId: row.masterId,
+      parentPackingNumber: row.packingNumber
+    }
+    await queryDetailList()
+    detailParenPackingRef.value.open('create', row, null, 'viewDetail') //查看明细数据
+  }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await PurchasereceiptJobMainApi.exportToolPurchasereceiptJobMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  await getSwitchByCode('EnableQms').then((res) => {
+    EnableQms.value = res == 'TRUE' ? true : false
+  })
+})
+</script>

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue

@@ -0,0 +1,463 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="[
+        ...PurchasereceiptRecordMain.allSchemas.searchSchema,
+        ...PurchasereceiptRecordDetail.allSchemas.searchSchema
+      ]"
+      @search="searchList"
+      @reset="searchList"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="PurchasereceiptRecordMain.allSchemas"
+    :detailAllSchemas="PurchasereceiptRecordDetail.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      v-clientTable
+      :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 #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row, $index }">
+        <ButtonBase
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasereceiptRecordMainRules"
+    :formAllSchemas="PurchasereceiptRecordMain.allSchemas"
+    :tableAllSchemas="PurchasereceiptRecordDetail.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptRecordMain.allSchemas"
+    :detailAllSchemas="detailAllSchemas"
+    :detailAllSchemasRules="PurchasereceiptRecordDetailRules"
+    :apiPage="apiPage"
+    :tabs="PurchasereceiptRequestTabsList"
+    @changeTabs="changeTabs"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 记录子包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRecordDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
+  <!-- 缺货子包装弹窗 -->
+  <BasicForm
+    ref="outStockDetailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRecordDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :tableData="outStockPackingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <el-dialog
+    v-model="showQualityReport"
+    :title="t('质检明细')"
+    :append-to-body="false"
+    destroy-on-close
+    fullscreen
+  >
+    <iframe :height="reportHeight" width="100%" :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import {
+  PurchasereceiptRecordMain,
+  PurchasereceiptRecordMainRules,
+  PurchasereceiptRecordDetail,
+  PurchasereceiptRecordDetailRules,
+  PurchasereceiptRecordDetailPackingNumber
+} from './purchasereceiptRecordMain.data'
+import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain'
+import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { getSwitchByCode } from '@/api/wms/switch'
+import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { getJmreportBaseUrl, getReportUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { mainListPointBtn, mainListPrintInspectionBtn } from '@/utils/disposition/defaultButtons'
+import { getAccessToken } from '@/utils/auth'
+const { loadStart, loadDone } = usePageLoading()
+// 采购收货记录主
+defineOptions({ name: 'PurchasereceiptRecordMain' })
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const apiPage = ref(PurchasereceiptRecordDetailApi.getToolPurchasereceiptRecordDetailPage
+)
+const tableColumns = ref([
+  ...PurchasereceiptRecordMain.allSchemas.tableColumns,
+  ...PurchasereceiptRecordDetail.allSchemas.tableMainColumns
+])
+const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereceiptRecordDetailApi.getToolPurchasereceiptRecordDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:tool-purchasereceipt-record-main:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据收货来源判断该按钮是否显示,根据QMS开关判断该按钮是否显示(检验相关)
+const EnableQms = ref(true)
+const isShowSourceTypeButton = (row) => {
+  if (EnableQms.value) {
+    if (row.sourceType == 'EDI' || row.sourceType == 'ASN_ExternalReceipt') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 根据QMS开关判断该按钮是否显示(检验相关)
+const isShowSCPAndQMSButton = () => {
+  if (EnableQms.value) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 根据QMS开关判断该按钮是否显示(检验相关)
+const isShowputawayRequestFlagButton = (row) => {
+  if (EnableQms.value) {
+    if (row.inspectRequestFlag == 'FALSE') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row, $index) => {
+  const findIndex = row['masterId']
+    ? tableObject.tableList.findIndex((item) => item['masterId'] == row['masterId'])
+    : -1
+  if (findIndex > -1 && findIndex < $index) {
+    return [defaultButtons.mainListPrintInspectionBtn({ hide: isShowSCPAndQMSButton() })]
+  }
+  return [
+    defaultButtons.mainInspectRequestBtn({
+      hasPermi: 'wms:tool-purchasereceipt-record-main:createInspectRequest',
+      hide: isShowputawayRequestFlagButton(row)
+    }), // 生成到货检验申请
+    defaultButtons.mainPutawayRequestBtn({
+      hasPermi: 'wms:tool-purchasereceipt-record-main:createPutawayRequest',
+      hide: row.putawayRequestFlag == 'FALSE'
+    }), // 生成采购上架申请
+    defaultButtons.mainPurchasereturnRecordBtn({
+      hasPermi: 'wms:tool-purchasereceipt-record-main:createPurchasereturnRecord',
+      hide: row.purchasereturnRecordFlag == 'FALSE'
+    }), // 生成采购退后记录申请
+    //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告
+    defaultButtons.mainListPlanCheckQualityReportBtn({ hide: isShowSourceTypeButton(row) }), // 查看质检报告
+    defaultButtons.mainListPrintInspectionBtn({ hide: isShowSCPAndQMSButton() })
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'putawayRequest') {
+    // 生成采购上架申请
+    handleCreatePutawayRequest(row.number)
+  } else if (val == 'inspectRequest') {
+    //生成到货检验申请
+    handleCreateInspectRequest(row.number)
+  } else if (val == 'purchasereturnRecord') {
+    //生成采购退后记录申请
+    handleCreatePurchasereturnRecord(row.number)
+  } else if (val == 'mainPlanCheckQualityReport') {
+    // 查看质检报告
+    checkQualityReport(row)
+  } else if (val == 'printInspection') {
+    handlePrint(row)
+  }
+}
+const searchList = (model) => {
+  let params = { ...model }
+  if (Array.isArray(params.itemType) && params.itemType.length > 0) {
+    params.itemTypes = params.itemType.join(',')
+    params.itemType = ''
+  } else {
+    params.itemTypes = ''
+    params.itemType = ''
+  }
+  setSearchParams(params)
+}
+
+// 查看质检报告
+const reportHeight = ref(window.innerHeight - 120)
+const showQualityReport = ref(false)
+const qualityReport = ref('')
+const checkQualityReport = async (row) => {
+  showQualityReport.value = true
+  // qualityReport.value = "http://localhost/purchasereceiptReport?asnNumber=ASNS20240720-0002"
+  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+}
+
+const BASE_URL = getJmreportBaseUrl()
+const src = ref(BASE_URL + '/jmreport/view/986481894320525312?token=' + getAccessToken())
+const handlePrint = async (row) => {
+  window.open(src.value + '&jobNumber=' + row.jobNumber)
+}
+
+/** 生成采购上架申请按钮操作 */
+const handleCreatePutawayRequest = async (number: string) => {
+  try {
+    await message.confirm(t('ts.确认生成上架申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPutawayRequest(number)
+    message.success(t('ts.上架申请生成成功'))
+    buttonBaseClick('refresh', null)
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
+
+/** 生成到货检验申请按钮操作 */
+const handleCreateInspectRequest = async (number: string) => {
+  try {
+    await message.confirm(t('ts.确认生成到货检验申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createInspectRequest(number)
+    message.success(t('ts.到货检验申请生成成功'))
+    buttonBaseClick('refresh', null)
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
+
+/** 生成采购退货记录按钮操作 */
+const handleCreatePurchasereturnRecord = async (number: string) => {
+  try {
+    await message.confirm(t('ts.确认生成采购退货记录吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPurchasereturnRecord(number)
+    message.success(t('ts.采购退货记录生成成功'))
+    buttonBaseClick('refresh', null)
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PurchasereceiptRecordDetailApi.queryPurchaseceiptChildPackingNumber
+})
+const { getList: queryDetailList } = packDetatableMethods
+
+// 缺货子包装数据
+const outStockDetailParenPackingRef = ref()
+const { tableObject: outStockPackingDetatableData, tableMethods: outStockPackDetatableMethods } =
+  useTable({
+    getListApi: PurchasereceiptRecordDetailApi.queryPurchaseshortageChildPackingNumber
+  })
+const { getList: queryOutStockDetailList } = outStockPackDetatableMethods
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache
+    .get(CACHE_KEY.DEPT)
+    .find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue, 'recordPurchasereceiptMain')
+}
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([
+  {
+    label: t('ts.查看子包装'),
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true // 文本展现按钮
+  }
+])
+
+const tabeKey = ref('receiptDetail')
+// 查看其他包装规格
+const tableFormButton = async (val, row) => {
+  if (val == 'viewParentPickingNumber' && tabeKey.value == 'receiptDetail') {
+    //查看其他包装规格
+    packingDetatableData.params = {
+      masterId: row.masterId,
+      parentPackingNumber: row.packingNumber
+    }
+    await queryDetailList()
+    detailParenPackingRef.value.open('create', row, null, 'viewDetail') //查看明细数据
+  }
+  if (val == 'viewParentPickingNumber' && tabeKey.value == 'scarceGoodsDetail') {
+    //查看其他包装规格
+    outStockPackingDetatableData.params = {
+      masterId: row.masterId,
+      parentPackingNumber: row.packingNumber
+    }
+    await queryOutStockDetailList()
+    outStockDetailParenPackingRef.value.open('create', row, null, 'viewDetail') //查看明细数据
+  }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await PurchasereceiptRecordMainApi.exportToolPurchasereceiptRecordMain(
+      tableObject.params
+    )
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+// tabs 切换事件
+const changeTabs = (data) => {
+  if (data.prop == 'receiptDetail') {
+    console.log(data)
+    apiPage.value = PurchasereceiptRecordDetailApi.getToolPurchasereceiptRecordDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    tabeKey.value = 'receiptDetail'
+  } else if (data.prop == 'scarceGoodsDetail') {
+    apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    tabeKey.value = 'scarceGoodsDetail'
+  }
+  detailAllSchemas.value.tableColumns.forEach((item) => {
+    if (item['field'] == 'qty') {
+      item['label'] = data.prop == 'scarceGoodsDetail' ? '缺货数量' : '收货数量'
+    }
+  })
+
+  console.log('detailAllSchemas', detailAllSchemas.value)
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getSwitchByCode('EnableQms').then((res) => {
+    EnableQms.value = res == 'TRUE' ? true : false
+  })
+  getList()
+})
+onActivated(() => {
+  getList()
+})
+</script>

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue

@@ -0,0 +1,915 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...PurchasereceiptRequestMain.allSchemas.searchSchema,...PurchasereceiptRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereceiptRequestMain.allSchemas"
+      :detailAllSchemas="PurchasereceiptRequestDetail.allSchemas"
+    />
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :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 #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :isOpenSearchTable="true"
+    fieldTableColumn="poNumber"
+    :rules="PurchasereceiptRequestMainRules"
+    :formAllSchemas="PurchasereceiptRequestMain.allSchemas"
+    :tableAllSchemas="PurchasereceiptRequestDetail.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain"
+    :apiCreate="PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @formFormDateChange="formFormDateChange"
+    @onEnter="onEnter"
+  >
+  <template  v-slot="{row}">
+    <el-date-picker v-bind:modelValue="row['expireTime']?addDay(row['produceDate'],row['expireTime']):dayjs('2099-12-31').valueOf()"
+    :clearable="true"
+    style="width: 100%"
+    :disabled="true" 
+    :placeholder="t('ts.选择日期')"/>
+    </template>
+  </BasicForm>
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptRequestMain.allSchemas"
+    :detailAllSchemas="detailAllSchemas"
+    :detailAllSchemasRules="PurchasereceiptRequestDetailRules"
+    :apiCreate="PurchasereceiptRequestDetailApi.createPurchasereceiptRequestDetail"
+    :apiUpdate="PurchasereceiptRequestDetailApi.updatePurchasereceiptRequestDetail"
+    :apiPage="apiPage"
+    :apiDelete="PurchasereceiptRequestDetailApi.deletePurchasereceiptRequestDetail"
+    fromeWhere="purchasereceipt"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 导入 -->
+  <ImportForm 
+    ref="importFormRef" 
+    url="/wms/purchasereceipt-request-main/import" 
+    :importTemplateData="importTemplateData" 
+    @success="importSuccess" 
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
+
+  <!-- 创建标签 -->
+  <BasicForm
+    ref="formLabelRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRequestDetailLabel.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    @submitForm="submitFormLabel"
+    @searchTableSuccess="searchTableSuccessLabel"
+    @formFormDateChange="onChangeLabel"
+  />
+  
+    <!-- 子包装弹窗 -->
+    <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRequestDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <!-- 标签打印 -->
+  <SearchTable width="905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" >
+    <template #searchQuery>
+      <el-form :inline="true">
+        <el-form-item>
+          <el-input v-model="printItemCode" placeholder="请输入物料代码"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="searchPrint">
+            <Icon class="mr-5px" icon="ep:search" />查询
+          </el-button>
+          <el-button type="primary" @click="resetPrint">
+            <Icon class="mr-5px" icon="ep:refresh" />重置
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </template>
+  </SearchTable>
+  <el-dialog
+      v-model="showQualityReport"
+      :title="t('质检明细')"
+      :append-to-body="false"
+      destroy-on-close
+      fullscreen
+    >
+    <iframe :height="reportHeight" width="100%"  :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
+  
+</template>
+
+<script setup lang="ts">
+import dayjs from 'dayjs'
+import { addDay } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { 
+  PurchasereceiptRequestMain,
+  PurchasereceiptRequestMainRules,
+  PurchasereceiptRequestDetail,
+  PurchasereceiptRequestDetailRules,
+  PurchasereceiptRequestDetailLabel,
+  PurchasereceiptRequestDetailPackingNumber
+ } from './purchasereceiptRequestMain.data'
+ import {
+  SupplierdeliverRequestPackage
+} from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
+ import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
+ import * as PackageApi from '@/api/wms/package'
+import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
+import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { getAccessToken } from '@/utils/auth'
+import { getSwitchByCode } from '@/api/wms/switch'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { getReportUrl } from '@/utils/systemParam'
+import { dateFormatter2 } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
+// 协定品收货申请
+defineOptions({ name: 'ToolPurchasereceiptRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const genLabelId = ref(); //主表ID
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...PurchasereceiptRequestMain.allSchemas.tableColumns,...PurchasereceiptRequestDetail.allSchemas.tableMainColumns])
+
+const apiPage = ref(PurchasereceiptRequestDetailApi.getTOOLPurchasereceiptRequestDetailPage)
+const detailAllSchemas = ref(PurchasereceiptRequestDetail.allSchemas)
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      if (formField == 'packUnit' || formField == 'packQty') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      }
+      if (formField == 'secondPackUnit') {
+        row['secondPackUnit'] = val[0]['packUnit']
+        row['secondPackQty'] = val[0]['packQty']
+      }
+    } 
+  })
+}
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  //console.log("formRef",formRef)
+  console.log("searchTableSuccess",formField, searchField, val, formRef, type, row)
+  nextTick(async () => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      if(formField == 'itemCode') {
+        row['itemCode'] = val[0]['code']
+      } else if(formField == 'poNumber') {
+        updateTableData(val)
+        // row['poNumber'] = val[0]['number']
+
+      } else if(formField == 'poLine'){
+        //添加费用明细--点击确定
+        val.forEach(item=>{
+          if(tableData.value.find(item1=>item1['id'] == item['id'])) return
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
+          newRow['poLine'] = item['lineNumber']
+          newRow['itemCode'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          newRow['poNumber'] = item['number']
+          newRow['poLineType'] = item['poLineType']
+          let supplierCode = formRef.formModel.supplierCode;
+          let queryData = {
+            supplierCode:supplierCode,
+            itemCode: item['itemCode']
+          } 
+          SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{
+            newRow['defaultToLocationCode'] = res
+            tableData.value.push(newRow)
+          })
+        })
+      }else if (formField == 'packQty'){
+        row['packQty'] = val[0]['packQty']
+        row['packUnit'] = val[0]['packUnit']
+      }else if(formField == 'defaultToLocationCode'){
+        row['defaultToLocationCode'] = val[0]['code']
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      if(formField == 'supplierCode'){
+        setV['supplierCode'] = val[0]['code']
+      }else if(formField == 'poNumber') {
+        //新增--采购订单--
+        setV['supplierCode'] = val[0]['supplierCode']
+        setV['poNumber'] = val[0]['number']
+        let res = await PurchasereceiptRequestMainApi.queryPurchasePlan({
+          "poNumber": val[0]['number']//采购订单号
+        })
+        console.log('默认到库位res',res)
+        if(res&&res['toLocationCode']){
+          setV['onlyDefaultToLocationCode'] = res['toLocationCode'] // 仅仅用来存储数据--用于给子表赋值
+        }
+
+        // 请求明细数据
+        getSearchTableData(val[0]['number'])
+        // tableData.value = [newRow]
+        // formRef.handleAddTable()
+      }
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if(formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+    } else {
+      setV['poNumber'] = val[0]['number']
+      setV['poLine'] = val[0]['lineNumber']
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereceiptRequestDetailApi.getTOOLPurchasereceiptRequestDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:tool-purchasereceipt-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {// 新增
+    openForm('create')
+  } else if (val == 'import') {// 导入
+    handleImport()
+  }else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 根据收货来源判断该按钮是否显示,根据QMS开关判断该按钮是否显示(检验相关)
+const EnableQms = ref(true)
+const isShowSourceTypeButton = (row) => {
+  if (EnableQms.value) {
+    if (row.sourceType == 'EDI' || row.sourceType == 'ASN_ExternalReceipt') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isASNShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if(row.sourceType == 'ASN_ExternalReceipt'){
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+
+// 根据状态返回该按钮是否显示
+const isASNShowMainButtonCreateLabel = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if(row.sourceType == 'ASN_ExternalReceipt' && row.asnOutLabel == '2'){
+      return true;
+    }else{
+      return false;
+    }
+  } else {
+    return true;
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+  return [
+    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:tool-purchasereceipt-request-main:reAdd'}), //重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:tool-purchasereceipt-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:tool-purchasereceipt-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:tool-purchasereceipt-request-main:agree'}), // 审批通过
+    // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
+    {
+      label: '生成标签',
+      name: 'ssbq',
+      hide: isASNShowMainButtonCreateLabel(row, ['3']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    },
+    defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','6','8']) }), // 标签打印
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:tool-purchasereceipt-request-main:handle'}), // 处理
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:tool-purchasereceipt-request-main:close'}), // 关闭
+    defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告
+      ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    handleClose(row.masterId)
+  } else if (val == 'mainReAdd') { // 重新添加
+    handleReAdd(row.masterId)
+  } else if (val == 'mainSubmit') { // 提交审批
+    handleSubmit(row.masterId)
+  } else if (val == 'mainTurnDown') { // 驳回
+    handleRefused(row.masterId)
+  } else if (val == 'mainApprove') { // 审批通过
+    handleAgree(row.masterId)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.masterId)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if(val == 'ssbq'){ // 生成标签
+     // 生成标签
+     detatableData.params = {
+      masterId:row.masterId
+     }
+    genLabelId.value = row.masterId
+    // 数据来源是EDI默认让输入生产日期
+    if (row.sourceType == 'EDI') {
+      PurchasereceiptRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
+          if (item.field == 'produceDate') {
+          item.tableForm.disabled = false
+        }
+      })
+    } else {
+      PurchasereceiptRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
+          if (item.field == 'produceDate') {
+          item.tableForm.disabled = true
+        }
+      })
+    }
+    await getDetailList()
+    formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
+  }else if (val == 'point') {
+    // 标签打印
+    labelPrint(row)
+  }
+  else if(val == 'mainPlanCheckQualityReport'){
+    // 查看质检报告
+    checkQualityReport(row)
+  }
+}
+// 生成标签选择
+const onChangeLabel =(field,e,row, index) => {
+  const arr = dateFormatter2('', '', e)?.split('-')
+  const str = arr[0]+arr[1]+arr[2]
+  row.batch = str
+}
+// 查看质检报告
+const showQualityReport = ref(false)
+const reportHeight = ref(window.innerHeight - 120)
+const qualityReport = ref('')
+const checkQualityReport = async (row)=>{
+  showQualityReport.value = true
+  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+}
+
+// 生成标签
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: PurchasereceiptRequestDetailApi.getTOOLPurchasereceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// 生成标签按钮操作
+const submitFormLabel = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+  try {
+    console.log("formType==",formType)
+    console.log("data==",data)
+    data.subList = detatableData.tableList
+    console.log("detatableData",detatableData)
+    await message.confirm(t('ts.是否为此数据生成标签？'))
+    await PurchasereceiptRequestMainApi.genLabel(data) //genLabelId.value
+    isCreateLabel.value = true
+    message.success('创建标签成功')
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+    buttonBaseClick('refresh',null);
+  }
+}
+
+const BASE_URL = getJmreportBaseUrl()
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+
+// 标签打印
+const searchTableRef = ref()
+
+// 本地筛选
+const printTableList = ref([])
+const printItemCode = ref('')
+const searchPrint = ()=>{
+  printItemCode.value = printItemCode.value.trim()
+  if(printItemCode.value == ''){
+    searchTableRef.value.updateData(printTableList.value)
+  }else{
+    console.log(printItemCode.value)
+    let printItemCodes = printItemCode.value.split(',')
+    console.log(printItemCodes)
+    let itemCodesList = printTableList.value.filter(item=>!!printItemCodes.find(item1=>item['itemCode']==item1)) 
+    searchTableRef.value.updateData(itemCodesList)
+  }
+  
+}
+const resetPrint = ()=>{
+  printItemCode.value = ''
+  searchPrint()
+}
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  const defaultParams = {'moduleName':'purchasereceipt_request','recordNumber':row.asnNumber}
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  await getListPrint()
+  tableObject.loading = false
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width
+  })
+  printItemCode.value = ''
+  printTableList.value = JSON.parse(JSON.stringify(tableObjectPrint.tableList))
+  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
+
+// 批量打印---采购收货申请
+const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印',val)
+  // let rows:any = []
+  // val.forEach(item=>{
+  //   rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
+  // })
+  if(val.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
+  }
+  // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
+
+  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+      console.log(res)
+      window.open(src.value + '&asn_number=' + res)
+  }).catch(err => {
+    console.log(err)
+    message.error('创建标签失败')
+  })
+}
+
+const updateTableData = (tableList)=>{
+  let itemCodes = tableList.filter(item=>tableData.value.find(item1=>item1['poNumber']==item['number']&&item1['supplierCode']==item['supplierCode']&&item1['poLine']==item['lineNumber']&&item1['itemCode']==item['itemCode']))
+  if(itemCodes.length>0){
+    itemCodes = itemCodes.map(item=>(item.itemCode))
+    message.warning(`物料${itemCodes.join(',')}已经存在`)
+  }
+  tableList = tableList.filter(item=>!tableData.value.find(item1=>item1['poNumber']==item['number']&&item1['supplierCode']==item['supplierCode']&&item1['poLine']==item['lineNumber']&&item1['itemCode']==item['itemCode']))
+  if(tableList.length==0) return
+  tableList.forEach(row=>{
+    //poNumber poLine itemCode batch
+    const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
+    newRow['poLine'] = row['lineNumber']
+    newRow['itemCode'] = row['itemCode']
+    newRow['uom'] = row['uom']
+    newRow['poNumber'] =row['number']
+    newRow['supplierCode'] =row['supplierCode']
+    //生产日期 到货日期 默认当天
+    newRow['produceDate'] = dayjs().valueOf()
+    newRow['arriveDate'] = dayjs().valueOf()
+    //批次
+    newRow['batch'] = formatDate(newRow['produceDate'],'YYYYMMDD');
+    // newRow['defaultToLocationCode'] =row['defaultLocation']
+    if(!newRow['defaultToLocationCode']){
+      newRow['defaultToLocationCode'] = formRef.value.formRef.formModel['onlyDefaultToLocationCode']
+    }
+    
+    if(!tableData.value.find((item:object)=>item.poNumber == newRow.poNumber&&item.itemCode == newRow.itemCode&&item.poLine == newRow.poLine&&item.batch == newRow.batch)){
+      tableData.value.push(newRow)
+    }
+  })
+}
+
+const getSearchTableData = async (number,isEnter=false)=>{
+  const {tableObject ,tableMethods} = useTable({
+    defaultParams:{number},
+    getListApi: PurchaseDetailApi.getPurchaseDetailPageWMS // 分页接口
+  })
+  tableObject.pageSize = 500
+  // 获得表格的各种操作
+  const { getList:getList1 } = tableMethods
+  await getList1()
+  const tableColumns = PurchaseDetail.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  tableData.value = []
+  updateTableData(tableObject.tableList)
+  const itemCodes = []
+  tableObject.tableList.forEach(row=>{
+    itemCodes.push(row['itemCode'])
+    if(isEnter){
+      //回车--供应商代码
+      const setV = {}
+      setV['poNumber'] = number
+      setV['supplierCode'] = row.supplierCode
+      formRef.value.formRef.setValues(setV)
+    }
+  })
+  //有效期
+  ItembasicApi.getItembasicPage({
+    code:itemCodes.join(',')
+  }).then((res)=>{
+    res.list.forEach((item,index)=>{
+      const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+      findItem['expireTime'] = item['expireTime']
+    })
+  })
+}
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PurchasereceiptRequestDetailApi.queryPurchaseceiptChildPackingNumber
+})
+const { getList:queryDetailList } = packDetatableMethods
+
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestPurchasereceiptMain')
+}
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: '查看子包装',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+        packingDetatableData.params = {
+          masterId:row.masterId,
+          parentPackingNumber:row.packingNumber
+        }
+        await queryDetailList()
+        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.closePurchasereceiptRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    buttonBaseClick('refresh',null)
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.reAddPurchasereceiptRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    buttonBaseClick('refresh',null)
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.agreePurchasereceiptRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.refusedPurchasereceiptRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.handlePurchasereceiptRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.submitPurchasereceiptRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await PurchasereceiptRequestMainApi.exportToolPurchasereceiptRequestMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+PurchasereceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
+}
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter(item => !selection.includes(item))
+}
+const onEnter = async (field,value)=>{
+  console.log(field,value)
+  getSearchTableData(value,true)
+}
+// 主子数据 提交
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+  tableData.value.forEach((row, index) => {
+    row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
+  })
+  let alalQty = 0
+  tableData.value.forEach(item => {
+    alalQty += item.qty ?  parseFloat(item.qty) : 0
+  })
+  if (alalQty == 0) {
+    message.error('收货总数量不可以为0')
+    return
+  }
+  data.subList = tableData.value.filter(item => parseFloat(item.qty) > 0) // 拼接子表数据参数
+  formRef.value.formLoading = true
+  try {
+    if (formType === 'create') {
+      data.orderTypeM='1';
+      await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      data.orderTypeM='1';
+      await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+
+const formFormDateChange = (field, val,row, index) => {
+  if(field == 'produceDate'){
+    let produceDateStr = formatDate(val,'YYYYMMDD');
+    row.batch = produceDateStr
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getSwitchByCode('EnableQms').then((res) => {
+    EnableQms.value = res == 'TRUE' ? true : false
+  })
+  getList()
+  importTemplateData.templateUrl = await PurchasereceiptRequestMainApi.importTemplate()
+})
+</script>

src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts

@@ -62,6 +62,7 @@ export const PurchaseClaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '供应商名称',
     field: 'supplierName',
     isDetail: true,
+    isSearch: true,
     table: {
       width: 180
     },
@@ -144,7 +145,7 @@ export const PurchaseClaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {

src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue

@@ -163,14 +163,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       tableData.value = []
     }
     formRef.setValues(setV)
-    // else {
-    //   // 主表查询页赋值
-    //   if (formField == 'supplierCode') {
-    //     setV['supplierName'] = val[0].name
-    //   }
-    //   setV[formField] = val[0][searchField]
-    //   formRef.setValues(setV)
-    // }
   })
 }
 
@@ -179,9 +171,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
-    // setV['soLine'] = val[0]['lineNumber']
-    // setV['lineNumber'] = val[0]['lineNumber']
-    // setV['itemCode'] = val[0]['itemCode']
     setV['remark'] = val[0]['remark']
     setV['uom'] = val[0]['customerUom']
     formRef.setValues(setV)