Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

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

@@ -258,6 +258,18 @@ export default function useColumns() {
             disabled: true,
           },
         },
+
+        {
+          item: {
+            key: "recentlyPriceDate",
+            title: "最近价格日期",
+          },
+          attr: {
+            is: "el-date-picker",
+            valueFormat: "yyyy-MM-dd",
+          },
+        },
+        
         {
           item: { key: "isApprovalFirst", title: "首次报批" },
           attr: {
@@ -342,6 +354,15 @@ export default function useColumns() {
           },
         },
         {
+          item: { width: 100, key: "yPurchaseVolume", title: "预计年采购额" },
+          attr: {
+            formatter: (prop) => {
+              const { taxPrice = 0, yPurchaseQuantity = 0 } = prop;
+              return (prop.yPurchaseVolume = (Number(taxPrice) * Number(yPurchaseQuantity)).toFixed(2));
+            },
+          },
+        },
+        {
           item: { width: 100, key: "yAffectedAmount", title: "预计年影响金额" },
           attr: {
             formatter: (prop) => {

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

@@ -258,6 +258,18 @@ export default function useColumns() {
             disabled: true,
           },
         },
+
+        {
+          item: {
+            key: "recentlyPriceDate",
+            title: "最近价格日期",
+          },
+          attr: {
+            is: "el-date-picker",
+            valueFormat: "yyyy-MM-dd",
+          },
+        },
+
         {
           item: { key: "isApprovalFirst", title: "首次报批" },
           attr: {
@@ -324,11 +336,7 @@ export default function useColumns() {
           attr: {
             formatter: (prop) => {
               const { priceDiffer = 0, recentlyPrice = 0 } = prop;
-              return (prop.increase = recentlyPrice
-                ? ((Number(priceDiffer) / Number(recentlyPrice)) * 100).toFixed(
-                    2
-                  )
-                : "0.00");
+              return (prop.increase = recentlyPrice ? ((Number(priceDiffer) / Number(recentlyPrice)) * 100).toFixed(2) : "0.00");
             },
           },
         },
@@ -343,6 +351,15 @@ export default function useColumns() {
           },
         },
         {
+          item: { width: 100, key: "yPurchaseVolume", title: "预计年采购额" },
+          attr: {
+            formatter: (prop) => {
+              const { taxPrice = 0, yPurchaseQuantity = 0 } = prop;
+              return (prop.yPurchaseVolume = (Number(taxPrice) * Number(yPurchaseQuantity)).toFixed(2));
+            },
+          },
+        },
+        {
           item: { width: 100, key: "yAffectedAmount", title: "预计年影响金额" },
           attr: {
             formatter: (prop) => {

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

@@ -258,6 +258,18 @@ export default function useColumns() {
             disabled: true,
           },
         },
+
+        {
+          item: {
+            key: "recentlyPriceDate",
+            title: "最近价格日期",
+          },
+          attr: {
+            is: "el-date-picker",
+            valueFormat: "yyyy-MM-dd",
+          },
+        },
+        
         {
           item: { key: "isApprovalFirst", title: "首次报批" },
           attr: {
@@ -343,6 +355,15 @@ export default function useColumns() {
           },
         },
         {
+          item: { width: 100, key: "yPurchaseVolume", title: "预计年采购额" },
+          attr: {
+            formatter: (prop) => {
+              const { taxPrice = 0, yPurchaseQuantity = 0 } = prop;
+              return (prop.yPurchaseVolume = (Number(taxPrice) * Number(yPurchaseQuantity)).toFixed(2));
+            },
+          },
+        },
+        {
           item: { width: 100, key: "yAffectedAmount", title: "预计年影响金额" },
           attr: {
             formatter: (prop) => {

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

@@ -152,6 +152,14 @@ export default function useColumns() {
           attr: {},
         },
         {
+          item: {
+            width: 100,
+            key: "recentlyPriceDate",
+            title: "最近价格日期",
+          },
+          attr: {},
+        },
+        {
           item: { width: 100, key: "isApprovalFirst", title: "首次报批" },
           attr: {
             is: "el-dict-tag",
@@ -224,7 +232,16 @@ export default function useColumns() {
           },
         },
         {
-          item: { width: 100, key: "yAffectedAmount", 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));
+            },
+          },
+        },
+        {
+          item: { width: 100, key: "yAffectedAmount", title: "预计年影响金额" },
           attr: {
             is: "el-computed-input-v2",
             formatter: (prop) => {