WuXiaohan 1 жил өмнө
parent
commit
17e65ae6c9

+ 124 - 0
src/views/purchase/apply/add/columns.js

@@ -282,6 +282,130 @@ export default function useColumns() {
             value: "N",
             value: "N",
           },
           },
         },
         },
+
+        {
+          item: { width:100,key: "isChannel", title: "是否渠道变更" },
+          attr: {
+            is: "el-select",
+            dictName: "is_effective",
+            value: "N",
+          },
+        },
+        {
+          item: { width:100,key: "brandReplacement", title: "是否品牌替换" },
+          attr: {
+            is: "el-select",
+            dictName: "is_effective",
+            value: "N",
+          },
+        },{
+          item: { width:100,key: "priceDiffer", title: "单价差" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+        {
+          item: { width:100,key: "increase", title: "涨幅" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+        {
+          item: { width:100,key: "yPurchaseQuantity", title: "预计年采购量" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+        {
+          item: { width:100,key: "yAffectedAmount", title: "预计年影响量" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+        {
+          item: { width:150,key: "supplierName", title: "供应商名称" },
+          attr: {is: "el-input"},
+        },{
+          item: { width:150,key: "bidPrice", title: "中标价" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "unitPrice", title: "单价" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "profit", title: "利润比" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },
+
+        {
+          item: { width:150,key: "supplierName1", title: "供应商名称1" },
+          attr: {is: "el-input"},
+        },{
+          item: { width:150,key: "bidPrice1", title: "中标价1" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "unitPrice1", title: "单价1" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "profit1", title: "利润比1" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },
+
+        {
+          item: { width:150,key: "supplierName2", title: "供应商名称2" },
+          attr: {is: "el-input"},
+        },{
+          item: { width:150,key: "bidPrice2", title: "中标价2" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "unitPrice2", title: "单价2" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "profit2", title: "利润比2" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },
+
         { item: { key: "createByName", title: "创建人名称" }, attr: {} },
         { item: { key: "createByName", title: "创建人名称" }, attr: {} },
         { item: { key: "updateByName", title: "更新人名称" }, attr: {} },
         { item: { key: "updateByName", title: "更新人名称" }, attr: {} },
       ],
       ],

+ 122 - 0
src/views/purchase/apply/copy/columns.js

@@ -281,6 +281,128 @@ export default function useColumns() {
             value: "N",
             value: "N",
           },
           },
         },
         },
+        {
+          item: { width:100,key: "isChannel", title: "是否渠道变更" },
+          attr: {
+            is: "el-select",
+            dictName: "is_effective",
+            value: "N",
+          },
+        },
+        {
+          item: { width:100,key: "brandReplacement", title: "是否品牌替换" },
+          attr: {
+            is: "el-select",
+            dictName: "is_effective",
+            value: "N",
+          },
+        },{
+          item: { width:100,key: "priceDiffer", title: "单价差" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+        {
+          item: { width:100,key: "increase", title: "涨幅" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+        {
+          item: { width:100,key: "yPurchaseQuantity", title: "预计年采购量" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+        {
+          item: { width:100,key: "yAffectedAmount", title: "预计年影响量" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+        {
+          item: { width:150,key: "supplierName", title: "供应商名称" },
+          attr: {is: "el-input"},
+        },{
+          item: { width:150,key: "bidPrice", title: "中标价" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "unitPrice", title: "单价" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "profit", title: "利润比" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },
+
+        {
+          item: { width:150,key: "supplierName1", title: "供应商名称1" },
+          attr: {is: "el-input"},
+        },{
+          item: { width:150,key: "bidPrice1", title: "中标价1" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "unitPrice1", title: "单价1" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "profit1", title: "利润比1" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },
+
+        {
+          item: { width:150,key: "supplierName2", title: "供应商名称2" },
+          attr: {is: "el-input"},
+        },{
+          item: { width:150,key: "bidPrice2", title: "中标价2" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "unitPrice2", title: "单价2" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "profit2", title: "利润比2" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },
         { item: { key: "createByName", title: "创建人名称" }, attr: {} },
         { item: { key: "createByName", title: "创建人名称" }, attr: {} },
         { item: { key: "updateByName", title: "更新人名称" }, attr: {} },
         { item: { key: "updateByName", title: "更新人名称" }, attr: {} },
       ],
       ],

+ 124 - 0
src/views/purchase/apply/edit/columns.js

@@ -281,6 +281,130 @@ export default function useColumns() {
             value: "N",
             value: "N",
           },
           },
         },
         },
+
+        {
+          item: { width:100,key: "isChannel", title: "是否渠道变更" },
+          attr: {
+            is: "el-select",
+            dictName: "is_effective",
+            value: "N",
+          },
+        },
+        {
+          item: { width:100,key: "brandReplacement", title: "是否品牌替换" },
+          attr: {
+            is: "el-select",
+            dictName: "is_effective",
+            value: "N",
+          },
+        },{
+          item: { width:100,key: "priceDiffer", title: "单价差" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+        {
+          item: { width:100,key: "increase", title: "涨幅" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+        {
+          item: { width:100,key: "yPurchaseQuantity", title: "预计年采购量" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+        {
+          item: { width:100,key: "yAffectedAmount", title: "预计年影响量" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+        {
+          item: { width:150,key: "supplierName", title: "供应商名称" },
+          attr: {is: "el-input"},
+        },{
+          item: { width:150,key: "bidPrice", title: "中标价" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "unitPrice", title: "单价" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "profit", title: "利润比" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },
+
+        {
+          item: { width:150,key: "supplierName1", title: "供应商名称1" },
+          attr: {is: "el-input"},
+        },{
+          item: { width:150,key: "bidPrice1", title: "中标价1" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "unitPrice1", title: "单价1" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "profit1", title: "利润比1" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },
+
+        {
+          item: { width:150,key: "supplierName2", title: "供应商名称2" },
+          attr: {is: "el-input"},
+        },{
+          item: { width:150,key: "bidPrice2", title: "中标价2" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "unitPrice2", title: "单价2" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },{
+          item: { width:150,key: "profit2", title: "利润比2" },
+          attr: {
+            is: "el-input-number",
+            precision: CONFIG.precision,
+          },
+        },
+
         { item: { key: "createByName", title: "创建人名称" }, attr: {} },
         { item: { key: "createByName", title: "创建人名称" }, attr: {} },
         { item: { key: "updateByName", title: "更新人名称" }, attr: {} },
         { item: { key: "updateByName", title: "更新人名称" }, attr: {} },
       ],
       ],

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

@@ -97,7 +97,7 @@ export default function useColumns() {
           attr: {
           attr: {
             is: "el-computed-input-v2",
             is: "el-computed-input-v2",
             formatter: (prop) => {
             formatter: (prop) => {
-              return (prop * 1).toFixed(CONFIG.precision);
+              return prop == null ? 0 : (prop * 1).toFixed(CONFIG.precision);
             },
             },
           },
           },
         },
         },
@@ -106,7 +106,7 @@ export default function useColumns() {
           attr: {
           attr: {
             is: "el-computed-input-v2",
             is: "el-computed-input-v2",
             formatter: (prop) => {
             formatter: (prop) => {
-              return (prop * 1).toFixed(CONFIG.precision);
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
             },
             },
           },
           },
         },
         },
@@ -115,7 +115,7 @@ export default function useColumns() {
           attr: {
           attr: {
             is: "el-computed-input-v2",
             is: "el-computed-input-v2",
             formatter: (prop) => {
             formatter: (prop) => {
-              return (prop * 1).toFixed(CONFIG.precision);
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
             },
             },
           },
           },
         },
         },
@@ -124,7 +124,7 @@ export default function useColumns() {
           attr: {
           attr: {
             is: "el-computed-input-v2",
             is: "el-computed-input-v2",
             formatter: (prop) => {
             formatter: (prop) => {
-              return (prop * 1).toFixed(CONFIG.precision);
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
             },
             },
           },
           },
         },
         },
@@ -173,6 +173,148 @@ export default function useColumns() {
             dictName: "is_effective",
             dictName: "is_effective",
           },
           },
         },
         },
+
+        {
+          item: { width:100,key: "isChannel", title: "是否渠道变更" },
+          attr: {
+            is: "el-dict-tag",
+            dictName: "is_effective",
+          },
+        },
+        {
+          item: { width:100,key: "brandReplacement", title: "是否品牌替换" },
+          attr: {
+            is: "el-dict-tag",
+            dictName: "is_effective",
+          },
+        },{
+          item: { width:100,key: "priceDiffer", title: "单价差" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+        {
+          item: { width:100,key: "increase", title: "涨幅" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+        {
+          item: { width:100,key: "yPurchaseQuantity", title: "预计年采购量" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+        {
+          item: { width:100,key: "yAffectedAmount", title: "预计年影响量" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+        {
+          item: { width:100,key: "supplierName", title: "供应商名称" },
+          attr: {},
+        },{
+          item: { width:100,key: "bidPrice", title: "中标价" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },{
+          item: { width:100,key: "unitPrice", title: "单价" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },{
+          item: { width:100,key: "profit", title: "利润比" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+        {
+          item: { width:100,key: "supplierName1", title: "供应商名称1" },
+          attr: {},
+        },{
+          item: { width:100,key: "bidPrice1", title: "中标价1" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },{
+          item: { width:100,key: "unitPrice1", title: "单价1" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },{
+          item: { width:100,key: "profit1", title: "利润比1" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+        {
+          item: { width:100,key: "supplierName2", title: "供应商名称2" },
+          attr: {},
+        },{
+          item: { width:100,key: "bidPrice2", title: "中标价2" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },{
+          item: { width:100,key: "unitPrice2", title: "单价2" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },{
+          item: { width:100,key: "profit2", title: "利润比2" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 :(prop * 1).toFixed(CONFIG.precision);
+            },
+          },
+        },
+
+
+
         { item: { width:100,key: "createByName", title: "创建人名称" }, attr: {} },
         { item: { width:100,key: "createByName", title: "创建人名称" }, attr: {} },
         { item: { width:100,key: "updateByName", title: "更新人名称" }, attr: {} },
         { item: { width:100,key: "updateByName", title: "更新人名称" }, attr: {} },
       ],
       ],

+ 5 - 1
src/views/purchase/task/see/columns.js

@@ -8,7 +8,11 @@ export default function useColumns() {
         dictName: "purchase_task_status",
         dictName: "purchase_task_status",
       },
       },
     },
     },
-    { item: { key: "existPrice", title: "是否有价格",width :150 ,inputType: "checkbox", isShow:true,}, attr: {} },
+    { item: { key: "existPrice", title: "是否有价格",width :150 ,}, attr: {
+      is: "el-dict-tag",
+      dictName: "is_effective",
+
+    } },
     { item: { key: "demandCode", title: "需求单号" }, attr: {} },
     { item: { key: "demandCode", title: "需求单号" }, attr: {} },
     { item: { key: "materialName", title: "物料" }, attr: {} },
     { item: { key: "materialName", title: "物料" }, attr: {} },
     {
     {