浏览代码

修改bug

QuKatie 3 年之前
父节点
当前提交
1b9169175b
共有 2 个文件被更改,包括 25 次插入7 次删除
  1. 15 6
      src/views/exportTrade/customerInquiry/index.vue
  2. 10 1
      src/views/exportTrade/salesContract/index.vue

+ 15 - 6
src/views/exportTrade/customerInquiry/index.vue

@@ -37,6 +37,12 @@
         <template slot-scope="{ row }" slot="orderQuantity">
           <span>{{ row.orderQuantity | IntegerFormat }}</span>
         </template>
+        <template slot-scope="{ row }" slot="amount">
+          <span>{{ row.amount | decimalFormat }}</span>
+        </template>
+        <template slot-scope="{ row }" slot="purchaseAmount">
+          <span>{{ row.purchaseAmount | decimalFormat }}</span>
+        </template>
         <template slot="portOfLoadSearch">
           <port-info v-model="search.portOfLoad" />
         </template>
@@ -146,7 +152,7 @@ import {
 } from "@/api/basicData/customerInquiry";
 import detailPage from "./detailsPage";
 import { defaultDate } from "@/util/date";
-import { micrometerFormat, IntegerFormat } from "@/util/validate";
+import { micrometerFormat, IntegerFormat,decimalFormat } from "@/util/validate";
 import _ from "lodash";
 export default {
   name: "customerInformation",
@@ -163,7 +169,7 @@ export default {
         pageSize: 20,
         currentPage: 1,
         total: 0,
-        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
       show: true,
       detailData: {},
@@ -241,6 +247,9 @@ export default {
   filters: {
     IntegerFormat(num) {
       return IntegerFormat(num);
+    },
+    decimalFormat(num){
+      return decimalFormat(num);
     }
   },
   activated() {
@@ -451,8 +460,8 @@ export default {
       );
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -463,8 +472,8 @@ export default {
       const inSave = await this.delColumnData(this.getColumnName(0), option);
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }

+ 10 - 1
src/views/exportTrade/salesContract/index.vue

@@ -39,6 +39,12 @@
         <template slot-scope="{ row }" slot="orderQuantity">
           <span>{{ row.orderQuantity | IntegerFormat }}</span>
         </template>
+        <template slot-scope="{ row }" slot="amount">
+          <span>{{ row.amount | decimalFormat }}</span>
+        </template>
+        <template slot-scope="{ row }" slot="purchaseAmount">
+          <span>{{ row.purchaseAmount | decimalFormat }}</span>
+        </template>
         <template slot="menuLeft">
           <el-button
             type="primary"
@@ -146,7 +152,7 @@ import {
 } from "@/api/basicData/salesContract";
 import detailPage from "./detailsPage.vue";
 import { defaultDate } from "@/util/date";
-import { micrometerFormat, IntegerFormat } from "@/util/validate";
+import { micrometerFormat, IntegerFormat,decimalFormat} from "@/util/validate";
 import _ from "lodash";
 export default {
   name: "customerInformation",
@@ -240,6 +246,9 @@ export default {
   filters: {
     IntegerFormat(num) {
       return IntegerFormat(num);
+    },
+    decimalFormat(num){
+      return decimalFormat(num);
     }
   },
   activated() {