Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!403

src/views/purchase/apply/add/columns.js

@@ -337,36 +337,36 @@ export default function useColumns() {
           attr: {
             formatter: (prop) => {
               const { priceDiffer = 0, recentlyPrice = 0 } = prop;
-              return (prop.increase = recentlyPrice ? ((Number(priceDiffer) / Number(recentlyPrice)) * 100).toFixed(1) + '%' : "0.0%");
+              return (prop.increase = recentlyPrice ? ((Number(priceDiffer) / Number(recentlyPrice)) * 100).toFixed(1) : 0);
             },
           },
         },
 
         {
-          item: { width: 100, key: "ypurchaseQuantity", title: "预计年采购量" },
+          item: { width: 100, key: "yPurchaseQuantity", title: "预计年采购量" },
           attr: {
             // is: "el-computed-input-v2",
             formatter: (prop) => {
-              return prop.ypurchaseQuantity
+              return prop.yPurchaseQuantity
             },
           },
         },
         {
-          item: { width: 100, key: "ypurchaseVolume", title: "预计年采购额" },
+          item: { width: 100, key: "yPurchaseVolume", title: "预计年采购额" },
           attr: {
             formatter: (prop) => {
-              const { taxPrice = 0, ypurchaseQuantity = 0 } = prop;
-              return (prop.ypurchaseVolume = (Number(taxPrice) * Number(ypurchaseQuantity)).toFixed(2));
+              const { taxPrice = 0, yPurchaseQuantity = 0 } = prop;
+              return (prop.yPurchaseVolume = (Number(taxPrice) * Number(yPurchaseQuantity)).toFixed(2));
             },
           },
         },
         {
-          item: { width: 100, key: "yaffectedAmount", title: "预计年影响金额" },
+          item: { width: 100, key: "yAffectedAmount", title: "预计年影响金额" },
           attr: {
             formatter: (prop) => {
-              const { priceDiffer = 0, ypurchaseQuantity = 0 } = prop;
-              return (prop.yaffectedAmount =
-                Number(priceDiffer) * Number(ypurchaseQuantity));
+              const { priceDiffer = 0, yPurchaseQuantity = 0 } = prop;
+              return (prop.yAffectedAmount =
+                Number(priceDiffer) * Number(yPurchaseQuantity));
             },
           },
         },

src/views/purchase/apply/copy/columns.js

@@ -337,36 +337,36 @@ export default function useColumns() {
           attr: {
             formatter: (prop) => {
               const { priceDiffer = 0, recentlyPrice = 0 } = prop;
-              return (prop.increase = recentlyPrice ? ((Number(priceDiffer) / Number(recentlyPrice)) * 100).toFixed(1) + '%' : "0.0%");
+              return (prop.increase = recentlyPrice ? ((Number(priceDiffer) / Number(recentlyPrice)) * 100).toFixed(1) : 0);
             },
           },
         },
 
         {
-          item: { width: 100, key: "ypurchaseQuantity", title: "预计年采购量" },
+          item: { width: 100, key: "yPurchaseQuantity", title: "预计年采购量" },
           attr: {
             // is: "el-computed-input-v2",
             formatter: (prop) => {
-              return prop.ypurchaseQuantity
+              return prop.yPurchaseQuantity
             },
           },
         },
         {
-          item: { width: 100, key: "ypurchaseVolume", title: "预计年采购额" },
+          item: { width: 100, key: "yPurchaseVolume", title: "预计年采购额" },
           attr: {
             formatter: (prop) => {
-              const { taxPrice = 0, ypurchaseQuantity = 0 } = prop;
-              return (prop.ypurchaseVolume = (Number(taxPrice) * Number(ypurchaseQuantity)).toFixed(2));
+              const { taxPrice = 0, yPurchaseQuantity = 0 } = prop;
+              return (prop.yPurchaseVolume = (Number(taxPrice) * Number(yPurchaseQuantity)).toFixed(2));
             },
           },
         },
         {
-          item: { width: 100, key: "yaffectedAmount", title: "预计年影响金额" },
+          item: { width: 100, key: "yAffectedAmount", title: "预计年影响金额" },
           attr: {
             formatter: (prop) => {
-              const { priceDiffer = 0, ypurchaseQuantity = 0 } = prop;
-              return (prop.yaffectedAmount = (
-                Number(priceDiffer) * Number(ypurchaseQuantity)
+              const { priceDiffer = 0, yPurchaseQuantity = 0 } = prop;
+              return (prop.yAffectedAmount = (
+                Number(priceDiffer) * Number(yPurchaseQuantity)
               ));
             },
           },

src/views/purchase/apply/edit/columns.js

@@ -337,36 +337,36 @@ export default function useColumns() {
           attr: {
             formatter: (prop) => {
               const { priceDiffer = 0, recentlyPrice = 0 } = prop;
-              return (prop.increase = recentlyPrice ? ((Number(priceDiffer) / Number(recentlyPrice)) * 100).toFixed(1) + '%': "0.0%");
+              return (prop.increase = recentlyPrice ? ((Number(priceDiffer) / Number(recentlyPrice)) * 100).toFixed(1): 0);
             },
           },
         },
 
         {
-          item: { width: 100, key: "ypurchaseQuantity", title: "预计年采购量" },
+          item: { width: 100, key: "yPurchaseQuantity", title: "预计年采购量" },
           attr: {
             // is: "el-computed-input-v2",
             formatter: (prop) => {
-              return prop.ypurchaseQuantity
+              return prop.yPurchaseQuantity
             },
           },
         },
         {
-          item: { width: 100, key: "ypurchaseVolume", title: "预计年采购额" },
+          item: { width: 100, key: "yPurchaseVolume", title: "预计年采购额" },
           attr: {
             formatter: (prop) => {
-              const { taxPrice = 0, ypurchaseQuantity = 0 } = prop;
-              return (prop.ypurchaseVolume = (Number(taxPrice) * Number(ypurchaseQuantity)).toFixed(2));
+              const { taxPrice = 0, yPurchaseQuantity = 0 } = prop;
+              return (prop.yPurchaseVolume = (Number(taxPrice) * Number(yPurchaseQuantity)).toFixed(2));
             },
           },
         },
         {
-          item: { width: 100, key: "yaffectedAmount", title: "预计年影响金额" },
+          item: { width: 100, key: "yAffectedAmount", title: "预计年影响金额" },
           attr: {
             formatter: (prop) => {
-              const { priceDiffer = 0, ypurchaseQuantity = 0 } = prop;
-              return (prop.yaffectedAmount = (
-                Number(priceDiffer) * Number(ypurchaseQuantity)
+              const { priceDiffer = 0, yPurchaseQuantity = 0 } = prop;
+              return (prop.yAffectedAmount = (
+                Number(priceDiffer) * Number(yPurchaseQuantity)
               ));
             },
           },

src/views/purchase/apply/see/columns.js

@@ -214,35 +214,35 @@ export default function useColumns() {
         },
 
         {
-          item: { width: 100, key: "increase", title: "涨幅" },
+          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.0%");
+              return (prop.increase = recentlyPrice ? ((Number(priceDiffer) / Number(recentlyPrice)) * 100).toFixed(1) + '%' : "0%");
             },
           },
         },
 
         {
-          item: { width: 100, key: "ypurchaseQuantity", title: "预计年采购量" },
+          item: { width: 100, key: "yPurchaseQuantity", title: "预计年采购量" },
           attr: {
             // is: "el-computed-input-v2",
             formatter: (prop) => {
-              return prop.ypurchaseQuantity
+              return prop.yPurchaseQuantity
             },
           },
         },
         {
-          item: { width: 100, key: "ypurchaseVolume", title: "预计年采购额" },
+          item: { width: 100, key: "yPurchaseVolume", title: "预计年采购额" },
           attr: {
             formatter: (prop) => {
-              const { taxPrice = 0, ypurchaseQuantity = 0 } = prop;
-              return (prop.ypurchaseVolume = (Number(taxPrice) * Number(ypurchaseQuantity)).toFixed(2));
+              const { taxPrice = 0, yPurchaseQuantity = 0 } = prop;
+              return (prop.yPurchaseVolume = (Number(taxPrice) * Number(yPurchaseQuantity)).toFixed(2));
             },
           },
         },
         {
-          item: { width: 100, key: "yaffectedAmount", title: "预计年影响金额" },
+          item: { width: 100, key: "yAffectedAmount", title: "预计年影响金额" },
           attr: {
             is: "el-computed-input-v2",
             formatter: (prop) => {