From b5762ad1f375cf16557f06c132e24481d226a76e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 18:36:43 +0800
Subject: [PATCH 01/11] =?UTF-8?q?SCP=20=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=20=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=97=B6=EF=BC=8C=E6=83=B3=E5=B0=91=E5=8F=91?=
 =?UTF-8?q?=E5=87=A0=E7=AE=B1=EF=BC=8C=E6=8A=8A=E7=AE=B1=E7=A7=BB=E5=87=BA?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=89=A9=E4=BD=99=E7=AE=B1?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=95=B0=E9=87=8F=E3=80=82=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/labelForm.vue   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 83247227f..ee81020ce 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -475,11 +475,11 @@ const blurOne = (oneRow, twoRow) => {
 }
 //在托下方的箱数量失去焦点
 const blurTwo = (oneRow, twoRow, threeRow) => {
-  if (parseFloat(threeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
-    message.warning('数量最多为' + oneRow.packQty)
-    threeRow.qtyTwo = oneRow.packQty
-    return
-  }
+  // if (parseFloat(threeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
+  //   message.warning('数量最多为' + oneRow.packQty)
+  //   threeRow.qtyTwo = oneRow.packQty
+  //   return
+  // }
   let num = 0
   twoRow.children.forEach((item) => {
     num += parseFloat(item.qtyTwo) || 0
@@ -488,10 +488,10 @@ const blurTwo = (oneRow, twoRow, threeRow) => {
 }
 // 箱数量失去焦点
 const blurThree = (oneRow, twoRow, thereeRow) => {
-  if (parseFloat(thereeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
-    message.warning('每箱个数最多' + oneRow.packQty)
-    thereeRow.qtyTwo = oneRow.packQty
-  }
+  // if (parseFloat(thereeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
+  //   message.warning('每箱个数最多' + oneRow.packQty)
+  //   thereeRow.qtyTwo = oneRow.packQty
+  // }
   let num = 0
   twoRow.children.forEach((item) => {
     num += parseFloat(item.qtyTwo) || 0

From b55f7457e8f1050c6e50ef8b4052b0904285eca5 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 18:40:13 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturnJobMain.data.ts           | 16 +++---
 .../productionreturnRecordMain.data.ts        | 56 +++++++++----------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
index 805da1f6f..4af5ac021 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
@@ -672,14 +672,14 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 120
-    },
-  },
+  // {
+  //   label: '包装规格',
+  //   field: 'packUnit',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 120
+  //   },
+  // },
   {
     label: '数量',
     field: 'qty',
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
index 0a86385ae..b2826ee28 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
@@ -15,18 +15,18 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isSearch: true
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isForm: false,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '状态',
+  //   field: 'status',
+  //   dictType: DICT_TYPE.REQUEST_STATUS,
+  //   dictClass: 'string',
+  //   isForm: false,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '车间代码',
     field: 'workshopCode',
@@ -504,23 +504,23 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     hiddenInMain: true,
   },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+  // {
+  //   label: '包装规格',
+  //   field: 'packUnit',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
 
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // },
+  // {
+  //   label: '包装数量',
+  //   field: 'packQty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '计量单位',
     field: 'uom',

From 2b6fecb79beddc05ac3616eedb9029aa54a0fad1 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 18:52:11 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E5=88=B6=E5=93=81=E6=8B=86=E8=A7=A3?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productdismantle/productdismantleRequestMain/index.vue   | 5 ++++-
 .../productreceiptscrapRequestMain/index.vue                 | 5 ++++-
 .../productreceiptscrapRequestMain.data.ts                   | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
index 8f9c31ca3..9cd07b365 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@@ -286,12 +286,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
             row['bomVersion'] = res.list[0].version
           }
         })
-      } else {
+      } else if(formField == 'productionLineCode'){
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow[formField] = item[searchField]
           tableData.value.push(newRow)
         })
+      }else{
+        row[formField] = val[0][searchField]
+
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index e9a80a163..c053bb4b0 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -220,7 +220,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
             row['bomVersion'] = res.list[0].version
           }
         })
-      }else{
+      }else if(formField == 'productionLineCode'){
         //添加明细
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
@@ -228,6 +228,9 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
           newRow[formField] = item[searchField]
           tableData.value.push(newRow)
         })
+      }else{
+        row[formField] = val[0][searchField]
+
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index 668c03dbc..95d6f73fa 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -523,8 +523,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm:{
+      disabled:true,
       multiple: true,
-      isInpuFocusShow: true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择生产线代码',
       searchField: 'code',
       searchTitle: '生产线信息',

From 8712223c6fee19e1bc8167e671f015982123969c Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 19:25:40 +0800
Subject: [PATCH 04/11] get

---
 src/api/wms/demandforecastingDetail/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index 059cc4ce2..e3303bbd1 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -115,6 +115,6 @@ export const getPageTableHead = async (params) => {
 
 
 // 查询版本号
-export const queryVersion = async (data) => {
-  return await request.post({ url: `/wms/demandforecasting-detail/queryVersion`, data })
+export const queryVersion = async (params) => {
+  return await request.get({ url: `/wms/demandforecasting-detail/queryVersion`, params })
 }
\ No newline at end of file

From d46613c38435a7aff35060a2778900368613cf4c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 19:39:44 +0800
Subject: [PATCH 05/11] =?UTF-8?q?SCP=20=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7=20=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=97=B6=20=E6=97=A2=E6=9C=89=E7=AE=B1?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=EF=BC=8C=E4=B9=9F=E6=9C=89=E6=89=98=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E3=80=82=E8=AE=A1=E7=AE=97=E7=BB=93=E6=9E=9C=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/labelForm.vue  | 58 +++++++++++--------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index ee81020ce..64ecf869f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -69,7 +69,7 @@
               <el-table-column label="托行号" width="100" prop="tPoNumber" align="center" />
               <el-table-column label="箱个数" width="100" prop="xNumber" align="center">
                 <template #default="scope1">
-                  <el-input v-model="scope1.row.xNumber" @blur="blurOne(scope.row, scope1.row)" />
+                  <el-input v-model="scope1.row.xNumber" @blur="blurOne(scope.row, scope1.row)" onkeyup="value=value.replace(/\D/g,'')" />
                 </template>
               </el-table-column>
               <el-table-column label="数量" width="100" prop="qtyOne" align="center" />
@@ -205,12 +205,22 @@ const intData =async () => {
 const expandChange = (row: any, expandedRows: any[]) => {
   // 判断托信息是否存在
   if (row.secondPackUnit && row.secondPackQty) {
-    // 数量除以托数量获取余数
-    row.lastNumber = parseFloat(row.qty) % parseFloat(row.secondPackQty)
+    // // 托数量/箱数量  一托可以放几箱
+    // row.otherNumber =Math.floor(parseFloat(row.secondPackQty) / parseFloat(row.packQty))
+    // // 数量除以托数量获取余数
+    // row.lastNumber = parseFloat(row.qty) % parseFloat(row.secondPackQty)
+    // // 数量%托数量  获取总共几托
+    // row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
+
+    // 总共需要多少箱
+    row.allXiangQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
     // 托数量/箱数量  一托可以放几箱
-    row.otherNumber = parseFloat(row.secondPackQty) / parseFloat(row.packQty)
-    // 数量%托数量  获取总共几托
-    row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
+    row.otherNumber =Math.floor(parseFloat(row.secondPackQty) / parseFloat(row.packQty))
+  // 数量%托数量  获取总共几托
+    row.allTuoQty = Math.ceil(parseFloat(row.allXiangQty) / parseFloat(row.otherNumber))
+  //  数量除以托数量获取余数
+    row.lastNumber = parseFloat(row.allXiangQty) % parseFloat(row.otherNumber)
+
     row.packageList = []
     // 循环托
     for (let i = 0; i < row.allTuoQty; i++) {
@@ -232,12 +242,12 @@ const expandChange = (row: any, expandedRows: any[]) => {
         } else {
           // 其他数据展示一托的全部箱数和全部数量
           row.packageList[i].xNumber = row.otherNumber
-          row.packageList[i].qtyOne = row.secondPackQty
+          row.packageList[i].qtyOne =  parseFloat(row.otherNumber) * parseFloat(row.packQty)
         }
       } else {
         // 如果沒有余数,直接展示一托的全部箱数和全部数量
         row.packageList[i].xNumber = row.otherNumber
-        row.packageList[i].qtyOne = row.secondPackQty
+        row.packageList[i].qtyOne = parseFloat(row.otherNumber) * parseFloat(row.packQty)
       }
     }
     // 判断箱信息是否存在
@@ -418,23 +428,23 @@ const blurOne = (oneRow, twoRow) => {
   if (!twoRow.xNumber) {
     twoRow.qtyOne = ''
   }
-  if (parseFloat(twoRow.xNumber) > parseFloat(oneRow.otherNumber)) {
-    message.warning('每托箱个数最多' + oneRow.otherNumber + '箱')
-    twoRow.xNumber = oneRow.otherNumber
-    twoRow.children = []
-    twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
-  }
+  // if (parseFloat(twoRow.xNumber) > parseFloat(oneRow.otherNumber)) {
+  //   message.warning('每托箱个数最多' + oneRow.otherNumber + '箱')
+  //   twoRow.xNumber = oneRow.otherNumber
+  //   twoRow.children = []
+  //   twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
+  // }
   twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
-  let num = 0
-  oneRow.packageList.forEach((item) => {
-    num += parseFloat(item.xNumber) || 0
-  })
-  if (num > oneRow.allPackQty) {
-    message.warning('总箱数不可以大于' + oneRow.allPackQty)
-    twoRow.xNumber = ''
-    twoRow.qtyOne = ''
-    return
-  }
+  // let num = 0
+  // oneRow.packageList.forEach((item) => {
+  //   num += parseFloat(item.xNumber) || 0
+  // })
+  // if (num > oneRow.allPackQty) {
+  //   message.warning('总箱数不可以大于' + oneRow.allPackQty)
+  //   twoRow.xNumber = ''
+  //   twoRow.qtyOne = ''
+  //   return
+  // }
   // 托信息修改的時候箱数据自动排列
   // 判断箱信息是否存在
   if (oneRow.packUnit && oneRow.packQty) {

From 1c6bcf66aa28f008cf323e822c00f072096fa386 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 08:50:00 +0800
Subject: [PATCH 06/11] workShopCode

---
 .../productreceiptJobMain/productreceiptJobMain.data.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index e388beb2f..268d5311d 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -38,7 +38,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '车间代码',
-    field: 'workshopCode',
+    field: 'workShopCode',
     sort: 'custom',
     table: {
       width: 150

From d4b6afefee8bb677737f10046116c22600832434 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 08:52:29 +0800
Subject: [PATCH 07/11] productionLineCode

---
 .../productreceiptAssembleJobMain.data.ts                      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
index b5ffc30ab..007f65edc 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
@@ -47,7 +47,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '生产线代码',
-    field: 'productionPlanNumber',
+    field: 'productionLineCode',
     sort: 'custom',
     table: {
       width: 150
@@ -626,6 +626,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '工位代码',

From d6a086d93e3b12db3df71f1e870675c166c26395 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 08:53:22 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptscrapJobMain.data.ts                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
index 1c13b442b..08a551d97 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
@@ -38,7 +38,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '车间代码',
-    field: 'workshopCode',
+    field: 'workShopCode',
     sort: 'custom',
     table: {
       width: 150

From 81244ff04cc78658cb3782b18a5aaba2020d9404 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 08:56:12 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptAssembleRecordMain.data.ts                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
index f447fd858..3d838cd3d 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
@@ -728,7 +728,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false ,
     table: {
-      width: 150,
+      width: 220,
       fixed: 'right'
     },
     hiddenInMain: false,

From cd891b1fe8f30202263793978e63e49842460ac9 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 12 Jul 2024 10:20:06 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/labelForm.vue  | 222 +++++++++++-------
 1 file changed, 136 insertions(+), 86 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 64ecf869f..2e2eff60e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -12,7 +12,7 @@
         <template #default="scope">
           <div
             style="margin-left: 400px; margin-top: -8px; margin-bottom: -8px"
-            v-if="scope.row.secondPackUnit && scope.row.secondPackQty"
+            v-if="scope.row.packUnit && scope.row.packQty && scope.row.secondPackUnit && scope.row.secondPackQty"
           >
             <el-table
               :data="scope.row.packageList"
@@ -25,7 +25,11 @@
                 <template #default="scope1">
                   <div style="margin-left: 150px; margin-top: -8px; margin-bottom: -8px">
                     <el-table :data="scope1.row.children" border style="width: 300px" row-key="id">
-                      <el-table-column label="箱行号" width="100" prop="xPoNumber" align="center" />
+                      <el-table-column label="箱行号" width="100" prop="xPoNumber" align="center">
+                        <template #default="scope2">
+                          {{ scope2.$index + 1 }}
+                        </template>
+                      </el-table-column>
                       <el-table-column label="数量" width="100" prop="qtyTwo" align="center">
                         <template #default="scope2">
                           <el-input
@@ -66,10 +70,18 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="托行号" width="100" prop="tPoNumber" align="center" />
+              <el-table-column label="托行号" width="100" prop="tPoNumber" align="center">
+                <template #default="scope">
+                  {{ scope.$index + 1 }}
+                </template>
+              </el-table-column>
               <el-table-column label="箱个数" width="100" prop="xNumber" align="center">
                 <template #default="scope1">
-                  <el-input v-model="scope1.row.xNumber" @blur="blurOne(scope.row, scope1.row)" onkeyup="value=value.replace(/\D/g,'')" />
+                  <el-input
+                    v-model="scope1.row.xNumber"
+                    @blur="blurOne(scope.row, scope1.row)"
+                    onkeyup="value=value.replace(/\D/g,'')"
+                  />
                 </template>
               </el-table-column>
               <el-table-column label="数量" width="100" prop="qtyOne" align="center" />
@@ -90,10 +102,13 @@
               </el-table-column>
             </el-table>
           </div>
-          <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px" v-else>
+          <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px"  v-if="scope.row.packUnit && scope.row.packQty && !scope.row.secondPackUnit">
             <div v-for="(item, index) in scope.row.packageList" :key="index">
               <el-table :data="item.children" border style="width: 300px" row-key="id">
-                <el-table-column label="箱行号" width="100" prop="xPoNumber" align="center" />
+                <el-table-column label="箱行号" width="100" prop="xPoNumber" align="center" >    <template #default="scope1">
+                          {{ scope1.$index + 1 }}
+                        </template>
+                      </el-table-column>
                 <el-table-column label="数量" width="100" prop="qtyOne" align="center">
                   <template #default="scope1">
                     <el-input
@@ -171,7 +186,7 @@ const tableData = ref([])
 const isLoading = ref(false)
 const oneId = ref(0) //每托的id
 const twoId = ref(0) //每箱的id
-const openLabel =async (tableList) => {
+const openLabel = async (tableList) => {
   dialogTableVisible.value = true
   tableData.value = tableList
   defaultExpandAll.value = false
@@ -188,51 +203,47 @@ const showTableData = () => {
   } else {
     return tableData.value
   }
-  
 }
-const intData =async () => {
+const intData = async () => {
   tableData.value.forEach((row) => {
-    if (row.secondPackUnit && row.secondPackQty) {
-      // 数量%托数量  获取总共几托
-      row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
-    } else {
-      // 数量%每箱数量  获取总共几箱
-      row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
-    }
-   expandChange(row)
+    expandChange(row)
   })
 }
 const expandChange = (row: any, expandedRows: any[]) => {
-  // 判断托信息是否存在
-  if (row.secondPackUnit && row.secondPackQty) {
-    // // 托数量/箱数量  一托可以放几箱
-    // row.otherNumber =Math.floor(parseFloat(row.secondPackQty) / parseFloat(row.packQty))
-    // // 数量除以托数量获取余数
-    // row.lastNumber = parseFloat(row.qty) % parseFloat(row.secondPackQty)
-    // // 数量%托数量  获取总共几托
-    // row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
-
+ 
+  // 判断托信息和箱信息是否都存在
+  if (row.secondPackUnit && row.secondPackQty&&row.packUnit && row.packQty) {
     // 总共需要多少箱
     row.allXiangQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+    // 放满的多少箱
+    row.manXiangQty = Math.floor(parseFloat(row.qty) / parseFloat(row.packQty))
     // 托数量/箱数量  一托可以放几箱
-    row.otherNumber =Math.floor(parseFloat(row.secondPackQty) / parseFloat(row.packQty))
-  // 数量%托数量  获取总共几托
+    row.otherNumber = Math.floor(parseFloat(row.secondPackQty) / parseFloat(row.packQty))
+    // 数量%托数量  获取总共几托
     row.allTuoQty = Math.ceil(parseFloat(row.allXiangQty) / parseFloat(row.otherNumber))
-  //  数量除以托数量获取余数
-    row.lastNumber = parseFloat(row.allXiangQty) % parseFloat(row.otherNumber)
-
-    row.packageList = []
+    // 放满的托数量
+    row.manTuoQty = Math.floor(parseFloat(row.manXiangQty) / parseFloat(row.otherNumber))
+    // 放满的托数量*一托的箱数量*一箱的数量  获取放满的托一共多少数量
+    row.tuoInManNumber =
+      parseFloat(row.manTuoQty) * parseFloat(row.otherNumber) * parseFloat(row.packQty)
+    // 数量除以托数量获取余数
+    row.lastNumber =
+      parseFloat(row.qty) > parseFloat(row.tuoInManNumber)
+        ? parseFloat(row.qty) - parseFloat(row.tuoInManNumber)
+        : parseFloat(row.qty)
     // 循环托
+    row.packageList =[]
     for (let i = 0; i < row.allTuoQty; i++) {
       oneId.value++
       // 先给所有托一个默认对象值
       row.packageList[i] = {
         id: oneId.value,
-        tPoNumber: i + 1,
+        // tPoNumber: i + 1,
         xNumber: '',
         qtyOne: '',
         isTuo: 1 //有托
       }
+
       // 如果有余数
       if (row.lastNumber) {
         // 最后一条信息直接展示余数的信息
@@ -242,7 +253,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
         } else {
           // 其他数据展示一托的全部箱数和全部数量
           row.packageList[i].xNumber = row.otherNumber
-          row.packageList[i].qtyOne =  parseFloat(row.otherNumber) * parseFloat(row.packQty)
+          row.packageList[i].qtyOne = parseFloat(row.otherNumber) * parseFloat(row.packQty)
         }
       } else {
         // 如果沒有余数,直接展示一托的全部箱数和全部数量
@@ -261,7 +272,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
           twoId.value++
           cur.children[j] = {
             id: twoId.value,
-            xPoNumber: j + 1
+            // xPoNumber: j + 1
           }
           // 如果有余数
           if (cur.xLastNumber) {
@@ -279,18 +290,21 @@ const expandChange = (row: any, expandedRows: any[]) => {
         }
       })
     }
-  } else {
+  }
+  // 只有箱规格
+  if(!row.secondPackUnit && row.packUnit && row.packQty){
     // 数量%每箱数量  获取总共几箱
     row.allXiangQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
     row.packageList = []
-    row.allTuoQty = 1
+    row.allTuoQty = ''
+    row.allTuoQty1 = 1
     // 循环箱
-    for (let i = 0; i < row.allTuoQty; i++) {
+    for (let i = 0; i < row.allTuoQty1; i++) {
       oneId.value++
       // 先给所有托一个默认对象值
       row.packageList[i] = {
         id: oneId.value,
-        xPoNumber: i + 1,
+        // xPoNumber: i + 1,
         qtyOne: row.qty,
         isTuo: 0 //无托
       }
@@ -301,7 +315,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
         twoId.value++
         cur.children[j] = {
           id: twoId.value,
-          xPoNumber: j + 1
+          // xPoNumber: j + 1
         }
         // 数量除以箱数量获取余数
         cur.lastNumber = parseFloat(row.qty) % parseFloat(row.packQty)
@@ -343,33 +357,59 @@ const buttonBaseClick = (val) => {
 }
 // 保存
 const submitForm = () => {
-  let arr = tableData.value.map((item) => {
-    item.allNumber = 0
-    // 判断托信息是否存在
-    item.packageList.forEach((cur) => {
-      item.allNumber += parseFloat(cur.qtyOne) || 0
+  let isZ = false
+  console.log(tableData.value)
+  setTimeout(() => {
+    tableData.value.forEach((item) => {
+      item.packageList.forEach((cur, key) => {
+        cur.tPoNumber = key + 1
+        if (cur.qtyOne == '' || cur.qtyOne == 0) {
+          isZ = true
+        }
+        cur?.children?.forEach((ele,i) => {
+          ele.xPoNumber = i+1
+          if (ele.qtyTwo == '' || ele.qtyTwo == 0) {
+            isZ = true
+          }
+        })
+      })
     })
-    if (item.allNumber == parseFloat(item.qty)) {
-      return true
-    } else {
-      return false
+    if (isZ) {
+      message.warning('有数量为0或空，请重新填写')
+      return
     }
-  })
-  const isBol = arr.some((item) => item == false)
-  if (isBol) {
-    message.warning('当前添加的数量与总数量不一致')
-    return
-  }
-  emit('submitForm', tableData.value)
+    let obj = tableData.value.find((item) => {
+      item.allNumber = 0
+      item.packageList.forEach((cur) => {
+        item.allNumber += parseFloat(cur.qtyOne) || 0
+      })
+      return item.allNumber != parseFloat(item.qty)
+    })
+    console.log(222, obj)
+    // return
+    // const isBol = arr.some((item) => item == false)
+    if (obj) {
+      message.warning(
+        `物料[${obj.itemCode}],批次[${obj.batch}],${obj.packageList.length}的总和数量${obj.allNumber}不等于发货总数量${obj.qty}`
+      )
+      return
+    }
+    emit('submitForm', tableData.value)
+  }, 300)
 }
 // 添加托
 const addT = (oneRow) => {
   oneId.value++
   oneRow.packageList.push({
     id: oneId.value,
-    tPoNumber: oneRow?.packageList?.length>0?oneRow.packageList[oneRow.packageList.length - 1]?.tPoNumber  + 1 :1, //行号是上一行的行号加1
+    // tPoNumber:oneRow.packageList.length+1 || 1,
+    // tPoNumber:
+    //   oneRow?.packageList?.length > 0
+    //     ? oneRow.packageList[oneRow.packageList.length - 1]?.tPoNumber + 1
+    //     : 1, //行号是上一行的行号加1
     xNumber: '',
-    qtyOne: ''
+    qtyOne: '',
+    isTuo: 1 //有托
   })
   oneRow.allTuoQty = oneRow.packageList.length
 }
@@ -386,16 +426,26 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
     // 在托下添加箱
     twoRow.children.push({
       id: twoId.value,
-      xPoNumber: twoRow?.children?.length>0? twoRow?.children[twoRow.children.length - 1]?.xPoNumber + 1 :1,
-      qtyOne: ''
+      // xPoNumber:
+      //   twoRow?.children?.length > 0
+      //     ? twoRow?.children[twoRow.children.length - 1]?.xPoNumber + 1
+      //     : 1,
+      qtyTwo: oneRow.packQty
     })
     twoRow.xNumber = twoRow.children.length
+     let num = 0
+    twoRow.children.forEach((item) => {
+      num += parseFloat(item.qtyTwo) || 0
+    })
+    twoRow.qtyOne = num
   } else {
     // 直接添加箱
+    oneRow.isTuo= 1 //无托
     twoRow.children.push({
       id: twoId.value,
-      xPoNumber:twoRow.children.length>0? twoRow.children[twoRow.children.length - 1].xPoNumber + 1:1,
-      qtyTwo: ''
+      // xPoNumber:
+      //   twoRow.children.length > 0 ? twoRow.children[twoRow.children.length - 1].xPoNumber + 1 : 1,
+      // qtyTwo: oneRow.packQty
     })
     oneRow.allTuoQty = twoRow.children.length
   }
@@ -449,37 +499,37 @@ const blurOne = (oneRow, twoRow) => {
   // 判断箱信息是否存在
   if (oneRow.packUnit && oneRow.packQty) {
     // oneRow.packageList.forEach((cur, key) => {
-      twoRow.children = []
-      // 数量除以托数量获取余数
-      twoRow.xLastNumber = parseFloat(twoRow.xNumber) % parseFloat(oneRow.packQty)
-      for (let j = 0; j < twoRow.xNumber; j++) {
-        twoId.value++
-        // 如果有余数
-        if (twoRow.xLastNumber) {
-          // 最后一条信息直接展示余数的信息
-          if (j == twoRow.xNumbery - 1) {
-            twoRow.children.push({
-              id: twoId.value,
-              xPoNumber: j + 1,
-              qtyTwo: twoRow.xLastNumber
-            })
-          } else {
-            // 其他数据展示一托的全部箱数和全部数量
-            twoRow.children.push({
-              id: twoId.value,
-              xPoNumber: j + 1,
-              qtyTwo: oneRow.packQty
-            })
-          }
+    twoRow.children = []
+    // 数量除以托数量获取余数
+    twoRow.xLastNumber = parseFloat(twoRow.xNumber) % parseFloat(oneRow.packQty)
+    for (let j = 0; j < twoRow.xNumber; j++) {
+      twoId.value++
+      // 如果有余数
+      if (twoRow.xLastNumber) {
+        // 最后一条信息直接展示余数的信息
+        if (j == twoRow.xNumbery - 1) {
+          twoRow.children.push({
+            id: twoId.value,
+            // xPoNumber: j + 1,
+            qtyTwo: twoRow.xLastNumber
+          })
         } else {
-          // 如果沒有余数,直接展示一托的全部箱数和全部数量
+          // 其他数据展示一托的全部箱数和全部数量
           twoRow.children.push({
             id: twoId.value,
-            xPoNumber: j + 1,
+            // xPoNumber: j + 1,
             qtyTwo: oneRow.packQty
           })
         }
+      } else {
+        // 如果沒有余数,直接展示一托的全部箱数和全部数量
+        twoRow.children.push({
+          id: twoId.value,
+          // xPoNumber: j + 1,
+          qtyTwo: oneRow.packQty
+        })
       }
+    }
     // })
   }
 }

From bd682e3b812ebb88ebf4d94de7fad561a38b566e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 10:23:54 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E4=BB=B7=E5=B7=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.vue                                 |  325 ++++
 .../supplierinvoiceRecordMain.data.ts         | 1557 +++++++++++++++++
 2 files changed, 1882 insertions(+)
 create mode 100644 src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/index.vue
 create mode 100644 src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/index.vue
new file mode 100644
index 000000000..2e12c467d
--- /dev/null
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/index.vue
@@ -0,0 +1,325 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SupplierinvoiceRecordMain.allSchemas.searchSchema" @search="searchList" @reset="searchList" >
+      <template #cha>
+        <div style="display:flex;flex-direction: row">
+          <el-input-number />
+          <span>{{' 到 '}}</span>
+          <el-input-number />
+        </div>
+
+      </template>
+    </Search>
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SupplierinvoiceRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table ref="tableRef"
+    :selection="true" 
+    v-clientTable
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+      @getSelectionRows="getSelectionRows"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, t('ts.单据号'), row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #differencePrice="{row}">
+        <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="SupplierinvoiceRecordMainRules"
+    :formAllSchemas="SupplierinvoiceRecordMain.allSchemas"
+    :tableAllSchemas="SupplierinvoiceRecordDetail.allSchemas"
+    :tableFormRules="SupplierinvoiceRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :annexTable="[{
+      label: t('ts.合同附件'),
+      prop: 'Annex',
+      tableName:'contract',
+      showDownload:true,
+      hiddenDelete:true,
+      queryParams:[{
+        queryField:'tableId',
+        rowField:'annexMasterId',
+      }],
+    },{
+      label: t('ts.发票附件'),
+      prop: 'Annex',
+      tableName:'invoice',
+      showDownload:true,
+      hiddenDelete:true,
+      queryParams:[{
+        queryField:'tableId',
+        rowField:'annexMasterId',
+      }],
+    },{
+      label: t('ts.货运单附件'),
+      prop: 'Annex',
+      tableName:'waybill',
+      showDownload:true,
+      hiddenDelete:true,
+      queryParams:[{
+        queryField:'tableId',
+        rowField:'annexMasterId',
+      }],
+    },{
+      label: t('ts.其他附件'),
+      prop: 'Annex',
+      tableName:'invoiceOther',
+      showDownload:true,
+      hiddenDelete:true,
+      queryParams:[{
+        queryField:'tableId',
+        rowField:'annexMasterId',
+      }],
+    }]"
+    :annexAlias="{
+      hidden:true,
+      label:t('ts.其他附件'),
+      showDownload:true,
+      hiddenDelete:true
+    }"
+    :isBasic="false"
+    direction="horizontal"
+    :column="3"
+    :allSchemas="SupplierinvoiceRecordDetailMain.allSchemas"
+    :detailAllSchemas="SupplierinvoiceRecordDetail.allSchemas"
+    :detailAllSchemasRules="SupplierinvoiceRecordDetailRules"
+    :apiPage="SupplierinvoiceRecordDetailApi.getSupplierinvoiceRecordDeatilPage"
+  >
+    <template #differencePrice="{row}">
+      <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
+    </template>
+  </Detail>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SupplierinvoiceRecordMain,SupplierinvoiceRecordMainRules,SupplierinvoiceRecordDetail,SupplierinvoiceRecordDetailRules,SupplierinvoiceRecordDetailMain } from './supplierinvoiceRecordMain.data'
+import * as SupplierinvoiceRecordMainApi from '@/api/wms/supplierinvoiceRecordMain'
+import * as SupplierinvoiceRecordDetailApi from '@/api/wms/supplierinvoiceRecordDeatil'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
+import * as PackageApi from "@/api/wms/package";
+import {getAccessToken} from "@/utils/auth";
+import {getJmreportBaseUrl} from "@/utils/systemParam";
+
+// 供应商发票记录主
+defineOptions({ name: 'SupplierinvoiceRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SupplierinvoiceRecordMain.allSchemas.tableColumns)
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierinvoiceRecordMainApi.getSupplierinvoiceRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), // 导出
+  defaultButtons.mainLisSelectiontPointBtn(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 == 'export') { // 导出
+    handleExport()
+  }else if (val=='selection_point'){// 批量打印
+    handleSelectionPoint()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  }else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+const BASE_URL = getJmreportBaseUrl()
+const srcPoint = ref(BASE_URL + '/jmreport/view/970966724605804544?token=' + getAccessToken())
+const handleSelectionPoint = async ()=>{
+  let rows:any = []
+  selectionRows.value.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
+  })
+  if(rows.length==0){
+    message.warning('至少选择一条数据！')
+    return
+  }
+  console.log('批量打印',rows.join(','))
+  window.open(srcPoint.value+'&ids='+rows.join(','))
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+  return [
+  {
+        label: t('ts.查看明细'),
+        name: 'open_detail',
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      }
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'open_detail') { // 查看明细
+      openDetail(row, '单据号', row.number)
+    }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = async (row: any, titleName: any, titleValue: any) => {
+  console.log('openDetail',row)
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  //获取申请中的masterId
+  const { tableObject: requestTableObject, tableMethods:requestTableMethods } = useTable({
+    getListApi: SupplierinvoiceRequestDetailApi.getSupplierinvoiceRequestDetailPage // 分页接口
+  })
+  const { getList:requestGetList } = requestTableMethods
+  requestTableObject.params.number = row.requestNumber
+  await requestGetList()
+  if(requestTableObject.tableList.length>0){
+    row.annexMasterId = requestTableObject.tableList[0].masterId
+  }
+
+
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+const searchList = (model)=>{
+  if(model.postingDate&&model.postingDate.length>1){
+    model.postingDate[1] = model.postingDate[1].replace('00:00:00','23:59:59')
+  }
+  selectionRows.value = []
+  setSearchParams(model)
+}
+const selectionRows = ref<any>([])
+const tableRef = ref()
+const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+  console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+  const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+  if(currentRows){
+    currentRows.selectionRows = currentPageSelectionRows
+  }else{
+    selectionRows.value.push({
+      currentPage,
+      selectionRows:currentPageSelectionRows
+    })
+  }
+}
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  let rows:any = []
+  selectionRows.value.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
+  })
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SupplierinvoiceRecordMainApi.exportSupplierinvoiceRecordMain({...tableObject.params,checkNums:rows})
+    download.excel(data, `${t('ts.供应商发票记录主')}.xlsx`)
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
+<style lang="scss" scoped>
+.is-red{
+  border-radius:var(--el-border-radius-base);
+  border:1px solid var(--el-color-danger);
+  box-shadow: 0 0 0 1px var(--el-color-danger) inset;
+}
+.red-text{
+  color:var(--el-color-danger);
+  font-weight:700;
+}
+</style>
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts
new file mode 100644
index 000000000..d8edcb341
--- /dev/null
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts
@@ -0,0 +1,1557 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { accountantFormart } from '@/utils/formatter'
+
+/**
+ * @returns {Array} 供应商发票记录主表
+ */
+export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field:'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: false
+  },
+  {
+    label: '发票申请单号',
+    field:'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    sortSearchDefault:1,
+    sortTableDefault:1,
+    isSearch: true
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
+    isSearch: true
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    table: {
+      width: 180,
+    },
+    sortTableDefault:2,
+    isForm: false,
+    isSearch: true
+  },
+  {
+    label: '税率',
+    field: 'taxRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  
+  
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sortTableDefault:7,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  
+  // {
+  //   label: '申请单号',
+  //   field: 'requestNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180,
+  //   },
+  //   isTable: false,
+  //   isSearch: true
+  // },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '金税票号',//金税票号
+    field: 'goldenTaxInvoiceNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    isSearch: true
+  },
+  {
+    label: '未税差额',
+    field: 'beforeTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '税额差异',
+    field: 'taxAmountDiff',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '价税合计差额',
+    field: 'totalTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false
+  },
+  
+  {
+    label: '系统税额',
+    field: 'taxAmount',
+    formatter: accountantFormart,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '未税金额',
+    field: 'beforeTaxAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '税额',
+    field: 'totalTaxAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '价税合计金额',
+    field: 'adTaxAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '是否有价差',
+    field: 'balanceStatementStatus',
+    dictType: DICT_TYPE.INVOICE_BALANCE_STATEMENT_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm:false,
+    isSearch:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+  },
+  {
+    label: '价差说明',
+    field: 'balanceStatement',
+    isTable: false,
+    isForm:false,
+    isSearch:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
+  {
+    label: '系统价税合计',//税后金额
+    field: 'afterTaxAmount',
+    formatter: accountantFormart,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  
+  {
+    label: '价差',//总差额
+    field: 'totalDifference',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    }
+  },
+
+  {
+    label: '系统未税金额',
+    field: 'amount',
+    formatter: accountantFormart,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+
+
+
+  {
+    label: '索赔金额',
+    field: 'claimAmount',
+    formatter: accountantFormart,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '调整价差',
+    field: 'discountAmount',
+    formatter: accountantFormart,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isDetail:false,
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '调整税额',
+    field: 'adjustingTaxAmount',
+    formatter: accountantFormart,
+    sort: 'custom',
+    isDetail:false,
+    table: {
+      width: 150
+    },
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+
+  {
+    label: '未税差额',
+    field: 'untaxedDifference',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    isTable: false,
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    }
+  },
+  {
+    label: '含税差额',
+    field: 'taxInclusiveDifference',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    }
+  },
+  {
+    label: '快递单号',
+    field: 'expressTrackingNumber',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+    isSearch:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '开票日期',
+    field: 'invoiceTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
+    sortTableDefault:4,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  // {
+  //   label: '采购审批人',
+  //   field: 'procurementCreatorName',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTable:true,
+  //   isDetail: true,
+  //   isTableForm: false,
+  //   isForm:false,
+  //   isSearch:false,
+  //   sortTableDefault:10
+  // },
+  {
+    label: '过账日期',
+    field: 'postingDate',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
+    isTable: true,
+    sortTableDefault:6,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    search: {
+      value:[],
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
+  },
+  {
+    label: '创建日期',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
+    isTable: true,
+    sortTableDefault:6,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    search: {
+      value:[],
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
+  },
+  //子表数据，仅是查询条件
+  {
+    label: '货运单号',
+    field: 'asnBillNum',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm:false,
+    isTable:false,
+    isDetail:false,
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '差价范围',
+    field: 'cha',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm:false,
+    isTable:false,
+    isDetail:false,
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '财务凭证号',
+    field: 'voucherNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+    },
+    isTable:true,
+    sortTableDefault:6,
+    isForm: false
+  },
+  {
+    label: '业务类型',
+    field:'businessType',
+    sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    isDetail:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    isDetail:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    isTable:false,
+    isTableForm:false,
+    isDetail:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    isTable:false,
+    isTableForm:false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    isTable:false,
+    isTableForm:false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    isTable:false,
+    isTableForm:false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    isTable:false,
+    isTableForm:false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    isTable:false,
+    isTableForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '代码',
+    field: 'code',
+    isTable:false,
+    isTableForm:false,
+    isDetail:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable:false,
+    isDetail:false,
+    isTableForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    isTable:false,
+    isTableForm:false,
+    dictClass: 'string',
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    sortTableDefault:1000,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: false,
+    sortTableDefault:1001,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '采购审批人',
+    field: 'procurementCreatorName',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable:true,
+    isDetail: true,
+    isTableForm: false,
+    isForm:false,
+    isSearch:false,
+    sortTableDefault:10
+  },
+  // {
+  //   label: '采购审批人代码',
+  //   field: 'procurementCreator',
+  //   sortTableDefault:1002,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  {
+    label: '采购审批时间',
+    field: 'procurementCreateTime',
+    sortTableDefault:11,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '财务审批人',
+    field: 'financialCreatorName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:12,
+    isForm: false,
+  },
+  {
+    label: '财务审批时间',
+    field: 'financialCreateTime',
+    sortTableDefault:13,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  // {
+  //   label: '采购驳回原因',
+  //   field: 'purchaseRejectCause',
+  //   table: {
+  //     width: 180
+  //   },
+  //   sortTableDefault:14,
+  //   isTable: true,
+  //   isSearch: false,
+  //   isForm: false,
+  //   isDetail:false,
+  // },
+  // {
+  //   label: '财务驳回原因',
+  //   field: 'financeRejectCause',
+  //   table: {
+  //     width: 180
+  //   },
+  //   sortTableDefault:15,
+  //   isTable: true,
+  //   isSearch: false,
+  //   isForm: false,
+  //   isDetail:false,
+  // },
+  {
+    label: '供应商审批人',
+    field: 'supplierCreatorName',
+    sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '供应商审批时间',
+    field: 'supplierCreateTime',
+    isTable:false,
+    isTableForm:false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '凭证描述',
+    field: 'voucherNumberRemark',
+    isTable:true,
+    isTableForm:false,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+  }
+]))
+/**
+ * @returns {Array} 供应商发票在详情展示的主表字段
+ */
+export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '汇总信息',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商信息',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+  {
+    label: 'SCP系统数据',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统价税合计',
+    field: 'afterTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务凭证号',
+    field: 'voucherNumber',
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统未税金额',
+    field: 'amount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商创建日期',
+    field: 'supplierDate',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '订单类型',
+    field: 'orderType',
+    dictType: DICT_TYPE.PURCHASE_INVOICE_ORDER_TYPE,
+    dictClass: 'string',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统税额',
+    field: 'taxAmount',
+    formatter: accountantFormart,
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '发票号码',
+    field: 'goldenTaxInvoiceNumber',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '采购价格审批人',
+    field: 'procurementCreator',
+    sortTableDefault: 1003,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '开票日期',
+    field: 'invoiceTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '采购价格审批时间',
+    field: 'procurementCreateTime',
+    sortTableDefault: 1003,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '税率(%)',
+    field: 'taxRate',
+    dictType: DICT_TYPE.TAX_RATE_DICT,
+    dictClass: 'string',
+    sortTableDefault: 3,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价差通过说明',
+    field: 'balanceStatement',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价税合计',
+    field: 'adTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+
+  {
+    label: '财务审批人',
+    field: 'financialCreatorName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '未税金额',
+    field: 'beforeTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '差额',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务审批时间',
+    field: 'financialCreateTime',
+    formatter: dateFormatter,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '税额',
+    field: 'totalTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价税合计差额(价税合计-系统价税合计)',
+    field: 'totalTaxDiffAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务过账日期',
+    field: 'postingDate',
+    isTable: true,
+    sortTableDefault: 15,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+   
+  },
+  {
+    label: '折扣金额',
+    field: 'discountAmount1',
+    formatter: accountantFormart,
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '未税差额(未税金额-系统未税金额)',
+    field: 'beforeTaxDiffAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+    detail:{
+      span:2
+    }
+  },
+  {
+    label: '税额差异（税额-系统税额）',
+    field: 'taxAmountDiff',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+]))
+//表单校验
+export const SupplierinvoiceRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'blur' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 供应商发票记录子表
+ */
+export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '项目编号',
+    field: 'projectCode',
+    isTable:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '采购收货记录单号',
+    field: 'qadNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '单据类型',
+    field: 'billType',
+    dictType: DICT_TYPE.BILL_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:7,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '待开票单据号',
+    field: 'recvBillNum',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    hiddenInMain:true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商发货单号',
+    field: 'asnBillNum',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:8,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    sortTableDefault:3,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述',
+    field: 'itemDesc',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '到货时间',
+    field: 'planArriveTime',
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter2,
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '到货数量',
+    field: 'arrivalQty',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货币',
+    field: 'currency',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '合同价格',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '采购价格',
+    field: 'purchasePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '差额',
+    field: 'differencePrice',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      type: 'slot',
+      disabled: true
+    }
+  },
+  {
+    label: '未税差额',
+    field: 'untaxedDifference',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    }
+  },
+  {
+    label: '含税差额',
+    field: 'taxInclusiveDifference',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    }
+  },
+  {
+    label: '收货日期',
+    field: 'deliveryDate',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '开票数量',
+    field: 'invoicableQuantity',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '财务凭证号',
+    field: 'voucherNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const SupplierinvoiceRecordDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请输入包装号', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  poNumber: [
+    { required: true, message: '请输入订单号', trigger: 'blur' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请输入包装规格', trigger: 'blur' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})