From 739f2594a8cb3ac4f77d84e228aa4430d448670d Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 13 三月 2026 14:03:25 +0800
Subject: [PATCH] Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management into dev_银川_中盛建材
---
src/views/productionPlan/summaryByProduct/index.vue | 11 +----------
src/views/productionPlan/productionPlan/index.vue | 16 ++++++++--------
2 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 7214e1a..9e4c098 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -376,7 +376,6 @@
label: "鐢宠鍗曠紪鍙�",
prop: "applyNo",
width: "150px",
- className: "code-cell",
},
{
label: "瀹㈡埛鍚嶇О",
@@ -389,11 +388,12 @@
width: "200px",
dataType: "tag",
formatType: params => {
- const typeMap = {
- 鏉挎潗: "primary",
- 鐮屽潡: "warning",
- };
- return typeMap[params] || "info";
+ // const typeMap = {
+ // 鏉挎潗: "primary",
+ // 鐮屽潡: "warning",
+ // };
+ // return typeMap[params] || "info";
+ return "primary";
},
},
{
@@ -406,12 +406,10 @@
label: "鐗╂枡缂栫爜",
prop: "materialCode",
width: "150px",
- className: "code-cell",
},
{
label: "鍧楁暟",
prop: "quantity",
- className: "quantity-cell",
formatData: cell => (cell ? `${cell}鍧梎 : ""),
},
{
@@ -496,10 +494,12 @@
{
label: "澶囨敞 1",
+ width: "150px",
prop: "remarkOne",
},
{
label: "澶囨敞 2",
+ width: "150px",
prop: "remarkTwo",
},
diff --git a/src/views/productionPlan/summaryByProduct/index.vue b/src/views/productionPlan/summaryByProduct/index.vue
index 97c5001..f575b72 100644
--- a/src/views/productionPlan/summaryByProduct/index.vue
+++ b/src/views/productionPlan/summaryByProduct/index.vue
@@ -43,18 +43,13 @@
{
label: "鐗╂枡缂栫爜",
prop: "materialCode",
- className: "code-cell",
},
{
label: "浜у搧鍚嶇О",
prop: "productName",
dataType: "tag",
formatType: params => {
- const typeMap = {
- 鏉挎潗: "primary",
- 鐮屽潡: "info",
- };
- return typeMap[params] || "info";
+ return "primary";
},
},
{
@@ -65,25 +60,21 @@
{
label: "闀�",
prop: "length",
- className: "dimension-cell",
formatData: cell => (cell ? `${cell}mm` : ""),
},
{
label: "瀹�",
prop: "width",
- className: "dimension-cell",
formatData: cell => (cell ? `${cell}mm` : ""),
},
{
label: "楂�",
prop: "height",
- className: "dimension-cell",
formatData: cell => (cell ? `${cell}mm` : ""),
},
{
label: "鍧楁暟",
prop: "quantity",
- className: "quantity-cell",
formatData: cell => (cell ? `${cell}鍧梎 : ""),
},
{
--
Gitblit v1.9.3