Merge branch 'purchaseDev' into 'dev'

Purchase dev

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

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

@@ -168,16 +168,6 @@ export default function useColumns() {
         //     },
         //   },
         // },
-        // {
-        //   item: { key: "conversionRate", title: "采购换算率", required: true },
-        //   attr: {
-        //     is: "el-input-number",
-        //     min: 0,
-        //     precision: CONFIG.precision,
-        //     value: 1,
-        //     disabled: true,
-        //   },
-        // },
         {
           item: { key: "customerName", title: "客户" },
           attr: {
@@ -208,15 +198,15 @@ export default function useColumns() {
             disabled: true,
           },
         },
-        // {
-        //   item: { key: "price", title: "无税单价", required: true },
-        //   attr: {
-        //     formatter: (prop) => {
-        //       const { tax = 0, taxPrice = 0 } = prop;
-        //       return (prop.price = iunitprice(tax, taxPrice));
-        //     },
-        //   },
-        // },
+        {
+          item: { key: "price", title: "无税单价", required: true },
+          attr: {
+            formatter: (prop) => {
+              const { tax = 0, taxPrice = 0 } = prop;
+              return (prop.price = iunitprice(tax, taxPrice));
+            },
+          },
+        },
         // {
         //   item: { key: "currencyName", title: "币种" },
         //   attr: {
@@ -473,6 +463,17 @@ export default function useColumns() {
             },
           },
         },
+        // 采购换算率隐藏
+        {
+          item: { key: "conversionRate", title: "", required: true, width: 5 },
+          attr: {
+            is: "el-input-number",
+            min: 0,
+            precision: CONFIG.precision,
+            value: 1,
+            disabled: true,
+          },
+        },
       ],
     },
   ];

src/views/purchase/apply/add/index.vue

@@ -530,6 +530,7 @@
         >
           <div v-loading="loading" style="height: 250px; display: flex">
             <el-super-ux-table
+              index
               v-model="params[item.key]"
               :dict="dict"
               :ref="tabName"

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

@@ -168,16 +168,6 @@ export default function useColumns() {
         //     },
         //   },
         // },
-        // {
-        //   item: { key: "conversionRate", title: "采购换算率", required: true },
-        //   attr: {
-        //     is: "el-input-number",
-        //     min: 0,
-        //     precision: CONFIG.precision,
-        //     value: 1,
-        //     disabled: true,
-        //   },
-        // },
         {
           item: { key: "customerName", title: "客户" },
           attr: {
@@ -208,15 +198,15 @@ export default function useColumns() {
             disabled: true,
           },
         },
-        // {
-        //   item: { key: "price", title: "无税单价", required: true },
-        //   attr: {
-        //     formatter: (prop) => {
-        //       const { tax = 0, taxPrice = 0 } = prop;
-        //       return (prop.price = iunitprice(tax, taxPrice));
-        //     },
-        //   },
-        // },
+        {
+          item: { key: "price", title: "无税单价", required: true },
+          attr: {
+            formatter: (prop) => {
+              const { tax = 0, taxPrice = 0 } = prop;
+              return (prop.price = iunitprice(tax, taxPrice));
+            },
+          },
+        },
         // {
         //   item: { key: "currencyName", title: "币种" },
         //   attr: {
@@ -474,6 +464,17 @@ export default function useColumns() {
             },
           },
         },
+        // 采购换算率隐藏
+        {
+          item: { key: "conversionRate", title: "采购换算率", required: true, width: 5 },
+          attr: {
+            is: "el-input-number",
+            min: 0,
+            precision: CONFIG.precision,
+            value: 1,
+            disabled: true,
+          },
+        },
       ],
     },
   ];

src/views/purchase/apply/copy/index.vue

@@ -581,6 +581,7 @@
         >
           <div v-loading="loading" style="height: 250px; display: flex">
             <el-super-ux-table
+              index
               v-model="params[item.key]"
               :dict="dict"
               :ref="tabName"

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

@@ -168,16 +168,6 @@ export default function useColumns() {
         //     },
         //   },
         // },
-        // {
-        //   item: { key: "conversionRate", title: "采购换算率", required: true },
-        //   attr: {
-        //     is: "el-input-number",
-        //     min: 0,
-        //     precision: CONFIG.precision,
-        //     value: 1,
-        //     disabled: true,
-        //   },
-        // },
         {
           item: { key: "customerName", title: "客户" },
           attr: {
@@ -208,15 +198,15 @@ export default function useColumns() {
             disabled: true,
           },
         },
-        // {
-        //   item: { key: "price", title: "无税单价", required: true },
-        //   attr: {
-        //     formatter: (prop) => {
-        //       const { tax = 0, taxPrice = 0 } = prop;
-        //       return (prop.price = iunitprice(tax, taxPrice));
-        //     },
-        //   },
-        // },
+        {
+          item: { key: "price", title: "无税单价", required: true },
+          attr: {
+            formatter: (prop) => {
+              const { tax = 0, taxPrice = 0 } = prop;
+              return (prop.price = iunitprice(tax, taxPrice));
+            },
+          },
+        },
         // {
         //   item: { key: "currencyName", title: "币种" },
         //   attr: {
@@ -474,6 +464,17 @@ export default function useColumns() {
             },
           },
         },
+        // 采购换算率隐藏
+        {
+          item: { key: "conversionRate", title: "采购换算率", required: true, width: 5 },
+          attr: {
+            is: "el-input-number",
+            min: 0,
+            precision: CONFIG.precision,
+            value: 1,
+            disabled: true,
+          },
+        },
       ],
     },
   ];

src/views/purchase/apply/edit/index.vue

@@ -597,6 +597,7 @@
         >
           <div v-loading="loading" style="height: 250px; display: flex">
             <el-super-ux-table
+              index
               v-model="priceApply[item.key]"
               :dict="dict"
               :ref="tabName"

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

@@ -129,15 +129,15 @@ export default function useColumns() {
             },
           },
         },
-        // {
-        //   item: { width: 100, key: "price", title: "无税单价" },
-        //   attr: {
-        //     is: "el-computed-input-v2",
-        //     formatter: (prop) => {
-        //       return prop == null ? 0 : (prop * 1);
-        //     },
-        //   },
-        // },
+        {
+          item: { width: 100, key: "price", title: "无税单价" },
+          attr: {
+            is: "el-computed-input-v2",
+            formatter: (prop) => {
+              return prop == null ? 0 : (prop * 1);
+            },
+          },
+        },
         // {
         //   item: { width: 100, key: "currencyName", title: "币种" },
         //   attr: {},

src/views/purchase/apply/see/index.vue

@@ -186,6 +186,7 @@ export default {
           lazy
         >
           <el-super-table
+            index
             v-model="params[item.key]"
             :size="$attrs.size"
             :dict="dict"