修改bug

src/views/tirePartsMall/statisticAnalysis/generalLedgerPayable/index.vue

@@ -54,7 +54,7 @@
           </el-select>
         </template>
         <template slot="whetherSettlementSearch">
-          <el-checkbox v-model="search.whetherSettlement" :true-label="1" :false-label="0"></el-checkbox>
+          <el-checkbox v-model="search.whetherSettlement" :true-label="0" :false-label="1"></el-checkbox>
         </template>
         <template slot="customerName" slot-scope="scope">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.customerName }}</span>
@@ -85,7 +85,7 @@ import _ from "lodash";
 import reportDialog from "@/components/report-dialog/main";
 import { gainUser } from "@/api/basicData/customerInquiry";
 import detail from "./detail";
-
+import {defaultDate3} from "@/util/date";
 export default {
   name: "index",
   components: {
@@ -116,7 +116,8 @@ export default {
       statementData: {},
       form: {},
       search: {
-        whetherSettlement:0
+        whetherSettlement:0,
+        businesDateList:defaultDate3()
       },
       dataList: [],
       loading: false,
@@ -249,15 +250,15 @@ export default {
       this.userList = res.data.data;
     });
 
-    let i = 0;
-    this.option.column.forEach(item => {
-      if (item.search) i++
-    })
-    if (i % 3 !== 0){
-      const num = 3 - Number(i % 3)
-      this.option.searchMenuSpan = num * 8;
-      this.option.searchMenuPosition = "right";
-    }
+    // let i = 0;
+    // this.option.column.forEach(item => {
+    //   if (item.search) i++
+    // })
+    // if (i % 3 !== 0){
+    //   const num = 3 - Number(i % 3)
+    //   this.option.searchMenuSpan = num * 8;
+    //   this.option.searchMenuPosition = "right";
+    // }
   },
   methods: {
     cellStyle() {
@@ -290,6 +291,7 @@ export default {
       this.page.pageSize = val;
     },
     onLoad(page, params) {
+      this.search=this.deepClone(this.search)
       this.search.customerId = this.search.customerName
       this.sysitemType = localStorage.getItem('sysitemType');
       if (this.sysitemType == 999) {
@@ -343,7 +345,7 @@ export default {
               this.itemloading = false;
             });
           if (this.page.total) {
-            this.option.height = window.innerHeight - 230;
+            this.option.height = window.innerHeight - 280;
           }
         })
         .finally(() => {

src/views/tirePartsMall/statisticAnalysis/generalLedgerReceivable/detail.vue

@@ -96,7 +96,7 @@ export default {
           },
           {
             label: "应收金额",
-            prop: "totalMoney",
+            prop: "salesAmount",
             overHidden: true,
           },
           {

src/views/tirePartsMall/statisticAnalysis/generalLedgerReceivable/index.vue

@@ -32,7 +32,7 @@
           }}</span>
         </template>
         <template slot="whetherSettlementSearch">
-          <el-checkbox v-model="search.whetherSettlement" :true-label="1" :false-label="0"></el-checkbox>
+          <el-checkbox v-model="search.whetherSettlement" :true-label="0" :false-label="1"></el-checkbox>
         </template>
       </avue-crud>
     </basic-container>
@@ -51,7 +51,7 @@ import _ from "lodash";
 import reportDialog from "@/components/report-dialog/main";
 import { gainUser } from "@/api/basicData/customerInquiry";
 import detail from "./detail";
-
+import { defaultDate3 } from "@/util/date";
 export default {
   name: "index",
   components: {
@@ -64,7 +64,7 @@ export default {
       commodityLabel: [
         {
           id: 1,
-          label: "应收金额",
+          label: "金额",
           prop: "totalMoney",
         }, {
           id: 2,
@@ -72,6 +72,10 @@ export default {
           prop: "paymentAmountTl",
         }, {
           id: 3,
+          label: "运费",
+          prop: "freight",
+        }, {
+          id: 4,
           label: "未收金额",
           prop: "outstandingAmount",
         }
@@ -82,7 +86,8 @@ export default {
       statementData: {},
       form: {},
       search: {
-        whetherSettlement: 0
+        whetherSettlement: 0,
+        businesDateList: defaultDate3()
       },
       dataList: [],
       loading: false,
@@ -193,12 +198,18 @@ export default {
           //   showColumn: false
           // },
           {
-            label: "应收金额",
+            label: "金额",
             prop: "totalMoney",
             search: false,
             overHidden: true,
           },
           {
+            label: "运费",
+            prop: "freight",
+            search: false,
+            overHidden: true,
+          },
+          {
             label: "实收金额",
             prop: "paymentAmountTl",
             search: false,
@@ -274,6 +285,7 @@ export default {
       this.page.pageSize = val;
     },
     onLoad(page, params) {
+      this.search = this.deepClone(this.search)
       this.search.customerId = this.search.customerName
       this.sysitemType = localStorage.getItem('sysitemType');
       if (this.sysitemType == 999) {
@@ -320,11 +332,11 @@ export default {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           if (this.page.total) {
-            this.option.height = window.innerHeight - 230;
+            this.option.height = window.innerHeight - 330;
           }
           this.itemloading = true,
-            statisticsSum({type:0,...queryParams}).then(res => {
-              this.commodityData= [res.data.data]
+            statisticsSum({ type: 0, ...queryParams }).then(res => {
+              this.commodityData = [res.data.data]
             }).finally(() => {
               this.itemloading = false;
             });

src/views/tirePartsMall/statisticAnalysis/profitLedger/detail.vue

@@ -122,7 +122,7 @@ export default {
           },
           {
             label: "收入",
-            prop: "totalMoney",
+            prop: "salesAmount",
             overHidden: true,
           },
           {
@@ -136,7 +136,12 @@ export default {
             overHidden: true,
           },
           {
-            label: "利润",
+            label: "运费",
+            prop: "freight",
+            overHidden: true,
+          },
+          {
+            label: "毛利",
             prop: "grossProfit",
             overHidden: true,
           },

src/views/tirePartsMall/statisticAnalysis/profitLedger/index.vue

@@ -33,7 +33,7 @@
           }}</span>
         </template>
         <template slot="whetherSettlementSearch">
-          <el-checkbox v-model="search.whetherSettlement" :true-label="1" :false-label="0"></el-checkbox>
+          <el-checkbox v-model="search.whetherSettlement" :true-label="0" :false-label="1"></el-checkbox>
         </template>
       </avue-crud>
     </basic-container>
@@ -52,6 +52,7 @@ import _ from "lodash";
 import reportDialog from "@/components/report-dialog/main";
 import { gainUser } from "@/api/basicData/customerInquiry";
 import detail from "./detail";
+import {defaultDate3} from "@/util/date";
 
 export default {
   name: "index",
@@ -73,7 +74,11 @@ export default {
           prop: "cost",
         }, {
           id: 3,
-          label: "利润",
+          label: "运费",
+          prop: "freight",
+        }, {
+          id: 4,
+          label: "毛利",
           prop: "profit",
         }
       ],
@@ -84,6 +89,7 @@ export default {
       form: {},
       search: {
         whetherSettlement: 0,
+        businesDateList:defaultDate3()
       },
       dataList: [],
       loading: false,
@@ -197,7 +203,13 @@ export default {
             overHidden: true,
           },
           {
-            label: "利润",
+            label: "运费",
+            prop: "freight",
+            search: false,
+            overHidden: true,
+          },
+          {
+            label: "毛利",
             prop: "profit",
             search: false,
             overHidden: true,
@@ -234,15 +246,15 @@ export default {
       this.userList = res.data.data;
     });
 
-    let i = 0;
-    this.option.column.forEach(item => {
-      if (item.search) i++
-    })
-    if (i % 3 !== 0) {
-      const num = 3 - Number(i % 3)
-      this.option.searchMenuSpan = num * 8;
-      this.option.searchMenuPosition = "right";
-    }
+    // let i = 0;
+    // this.option.column.forEach(item => {
+    //   if (item.search) i++
+    // })
+    // if (i % 3 !== 0) {
+    //   const num = 3 - Number(i % 3)
+    //   this.option.searchMenuSpan = num * 8;
+    //   this.option.searchMenuPosition = "right";
+    // }
   },
   methods: {
     cellStyle() {
@@ -275,6 +287,7 @@ export default {
       this.page.pageSize = val;
     },
     onLoad(page, params) {
+      this.search=this.deepClone(this.search)
       this.search.customerId = this.search.customerName
       this.sysitemType = localStorage.getItem('sysitemType');
       if (this.sysitemType == 999) {
@@ -327,7 +340,7 @@ export default {
               this.itemloading = false;
             });
           if (this.page.total) {
-            this.option.height = window.innerHeight - 230;
+            this.option.height = window.innerHeight - 330;
           }
         })
         .finally(() => {