QuKatie 3 years ago
parent
commit
90e414097e

+ 3 - 1
src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -769,6 +769,7 @@ export default {
       let amountSum = 0;
       let purchaseAmountSum = 0;
       let grossProfitRate = 0;
+      let grossProfit=0
       this.data.forEach(e => {
         amountSum = _.add(amountSum, Number(e.amount));
         purchaseAmountSum = _.add(
@@ -780,11 +781,12 @@ export default {
             )
           )
         );
-        this.form.grossProfit = _.subtract(amountSum, purchaseAmountSum);
+        grossProfit = _.subtract(amountSum, purchaseAmountSum);
         grossProfitRate = _.multiply(
           _.divide(_.subtract(amountSum, purchaseAmountSum), amountSum),
           100
         );
+        this.form.grossProfit=Number(grossProfit?grossProfit:0).toFixed(2);
         this.form.grossProfitRate = Number(
           grossProfitRate ? grossProfitRate : 0
         ).toFixed(2);

+ 4 - 1
src/views/exportTrade/customerInquiry/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="show">
+    <basic-container v-if="show" class="page-crad">
       <avue-crud
         ref="crud"
         :option="option"
@@ -241,4 +241,7 @@ export default {
 ::v-deep .select-component {
   display: flex;
 }
+.page-crad ::v-deep .basic-container__card {
+  height: 86.5vh;
+}
 </style>

+ 4 - 1
src/views/exportTrade/invoice/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="show">
+    <basic-container v-if="show" class="page-crad">
       <avue-crud
         ref="crud"
         :option="option"
@@ -301,4 +301,7 @@ export default {
 ::v-deep .select-component {
   display: flex;
 }
+.page-crad ::v-deep .basic-container__card {
+  height: 86.5vh;
+}
 </style>

+ 1 - 1
src/views/exportTrade/purchaseContract/config/mainList.json

@@ -28,7 +28,7 @@
       "overHidden": true
     },
     {
-      "label": "订单号",
+      "label": "采购订单号",
       "prop": "orderNo",
       "search": true,
       "index": 3,

+ 4 - 1
src/views/exportTrade/purchaseContract/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="show">
+    <basic-container v-if="show" class="page-crad">
       <avue-crud
         ref="crud"
         :option="option"
@@ -246,4 +246,7 @@ export default {
 ::v-deep .select-component {
   display: flex;
 }
+.page-crad ::v-deep .basic-container__card {
+  height: 86.5vh;
+}
 </style>

+ 4 - 1
src/views/exportTrade/purchaseInquiry/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="show">
+    <basic-container v-if="show" class="page-crad">
       <avue-crud
         ref="crud"
         :option="option"
@@ -211,4 +211,7 @@ export default {
 ::v-deep .select-component {
   display: flex;
 }
+.page-crad ::v-deep .basic-container__card {
+  height: 86.5vh;
+}
 </style>

+ 4 - 1
src/views/exportTrade/receipt/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="show">
+    <basic-container v-if="show" class="page-crad">
       <avue-crud
         ref="crud"
         :option="option"
@@ -263,4 +263,7 @@ export default {
 ::v-deep .select-component {
   display: flex;
 }
+.page-crad ::v-deep .basic-container__card {
+  height: 86.5vh;
+}
 </style>

+ 11 - 3
src/views/exportTrade/salesContract/config/mainList.json

@@ -27,6 +27,14 @@
       "overHidden": true
     },
     {
+      "label": "销售订单号",
+      "prop": "orderNo",
+      "search": true,
+      "index": 3,
+      "width": 100,
+      "overHidden": true
+    },
+    {
       "label": "订单状态",
       "prop": "orderStatus",
       "search": true,
@@ -71,7 +79,7 @@
       "width": 100,
       "overHidden": true,
       "type": "select",
-      "filterable":true,
+      "filterable": true,
       "dicData": [],
       "props": {
         "label": "name",
@@ -85,7 +93,7 @@
       "width": 100,
       "overHidden": true,
       "type": "select",
-      "filterable":true,
+      "filterable": true,
       "dicData": [],
       "props": {
         "label": "name",
@@ -103,7 +111,7 @@
       "index": 12,
       "width": 100,
       "overHidden": true
-    },{
+    }, {
       "label": "订单日期",
       "prop": "businesDate",
       "search": true,

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="show">
+    <basic-container v-if="show" class="page-crad">
       <avue-crud
         ref="crud"
         :option="option"
@@ -234,4 +234,7 @@ export default {
 ::v-deep .select-component {
   display: flex;
 }
+.page-crad ::v-deep .basic-container__card {
+  height: 86.5vh;
+}
 </style>

+ 4 - 1
src/views/exportTrade/shippingInquiry/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="show">
+    <basic-container v-if="show" class="page-crad">
       <avue-crud
         ref="crud"
         :option="option"
@@ -179,4 +179,7 @@ export default {
 ::v-deep .select-component {
   display: flex;
 }
+.page-crad ::v-deep .basic-container__card {
+  height: 86.5vh;
+}
 </style>