소스 검색

🐞 fix([drp-价格申报单]): 无税单价、单价差、涨幅、预计年影响金额

重新提报20240314191、20240304084  【无税单价、单价差、涨幅、预计年影响金额】这些字段是前端计算,滚动条没有拉动到对应字段的位置,前端没有加载计算,导致没有取到值。 临时解决方案:价格申报单新增填写好,拉动向滚动条往右边走一遍。这样字段都能取到值。  永久解决方案:字段取值由前端改后端计算      ——v1

20240506187
002390 1 년 전
부모
커밋
60e1f4fe85

+ 21 - 21
src/views/purchase/apply/add/columns.js

@@ -201,10 +201,10 @@ export default function useColumns() {
         {
           item: { key: "price", title: "无税单价", required: true },
           attr: {
-            formatter: (prop) => {
-              const { tax = 0, taxPrice = 0 } = prop;
-              return (prop.price = iunitprice(tax, taxPrice));
-            },
+            // formatter: (prop) => {
+            //   const { tax = 0, taxPrice = 0 } = prop;
+            //   return (prop.price = iunitprice(tax, taxPrice));
+            // },
           },
         },
         // {
@@ -287,20 +287,20 @@ export default function useColumns() {
         {
           item: { width: 100, key: "priceDiffer", title: "单价差" },
           attr: {
-            formatter: (prop) => {
-              const { taxPrice = 0, recentlyPrice = 0 } = prop;
-              return (prop.priceDiffer = Number(recentlyPrice) !== 0 ? Number(taxPrice) - Number(recentlyPrice) : 0);
-            },
+            // formatter: (prop) => {
+            //   const { taxPrice = 0, recentlyPrice = 0 } = prop;
+            //   return (prop.priceDiffer = Number(recentlyPrice) !== 0 ? Number(taxPrice) - Number(recentlyPrice) : 0);
+            // },
           },
         },
 
         {
           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);
+            // },
           },
         },
 
@@ -325,11 +325,11 @@ export default function useColumns() {
         {
           item: { width: 100, key: "yAffectedAmount", title: "预计年影响金额" },
           attr: {
-            formatter: (prop) => {
-              const { priceDiffer = 0, yPurchaseQuantity = 0 } = prop;
-              return (prop.yAffectedAmount =
-                Number(priceDiffer) * Number(yPurchaseQuantity));
-            },
+            // formatter: (prop) => {
+            //   const { priceDiffer = 0, yPurchaseQuantity = 0 } = prop;
+            //   return (prop.yAffectedAmount =
+            //     Number(priceDiffer) * Number(yPurchaseQuantity));
+            // },
           },
         },
         {
@@ -457,10 +457,10 @@ export default function useColumns() {
           item: { key: "isPriceAdjustment", title: "", width: 10 },
           attr: {
             value: 'no',
-            formatter: (prop) => {
-              const { priceDiffer } = prop;
-              return (prop.isPriceAdjustment = priceDiffer > 0 ? 'up' : priceDiffer < 0 ? 'down' : 'no');
-            },
+            // formatter: (prop) => {
+            //   const { priceDiffer } = prop;
+            //   return (prop.isPriceAdjustment = priceDiffer > 0 ? 'up' : priceDiffer < 0 ? 'down' : 'no');
+            // },
           },
         },
         // 采购换算率隐藏

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 490 - 443
src/views/purchase/apply/add/index.vue


+ 24 - 23
src/views/purchase/apply/copy/columns.js

@@ -147,7 +147,7 @@ export default function useColumns() {
         { item: { key: "model", title: "型号" }, attr: {} },
         { item: { key: "manufacturerName", title: "生产厂家" }, attr: {} },
         {
-          item: { key: "unitName", title: "单位"},
+          item: { key: "unitName", title: "单位" },
           attr: {
             is: "el-popover-select-v2",
             valueKey: "name",
@@ -201,10 +201,10 @@ export default function useColumns() {
         {
           item: { key: "price", title: "无税单价", required: true },
           attr: {
-            formatter: (prop) => {
-              const { tax = 0, taxPrice = 0 } = prop;
-              return (prop.price = iunitprice(tax, taxPrice));
-            },
+            // formatter: (prop) => {
+            //   const { tax = 0, taxPrice = 0 } = prop;
+            //   return (prop.price = iunitprice(tax, taxPrice));
+            // },
           },
         },
         // {
@@ -287,20 +287,20 @@ export default function useColumns() {
         {
           item: { width: 100, key: "priceDiffer", title: "单价差" },
           attr: {
-            formatter: (prop) => {
-              const { taxPrice = 0, recentlyPrice = 0 } = prop;
-              return (prop.priceDiffer = Number(recentlyPrice) !== 0 ? Number(taxPrice) - Number(recentlyPrice) : 0);
-            },
+            // formatter: (prop) => {
+            //   const { taxPrice = 0, recentlyPrice = 0 } = prop;
+            //   return (prop.priceDiffer = Number(recentlyPrice) !== 0 ? Number(taxPrice) - Number(recentlyPrice) : 0);
+            // },
           },
         },
 
         {
           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);
+            // },
           },
         },
 
@@ -325,12 +325,12 @@ export default function useColumns() {
         {
           item: { width: 100, key: "yAffectedAmount", title: "预计年影响金额" },
           attr: {
-            formatter: (prop) => {
-              const { priceDiffer = 0, yPurchaseQuantity = 0 } = prop;
-              return (prop.yAffectedAmount = (
-                Number(priceDiffer) * Number(yPurchaseQuantity)
-              ));
-            },
+            // formatter: (prop) => {
+            //   const { priceDiffer = 0, yPurchaseQuantity = 0 } = prop;
+            //   return (prop.yAffectedAmount = (
+            //     Number(priceDiffer) * Number(yPurchaseQuantity)
+            //   ));
+            // },
           },
         },
         {
@@ -455,13 +455,14 @@ export default function useColumns() {
         // { item: { key: "createByName", title: "创建人名称" }, attr: {} },
         // { item: { key: "updateByName", title: "更新人名称" }, attr: {} },
         {
+          // 调价类型
           item: { key: "isPriceAdjustment", title: "", width: 10 },
           attr: {
             value: 'no',
-            formatter: (prop) => {
-              const { priceDiffer } = prop;
-              return (prop.isPriceAdjustment = priceDiffer > 0 ? 'up' : priceDiffer < 0 ? 'down' : 'no');
-            },
+            // formatter: (prop) => {
+            //   const { priceDiffer } = prop;
+            //   return (prop.isPriceAdjustment = priceDiffer > 0 ? 'up' : priceDiffer < 0 ? 'down' : 'no');
+            // },
           },
         },
         // 采购换算率隐藏

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 521 - 478
src/views/purchase/apply/copy/index.vue


+ 23 - 23
src/views/purchase/apply/edit/columns.js

@@ -126,7 +126,7 @@ export default function useColumns() {
           attr: {
             is: "el-popover-select-v2",
             checkbox: true,
-            clearable:true,
+            clearable: true,
             valueKey: "name",
             referName: "MATERIAL_PARAM",
             dataMapping: {
@@ -201,10 +201,10 @@ export default function useColumns() {
         {
           item: { key: "price", title: "无税单价", required: true },
           attr: {
-            formatter: (prop) => {
-              const { tax = 0, taxPrice = 0 } = prop;
-              return (prop.price = iunitprice(tax, taxPrice));
-            },
+            // formatter: (prop) => {
+            //   const { tax = 0, taxPrice = 0 } = prop;
+            //   return (prop.price = iunitprice(tax, taxPrice));
+            // },
           },
         },
         // {
@@ -287,20 +287,20 @@ export default function useColumns() {
         {
           item: { width: 100, key: "priceDiffer", title: "单价差" },
           attr: {
-            formatter: (prop) => {
-              const { taxPrice = 0, recentlyPrice = 0 } = prop;
-              return (prop.priceDiffer = Number(recentlyPrice) !== 0 ? Number(taxPrice) - Number(recentlyPrice) : 0 );
-            },
+            // formatter: (prop) => {
+            //   const { taxPrice = 0, recentlyPrice = 0 } = prop;
+            //   return (prop.priceDiffer = Number(recentlyPrice) !== 0 ? Number(taxPrice) - Number(recentlyPrice) : 0 );
+            // },
           },
         },
 
         {
           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);
+            // },
           },
         },
 
@@ -325,12 +325,12 @@ export default function useColumns() {
         {
           item: { width: 100, key: "yAffectedAmount", title: "预计年影响金额" },
           attr: {
-            formatter: (prop) => {
-              const { priceDiffer = 0, yPurchaseQuantity = 0 } = prop;
-              return (prop.yAffectedAmount = (
-                Number(priceDiffer) * Number(yPurchaseQuantity)
-              ));
-            },
+            // formatter: (prop) => {
+            //   const { priceDiffer = 0, yPurchaseQuantity = 0 } = prop;
+            //   return (prop.yAffectedAmount = (
+            //     Number(priceDiffer) * Number(yPurchaseQuantity)
+            //   ));
+            // },
           },
         },
         {
@@ -458,10 +458,10 @@ export default function useColumns() {
           item: { key: "isPriceAdjustment", title: "", width: 10 },
           attr: {
             value: 'no',
-            formatter: (prop) => {
-              const { priceDiffer } = prop;
-              return (prop.isPriceAdjustment = priceDiffer > 0 ? 'up' : priceDiffer < 0 ? 'down' : 'no');
-            },
+            // formatter: (prop) => {
+            //   const { priceDiffer } = prop;
+            //   return (prop.isPriceAdjustment = priceDiffer > 0 ? 'up' : priceDiffer < 0 ? 'down' : 'no');
+            // },
           },
         },
         // 采购换算率隐藏

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 540 - 497
src/views/purchase/apply/edit/index.vue


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.