From b55d7caa696d25156b224a52ae9b7beb7e27647a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 22 Mar 2024 17:30:45 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/filters/status.js                    |  8 ++++++++
 fe/PC/src/utils/tableColumns/index.js          |  6 ++++--
 .../views/basicData/ItemsManage/Utensil.vue    | 18 +++++++++---------
 .../InventoryQuery/InventoryBalance.vue        |  3 ++-
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js
index 979fa5272..0309c25dd 100644
--- a/fe/PC/src/filters/status.js
+++ b/fe/PC/src/filters/status.js
@@ -2359,6 +2359,14 @@ export function SupplierAsnCtypeStaBack(name){
   return Enum(store.getters.dictionaries.CaseCode, index, prop)
 }
 
+// 专案代码
+/**
+ * @returns {object} '专案代码'
+ */
+ export function ContainerSpecificationsType(index, prop) {
+  return Enum(store.getters.dictionaries.ContainerSpecificationsType, index, prop)
+}
+
 // 获取业务字典类型
 /**
  * @returns {object} 
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index c1b433cca..d2631f033 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -1569,7 +1569,7 @@ export const IssueRequest =  [
   { label: "备注", prop: 'remark' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "叫料类型", prop: 'type' },
+  // { label: "叫料类型", prop: 'type' },
   { label: "备料计划单号", prop: 'preparationPlanNumber',width: orderWidth },
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
@@ -1665,7 +1665,7 @@ export const automaticCallApply =  [
   { label: "备注", prop: 'remark' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "叫料类型", prop: 'type' },
+  // { label: "叫料类型", prop: 'type' },
   { label: "备料计划单号", prop: 'preparationPlanNumber',width: orderWidth },
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
@@ -2650,6 +2650,8 @@ export const InventoryBalance = [
   { label: "配置", prop: "item_configurationFromFE",showProp:true },
   { label: "库存数量", prop: "qty",isNumber:true },
   { label: "计量单位", prop: "uom" },
+  { label: "标准成本单价", prop: "stdCostPrice" },
+  { label: "标准成本价格", prop: "stdCost" },
   { label: "批次", prop: "lot" },
   { label: "库位代码", prop: "locationCode" },
   { label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" },
diff --git a/fe/PC/src/views/basicData/ItemsManage/Utensil.vue b/fe/PC/src/views/basicData/ItemsManage/Utensil.vue
index e6d853639..4ffb94cd1 100644
--- a/fe/PC/src/views/basicData/ItemsManage/Utensil.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/Utensil.vue
@@ -148,27 +148,27 @@ export default {
         concurrencyStamp: ""
       },
       editOptions: {},
-      // todo:1、列表与详情添加尺寸和类型字段，标包字段是否去掉
       CreateForm: [
         { type: "prefixInput", label: "器具号", prop: "codeSuffix",prefixProp:"type",prefixWidth:'50px',prefixDisabled:true, colSpan: 12 },
-        //todo:获取字典,字段确定
-        { type: "select", label: "尺寸", prop: "size", colSpan: 12 },
-        // todo:确定枚举（内物流，客户）,字段确定
-        { type: "select",options: "utensilType", label: "类型", prop: "type2", colSpan: 12 },
+        //todo:字段确定
+        { type: "select", options: "ContainerSpecificationsType",label: "器具规格", prop: "size", colSpan: 12 },
+         //todo:字段确定
+        { type: "select",options: "utensilType", label: "器具类型", prop: "type2", colSpan: 12 },
         //todo：标包数量是否去掉
         { type: "inputNumber", label: "标包数量", prop: "stdQty", colSpan: 12, min:1 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editForm: [
         { disabled:true,type: "prefixInput", label: "器具号", prop: "codeSuffix",prefixProp:"type",prefixWidth:'50px',prefixDisabled:true, colSpan: 12 },
-        //todo:获取字典,字段确定
-        { type: "select", label: "尺寸", prop: "size", colSpan: 12 },
-        // todo:确定枚举（内物流，客户）,字段确定
-        { type: "select",options: "utensilType", label: "类型", prop: "type2", colSpan: 12 },
+        //todo:字段确定
+        { type: "select",options: "ContainerSpecificationsType", label: "器具规格", prop: "size", colSpan: 12 },
+        //todo:字段确定
+        { type: "select",options: "utensilType", label: "器具类型", prop: "type2", colSpan: 12 },
         //todo：标包数量是否去掉
         { type: "inputNumber", label: "标包数量", prop: "stdQty", colSpan: 12, min:1 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
+      //todo:器具规格+器具类型
       editRules: {
         cerateRule: {
           codeSuffix: [{ required: true, trigger: "blur", message: "不可为空" }],
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
index d95b07e6a..f26dded23 100644
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
@@ -102,7 +102,8 @@ export default {
   data () {
     return {
       showTableBaseFromFE:['configuration'],
-      URL: 'wms/inventory/inventory-balance',
+      // URL: 'wms/inventory/inventory-balance',
+      listURL:"wms/inventory/inventory-balance/get-list",
       //常用按钮数据
       currenButtonData: [
         this.defaultImportBtn(),//导入