From 3914b5ffac1d66ae0f26052631d8dd55f73ec966 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 08:50:37 +0800
Subject: [PATCH 01/51] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/balance/index.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
index fbca93edf..0aa246832 100644
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@@ -193,4 +193,8 @@ export const getBalanceByBusinessTypeByItemType = async (params) => {
 // 根据code获取数据列表
 export const getBalanceItemListByCodes = async (data) => {
     return await request.get({ url: `/wms/balance/listByCodes`,data })
-  }
\ No newline at end of file
+}
+// 查询bom批次默认数据
+export const getBanchBomPage = async (params) => {
+  return await request.get({ url: `/wms/balance/pageBOM`, params })
+}
\ No newline at end of file

From 0d80d6f5748ca9fe6b5131db3f1fa07730902465 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 09:26:16 +0800
Subject: [PATCH 02/51] =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/labelForm.vue  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index aca148dcb..7ff4af19c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -168,6 +168,7 @@
 </template>
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as accuracyFun from "@/utils/calculate"
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -381,7 +382,8 @@ const submitForm = () => {
     let obj = tableData.value.find((item) => {
       item.allNumber = 0
       item.packageList.forEach((cur) => {
-        item.allNumber += parseFloat(cur.qtyOne) || 0
+        item.allNumber = accuracyFun.add(item.allNumber , parseFloat(cur.qtyOne)?parseFloat(cur.qtyOne):0)
+        // item.allNumber += parseFloat(cur.qtyOne) || 0
       })
       return item.allNumber != parseFloat(item.qty)
     })

From 1c8c6217673ba4f4f3e3c8dde7cb053deb2ba868 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 09:33:48 +0800
Subject: [PATCH 03/51] =?UTF-8?q?=E7=B2=BE=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/calculate.ts | 105 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 src/utils/calculate.ts

diff --git a/src/utils/calculate.ts b/src/utils/calculate.ts
new file mode 100644
index 000000000..372378039
--- /dev/null
+++ b/src/utils/calculate.ts
@@ -0,0 +1,105 @@
+
+  // 判断传入的值-是否为整数
+  function isInteger(obj) {
+    return Math.floor(obj) === obj
+  }
+
+  // 将一个浮点数转成整数，返回整数和倍数。如 3.14 >> 314，倍数是 100
+  // @param floatNum { number } 小数
+  // @return { object }
+  // { times: 100, num: 314 }
+
+  // 用于返回整数和倍数
+  function toInteger(floatNum) {
+    // 声明一个对象用来保存倍数和整数
+    const ret = { times: 1, num: 0 }
+    // 第一种情况：是整数
+    if (isInteger(floatNum)) {
+      // 把整数给 ret中的   num
+      ret.num = floatNum
+      return ret //  最后返回 ret
+    }
+
+    // 第二种情况-不是整数，
+    const strfi = floatNum + ''  // 转为字符串  "0.1"
+    const dotPos = strfi.indexOf('.')  // 查询小数点
+    const len = strfi.substr(dotPos + 1).length; //  获取小数点后的长度
+    const times = Math.pow(10, len)  // 放大多少倍
+    const intNum = Number(floatNum.toString().replace('.', ''))  // 返回 转为字符串  截取掉小数点  最后转为数字（整数）
+    // 把获取到的倍数和整数存入对象中
+    ret.times = times
+    ret.num = intNum
+    return ret
+  }
+
+
+  // 核心方法，实现加减乘除运算，确保不丢失精度
+  // 思路：把小数放大为整数（乘），进行算术运算，再缩小为小数（除）
+  // @param a { number } 运算数1
+  // @param b { number } 运算数2
+  // @param digits { number } 精度，保留的小数点数，比如 2, 即保留为两位小数
+  // @param op { string } 运算类型，有加减乘除（add / subtract / multiply / divide）
+
+
+
+  function operation(a, b, digits, op) {
+    // 获取倍数和整数的对象
+    const o1 = toInteger(a)
+    const o2 = toInteger(b)
+    // 提取整数
+    const n1 = o1.num
+    const n2 = o2.num
+    // 提取倍数
+    const t1 = o1.times
+    const t2 = o2.times
+
+    // 获取最大倍数
+    const max = t1 > t2 ? t1 : t2
+    let result = 0  //
+
+    switch (op) {
+      case 'add':
+        if (t1 === t2) { // 两个小数位数相同
+          result = n1 + n2    //  
+        } else if (t1 > t2) { // o1 小数位 大于 o2
+          result = n1 + n2 * (t1 / t2)
+        } else { // o1 小数位 小于 o2
+          result = n1 * (t2 / t1) + n2
+        }
+        return result / max
+      case 'subtract':
+        if (t1 === t2) {
+          result = n1 - n2
+        } else if (t1 > t2) {
+          result = n1 - n2 * (t1 / t2)
+        } else {
+          result = n1 * (t2 / t1) - n2
+        }
+        return result / max
+      case 'multiply':
+        result = (n1 * n2) / (t1 * t2)
+        return result
+      case 'divide':
+        result = (n1 / n2) * (t2 / t1)
+        return result
+    }
+  }
+
+  // 加减乘除的四个接口
+export function add(a, b, digits) {
+    return operation(a, b, digits, 'add')
+  }
+export function subtract(a, b, digits) {
+    return operation(a, b, digits, 'subtract')
+  }
+export function multiply(a, b, digits) {
+    return operation(a, b, digits, 'multiply')
+  }
+export function divide(a, b, digits) {
+    return operation(a, b, digits, 'divide')
+  }
+
+
+
+// console.log(floatObj.add(0.5, 0.2))
+// console.log(floatObj.add(0.12, 0.3))

From bc158d4fb7de4626c46b93a89e76cbfc557c7c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 15 Jul 2024 09:55:06 +0800
Subject: [PATCH 04/51] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packagesplitMain/packagesplitMain.data.ts | 160 +++++++++---------
 1 file changed, 84 insertions(+), 76 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
index 7ea57ca7b..050e355ff 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
@@ -80,50 +80,50 @@ export const PackagesplitMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false
   },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false
-  },
+  // {
+  //   label: '申请时间',
+  //   field: 'requestTime',
+  //   sort: 'custom',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false
+  // },
+  // {
+  //   label: '截止时间',
+  //   field: 'dueTime',
+  //   sort: 'custom',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false
+  // },
   {
     label: '部门',
     field: 'departmentCode',
@@ -297,6 +297,9 @@ export const PackagesplitDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库存状态',
     field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -305,43 +308,46 @@ export const PackagesplitDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库存状态',
     field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
-  {
-    label: '从器具号',
-    field: 'fromContainerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到器具号',
-    field: 'toContainerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '从器具号',
+  //   field: 'fromContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到器具号',
+  //   field: 'toContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '从货主代码',
+  //   field: 'fromOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到货主代码',
+  //   field: 'toOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -385,6 +391,8 @@ export const PackagesplitDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计量单位',
     field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150

From 8b9466d9506e0c1038d0ca6d83314de85fcd6f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 15 Jul 2024 09:55:26 +0800
Subject: [PATCH 05/51] =?UTF-8?q?=E6=8B=86=E5=8C=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
index 050e355ff..3eb010c76 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
@@ -347,7 +347,7 @@ export const PackagesplitDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   table: {
   //     width: 150
   //   },
-  // },
+  // }, 
   {
     label: '物料代码',
     field: 'itemCode',

From bf01eeac1a8490b5894be0c77a6e2e951cc90e9f Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 09:57:12 +0800
Subject: [PATCH 06/51] =?UTF-8?q?=E6=94=B9=E5=88=B0=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issue/issueRequestMain/issueRequestMain.data.ts          | 5 +++--
 .../productionreturnRequestMain.data.ts                      | 4 +++-
 .../productionreturnRequestMainNo.data.ts                    | 3 ++-
 .../repleinshRequestMain/repleinshRequestMain.data.ts        | 4 +++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 022e7787d..74fe76479 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -766,8 +766,9 @@ export const IssueRequestDetail = useCrudSchemas(
       sortTableDefault: 3,
       tableForm: {
         multiple: true,
-        enterSearch: true,
-        isInpuFocusShow: true,
+        // enterSearch: true,
+        disabled:true,
+        // isInpuFocusShow: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 46f95443d..d11ab5ea3 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -583,7 +583,9 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }
     },
     tableForm:{
-      isInpuFocusShow: true,
+      multiple:true,
+      disabled:true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '工位信息', // 查询弹窗标题
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index 0f32a1278..eed4bc467 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -106,7 +106,8 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     },
     tableForm:{
       multiple: true,
-      isInpuFocusShow: true,
+      disabled:true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '工位信息', // 查询弹窗标题
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index f7a7c224c..308e02f7a 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -543,7 +543,9 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
-      isInpuFocusShow: true,
+      multiple:true,
+      disabled:true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '物料基础信息', // 查询弹窗标题

From b86aca5ae7430aac10d9ecbf25e949631de2e766 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 10:03:03 +0800
Subject: [PATCH 07/51] =?UTF-8?q?=E5=B7=B2=E8=AE=A1=E5=88=92=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseMain/purchaseMain.data.ts         | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 23de01ea5..53b585e74 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -599,24 +599,24 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false,
   },
-  {
-    label: t('ts.已计划数量'),
-    field: 'plannedQty',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      },
-      value: 1
-    },
-    isTableForm: false,
-    isForm: false,
-  },
+  // {
+  //   label: t('ts.已计划数量'),
+  //   field: 'plannedQty',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 1,
+  //       precision: 6
+  //     },
+  //     value: 1
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  // },
   {
     label: t('ts.已发货数量'),
     field: 'shippedQty',

From 7d087349f78bd067e53e946fc8aaaed19683040a Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Mon, 15 Jul 2024 10:04:34 +0800
Subject: [PATCH 08/51] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=88=97=E8=A1=A8=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=EF=BC=8C=E6=98=8E=E7=BB=86=E4=B8=AD=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain.data.ts         | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index bc10f2178..a7b55418d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -1014,28 +1014,29 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }]
     },
   },
-  // {
-  //   label: '库存余额',
-  //   field: 'inventoryBalance',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'InputNumber',
-  //     componentProps: {
-  //       min: 0,
-  //       precision: 6
-  //     }
-  //   },
-  //   isForm:false,
-  //   tableForm:{
-  //     hidden:false,//控制列是否展示
-  //     type:'InputNumber',
-  //     min:0,
-  //     precision: 6
-  //   }
-  // },
+  {
+    label: '库存余额',
+    field: 'inventoryBalance',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm:{
+      hidden:false,//控制列是否展示
+      type:'InputNumber',
+      min:0,
+      precision: 6
+    },
+    hiddenInMain: true,
+    isTable: false,
+  },
   {
     label: '退货数量',
     field: 'qty',

From 0cd118078ca44c20200908fabc53a25f49fe4a0f Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 10:07:14 +0800
Subject: [PATCH 09/51] =?UTF-8?q?=E5=96=9C=E5=A9=B7=E8=AF=B4=E5=85=88?=
 =?UTF-8?q?=E6=8B=BF=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index cbe18f856..20aa155c2 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -402,7 +402,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplierdeliver-request-main:create' }), // 新增
-  defaultButtons.defaultImportBtn({ hasPermi: 'wms:supplierdeliver-request-main:import' }), // 导入
+  // defaultButtons.defaultImportBtn({ hasPermi: 'wms:supplierdeliver-request-main:import' }), // 导入 7.15喜婷说先拿掉
   defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierdeliver-request-main:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选

From c037fef754cbaee5d5c3277f53c8f42d5d0f3476 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 10:34:49 +0800
Subject: [PATCH 10/51] =?UTF-8?q?=E6=94=B9=E5=88=B0=E8=87=AA=E5=88=B6?=
 =?UTF-8?q?=E5=A4=87=E4=BB=B6=E5=8F=91=E8=B4=A7=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverplan/deliverPlanMain/deliverPlanMain.data.ts        | 2 +-
 .../processproductionRequestMain.data.ts                       | 3 ++-
 .../productdismantleRequestMain.data.ts                        | 3 ++-
 .../productionplan/productionMain/productionMain.data.ts       | 3 ++-
 .../productionMainAssembleSparePart.data.ts                    | 2 +-
 .../productionMainPredictSparePart.data.ts                     | 2 +-
 .../productputawayRequestMain.data.ts                          | 3 ++-
 .../productputawayAssembleRequestMain/index.vue                | 2 +-
 .../productputawayAssembleRequestMain.data.ts                  | 2 +-
 .../productreceiptRequestMain.data.ts                          | 3 ++-
 .../productreceiptAssembleRequestMain.data.ts                  | 3 ++-
 .../productrepairRequestMain/productrepairRequestMain.data.ts  | 3 ++-
 .../productscrapRequestMain/productscrapRequestMain.data.ts    | 3 ++-
 13 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index 40d883e9a..06e18de14 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -592,7 +592,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm:{
       multiple:true,
-      isInpuFocusShow: true, // 开启查询弹窗
+      // isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择物料代码',
       searchField: 'itemCode',
       searchTitle: '客户物料基础信息',
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
index 2a63f139b..07cd13ca5 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
@@ -339,7 +339,8 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     },
     tableForm:{
       multiple:true,
-      isInpuFocusShow: true,
+      disabled:true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'productionLineCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index cdd5e6572..0da6c60a3 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -475,7 +475,8 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     },
     tableForm:{
       multiple: true,
-      isInpuFocusShow: true,
+      // isInpuFocusShow: true,
+      disabled:true,
       searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '生产线信息', // 查询弹窗标题
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index 74d41a233..2faf81f81 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -656,7 +656,8 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm:{
       multiple:true,
-      isInpuFocusShow: true,
+      disabled:true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index 76f307cbd..e700e948f 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -649,7 +649,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       multiple:true,
       enterSearch:true,
-      isInpuFocusShow: true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index 542dbb02b..7db5dfe79 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -649,7 +649,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       multiple:true,
       enterSearch:true,
-      isInpuFocusShow: true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index fe9c56858..32bf9fbb3 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -456,7 +456,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     tableForm:{
       multiple:true,
-      isInpuFocusShow: true,
+      // isInpuFocusShow: true,
+      disabled:true,
       isSearchList: true, // 开启查询弹窗
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
index 956de7a21..c8bec783a 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
@@ -89,7 +89,7 @@ import * as ProductputawayRequestMainApi from '@/api/wms/productputawayRequestMa
 import * as ProductputawayRequestDetailApi from '@/api/wms/productputawayRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-// 制品上架申请 装配上架申请
+// 制品上架申请 装配上架申请 装配制品上架申请
 defineOptions({ name: 'ProductputawayRequestMain' })
 
 const message = useMessage() // 消息弹窗
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
index 9dcc911d5..bc733b505 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
@@ -448,7 +448,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     tableForm:{
       multiple: true,
-      isInpuFocusShow: true,
+      // isInpuFocusShow: true,
       isSearchList: true, // 开启查询弹窗
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 560808251..1faa0b6f4 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -616,7 +616,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     tableForm:{
       multiple: true,
-      isInpuFocusShow: true,
+      disabled:true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码',
       searchField: 'code',
       searchTitle: '工位信息',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index 63fd5b156..ed0e5fdba 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -617,7 +617,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     tableForm:{
       multiple: true,
-      isInpuFocusShow: true,
+      disabled:true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码',
       searchField: 'code',
       searchTitle: '工位信息',
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 37114f603..e07a122e5 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -554,7 +554,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:5,
     tableForm:{
       multiple: true,
-      isInpuFocusShow: true,
+      disabled:true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '工位信息', // 查询弹窗标题
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index c7ad921ec..475ff6714 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -552,7 +552,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm:{
       multiple: true,
-      isInpuFocusShow: true,
+      // isInpuFocusShow: true,
+      disabled:true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '工位信息', // 查询弹窗标题

From 5a144e5fdf24c8e695fcb44d150440d301209c96 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 10:41:45 +0800
Subject: [PATCH 11/51] =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/business/business.ts              | 293 ++++++++++--------
 src/api/wms/location/index.ts                 |   4 +
 src/components/TableForm/src/TableForm.vue    |   6 +
 .../itemManage/itemarea/itemarea.data.ts      |  54 ++--
 4 files changed, 217 insertions(+), 140 deletions(-)

diff --git a/src/api/wms/business/business.ts b/src/api/wms/business/business.ts
index 6329afa0b..ea4c7bb68 100644
--- a/src/api/wms/business/business.ts
+++ b/src/api/wms/business/business.ts
@@ -384,141 +384,190 @@ export const FormBlur = async (formField, val,routeName,formRef,detailData,formS
 }
 
 // 根据下方输入框失去焦点校验信息
-export const getListByBottonInput = async (headerItem, val,row,routeName,formRef,detailData,tableData,callback) => {
-  let pageApi = ref()
-  let params = ref({})
-  let list = ref([])
-  let field = 'itemCode'
-  // scp采购订单
-  if(!val)return;
-  if (routeName == 'PurchaseMain') {
-    pageApi.value = getSupplierItemListByCodes
-    params.value = {
-      supplierCode: formRef.formModel.supplierCode,
-      itemCodes: val?.trim(),
-      available: true
-    }
-  } else if (routeName == 'ProductionMain') {
-    pageApi.value = getProductionLineCodelistByCodes
-    params.value = {
-      productionLineCode: formRef.formModel.productionLine,
-      itemCodes: val?.trim()
-    }
-  } else if (
-    routeName == 'ZZBJDeliverPlanMain' ||
-    routeName == 'DeliverPlanMain' ||
-    routeName == 'DeliverRequestMain' ||
-    routeName == 'ZZBJDeliverRequestMain'
-  ) {
-    // 自制备件发货计划，发货计划，成品发货申请，自制备件发货申请
-    pageApi.value = getCustomerItemListByCodes
-    params.value = {
-      customerCode: formRef.formModel.customerCode,
-      itemCodes: val?.trim()
-    }
-  } 
-  // else if (routeName == 'UnplannedissueRequestMain') {
-  //   // 计划外出库
-  //   pageApi.value = getBalanceItemListByCodes
-  //   params.value = {
-  //     packingNumber: val?.trim()
-  //   }
-  //   field = 'packingNumber'
-  // } 
-  else {
-    params.value.codes = val?.trim()
-    pageApi.value = getItemListByCodes
-  }
-  let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息
-  // 循环参数设置参数为key：value格式
-  if (searchCondition1 && searchCondition1.length > 0) {
-    for (let i = 0; i < searchCondition1.length; i++) {
-      if (searchCondition1[i].isMainValue) {
-        params.value[searchCondition1[i].key] = formRef.formModel[
-          searchCondition1[i].value
-        ]
-          ? formRef.formModel[searchCondition1[i].value]
-          : detailData
-          ? detailData[searchCondition1[i].value]
-          : ''
-        // 是否含有空参数情况
-        let isNull = false
-        if (
-          params.value[searchCondition1[i].key] == '' ||
-          params.value[searchCondition1[i].key] == undefined
-        ) {
-          isNull = true
-        }
-        if (isNull) {
-          message.warning(
-            searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
-          )
-          return
-        }
-      } else if (searchCondition1[i].isTableRowValue) {
-        if (searchCondition1[i].required) {
-          if (row[searchCondition1[i].value] == '' || row[searchCondition1[i].value] == undefined) {
+export const getListByBottonInput = async (headerItem, val, row, routeName, formRef, detailData, tableData, callback) => {
+  let tableFormSchemaObj = headerItem?.tableForm
+  console.log(333,tableFormSchemaObj)
+  if (tableFormSchemaObj.searchPage && tableFormSchemaObj.verificationParams) { 
+    let params = ref({})
+    let list = ref([])
+    console.log(3344)
+    let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息
+    let verificationParams = headerItem.tableForm.verificationParams //获取data.ts参数信息
+    // 循环参数设置参数为key：value格式
+    if (searchCondition1 && searchCondition1.length > 0) {
+      for (let i = 0; i < searchCondition1.length; i++) {
+        if (searchCondition1[i].isMainValue) {
+          params.value[searchCondition1[i].key] = formRef.formModel[
+            searchCondition1[i].value
+          ]
+            ? formRef.formModel[searchCondition1[i].value]
+            : detailData
+              ? detailData[searchCondition1[i].value]
+              : ''
+          // 是否含有空参数情况
+          let isNull = false
+          if (
+            params.value[searchCondition1[i].key] == '' ||
+            params.value[searchCondition1[i].key] == undefined
+          ) {
+            isNull = true
+          }
+          if (isNull) {
             message.warning(
               searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
             )
             return
           }
-        }
-        row[searchCondition1[i].value]
-        //查询当前table表数据的值
-        params.value[searchCondition1[i].key] = row[searchCondition1[i].value]
-      } else {
-        // 扩展 转换为筛选条件进行查询
-        if (searchCondition1[i].isSearch) {
-          if (searchCondition1[i].isFormModel) {
-            //用formModel中的值
-            if (searchCondition1[i].required) {
-              if (
-                formRef.formModel[searchCondition1[i].value] == '' ||
-                formRef.formModel[searchCondition1[i].value] == undefined
-              ) {
-                message.warning(
-                  searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
-                )
-                return
+        } else if (searchCondition1[i].isTableRowValue) {
+          if (searchCondition1[i].required) {
+            if (row[searchCondition1[i].value] == '' || row[searchCondition1[i].value] == undefined) {
+              message.warning(
+                searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+              )
+              return
+            }
+          }
+          row[searchCondition1[i].value]
+          //查询当前table表数据的值
+          params.value[searchCondition1[i].key] = row[searchCondition1[i].value]
+        } else {
+          // 扩展 转换为筛选条件进行查询
+          if (searchCondition1[i].isSearch) {
+            if (searchCondition1[i].isFormModel) {
+              //用formModel中的值
+              if (searchCondition1[i].required) {
+                if (
+                  formRef.formModel[searchCondition1[i].value] == '' ||
+                  formRef.formModel[searchCondition1[i].value] == undefined
+                ) {
+                  message.warning(
+                    searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                  )
+                  return
+                }
               }
+            } else {
+              params.value[searchCondition1[i].key] = searchCondition1[i].value
             }
-          }else {
+          } else {
             params.value[searchCondition1[i].key] = searchCondition1[i].value
           }
-        } else {
-          params.value[searchCondition1[i].key] = searchCondition1[i].value
         }
       }
     }
-  }
-  await pageApi.value(params.value).then(async (res) => {
-    list.value = res ? res : []
-    let arr1 = val.split(',').map(item=>item.trim())
-    if (arr1.length != res.length) {
-      let arr2 = res.map((item) => item[field])
-      let str = [
-        ...arr1.filter((item) => !arr2.includes(item)),
-        ...arr2.filter((item) => !arr1.includes(item))
-      ].join(',')
-      message.alert('代码' + str + '没有找到对应数据')
-      return
-    } else {
-      let repeatCode = []
-      if(tableData.length > 0){
-        tableData.forEach((item) => {
-          const findIndex = arr1.findIndex(valItem=>valItem==item[field]) 
-          if(findIndex > -1){
-            arr1.splice(findIndex,1)
-            repeatCode.push(item.itemCode)
-          }
-        })
+    console.log(999, verificationParams)
+    if (verificationParams && verificationParams.length > 0) {
+      for (let i = 0; i < verificationParams.length; i++) {
+        params.value[verificationParams[i].key] = val
+      }
+    }
+    await tableFormSchemaObj.verificationPage(params.value).then(async (res) => {
+      list.value = res ? res : []
+      let arr1 = val.split(',').map(item => item.trim())
+      if (arr1.length != res.length) {
+        let arr2 = res.map((item) => item[field])
+        let str = [
+          ...arr1.filter((item) => !arr2.includes(item)),
+          ...arr2.filter((item) => !arr1.includes(item))
+        ].join(',')
+        message.alert('代码' + str + '没有找到对应数据')
+        return
+      } else {
+        let repeatCode = []
+        if (tableData.length > 0) {
+          tableData.forEach((item) => {
+            const findIndex = arr1.findIndex(valItem => valItem == item[field])
+            if (findIndex > -1) {
+              arr1.splice(findIndex, 1)
+              repeatCode.push(item.itemCode)
+            }
+          })
+        }
+        if (repeatCode.length > 0) {
+          message.warning(`${t('ts.代码')}${repeatCode.join(',')}${t('ts.已经存在')}`);
+          return;
+        }
+        callback(list.value)
+      }
+    })
+    return
+  } else {
+    let pageApi = ref()
+    let params = ref({})
+    let list = ref([])
+    let field = 'itemCode'
+    // scp采购订单
+    if (!val) return;
+
+    if (routeName == 'PurchaseMain') {
+      pageApi.value = getSupplierItemListByCodes
+      params.value = {
+        supplierCode: formRef.formModel.supplierCode,
+        itemCodes: val?.trim(),
+        available: true
+      }
+    } else if (routeName == 'ProductionMain') {
+      pageApi.value = getProductionLineCodelistByCodes
+      params.value = {
+        productionLineCode: formRef.formModel.productionLine,
+        itemCodes: val?.trim()
       }
-      if(repeatCode.length>0){
-        message.warning(`${t('ts.代码')}${repeatCode.join(',')}${t('ts.已经存在')}`);
-        return;
+    } else if (
+      routeName == 'ZZBJDeliverPlanMain' ||
+      routeName == 'DeliverPlanMain' ||
+      routeName == 'DeliverRequestMain' ||
+      routeName == 'ZZBJDeliverRequestMain'
+    ) {
+      // 自制备件发货计划，发货计划，成品发货申请，自制备件发货申请
+      pageApi.value = getCustomerItemListByCodes
+      params.value = {
+        customerCode: formRef.formModel.customerCode,
+        itemCodes: val?.trim()
       }
-      callback(list.value)
     }
-  })
+    // else if (routeName == 'UnplannedissueRequestMain') {
+    //   // 计划外出库
+    //   pageApi.value = getBalanceItemListByCodes
+    //   params.value = {
+    //     packingNumber: val?.trim()
+    //   }
+    //   field = 'packingNumber'
+    // } 
+    else {
+      params.value.codes = val?.trim()
+      pageApi.value = getItemListByCodes
+    }
+
+    await pageApi.value(params.value).then(async (res) => {
+      list.value = res ? res : []
+      let arr1 = val.split(',').map(item => item.trim())
+      if (arr1.length != res.length) {
+        let arr2 = res.map((item) => item[field])
+        let str = [
+          ...arr1.filter((item) => !arr2.includes(item)),
+          ...arr2.filter((item) => !arr1.includes(item))
+        ].join(',')
+        message.alert('代码' + str + '没有找到对应数据')
+        return
+      } else {
+        let repeatCode = []
+        if (tableData.length > 0) {
+          tableData.forEach((item) => {
+            const findIndex = arr1.findIndex(valItem => valItem == item[field])
+            if (findIndex > -1) {
+              arr1.splice(findIndex, 1)
+              repeatCode.push(item.itemCode)
+            }
+          })
+        }
+        if (repeatCode.length > 0) {
+          message.warning(`${t('ts.代码')}${repeatCode.join(',')}${t('ts.已经存在')}`);
+          return;
+        }
+        callback(list.value)
+      }
+    })
+
+  }
+  
 }
diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts
index 3870b46d7..36cf3f575 100644
--- a/src/api/wms/location/index.ts
+++ b/src/api/wms/location/index.ts
@@ -136,3 +136,7 @@ export const selectConfigToLocation = async (params) => {
     return request.get({ url: `/wms/location/pageConfigToLocation`, params })
   }
 }
+// 根据code获取数据列表
+export const getLocationByCodes = async (params) => {
+  return await request.get({ url: `/wms/location/listByCodes`, params })
+}
\ No newline at end of file
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 502cd36e1..e977306f3 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -402,6 +402,8 @@
       <div
         class="p-12px"
         v-if="
+          isShowTableFormSearch||
+          routeName == 'PurchaseMain' ||
           routeName == 'PurchaseMain' ||
           routeName == 'ProductionMain' ||
           routeName == 'ZZBJDeliverPlanMain' ||
@@ -501,6 +503,10 @@ const props = defineProps({
     default: ''
   }
 })
+const isShowTableFormSearch = ref(false)
+console.log(33333,props.tableFields)
+isShowTableFormSearch.value =props.tableFields.some(item=>item.isShowTableFormSearch)
+
 // 传递给父类
 const emit = defineEmits([
   'tableSelectionChange',
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index 275ff5890..bbf24019e 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -155,12 +155,12 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-        },{
+        }, {
           key: 'itemCode',
           value: 'itemCode',
           message: "请选择物料代码",
           isMainValue: true
-          }],
+        }],
         verificationParams: [{
           key: 'packUnit',
           action: '==',
@@ -195,12 +195,12 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-        },{
+        }, {
           key: 'itemCode',
           value: 'itemCode',
           message: "请选择物料代码",
           isMainValue: true
-          }],
+        }],
         verificationParams: [{
           key: 'packUnit',
           action: '==',
@@ -210,7 +210,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
           isFormModel: true,
           required: true,
           message: '请选择物料代码',
-          isBlurParams:true,//是否是失去焦点的方法的参数
+          isBlurParams: true,//是否是失去焦点的方法的参数
         }], // 失去焦点校验参数
       }
     }
@@ -304,7 +304,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        enterSearch:true,
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库区代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -344,7 +344,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
- 
+
   // {
   //   label: '入库自动转为出库包装规格',
   //   field: 'newlyToOutpackunit',
@@ -440,7 +440,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
-    isTable:false
+    isTable: false
   },
   {
     label: '超过高储是否允许叫料',
@@ -456,7 +456,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
-    isTable:false
+    isTable: false
   },
   {
     label: '优先空库位',
@@ -623,7 +623,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     },
     table: {
       width: 150
-    } ,
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -642,7 +642,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     },
     table: {
       width: 150
-    } ,
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -704,7 +704,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 120
-    } ,
+    },
   },
   {
     label: '操作',
@@ -744,8 +744,8 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '库位代码',
     field: 'locationCode',
     sort: 'custom',
-    tableForm:{
-      multiple:true,//多选
+    tableForm: {
+      multiple: true,//多选
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择库位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
@@ -756,18 +756,28 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      },{
+      }, {
         key: 'areaCode',
         value: 'areaCode',
         message: '请选择区域代码！',
         isMainValue: true
-      }]
+      }],
+      verificationParams: [{
+        key: 'codes',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }],
+      verificationPage: LocationApi.getLocationByCodes, // 校验数去焦点输入是否正确的方法
+      isShowTableFormSearch: true, // 
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        multiple:true,//多选
+        multiple: true,//多选
         searchListPlaceholder: '请选择库位代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '库位基础信息', // 查询弹窗标题
@@ -777,11 +787,19 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
+        }, {
           key: 'areaCode',
           value: 'areaCode',
           message: '请选择区域代码！',
           isMainValue: true
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
         }]
       }
     }

From 2b6247c6893a4331c7879e3fc4ffb8881a9bb89e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 10:51:19 +0800
Subject: [PATCH 12/51] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=9C=AA=E7=A8=8E?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue                 | 7 ++-----
 src/components/SearchTable/src/SearchTable.vue             | 2 +-
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue   | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index e8a2d681f..e52d97abb 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -135,11 +135,8 @@
     @searchTableSuccess="searchTableSuccess"
   >
   
-    <template #selectionsActions="selections">
-      <slot name="searchTableSelectionsActions" :selections="selections"></slot>
-    </template>
-    <template v-for="name in Object.keys($slots)" :key="name" #[name]>
-      <slot :name="name"></slot>
+    <template v-for="name in Object.keys($slots)" :key="name" #[name]="{selections}">
+      <slot :name="name" :selections="selections"></slot>
     </template>
   </SearchTable>
 </template>
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index 539271296..64e3f6b7e 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -37,7 +37,7 @@
     </ContentWrap>
     <template #footer>
       <div class="flex items-center">
-        <slot name="selectionsActions" :selections="searchTableRef?searchTableRef.selections:[]"></slot>
+        <slot :name="'selectionsActions'+formFieldRef" :selections="searchTableRef?searchTableRef.selections:[]"></slot>
         <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
         <el-button @click="searchDialogVisible = false">取 消</el-button>
 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index b1990ebc4..771551e40 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -113,9 +113,9 @@
     @sumFormDataHandle="sumFormDataHandle"
   >      
   
-  <template #searchTableSelectionsActions="{selections}">
+  <template #selectionsActionspoLine="{selections}">
     <div style="text-align: left;margin-right:10px">
-      系统未税金额:{{Number(selections.selections.reduce((prev, item) => prev + Number(Number(Number(Number(item['purchasePrice']).toFixed(2))*item['invoicableQuantity']).toFixed(2)),0)).toFixed(2)}}
+      系统未税金额:{{Number(selections.reduce((prev, item) => prev + Number(Number(Number(Number(item['purchasePrice']).toFixed(2))*item['invoicableQuantity']).toFixed(2)),0)).toFixed(2)}}
     </div>
   </template>
   <!-- <template #foorter>

From c94138d4fc14d851364cab3b56d28d7e5486ebaa Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 10:54:09 +0800
Subject: [PATCH 13/51] =?UTF-8?q?bug:=E4=B8=BB=E9=A1=B5=E9=9D=A2=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=BA=94=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrapRequestMain.data.ts           | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 475ff6714..4c22a63cc 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -307,37 +307,37 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
+  // {
+  //   label: '截止时间',
+  //   field: 'dueTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTable:false,
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  // },
   {
     label: '部门',
     field: 'departmentCode',

From daf3014bc5f6a937eeb75d5d670270cd03ae25d3 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 10:56:04 +0800
Subject: [PATCH 14/51] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productrepairRequestMain.data.ts          | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index e07a122e5..58887b849 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -254,15 +254,15 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm: false,
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -319,28 +319,28 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
+  // {
+  //   label: '截止时间',
+  //   field: 'dueTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTable: false,
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: { width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
   {
     label: '部门',
     field: 'departmentCode',

From 9552f4fa4fe5031d2f175c469ac786ec24afa481 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Mon, 15 Jul 2024 10:57:47 +0800
Subject: [PATCH 15/51] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
index 2da883598..c71130a62 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
@@ -416,7 +416,7 @@ export const LocationRules = reactive({
     { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
   name: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    {required: true, max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   aisle: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }

From 788da0687475b7c5ed586430409e43ca9dad4e57 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 11:03:44 +0800
Subject: [PATCH 16/51] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productredressRequestMain.data.ts         | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index 023a77ee9..67d793bd4 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -184,7 +184,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '原因',
     field: 'remark',
     sort: 'custom',
-    isTable:false,
+    isTable:true,
   },
   {
     label: '到库区类型范围',
@@ -558,16 +558,16 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     hiddenInMain:true,
   },
 
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:false,
+  //   hiddenInMain:true
+  // },
   {
     label: '创建者',
     field: 'creator',

From c6f31a9ff11d927145d843e1c54d41444c8a9898 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 11:45:48 +0800
Subject: [PATCH 17/51] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=92=8C=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1=E7=90=86=E5=A4=B1?=
 =?UTF-8?q?=E5=8E=BB=E7=84=A6=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |  2 +-
 .../customerdock/customerdock.data.ts         | 28 +++++++++++++++++--
 .../customerManage/project/project.data.ts    | 10 ++++++-
 .../saleprice/saleprice.data.ts               | 20 +++++++++++--
 .../purchaseprice/purchaseprice.data.ts       | 20 +++++++++++--
 .../supplieritem/supplieritem.data.ts         | 20 +++++++++++--
 6 files changed, 90 insertions(+), 10 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index e52d97abb..1b505cd3d 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -998,7 +998,7 @@ const onBlur = async (field, e) => {
         await formSchemaObj.searchPage(params).then((res) => {
           let arr1 = e.split(',')
           let list = ref([])
-          list.value = res.list
+          list.value = res?.list?.length>0 ? res.list.slice(0,1) : []
           if (list.value?.length == 0) {
             message.alert('暂无数据')
             formRef.value.setValues(setV)
diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
index 6ba5ac483..4ece20cf8 100644
--- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
@@ -52,7 +52,15 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
           action: '==',
           isSearch: true,
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -122,6 +130,14 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '仓库基础信息',
         searchAllSchemas: Warehouse.allSchemas,
         searchPage: WarehouseApi.getWarehousePage,
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -160,7 +176,15 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
           isFormModel:true, // filters中添加筛选的数据--取于formModel
           required:true, // 前置添加必有，和isFormModel结合使用
 
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/customerManage/project/project.data.ts b/src/views/wms/basicDataManage/customerManage/project/project.data.ts
index 95da14f67..70b4ca87c 100644
--- a/src/views/wms/basicDataManage/customerManage/project/project.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/project/project.data.ts
@@ -46,7 +46,15 @@ export const Project = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
   },
diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
index b11dd0df9..f298961eb 100644
--- a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
@@ -37,7 +37,15 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
   },
@@ -68,7 +76,15 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
           value: 'customerCode',
           message: '请填写客户代码！',
           isMainValue: true
-        }]
+          }],
+        verificationParams: [{
+          key: 'itemCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
   },
diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
index a92e56d5f..399553c0a 100644
--- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
@@ -36,7 +36,15 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -67,7 +75,15 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+          }],
+          verificationParams: [{
+          key: 'itemCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
index 82f7bf3e8..0e898074d 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
@@ -44,7 +44,15 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -70,7 +78,15 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'itemCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },

From 936dcf1b5b73b2373273cff0acd29c60c64c9155 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 13:10:32 +0800
Subject: [PATCH 18/51] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=BB=BA=E6=A8=A1?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../areabasic/areabasic.data.ts               | 10 ++++-
 .../factoryModeling/dock/dock.data.ts         | 20 +++++++++-
 .../factoryModeling/location/location.data.ts | 30 ++++++++++++--
 .../locationgroup/locationgroup.data.ts       | 20 +++++++++-
 .../factoryModeling/process/process.data.ts   | 20 +++++++++-
 .../productionline/productionline.data.ts     | 10 ++++-
 .../workstation/workstation.data.ts           | 40 +++++++++++++++++--
 7 files changed, 135 insertions(+), 15 deletions(-)

diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
index 2470bc8c8..dfa823146 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
@@ -52,7 +52,15 @@ export const Area = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
index ff90736b8..dbbc72a7a 100644
--- a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
@@ -67,7 +67,15 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -92,7 +100,15 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
index c71130a62..1a74eea06 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
@@ -58,7 +58,15 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -89,7 +97,15 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -119,7 +135,15 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
index 2c9834e99..da5fdfbd5 100644
--- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
@@ -55,7 +55,15 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -86,7 +94,15 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
index 389ad3266..7f4690a51 100644
--- a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
@@ -67,7 +67,15 @@ export const Process = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -97,7 +105,15 @@ export const Process = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
index 7ea279769..1e17db6d5 100644
--- a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
@@ -67,7 +67,15 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
index 1f8038226..b8da1ff1c 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -76,7 +76,15 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -107,7 +115,15 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -137,7 +153,15 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'areaType',
           value: confgiDataOne.areaType,
           isMainValue: false
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -167,7 +191,15 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'areaType',
           value: confgiDataTwo.areaType,
           isMainValue: false
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },

From 9a8d9e9c517de99e2d5a11d3c1d23a82bccb44b5 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Mon, 15 Jul 2024 14:11:15 +0800
Subject: [PATCH 19/51] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/supplierinvoiceRecordMain/index.ts    |  6 +-
 .../supplierinvoiceRecordMain/index.vue       | 62 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/supplierinvoiceRecordMain/index.ts b/src/api/wms/supplierinvoiceRecordMain/index.ts
index 9ffde26ba..dfdb880ec 100644
--- a/src/api/wms/supplierinvoiceRecordMain/index.ts
+++ b/src/api/wms/supplierinvoiceRecordMain/index.ts
@@ -60,4 +60,8 @@ export const exportSupplierinvoiceRecordMain = async (data) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplierinvoice-record-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+export const exportSupplierinvoiceRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/supplierinvoice-record-deatil/export-excel`, params })
+}
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index 2d7484b2e..54788dd53 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -105,6 +105,25 @@
       showDownload:true,
       hiddenDelete:true
     }"
+    :otherHeadButttonData="[{
+        label: t('ts.打印明细'),
+        name: 'printing',
+        hide: false,
+        type: 'primary',
+        // icon: 'ep:operation',
+        color: '',
+        float:'left',
+        hasPermi: ''
+    },{
+        label: t('ts.导出明细'),
+        name: 'export-detail',
+        hide: false,
+        type: 'primary',
+        // icon: 'ep:operation',
+        color: '',
+        float:'left',
+        hasPermi: ''
+    }]"
     :isBasic="false"
     direction="horizontal"
     :column="3"
@@ -112,6 +131,7 @@
     :detailAllSchemas="SupplierinvoiceRecordDetail.allSchemas"
     :detailAllSchemasRules="SupplierinvoiceRecordDetailRules"
     :apiPage="SupplierinvoiceRecordDetailApi.getSupplierinvoiceRecordDeatilPage"
+    @buttonBaseClick="detailButtonBaseClick"
   >
     <template #differencePrice="{row}">
       <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
@@ -205,6 +225,8 @@ const handleSelectionPoint = async ()=>{
   window.open(srcPoint.value+'&ids='+rows.join(','))
 }
 
+
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   return [
@@ -230,8 +252,10 @@ const buttonTableClick = async (val, row) => {
 const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
+const clicKRowId = ref();
 const openDetail = async (row: any, titleName: any, titleValue: any) => {
   console.log('openDetail',row)
+  clicKRowId.value = row.id
   const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
   //获取申请中的masterId
   const { tableObject: requestTableObject, tableMethods:requestTableMethods } = useTable({
@@ -289,6 +313,44 @@ const handleExport = async () => {
   }
 }
 
+
+const detailButtonBaseClick = (val, item) => {
+  console.log("点击的按钮",val)
+  if(val == 'printing'){
+    // 单据打印
+    handleDocumentPrint(clicKRowId.value)
+  }else if(val === 'export-detail'){
+    console.log("导出明细:",clicKRowId.value)
+    handleDetailExport(clicKRowId.value)
+  }
+}
+
+// 单据打印
+const documentSrc = ref(BASE_URL + '/jmreport/view/972639553789239296?token=' + getAccessToken())
+const handleDocumentPrint = async (id) => {
+  window.open(documentSrc.value + '&id=' + id)
+}
+
+/** 导出明细按钮操作 */
+const exportLoadingDetail = ref(false) // 导出的加载中
+const handleDetailExport = async (masterId) => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出导出明细
+    exportLoadingDetail.value = true
+    let params = {
+      masterId: masterId
+    }
+    const data = await SupplierinvoiceRecordMainApi.exportSupplierinvoiceRecordDetail(params)
+    download.excel(data, `${t('ts.供应商发票记录明细')}.xlsx`)
+  } catch {
+  } finally {
+    exportLoadingDetail.value = false
+  }
+}
+
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {

From c7e49b674dc31150ddd93635d9e69feb9eb82fd5 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 14:16:15 +0800
Subject: [PATCH 20/51] =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/labelForm.vue  | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 7ff4af19c..8f6ab2391 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -12,7 +12,12 @@
         <template #default="scope">
           <div
             style="margin-left: 400px; margin-top: -8px; margin-bottom: -8px"
-            v-if="scope.row.packUnit && scope.row.packQty && 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"
@@ -102,13 +107,17 @@
               </el-table-column>
             </el-table>
           </div>
-          <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px"  v-if="scope.row.packUnit && scope.row.packQty && !scope.row.secondPackUnit">
+          <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" >    <template #default="scope1">
-                          {{ scope1.$index + 1 }}
-                        </template>
-                      </el-table-column>
+                <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
@@ -130,7 +139,7 @@
                     <el-button
                       type="warning"
                       link
-                      @click="removeX(scope.row, scope.$index, item, index)"
+                      @click="removeX(scope.row, scope.$index, item, index,scope1.row, scope1.$index )"
                       >移出</el-button
                     >
                   </template>
@@ -225,12 +234,12 @@ const expandChange = (row: any, expandedRows: any[]) => {
     // 放满的托数量
     row.manTuoQty = Math.floor(parseFloat(row.manXiangQty) / parseFloat(row.otherNumber))
     // 放满的托数量*一托的箱数量*一箱的数量  获取放满的托一共多少数量
-    row.tuoInManNumber =
-      parseFloat(row.manTuoQty) * parseFloat(row.otherNumber) * parseFloat(row.packQty)
+    let num1 = accuracyFun.multiply(parseFloat(row.manTuoQty ),parseFloat(row.otherNumber))
+    row.tuoInManNumber =accuracyFun.multiply(num1,parseFloat(row.packQty))
     // 数量除以托数量获取余数
     row.lastNumber =
       parseFloat(row.qty) > parseFloat(row.tuoInManNumber)
-        ? parseFloat(row.qty) - parseFloat(row.tuoInManNumber)
+        ? accuracyFun.subtract( parseFloat(row.qty),parseFloat(row.tuoInManNumber)) 
         : parseFloat(row.qty)
     // 循环托
     row.packageList =[]
@@ -259,7 +268,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 = accuracyFun.multiply( parseFloat(row.otherNumber),parseFloat(row.packQty))
       }
     }
     // 判断箱信息是否存在
@@ -417,7 +426,7 @@ const addT = (oneRow) => {
 }
 // 移出托
 const removeT = (oneRow, oneIndex, twoRow, twoIndex) => {
-  oneRow.packageList.splice(twoIndex, 1)
+   oneRow.packageList= oneRow.packageList.filter(item=>item.id!=twoRow.id)
   oneRow.allTuoQty = oneRow.packageList.length
 }
 // 添加箱
@@ -437,7 +446,7 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
     twoRow.xNumber = twoRow.children.length
      let num = 0
     twoRow.children.forEach((item) => {
-      num += parseFloat(item.qtyTwo) || 0
+     num =  accuracyFun.add( parseFloat(num),parseFloat(item.qtyTwo) || 0)
     })
     twoRow.qtyOne = num
   } else {
@@ -447,9 +456,8 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
       id: twoId.value,
       // xPoNumber:
       //   twoRow.children.length > 0 ? twoRow.children[twoRow.children.length - 1].xPoNumber + 1 : 1,
-      // qtyTwo: oneRow.packQty
+      qtyTwo: oneRow.packQty
     })
-    oneRow.allTuoQty = twoRow.children.length
   }
 }
 // 移除箱
@@ -457,16 +465,15 @@ const removeX = (oneRow, oneIndex, twoRow, twoIndex, threeRow, threeIndex, type)
   //  有父级托的时候
   if (type == 1) {
     // 在托下移除箱
-    twoRow.children.splice(threeIndex, 1)
+     twoRow.children= twoRow.children.filter(item=>item.id!=threeRow.id)
     let num = 0
     twoRow.children.forEach((item) => {
-      num += parseFloat(item.qtyTwo) || 0
+     num =  accuracyFun.add( parseFloat(num),parseFloat(item.qtyTwo) || 0)
     })
     twoRow.qtyOne = num
     twoRow.xNumber = twoRow.children.length
   } else {
-    twoRow.children.splice(twoIndex, 1)
-    oneRow.allTuoQty = twoRow.children.length
+     twoRow.children= twoRow.children.filter(item=>item.id!=threeRow.id)
   }
 }
 // 是否显示展开图标
@@ -486,7 +493,9 @@ const blurOne = (oneRow, twoRow) => {
   //   twoRow.children = []
   //   twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
   // }
-  twoRow.qtyOne = parseFloat(twoRow.xNumber)?  parseFloat(twoRow.xNumber)* parseFloat(oneRow.packQty) : ''
+  twoRow.qtyOne = parseFloat(twoRow.xNumber) ?
+    accuracyFun.multiply( parseFloat(twoRow.xNumber),parseFloat(oneRow.packQty))
+    : ''
   // let num = 0
   // oneRow.packageList.forEach((item) => {
   //   num += parseFloat(item.xNumber) || 0
@@ -544,7 +553,7 @@ const blurTwo = (oneRow, twoRow, threeRow) => {
   // }
   let num = 0
   twoRow.children.forEach((item) => {
-    num += parseFloat(item.qtyTwo) || 0
+     num =  accuracyFun.add( parseFloat(num),parseFloat(item.qtyTwo))
   })
   twoRow.qtyOne = num
 }
@@ -556,7 +565,7 @@ const blurThree = (oneRow, twoRow, thereeRow) => {
   // }
   let num = 0
   twoRow.children.forEach((item) => {
-    num += parseFloat(item.qtyTwo) || 0
+     num =  accuracyFun.add( parseFloat(num),parseFloat(item.qtyTwo))
   })
   twoRow.qtyOne = num
 }

From b09e7ac271a6aab54e668225f6d06d275d526cab Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 15 Jul 2024 14:37:00 +0800
Subject: [PATCH 21/51] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/unplannedreceiptRequestDetail/index.ts           | 5 +++++
 .../unplannedreceipt/unplannedreceiptRequestMain/index.vue   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/unplannedreceiptRequestDetail/index.ts b/src/api/wms/unplannedreceiptRequestDetail/index.ts
index c62a7e13f..3b63ee625 100644
--- a/src/api/wms/unplannedreceiptRequestDetail/index.ts
+++ b/src/api/wms/unplannedreceiptRequestDetail/index.ts
@@ -38,6 +38,11 @@ export const getUnplannedreceiptRequestDetailPage = async (params) => {
   }
 }
 
+// 查询计划外入库申请子打印标签
+export const getUnplannedreceiptRequestDetailPageCreateLabel = async (params) => {
+  return await request.get({ url: `/wms/unplannedreceipt-request-detail/pageCreateLabel`, params })
+}
+
 // 查询计划外入库申请子详情
 export const getUnplannedreceiptRequestDetail = async (id: number) => {
   return await request.get({ url: `/wms/unplannedreceipt-request-detail/get?id=` + id })
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index 99dc8fae0..799614b09 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -150,7 +150,7 @@ const isCreateLabel = ref(false)
 const formLabelRef = ref()
 const labelType = ref('') // 标签类别 采购还是制造等 
 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
-  getListApi: UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPage
+  getListApi: UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPageCreateLabel
 })
 const { getList:getDetailList } = detatableMethods
 

From f77172334c5ec9caf945fa6d29a6348c38ef28d6 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 14:39:55 +0800
Subject: [PATCH 22/51] =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/business/business.ts              | 380 +++++++++++++-----
 src/components/BasicForm/src/BasicForm.vue    | 200 +--------
 .../businesstype/businesstype.data.ts         |  22 +-
 .../supplieritem/supplieritem.data.ts         |   2 +-
 4 files changed, 301 insertions(+), 303 deletions(-)

diff --git a/src/api/wms/business/business.ts b/src/api/wms/business/business.ts
index ea4c7bb68..21271d1a4 100644
--- a/src/api/wms/business/business.ts
+++ b/src/api/wms/business/business.ts
@@ -229,138 +229,160 @@ export const tableFormBlurVer = async (headerItem, val, row, index,routeName,for
     }
   }
 }
-export const FormBlur = async (formField, val,routeName,formRef,detailData,formSchema,callback) => {
-  let pageApi = ref()
-  let params = ref()
-  let setV = {}
-  setV[formField] = ''
-  if (val && isString(val)) {
-    if (
-      formField == 'supplierCode' ||
-      formField == 'itemCode' ||
-      formField == 'productItemCode' ||
-      formField == 'componentItemCode' ||
-      formField == 'packUnit' ||
-      formField == 'inPackUnit' ||
-      formField == 'fromPackingNumber'
-    ) {
-      let searchField = 'code'
-      if (formField == 'supplierCode') {
-        params.value = val?.trim()
-        pageApi.value = getSupplierListByCodes
-      } else if (
-        formField == 'itemCode' ||
-        formField == 'productItemCode' ||
-        formField == 'componentItemCode'
-      ) {
-        // 销售价格单
-        if (routeName == 'Saleprice') {
-          params.value = {
-            customerCode: formRef.formModel.customerCode,
-            itemCodes: val?.trim()
-          }
-          pageApi.value = getCustomerItemListByCodes
-          searchField = 'itemCode'
-        }else  if (routeName == 'ProductscrapRequestMain') {
-          // 制品报废申请
-          params.value = {
-            productionLineCode:
-              detailData.productionLine || detailData.productionLineCode,
-            itemCodes: val?.trim()
-          }
-          pageApi.value = getProductionLineCodelistByCodes
-          searchField = 'itemCode'
-        }else {
-          // params.value = val.trim()
-          searchField = 'code'
-          
-          params.value={
-            codes:val?.trim()
-          }
-          pageApi.value = getItemListByCodes
-        }
-      } else if (formField == 'packUnit') {
-        if(routeName == 'Itemwarehouse'||routeName == 'Callmaterials'){//物料仓库默认配置,叫料标签
-          searchField = 'packUnit'
-          params.value = {
-            itemCode: formRef.formModel.itemCode,
-            packUnit: val?.trim()
-          }
-          pageApi.value = getItemPackageunitListByCodes
-        }else{
-         params.value = val?.trim()
-         pageApi.value = getPackageunitListByCodes
-        }
-      } else if (formField == 'inPackUnit') {
-        params.value = {
-          itemCode: formRef.formModel.itemCode,
-          packUnit: val.trim()
-        }
-        pageApi.value = getItemPackageunitListByCodes
-      } 
-      // else if (formField == 'fromPackingNumber') {
-      //   params.value = {
-      //     packingNumber: val?.trim()
-      //   }
-      //   pageApi.value = getBalanceItemListByCodes
-      // }
-      let obj = {}
-      let searchCondition1 = formSchema.find((item) => item.field == formField).componentProps
-        .searchCondition //获取data.ts参数信息
-      // 循环参数设置参数为key：value格式
-      if (searchCondition1 && searchCondition1.length > 0) {
-        for (let i = 0; i < searchCondition1.length; i++) {
-          if (searchCondition1[i].isMainValue) {
-            obj[searchCondition1[i].key] = formRef.formModel[searchCondition1[i].value]
-              ? formRef.formModel[searchCondition1[i].value]
+export const FormBlur = async (field, val, routeName, formRef, detailData, formSchema, callback) => {
+  if (formSchema.searchPage && formSchema.verificationParams) {
+    //获取data.ts参数信息
+    let searchCondition = formSchema?.searchCondition || []
+    //获取失去焦点参数信息
+    let verificationParams = formSchema?.verificationParams ||
+      []
+    console.log('走新方法啦')
+    // searchCondition = [...searchCondition, ...verificationParams]
+
+    if (val && isString(val)) {
+      let setV = {}
+      setV[field] = ''
+      let params = {}
+      const _searchCondition = {}
+      let filters: any[] = []
+      if (searchCondition && searchCondition.length > 0) {
+        // 转换筛选条件所需
+        for (let i = 0; i < searchCondition.length; i++) {
+          // searchCondition.forEach((item) => {
+          // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
+          if (searchCondition[i].isMainValue) {
+            _searchCondition[searchCondition[i].key] = formRef.formModel[
+              searchCondition[i].value
+            ]
+              ? formRef.formModel[searchCondition[i].value]
               : detailData
-              ? detailData[searchCondition1[i].value]
-              : ''
+                ? detailData[searchCondition[i].value]
+                : // : row
+                // ? row[searchCondition[i].value]
+                ''
             // 是否含有空参数情况
             let isNull = false
-            if (obj[searchCondition1[i].key] == '' || obj[searchCondition1[i].key] == undefined) {
+            if (
+              _searchCondition[searchCondition[i].key] == '' ||
+              _searchCondition[searchCondition[i].key] == undefined
+            ) {
               isNull = true
             }
             if (isNull) {
               message.warning(
-                searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
               )
               return
             }
-          } else {
+            filters.push({
+              action: searchCondition[i].action || '==',
+              column: searchCondition[i].key,
+              value: formRef.formModel[searchCondition[i].value]
+            })
+          }
+
+          // else if (searchCondition[i].isTableRowValue) {
+          //   if (searchCondition[i].required) {
+          //     if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) {
+          //       message.warning(
+          //         searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+          //       )
+          //       return
+          //     }
+          //   }
+          //   row[searchCondition[i].value]
+          //   //查询当前table表数据的值
+          //   _searchCondition[searchCondition[i].key] = row[searchCondition[i].value]
+          // }
+          else {
             // 扩展 转换为筛选条件进行查询
-            if (searchCondition1[i].isSearch) {
-              if (searchCondition1[i].isFormModel) {
+            if (searchCondition[i].isSearch) {
+              if (searchCondition[i].isFormModel) {
                 //用formModel中的值
-                if (searchCondition1[i].required) {
+                if (searchCondition[i].required) {
                   if (
-                    formRef.formModel[searchCondition1[i].value] == '' ||
-                    formRef.formModel[searchCondition1[i].value] == undefined
+                    formRef.formModel[searchCondition[i].value] == '' ||
+                    formRef.formModel[searchCondition[i].value] == undefined
                   ) {
                     message.warning(
-                      searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                      searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
                     )
                     return
                   }
                 }
+                filters.push({
+                  action: searchCondition[i].action || '==',
+                  column: searchCondition[i].key,
+                  value: formRef.formModel[searchCondition[i].value]
+                })
+              } else {
+                filters.push({
+                  action: searchCondition[i].action || '==',
+                  column: searchCondition[i].key,
+                  value: searchCondition[i].value
+                })
               }
             } else {
-              obj[searchCondition1[i].key] = searchCondition1[i].value
+              filters.push({
+                action: searchCondition[i].action || '==',
+                column: searchCondition[i].key,
+                value: searchCondition[i].value
+              })
             }
           }
         }
       }
-
-      let obj1 = formSchema.find((item) => item.field == formField)
-      if (!obj1.componentProps.multiple && val.indexOf(',') > -1) {
+      if (verificationParams && verificationParams.length > 0) {
+        // 转换筛选条件所需
+        for (let i = 0; i < verificationParams.length; i++) {
+          // 扩展 转换为筛选条件进行查询
+          if (verificationParams[i].isSearch) {
+            if (verificationParams[i].isFormModel) {
+              filters.push({
+                action: verificationParams[i].action,
+                column: verificationParams[i].key,
+                value: formRef.formModel[verificationParams[i].value]
+                  ? formRef.formModel[verificationParams[i].value]
+                  : val.trim()
+              })
+            } else {
+              filters.push({
+                action: verificationParams[i].action,
+                column: verificationParams[i].key,
+                value: verificationParams[i].value
+              })
+            }
+          } else {
+            _searchCondition[verificationParams[i].key] = verificationParams[i].value
+          }
+        }
+      }
+      if (filters.length > 0) {
+        _searchCondition.isSearch = true
+        _searchCondition.filters = filters
+      }
+      console.log(4545, _searchCondition)
+      let obj = {
+        by: 'ASC',
+        pageNo: 1,
+        pageSize: 20
+      }
+      console.log(888, _searchCondition)
+      params = {
+        isSearch: _searchCondition.isSearch,
+        filters: _searchCondition.filters,
+        ...obj
+      }
+      // console.log(333,params)
+      if (!formSchema?.multiple && val.indexOf(',') > -1) {
         message.alert('该输入框只能输入一条数据')
         formRef.setValues(setV)
         return
       }
-     await pageApi.value(params.value).then((res) => {
+      await formSchema.searchPage(params).then((res) => {
         let arr1 = val.split(',')
         let list = ref([])
-        list.value = res
+        list.value = res?.list?.length > 0 ? res.list.slice(0, 1) : []
         if (list.value?.length == 0) {
           message.alert('暂无数据')
           formRef.setValues(setV)
@@ -376,11 +398,161 @@ export const FormBlur = async (formField, val,routeName,formRef,detailData,formS
           formRef.setValues(setV)
           return
         }
-        // emit('searchTableSuccess', formField, searchField, list.value, formRef.value, 'form')
-        callback(searchField,list.value)
+        callback(list.value)
       })
     }
-  }
+  } 
+  else {
+    let pageApi = ref()
+    let params = ref()
+    let setV = {}
+    setV[field] = ''
+    if (val && isString(val)) {
+      if (
+        field == 'supplierCode' ||
+        field == 'itemCode' ||
+        field == 'productItemCode' ||
+        field == 'componentItemCode' ||
+        field == 'packUnit' ||
+        field == 'inPackUnit' ||
+        field == 'fromPackingNumber'
+      ) {
+        let searchField = 'code'
+        if (field == 'supplierCode') {
+          params.value = val?.trim()
+          pageApi.value = getSupplierListByCodes
+        } else if (
+          field == 'itemCode' ||
+          field == 'productItemCode' ||
+          field == 'componentItemCode'
+        ) {
+          // 销售价格单
+          if (routeName == 'Saleprice') {
+            params.value = {
+              customerCode: formRef.formModel.customerCode,
+              itemCodes: val?.trim()
+            }
+            pageApi.value = getCustomerItemListByCodes
+            searchField = 'itemCode'
+          } else if (routeName == 'ProductscrapRequestMain') {
+            // 制品报废申请
+            params.value = {
+              productionLineCode:
+                detailData.productionLine || detailData.productionLineCode,
+              itemCodes: val?.trim()
+            }
+            pageApi.value = getProductionLineCodelistByCodes
+            searchField = 'itemCode'
+          } else {
+            // params.value = val.trim()
+            searchField = 'code'
+
+            params.value = {
+              codes: val?.trim()
+            }
+            pageApi.value = getItemListByCodes
+          }
+        } else if (field == 'packUnit') {
+          if (routeName == 'Itemwarehouse' || routeName == 'Callmaterials') {//物料仓库默认配置,叫料标签
+            searchField = 'packUnit'
+            params.value = {
+              itemCode: formRef.formModel.itemCode,
+              packUnit: val?.trim()
+            }
+            pageApi.value = getItemPackageunitListByCodes
+          } else {
+            params.value = val?.trim()
+            pageApi.value = getPackageunitListByCodes
+          }
+        } else if (field == 'inPackUnit') {
+          params.value = {
+            itemCode: formRef.formModel.itemCode,
+            packUnit: val.trim()
+          }
+          pageApi.value = getItemPackageunitListByCodes
+        }
+        // else if (formField == 'fromPackingNumber') {
+        //   params.value = {
+        //     packingNumber: val?.trim()
+        //   }
+        //   pageApi.value = getBalanceItemListByCodes
+        // }
+        let obj = {}
+        let searchCondition1 = formSchema.searchCondition //获取data.ts参数信息
+        // 循环参数设置参数为key：value格式
+        if (searchCondition1 && searchCondition1.length > 0) {
+          for (let i = 0; i < searchCondition1.length; i++) {
+            if (searchCondition1[i].isMainValue) {
+              obj[searchCondition1[i].key] = formRef.formModel[searchCondition1[i].value]
+                ? formRef.formModel[searchCondition1[i].value]
+                : detailData
+                  ? detailData[searchCondition1[i].value]
+                  : ''
+              // 是否含有空参数情况
+              let isNull = false
+              if (obj[searchCondition1[i].key] == '' || obj[searchCondition1[i].key] == undefined) {
+                isNull = true
+              }
+              if (isNull) {
+                message.warning(
+                  searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                )
+                return
+              }
+            } else {
+              // 扩展 转换为筛选条件进行查询
+              if (searchCondition1[i].isSearch) {
+                if (searchCondition1[i].isFormModel) {
+                  //用formModel中的值
+                  if (searchCondition1[i].required) {
+                    if (
+                      formRef.formModel[searchCondition1[i].value] == '' ||
+                      formRef.formModel[searchCondition1[i].value] == undefined
+                    ) {
+                      message.warning(
+                        searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                      )
+                      return
+                    }
+                  }
+                }
+              } else {
+                obj[searchCondition1[i].key] = searchCondition1[i].value
+              }
+            }
+          }
+        }
+
+        if (!formSchema.multiple && val.indexOf(',') > -1) {
+          message.alert('该输入框只能输入一条数据')
+          formRef.setValues(setV)
+          return
+        }
+        await pageApi.value(params.value).then((res) => {
+          let arr1 = val.split(',')
+          let list = ref([])
+          list.value = res
+          if (list.value?.length == 0) {
+            message.alert('暂无数据')
+            formRef.setValues(setV)
+            return
+          }
+          if (arr1.length != list.value.length) {
+            let arr2 = list.value.map((item) => item.code)
+            let str = [
+              ...arr1.filter((item) => !arr2.includes(item)),
+              ...arr2.filter((item) => !arr1.includes(item))
+            ].join(',')
+            message.alert('代码' + str + '没有找到对应数据')
+            formRef.setValues(setV)
+            return
+          }
+          // emit('searchTableSuccess', formField, searchField, list.value, formRef.value, 'form')
+          callback(searchField, list.value)
+        })
+      }
+    }
+ }
 }
 
 // 根据下方输入框失去焦点校验信息
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 1b505cd3d..63cbd4c18 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -843,203 +843,11 @@ const onChange = (field, cur) => {
 const onBlur = async (field, e) => {
   isExecute.value = false
   let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
+ 
   if (formSchemaObj?.enterSearch) {
-    if (formSchemaObj.searchPage && formSchemaObj.verificationParams) {
-      //获取data.ts参数信息
-      let searchCondition =
-        formSchema.value.find((item) => item.field == field)?.componentProps?.searchCondition || []
-      //获取失去焦点参数信息
-      let verificationParams =
-        formSchema.value.find((item) => item.field == field)?.componentProps?.verificationParams ||
-        []
-      console.log('走新方法啦')
-      // searchCondition = [...searchCondition, ...verificationParams]
-
-      if (e && isString(e)) {
-        let setV = {}
-        setV[field] = ''
-        let params = {}
-        const _searchCondition = {}
-        let filters: any[] = []
-        if (searchCondition && searchCondition.length > 0) {
-          // 转换筛选条件所需
-          for (var i = 0; i < searchCondition.length; i++) {
-            // searchCondition.forEach((item) => {
-            // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
-            if (searchCondition[i].isMainValue) {
-              _searchCondition[searchCondition[i].key] = formRef.value.formModel[
-                searchCondition[i].value
-              ]
-                ? formRef.value.formModel[searchCondition[i].value]
-                : props.detailData
-                ? props.detailData[searchCondition[i].value]
-                : // : row
-                  // ? row[searchCondition[i].value]
-                  ''
-              // 是否含有空参数情况
-              let isNull = false
-              if (
-                _searchCondition[searchCondition[i].key] == '' ||
-                _searchCondition[searchCondition[i].key] == undefined
-              ) {
-                isNull = true
-              }
-              if (isNull) {
-                message.warning(
-                  searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
-                )
-                return
-              }
-              filters.push({
-                action: searchCondition[i].action || '==',
-                column: searchCondition[i].key,
-                value: formRef.value.formModel[searchCondition[i].value]
-              })
-            }
-
-            // else if (searchCondition[i].isTableRowValue) {
-            //   if (searchCondition[i].required) {
-            //     if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) {
-            //       message.warning(
-            //         searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
-            //       )
-            //       return
-            //     }
-            //   }
-            //   row[searchCondition[i].value]
-            //   //查询当前table表数据的值
-            //   _searchCondition[searchCondition[i].key] = row[searchCondition[i].value]
-            // }
-            else {
-              // 扩展 转换为筛选条件进行查询
-              if (searchCondition[i].isSearch) {
-                if (searchCondition[i].isFormModel) {
-                  //用formModel中的值
-                  if (searchCondition[i].required) {
-                    if (
-                      formRef.value.formModel[searchCondition[i].value] == '' ||
-                      formRef.value.formModel[searchCondition[i].value] == undefined
-                    ) {
-                      message.warning(
-                        searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
-                      )
-                      return
-                    }
-                  }
-                  filters.push({
-                    action: searchCondition[i].action || '==',
-                    column: searchCondition[i].key,
-                    value: formRef.value.formModel[searchCondition[i].value]
-                  })
-                } else {
-                  filters.push({
-                    action: searchCondition[i].action || '==',
-                    column: searchCondition[i].key,
-                    value: searchCondition[i].value
-                  })
-                }
-              } else {
-                filters.push({
-                action: searchCondition[i].action || '==',
-                column: searchCondition[i].key,
-                value: searchCondition[i].value
-              })
-              }
-            }
-          }
-        }
-        if (verificationParams && verificationParams.length > 0) {
-          // 转换筛选条件所需
-          for (var i = 0; i < verificationParams.length; i++) {
-            // 扩展 转换为筛选条件进行查询
-            if (verificationParams[i].isSearch) {
-              if (verificationParams[i].isFormModel) {
-                filters.push({
-                  action: verificationParams[i].action,
-                  column: verificationParams[i].key,
-                  value: formRef.value.formModel[verificationParams[i].value]
-                    ? formRef.value.formModel[verificationParams[i].value]
-                    : e.trim()
-                })
-              } else {
-                filters.push({
-                  action: verificationParams[i].action,
-                  column: verificationParams[i].key,
-                  value: verificationParams[i].value
-                })
-              }
-            } else {
-              _searchCondition[verificationParams[i].key] = verificationParams[i].value
-            }
-          }
-        }
-        if (filters.length > 0) {
-          _searchCondition.isSearch = true
-          _searchCondition.filters = filters
-        }
-        console.log(4545, _searchCondition)
-        let obj = {
-          by: 'ASC',
-          pageNo: 1,
-          pageSize: 20
-        }
-        console.log(888,_searchCondition)
-        params = {
-          isSearch:_searchCondition.isSearch,
-          filters:_searchCondition.filters,
-          ...obj
-        }
-        // console.log(333,params)
-        if (!formSchemaObj?.multiple && e.indexOf(',') > -1) {
-          message.alert('该输入框只能输入一条数据')
-          formRef.value.setValues(setV)
-          return
-        }
-        await formSchemaObj.searchPage(params).then((res) => {
-          let arr1 = e.split(',')
-          let list = ref([])
-          list.value = res?.list?.length>0 ? res.list.slice(0,1) : []
-          if (list.value?.length == 0) {
-            message.alert('暂无数据')
-            formRef.value.setValues(setV)
-            return
-          }
-          if (arr1.length != list.value.length) {
-            let arr2 = list.value.map((item) => item.code)
-            let str = [
-              ...arr1.filter((item) => !arr2.includes(item)),
-              ...arr2.filter((item) => !arr1.includes(item))
-            ].join(',')
-            message.alert('代码' + str + '没有找到对应数据')
-            formRef.value.setValues(setV)
-            return
-          }
-        })
-      }
-    } else {
-      if (
-        field == 'supplierCode' ||
-        field == 'itemCode' ||
-        field == 'productItemCode' ||
-        field == 'componentItemCode' ||
-        field == 'packUnit' ||
-        field == 'inPackUnit' ||
-        field == 'fromPackingNumber'
-      ) {
-        await FormBlur(
-          field,
-          e,
-          routeName.value,
-          formRef.value,
-          props.detailData,
-          formSchema.value,
-          (searchField, list) => {
-            emit('searchTableSuccess', field, searchField, list, formRef.value, 'form')
-          }
-        )
-        return
-      }
-    }
+   await  FormBlur(field, e, routeName.value, formRef.value, props.detailData, formSchemaObj, (list) => {
+       emit('searchTableSuccess', field, formSchemaObj.searchField, list, formRef.value, 'form')
+     })
   } else {
     emit('onBlur', field, e)
   }
diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
index 1da7b2914..d04cd3304 100644
--- a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
@@ -112,12 +112,21 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库区代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '库区信息', // 查询弹窗标题
         searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
-        searchPage: AreaApi.getAreaPage // 查询弹窗所需分页方法
+        searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -131,12 +140,21 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库区代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '库区信息', // 查询弹窗标题
         searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
-        searchPage: AreaApi.getAreaPage // 查询弹窗所需分页方法
+        searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
index 0e898074d..5ddace825 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
@@ -80,7 +80,7 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
           isMainValue: false
         }],
         verificationParams: [{
-          key: 'itemCode',
+          key: 'code',
           action: '==',
           value: '',
           isMainValue: false,

From fc99b567882eb054b173e4c6175f7ad5d7e2aa6f Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 14:44:48 +0800
Subject: [PATCH 23/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B1=E5=8E=BB?=
 =?UTF-8?q?=E7=84=A6=E7=82=B9=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/business/{business.ts => inputBlur.ts} | 0
 src/components/BasicForm/src/BasicForm.vue         | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/api/wms/business/{business.ts => inputBlur.ts} (100%)

diff --git a/src/api/wms/business/business.ts b/src/api/wms/business/inputBlur.ts
similarity index 100%
rename from src/api/wms/business/business.ts
rename to src/api/wms/business/inputBlur.ts
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 63cbd4c18..c36b73763 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -147,7 +147,7 @@ import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
 import TableForm from '@/components/TableForm/src/TableForm.vue'
 import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-import { tableFormBlurVer, FormBlur, getListByBottonInput } from '@/api/wms/business/business'
+import { tableFormBlurVer, FormBlur, getListByBottonInput } from '@/api/wms/business/inputBlur'
 import { isString } from 'min-dash'
 
 const props = defineProps({

From 48da3b3e0d1a785811dcb9399da96b271fd8402b Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Mon, 15 Jul 2024 14:52:38 +0800
Subject: [PATCH 24/51] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain/index.vue      |  2 +-
 .../supplierinvoiceRequestMain.data.ts        | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 771551e40..02b820b49 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -189,7 +189,7 @@
     :buttondataTable = "[{
         label: t('ts.打印'),
         name: 'print',
-        hide: false,
+        hide: true,
         type: 'primary',
         // icon: 'ep:operation',
         color: '',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index a79243100..dab603fea 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -2004,18 +2004,18 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
   },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 250,
-      fixed: 'right'
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-  }
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 250,
+  //     fixed: 'right'
+  //   },
+  //   hiddenInMain:true,
+  //   isTableForm: false,
+  // }
 ]))
 // 批次校验
 const validateSinglePrice = (rule: any, value: any, callback: any) => {

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

---
 src/locales/en-US.ts                          |    2 +
 src/locales/zh-CN.ts                          |    2 +
 .../index.vue                                 |  325 ---
 .../index.vue                                 |  468 +++++
 ...plierinvoiceRequestMainDifference.data.ts} | 1740 +++++++++++------
 5 files changed, 1592 insertions(+), 945 deletions(-)
 delete mode 100644 src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/index.vue
 create mode 100644 src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
 rename src/views/wms/supplierManage/supplierinvoice/{supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts => supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts} (53%)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 70665df76..b11c59122 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1152,6 +1152,8 @@ export default {
     '要货预测-供应商':'Demand forecast-Supplier',
     全选:'All',
     计划员:'Planner',
+    最小值:'Min',
+    最大值:'Max',
 
 
   },
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 9e6733363..35e3cd8fa 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1152,6 +1152,8 @@ export default {
     '要货预测-供应商':'要货预测-供应商',
     全选:'全选',
     计划员:'计划员',
+    最小值:'最小值',
+    最大值:'最大值',
 
   },
 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/index.vue
deleted file mode 100644
index 2e12c467d..000000000
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/index.vue
+++ /dev/null
@@ -1,325 +0,0 @@
-<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/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
new file mode 100644
index 000000000..13e1a4e07
--- /dev/null
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
@@ -0,0 +1,468 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search class="search-box" :schema="SupplierinvoiceRequestMain.allSchemas.searchSchema" @search="searchList" @reset="resetList" >
+      <template #cha>
+        <div style="display:flex;flex-direction: row">
+          <el-input-number v-model="staDifferencePrice" :max="endDifferencePrice" size="small" :placeholder="t('ts.最小值')"/>-<el-input-number v-model="endDifferencePrice" :min="staDifferencePrice" size="small" :placeholder="t('ts.最大值')"/>
+        </div>
+      </template>
+    </Search>
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead 
+      :HeadButttondata="HeadButttondata" 
+      @button-base-click="buttonBaseClick" 
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns" 
+      @searchFormClick="searchFormClick"
+    :allSchemas="SupplierinvoiceRequestMain.allSchemas"
+ 
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table ref="tableRef"
+    :selection="true"
+    :selectionColor="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, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #differencePrice="{row}">
+        <span :class="{'red-text':row.differencePrice!=0}">{{ Number(row.differencePrice).toFixed(2) }}</span>
+      </template>
+    </Table>
+  </ContentWrap>
+
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef" 
+    :isOpenSearchTable="true"
+    fieldTableColumn="poLine"
+    :annexTable="detailAnnexTable"
+    direction="horizontal"
+    :column="3"
+    :annexAlias="{
+      hidden:true,
+      label:t('ts.其他附件')
+    }"
+    :otherHeadButttonData="[{
+        label: t('ts.打印明细'),
+        name: 'printing',
+        hide: false,
+        type: 'primary',
+        // icon: 'ep:operation',
+        color: '',
+        float:'left',
+        hasPermi: ''
+    },{
+        label: t('ts.打印全部发货单'),
+        name: 'printing-all',
+        hide: false,
+        type: 'primary',
+        // icon: 'ep:operation',
+        color: '',
+        float:'left',
+        hasPermi: ''
+    },{
+        label: t('ts.导出明细'),
+        name: 'export-detail',
+        hide: false,
+        type: 'primary',
+        // icon: 'ep:operation',
+        color: '',
+        float:'left',
+        hasPermi: ''
+    }]"
+    :buttondataTable = "[{
+        label: t('ts.打印'),
+        name: 'print',
+        hide: false,
+        type: 'primary',
+        // icon: 'ep:operation',
+        color: '',
+        float:'left',
+        link: true, // 文本展现按钮
+        hasPermi: ''
+    }]"
+    :sumFormDataByForm ="(formRef,formModel)=>{
+      const {singlePrice=0,purchasePrice=0} = formModel
+      formRef.value.setValues({
+        differencePrice:Number((Number(singlePrice)-Number(purchasePrice)).toFixed(2))
+      })
+    }"
+    :isBasic="false" 
+    :allSchemas="SupplierinvoiceRequestDetailMain.allSchemas"
+    :detailAllSchemas="SupplierinvoiceRequestDetail.allSchemas"
+    :detailAllSchemasRules="SupplierinvoiceRequestDetailRules" 
+    :searchTableParams="searchTableParams"
+    :apiCreate="SupplierinvoiceRequestDetailApi.createSupplierinvoiceRequestDetail"
+    :apiUpdate="SupplierinvoiceRequestDetailApi.updateSupplierinvoiceRequestDetail"
+    :apiPage="SupplierinvoiceRequestDetailApi.getSupplierinvoiceRequestDetailPage"
+    :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail" 
+    :Echo="Echo"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :detailButtonIsShowAdd="false"
+    @buttonBaseClick="detailButtonBaseClick"
+    @tableFormButton="tableFormButton"
+    :mainSubmitCreateApi="true"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @handleMainFefresh="handleMainFefresh"
+  >
+    <template #differencePrice="{row}">
+      <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
+    </template>
+  </Detail>
+
+
+</template>
+<script setup lang="ts">
+import dayjs from 'dayjs'
+// 供应商发票申请
+  import download from '@/utils/download'
+  import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+  import { SupplierinvoiceRequestMain, 
+    SupplierinvoiceRequestMainRules, 
+    SupplierinvoiceRequestDetail, 
+    SupplierinvoiceRequestDetailRules,
+    SupplierinvoiceRequestFinance,
+    SupplierinvoiceRequestFinanceRules,
+    PurchasePass,
+    PurchasePassRules,
+    SupplierinvoiceRequestDetailMain
+  } from './supplierinvoiceRequestMainDifference.data'
+  import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
+  import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import * as SupplierApi from '@/api/wms/supplier'
+  import { Supplier } from '../../../basicDataManage/supplierManage/supplier/supplier.data'
+  import { getAccessToken } from '@/utils/auth'
+  import { ElMessageBox } from 'element-plus'
+  import { getJmreportBaseUrl } from '@/utils/systemParam'
+  import { accountantFormart } from '@/utils/formatter'
+
+  defineOptions({ name: 'SupplierinvoiceRequestMain' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(SupplierinvoiceRequestMain.allSchemas.tableColumns)
+
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+  // 查询列表页面参数设置
+  const searchTableParams = ref([
+    {
+      formField: 'supplierCode',
+      searchTableTitle: t('ts.供应商信息'),
+      searchTableAllSchemas: Supplier.allSchemas,
+      searchTablePage: SupplierApi.getSupplierPage
+    }
+  ])
+
+const staDifferencePrice = ref() 
+const endDifferencePrice = ref() 
+const searchList = (model)=>{
+  model.staDifferencePrice = staDifferencePrice.value
+  model.endDifferencePrice = endDifferencePrice.value
+  console.log('searchList',model)
+  selectionRows.value = []
+  setSearchParams(model)
+}
+const resetList = (model)=>{
+  staDifferencePrice.value = null
+  endDifferencePrice.value = null
+  searchList(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 handleMainFefresh = ()=>{
+  getList()
+}
+
+const searchTableSuccessDetail = async (formField, searchField, val, formRef,searchTableFormModel)=>{
+  console.log('详情',formField, searchField, val, formRef,searchTableFormModel)
+  val.forEach(item=>{
+    item.deliveryDate = item['prhRcpDate']
+    item.arrivalQty = item['prhRcvd']
+  })
+  await SupplierinvoiceRequestDetailApi.createSupplierinvoiceRequestDetail({
+    masterId:searchTableFormModel.masterId,
+    subList:val
+  })
+  detailRef.value.updateList()
+  getList()
+}
+
+
+  const Echo = []
+
+  const { tableObject, tableMethods } = useTable({
+    getListApi: SupplierinvoiceRequestMainApi.getSupplierinvoiceRequestMainPage // 分页接口  
+  })
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultExportBtn({hasPermi: 'wms:supplierinvoice-request-main:export'}), // 导出
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+  ]
+
+  // 头部按钮事件
+  const buttonBaseClick = (val, item) => {
+    if (val == 'export') { // 导出
+      handleExport()
+    } else if (val == 'refresh') { // 刷新
+      if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+    } else if (val == 'filtrate') { // 筛选
+    } else { // 其他按钮
+      console.log('其他按钮', item)
+    }
+  }
+
+  // 获取部门 用于详情 部门回显
+  const { wsCache } = useCache()
+  /** 详情操作 */
+  const detailRef = ref()
+  const clicKRowId = ref();
+  const detailAnnexTable = ref(
+  [{
+    label: t('ts.合同附件'),
+    prop: 'Annex',
+    tableName:'contract',
+    hiddenDelete:true,
+    hiddenUpload:true,
+    fileSize:20
+  },{
+    label: t('ts.发票附件'),
+    prop: 'Annex',
+    tableName:'invoice',
+    hiddenDelete:true,
+    hiddenUpload:true,
+    fileSize:20
+
+  },{
+    label: t('ts.货运单附件'),
+    prop: 'Annex',
+    tableName:'waybill',
+    hiddenDelete:true,
+    hiddenUpload:true,
+    fileSize:20
+  },{
+    label: t('ts.其他附件'),
+    prop: 'Annex',
+    tableName:'invoiceOther',
+    hiddenDelete:true,
+    hiddenUpload:true,
+    fileSize:20
+  }])
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+    if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+    clicKRowId.value = row.id
+    detailRef.value.openDetail(row, titleName, titleValue)
+  }
+
+  /** 导出按钮操作 */
+  const exportLoading = ref(false) // 导出的加载中
+  const handleExport = async () => {
+    let rows:any = []
+    selectionRows.value.forEach(item=>{
+      rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
+    })
+
+    let paramsData =JSON.parse(JSON.stringify(tableObject.params))
+    if(tableObject.params&&tableObject.params.isSearch==true){
+      paramsData.filters.push({
+        action: "in",
+        column: "number",
+        value: rows.join(",")
+      })
+    }else{
+      paramsData = {...paramsData,checkNums:rows}
+    }
+    console.log('批量导出',paramsData)
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestMain(paramsData)
+      download.excel(data, `${t('ts.供应商发票申请主')}.xlsx`)
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+
+
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  SupplierinvoiceRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  const tableData = ref([])
+
+  // 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: `${t('ts.供应商发票申请主导入模板')}.xlsx`
+})
+
+
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
+  }
+
+  // 详情--头部按钮事件
+  const detailButtonBaseClick = (val, item) => {
+    console.log("点击的按钮",val)
+    if(val == 'printing'){
+      // 单据打印
+      handleDocumentPrint(clicKRowId.value)
+    }else if(val === 'printing-all'){
+      //打印全部发货单
+      handlePrintAll(clicKRowId.value)  
+    }else if(val === 'export-detail'){
+      console.log("导出明细:",clicKRowId.value)
+      handleDetailExport(clicKRowId.value)
+    }
+  }
+
+  const tableFormButton = (val, item) => {
+    console.log("点击的按钮",val)
+    if(val == 'print'){
+      // 打印
+      SupplierinvoiceRequestMainApi.printSupplierRecord(item.asnBillNum).then(res =>{
+        if(res){
+          handleSupplierdeliverRecordPrint(res);
+        }
+      })
+    }
+  }
+
+ /** 导出明细按钮操作 */
+ const exportLoadingDetail = ref(false) // 导出的加载中
+  const handleDetailExport = async (masterId) => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出导出明细
+      exportLoadingDetail.value = true
+      let params = {
+        masterId: masterId
+      }
+      const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestDetail(params)
+      download.excel(data, `${t('ts.供应商发票申请明细')}.xlsx`)
+    } catch {
+    } finally {
+      exportLoadingDetail.value = false
+    }
+  }
+
+  const BASE_URL = getJmreportBaseUrl()
+
+  //供应商发货单打印    
+  const documentSupplierdeliverRecordSrc = ref(BASE_URL + '/jmreport/view/932556833517789184?token=' + getAccessToken())
+  const handleSupplierdeliverRecordPrint = async (id) => {
+      window.open(documentSupplierdeliverRecordSrc.value + '&id=' + id)
+  }
+
+  // 单据打印
+  const documentSrc = ref(BASE_URL + '/jmreport/view/936875675614240768?token=' + getAccessToken())
+  const handleDocumentPrint = async (id) => {
+    window.open(documentSrc.value + '&id=' + id)
+  }
+
+  const handlePrintAll = async (masterId) => {
+    // 打印
+    SupplierinvoiceRequestMainApi.printSupplierRecordByMasterId(masterId).then(res =>{
+        if(res && res.length > 0){
+          for(let i=0;i<res.length;i++){
+            let id = res[i];
+            handleSupplierdeliverRecordPrint(id);
+          }
+        }else{
+          message.warning(t('ts.非SCP订单无法打印'))
+          return;
+        }
+      })
+  }
+ 
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await SupplierinvoiceRequestMainApi.importTemplate()
+  })
+</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;
+}
+.search-box .el-input-number__decrease {
+    display: none !important;
+}
+::v-deep(.el-input-number__decrease) {
+  display: none !important;
+}
+::v-deep(.el-input-number__increase) {
+  display: none !important;
+}
+
+
+</style>
+./supplierinvoiceRequestMainDifference.data
\ No newline at end of file
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
similarity index 53%
rename from src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts
rename to src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
index 750b54375..652c04092 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@@ -2,32 +2,159 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import { accountantFormart } from '@/utils/formatter'
 
+import * as SupplierApi from '@/api/wms/supplier'
+import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+const { t } = useI18n() // 国际化
+
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+import * as supplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize: 10,
+  pageNo: 1,
+  code: 'PurchaseInvoiceRequest'
+}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+
+const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase',pageSize: 1000,pageNo: 1,sort: '',by: 'ASC' })
 /**
- * @returns {Array} 供应商发票记录主表
+ * @returns {Array} 采购员列表
  */
-export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+export const PurchaseMemberInfo = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '单据号',
-    field:'number',
+    label: '用户编号',
+    field: 'id',
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '用户名称',
+    field: 'username',
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '用户昵称',
+    field: 'nickname',
+    table: {
+      width: 180,
+    },
+  }
+]))
+
+/**
+ * @returns {Array} 采购订单或者采购退货单
+ */
+export const PurchaseReceiptOrReturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据类型',
+    field: 'billType'
+  },
+  {
+    label: '收货日期',
+    field: 'deliveryDate',
     sort: 'custom',
+    isDetail:false,
+    isTable: true,
+    isForm:false,
+    isTableForm:false,
+    isSearch:true,
+    formatter: dateFormatter2,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
+  },
+  {
+    label: '待开票单据号',
+    field: 'recvBillNum',
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '供应商发货单号',
+    field: 'asnBillNum',
     table: {
       width: 180,
-      fixed: 'left'
     },
-    isSearch: false
   },
   {
-    label: '发票申请单号',
-    field:'requestNumber',
+    label: '供应商代码',
+    field: 'supplierCode'
+  },
+  {
+    label: '订单号',
+    field: 'poNumber'
+  },
+  {
+    label: '订单行',
+    field: 'poLine'
+  },
+  {
+    label: '采购价格',
+    field: 'purchasePrice'
+  },
+  {
+    label: '可开票数量',
+    field: 'invoicableQuantity'
+  },
+  {
+    label: '货币',
+    field: 'currency',
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode'
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTableForm: false,
+    isForm: false
+  }
+]))
+
+
+/**
+ * @returns {Array} 供应商发票申请主表
+ */
+export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
       width: 180,
       fixed: 'left'
     },
-    sortSearchDefault:1,
-    sortTableDefault:1,
-    isSearch: true
+    isSearch: true,
+    isForm: false
   },
+  
   {
     label: '供应商代码',
     field: 'supplierCode',
@@ -36,45 +163,54 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     sortTableDefault:1,
-    isSearch: true
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {    
+        enterSearch:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPageSCP // 查询弹窗所需分页方法
+      }
+    }
   },
   {
-    label: '供应商名称',
-    field: 'supplierName',
+    label: '订单类型',
+    field: 'orderType',
+    dictType: DICT_TYPE.PURCHASE_INVOICE_ORDER_TYPE,
+    dictClass: 'string',
+    isTable: false,
     sort: 'custom',
     table: {
-      width: 180,
+      width: 150
     },
-    sortTableDefault:2,
-    isForm: false,
-    isSearch: true
   },
   {
-    label: '税率',
-    field: 'taxRate',
+    label: '供应商名称',
+    field: 'supplierName',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180,
     },
-    sortTableDefault:3,
-    form: {
-      component: 'InputNumber',
-    }
+    sortTableDefault:2,
+    isSearch: true,
+    isForm: false
   },
-  
-  
   {
     label: '状态',
     field: 'status',
     dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
     dictClass: 'string',
     isTable: true,
-    sortTableDefault:7,
     isForm:false,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:9,
     isSearch: true,
     form: {
       value: '1',
@@ -83,81 +219,210 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  
-  // {
-  //   label: '申请单号',
-  //   field: 'requestNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 180,
-  //   },
-  //   isTable: false,
-  //   isSearch: true
-  // },
+  //子表数据，仅是查询条件
   {
-    label: '订单号',
-    field: 'poNumber',
+    label: '货运单号',
+    field: 'asnBillNum',
     sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm:false,
     isTable:false,
+    isDetail:false,
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '系统未税金额',
+    field: 'amount',
+    formatter: accountantFormart,
     table: {
       width: 150
     },
+    sortTableDefault:8,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 2,
+    }
   },
   {
-    label: '金税票号',//金税票号
-    field: 'goldenTaxInvoiceNumber',
+    label: '税率(%)',
+    field: 'taxRate',
+    dictType: DICT_TYPE.TAX_RATE_DICT,
+    dictClass: 'string',
+    sortTableDefault:3,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:5,
-    isSearch: true
   },
+  
+  // {
+  //   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: 'beforeTaxDiffAmount',
+    label: '系统税额',
+    field: 'taxAmount',
     formatter: accountantFormart,
     table: {
       width: 150
     },
-    sortTableDefault:5,
-    isForm:false,
-    isTableForm:false
+    sortTableDefault:6,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 2,
+    }
   },
   {
-    label: '税额差异',
-    field: 'taxAmountDiff',
+    label: '系统价税合计',
+    field: 'afterTaxAmount',
     formatter: accountantFormart,
     table: {
       width: 150
     },
-    sortTableDefault:5,
-    isForm:false,
-    isTableForm:false
+    sortTableDefault:7,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 2,
+      disabled: true,
+    }
   },
   {
-    label: '价税合计差额',
-    field: 'totalTaxDiffAmount',
+    label: '索赔金额',
+    field: 'claimAmount',
     formatter: accountantFormart,
     table: {
       width: 150
     },
-    sortTableDefault:5,
+    isTable:false,
+    isTableForm:false,
     isForm:false,
-    isTableForm:false
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 2,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 2,
+    }
   },
-  
+  // {
+  //   label: '调整价差',
+  //   field: 'discountAmount',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:false,
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       precision: 2,
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 0,
+  //     precision: 2,
+  //   }
+  // },
+  // {
+  //   label: '调整税额',
+  //   field: 'adjustingTaxAmount',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:false,
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       precision: 2,
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 0,
+  //     precision: 2,
+  //   }
+  // },
   {
-    label: '系统税额',
-    field: 'taxAmount',
+    label: '折扣金额',
+    field: 'discountAmount1',
     formatter: accountantFormart,
-    sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:8,
+    isTable:false,
     form: {
       component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 2,
     }
   },
   {
@@ -168,8 +433,14 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     sortTableDefault:3,
-    isForm:false,
-    isTableForm:false
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    isTableForm:false,
   },
   {
     label: '税额',
@@ -178,9 +449,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault:3,
-    isForm:false,
-    isTableForm:false
+    sortTableDefault:4,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    isTableForm:false,
   },
   {
     label: '价税合计金额',
@@ -189,9 +466,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault:3,
-    isForm:false,
-    isTableForm:false
+    sortTableDefault:5,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    isTableForm:false,
   },
   {
     label: '是否有价差',
@@ -205,7 +488,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault:3,
+    sortTableDefault:5,
   },
   {
     label: '价差说明',
@@ -220,147 +503,96 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:5,
   },
   {
-    label: '系统价税合计',//税后金额
-    field: 'afterTaxAmount',
+    label: '未税差额',
+    field: 'beforeTaxDiffAmount',
     formatter: accountantFormart,
-    sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:9,
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  
-  {
-    label: '价差',//总差额
-    field: 'totalDifference',
-    table: {
-      width: 150
-    },
-    isTable: false,
+    sortTableDefault:5,
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0,
-        precision: 6,
+        precision: 2,
+        disabled: true,
       }
     },
-    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',
-    }
+    isTableForm:false,
   },
   {
-    label: '调整价差',
-    field: 'discountAmount',
+    label: '税额差异',
+    field: 'taxAmountDiff',
     formatter: accountantFormart,
-    sort: 'custom',
     table: {
       width: 150
     },
-    isDetail:false,
-    isTable: false,
+    sortTableDefault:5,
     form: {
       component: 'InputNumber',
-    }
-  },
-  {
-    label: '调整税额',
-    field: 'adjustingTaxAmount',
-    formatter: accountantFormart,
-    sort: 'custom',
-    isDetail:false,
-    table: {
-      width: 150
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
     },
-    isTable: false,
-    form: {
-      component: 'InputNumber',
-    }
+    isTableForm:false,
   },
-
   {
-    label: '未税差额',
-    field: 'untaxedDifference',
+    label: '价税合计差额',
+    field: 'totalTaxDiffAmount',
     formatter: accountantFormart,
     table: {
       width: 150
     },
+    sortTableDefault:5,
+    isTableForm:false,
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0,
-        precision: 6,
+        precision: 2,
+        disabled: true,
       }
     },
-    isTable: false,
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6,
-    }
   },
+  
+  // {
+  //   label: '总差额',
+  //   field: 'totalDifference',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:false,
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       precision: 2,
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 0,
+  //     precision: 2,
+  //   }
+  // },
   {
-    label: '含税差额',
-    field: 'taxInclusiveDifference',
-    formatter: accountantFormart,
+    label: '金税票号',
+    field: 'goldenTaxInvoiceNumber',
     table: {
-      width: 150
+      width: 150,
     },
-    isTable: false,
-    form: {
-      component: 'InputNumber',
+    sortTableDefault:10,
+    form:{
       componentProps: {
-        min: 0,
-        precision: 6,
+        maxlength:23,
+        showWordLimit:true
       }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6,
     }
   },
   {
     label: '快递单号',
     field: 'expressTrackingNumber',
-    sort: 'custom',
     isTable:false,
     isForm:false,
-    isSearch:false,
     table: {
       width: 150
     },
@@ -368,25 +600,24 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '开票日期',
     field: 'invoiceTime',
-    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-    form:{
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:11,
+    form: {
       component: 'DatePicker',
       componentProps: {
         style: {width:'100%'},
         type: 'datetime',
-        dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD
-        valueFormat: 'x',//数据转成时间戳
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
-    sortTableDefault:4,
-    sort: 'custom',
-    table: {
-      width: 180
-    },
   },
   // {
   //   label: '采购审批人',
@@ -400,89 +631,89 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   isTableForm: false,
   //   isForm:false,
   //   isSearch:false,
-  //   sortTableDefault:10
+  //   sortTableDefault:12
   // },
   {
     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',//数据转成时间戳
-      }
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-    isTable: true,
-    sortTableDefault:6,
     sort: 'custom',
     table: {
       width: 180
     },
-    isSearch: true,
-    search: {
-      value:[],
+    isTable:false,
+    isDetail:false,
+    form: {
       component: 'DatePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        dateFormat: 'YYYY-MM-DD',
-        type: 'daterange',
-        defaultTime: [new Date('1 '), new Date('1 ')]
+        disabled: true,
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
   },
+  
   {
-    label: '创建日期',
-    field: 'createTime',
+    label: '申请时间',
+    field: 'requestTime',
     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:[],
+    isTable:false,
+    isForm:false,
+    form: {
       component: 'DatePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        dateFormat: 'YYYY-MM-DD',
-        type: 'daterange',
-        defaultTime: [new Date('1 '), new Date('1 ')]
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
   },
-  //子表数据，仅是查询条件
   {
-    label: '货运单号',
-    field: 'asnBillNum',
+    label: '部门',
+    field: 'departmentCode',
     sort: 'custom',
     table: {
-      width: 180,
-      fixed: 'left'
+      width: 150
     },
+    isTable:false,
     isTableForm:false,
+    isForm:false,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 150
+    },
     isTable:false,
-    isDetail:false,
-    isSearch: true,
+    sortTableDefault:1001,
     isForm: false,
   },
   {
@@ -500,55 +731,11 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '财务凭证号',
-    field: 'voucherNumber',
-    sort: 'custom',
-    table: {
-      width: 180,
-    },
+    label: '创建时间',
+    field: 'createTime',
     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,
+    sortTableDefault:1000,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
@@ -556,40 +743,42 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-  },
-  {
-    label: '生效日期',
-    field: 'activeDate',
-    isTable:false,
-    isTableForm:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
+    isForm: false,
+    isSearch: true,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetimerange',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    search: {
+      value:[],
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'datetimerange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
     },
   },
   {
-    label: '申请时间',
-    field: 'requestTime',
-    isTable:false,
-    isTableForm:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+    label: '最后更新者',
+    field: 'updater',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
+    isTable:false,
+    isForm: false,
   },
   {
-    label: '截止时间',
-    field: 'dueTime',
-    isTable:false,
-    isTableForm:false,
+    label: '最后更新时间',
+    field: 'updateTime',
+    isTable: false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -598,103 +787,153 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
   },
   {
-    label: '部门',
-    field: 'departmentCode',
-    isTable:false,
-    isTableForm:false,
-    sort: 'custom',
+    label: '采购价格审批人',
+    field: 'procurementCreator',
     table: {
       width: 150
     },
-  },
-  {
-    label: '代码',
-    field: 'code',
+    sortTableDefault:14,
+    isForm: true,
     isTable:false,
-    isTableForm:false,
     isDetail:false,
-    sort: 'custom',
+    form: {
+      component: 'Select',
+      api: () => procurementCreators.list,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'nickname',
+          valueField: 'id'
+        }
+      },
+      // labelMessage: '信息提示说明！！！',
+      // componentProps: {
+      //   isSearchList: true, // 开启查询弹窗
+      //   hiddenFilterButton:true,//是否隐藏筛选按钮
+      //   dialogWidth:'665px',//搜索出来弹窗的宽度
+      //   searchListPlaceholder: '请选择采购员', // 输入框占位文本
+      //   searchField: 'id', // 查询弹窗赋值字段
+      //   searchTitle: '采购员信息', // 查询弹窗标题
+      //   searchAllSchemas: PurchaseMemberInfo.allSchemas, // 查询弹窗所需类
+      //   searchPage: SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode, // 查询弹窗所需分页方法
+      //   searchCondition: [{
+      //     key: 'roleCode', // 查询列表中字段
+      //     value: 'purchase', // 指查询具体值
+      //     isMainValue: false // 表示查询条件不是主表的字段的值
+      //   }]
+      // }
+    }
+  },
+  {
+    label: '采购价格审批人',
+    field: 'procurementCreatorName',
     table: {
       width: 150
     },
+    sortTableDefault:14,
+    isForm: false,
+    isTable:true,
+    isDetail:false,
+    form: {
+      component: 'Select',
+      api: () => procurementCreators.list,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'nickname',
+          valueField: 'id'
+        }
+      },
+    }
   },
+  // {
+  //   label: '采购审批人',
+  //   field: 'procurementCreatorName',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTable:true,
+  //   isDetail: true,
+  //   isTableForm: false,
+  //   isForm:false,
+  //   isSearch:false,
+  //   sortTableDefault:12
+  // },
+ 
   {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable:false,
-    isDetail:false,
-    isTableForm:false,
+    label: '采购审批时间',
+    field: 'procurementCreateTime',
+    isTable: true,
+    sortTableDefault:13,
+    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: 150
+      width: 180
     },
+    isForm: false,
   },
   {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    isTable:false,
-    isTableForm:false,
-    dictClass: 'string',
-  },
-  {
-    label: '创建者',
-    field: 'creator',
+    label: '财务审批人',
+    field: 'financialCreatorName',
     sort: 'custom',
-    sortTableDefault:1000,
-    isTable: false,
     table: {
       width: 150
     },
+    sortTableDefault:14,
+    isForm: false,
   },
   {
-    label: '创建时间',
-    field: 'createTime',
-    isTable: false,
-    sortTableDefault:1001,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
+    label: '采购驳回原因',
+    field: 'purchaseRejectCause',
     table: {
       width: 180
     },
+    sortTableDefault:16,
+    isTable: true,
+    isSearch: false,
+    isForm: false,
+    isDetail:false,
   },
   {
-    label: '采购审批人',
-    field: 'procurementCreatorName',
-    sort: 'custom',
+    label: '财务驳回原因',
+    field: 'financeRejectCause',
     table: {
       width: 180
-    },
-    isTable:true,
-    isDetail: true,
-    isTableForm: false,
-    isForm:false,
-    isSearch:false,
-    sortTableDefault:10
+    },
+    sortTableDefault:17,
+    isTable: true,
+    isSearch: false,
+    isForm: false,
+    isDetail:false,
   },
-  // {
-  //   label: '采购审批人代码',
-  //   field: 'procurementCreator',
-  //   sortTableDefault:1002,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable: false,
-  //   isForm: false,
-  // },
   {
-    label: '采购审批时间',
-    field: 'procurementCreateTime',
-    sortTableDefault:11,
+    label: '财务审批时间',
+    field: 'financialCreateTime',
     isTable: true,
+    sortTableDefault:15,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -715,20 +954,33 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '财务审批人',
-    field: 'financialCreatorName',
+    label: '供应商审批人',
+    field: 'supplierCreator',
     sort: 'custom',
+    isTable:false,
+    isDetail:false,
+    sortTableDefault:1006,
     table: {
-      width: 150
+      width: 180
     },
-    sortTableDefault:12,
     isForm: false,
   },
   {
-    label: '财务审批时间',
-    field: 'financialCreateTime',
-    sortTableDefault:13,
-    isTable: true,
+    label: '供应商审批人',
+    field: 'supplierCreatorName',
+    sort: 'custom',
+    isTable:false,
+    isDetail:true,
+    sortTableDefault:1006,
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '供应商审批时间',
+    field: 'supplierCreateTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -748,82 +1000,113 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     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',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
-    isTable:false,
-    isTableForm:false,
     table: {
       width: 150
     },
-    isForm: false,
+    isForm:false,
+    isTable: false,
   },
   {
-    label: '供应商审批时间',
-    field: 'supplierCreateTime',
-    isTable:false,
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm:false,
     isTableForm:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    isDetail:false,
+    sort: 'custom',
+    table: {
+      width: 150
     },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm:false,
+    isTableForm:false,
+    isDetail:false,
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
-    isForm: false,
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
   },
   {
-    label: '凭证描述',
-    field: 'voucherNumberRemark',
-    isTable:true,
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm:false,
     isTableForm:false,
+    isDetail:false,
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
-    isForm: false,
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
   },
   {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
+    label: '跳过任务生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm:false,
+    isTableForm:false,
+    isDetail:false,
+    sort: 'custom',
     table: {
-      width: 150,
-      fixed: 'right'
+      width: 150
     },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
   }
 ]))
 /**
  * @returns {Array} 供应商发票在详情展示的主表字段
  */
-export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchema[]>([
+export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '汇总信息',
     field: '',
@@ -899,7 +1182,6 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     label: '供应商名称',
     field: 'supplierName',
     sort: 'custom',
-    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1013,6 +1295,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
   {
     label: '采购价格审批时间',
     field: 'procurementCreateTime',
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sortTableDefault: 1003,
     isForm: false,
     isTable: false,
@@ -1107,7 +1392,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     label: '财务审批时间',
     field: 'financialCreateTime',
     formatter: dateFormatter,
-    
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1194,105 +1481,145 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isSearch: false,
     isDetail: true,
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    sortTableDefault:1000,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+
 ]))
+const singlePriceFormart = (row, column, cellValue) => {
+  cellValue= Number(cellValue).toFixed(2)
+  cellValue = cellValue + '' || ''
+
+  let x = cellValue.split('.')
+  let x1 = x[0]
+  let x2  = x.length > 1 ? '.' + x[1] : ''
+  const reg = /(\d+)(\d{3})/
+  while(reg.test(x1)){
+    x1 = x1.replace(reg, '$1,$2')
+  }
+  return x1+x2
+}
+
+function validateTaxRate(rule, value, callback) {
+  if (value>0) {
+    callback()
+  }else{
+    callback(new Error('税率必须大于0'))
+  }
+}
+
 //表单校验
-export const SupplierinvoiceRecordMainRules = reactive({
-  requestNumber: [
-    { required: true, message: '请选择申请单号', trigger: 'change' }
+export const SupplierinvoiceRequestMainRules = reactive({
+  taxRate: [
+    required,
+    { validator:validateTaxRate, message: '税率必须大于0', trigger: 'blur'}
   ],
   supplierCode: [
     { required: true, message: '请选择供应商代码', trigger: 'change' }
   ],
-  outTransaction: [
-    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  invoiceTime:[
+    { required: false, 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' }
+  goldenTaxInvoiceNumber:[
+    { required: false, message: '请输入金税票号', trigger: 'blur' }
   ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],
-  interfaceType: [
-    { required: true, message: '请选择接口类型', trigger: 'change' }
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
   ],
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
   ],
   businessType: [
     { required: true, message: '请输入业务类型', trigger: 'blur' }
   ],
-  createTime: [
-    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  procurementCreator: [
+    { required: true, message: '请选择采购员', trigger: 'change' }
   ],
-  creator: [
-    { required: true, message: '请输入创建者', trigger: 'blur' }
+  beforeTaxAmount: [
+    { required: true, message: '请输入未税金额', trigger: 'change' }
+  ],
+  totalTaxAmount: [
+    { required: true, message: '请输入税额', trigger: 'change' }
   ],
 })
 
-/**
- * @returns {Array} 供应商发票记录子表
- */
-export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+export const SupplierinvoiceRequestFinance = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '项目编号',
-    field: 'projectCode',
-    isTable:false,
-    sort: 'custom',
-    table: {
-      width: 150
+    label: '过账日期',
+    field: 'postingDate',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-  },
-  {
-    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
+    isTable:false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
     },
-    sortTableDefault:7,
   },
   {
-    label: '订单行',
-    field: 'poLine',
+    label: '凭证描述',
+    field: 'voucherNumberRemark',
     sort: 'custom',
-    table: {
-      width: 150
+    isTable:false,
+    form: {
+      component: 'Input',
+      componentProps:{
+        type: 'textarea'
+      }
     },
   },
+]))
+
+export const SupplierinvoiceRequestFinanceRules = reactive({
+  postingDate: [
+    { required: true, message: '请选择过账日期', trigger: 'change' }
+  ],
+  // voucherNumberRemark:  [
+  //   { max: 50, message: '不得超过40个字符', trigger: 'blur' }
+  // ],
+})
+/**
+ * @returns {Array} 供应商发票申请子表
+ */
+export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '待开票单据号',
-    field: 'recvBillNum',
+    label: '物料代码',
+    field: 'itemCode',
     table: {
       width: 150
     },
-    sortTableDefault:9,
     form: {
       componentProps: {
         disabled: true
@@ -1303,39 +1630,19 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    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,
+    label: '物料名称',
+    field: 'itemName',
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
   },
   {
     label: '物料描述',
@@ -1343,215 +1650,408 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    sortTableDefault:4,
     isForm:false,
     isTableForm:false,
     isDetail: false,
     isTable: true,
   },
-  {
-    label: '到货时间',
-    field: 'planArriveTime',
-    table: {
-      width: 150
-    },
-    formatter: dateFormatter2,
-    sortTableDefault:5,
+  
+   //仅是主列表页面的筛选搜索条件
+   {
+    label: '收货日期',
+    field: 'deliveryDate',
+    sort: 'custom',
+    isDetail:false,
+    isTable: false,
     isForm:false,
     isTableForm:false,
-    isDetail: false,
-    isTable: true,
+    isSearch:true,
+    formatter: dateFormatter,
+    search: {
+      value:[],
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
   },
   {
-    label: '到货数量',
-    field: 'arrivalQty',
+    label: '收货日期',
+    field: 'deliveryDate',
     table: {
       width: 150
     },
-    sortTableDefault:6,
+    formatter: dateFormatter2,
     isForm:false,
-    isTableForm:false,
+    isTableForm:true,
     isDetail: false,
     isTable: true,
+    tableForm:{
+      disabled:true
+    }
   },
   {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
+    label: '可开票数量',
+    field: 'invoicableQuantity',
     table: {
       width: 150
     },
-  },
-  {
-    label: '货币',
-    field: 'currency',
-    sort: 'custom',
-    table: {
-      width: 150
+    form: {
+      componentProps: {
+        disabled: true
+      }
     },
+    tableForm:{
+      disabled: true
+    }
   },
   {
     label: '合同价格',
     field: 'singlePrice',
-    sort: 'custom',
+    formatter: singlePriceFormart,
     table: {
       width: 150
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 2,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 2,
     }
   },
   {
     label: '采购价格',
     field: 'purchasePrice',
-    sort: 'custom',
+    formatter: singlePriceFormart,
     table: {
       width: 150
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 2,
+      }
+    },
+    tableForm:{
+      type: 'InputNumber',
+      disabled: true,
+      min: 0,
+      precision: 2,
     }
   },
   {
-    label: '差额',
+    label: '单价差额',
     field: 'differencePrice',
+    formatter: singlePriceFormart,
     table: {
       width: 150
     },
     form: {
       componentProps: {
-        disabled: true
+        disabled: true,
+        min: 0,
+        precision: 2,
       }
     },
     tableForm:{
       type: 'slot',
+      disabled: true,
+      min: 0,
+      precision: 2,
+    }
+  },
+  {
+    label: '到货数量',
+    field: 'arrivalQty',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    isTableForm:true,
+    isDetail: false,
+    isTable: true,
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    table: {
+      width: 150
+    },
+    tableForm:{
       disabled: true
     }
   },
   {
-    label: '未税差额',
-    field: 'untaxedDifference',
-    formatter: accountantFormart,
+    label: '订单行',
+    field: 'poLine',
     table: {
       width: 150
     },
     form: {
-      component: 'InputNumber',
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        min: 0,
-        precision: 6,
+        multiple:true,//多选
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'poLine',
+        searchTitle: '待开票列表',
+        searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas,
+        searchPage: supplierinvoiceRequestDetailApi.getPoNumberPoLineInfo,
+        searchCondition: [
+          {
+            key: 'supplierCode',
+            value: 'supplierCode',
+            message: '请填供应商信息！',
+            isMainValue: true
+          },{
+            key: 'orderType',
+            value: 'orderType',
+            message: '请填订单类型！',
+            isMainValue: true
+          }
+        ]
       }
     },
     tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6,
+      multiple:true,//多选
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单行',
+      searchField: 'poLine',
+      searchTitle: '待开票列表',
+      searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas,
+      searchPage: supplierinvoiceRequestDetailApi.getPoNumberPoLineInfo,
+      searchCondition: [
+        {
+          key: 'supplierCode',
+          value: 'supplierCode',
+          message: '请填供应商信息！',
+          isMainValue: true
+        },
+        {
+          key: 'orderType',
+          value: 'orderType',
+          message: '请填订单类型！',
+          isMainValue: true
+        }
+      ]
     }
   },
   {
-    label: '含税差额',
-    field: 'taxInclusiveDifference',
-    formatter: accountantFormart,
+    label: '待开票单据号',
+    field: 'recvBillNum',
     table: {
       width: 150
     },
     form: {
-      component: 'InputNumber',
       componentProps: {
-        min: 0,
-        precision: 6,
+        disabled: true
       }
     },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6,
+    tableForm:{
+      disabled: true
     }
   },
   {
-    label: '收货日期',
-    field: 'deliveryDate',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    label: '单据类型',
+    field: 'billType',
+    dictType: DICT_TYPE.BILL_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
     },
-    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '供应商发货单号',
+    field: 'asnBillNum',
     table: {
-      width: 180
+      width: 150
     },
     form: {
-      component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        disabled: true
       }
+    },
+    tableForm:{
+      disabled: true
     }
   },
   {
-    label: '开票数量',
-    field: 'invoicableQuantity',
-    sort: 'custom',
+    label: '供应商代码',
+    field: 'supplierCode',
+    hiddenInMain:true,
     table: {
       width: 150
     },
     form: {
-      component: 'InputNumber',
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
     }
   },
+  
+  // {
+  //   label: '未税差额',//子表数据
+  //   field: 'untaxedDifference',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       precision: 2,
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 0,
+  //     precision: 2,
+  //   }
+  // },
+  // {
+  //   label: '含税差额',
+  //   field: 'taxInclusiveDifference',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       precision: 2,
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 0,
+  //     precision: 2,
+  //   }
+  // },
+  
   {
-    label: '财务凭证号',
-    field: 'voucherNumber',
-    sort: 'custom',
+    label: '货币',
+    field: 'currency',
     table: {
       width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
     }
   },
   {
     label: '备注',
     field: 'remark',
-    sort: 'custom',
+    hiddenInMain:true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    hiddenInMain:true,
+    isTable: false,
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    hiddenInMain:true,
+    isTableForm: false,
+    isTable:false,
+    isForm: false,
     table: {
       width: 150
     },
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 250,
+      fixed: 'right'
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+  }
 ]))
-
+// 批次校验
+const validateSinglePrice = (rule: any, value: any, callback: any) => {
+  if (Number(value)>0) {
+      callback();
+  } else {
+    callback(new Error('请输入合同价格'));
+  }
+}
 //表单校验
-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' }
+export const SupplierinvoiceRequestDetailRules = reactive({
+  singlePrice: [
+    { required: true, message: '请输入合同价格', trigger: 'change' },
+    { validator: validateSinglePrice, trigger: 'change' }
   ],
-  createTime: [
-    { required: true, message: '请输入创建时间', trigger: 'blur' }
-  ],
-  creator: [
-    { required: true, message: '请输入创建者', trigger: 'blur' }
+})
+// 采购通过
+export const PurchasePass = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '价差通过说明',
+    field: 'balanceStatement',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable:false,
+    form: {
+      componentProps:{
+        type:'textarea'
+      }
+    },
+  },
+]))
+//表单校验
+export const PurchasePassRules = reactive({
+  balanceStatement: [
+    { required: true, message: '请输入价差通过说明', trigger: 'blur'},
+    { max: 100, message: '最多100字符', trigger: 'blur'}
   ],
 })

From 161c240b7dcddd392f3e432c8116574ea1e8ff2c Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 15:12:24 +0800
Subject: [PATCH 26/51] =?UTF-8?q?=E5=B7=AE=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMainDifference/index.vue    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
index 13e1a4e07..026e0cac9 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
@@ -227,9 +227,12 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
   const Echo = []
 
   const { tableObject, tableMethods } = useTable({
+    defaultParams:{
+      balanceStatementStatus : 'TRUE'
+    },
     getListApi: SupplierinvoiceRequestMainApi.getSupplierinvoiceRequestMainPage // 分页接口  
   })
-
+  
   // 获得表格的各种操作
   const { getList, setSearchParams } = tableMethods
 
@@ -356,7 +359,11 @@ const importTemplateData = reactive({
   const searchFormClick = (searchData) => {
     tableObject.params = {
       isSearch: true,
-      filters: searchData.filters
+      filters: [...searchData.filters,{
+        action: "==",
+        column: "balanceStatementStatus",
+        value: "TRUE"
+      }]
     }
     getList() // 刷新当前列表
   }

From 32a74f971052044eec17e8587bb114170d2da2cd Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 15:42:14 +0800
Subject: [PATCH 27/51] =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E3=80=81=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productputawayRequestMain.data.ts         | 62 +++++++++----------
 .../productputawayAssembleRequestMain.data.ts | 62 +++++++++----------
 .../productreceiptRequestMain.data.ts         | 62 +++++++++----------
 .../productreceiptAssembleRequestMain.data.ts | 62 +++++++++----------
 .../productreceiptscrapRequestMain.data.ts    | 62 +++++++++----------
 .../productredressRequestMain.data.ts         | 12 ++--
 6 files changed, 161 insertions(+), 161 deletions(-)

diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index 32bf9fbb3..a6a53ba52 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -126,15 +126,15 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false
+  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -189,28 +189,28 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
+  // {
+  //   label: '截止时间',
+  //   field: 'dueTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTable: false,
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
   {
     label: '部门',
     field: 'departmentCode',
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
index bc733b505..c90e6eaf3 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
@@ -118,15 +118,15 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false
+  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -181,28 +181,28 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm: false,
   },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
+  // {
+  //   label: '截止时间',
+  //   field: 'dueTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTable: false,
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
   {
     label: '部门',
     field: 'departmentCode',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 1faa0b6f4..02f793ed1 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -280,15 +280,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm: false,
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -345,28 +345,28 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm: false
   },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    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',
-      }
-    },
-    isTable: false,
-  },
+  // {
+  //   label: '截止时间',
+  //   field: 'dueTime',
+  //   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',
+  //     }
+  //   },
+  //   isTable: false,
+  // },
   {
     label: '部门',
     field: 'departmentCode',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index ed0e5fdba..e786a028d 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -280,15 +280,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm: false,
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false
+  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -345,28 +345,28 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm: false
   },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    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',
-      }
-    },
-    isTable: false,
-  },
+  // {
+  //   label: '截止时间',
+  //   field: 'dueTime',
+  //   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',
+  //     }
+  //   },
+  //   isTable: false,
+  // },
   {
     label: '部门',
     field: 'departmentCode',
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index 95d6f73fa..7e3cc8a51 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -238,15 +238,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm: false,
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false
+  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -303,28 +303,28 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm: false
   },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    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',
-      }
-    },
-    isTable: false,
-  },
+  // {
+  //   label: '截止时间',
+  //   field: 'dueTime',
+  //   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',
+  //     }
+  //   },
+  //   isTable: false,
+  // },
   {
     label: '部门',
     field: 'departmentCode',
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index 67d793bd4..18736b93f 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -180,12 +180,12 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm:false,
     isTable:false,
   },
-  {
-    label: '原因',
-    field: 'remark',
-    sort: 'custom',
-    isTable:true,
-  },
+  // {
+  //   label: '原因',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   isTable:true,
+  // },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',

From 07b1d6fb573efd45788a9edfb780c23df424e8fc Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Mon, 15 Jul 2024 15:53:30 +0800
Subject: [PATCH 28/51] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain/index.vue      | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 02b820b49..d828ff12d 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -398,6 +398,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
     defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplierinvoice-request-main:create' }), // 新增
     defaultButtons.defaultImportBtn({hasPermi: 'wms:supplierinvoice-request-main:import'}), // 导入
     defaultButtons.defaultExportBtn({hasPermi: 'wms:supplierinvoice-request-main:export'}), // 导出
+    defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
@@ -419,6 +420,8 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
       handleImport()
     } else if (val == 'export') { // 导出
       handleExport()
+    } else if (val=='selection_point'){// 批量打印
+      handleSelectionPoint()
     } else if (val == 'refresh') { // 刷新
       if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({
@@ -990,7 +993,6 @@ const handleImport = () => {
   }
 
 
-
   /**
     * tableForm方法
   */
@@ -1139,6 +1141,22 @@ const importSuccess = () => {
     window.open(documentSrc.value + '&id=' + id)
   }
 
+
+const srcPoint = ref(BASE_URL + '/jmreport/view/972723426543935488?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 handlePrintAll = async (masterId) => {
     // 打印
     SupplierinvoiceRequestMainApi.printSupplierRecordByMasterId(masterId).then(res =>{

From 59ac86f29703ed1a245c9546daa7e10293d98832 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Mon, 15 Jul 2024 16:11:35 +0800
Subject: [PATCH 29/51] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain/index.vue       |  9 ++-
 .../purchasereturnRequestMain.data.ts         | 79 +++++++++++++++++--
 2 files changed, 80 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 0145d5de3..7875f9402 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -418,7 +418,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
       setV['singlePrice'] = val[0]['singlePrice']
       setV['amount'] = val[0]['amount']
       setV['projectCode'] = val[0]['projectCode']
-      setV['packingNumber'] = val[0]['packingNumber']
+      // setV['packingNumber'] = val[0]['packingNumber']
+      // setV['inventoryBalance'] = val[0]['qty']
 
       if (formField == 'itemCode') {
         setV['batch'] = val[0]['toBatch']
@@ -428,7 +429,11 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
         // setV['fromLocationCode'] = val[0]['fromLocationCode']
         // setV['toLocationCode'] = val[0]['toLocationCode']
       }
-    } else {
+    } else if (formField == 'packingNumber'){
+      setV[formField] = val[0][searchField]
+      setV['inventoryBalance'] = val[0]['qty']
+    }
+    else {
       setV[formField] = val[0][searchField]
     }
     formRef.setValues(setV)
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index a7b55418d..eef4f4f85 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -780,6 +780,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm:false,
     isTable:false,
     hiddenInMain: true,
+    isForm: false,
     tableForm:{
       disabled:true
     },
@@ -799,6 +800,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm:false,
     isTable:false,
     hiddenInMain: true,
+    isForm: false,
     tableForm:{
       disabled:true
     },
@@ -834,6 +836,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     hiddenInMain: true,
     isTableForm: false,
     isTable: false,
+    isForm: false,
     tableForm:{
       disabled:true
     },
@@ -856,6 +859,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isTableForm: false,
     isTable: false,
+    isForm: false,
     form: {
       componentProps:{
         disabled:true
@@ -939,11 +943,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    form: {
-      componentProps:{
-        disabled:true
-      }
-    },
     tableForm:{
       // labelMessage: '信息提示说明！！！',
       isInpuFocusShow: true, // 开启查询弹窗
@@ -964,6 +963,33 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         isMainValue: false
       }]
     },
+    // form: {
+    //   componentProps:{
+    //     disabled:true
+    //   }
+    // },
+    form:{
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择从库位代码',
+        searchField: 'code',
+        searchTitle: '库位代码信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
+        searchCondition: [{
+          key: 'businessType',
+          value: 'PurchaseReturn',
+          message: '请填写业务类型',
+          isMainValue: false
+        },{
+          key: 'isIn',
+          value: 'out',
+          message: '',
+          isMainValue: false
+        }]
+      }
+    },
     hiddenInMain: true,
     isTable: false,
   },
@@ -976,9 +1002,41 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     hiddenInMain: true,
     isTable: false,
+    // form: {
+    //   componentProps:{
+    //     disabled: true,
+    //   }
+    // },
     form: {
       componentProps:{
-        disabled:true
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息', // 查询弹窗标题
+        searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+        searchPage: BalanceApi.getBalancePage,
+        searchCondition: [{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请填写物料代码',
+          isTableRowValue: true, //查询当前searchTable表中行数据的值
+          required:true,
+          isMainValue:true
+        },{
+          key: 'batch',
+          value: 'batch',
+          message: '请填写批次',
+          isTableRowValue: true, //查询当前searchTable表中行数据的值
+          // required:true,
+          isMainValue:true
+        },{
+          key: 'locationCode',
+          value: 'fromLocationCode',
+          message: '请选择从库位代码',
+          isTableRowValue: true, //查询当前searchTable表中行数据的值
+          required:true,
+          isMainValue:true
+        }]
       }
     },
     tableForm:{
@@ -1024,6 +1082,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'InputNumber',
       componentProps: {
+        disabled: true,
         min: 0,
         precision: 6
       }
@@ -1036,6 +1095,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     hiddenInMain: true,
     isTable: false,
+    isDetail: false,
   },
   {
     label: '退货数量',
@@ -1075,6 +1135,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isTableForm: false,
     isTable: false,
+    isForm: false,
     form: {
       componentProps:{
         disabled:true
@@ -1094,6 +1155,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     hiddenInMain: true,
     isTableForm: false,
     isTable: false,
+    isForm: false,
     form: {
       componentProps:{
         disabled:true
@@ -1113,6 +1175,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     hiddenInMain: true,
     isTableForm: false,
     isTable: false,
+    isForm: false,
     form: {
       componentProps:{
         disabled:true
@@ -1132,6 +1195,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     hiddenInMain: true,
     isTableForm: false,
     isTable: false,
+    isForm: false,
     form: {
       componentProps:{
         disabled:true
@@ -1257,6 +1321,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     tableForm:{
       disabled:true
     },
+    isForm: false,
     isTableForm: false,
     isTable: false,
     hiddenInMain: true,
@@ -1278,6 +1343,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     tableForm:{
       disabled:true
     },
+    isForm: false,
     isTableForm:false,
     isForm:false
   },
@@ -1317,6 +1383,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
     isTable: false,
     hiddenInMain: true,
+    isForm: false,
     form: {
       componentProps:{
         disabled:true

From 303cbbc58f71cfff978ea3e60cccb3fbbbc4cdda Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 16:23:17 +0800
Subject: [PATCH 30/51] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E5=A4=B1=E5=8E=BB?=
 =?UTF-8?q?=E7=84=A6=E7=82=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderManage/team/teamForm.vue             | 337 +++++++++++++-----
 1 file changed, 238 insertions(+), 99 deletions(-)

diff --git a/src/views/wms/basicDataManage/orderManage/team/teamForm.vue b/src/views/wms/basicDataManage/orderManage/team/teamForm.vue
index 3ecd1d35b..6cc673472 100644
--- a/src/views/wms/basicDataManage/orderManage/team/teamForm.vue
+++ b/src/views/wms/basicDataManage/orderManage/team/teamForm.vue
@@ -10,7 +10,7 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="班组编码" prop="code">
-            <el-input v-model="formData.code" placeholder="请输入班组编码" :disabled="isDisabled"/>
+            <el-input v-model="formData.code" placeholder="请输入班组编码" :disabled="isDisabled" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -35,8 +35,13 @@
         <el-col :span="12">
           <el-form-item label="负责人" prop="teamMonitorName">
             <div class="input-with-button">
-              <el-input v-model="formData.teamMonitorName" placeholder="请选择负责人"  :style="{ width: '35%' }"/>
-              <el-button :icon="Search" @click="addMonitor"/>
+              <el-input
+                v-model="formData.teamMonitorName"
+                placeholder="请选择负责人"
+                :style="{ width: '35%' }"
+                @blur="addUserBlur('teamMonitorName', formData.teamMonitorName)"
+              />
+              <el-button :icon="Search" @click="addMonitor" />
             </div>
           </el-form-item>
         </el-col>
@@ -45,16 +50,26 @@
         <el-col :span="12">
           <el-form-item label="车间代码" prop="workshopCode">
             <div class="input-with-button">
-              <el-input v-model="formData.workshopCode" placeholder="请选择车间代码"  :style="{ width: '35%' }"/>
-              <el-button :icon="Search" @click="addWorkShop"/>
+              <el-input
+                v-model="formData.workshopCode"
+                placeholder="请选择车间代码"
+                :style="{ width: '35%' }"
+                @blur="addWorkshopCodeBlur('workshopCode', formData.workshopCode)"
+              />
+              <el-button :icon="Search" @click="addWorkShop" />
             </div>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="产线代码" prop="productionLineCode">
             <div class="input-with-button">
-            <el-input v-model="formData.productionLineCode" placeholder="请选择产线代码"  :style="{ width: '35%' }"/>
-            <el-button :icon="Search" @click="addProductionLine"/>
+              <el-input
+                v-model="formData.productionLineCode"
+                placeholder="请选择产线代码"
+                :style="{ width: '35%' }"
+                @blur="addProductionLineBlur('productionLineCode', formData.productionLineCode)"
+              />
+              <el-button :icon="Search" @click="addProductionLine" />
             </div>
           </el-form-item>
         </el-col>
@@ -68,7 +83,7 @@
               placeholder="请选择生效时间"
               format="YYYY-MM-DD HH:mm:ss"
               value-format="x"
-              style="width: 100%;"
+              style="width: 100%"
             />
           </el-form-item>
         </el-col>
@@ -80,7 +95,7 @@
               placeholder="请选择失效时间"
               format="YYYY-MM-DD HH:mm:ss"
               value-format="x"
-              style="width: 100%;"
+              style="width: 100%"
             />
           </el-form-item>
         </el-col>
@@ -89,9 +104,14 @@
         <el-col :span="24">
           <el-form-item label="班组成员">
             <div class="tag-container flex gap-2">
-              <el-tag v-for="ent in tags" :key="ent.username" closable :disable-transitions="false"
-                      @close="handleClose(ent.username)">
-                {{ ent.nickname}}
+              <el-tag
+                v-for="ent in tags"
+                :key="ent.username"
+                closable
+                :disable-transitions="false"
+                @close="handleClose(ent.username)"
+              >
+                {{ ent.nickname }}
               </el-tag>
               <el-input
                 v-if="inputVisible"
@@ -126,24 +146,24 @@
     </template>
   </Dialog>
 
-<!--添加班组人员弹窗-->
+  <!--添加班组人员弹窗-->
   <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
-
 </template>
 <script lang="ts" setup>
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as TeamApi from '@/api/wms/team'
-import request from "@/config/axios";
+import request from '@/config/axios'
 import { SearchTable } from '@/components/SearchTable'
-import {searchUser} from "@/views/wms/basicDataManage/orderManage/team/team.data";
-import * as UserApi from "@/api/system/user";
-import {validateYS} from "@/utils/validator";
+import { searchUser } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+import * as UserApi from '@/api/system/user'
+import { validateYS } from '@/utils/validator'
 import { Search } from '@element-plus/icons-vue'
-import * as WorkshopApi from "@/api/wms/workshop";
-import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
 import * as ProductionlineApi from '@/api/wms/productionline'
-import { Productionline } from "@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data";
-import {ElInput} from "element-plus";
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import { ElInput } from 'element-plus'
+import { FormBlur } from '@/api/wms/business/inputBlur'
 
 defineOptions({ name: 'TeamForm' })
 
@@ -154,7 +174,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const tags=ref([])
+const tags = ref([])
 
 const inputValue = ref('')
 const inputVisible = ref(false)
@@ -171,65 +191,63 @@ const formData = ref({
   remark: '',
   createTime: '',
   members: '',
-  workshopCode:'',
-  workshopName:'',
-  productionLineCode:'',
-  productionLineName:'',
-  teamMonitorCode:'',
-  teamMonitorName:''
+  workshopCode: '',
+  workshopName: '',
+  productionLineCode: '',
+  productionLineName: '',
+  teamMonitorCode: '',
+  teamMonitorName: ''
 })
 const formRules = reactive({
   code: [
     { required: true, message: '班组编码不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+    { validator: validateYS, message: '请输入正确的代码', trigger: 'blur' }
   ],
   name: [
     { required: true, message: '班组名称不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   teamGroup: [{ required: true, message: '班组类别不能为空', trigger: 'change' }],
-  workshopCode: [{ required: true, message: '请选择车间代码', trigger: 'blur' },],
-  productionLineCode: [{ required: true, message: '请选择产线代码', trigger: 'blur' },],
-  teamMonitorName: [{ required: true, message: '请选择负责人', trigger: 'blur' },],
+  workshopCode: [{ required: true, message: '请选择车间代码', trigger: 'blur' }],
+  productionLineCode: [{ required: true, message: '请选择产线代码', trigger: 'blur' }],
+  teamMonitorName: [{ required: true, message: '请选择负责人', trigger: 'blur' }]
 })
 const basicFormRef = ref() // 表单 Ref
 const handleClose = (username: string) => {
-  const index = tags.value.findIndex(tag => tag.username === username);
+  const index = tags.value.findIndex((tag) => tag.username === username)
   if (index !== -1) {
-    tags.value.splice(index, 1);
+    tags.value.splice(index, 1)
   }
 }
 
 /** 弹窗相关参数 */
-const searchTableRef = ref();
-const _searchTableTitle = ref();
-const _searchTableAllSchemas = ref();
-const _searchTablePage = ref();
-const _formField = ref();
-const _searchField = ref();
-const _multiple = ref();
-const _type = ref();
-const _row = ref();
+const searchTableRef = ref()
+const _searchTableTitle = ref()
+const _searchTableAllSchemas = ref()
+const _searchTablePage = ref()
+const _formField = ref()
+const _searchField = ref()
+const _multiple = ref()
+const _type = ref()
+const _row = ref()
 const _searchCondition = ref({})
 
-const addMonitor = () =>{
-  addUserCommon(false,'monitor')
+const addMonitor = () => {
+  addUserCommon(false, 'monitor')
 }
 
-const addUser = () =>{
-  addUserCommon(true,'username')
+const addUser = () => {
+  addUserCommon(true, 'username')
 }
 
 /** 选择人员弹窗 */
-const addUserCommon = (multiple,field) => {
+const addUserCommon = (multiple, field) => {
   _searchCondition.value = {}
   const filters: any[] = []
   filters.push({
-    action: "==",
+    action: '==',
     column: 'userType',
     value: 'WORKER'
   })
@@ -244,13 +262,40 @@ const addUserCommon = (multiple,field) => {
   _searchTableAllSchemas.value = searchUser.allSchemas
   openCommon()
 }
+// 人员失去焦点
+const addUserBlur = async (field, e) => {
+  _searchCondition.value = {}
+  const filters: any[] = []
+  filters.push(
+    {
+      action: '==',
+      column: 'userType',
+      value: 'WORKER'
+    },
+    {
+      action: '==',
+      column: 'username',
+      value: e
+    }
+  )
+  // 参数整理
+  _searchCondition.value.isSearch = true
+  _searchCondition.value.filters = filters
+  _searchTableTitle.value = '选择人员'
+  _multiple.value = false
+  _formField.value = field
+  _searchField.value = field
+  _searchTablePage.value = UserApi.getUserPage
+  _searchTableAllSchemas.value = searchUser.allSchemas
+  getBlurFun(field, e)
+}
 
 /** 选择车间弹窗 */
 const addWorkShop = () => {
   _searchCondition.value = {}
   const filters: any[] = []
   filters.push({
-    action: "==",
+    action: '==',
     column: 'available',
     value: 'TRUE'
   })
@@ -265,27 +310,54 @@ const addWorkShop = () => {
   _searchTableAllSchemas.value = Workshop.allSchemas
   openCommon()
 }
-
-/** 选择产线弹窗 */
-const addProductionLine = () => {
-  if (formData.value.workshopCode == '' || formData.value.workshopCode == null ){
-    message.warning('请先选择车间代码');
-    return
-  }
+// 车间失去焦点
+const addWorkshopCodeBlur = (field, e) => {
   _searchCondition.value = {}
   const filters: any[] = []
   filters.push({
-    action: "==",
+    action: '==',
     column: 'available',
     value: 'TRUE'
   },{
-    action: "==",
-    column: 'workshopCode',
-    value: formData.value.workshopCode
+      action: '==',
+      column: 'code',
+      value: e
   })
   // 参数整理
   _searchCondition.value.isSearch = true
   _searchCondition.value.filters = filters
+  _searchTableTitle.value = '选择车间'
+  _multiple.value = false
+  _formField.value = 'workshop'
+  _searchField.value = 'workshop'
+  _searchTablePage.value = WorkshopApi.getWorkshopPage
+  _searchTableAllSchemas.value = Workshop.allSchemas
+  formData.value.productionLineCode = ''
+  getBlurFun(field, e)
+}
+/** 选择产线弹窗 */
+const addProductionLine = () => {
+  if (formData.value.workshopCode == '' || formData.value.workshopCode == null) {
+    message.warning('请先选择车间代码')
+    return
+  }
+  _searchCondition.value = {}
+  const filters: any[] = []
+  filters.push(
+    {
+      action: '==',
+      column: 'available',
+      value: 'TRUE'
+    },
+    {
+      action: '==',
+      column: 'workshopCode',
+      value: formData.value.workshopCode
+    }
+  )
+  // 参数整理
+  _searchCondition.value.isSearch = true
+  _searchCondition.value.filters = filters
   _searchTableTitle.value = '选择产线'
   _multiple.value = false
   _formField.value = 'productionLine'
@@ -294,38 +366,68 @@ const addProductionLine = () => {
   _searchTableAllSchemas.value = Productionline.allSchemas
   openCommon()
 }
-
+// 产线失去焦点
+const addProductionLineBlur = (field, e) => {
+  _searchCondition.value = {}
+ if (formData.value.workshopCode == '' || formData.value.workshopCode == null) {
+    message.warning('请先选择车间代码')
+    return
+  }
+  _searchCondition.value = {}
+  const filters: any[] = []
+  filters.push(
+    {
+      action: '==',
+      column: 'available',
+      value: 'TRUE'
+    }, {
+      action: '==',
+      column: 'workshopCode',
+      value: formData.value.workshopCode
+    },{
+      action: '==',
+      column: 'code',
+      value: e
+  })
+  // 参数整理
+  _searchCondition.value.isSearch = true
+  _searchCondition.value.filters = filters
+  _searchTableTitle.value = '选择产线'
+  _multiple.value = false
+  _formField.value = 'productionLine'
+  _searchField.value = 'productionLine'
+  _searchTablePage.value = ProductionlineApi.getProductionlinePage
+  _searchTableAllSchemas.value = Productionline.allSchemas
+  getBlurFun(field, e)
+}
 /** 弹窗选择之后  回调函数 */
-const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick?.(() => {
     if (formField === 'workshop') {
-      if (formData.value.workshopCode != val[0].code){
+      if (formData.value.workshopCode != val[0].code) {
         formData.value.productionLineCode = null
         formData.value.productionLineName = null
       }
       formData.value.workshopCode = val[0].code
       formData.value.workshopName = val[0].name
-    }
-    else if (formField === 'productionLine'){
+    } else if (formField === 'productionLine') {
       formData.value.productionLineCode = val[0].code
       formData.value.productionLineName = val[0].name
-    }
-    else if (formField === 'monitor'){
+    } else if (formField === 'monitor') {
       formData.value.teamMonitorCode = val[0].username
       formData.value.teamMonitorName = val[0].nickname
-    }
-    else {
-      val.forEach(item => {
-        const isExist = tags.value.some(tag => tag.username === item.username);
-        if (!isExist){
-          const newUser = {};
+    } else {
+      val.forEach((item) => {
+        const isExist = tags.value.some((tag) => tag.username === item.username)
+        if (!isExist) {
+          const newUser = {}
           if (formField === 'username') {
-            newUser['username'] = item.username;
-            newUser['nickname'] = item.nickname;
+            newUser['username'] = item.username
+            newUser['nickname'] = item.nickname
           }
-          tags.value.push(newUser);
+          tags.value.push(newUser)
         }
-      });
+      })
     }
   })
 }
@@ -343,6 +445,46 @@ const openCommon = () => {
     _searchCondition.value
   )
 }
+// 失去焦點接口
+const getBlurFun = async (field, val) => {
+  let obj = {
+    by: 'ASC',
+    pageNo: 1,
+    pageSize: 20
+  }
+  const params = {
+    isSearch: _searchCondition.value.isSearch,
+    filters: _searchCondition.value.filters,
+    ...obj
+  }
+  if (!_multiple.value && val.indexOf(',') > -1) {
+    message.alert('该输入框只能输入一条数据')
+    formData.value[field] = ''
+    return
+  }
+  await _searchTablePage.value(params).then((res) => {
+    let arr1 = val.split(',')
+    let list = ref([])
+    list.value = res?.list?.length > 0 ? res.list.slice(0, 1) : []
+    if (list.value?.length == 0) {
+      message.alert('暂无数据')
+
+      formData.value[field] = ''
+      return
+    }
+    if (arr1.length != list.value.length) {
+      let arr2 = list.value.map((item) => item[field])
+      let str = [
+        ...arr1.filter((item) => !arr2.includes(item)),
+        ...arr2.filter((item) => !arr1.includes(item))
+      ].join(',')
+      message.alert('代码' + str + '没有找到对应数据')
+      formData.value[field] = ''
+      return
+    }
+    // callback(list.value)
+  })
+}
 /** 初始化弹窗 */
 const open = async (type: string, row?: object) => {
   dialogVisible.value = true
@@ -351,18 +493,17 @@ const open = async (type: string, row?: object) => {
   resetForm()
   // 修改时，设置数据
   if (row) {
-    isDisabled.value = true;
+    isDisabled.value = true
     formLoading.value = true
     try {
-       formData.value = await request.get({ url: `/wms/team/get?id=` + row.id });
-      tags.value=JSON.parse(formData.value.members)
+      formData.value = await request.get({ url: `/wms/team/get?id=` + row.id })
+      tags.value = JSON.parse(formData.value.members)
     } finally {
       formLoading.value = false
     }
-  }
-  else {
-    isDisabled.value = false;
-    tags.value=[];
+  } else {
+    isDisabled.value = false
+    tags.value = []
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -374,8 +515,8 @@ const submitForm = async () => {
   if (!basicFormRef) return
   const valid = await basicFormRef.value.validate()
   if (!valid) return
-  if (tags.value.length > 15  ){
-    message.warning('班组成员最多15人');
+  if (tags.value.length > 15) {
+    message.warning('班组成员最多15人')
     return
   }
   // 提交请求
@@ -410,16 +551,15 @@ const resetForm = () => {
     remark: '',
     createTime: '',
     members: '',
-    workshopCode:'',
-    workshopName:'',
-    productionLineCode:'',
-    productionLineName:'',
-    teamMonitorCode:'',
-    teamMonitorName:''
+    workshopCode: '',
+    workshopName: '',
+    productionLineCode: '',
+    productionLineName: '',
+    teamMonitorCode: '',
+    teamMonitorName: ''
   }
   basicFormRef.value?.resetFields()
 }
-
 </script>
 
 <style scoped>
@@ -443,5 +583,4 @@ const resetForm = () => {
   flex: 1;
   /*margin-right: 10px;*/
 }
-
 </style>

From b8498ac217c0e5b9d10ca5b3963929ecd57d07f2 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 16:46:06 +0800
Subject: [PATCH 31/51] =?UTF-8?q?=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7=20?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=AA=E8=83=BD=E9=80=89=E6=8B=A9=E4=B8=80?=
 =?UTF-8?q?=E6=9D=A1=E6=95=B0=E6=8D=AE=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issueManage/repleinsh/repleinshRequestMain/index.vue  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index eb70d07f0..2066f250c 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -379,10 +379,10 @@ const submitForm = async (formType, submitData) => {
     data.id = data.masterId
   }
   data.subList = tableData.value // 拼接子表数据参数
-  if( data.subList.length>1){
-    message.warning('明细只能选择一条数据')
-    return;
-  }
+  // if( data.subList.length>1){ // 喜婷说可以添加多条
+  //   message.warning('明细只能选择一条数据')
+  //   return;
+  // }
   if(tableData.value.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')
     formRef.value.formLoading = false

From 70860badf408f602b2d92ef0e94906d0e8647532 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 16:49:41 +0800
Subject: [PATCH 32/51] =?UTF-8?q?=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/issueManage/repleinsh/repleinshRequestMain/index.vue   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index 2066f250c..6dda9a217 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -379,6 +379,9 @@ const submitForm = async (formType, submitData) => {
     data.id = data.masterId
   }
   data.subList = tableData.value // 拼接子表数据参数
+  data.subList.forEach(item=>{
+    item.toLocationCode = data.toLocationCode
+  })
   // if( data.subList.length>1){ // 喜婷说可以添加多条
   //   message.warning('明细只能选择一条数据')
   //   return;

From aa94548aaf242186e41f30f72651da7e45ac8c23 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 16:55:02 +0800
Subject: [PATCH 33/51] =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/issueManage/repleinsh/repleinshRequestMain/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index 6dda9a217..8dbf7b04a 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -113,7 +113,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         // row['itemCode'] = val[0]['code']
         // row['uom'] = val[0]['uom']
         val.forEach(item=>{
-          if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return
+          if(tableData.value.find(item1=>item1['itemCode'] == item['code'])){
+            message.warning(`物料${item['code']}已经存在`)
+            return
+          } 
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow['itemCode'] = item['code']
           newRow['uom'] = item['uom']

From 7c5eec43fa9041b35a1183e4fac26b80310b6ac9 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 17:02:43 +0800
Subject: [PATCH 34/51] =?UTF-8?q?AGV=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/business/inputBlur.ts             |  2 +
 .../callmaterials/callmaterials.data.ts       | 64 +++++++++++--
 .../manufacturePackage.data.ts                | 40 ++++++++-
 .../purchasePackage/purchasePackage.data.ts   | 90 +++++++++++++++++--
 4 files changed, 177 insertions(+), 19 deletions(-)

diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts
index 21271d1a4..4f4fcbbe1 100644
--- a/src/api/wms/business/inputBlur.ts
+++ b/src/api/wms/business/inputBlur.ts
@@ -272,6 +272,7 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
               message.warning(
                 searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
               )
+              formRef.setValues(setV)
               return
             }
             filters.push({
@@ -307,6 +308,7 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
                     message.warning(
                       searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
                     )
+                    formRef.setValues(setV)
                     return
                   }
                 }
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
index 1524849c4..c663d5db3 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
@@ -64,7 +64,15 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -95,7 +103,15 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
           value: 'itemCode',
           message: '请填写物料代码！',
           isMainValue: true
-        }]
+          }],
+        verificationParams: [{
+          key: 'packUnit',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -190,6 +206,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -200,7 +217,15 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -214,12 +239,21 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择车间代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '车间信息', // 查询弹窗标题
         searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkshopApi.getWorkshopPage // 查询弹窗所需分页方法
+        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -233,12 +267,21 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择生产线', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '生产线信息', // 查询弹窗标题
         searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-        searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法,
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -252,6 +295,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择工位', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -272,7 +316,15 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
           key:'available',
           value:'TRUE',
           isMainValue: false
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
     tableForm:{
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
index d8897e8e1..2c40f2698 100644
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
@@ -199,7 +199,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -476,7 +484,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -501,7 +517,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -526,7 +550,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
index acbfe228d..ecae0e0a1 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
@@ -174,7 +174,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -419,7 +427,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -444,7 +460,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -469,7 +493,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -494,7 +526,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -534,7 +574,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+          }],
+          verificationParams: [{
+            key: 'number',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
       }
     }
   },
@@ -566,7 +614,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'lineNumber',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -598,7 +654,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+          }],
+        verificationParams: [{
+          key: 'number',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -630,7 +694,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+          }],
+        verificationParams: [{
+          key: 'asnNumber',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },

From 6245c25fb31627359913396e5eb146037ddf78fe Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 17:06:14 +0800
Subject: [PATCH 35/51] =?UTF-8?q?agv=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agvLocationrelation.data.ts               | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/agvManage/agvLocationrelation/agvLocationrelation.data.ts b/src/views/wms/agvManage/agvLocationrelation/agvLocationrelation.data.ts
index 7c26a4bdc..6dfc2a8b4 100644
--- a/src/views/wms/agvManage/agvLocationrelation/agvLocationrelation.data.ts
+++ b/src/views/wms/agvManage/agvLocationrelation/agvLocationrelation.data.ts
@@ -49,6 +49,7 @@ export const AgvLocationrelation = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库区代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -59,7 +60,15 @@ export const AgvLocationrelation = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -73,6 +82,7 @@ export const AgvLocationrelation = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库位代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -89,7 +99,15 @@ export const AgvLocationrelation = useCrudSchemas(reactive<CrudSchema[]>([
           value: "wmsArea",
           message: '请选择库区代码！',
           isMainValue: true
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },

From ff39c694527cf7d9a2c43f5e20396f474afb2283 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 17:15:40 +0800
Subject: [PATCH 36/51] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=816?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packageoverMain/packageoverRequestMain/index.vue            | 2 +-
 .../wms/inventoryjobManage/scrap/scrapRequestMain/index.vue     | 2 +-
 .../sparepartsrequisitionRequestMain/index.vue                  | 2 +-
 .../transferissue/transferissueRequestMain/index.vue            | 2 +-
 .../transferreceipt/transferreceiptRequestMain/index.vue        | 2 +-
 .../unplannedreceipt/unplannedreceiptRequestMain/index.vue      | 2 +-
 src/views/wms/issueManage/issue/issueRequestMain/index.vue      | 2 +-
 .../productionreturn/productionreturnRequestMain/index.vue      | 2 +-
 .../productionreturn/productionreturnRequestMainNo/index.vue    | 2 +-
 .../wms/issueManage/repleinsh/repleinshRequestMain/index.vue    | 2 +-
 .../inventorychange/inventorychangeRequestMain/index.vue        | 2 +-
 .../processproduction/processproductionRequest/index.vue        | 2 +-
 .../productdismantle/productdismantleRequestMain/index.vue      | 2 +-
 .../productputaway/productputawayRequestMain/index.vue          | 2 +-
 .../productputawayAssembleRequestMain/index.vue                 | 2 +-
 .../productreceipt/productreceiptRequestMain/index.vue          | 2 +-
 .../productreceiptAssembleRequestMain/index.vue                 | 2 +-
 .../productreceiptscrapRequestMain/index.vue                    | 2 +-
 .../productredress/productredressRequestMain/index.vue          | 2 +-
 .../productrepair/productrepairRequestMain/index.vue            | 2 +-
 .../productscrap/productscrapRequestMain/index.vue              | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
index dab4cf2b7..7f99c50dc 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
@@ -236,7 +236,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:packageover-request-main:close'}), // 关闭
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:packageover-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:packageover-request-main:reAdd'}), // 重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:packageover-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:packageover-request-main:refused'}), // 驳回
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 9a5679c56..56e040304 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -244,7 +244,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:scrap-request-main:close'}), // 关闭
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:scrap-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:scrap-request-main:reAdd'}), // 重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:scrap-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:scrap-request-main:refused'}), // 驳回
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index 79a4547e5..d4ad79678 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -233,7 +233,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:unplannedissue-request-main:close'}), // 关闭
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:unplannedissue-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedissue-request-main:reAdd'}), // 重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedissue-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedissue-request-main:refused'}), // 驳回
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
index 11ecd8cc3..29a8c0330 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
@@ -230,7 +230,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:transferissue-request-main:close'}), // 关闭
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:transferissue-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:transferissue-request-main:reAdd'}), // 重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferissue-request-main:refused'}), // 驳回
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
index 0c52a5d4f..909159740 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
@@ -206,7 +206,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:transferreceipt-request-main:close'}), // 关闭
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:transferreceipt-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:transferreceipt-request-main:reAdd'}), // 重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferreceipt-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferreceipt-request-main:refused'}), // 驳回
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index 799614b09..eb3cde1ea 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -373,7 +373,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:unplannedreceipt-request-main:close'}), // 关闭
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:unplannedreceipt-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedreceipt-request-main:reAdd'}), // 重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedreceipt-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedreceipt-request-main:refused'}), // 驳回
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index df1f3f87a..f8406acad 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -283,7 +283,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:issue-request-main:close'}), // 关闭
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:issue-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:issue-request-main:reAdd'}), // 重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:issue-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:issue-request-main:refused'}), // 驳回
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index af65818e2..8375eb726 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -327,7 +327,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-      defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productionreturn-request-main:close'}), // 关闭
+      defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productionreturn-request-main:close'}), // 关闭
       defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productionreturn-request-main:reAdd'}), // 重新添加
       defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:submit'}), // 提交审批
       defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionreturn-request-main:refused'}), // 驳回
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index 3a703320f..1738c8fb9 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -305,7 +305,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-      defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productionreturn-request-main:close'}), // 关闭
+      defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productionreturn-request-main:close'}), // 关闭
       defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productionreturn-request-main:reAdd'}), // 重新添加
       defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:submit'}), // 提交审批
       defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionreturn-request-main:refused'}), // 驳回
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index 8dbf7b04a..47f275fad 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -215,7 +215,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:repleinsh-request-main:close'}), // 关闭
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:repleinsh-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:repleinsh-request-main:reAdd'}), // 重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:repleinsh-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:repleinsh-request-main:refused'}), // 驳回
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index 63fc24a71..0aa1d217f 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -274,7 +274,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:inventorychange-request-main:close'}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:inventorychange-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorychange-request-main:reAdd'}), //重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorychange-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorychange-request-main:refused'}), // 驳回
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index 16efcd877..c6d753817 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -207,7 +207,7 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:processproduction-request-main:close'}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:processproduction-request-main:close'}), // 关闭
     defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:processproduction-request-main:reAdd'}), // 重新添加
     defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:processproduction-request-main:submit'}), // 提交审批
     defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:processproduction-request-main:refused'}), // 驳回
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
index 9cd07b365..3f4786a8b 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@@ -380,7 +380,7 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productdismantle-request-main:close'}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productdismantle-request-main:close'}), // 关闭
     defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productdismantle-request-main:reAdd'}), // 重新添加
     defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productdismantle-request-main:submit'}), // 提交审批
     defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productdismantle-request-main:refused'}), // 驳回
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
index 997469e15..c82d51f25 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@@ -214,7 +214,7 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productputaway-request-main:close'}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productputaway-request-main:close'}), // 关闭
     defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productputaway-request-main:reAdd'}), // 重新添加
     defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productputaway-request-main:submit'}), // 提交审批
     defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productputaway-request-main:refused'}), // 驳回
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
index c8bec783a..84d9e6d53 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
@@ -216,7 +216,7 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productputaway-request-main:close'}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productputaway-request-main:close'}), // 关闭
     defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productputaway-request-main:reAdd'}), // 重新添加
     defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productputaway-request-main:submit'}), // 提交审批
     defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productputaway-request-main:refused'}), // 驳回
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index ac11bd065..1e9dde54f 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -320,7 +320,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭
       defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceipt-request-main:reAdd'}), // 重新添加
       defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:submit'}), // 提交审批
       defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:refused'}), // 驳回
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index be07c0b41..491dc8daf 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -319,7 +319,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭
       defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceipt-request-main:reAdd'}), // 重新添加
       defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:submit'}), // 提交审批
       defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:refused'}), // 驳回
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index 811f90d25..a95bf54c1 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -311,7 +311,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭
       defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceipt-request-main:reAdd'}), // 重新添加
       defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:submit'}), // 提交审批
       defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:refused'}), // 驳回
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
index 659d48369..086524541 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
@@ -229,7 +229,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-      defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productredress-request-main:close'}), // 关闭
+      defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productredress-request-main:close'}), // 关闭
       defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productredress-request-main:reAdd'}), // 重新添加
       defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productredress-request-main:submit'}), // 提交审批
       defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productredress-request-main:refused'}), // 驳回
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index 8c2482afd..89c622b32 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -380,7 +380,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-      defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productrepair-request-main:close'}), // 关闭
+      defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productrepair-request-main:close'}), // 关闭
       defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productrepair-request-main:reAdd'}), // 重新添加
       defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productrepair-request-main:submit'}), // 提交审批
       defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productrepair-request-main:refused'}), // 驳回
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 8f48623fe..2bef4ef89 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -468,7 +468,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:productscrap-request-main:close'}), // 关闭
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:productscrap-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:productscrap-request-main:reAdd'}), // 重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:productscrap-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:productscrap-request-main:refused'}), // 驳回

From 87ed5e8c24a320d4529ae0760e553bab31410ffc Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 17:35:54 +0800
Subject: [PATCH 37/51] =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/business/inputBlur.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts
index 4f4fcbbe1..50ffd9583 100644
--- a/src/api/wms/business/inputBlur.ts
+++ b/src/api/wms/business/inputBlur.ts
@@ -550,7 +550,7 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
             return
           }
           // emit('searchTableSuccess', formField, searchField, list.value, formRef.value, 'form')
-          callback(searchField, list.value)
+          callback(list.value)
         })
       }
     }

From 1da0d531656651c428c8367df3d57a94ff608e99 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 17:38:24 +0800
Subject: [PATCH 38/51] type:'Select',

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

diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index 18736b93f..339927a39 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -511,6 +511,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm: {
+      type:'Select',
       disabled: true
     },
     form: {

From 8d1350c0e085d5bc4847d0961b31905313dfad44 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 17:41:11 +0800
Subject: [PATCH 39/51] select

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

diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 0da6c60a3..bb1e0b840 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -782,7 +782,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     },
     tableForm: {
       disabled: true,
-      // type: 'Select'
+      type: 'Select'
     }
   },
   {

From 6df00ff206c8b12da6e9937e9af2de71f5451ea5 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 17:42:26 +0800
Subject: [PATCH 40/51] bug

---
 .../supplierdeliver/purchasePlanMain/index.vue                   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index bb9d87c5d..bb2c0a188 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -78,7 +78,6 @@
     fieldTableColumn="poLine"
 
   />
-  采购订单信息
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData"
     @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />

From ecadb01f27af9fea8f38e1e866baeae76af48db0 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 18:22:37 +0800
Subject: [PATCH 41/51] =?UTF-8?q?=EF=BC=88=E6=97=A0=E6=84=8F=E4=B9=89?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=88=A0=E9=99=A4=EF=BC=89=E5=B0=8F=E5=8D=9A?=
 =?UTF-8?q?=E6=8F=90=E5=87=BA--=E5=96=9C=E5=A9=B7=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparereceiptJobMain.data.ts               | 124 ++++-----
 .../sparereceiptRecordMain.data.ts            | 212 +++++++-------
 .../sparereceiptRequestMain.data.ts           | 262 +++++++++---------
 3 files changed, 299 insertions(+), 299 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
index 2b5581a23..e3f884bb2 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
@@ -692,29 +692,29 @@ export const PurchasereceiptJobMainRules = reactive({
  * @returns {Array} 采购收货任务子表
  */
 export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    hiddenInMain:true,
-    sortTableDefault:1002,
-    sortSearchDefault:1002
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1002
-  },
+  // {
+  //   label: '包装号',
+  //   field: 'packingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch:true,
+  //   hiddenInMain:true,
+  //   sortTableDefault:1002,
+  //   sortSearchDefault:1002
+  // },
+  // {
+  //   label: '包装规格',
+  //   field: 'packUnit',
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:1002
+  // },
   {
     label: '包装数量',
     field: 'qty',
@@ -841,15 +841,15 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
     sortTableDefault:1006,
   },
-  {
-    label: '来源库位',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1007,
-  },
+  // {
+  //   label: '来源库位',
+  //   field: 'fromLocationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:1007,
+  // },
   {
     label: '目标库位',
     field: 'toLocationCode',
@@ -933,26 +933,26 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:1009,
     hiddenInMain:true,
   },
-  {
-    label: '从货主',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:1008,
-  },
-  {
-    label: '到货主',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:1008,
-  },
+  // {
+  //   label: '从货主',
+  //   field: 'fromOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   sortTableDefault:1008,
+  // },
+  // {
+  //   label: '到货主',
+  //   field: 'toOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   sortTableDefault:1008,
+  // },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -992,16 +992,16 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
     sortTableDefault:7,
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:1010,
-  },
+  // {
+  //   label: '项目代码',
+  //   field: 'projectCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   sortTableDefault:1010,
+  // },
   {
     label: '计量单位',
     field: 'uom',
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
index 5aea05b6e..6ea0c3605 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
@@ -603,16 +603,16 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:14,
     hiddenInMain:true
   },
-  {
-    label: '到批次',
-    field: 'toBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:14,
-    hiddenInMain:true
-  },
+  // {
+  //   label: '到批次',
+  //   field: 'toBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:14,
+  //   hiddenInMain:true
+  // },
   {
     label: '替代批次',
     field: 'altBatch',
@@ -623,26 +623,26 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTable:false,
     hiddenInMain:true
   },
-  {
-    label: '从包装号',
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:15,
-    hiddenInMain:true
-  },
-  {
-    label: '到包装号',
-    field: 'toPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:15,
-    hiddenInMain:true
-  },
+  // {
+  //   label: '从包装号',
+  //   field: 'fromPackingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:15,
+  //   hiddenInMain:true
+  // },
+  // {
+  //   label: '到包装号',
+  //   field: 'toPackingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:15,
+  //   hiddenInMain:true
+  // },
   {
     label: '从器具号',
     field: 'fromContainerNumber',
@@ -709,33 +709,33 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:13,
   },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:16,
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    tableForm: {
-      disabled: true,
-    },
-    isForm:false,
-    sortTableDefault:16,
-  },
+  // {
+  //   label: '包装规格',
+  //   field: 'packUnit',
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:16,
+  // },
+  // {
+  //   label: '包装数量',
+  //   field: 'packQty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //   },
+  //   tableForm: {
+  //     disabled: true,
+  //   },
+  //   isForm:false,
+  //   sortTableDefault:16,
+  // },
   {
     label: '供应商计量数量',
     field: 'supplierQty',
@@ -776,16 +776,16 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:18,
     hiddenInMain:true
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:18,
+  // {
+  //   label: '从库位代码',
+  //   field: 'fromLocationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:18,
 
-  },
+  // },
   {
     label: '到库位代码',
     field: 'toLocationCode',
@@ -795,16 +795,16 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:18,
   },
-  {
-    label: '从库位组',
-    field: 'fromLocationGroupCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:19,
-    hiddenInMain:true
-  },
+  // {
+  //   label: '从库位组',
+  //   field: 'fromLocationGroupCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:19,
+  //   hiddenInMain:true
+  // },
   {
     label: '到库位组',
     field: 'toLocationGroupCode',
@@ -815,16 +815,16 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:19,
     hiddenInMain:true
   },
-  {
-    label: '从库区',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:22,
-    hiddenInMain:true,
-  },
+  // {
+  //   label: '从库区',
+  //   field: 'fromAreaCodes',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:22,
+  //   hiddenInMain:true,
+  // },
   {
     label: '到库区',
     field: 'toAreaCodes',
@@ -835,16 +835,16 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:22,
     hiddenInMain:true
   },
-  {
-    label: '从货主',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:23,
-    hiddenInMain:true
-  },
+  // {
+  //   label: '从货主',
+  //   field: 'fromOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:23,
+  //   hiddenInMain:true
+  // },
   {
     label: '到货主',
     field: 'toOwnerCode',
@@ -1004,16 +1004,16 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   //   },
   // },
 
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1998,
-    hiddenInMain:true
-  },
+  // {
+  //   label: '项目代码',
+  //   field: 'projectCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:1998,
+  //   hiddenInMain:true
+  // },
   // {
   //   label: '代码',
   //   field: 'code',
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index 1df29662c..767c6f791 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -870,92 +870,92 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: true
     }
   },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    hiddenInMain:true,
-    sortTableDefault:11,
-    isForm: false
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    dictClass: 'string',
-    isTable: true,
-    isTableForm: false,
-    sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
-        disabled: true
-      }
-    },
-    sortTableDefault:11,
-    tableForm:{
-      disabled:true
-    },
-    isForm: true
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:11,
-    form: {
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packQty',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
+  // {
+  //   label: '包装号',
+  //   field: 'packingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   hiddenInMain:true,
+  //   sortTableDefault:11,
+  //   isForm: false
+  // },
+  // {
+  //   label: '包装规格',
+  //   field: 'packUnit',
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   isTableForm: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   },
+  //   sortTableDefault:11,
+  //   tableForm:{
+  //     disabled:true
+  //   },
+  //   isForm: true
+  // },
+  // {
+  //   label: '包装数量',
+  //   field: 'packQty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:11,
+  //   form: {
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择包装',
+  //       searchField: 'packQty',
+  //       searchTitle: '物品包装信息',
+  //       searchAllSchemas: Itempackaging.allSchemas,
+  //       searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+  //       searchCondition: [
+  //         {
+  //           key: 'itemCode',
+  //           value: 'itemCode',
+  //           message: '请选择订单行',
+  //           isMainValue: true
+  //         },
+  //         {
+  //           key: 'available',
+  //           value: 'TRUE',
+  //           isMainValue: false
+  //         }
 
-        ]
-      }
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'packQty',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isMainValue: true
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    },
-    isTableForm: false,
-    isForm: true
-  },
+  //       ]
+  //     }
+  //   },
+  //   tableForm: {
+  //     isInpuFocusShow: true,
+  //     searchListPlaceholder: '请选择包装',
+  //     searchField: 'packQty',
+  //     searchTitle: '物品包装信息',
+  //     searchAllSchemas: Itempackaging.allSchemas,
+  //     searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+  //     searchCondition: [
+  //       {
+  //         key: 'itemCode',
+  //         value: 'itemCode',
+  //         message: '请选择订单行',
+  //         isMainValue: true
+  //       },
+  //       {
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //   },
+  //   isTableForm: false,
+  //   isForm: true
+  // },
   {
     label: '到库位代码',
     field: 'defaultToLocationCode',
@@ -996,30 +996,30 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: true,
     isForm: false
   },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:13,
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:13,
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
+  // {
+  //   label: '从货主代码',
+  //   field: 'fromOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:13,
+  //   hiddenInMain:true,
+  //   isTableForm: false,
+  //   isForm: false
+  // },
+  // {
+  //   label: '到货主代码',
+  //   field: 'toOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:13,
+  //   hiddenInMain:true,
+  //   isTableForm: false,
+  //   isForm: false
+  // },
   {
     label: '供应商计量数量',
     field: 'supplierPackQty',
@@ -1204,29 +1204,29 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'Select'
     }
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:12,
-    isTableForm: false,
-    isForm: false
-  },
+  // {
+  //   label: '从库位代码',
+  //   field: 'fromLocationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:12,
+  //   isTableForm: false,
+  //   isForm: false
+  // },
 
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
+  // {
+  //   label: '项目代码',
+  //   field: 'projectCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   isTableForm: false,
+  //   isForm: false
+  // },
   {
     label: '单据号',
     field: 'number',

From 23eb24efe31f6419b4462dc14324c6965fd413bc Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 18:34:00 +0800
Subject: [PATCH 42/51] =?UTF-8?q?=E6=97=A0=E6=84=8F=E4=B9=89=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=88=A0=E9=99=A4---=E5=B0=8F=E5=8D=9A=E6=8F=90?=
 =?UTF-8?q?=E5=87=BA=EF=BC=8C=E5=96=9C=E5=A9=B7=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../putawayJobMain/putawayJobMain.data.ts     | 54 ++++++-------
 .../putawayRecordMain.data.ts                 | 78 +++++++++----------
 .../putawayRequestMain.data.ts                | 66 ++++++++--------
 3 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
index 07d5dd8df..d70ef2d4c 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
@@ -793,15 +793,15 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     hiddenInMain: true,
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
+  // {
+  //   label: '项目代码',
+  //   field: 'projectCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain: true,
+  // },
   {
     label: '数量',
     field: 'qty',
@@ -844,24 +844,24 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     hiddenInMain: true,
   },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
+  // {
+  //   label: '从货主代码',
+  //   field: 'fromOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain: true,
+  // },
+  // {
+  //   label: '到货主代码',
+  //   field: 'toOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain: true,
+  // },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
index 7f5c9997e..64063dbc4 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
@@ -671,15 +671,15 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     hiddenInMain:true,
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
+  // {
+  //   label: '项目代码',
+  //   field: 'projectCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  // },
   {
     label: '数量',
     field: 'qty',
@@ -701,18 +701,18 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
+  // {
+  //   label: '接口类型',
+  //   field: 'interfaceType',
+  //   dictType: DICT_TYPE.INTERFACE_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  // },
   // {
   //   label: '任务明细ID',
   //   field: 'jobDetailId',
@@ -721,24 +721,24 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
-    label: '从器具号',
-    field: 'fromContainerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '到器具号',
-    field: 'toContainerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
+  // {
+  //   label: '从器具号',
+  //   field: 'fromContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  // },
+  // {
+  //   label: '到器具号',
+  //   field: 'toContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  // },
   {
     label: '操作',
     hiddenInMain:true,
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index bdfe01bf9..07db11bad 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -810,17 +810,17 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
+  // {
+  //   label: '项目代码',
+  //   field: 'projectCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   isTableForm: false,
+  //   isForm: false
+  // },
   {
     label: '数量',
     field: 'qty',
@@ -843,28 +843,28 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
 
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-    hiddenInMain:true,
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
+  // {
+  //   label: '从货主代码',
+  //   field: 'fromOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  //   hiddenInMain:true,
+  // },
+  // {
+  //   label: '到货主代码',
+  //   field: 'toOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   isTableForm: false,
+  //   isForm: false
+  // },
   {
     label: '操作',
     hiddenInMain:true,

From 4f577780862a0a9abd19c2d416248749f7599d6d Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 19:53:32 +0800
Subject: [PATCH 43/51] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    | 39 ++++++++++++++-----
 .../purchasereceiptRequestMain.data.ts        | 11 +++++-
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index c36b73763..74928cee4 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -134,8 +134,7 @@
     :showSearchTableQueryFields="showSearchTableQueryFields"
     @searchTableSuccess="searchTableSuccess"
   >
-  
-    <template v-for="name in Object.keys($slots)" :key="name" #[name]="{selections}">
+    <template v-for="name in Object.keys($slots)" :key="name" #[name]="{ selections }">
       <slot :name="name" :selections="selections"></slot>
     </template>
   </SearchTable>
@@ -843,18 +842,25 @@ const onChange = (field, cur) => {
 const onBlur = async (field, e) => {
   isExecute.value = false
   let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
- 
+
   if (formSchemaObj?.enterSearch) {
-   await  FormBlur(field, e, routeName.value, formRef.value, props.detailData, formSchemaObj, (list) => {
-       emit('searchTableSuccess', field, formSchemaObj.searchField, list, formRef.value, 'form')
-     })
+    await FormBlur(
+      field,
+      e,
+      routeName.value,
+      formRef.value,
+      props.detailData,
+      formSchemaObj,
+      (list) => {
+        emit('searchTableSuccess', field, formSchemaObj.searchField, list, formRef.value, 'form')
+      }
+    )
   } else {
     emit('onBlur', field, e)
   }
   isExecute.value = true
 }
 
-
 // 批量增加
 const batchAdd = async (val) => {
   const row = {}
@@ -921,8 +927,23 @@ const inputStringBlur = async (headerItem, val, row, index) => {
  * @param field 当前操作字段
  * @param e
  */
-const onEnter = (field, value, e) => {
-  emit('onEnter', field, value, e)
+const onEnter = async (field, value, e) => {
+  let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
+  if (formSchemaObj?.enterSearch && formSchemaObj?.isEnter ) {
+    await FormBlur(
+      field,
+      value,
+      routeName.value,
+      formRef.value,
+      props.detailData,
+      formSchemaObj,
+      (list) => {
+        emit('onEnter', field, value, e)
+      }
+    )
+  } else {
+    emit('onEnter', field, value, e)
+  }
 }
 
 // 修改盘点类型
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 15bb63b55..abb308c19 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -68,6 +68,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         searchDetailSchemas:PurchaseDetail.allSchemas,
         searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类
         searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, // 查询弹窗所需分页方法
+        isEnter:true,
         searchCondition: [{
           key:'status',
           value:'2',
@@ -80,7 +81,15 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
           action: '==', // 查询拼接条件
           isSearch: true, // 使用自定义拼接条件
           isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
-        }]
+        }],
+        verificationParams: [{
+          key: 'number',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
     isForm: true,

From 2073f4d7bfabf9bfeb21571048149ad4890368c2 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 16 Jul 2024 08:09:31 +0800
Subject: [PATCH 44/51] =?UTF-8?q?=E6=97=A0=E7=94=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../putawayRecordMain.data.ts                 | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
index 64063dbc4..f1efeeada 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
@@ -513,15 +513,15 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:3,
   },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
+  // {
+  //   label: '从货主代码',
+  //   field: 'fromOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  // },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
@@ -549,15 +549,15 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     hiddenInMain:true,
   },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
+  // {
+  //   label: '到货主代码',
+  //   field: 'toOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  // },
   {
     label: '到库位代码',
     field: 'toLocationCode',

From 897a1ef8a4124acd5516141e0dbaf54b774044fb Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 16 Jul 2024 09:12:13 +0800
Subject: [PATCH 45/51] =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productputawayRequestMain.data.ts         | 20 +++++++++----------
 .../productreceiptRecordMain.data.ts          |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index a6a53ba52..48ff2d557 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -612,7 +612,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
-    hiddeInMain: true,
+    hiddenInMain: true,
     isTableForm: false,
     form: {
       componentProps: {
@@ -627,7 +627,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    hiddeInMain: true,
+    hiddenInMain: true,
   },
   {
     label: '创建时间',
@@ -640,7 +640,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
-    hiddeInMain: true,
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -659,7 +659,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    hiddeInMain: true,
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false
   },
@@ -671,7 +671,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    hiddeInMain: true,
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false
   },
@@ -682,7 +682,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    hiddeInMain: true,
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false
   },
@@ -693,7 +693,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    hiddeInMain: true,
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false
   },
@@ -704,7 +704,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    hiddeInMain: true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -726,7 +726,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    hiddeInMain: true,
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false
   },
@@ -737,7 +737,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    hiddeInMain: true,
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false
   },
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
index 7253d12da..81838b9a2 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@@ -724,7 +724,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false ,
     table: {
-      width: 150,
+      width: 220,
       fixed: 'right'
     },
     isTableForm:true,

From 5927242a9d79d233ad927a06a1446e7a95f6eb64 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 16 Jul 2024 09:37:14 +0800
Subject: [PATCH 46/51] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 4c22a63cc..3fac21ff8 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -1068,11 +1068,11 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false ,
     hiddenInMain:true,
+    isTableForm:false,
     table: {
       width: 150,
       fixed: 'right'
     },
-    hiddeInMain:true,
     tableForm: {
       type: 'action',
       buttonText: 'Bom',

From 277676960eeef19c234b73e1107335d92a04219c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 16 Jul 2024 10:30:32 +0800
Subject: [PATCH 47/51] =?UTF-8?q?tableForm=E5=A4=B1=E5=8E=BB=E7=84=A6?=
 =?UTF-8?q?=E7=82=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/business/inputBlur.ts             | 460 ++++++++++++------
 src/components/BasicForm/src/BasicForm.vue    |   4 +-
 .../purchasereceiptRequestMain.data.ts        |  13 +-
 3 files changed, 320 insertions(+), 157 deletions(-)

diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts
index 50ffd9583..20a179bb8 100644
--- a/src/api/wms/business/inputBlur.ts
+++ b/src/api/wms/business/inputBlur.ts
@@ -22,95 +22,122 @@ const { t } = useI18n() // 国际化
  * tableFormBlur  表格表单失去焦点时候获取焦点
  * FormBlur  表格失去焦点时候获取焦点
  */
-export const tableFormBlurVer = async (headerItem, val, row, index,routeName,formRef,detailData,tableData,callback) => {
-  if (
-    headerItem.field == 'fromPackingNumber' ||
-    headerItem.field == 'packingNumber' ||
-    headerItem.field == 'itemCode' ||
-    headerItem.field == 'packUnit' ||
-    headerItem.field == 'secondPackUnit' ||
-    headerItem.field == 'fromPackUnit' ||
-    headerItem.field == 'toPackUnit'||
-    headerItem.field == 'toPackUnit'||
-    headerItem.field == 'supplierItemCode'
-    
-  ) {
-    let searchField = headerItem.field
-    let pageApi = ref()
-    let params = ref()
-
+export const tableFormBlurVer = async (headerItem, val, row, index, routeName, formRef, detailData, tableData, callback) => {
+  if (headerItem.tableForm.searchPage && headerItem.tableForm.verificationParams) {
     if (val && isString(val)) {
-      // const obj = props.tableAllSchemas.tableFormColumns.find((item) => item.field == headerItem.field)
       if (val.indexOf(',') > -1) {
         message.alert('该输入框只能输入一条数据')
         row[headerItem.field] = ''
         return
       }
       // 校验
-      let params = ref({})
-      let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息
+      const params = ref({})
+      const filters: any[] = []
+      const searchCondition = headerItem.tableForm.searchCondition //获取data.ts参数信息
+      const verificationParams = headerItem.tableForm.verificationParams //获取data.ts参数信息
       // 循环参数设置参数为key：value格式
-      if (searchCondition1 && searchCondition1.length > 0) {
-        for (let i = 0; i < searchCondition1.length; i++) {
-          if (searchCondition1[i].isMainValue) {
-            params.value[searchCondition1[i].key] = formRef.formModel[
-              searchCondition1[i].value
+      if (searchCondition && searchCondition.length > 0) {
+        for (let i = 0; i < searchCondition.length; i++) {
+          if (searchCondition[i].isMainValue) {
+            params.value[searchCondition[i].key] = formRef.formModel[
+              searchCondition[i].value
             ]
-              ? formRef.formModel[searchCondition1[i].value]
+              ? formRef.formModel[searchCondition[i].value]
               : detailData
-              ? detailData[searchCondition1[i].value]
-              : row
-              ? row[searchCondition1[i].value]
-              : ''
+                ? detailData[searchCondition[i].value]
+                : row
+                  ? row[searchCondition[i].value]
+                  : ''
             // 是否含有空参数情况
             let isNull = false
             if (
-              params.value[searchCondition1[i].key] == '' ||
-              params.value[searchCondition1[i].key] == undefined
+              params.value[searchCondition[i].key] == '' ||
+              params.value[searchCondition[i].key] == undefined
             ) {
               isNull = true
             }
             if (isNull) {
               message.warning(
-                searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
               )
               row[headerItem.field] = ''
               return
             }
+            filters.push({
+              action: searchCondition[i].action || '==',
+              column: searchCondition[i].key,
+              value: formRef.formModel[searchCondition[i].value]
+            })
           } else {
             // 扩展 转换为筛选条件进行查询
-            if (searchCondition1[i].isSearch) {
-              if (searchCondition1[i].isFormModel) {
+            if (searchCondition[i].isSearch) {
+              if (searchCondition[i].isFormModel) {
                 //用formModel中的值
-                if (searchCondition1[i].required) {
+                if (searchCondition[i].required) {
                   if (
-                    formRef.formModel[searchCondition1[i].value] == '' ||
-                    formRef.formModel[searchCondition1[i].value] == undefined
+                    formRef.formModel[searchCondition[i].value] == '' ||
+                    formRef.formModel[searchCondition[i].value] == undefined
                   ) {
                     message.warning(
-                      searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                      searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
                     )
                     row[headerItem.field] = ''
                     return
                   }
                 }
               }
+              filters.push({
+                action: searchCondition[i].action || '==',
+                column: searchCondition[i].key,
+                value: formRef.formModel[searchCondition[i].value]
+              })
             } else {
-              params.value[searchCondition1[i].key] = searchCondition1[i].value
+              params.value[searchCondition[i].key] = searchCondition[i].value
             }
           }
         }
       }
-      params.value[headerItem.field] = val?.trim()
+      if (verificationParams && verificationParams.length > 0) {
+        // 转换筛选条件所需
+        for (let i = 0; i < verificationParams.length; i++) {
+          // 扩展 转换为筛选条件进行查询
+          if (verificationParams[i].isSearch) {
+            if (verificationParams[i].isFormModel) {
+              filters.push({
+                action: verificationParams[i].action,
+                column: verificationParams[i].key,
+                value: formRef.formModel[verificationParams[i].value]
+                  ? formRef.formModel[verificationParams[i].value]
+                  : val.trim()
+              })
+              filters.push({
+                action: searchCondition[i].action || '==',
+                column: searchCondition[i].key,
+                value: formRef.formModel[searchCondition[i].value]
+              })
+            } else {
+              filters.push({
+                action: searchCondition[i].action || '==',
+                column: searchCondition[i].key,
+                value: searchCondition[i].value
+              })
+            }
+          } else {
+            params[verificationParams[i].key] = verificationParams[i].value
+          }
+        }
+      }
       // 判断改包装号是否已经添加
       const seen = new Set()
       const repeatCode = new Set()
-      let arr = tableData.map((item) => item[headerItem.field]?.trim())
+      const arr = tableData.map((item) => item[headerItem.field]?.trim())
       arr.forEach((item) => {
-        if (seen.has(item)) {
-          repeatCode.add(item)
-        } else {
-          seen.add(item)
+        if (item) {
+          if (seen.has(item)) {
+            repeatCode.add(item)
+          } else {
+            seen.add(item)
+          }
         }
       })
       const arr1 = Array.from(repeatCode)
@@ -119,132 +146,258 @@ export const tableFormBlurVer = async (headerItem, val, row, index,routeName,for
         row[headerItem.field] = ''
         return
       }
-      if (
-        headerItem.field == 'fromPackingNumber' ||
-        headerItem.field == 'packingNumber' ||
-        headerItem.field == 'itemCode'
-      ) {
-        // 业务
-        // 采购退货申请，制品拆解,调拨出库,报废出库申请，合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请，库存修改申请
-        if (
-          routeName == 'PurchasereturnRequestMain' ||
-          routeName == 'ProductdismantleRequestMain' ||
-          routeName == 'TransferissueRequestMain' ||
-          routeName == 'ScrapRequestMain' ||
-          routeName == 'OktoholdRequestMain' ||
-          routeName == 'HoldtookRequestMain' ||
-          routeName == 'HoldtoscrapRequestMain' ||
-          routeName == 'OktoscrapRequestMain' ||
-          routeName == 'ScraptoholdRequestMain' ||
-          routeName == 'InventorymoveRequestMain' ||
-          routeName == 'InventorychangeRequestMain'
-        ) {
-          // //合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请参数稍有不同
-          // if (
-          //   routeName == 'OktoholdRequestMain' ||
-          //   routeName == 'HoldtookRequestMain' ||
-          //   routeName == 'HoldtoscrapRequestMain' ||
-          //   routeName == 'OktoscrapRequestMain' ||
-          //   routeName == 'ScraptoholdRequestMain' ||
-          //   routeName == 'InventorymoveRequestMain' ||
-          //   routeName == 'InventorychangeRequestMain'
-          // ) {
-          //   searchField = 'packingNumber'
-          //   params.value.packingNumber = val?.trim()
-          // }
-          // pageApi.value = getBalanceItemListByCodes
-        } else if (
-          routeName == 'RepleinshRequestMain' ||
-          routeName == 'IssueRequestMain' ||
-          routeName == 'InventoryinitRequestMain'
-        ) {
-          // 补料申请业务
-          pageApi.value = getItemListByCodes
-          searchField = 'code'
-          params.value.codes = val?.trim()
-        } else if (
-          routeName == 'ProductionMainAssemble' ||
-          routeName == 'ProductionMainASparePart' ||
-          routeName == 'ProductionMainPredictSparePart' ||
-          routeName == 'ProductreceiptRequestMain' ||
-          routeName == 'ProductreceiptRequestMainA' ||
-          routeName == 'ProductreceiptscrapRequestMain' ||
-          routeName == 'ProductscrapRequestMain'
-        ) {
-          // 装配计划,裝配备件计划,预备产件计划，预生产收货申请,装配收货申请,报修收货申请,制品报废申请
-          pageApi.value = getProductionLineCodelistByCodes
-          params.value.productionLineCode=
-              formRef.formModel.productionLine || formRef.formModel.productionLineCode || row.productionLine || row.productionLineCode,
-              params.value.itemCodes=val?.trim()
-        }
-      } else if (
-        headerItem.field == 'packUnit' ||
-        headerItem.field == 'secondPackUnit' ||
-        headerItem.field == 'fromPackUnit' ||
-        headerItem.field == 'toPackUnit'
-      ) {
-        searchField = 'packUnit'
-        //包装规格
-        // 预生产收货申请,装配收货申请,报修收货申请,客户退货申请，计划外入库，计划外出库,翻包申请
-        if (
-          routeName == 'ProductreceiptRequestMain' ||
-          routeName == 'ProductreceiptRequestMainA' ||
-          routeName == 'ProductreceiptscrapRequestMain' ||
-          routeName == 'CustomerreturnRequestMain' ||
-          routeName == 'UnplannedreceiptRequestMain' ||
-          routeName == 'UnplannedissueJobMain' ||
-          routeName == 'PackageoverRequestMain'
-        ) {
-          params.value.itemCode= row.itemCode
-          params.value.packUnit= val?.trim()
-          pageApi.value = getItemPackageunitListByCodes
-        }
-      } else if (
-        headerItem.field == 'supplierItemCode' 
-      ) {
-        // 生产退料申请,隔离退料申请
-        if (
-          routeName == 'ProductionreturnRequestMain' ||
-          routeName == 'ProductionreturnRequestMainNo' 
-        ) {
-        searchField = 'supplierCode'
-          params.value.itemCodes= row.itemCode
-          params.value.supplierCode= val?.trim()
-          pageApi.value = getSupplierItemListByCodes
-        }
+      if (filters.length > 0) {
+        params.value.isSearch = true
+        params.value.filters = filters
+      }
+      const obj = {
+        by: 'ASC',
+        pageNo: 1,
+        pageSize: 20
+      }
+      params.value = {
+        isSearch: params.value.isSearch,
+        filters: params.value.filters,
+        ...obj
       }
       const list = ref()
       // 调取包装接口
-     await pageApi.value(params.value).then(async (res) => {
-        list.value = res ? res : []
+      await headerItem.tableForm.searchPage(params.value).then(async (res) => {
+
+        list.value = res?.list?.length > 0 ? res.list.slice(0, 1) : []
         // 只查一条数据，多条数据查询默认显示不存在
-        if (res.length == 1) {
-          callback(searchField,list.value)
-        } else {
+        if (list.value?.length == 0) {
           message.alert('代码' + row[headerItem.field] + '没有找到对应数据')
           row[headerItem.field] = ''
           return
         }
+        callback(list.value)
       })
     }
+  } else {
+    if (
+      headerItem.field == 'fromPackingNumber' ||
+      headerItem.field == 'packingNumber' ||
+      headerItem.field == 'itemCode' ||
+      headerItem.field == 'packUnit' ||
+      headerItem.field == 'secondPackUnit' ||
+      headerItem.field == 'fromPackUnit' ||
+      headerItem.field == 'toPackUnit'||
+      headerItem.field == 'toPackUnit'||
+      headerItem.field == 'supplierItemCode'
+      
+    ) {
+      let searchField = headerItem.field
+      let pageApi = ref()
+      let params = ref()
+
+      if (val && isString(val)) {
+        // const obj = props.tableAllSchemas.tableFormColumns.find((item) => item.field == headerItem.field)
+        if (val.indexOf(',') > -1) {
+          message.alert('该输入框只能输入一条数据')
+          row[headerItem.field] = ''
+          return
+        }
+        // 校验
+        let params = ref({})
+        let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息
+        // 循环参数设置参数为key：value格式
+        if (searchCondition1 && searchCondition1.length > 0) {
+          for (let i = 0; i < searchCondition1.length; i++) {
+            if (searchCondition1[i].isMainValue) {
+              params.value[searchCondition1[i].key] = formRef.formModel[
+                searchCondition1[i].value
+              ]
+                ? formRef.formModel[searchCondition1[i].value]
+                : detailData
+                ? detailData[searchCondition1[i].value]
+                : row
+                ? row[searchCondition1[i].value]
+                : ''
+              // 是否含有空参数情况
+              let isNull = false
+              if (
+                params.value[searchCondition1[i].key] == '' ||
+                params.value[searchCondition1[i].key] == undefined
+              ) {
+                isNull = true
+              }
+              if (isNull) {
+                message.warning(
+                  searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                )
+                row[headerItem.field] = ''
+                return
+              }
+            } else {
+              // 扩展 转换为筛选条件进行查询
+              if (searchCondition1[i].isSearch) {
+                if (searchCondition1[i].isFormModel) {
+                  //用formModel中的值
+                  if (searchCondition1[i].required) {
+                    if (
+                      formRef.formModel[searchCondition1[i].value] == '' ||
+                      formRef.formModel[searchCondition1[i].value] == undefined
+                    ) {
+                      message.warning(
+                        searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                      )
+                      row[headerItem.field] = ''
+                      return
+                    }
+                  }
+                }
+              } else {
+                params.value[searchCondition1[i].key] = searchCondition1[i].value
+              }
+            }
+          }
+        }
+        params.value[headerItem.field] = val?.trim()
+        // 判断改包装号是否已经添加
+        const seen = new Set()
+        const repeatCode = new Set()
+        let arr = tableData.map((item) => item[headerItem.field]?.trim())
+        arr.forEach((item) => {
+          if (seen.has(item)) {
+            repeatCode.add(item)
+          } else {
+            seen.add(item)
+          }
+        })
+        const arr1 = Array.from(repeatCode)
+        if (arr1.length > 0) {
+          message.warning(`${arr1.join(',')}${t('ts.已经存在')}`)
+          row[headerItem.field] = ''
+          return
+        }
+        if (
+          headerItem.field == 'fromPackingNumber' ||
+          headerItem.field == 'packingNumber' ||
+          headerItem.field == 'itemCode'
+        ) {
+          // 业务
+          // 采购退货申请，制品拆解,调拨出库,报废出库申请，合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请，库存修改申请
+          if (
+            routeName == 'PurchasereturnRequestMain' ||
+            routeName == 'ProductdismantleRequestMain' ||
+            routeName == 'TransferissueRequestMain' ||
+            routeName == 'ScrapRequestMain' ||
+            routeName == 'OktoholdRequestMain' ||
+            routeName == 'HoldtookRequestMain' ||
+            routeName == 'HoldtoscrapRequestMain' ||
+            routeName == 'OktoscrapRequestMain' ||
+            routeName == 'ScraptoholdRequestMain' ||
+            routeName == 'InventorymoveRequestMain' ||
+            routeName == 'InventorychangeRequestMain'
+          ) {
+            // //合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请参数稍有不同
+            // if (
+            //   routeName == 'OktoholdRequestMain' ||
+            //   routeName == 'HoldtookRequestMain' ||
+            //   routeName == 'HoldtoscrapRequestMain' ||
+            //   routeName == 'OktoscrapRequestMain' ||
+            //   routeName == 'ScraptoholdRequestMain' ||
+            //   routeName == 'InventorymoveRequestMain' ||
+            //   routeName == 'InventorychangeRequestMain'
+            // ) {
+            //   searchField = 'packingNumber'
+            //   params.value.packingNumber = val?.trim()
+            // }
+            // pageApi.value = getBalanceItemListByCodes
+          } else if (
+            routeName == 'RepleinshRequestMain' ||
+            routeName == 'IssueRequestMain' ||
+            routeName == 'InventoryinitRequestMain'
+          ) {
+            // 补料申请业务
+            pageApi.value = getItemListByCodes
+            searchField = 'code'
+            params.value.codes = val?.trim()
+          } else if (
+            routeName == 'ProductionMainAssemble' ||
+            routeName == 'ProductionMainASparePart' ||
+            routeName == 'ProductionMainPredictSparePart' ||
+            routeName == 'ProductreceiptRequestMain' ||
+            routeName == 'ProductreceiptRequestMainA' ||
+            routeName == 'ProductreceiptscrapRequestMain' ||
+            routeName == 'ProductscrapRequestMain'
+          ) {
+            // 装配计划,裝配备件计划,预备产件计划，预生产收货申请,装配收货申请,报修收货申请,制品报废申请
+            pageApi.value = getProductionLineCodelistByCodes
+            params.value.productionLineCode=
+                formRef.formModel.productionLine || formRef.formModel.productionLineCode || row.productionLine || row.productionLineCode,
+                params.value.itemCodes=val?.trim()
+          }
+        } else if (
+          headerItem.field == 'packUnit' ||
+          headerItem.field == 'secondPackUnit' ||
+          headerItem.field == 'fromPackUnit' ||
+          headerItem.field == 'toPackUnit'
+        ) {
+          searchField = 'packUnit'
+          //包装规格
+          // 预生产收货申请,装配收货申请,报修收货申请,客户退货申请，计划外入库，计划外出库,翻包申请
+          if (
+            routeName == 'ProductreceiptRequestMain' ||
+            routeName == 'ProductreceiptRequestMainA' ||
+            routeName == 'ProductreceiptscrapRequestMain' ||
+            routeName == 'CustomerreturnRequestMain' ||
+            routeName == 'UnplannedreceiptRequestMain' ||
+            routeName == 'UnplannedissueJobMain' ||
+            routeName == 'PackageoverRequestMain'
+          ) {
+            params.value.itemCode= row.itemCode
+            params.value.packUnit= val?.trim()
+            pageApi.value = getItemPackageunitListByCodes
+          }
+        } else if (
+          headerItem.field == 'supplierItemCode' 
+        ) {
+          // 生产退料申请,隔离退料申请
+          if (
+            routeName == 'ProductionreturnRequestMain' ||
+            routeName == 'ProductionreturnRequestMainNo' 
+          ) {
+          searchField = 'supplierCode'
+            params.value.itemCodes= row.itemCode
+            params.value.supplierCode= val?.trim()
+            pageApi.value = getSupplierItemListByCodes
+          }
+        }
+        const list = ref()
+        // 调取包装接口
+        await pageApi.value(params.value).then(async (res) => {
+            list.value = res ? res : []
+            // 只查一条数据，多条数据查询默认显示不存在
+            if (res.length == 1) {
+              callback(list.value)
+            } else {
+              message.alert('代码' + row[headerItem.field] + '没有找到对应数据')
+              row[headerItem.field] = ''
+              return
+            }
+          })
+        }
+      }
   }
 }
 export const FormBlur = async (field, val, routeName, formRef, detailData, formSchema, callback) => {
   if (formSchema.searchPage && formSchema.verificationParams) {
     //获取data.ts参数信息
-    let searchCondition = formSchema?.searchCondition || []
+    const searchCondition = formSchema?.searchCondition || []
     //获取失去焦点参数信息
-    let verificationParams = formSchema?.verificationParams ||
+    const verificationParams = formSchema?.verificationParams ||
       []
     console.log('走新方法啦')
     // searchCondition = [...searchCondition, ...verificationParams]
 
     if (val && isString(val)) {
-      let setV = {}
+      const setV = {}
       setV[field] = ''
       let params = {}
       const _searchCondition = {}
-      let filters: any[] = []
+      const filters: any[] = []
       if (searchCondition && searchCondition.length > 0) {
         // 转换筛选条件所需
         for (let i = 0; i < searchCondition.length; i++) {
@@ -359,12 +512,13 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
           }
         }
       }
+      console.log(filters)
       if (filters.length > 0) {
         _searchCondition.isSearch = true
         _searchCondition.filters = filters
       }
       console.log(4545, _searchCondition)
-      let obj = {
+      const obj = {
         by: 'ASC',
         pageNo: 1,
         pageSize: 20
@@ -382,8 +536,8 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
         return
       }
       await formSchema.searchPage(params).then((res) => {
-        let arr1 = val.split(',')
-        let list = ref([])
+        const arr1 = val.split(',')
+        const list = ref([])
         list.value = res?.list?.length > 0 ? res.list.slice(0, 1) : []
         if (list.value?.length == 0) {
           message.alert('暂无数据')
@@ -391,8 +545,8 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
           return
         }
         if (arr1.length != list.value.length) {
-          let arr2 = list.value.map((item) => item.code)
-          let str = [
+          const arr2 = list.value.map((item) => item.code)
+          const str = [
             ...arr1.filter((item) => !arr2.includes(item)),
             ...arr2.filter((item) => !arr1.includes(item))
           ].join(',')
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 74928cee4..99a390f19 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -904,11 +904,11 @@ const inputStringBlur = async (headerItem, val, row, index) => {
     formRef.value,
     props.detailData,
     props.tableData,
-    (searchField, list) => {
+    ( list) => {
       emit(
         'searchTableSuccess',
         headerItem.field,
-        searchField,
+        headerItem.tableForm.searchField,
         list,
         formRef.value,
         'tableForm',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index abb308c19..f83af7467 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -988,7 +988,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         }]
       }
     },
-    tableForm:{
+    tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择库位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
@@ -999,7 +1000,15 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      }]
+      }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     isTableForm: true,
     isForm: false

From cb8085537b6854ae0b03670b8dd53f4153727d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Tue, 16 Jul 2024 10:51:40 +0800
Subject: [PATCH 48/51] =?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/views/qms/inspectionRequest/inspectionRequestMain.data.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
index af771ca97..081511ac3 100644
--- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
+++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
@@ -457,7 +457,7 @@ export const InspectionMain = useCrudSchemas(
       isForm: false,
       isDetail: false,
       table: {
-        width: 150,
+        width: 300,
         fixed: 'right'
       }
     }

From 5714f9057919ebec21d037460587f38811a491ea Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 16 Jul 2024 11:07:30 +0800
Subject: [PATCH 49/51] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain/purchasereturnRequestMain.data.ts | 2 +-
 1 file changed, 1 insertion(+), 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 eef4f4f85..2c770f1d7 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -871,7 +871,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'uom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isSearch: true,
+    // isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {

From 5e3e8d719fbe754a418426a312a4bbc1040a4ede Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 16 Jul 2024 11:09:48 +0800
Subject: [PATCH 50/51] =?UTF-8?q?=E5=88=B0=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 308e02f7a..0e728c496 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -642,7 +642,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     hiddenInMain:true,
     sortSearchDefault:1000,
-    isSearch: true,
+    // isSearch: true,
     sortTableDefault:1100,
     isTableForm: false,
   },

From 9df8efb839df0e2e68043d7c00d05bc07e0b4e2e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 16 Jul 2024 11:47:52 +0800
Subject: [PATCH 51/51] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/business/inputBlur.ts             | 37 +++++++---
 .../purchasereceiptRequestMain.data.ts        | 11 ++-
 .../purchasereceiptRequestMain.data.ts        | 34 +++++++--
 .../purchasereturnRequestMain.data.ts         | 71 ++++++++++++++++---
 .../sparereceiptRequestMain.data.ts           | 34 +++++++--
 5 files changed, 161 insertions(+), 26 deletions(-)

diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts
index 20a179bb8..905a255d5 100644
--- a/src/api/wms/business/inputBlur.ts
+++ b/src/api/wms/business/inputBlur.ts
@@ -68,6 +68,22 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f
               column: searchCondition[i].key,
               value: formRef.formModel[searchCondition[i].value]
             })
+          } else if (searchCondition[i].isTableRowValue) {
+            if (searchCondition[i].required) {
+              if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) {
+                message.warning(
+                  searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+                )
+                row[headerItem.field] = ''
+                return
+              }
+            }
+            //查询当前table表数据的值
+            filters.push({
+              action: searchCondition[i].action || '==',
+              column: searchCondition[i].key,
+              value: row[searchCondition[i].value]
+            })
           } else {
             // 扩展 转换为筛选条件进行查询
             if (searchCondition[i].isSearch) {
@@ -85,14 +101,24 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f
                     return
                   }
                 }
+                filters.push({
+                  action: searchCondition[i].action || '==',
+                  column: searchCondition[i].key,
+                  value: formRef.formModel[searchCondition[i].value]
+                })
+              } else {
+                filters.push({
+                  action: searchCondition[i].action || '==',
+                  column: searchCondition[i].key,
+                  value: searchCondition[i].value
+                })
               }
+            } else {
               filters.push({
                 action: searchCondition[i].action || '==',
                 column: searchCondition[i].key,
-                value: formRef.formModel[searchCondition[i].value]
+                value: searchCondition[i].value
               })
-            } else {
-              params.value[searchCondition[i].key] = searchCondition[i].value
             }
           }
         }
@@ -110,11 +136,6 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f
                   ? formRef.formModel[verificationParams[i].value]
                   : val.trim()
               })
-              filters.push({
-                action: searchCondition[i].action || '==',
-                column: searchCondition[i].key,
-                value: formRef.formModel[searchCondition[i].value]
-              })
             } else {
               filters.push({
                 action: searchCondition[i].action || '==',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index f83af7467..d2e2d5928 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -975,6 +975,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库位代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -985,7 +986,15 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
     tableForm: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
index 5a46ecd78..09e5109be 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
@@ -86,7 +86,15 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
           action: '==', // 查询拼接条件
           isSearch: true, // 使用自定义拼接条件
           isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
-        }]
+          }],
+        verificationParams: [{
+          key: 'number',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
     isForm: true,
@@ -966,6 +974,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库位代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -976,10 +985,19 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
-    tableForm:{
+    tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择库位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
@@ -990,7 +1008,15 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      }]
+      }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     isTableForm: true,
     isForm: false
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 2c770f1d7..d46fac093 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -195,7 +195,15 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '供应商信息', // 查询弹窗标题
         searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+        searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -209,6 +217,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         disabled:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
@@ -221,7 +230,15 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'supplierCode',
           value: 'supplierCode',
           isMainValue: true
-        }]
+          }],
+        verificationParams: [{
+          key: 'number',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -943,7 +960,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
+      enterSearch: true,
       // labelMessage: '信息提示说明！！！',
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择从库位代码',
@@ -961,7 +979,15 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         value: 'out',
         message: '',
         isMainValue: false
-      }]
+        }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     // form: {
     //   componentProps:{
@@ -971,6 +997,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     form:{
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true,
         searchListPlaceholder: '请选择从库位代码',
         searchField: 'code',
@@ -987,7 +1014,15 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
           value: 'out',
           message: '',
           isMainValue: false
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
     hiddenInMain: true,
@@ -1008,7 +1043,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     //   }
     // },
     form: {
-      componentProps:{
+      componentProps: {
+        enterSearch: true,
         isSearchList: true,
         searchListPlaceholder: '请选择包装号',
         searchField: 'packingNumber',
@@ -1036,10 +1072,19 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
           isTableRowValue: true, //查询当前searchTable表中行数据的值
           required:true,
           isMainValue:true
-        }]
+          }],
+        verificationParams: [{
+          key: 'packingNumber',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
-    tableForm:{
+    tableForm: {
+      enterSearch: true,
       multiple: true,
       // labelMessage: '信息提示说明！！！',
       isInpuFocusShow: true, // 开启查询弹窗
@@ -1069,7 +1114,15 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         isTableRowValue: true, //查询当前searchTable表中行数据的值
         required:true,
         isMainValue:false
-      }]
+        }],
+      verificationParams: [{
+        key: 'packingNumber',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
   },
   {
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index 767c6f791..c3e136109 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -84,7 +84,15 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
           action: '==', // 查询拼接条件
           isSearch: true, // 使用自定义拼接条件
           isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
-        }]
+          }],
+        verificationParams: [{
+          key: 'number',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
     isForm: true,
@@ -967,6 +975,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库位代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -977,10 +986,19 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
-    tableForm:{
+    tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择库位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
@@ -991,7 +1009,15 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      }]
+      }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     isTableForm: true,
     isForm: false