Просмотр исходного кода

销售订单发票组件优化:完善合计金额格式化显示,调整数量变更逻辑及移除冗余代码

yusheng 9 месяцев назад
Родитель
Сommit
c8bc0e6272

+ 5 - 4
src/utils/util.js

@@ -47,7 +47,7 @@ export function copyObj(obj) {
   return newobj;
 }
 //合计费用
-export function getSummaries(param,key,unit) {
+export function getSummaries(param, key, unit) {
   const { columns, data } = param;
   const sums = [];
   columns.forEach((column, index) => {
@@ -58,7 +58,7 @@ export function getSummaries(param,key,unit) {
 
     if (key.includes(column.property)) {
       const values = data.map((item) => Number(item[column.property]));
-          console.log(values)
+      console.log(values);
 
       if (!values.every((value) => isNaN(value))) {
         sums[index] = values.reduce((prev, curr) => {
@@ -69,7 +69,8 @@ export function getSummaries(param,key,unit) {
             return prev;
           }
         }, 0);
-        sums[index] += ' '+unit+'';
+        sums[index] = parseFloat(sums[index]).toFixed(3).replace(/\.?0+$/, '');
+        sums[index] += ' ' + unit + '';
       } else {
         sums[index] = '';
       }
@@ -79,4 +80,4 @@ export function getSummaries(param,key,unit) {
   });
 
   return sums;
-}
+}

+ 7 - 6
src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -310,7 +310,7 @@
             placeholder="请输入"
             type="number"
             :min="0"
-            @input="changeCount(scope.row, scope.$index,false)"
+            @input="changeCount(scope.row, scope.$index, false)"
           >
           </el-input>
         </el-form-item>
@@ -538,7 +538,6 @@
         columnsVersion: 1,
         isWarehouseId: 0,
         blockCountColumn: {},
-        clientEnvironmentId: '',
         form: {
           datasource: []
         },
@@ -561,6 +560,9 @@
       canHandl() {
         return this.form.datasource.length;
       },
+      clientEnvironmentId() {
+        return this.$store.state.user.info.clientEnvironmentId;
+      },
       columns() {
         return [
           {
@@ -960,8 +962,7 @@
       }
     },
     mounted() {
-      this.clientEnvironmentId =
-        this.$store.state.user.info.clientEnvironmentId;
+      // this.clientEnvironmentId =
     },
     methods: {
       getSummaries(param) {
@@ -1070,7 +1071,7 @@
         );
       },
       //改变数量
-      changeCount(row, index, isBlockCount=true) {
+      changeCount(row, index, isBlockCount = true) {
         this.$set(
           this.form,
           'datasource[' + index + ']',
@@ -1201,7 +1202,7 @@
               (Number(row.blockCount) * modelLong * modeWide * modeHight) /
               1000000;
             row.saleCount = row.totalCount;
-            this.changeCount(row, index, false);
+            this.changeCount(row, index, true);
           }
         }
       },