From 36a807cc8dc57400a45effaae64b4f8d954e9d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 4 Apr 2023 15:17:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E7=89=A9=E5=93=81=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/tableColumns/index.js                     | 2 +-
 fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 51a189db8..e4fba05f4 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -1112,7 +1112,7 @@ export const PurchaseOrder = [
   { label: "联系人邮件", prop: 'contactEmail' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "订单类型", prop: 'poType' },
-  { label: "是否寄存订单", prop: 'isConsignment' },
+  { label: "是否寄存订单", prop: 'isConsignment', type: "filter", filters: "whetherOrNot" },
   { label: "订单日期", prop: 'orderDate',type: "dateTime" },
   { label: "截止日期", prop: 'dueDate',type: "dateTime" },
   { label: "版本", prop: 'version' },
diff --git a/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue b/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue
index 768d06abc..2c55bdcc6 100644
--- a/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue
+++ b/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue
@@ -131,7 +131,8 @@ export default {
         supplierItemCode: null,
         version: null,
         supplierPackQty: 0,
-        supplierPackUom: '包装单位',
+        // supplierPackUom: '包装单位',
+        supplierPackUom: '',
         itemName: null,
         supplierCode: null,
         itemCode: null,
@@ -164,6 +165,8 @@ export default {
         { type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 },
         { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },
+        { type: "input", label: "供应商包装计量单位", prop: "supplierPackUom", colSpan: 12 },
+        { type: "input", label: "供应商包装数量", prop: "supplierPackQty", validType:'number', colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -173,7 +176,8 @@ export default {
         { type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 },
         { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },
-        { type: "input", label: "包装单位", prop: "supplierPackUom", colSpan: 12 },
+        { type: "input", label: "供应商包装计量单位", prop: "supplierPackUom", colSpan: 12 },
+        { type: "input", label: "供应商包装数量", prop: "supplierPackQty", validType:'number', colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],