Browse Source

采购合同,物料没有带出税率

002390 1 year ago
parent
commit
e8e695f44f

+ 1 - 1
src/components/popover-select-v2/index.vue

@@ -6,7 +6,7 @@ export default {
   props: {
     // v-model
     value: {
-      type: [Array, String],
+      type: [Array, String,Number],
       require: true,
     },
     // 参照类型 ,对应后端

+ 1 - 2
src/views/purchase/contract/add/columns.js

@@ -539,8 +539,7 @@ export default function useColumns() {
               registration: "registrationNo",
               specification: "specification",
               manufacturer: "manufacturerIdName",
-              tax: "materialRateName",
-              // tax: "materialRate",
+              rateCode: "materialRateName",
             },
           },
         },

+ 1 - 1
src/views/purchase/contract/add/index.vue

@@ -128,7 +128,7 @@ export default {
         // try
         this.loading = true;
         const { ntaxrate } = await tax(rateCode);
-        row.tax = Number(ntaxrate === "0E-8" ? 0 : ntaxrate);
+        row.tax = ntaxrate === "0E-8" ? 0 : ntaxrate;
       } catch (err) {
         // catch
         console.error(err);

+ 1 - 0
src/views/purchase/contract/edit/columns.js

@@ -526,6 +526,7 @@ export default function useColumns() {
               registration: "registrationNo",
               specification: "specification",
               manufacturer: "manufacturerIdName",
+              rateCode: "materialRateName",
             },
           },
         },

+ 2 - 1
src/views/purchase/contract/edit/index.vue

@@ -131,7 +131,8 @@ export default {
         // try
         this.loading = true;
         const { ntaxrate } = await tax(rateCode);
-        row.tax = Number(ntaxrate === "0E-8" ? 0 : ntaxrate);
+        // row.tax = Number(ntaxrate === "0E-8" ? 0 : ntaxrate);
+        row.tax = ntaxrate === "0E-8" ? 0 : ntaxrate;
       } catch (err) {
         // catch
         console.error(err);