From 1de52e567088e2ff296feac0ff7817637ab6f2d2 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 25 Jul 2024 08:29:12 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E6=8F=90=EF=BC=9A?=
 =?UTF-8?q?=E7=A8=8E=E7=8E=87=E5=8F=AF=E4=BB=A5=E7=AD=89=E4=BA=8E0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain.data.ts                          | 2 +-
 .../supplierinvoiceRequestMainDifference.data.ts                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 5eb65008d..1bf8078ac 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1508,7 +1508,7 @@ function validateTaxRate(rule, value, callback) {
 export const SupplierinvoiceRequestMainRules = reactive({
   taxRate: [
     required,
-    { validator:validateTaxRate, message: '税率必须大于0', trigger: 'blur'}
+    // { validator:validateTaxRate, message: '税率必须大于0', trigger: 'blur'}
   ],
   supplierCode: [
     { required: true, message: '请选择供应商代码', trigger: 'change' }
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
index bba1657b1..76834ee32 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@@ -1522,7 +1522,7 @@ function validateTaxRate(rule, value, callback) {
 export const SupplierinvoiceRequestMainRules = reactive({
   taxRate: [
     required,
-    { validator:validateTaxRate, message: '税率必须大于0', trigger: 'blur'}
+    // { validator:validateTaxRate, message: '税率必须大于0', trigger: 'blur'}
   ],
   supplierCode: [
     { required: true, message: '请选择供应商代码', trigger: 'change' }

From 39e25ff37db7768952229ea22b1d486c476723af Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 25 Jul 2024 09:27:04 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestMain.data.ts                           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 714ad6745..afb7ae957 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -836,6 +836,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     hiddenInMain: true,
     sortTableDefault:9,
     tableForm: {
+      disabled:true,
       type: 'InputNumber',
       min: 1,
       precision: 6

From 810e1845c272c1b115d824e3cfdd08c78189b7b6 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 25 Jul 2024 11:05:34 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA/=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productionlineitem/index.ts       |   4 +
 src/api/wms/relegateRequestMain/index.ts      |   5 +
 .../productionitemcodeSpareitemcode.data.ts   |   9 +
 .../relegate/relegateRequest/index.vue        | 143 +++++++--
 .../relegateRequestMain.data.ts               | 288 +++++++++++++++++-
 5 files changed, 408 insertions(+), 41 deletions(-)

diff --git a/src/api/wms/productionlineitem/index.ts b/src/api/wms/productionlineitem/index.ts
index 430a0e9e5..31efb8954 100644
--- a/src/api/wms/productionlineitem/index.ts
+++ b/src/api/wms/productionlineitem/index.ts
@@ -72,3 +72,7 @@ export const importTemplate = () => {
 export const getProductionLineCodelistByCodes = async (params) => {
   return await request.get({ url: `/wms/productionlineitem/listByCodes`, params })
 }
+
+export const selectItemCodeToProductionLineCode = async (itemCode: String) => {
+  return await request.get({ url: `/wms/productionlineitem/selectItemCodeToProductionLineCode?itemCode=` + itemCode })
+}
\ No newline at end of file
diff --git a/src/api/wms/relegateRequestMain/index.ts b/src/api/wms/relegateRequestMain/index.ts
index 03e02454a..84a8a9f0d 100644
--- a/src/api/wms/relegateRequestMain/index.ts
+++ b/src/api/wms/relegateRequestMain/index.ts
@@ -95,4 +95,9 @@ export const agree = (id) => {
 // 处理
 export const handle = (id) => {
   return request.put({ url: '/wms/relegate-request-main/handle?id=' + id })
+}
+
+// 创建标签
+export const relegateCreateLabel = async (data: RelegateRequestMainVO) => {
+  return await request.post({ url: `/wms/relegate-request-main/relegateCreateLabel`, data })
 }
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts
index cf6f44bf7..3d6f1be35 100644
--- a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts
@@ -6,6 +6,7 @@ import { Itembasic } from '../itembasic/itembasic.data'
 // 表单校验
 export const ProductionitemcodeSpareitemcodeRules = reactive({
   productionItemCode: [required],
+  spareItemCode: [required],
   available: [required],
 })
 
@@ -33,6 +34,10 @@ export const ProductionitemcodeSpareitemcode = useCrudSchemas(reactive<CrudSchem
           key: 'category',
           value: 'LCJ',
           isMainValue: false
+        },{
+          key: 'type',
+          value: 'CCP',
+          isMainValue: false
         }],
         verificationParams: [{
           key: 'code',
@@ -68,6 +73,10 @@ export const ProductionitemcodeSpareitemcode = useCrudSchemas(reactive<CrudSchem
           key: 'category',
           value: 'BJ',
           isMainValue: false
+        },{
+          key: 'type',
+          value: 'CCP',
+          isMainValue: false
         }],
         verificationParams: [{
           key: 'code',
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index 352bbf879..f8c7fcf0d 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -67,7 +67,7 @@
       ref="formLabelRef"
       @success="getList"
       :tableAllSchemas="detailListTableColumns"
-      :tableFormRules="ProductionreturnRequestDetailLabelRules"
+      :tableFormRules="RelegateRequestDetailLabelRules"
       :tableData="detatableData.tableList"
       :isBusiness="true"
       :isShowButton="false"
@@ -80,11 +80,13 @@
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/relegate-request-main/import" :importTemplateData="importTemplateData"
     @success="importSuccess" />
+      <!-- 标签打印 -->
+  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { RelegateRequestMain, RelegateRequestMainRules, RelegateRequestDetail, RelegateRequestDetailRules } from './relegateRequestMain.data'
+import { RelegateRequestMain, RelegateRequestMainRules, RelegateRequestDetail, RelegateRequestDetailRules,RelegateRequestDetailLabel,RelegateRequestDetailLabelRules } from './relegateRequestMain.data'
 import * as RelegateRequestMainApi from '@/api/wms/relegateRequestMain'
 import * as RelegateRequestDetailApi from '@/api/wms/relegateRequestDetail'
 import * as ItembasicApi from '@/api/wms/itembasic'
@@ -92,12 +94,11 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-import { ProductreceiptRequestLabel,ProductreceiptRequestLabelRules } from '../../../../productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data'
 import * as ProductionitemcodeSpareitemcodeApi from '@/api/wms/productionitemcodeSpareitemcode'
 import * as PackageApi from "@/api/wms/package";
-import * as ProductionreturnRequestMainApi from '@/api/wms/productionreturnRequestMain'
-import { ProductionreturnRequestMain,ProductionreturnRequestMainRules,ProductionreturnRequestDetail,ProductionreturnRequestDetailRules,ProductionreturnRequestDetailLabel,ProductionreturnRequestDetailLabelRules, SupplierdeliverRequestPackage } from '@/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts'
-import * as ProductionreturnRequestDetailApi from '@/api/wms/productionreturnRequestDetail'
+import { getAccessToken } from '@/utils/auth'
+import { getJmreportBaseUrl } from '@/utils/systemParam'
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 
 defineOptions({ name: 'RelegateRequestMain' })
 
@@ -111,12 +112,12 @@ routeName.value = route.name
 const tableColumns = ref([...RelegateRequestMain.allSchemas.tableColumns, ...RelegateRequestDetail.allSchemas.tableMainColumns])
 const isShowButton = ref(true)
 //创建标签
-const detailListTableColumns = ProductionreturnRequestDetailLabel.allSchemas
+const detailListTableColumns = RelegateRequestDetailLabel.allSchemas
 const isCreateLabel = ref(false)
 const formLabelRef = ref()
 const labelType = ref('') // 标签类别 采购还是制造等
 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
-  getListApi: ProductionreturnRequestDetailApi.getProductionreturnRequestDetailPage
+  getListApi: RelegateRequestDetailApi.getRelegateRequestDetailPage
 })
 const { getList:getDetailList } = detatableMethods
 // 创建标签
@@ -126,23 +127,53 @@ const submitFormLabel = async (formType, submitData) => {
     data.id = data.masterId
   }
   try {
-    alert('做一下接口')
-    // detatableData.tableList.forEach(async (item) => {
-    //   item.toLocationCode = item.fromLocationCode
-    //   await PackageApi.createPackageLabel(item).then(() => {
-    //     isCreateLabel.value = true
-    //     message.success('创建标签成功')
-    //   }).catch(err => {
-    //     isCreateLabel.value = false
-    //     console.log(err)
-    //     message.error('创建标签失败')
-    //   })
-    // })
+    // alert('做一下接口')
+    console.log("aaaaa",data);
+    data.subList=detatableData.tableList
+    console.log("bbbbb",data);
+      // item.toLocationCode = item.fromLocationCode
+      await RelegateRequestMainApi.relegateCreateLabel(data).then(() => {
+        isCreateLabel.value = true
+        message.success('创建标签成功')
+      }).catch(err => {
+        isCreateLabel.value = false
+        console.log(err)
+        message.error('创建标签失败')
+      })
   } finally {
     formLabelRef.value.formLoading = false
     formLabelRef.value.dialogVisible = false
   }
 }
+
+// 标签打印
+const handlePoint = async (row) => {
+  // 查询是否已创建过标签
+  await PackageApi.getPackagePage({
+    requestNumber: row.number
+  }).then((res) => {
+    if(res.list.length > 0) {
+      isCreateLabel.value = true
+      if (res.list[0].productionLineCode != null) {
+        labelType.value = 'zz'
+      } else {
+        labelType.value = 'cg'
+      }
+    } else {
+      isCreateLabel.value = false
+    }
+  }).catch(err => {
+    isCreateLabel.value = false
+    console.log(err)
+  })
+  // 判断是采购还是制造
+  if (isCreateLabel.value) {
+    labelPrint(row)
+  } else {
+    message.warning('请先创建标签')
+  }
+}
+
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
@@ -159,7 +190,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           newRow['fromBatch'] = item['batch']
           newRow['fromPackingNumber'] = item['packingNumber']
           newRow['toBatch'] = item['batch']
-          newRow['toPackingNumber'] = item['packingNumber']
           newRow['fromLocationCode'] = item['locationCode']
           newRow['inventoryStatus'] = item['inventoryStatus']
           tableData.value.push(newRow)
@@ -376,7 +406,7 @@ const butttondata = (row,$index) => {
       color: '',
       hasPermi: '',
       link: true, // 文本展现按钮
-    }
+    },defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
     // defaultButtons.mainListDeleteBtn({hasPermi:'wms:relegate-request-main:delete'}), // 删除
     ]
 }
@@ -475,6 +505,8 @@ const buttonTableClick = async (val, row) => {
     // dialogVisible.value = true
     formLabelRef.value.open('create', row)
     detatableData.tableList.map((item) => {
+      console.log(item);
+      
       // item.batch = '000000'
       // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
       ItembasicApi.getItembasicPage({
@@ -492,27 +524,31 @@ const buttonTableClick = async (val, row) => {
             if(itemColumns.field == 'productionLineCodePackage') {
               // itemColumns.tableForm.isInpuFocusShow = false
               // itemColumns.tableForm.disabled = true
-              ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = false
+              RelegateRequestDetailLabelRules.productionLineCodePackage[0].required = false
             }
             if(itemColumns.field == 'supplierItemCode') {
               itemColumns.tableForm.isInpuFocusShow = true
               itemColumns.tableForm.disabled = false
-              ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = true
+              RelegateRequestDetailLabelRules.supplierItemCode[0].required = true
             }
           })
           } else {
             // 修改 tableform 属性
-            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            detailListTableColumns.tableFormColumns.map(async itemColumns => {
             if(itemColumns.field == 'supplierItemCode') {
               itemColumns.tableForm.isInpuFocusShow = false
               itemColumns.tableForm.disabled = true
-              ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = false
+              RelegateRequestDetailLabelRules.supplierItemCode[0].required = false
             }
             if(itemColumns.field == 'productionLineCodePackage') {
-              item.productionLineCodePackage = item.productionLineCode
+              let res = await ProductionlineitemApi.selectItemCodeToProductionLineCode(item.itemCode)
+              // let res = ProductionlineitemApi.selectItemCodeToProductionLineCode(item.itemCode)
+              console.log(res,999999999999999999999);
+              console.log(res[0],999999999999999999999);
+              item.productionLineCodePackage = res[0].productionLineCode
               // itemColumns.tableForm.isInpuFocusShow = true
               // itemColumns.tableForm.disabled = false
-              ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = true
+              RelegateRequestDetailLabelRules.productionLineCodePackage[0].required = true
             }
           })
           }
@@ -523,6 +559,8 @@ const buttonTableClick = async (val, row) => {
       })
     })
 
+  }else if (val == 'point') { // 标签打印
+    handlePoint(row)
   }
 }
 
@@ -577,6 +615,34 @@ const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicRelegateRequestMain')
 }
+const BASE_URL = getJmreportBaseUrl()
+// 批量打印
+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)
+      if (labelType.value == 'cg') {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      } else {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      }
+  }).catch(err => {
+    console.log(err)
+    message.error('创建标签失败')
+  })
+}
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -649,6 +715,27 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const searchTableRef = ref()
+
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  const defaultParams = {'moduleName':'productreceipt_predict','recordNumber':row.number}
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  getListPrint()
+  tableObject.loading = false
+  const tableColumns = RelegateRequestDetailLabel.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index 701f85c5a..3999a2a75 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -16,6 +16,9 @@ import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/l
 import * as ItempackageApi from '@/api/wms/itempackage'
 import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 
+import * as SupplieritemApi  from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+
 import * as ProductionitemcodeSpareitemcodeApi from '@/api/wms/productionitemcodeSpareitemcode'
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -289,7 +292,7 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isForm: false,
     table: {
-      width: 200,
+      width: 250,
       fixed: 'right'
     },
     isDetail:false
@@ -509,17 +512,6 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '到包装号',
-    field: 'toPackingNumber',
-    sort: 'custom',
-    tableForm: {
-      disabled: true
-    },
-    table: {
-      width: 120
-    },
-  },
   {
     label: '到批次',
     field: 'toBatch',
@@ -726,9 +718,279 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     hiddenInMain:true,
     table: {
-      width: 200,
+      width: 250,
       fixed: 'right'
     },
     isTableForm: false
   }
 ]))
+
+/**
+ * @returns {Array} 物料变更申请子表创建标签
+ */
+export const RelegateRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCodePackage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+      // isInpuFocusShow: true,
+      // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      // searchField: 'productionLineCode', // 查询弹窗赋值字段
+      // searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      // searchCondition:[{
+      //   key: 'itemCode',
+      //   value: 'itemCode',
+      //   isMainValue: true
+      // }]
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    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: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    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,
+    }
+  }
+]))
+
+//表单校验
+export const RelegateRequestDetailLabelRules = reactive({
+  supplierItemCode: [
+    { required: true, message: '请选择供应商', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ]
+})
\ No newline at end of file

From c98a77b75e0158399e340be21a1b80f7fbd772ee Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 25 Jul 2024 11:08:12 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=88=B0=E5=BA=93=E4=BD=8D=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestMain.data.ts        | 24 +++++++++++++++----
 .../sparereceiptRequestMain.data.ts           | 24 +++++++++++++++----
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index afb7ae957..7ef563f22 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -982,12 +982,20 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchPage: LocationApi.selectBusinessTypeToLocation, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }],
+        },{
+          key: 'businessType',
+          value: 'PurchaseReceipt',
+          isMainValue: false
+        },{
+          key: 'isIn',
+          value: 'in',
+          isMainValue: false
+          }],
         verificationParams: [{
           key: 'code',
           action: '==',
@@ -1005,12 +1013,20 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '库位信息', // 查询弹窗标题
       searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchPage: LocationApi.selectBusinessTypeToLocation, // 查询弹窗所需分页方法
       searchCondition: [{
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      }],
+      },{
+        key: 'businessType',
+        value: 'PurchaseReceipt',
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+        }],
       verificationParams: [{
         key: 'code',
         action: '==',
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index 1869f012c..db236e918 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -982,12 +982,20 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchPage: LocationApi.selectBusinessTypeToLocation, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }],
+        },{
+          key: 'businessType',
+          value: 'PurchaseReceipt',
+          isMainValue: false
+        },{
+          key: 'isIn',
+          value: 'in',
+          isMainValue: false
+          }],
         verificationParams: [{
           key: 'code',
           action: '==',
@@ -1005,12 +1013,20 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '库位信息', // 查询弹窗标题
       searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchPage: LocationApi.selectBusinessTypeToLocation, // 查询弹窗所需分页方法
       searchCondition: [{
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      }],
+      },{
+        key: 'businessType',
+        value: 'PurchaseReceipt',
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+        }],
       verificationParams: [{
         key: 'code',
         action: '==',

From 4c060eab3fec649dea896fa58169417fc1908915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Thu, 25 Jul 2024 11:10:47 +0800
Subject: [PATCH 05/10] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/qms/inspectionQ1/index.ts             |  67 +++
 src/api/qms/inspectionQ2/index.ts             |  68 +++
 src/api/qms/inspectionQ3/index.ts             |  68 +++
 src/utils/dict.ts                             |   1 +
 src/views/qms/inspectionQ1/index.vue          | 250 +++++++++++
 .../qms/inspectionQ1/inspectionQ1.data.ts     | 352 ++++++++++++++++
 src/views/qms/inspectionQ2/index.vue          | 258 ++++++++++++
 .../qms/inspectionQ2/inspectionQ2.data.ts     | 395 ++++++++++++++++++
 src/views/qms/inspectionQ3/index.vue          | 252 +++++++++++
 .../qms/inspectionQ3/inspectionQ3.data.ts     | 328 +++++++++++++++
 10 files changed, 2039 insertions(+)
 create mode 100644 src/api/qms/inspectionQ1/index.ts
 create mode 100644 src/api/qms/inspectionQ2/index.ts
 create mode 100644 src/api/qms/inspectionQ3/index.ts
 create mode 100644 src/views/qms/inspectionQ1/index.vue
 create mode 100644 src/views/qms/inspectionQ1/inspectionQ1.data.ts
 create mode 100644 src/views/qms/inspectionQ2/index.vue
 create mode 100644 src/views/qms/inspectionQ2/inspectionQ2.data.ts
 create mode 100644 src/views/qms/inspectionQ3/index.vue
 create mode 100644 src/views/qms/inspectionQ3/inspectionQ3.data.ts

diff --git a/src/api/qms/inspectionQ1/index.ts b/src/api/qms/inspectionQ1/index.ts
new file mode 100644
index 000000000..dab41fa63
--- /dev/null
+++ b/src/api/qms/inspectionQ1/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface Q1VO {
+  id: number
+  number: string
+  customerCode: string
+  costCode: string
+  itemCode: string
+  qty: number
+  uom: string
+  code: string
+  priority: number
+  responUser: string
+  claimAmount: number
+  claimReason: number
+  claimTime: Date
+  handleTime: Date
+  desc: string
+  status: string
+  available: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询Q1通知单列表
+export const getQ1Page = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/qms/inspectionQ1/senior', data })
+  } else {
+    return await request.get({ url: `/qms/inspectionQ1/page`, params })
+  }
+}
+
+// 查询Q1通知单详情
+export const getQ1 = async (id: number) => {
+  return await request.get({ url: `/qms/inspectionQ1/get?id=` + id })
+}
+
+// 新增Q1通知单
+export const createQ1 = async (data: Q1VO) => {
+  return await request.post({ url: `/qms/inspectionQ1/create`, data })
+}
+
+// 修改Q1通知单
+export const updateQ1 = async (data: Q1VO) => {
+  return await request.put({ url: `/qms/inspectionQ1/update`, data })
+}
+
+// 删除Q1通知单
+export const deleteQ1 = async (id: number) => {
+  return await request.delete({ url: `/qms/inspectionQ1/delete?id=` + id })
+}
+
+// 导出Q1通知单 Excel
+export const exportQ1 = async (params) => {
+  return await request.download({ url: `/qms/inspectionQ1/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/qms/inspectionQ1/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/qms/inspectionQ2/index.ts b/src/api/qms/inspectionQ2/index.ts
new file mode 100644
index 000000000..19d1f6f40
--- /dev/null
+++ b/src/api/qms/inspectionQ2/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface Q2VO {
+  id: number
+  number: string
+  supplierCode: string
+  itemCode: string
+  q1Number: string
+  purchaseReceiptNumber: string
+  qty: number
+  uom: string
+  code: string
+  desc: string
+  priority: number
+  responUser: string
+  claimAmount: number
+  costCode: string
+  claimTime: Date
+  handleTime: Date
+  status: string
+  available: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询Q2通知单列表
+export const getQ2Page = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/qms/inspectionQ2/senior', data })
+  } else {
+    return await request.get({ url: `/qms/inspectionQ2/page`, params })
+  }
+}
+
+// 查询Q2通知单详情
+export const getQ2 = async (id: number) => {
+  return await request.get({ url: `/qms/inspectionQ2/get?id=` + id })
+}
+
+// 新增Q2通知单
+export const createQ2 = async (data: Q2VO) => {
+  return await request.post({ url: `/qms/inspectionQ2/create`, data })
+}
+
+// 修改Q2通知单
+export const updateQ2 = async (data: Q2VO) => {
+  return await request.put({ url: `/qms/inspectionQ2/update`, data })
+}
+
+// 删除Q2通知单
+export const deleteQ2 = async (id: number) => {
+  return await request.delete({ url: `/qms/inspectionQ2/delete?id=` + id })
+}
+
+// 导出Q2通知单 Excel
+export const exportQ2 = async (params) => {
+  return await request.download({ url: `/qms/inspectionQ2/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/qms/inspectionQ2/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/qms/inspectionQ3/index.ts b/src/api/qms/inspectionQ3/index.ts
new file mode 100644
index 000000000..616376561
--- /dev/null
+++ b/src/api/qms/inspectionQ3/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface Q3VO {
+  id: number
+  number: string
+  q1Number: string
+  itemCode: string
+  qty: number
+  code: string
+  uom: string
+  desc: string
+  defectLocation: string
+  defectType: string
+  problemReason: string
+  priority: number
+  responUser: string
+  amount: number
+  costCode: string
+  handleTime: Date
+  status: string
+  available: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询Q3通知单列表
+export const getQ3Page = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/qms/inspectionQ3/senior', data })
+  } else {
+    return await request.get({ url: `/qms/inspectionQ3/page`, params })
+  }
+}
+
+// 查询Q3通知单详情
+export const getQ3 = async (id: number) => {
+  return await request.get({ url: `/qms/inspectionQ3/get?id=` + id })
+}
+
+// 新增Q3通知单
+export const createQ3 = async (data: Q3VO) => {
+  return await request.post({ url: `/qms/inspectionQ3/create`, data })
+}
+
+// 修改Q3通知单
+export const updateQ3 = async (data: Q3VO) => {
+  return await request.put({ url: `/qms/inspectionQ3/update`, data })
+}
+
+// 删除Q3通知单
+export const deleteQ3 = async (id: number) => {
+  return await request.delete({ url: `/qms/inspectionQ3/delete?id=` + id })
+}
+
+// 导出Q3通知单 Excel
+export const exportQ3 = async (params) => {
+  return await request.download({ url: `/qms/inspectionQ3/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/qms/inspectionQ3/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index c753f6ff7..6c806f0d1 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -385,4 +385,5 @@ export enum DICT_TYPE {
   IS_LINE_ITEM = 'is_line_item', // 是否是线边
   PUT_IN_TYPE = 'put_in_type', // 入库类型
   PURCHASE_JOB_STATUS = 'purchase_job_status', // 采购收货任务状态
+ PUBLISHE_STATUS = 'publishe_status', // 采购收货任务状态
 }
diff --git a/src/views/qms/inspectionQ1/index.vue b/src/views/qms/inspectionQ1/index.vue
new file mode 100644
index 000000000..d693ad893
--- /dev/null
+++ b/src/views/qms/inspectionQ1/index.vue
@@ -0,0 +1,250 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Q1.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Q1.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="Q1Rules"
+    :formAllSchemas="Q1.allSchemas"
+    :apiUpdate="Q1Api.updateQ1"
+    :apiCreate="Q1Api.createQ1"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Q1.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/basic/Q1/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Q1,Q1Rules } from './inspectionQ1.data'
+import * as Q1Api from '@/api/qms/inspectionQ1'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'InspectionQ1' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Q1.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+   nextTick(() => {
+    const setV = {}
+    if(formField == 'itemCode'){
+      console.log(val);
+      setV['uom'] = val[0]['customerUom']
+    }
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+   })
+
+   
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: Q1Api.getQ1Page // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:q1:import'}), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:q1:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:q1:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =Q1.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await Q1Api.createQ1(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await Q1Api.updateQ1(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicQ1')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await Q1Api.deleteQ1(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await Q1Api.exportQ1(tableObject.params)
+    download.excel(data, 'Q1通知单.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: 'Q1通知单导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await Q1Api.importTemplate()
+})
+
+</script>
diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts
new file mode 100644
index 000000000..0acc3299c
--- /dev/null
+++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts
@@ -0,0 +1,352 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
+
+import * as CustomeritemApi from '@/api/wms/customeritem'
+import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data'
+
+import * as QadCostcentreApi from '@/api/wms/qadCostcentre'
+import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
+
+// 表单校验
+export const Q1Rules = reactive({
+  customerCode: [required],
+  costCode: [required],
+  itemCode: [required],
+  qty: [required],
+  code: [required],
+  priority: [required],
+  claimAmount: [required],
+  claimReason: [required],
+  claimTime: [required],
+  handleTime: [required]
+})
+
+export const Q1 = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '通知单号',
+      field: 'number',
+      sort: 'custom',
+      isForm: false,
+      isSearch: true,
+        table: {
+        width: 150,
+        fixed: 'left'
+      },
+    },
+    {
+      label: '状态',
+      field: 'status',
+      sort: 'custom',
+      dictType: DICT_TYPE.PUBLISHE_STATUS,
+      dictClass: 'string',
+      isForm: false,
+      isSearch: false,
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '客户代码',
+      field: 'customerCode',
+      sort: 'custom',
+      table: {
+        width: 150,
+        fixed: 'left'
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '客户信息', // 查询弹窗标题
+          searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+          searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      },
+      isSearch: true
+    },
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchField: 'itemCode', // 查询弹窗赋值字段
+          searchTitle: '客户物料信息', // 查询弹窗标题
+          searchAllSchemas: Customeritem.allSchemas, // 查询弹窗所需类
+          searchPage: CustomeritemApi.getCustomeritemPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'customerCode',
+              value: 'customerCode',
+              message: '请填写客户代码！',
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'itemCode',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      isTable: false,
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      }
+    },
+
+    {
+      label: '单位',
+      field: 'uom',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '编码',
+      field: 'code',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '优先级',
+      field: 'priority',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '负责用户',
+      field: 'responUser',
+      sort: 'custom',
+      isSearch: false
+    },
+    {
+      label: '索赔金额',
+      field: 'claimAmount',
+      sort: 'custom',
+      isTable: false,
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      }
+    },
+    {
+      label: '成本中心',
+      field: 'costCode',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+          searchField: 'costcentreCode', // 查询弹窗赋值字段
+          searchTitle: '成本中心信息', // 查询弹窗标题
+          searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+          searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      }
+    },
+    {
+      label: '索赔原因',
+      field: 'claimReason',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '索赔日期',
+      field: 'claimTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      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: 'handleTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isTable: false,
+      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: 'desc',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: '150'
+      },
+      form: {
+        component: 'Input',
+        componentProps: {
+          type: 'textarea'
+        }
+      }
+    },
+    {
+      label: '是否可用',
+      field: 'available',
+      sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      isSearch: true,
+      isForm: false,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      search: {
+        value: 'TRUE'
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      table: {
+        width: 110
+      }
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
+    }
+  ])
+)
diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue
new file mode 100644
index 000000000..5731edb26
--- /dev/null
+++ b/src/views/qms/inspectionQ2/index.vue
@@ -0,0 +1,258 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Q2.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Q2.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="Q2Rules"
+    :formAllSchemas="Q2.allSchemas"
+    :apiUpdate="Q2Api.updateQ2"
+    :apiCreate="Q2Api.createQ2"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Q2.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/basic/Q2/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Q2,Q2Rules } from './inspectionQ2.data'
+import * as Q2Api from '@/api/qms/inspectionQ2'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'InspectionQ2' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Q2.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+    nextTick(() => {
+    const setV = {}
+    if(formField == 'itemCode'){
+      console.log(val);
+      setV['uom'] = val[0]['supplierUom']
+      }
+      if (formField == 'q1Number') {
+          console.log(123)
+      setV['q1Number'] = val[0]['number']
+      }
+// if (formField == 'supplierCode') {
+//           console.log(123)
+//       setV['supplierCode'] = val[0]['code']
+//       }
+      
+    
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+   })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: Q2Api.getQ2Page // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:q2:import'}), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:q2:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:q2:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =Q2.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await Q2Api.createQ2(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await Q2Api.updateQ2(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicQ2')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await Q2Api.deleteQ2(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await Q2Api.exportQ2(tableObject.params)
+    download.excel(data, 'Q2通知单.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: 'Q2通知单导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await Q2Api.importTemplate()
+})
+
+</script>
diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
new file mode 100644
index 000000000..2ec6ee0e1
--- /dev/null
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@@ -0,0 +1,395 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as QadCostcentreApi from '@/api/wms/qadCostcentre'
+import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
+
+import * as InspectionQ1Api from '@/api/qms/inspectionQ1'
+import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data'
+
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+
+import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
+import { PurchasereceiptRecordMain1 } from '@/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data'
+
+// 表单校验
+export const Q2Rules = reactive({
+  number: [required],
+  supplierCode: [required],
+  itemCode: [required],
+  purchaseReceiptNumber: [required],
+  qty: [required],
+  code: [required],
+  priority: [required],
+  claimAmount: [required],
+  costCode: [required],
+  claimTime: [required],
+  handleTime: [required],
+  available: [required],
+  concurrencyStamp: [required]
+})
+
+export const Q2 = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '通知单号',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'left'
+      }
+    },
+    {
+      label: 'q1通知单号',
+      field: 'q1Number',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q1通知单', // 查询弹窗标题
+          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      },
+      isSearch: true
+    },
+    {
+      label: '状态',
+      field: 'status',
+      sort: 'custom',
+      dictType: DICT_TYPE.PUBLISHE_STATUS,
+      dictClass: 'string',
+      isForm: false,
+      isSearch: false,
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '供应商编码',
+      field: 'supplierCode',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 175
+      },
+      form: {
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择供应商', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '供应商信息', // 查询弹窗标题
+          searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+          searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      }
+    },
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 190
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchField: 'itemCode', // 查询弹窗赋值字段
+          searchTitle: '供应商物料信息', // 查询弹窗标题
+          searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+          searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'supplierCode',
+              value: 'supplierCode',
+              message: '请填写供应商代码！',
+              isMainValue: true
+            },
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'itemCode',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: '单位',
+      field: 'uom',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '采购收货单号',
+      field: 'purchaseReceiptNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          disabled: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: '采购收货记录', // 查询弹窗标题
+          searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类
+          searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'supplierCode',
+              value: 'supplierCode',
+              isMainValue: true
+            },
+            {
+              key: 'itemCode',
+              value: 'itemCode',
+              isMainValue: true
+            }
+          ]
+        }
+      }
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      isTable: false,
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      }
+    },
+
+    {
+      label: '编码',
+      field: 'code',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+
+    {
+      label: '优先级',
+      field: 'priority',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '负责用户',
+      field: 'responUser',
+      sort: 'custom',
+      isSearch: false
+    },
+    {
+      label: '索赔金额',
+      field: 'claimAmount',
+      sort: 'custom',
+      isTable: false,
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      }
+    },
+    {
+      label: '成本中心代码',
+      field: 'costCode',
+      sort: 'custom',
+      isSearch: false,
+      isTable: true,
+      isForm: true,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择成本中心', // 输入框占位文本
+          searchField: 'costcentreCode', // 查询弹窗赋值字段
+          searchTitle: '成本中心信息', // 查询弹窗标题
+          searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+          searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      }
+    },
+
+    {
+      label: '索赔日期',
+      field: 'claimTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      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: 'handleTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isTable: false,
+      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: 'desc',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: '150'
+      },
+      form: {
+        component: 'Input',
+        componentProps: {
+          type: 'textarea'
+        }
+      }
+    },
+    {
+      label: '是否可用',
+      field: 'available',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
+    }
+  ])
+)
diff --git a/src/views/qms/inspectionQ3/index.vue b/src/views/qms/inspectionQ3/index.vue
new file mode 100644
index 000000000..18b256c52
--- /dev/null
+++ b/src/views/qms/inspectionQ3/index.vue
@@ -0,0 +1,252 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Q3.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Q3.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="Q3Rules"
+    :formAllSchemas="Q3.allSchemas"
+    :apiUpdate="Q3Api.updateQ3"
+    :apiCreate="Q3Api.createQ3"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Q3.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/basic/Q3/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Q3,Q3Rules } from './inspectionQ3.data'
+import * as Q3Api from '@/api/qms/inspectionQ3'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'InspectionQ3' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Q3.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+    nextTick(() => {
+    const setV = {}
+    if(formField == 'itemCode'){
+      console.log(val);
+      setV['uom'] = val[0]['customerUom']
+      }
+     if (formField == 'q1Number') {
+          console.log(123)
+      setV['q1Number'] = val[0]['number']
+      }
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+   })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: Q3Api.getQ3Page // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:q3:import'}), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:q3:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:q3:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =Q3.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await Q3Api.createQ3(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await Q3Api.updateQ3(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicQ3')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await Q3Api.deleteQ3(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await Q3Api.exportQ3(tableObject.params)
+    download.excel(data, 'Q3通知单.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: 'Q3通知单导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await Q3Api.importTemplate()
+})
+
+</script>
diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
new file mode 100644
index 000000000..2e002b789
--- /dev/null
+++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
@@ -0,0 +1,328 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as InspectionQ1Api from '@/api/qms/inspectionQ1'
+import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data'
+
+import * as QadCostcentreApi from '@/api/wms/qadCostcentre'
+import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
+
+import * as CustomeritemApi from '@/api/wms/customeritem'
+import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data'
+
+// 表单校验
+export const Q3Rules = reactive({
+  number: [required],
+  itemCode: [required],
+  qty: [required],
+  code: [required],
+  defectLocation: [required],
+  defectType: [required],
+  problemReason: [required],
+  priority: [required],
+  amount: [required],
+  costCode: [required],
+  handleTime: [required],
+  available: [required],
+  concurrencyStamp: [required]
+})
+
+export const Q3 = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '通知单号',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'left'
+      }
+    },
+    {
+      label: 'q1通知单号',
+      field: 'q1Number',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q1通知单', // 查询弹窗标题
+          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      },
+      isSearch: true
+    },
+    {
+      label: '状态',
+      field: 'status',
+      sort: 'custom',
+      dictType: DICT_TYPE.PUBLISHE_STATUS,
+      dictClass: 'string',
+      isForm: false,
+      isSearch: false,
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchField: 'itemCode', // 查询弹窗赋值字段
+          searchTitle: '客户物料信息', // 查询弹窗标题
+          searchAllSchemas: Customeritem.allSchemas, // 查询弹窗所需类
+          searchPage: CustomeritemApi.getCustomeritemPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'customerCode',
+              value: 'customerCode',
+              message: '请填写客户代码！',
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'itemCode',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      isTable: false,
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      }
+    },
+    {
+      label: '单位',
+      field: 'uom',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '编码',
+      field: 'code',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+
+    {
+      label: '缺陷位置',
+      field: 'defectLocation',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false
+    },
+    {
+      label: '缺陷类型',
+      field: 'defectType',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      form: {
+        component: 'SelectV2'
+      }
+    },
+    {
+      label: '问题原因',
+      field: 'problemReason',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false
+    },
+    {
+      label: '优先级',
+      field: 'priority',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '负责用户',
+      field: 'responUser',
+      sort: 'custom',
+      isSearch: false
+    },
+    {
+      label: '金额',
+      field: 'amount',
+      sort: 'custom',
+      isTable: false,
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      }
+    },
+    {
+      label: '成本中心代码',
+      field: 'costCode',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchField: 'costcentreCode', // 查询弹窗赋值字段
+          searchTitle: '成本中心信息', // 查询弹窗标题
+          searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+          searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      }
+    },
+    {
+      label: '处理时间',
+      field: 'handleTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isTable: false,
+      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: 'desc',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: '150'
+      },
+      form: {
+        component: 'Input',
+        componentProps: {
+          type: 'textarea'
+        }
+      }
+    },
+    {
+      label: '是否可用',
+      field: 'available',
+      sort: 'custom',
+      isSearch: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
+    }
+  ])
+)

From 3def176f847f61efe670169c01e954414a14e576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Thu, 25 Jul 2024 11:14:13 +0800
Subject: [PATCH 06/10] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain/purchasereturnRequestMain.data.ts  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index be19306d8..861ff32fd 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -1398,7 +1398,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isForm: false,
     isTableForm:false,
-    isForm:false
   },
   // {
   //   label: '接口类型',

From a2611adbf620b85124300675d5538dd14b73fa80 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 25 Jul 2024 11:59:19 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relegate/relegateRequest/index.vue        |  5 +-
 .../relegateRequestMain.data.ts               | 92 +------------------
 2 files changed, 6 insertions(+), 91 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index f8c7fcf0d..88f2cd907 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -229,7 +229,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         // console.log(row['itemCode']);
         // ItembasicApi.getItemListByCodes(row['itemCode'])
         row['downItemCode'] = val[0]['code']
-      } else if (formField == 'toLocationCode') {
+      } else if(formField == 'packUnit'){
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      }else if (formField == 'toLocationCode') {
         row['toLocationCode'] = val[0]['code']
       } else {
         row[formField] = val[0][searchField]
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index 3999a2a75..9a16dab51 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -729,50 +729,6 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
  * @returns {Array} 物料变更申请子表创建标签
  */
 export const RelegateRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '生产线代码',
-    field: 'productionLineCodePackage',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      disabled: true
-      // isInpuFocusShow: true,
-      // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      // searchField: 'productionLineCode', // 查询弹窗赋值字段
-      // searchTitle: '生产线物料关系信息', // 查询弹窗标题
-      // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
-      // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
-      // searchCondition:[{
-      //   key: 'itemCode',
-      //   value: 'itemCode',
-      //   isMainValue: true
-      // }]
-    }
-  },
-  {
-    label: '供应商代码',
-    field: 'supplierItemCode',
-    sort: 'custom',
-    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: '物料代码',
     field: 'itemCode',
@@ -831,7 +787,7 @@ export const RelegateRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '批次',
-    field: 'batch',
+    field: 'fromBatch',
     sort: 'custom',
     table: {
       width: 150
@@ -861,45 +817,6 @@ export const RelegateRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '单据号',
     field: 'number',
@@ -987,10 +904,5 @@ export const RelegateRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>(
 
 //表单校验
 export const RelegateRequestDetailLabelRules = reactive({
-  supplierItemCode: [
-    { required: true, message: '请选择供应商', trigger: 'change' }
-  ],
-  productionLineCodePackage: [
-    { required: true, message: '请选择生产线', trigger: 'change' }
-  ]
+
 })
\ No newline at end of file

From 7423ed83af41082421644d1b1d5fbe004574b86b Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 25 Jul 2024 15:36:00 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E6=B3=A8=E6=84=8F=E4=BA=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |   1 +
 .../issue/issueRequestMain/index.vue          |  14 +-
 .../issueRequestMain/issueRequestMain.data.ts | 128 +++++++++++++++++-
 3 files changed, 137 insertions(+), 6 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 6c806f0d1..3a0483446 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -290,6 +290,7 @@ export enum DICT_TYPE {
   PL_MSTR_TYPE = 'pl_mstr_type', //产品类类型
   TT_GLTYPE = 'tt_gltype', //账户类型
   REPLY_STATUS = 'reply_status', //询证函回函状态
+  PRIORITY = 'priority', //优先级
 
   // ========== 业务 - mes ==========
   MESDO_STATUS = 'mes_do_status', // 工单执行状态
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index db8125f6d..00cc8063f 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -62,7 +62,16 @@
     @onEnter="onEnter"
     @onChange="onChange"
     @clearSearchInput="onChange"
-  />
+    :sumFormDataByTableCustom ="(formRef,formModel,tableData)=>{
+      tableData.forEach(item=>{
+        item.qty = item.qty1*item.packQty
+      })
+    }"
+  >
+  <template #default="{row}">
+    <el-input-number disabled v-model="row.qty"></el-input-number>
+  </template>
+  </BasicForm>
 
   <!-- 详情 -->
   <Detail
@@ -176,6 +185,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['uom'] = item['uom']
           tableData.value.push(newRow)
         })
+      }else if(formField == 'packUnit'){
+        row['packQty'] = val[0]['packQty']
+        row[formField] = val[0][searchField]
       } else {
         row[formField] = val[0][searchField]
       }
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 74e46ae6e..b02157b91 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -10,7 +10,8 @@ import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/worksta
 
 import * as WorkshopApi from '@/api/wms/workshop'
 import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
-
+import * as ItempackagingApi from '@/api/wms/itempackage'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
 
@@ -301,6 +302,21 @@ export const IssueRequestMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '优先级',
+      field: 'priority',
+      dictType: DICT_TYPE.PRIORITY,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Select'
+      }
+    },
     {
       label: '从库区类型范围',
       field: 'fromAreaTypes',
@@ -880,26 +896,124 @@ export const IssueRequestDetail = useCrudSchemas(
       isForm: false
     },
     {
-      label: '数量',
-      field: 'qty',
+      label: '包装规格',
+      field: 'packUnit',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        isInpuFocusShow: true,
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+          }]
+      }
+      // form: {
+      //   // labelMessage: '信息提示说明！！！',
+      //   componentProps: {
+      //     enterSearch:true,
+      //     isSearch:true,
+      //     isSearchList: true, // 开启查询弹窗
+      //     searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+      //     searchField: 'itemCode', // 查询弹窗赋值字段
+      //     searchTitle: '物料包装信息', // 查询弹窗标题
+      //     searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+      //     searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+      //     searchCondition: [{
+      //       key: 'available',
+      //       value: 'TRUE',
+      //       isMainValue: false
+      //     },{
+      //       key: 'itemCode',
+      //       value: 'itemCode',
+      //       message: '请填写物料代码！',
+      //       isMainValue: true
+      //       }],
+      //     verificationParams: [{
+      //       key: 'packUnit',
+      //       action: '==',
+      //       value: '',
+      //       isMainValue: false,
+      //       isSearch: true,
+      //       isFormModel: true,
+      //     }], // 失去焦点校验参数
+      //   }
+      // }
+    },
+    {
+      label: '标包数',
+      field: 'packQty',
       sort: 'custom',
       table: {
         width: 150
       },
       hiddenInMain: true,
       tableForm: {
+        disabled:true,
         type: 'InputNumber',
         min: 0,
-        precision: 6
+        precision: 0
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 0
+        }
+      }
+    },
+    {
+      label: '包装数',
+      field: 'qty1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      tableForm: {
+        type: 'InputNumber',
+        min: 1,
+        precision: 0
       },
       form: {
         component: 'InputNumber',
         componentProps: {
           min: 0,
-          precision: 6
+          precision: 0
         }
       }
     },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      tableForm: {
+        type: 'slot'
+      },
+      // form: {
+      //   component: 'InputNumber',
+      //   componentProps: {
+      //     min: 0,
+      //     precision: 6
+      //   }
+      // }
+    },
 
     {
       label: '计量单位',
@@ -1170,6 +1284,10 @@ export const IssueRequestDetailRules = reactive({
   toLocationCode: [
     { required: true, message: '请输入到库位代码', trigger: 'blur' }
   ],
+  qty1: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' },
+    { min: true, message: '包装数量不能小于1', trigger: 'blur' }
+  ],
   qty: [
     { required: true, message: '请输入数量', trigger: 'blur' }
   ],

From 988da7985787cc056af6afaa72269a60c7d1bc38 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 25 Jul 2024 15:46:17 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B3=A8=E6=84=8F?=
 =?UTF-8?q?=E4=BA=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImportForm/src/ImportForm.vue  | 20 +++++++++++++++++++
 src/locales/en-US.ts                          |  1 +
 src/locales/zh-CN.ts                          |  1 +
 .../purchasePlanMain/index.vue                | 12 +++++++++--
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue
index a4cb50c64..c69a2b4cd 100644
--- a/src/components/ImportForm/src/ImportForm.vue
+++ b/src/components/ImportForm/src/ImportForm.vue
@@ -34,6 +34,18 @@
       <div class="el-upload__text">{{t('ts.将文件拖到此处，或')}}<em>{{t('ts.点击上传')}}</em></div>
       <template #tip>
         <div class="el-upload__tip ml--126px mr--80px">
+          <div class="flex" v-if="announcements&&announcements.length>0">
+            <div
+              class="label h-32px ml-22px mr-26px color-#acaeb3 font-size-14px w-100px text-right mt-2px"
+              style="line-height: 32px;"
+              >{{t('ts.注意事项')}}</div
+            >
+            <div class="">
+              <div class="notice color-#acaeb3 font-size-14px text-red">
+                <div class="mt-2" v-for="item in announcements">{{ item }}</div>
+              </div>
+            </div>
+          </div>
           <div class="flex">
             <div
               class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right"
@@ -209,6 +221,11 @@ const props = defineProps({
     type: String,
     required: false,
     default: ''
+  },
+  announcements:{
+    type: Array,
+    required: false,
+    default: []
   }
 })
 const importTemplateData = ref(props.importTemplateData)
@@ -337,6 +354,9 @@ const importTemplate = () => {
 </script>
 
 <style scoped lang="scss">
+.text-red{
+  color: var(--el-color-danger);
+}
 .tips {
   div {
     position: relative;
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index a1a559616..42ca67aba 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -924,6 +924,7 @@ export default {
     地点:'Place',
     '影响明细中物料代码，需在供应商物料中维护':'The material code in the details is affected ， must be maintained in the supplier\'s material',
     是否外部资源:'External resource or not',
+    注意事项:'Announcements',
     导入模式:'Import Mode',
     请选择内容:'Please select content',
     请选择条件:'Please select condition',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 91d2a8a96..5a5be6409 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -924,6 +924,7 @@ export default {
     地点:'地点',
     '影响明细中物料代码，需在供应商物料中维护':'影响明细中物料代码，需在供应商物料中维护',
     是否外部资源:'是否外部资源',
+    注意事项:'注意事项',
     导入模式:'导入模式',
     请选择内容:'请选择内容',
     请选择条件:'请选择条件',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 5ee2fcbc5..7ed2bd95e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -97,7 +97,7 @@
 
   />
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData"
+  <ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData" :announcements = "announcements"
     @success="importSuccess" :updateIsDisable="false" :appendIsDisable="true" :coverIsDisable="true" :mode="1" :coverIsShow="false" :appendIsShow="false"/>
   <!-- 创建供应商发货申请 -->
   <supplierdeliverBasicForm ref="supplierdeliverFormRef" @getList="getList" ></supplierdeliverBasicForm>
@@ -117,6 +117,15 @@
   import * as PurchaseMainApi from '@/api/wms/purchaseMain'
   import { PurchaseMain } from '../purchaseMain/purchaseMain.data'
   import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+  const { wsCache } = useCache()
+  const language = wsCache.get('lang')
+  const announcements  = ref<any>([])
+  if('en-US'==language){
+    announcements.value = ["1. The total number of data items of the quantity of goods in the template does not exceed 1000 data (row × column).","2. All data content in the template is in text format, and formula content cannot be used as import data","3. The delivery date is in YYYY-MM-DD format, no hours, minutes and seconds are required"]
+
+  }else{
+    announcements.value = ["1. 模板中要货数量数据项总数不超过1000个数据（行×列）","2. 模板中全部数据内容格式为文本格式，不能使用公式内容作为导入数据","3. 要货日期为YYYY-MM-DD格式，不需填写时分秒"]
+  }
   // 要货计划
   defineOptions({ name: 'PurchasePlanMain' })
 
@@ -479,7 +488,6 @@ const getSearchTableData = async (number,formField,searchField)=>{
     }
   }
 // 获取部门 用于详情 部门回显
-const { wsCache } = useCache()
   /** 详情操作 */
   const detailRef = ref()
   const openDetail = (row : any, titleName : any, titleValue : any) => {

From d5419e34b112fb3303d3b7cc03e5d374c72b0e2b Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 25 Jul 2024 15:57:34 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=20=20=20HL-4331?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturnJobMain/customerreturnJobMain.data.ts          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
index 3ced1e795..52fef9371 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
@@ -101,7 +101,6 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable: false,
-    isSearch: true,
   },
   {
     label: '车牌号',