Browse Source

🐞 fix(【drp-采购工作台】): 采购工作台字段检验

采购工作台-【采购需求单、采购订单、价格申报单、物料申请单、物料变更】5个单据,开发核对界面上所有字段是否有传值,没有传值进行添加,传值核对是否传值正确。测试负责验证每个字段有值是否在界面上显示  胡雪芊今反馈【价格申报单】涨幅、预计年采购量、预计年采购金额在采购工作台没有值

20240529474 -v2
002390 1 year ago
parent
commit
41e0b20901
2 changed files with 17 additions and 14 deletions
  1. 4 4
      src/views/purchase/apply/see/columns.js
  2. 13 10
      src/views/purchase/workSpace/columns.js

+ 4 - 4
src/views/purchase/apply/see/columns.js

@@ -187,10 +187,10 @@ export default function useColumns() {
         {
           item: { width: 100, key: "increase", title: "涨幅(%)" },
           attr: {
-            formatter: (prop) => {
-              const { priceDiffer = 0, recentlyPrice = 0 } = prop;
-              return (prop.increase = recentlyPrice ? ((Number(priceDiffer) / Number(recentlyPrice)) * 100).toFixed(1) + '%' : "0%");
-            },
+            // formatter: (prop) => {
+            //   const { priceDiffer = 0, recentlyPrice = 0 } = prop;
+            //   return (prop.increase = recentlyPrice ? ((Number(priceDiffer) / Number(recentlyPrice)) * 100).toFixed(1) + '%' : "0%");
+            // },
           },
         },
 

+ 13 - 10
src/views/purchase/workSpace/columns.js

@@ -81,7 +81,7 @@ export default function useColumns() {
       item: { title: "紧急标识", key: "isUrgency", width: 80, },
       attr: {
         is: "el-dict-tag",
-        dictName: "sys_number_yes_no",
+        dictName: "sys_yes_no",
       },
     },
     {
@@ -90,7 +90,7 @@ export default function useColumns() {
       },
       attr: {
         is: "el-dict-tag",
-        dictName: "sys_number_yes_no",
+        dictName: "sys_yes_no",
       }
     },
   ].map(({ item, attr }) => ({
@@ -475,7 +475,7 @@ export default function useColumns() {
       attr: {}
     },
     {
-      item: { title: "税率", key: "tax" },
+      item: { title: "税率(%)", key: "tax" },
       attr: {}
     },
     {
@@ -493,12 +493,15 @@ export default function useColumns() {
       },
       attr: {
         is: "el-dict-tag",
-        dictName: "sys_number_yes_no",
+        dictName: "sys_yes_no",
       },
     },
     {
       item: { title: "调整类型", key: "isPriceAdjustment" },
-      attr: {}
+      attr: {
+        is: "el-dict-tag",
+        dictName: "price_adjustment_type",
+      }
     },
     {
       item: { title: "最近价格", key: "recentlyPrice", width: 80 },
@@ -509,15 +512,15 @@ export default function useColumns() {
       attr: {}
     },
     {
-      item: { title: "涨幅", key: "increase" },
+      item: { title: "涨幅(%)", key: "increase" },
       attr: {}
     },
     {
-      item: { title: "预计年采购量", key: "yPurchaseQuantity" },
+      item: { title: "预计年采购量", key: "ypurchaseQuantity" },
       attr: {}
     },
     {
-      item: { title: "预计年影响金额", key: "yAffectedAmount" },
+      item: { title: "预计年影响金额", key: "yaffectedAmount" },
       attr: {}
     },
     {
@@ -614,7 +617,7 @@ export default function useColumns() {
       attr: {}
     },
     {
-      item: { title: "税率", key: "tax" },
+      item: { title: "税率(%)", key: "tax" },
       attr: {}
     },
     {
@@ -625,7 +628,7 @@ export default function useColumns() {
       },
       attr: {
         is: "el-dict-tag",
-        dictName: "sys_number_yes_no",
+        dictName: "sys_yes_no",
       },
     },
     {