基础数据供应商物品信息修改

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' },

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 },
       ],