Browse Source

修改分页 微信通知 费用bug 检索 审批

Qukatie 10 months ago
parent
commit
cfb483a530
24 changed files with 530 additions and 443 deletions
  1. 1 1
      src/api/iosBasicData/bbusinesstype.js
  2. 8 0
      src/api/tirePartsMall/salesManagement/outboundWorkOrder.js
  3. 8 7
      src/components/tradeAgency/fee-info.vue
  4. 8 7
      src/components/tradeAgency/fee-oceanFreight.vue
  5. 4 1
      src/enums/column-name.js
  6. 17 10
      src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue
  7. 28 5
      src/views/iosBasicData/UnpaidPaymentsDetails/index.vue
  8. 42 0
      src/views/iosBasicData/bbusinesstype/bbusinesstype.js
  9. 5 3
      src/views/iosBasicData/decisionAnalysis/index.vue
  10. 6 4
      src/views/iosBasicData/financeProfit/index.vue
  11. 245 274
      src/views/iosBasicData/paymentDetail/index.vue
  12. 5 4
      src/views/iosBasicData/paymentSummary/index.vue
  13. 3 3
      src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue
  14. 5 5
      src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue
  15. 52 23
      src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue
  16. 19 11
      src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue
  17. 5 4
      src/views/tirePartsMall/statisticAnalysis/accountsReceivableStatistics/index.vue
  18. 22 9
      src/views/tirePartsMall/statisticAnalysis/customAnalysis/index.vue
  19. 1 0
      src/views/tirePartsMall/statisticAnalysis/customerTransactions/js/optionList.js
  20. 1 0
      src/views/tirePartsMall/statisticAnalysis/financingGeneral/index.vue
  21. 36 66
      src/views/tirePartsMall/statisticAnalysis/generalLedgerPayable/index.vue
  22. 6 5
      src/views/tirePartsMall/statisticAnalysis/generalLedgerReceivable/index.vue
  23. 2 1
      src/views/tirePartsMall/statisticAnalysis/profitLedger/index.vue
  24. 1 0
      src/views/tirePartsMall/statisticAnalysis/supplierTransactions/js/optionList.js

+ 1 - 1
src/api/iosBasicData/bbusinesstype.js

@@ -7,7 +7,7 @@ export const bbusinesstypeList = (current, size, params) => {
     params: {
       ...params,
       current,
-      size: size<=100?100:size,
+      size: size,
     }
   })
 }

+ 8 - 0
src/api/tirePartsMall/salesManagement/outboundWorkOrder.js

@@ -106,3 +106,11 @@ export const revokeTransferAllocate = (data) => {
   })
 }
 
+// 撤销调拨
+export const shippingNotice = (data) => {
+  return request({
+    url: '/api/blade-sales-part/ship/shippingNotice',
+    method: 'POST',
+    data: data
+  })
+}

+ 8 - 7
src/components/tradeAgency/fee-info.vue

@@ -163,9 +163,9 @@
                 <span v-else>{{ row.stlExrate }}</span>
             </tempalte>
         </avue-crud>
-        <business-reports :id="form.id" :itemIds="itemIds" ref="printD" businessValue="MYDL" classifyCode="费用"
+        <business-reports :id="form.id" :itemIds="itemDIds" ref="printD" businessValue="MYDL" classifyCode="费用"
             groupCode="应收" :selecList="selectionDList"></business-reports>
-        <business-reports :id="form.id" :itemIds="itemIds" ref="printC" businessValue="MYDL" classifyCode="费用"
+        <business-reports :id="form.id" :itemIds="itemCIds" ref="printC" businessValue="MYDL" classifyCode="费用"
             groupCode="应付" :selecList="selectionCList"></business-reports>
         <!--模板弹窗-->
         <el-dialog title="提示" :visible.sync="templateVisible" append-to-body width="70%" :close-on-click-modal="false"
@@ -675,7 +675,8 @@ export default {
             lefttemplate: {}, // 左侧选择的数据
             feesselectionList: [], // 清空多选
             templateRightData: [],
-            itemIds: null,
+            itemDIds: null,
+            itemCIds: null,
         }
     },
     async created() {
@@ -814,9 +815,9 @@ export default {
                 ids.push(e.id)
             })
             if (ids.length) {
-                this.itemIds = ids.join(',')
+                this.itemDIds = ids.join(',')
             } else {
-                this.itemIds = null
+                this.itemDIds = null
             }
             this.selectionDList = list
         },
@@ -826,9 +827,9 @@ export default {
                 ids.push(e.id)
             })
             if (ids.length) {
-                this.itemIds = ids.join(',')
+                this.itemCIds = ids.join(',')
             } else {
-                this.itemIds = null
+                this.itemCIds = null
             }
             this.selectionCList = list
         },

+ 8 - 7
src/components/tradeAgency/fee-oceanFreight.vue

@@ -196,9 +196,9 @@
                     认</el-button>
             </span>
         </el-dialog>
-        <business-reports :id="form.id" :itemIds="itemIds" ref="printD" businessValue="HYJK" classifyCode="费用"
+        <business-reports :id="form.id" :itemIds="itemDIds" ref="printD" businessValue="HYJK" classifyCode="费用"
             groupCode="应收" :selecList="selectionDList"></business-reports>
-        <business-reports :id="form.id" :itemIds="itemIds" ref="printC" businessValue="HYJK" classifyCode="费用"
+        <business-reports :id="form.id" :itemIds="itemCIds" ref="printC" businessValue="HYJK" classifyCode="费用"
             groupCode="应付" :selecList="selectionCList"></business-reports>
     </div>
 </template>
@@ -751,7 +751,8 @@ export default {
             lefttemplate: {}, // 左侧选择的数据
             feesselectionList: [], // 清空多选
             templateRightData: [],
-            itemIds: null,
+            itemDIds: null,
+            itemCIds: null,
         }
     },
     async created() {
@@ -937,9 +938,9 @@ export default {
                 ids.push(e.id)
             })
             if (ids.length) {
-                this.itemIds = ids.join(',')
+                this.itemDIds = ids.join(',')
             } else {
-                this.itemIds = null
+                this.itemDIds = null
             }
             this.selectionDList = list
         },
@@ -949,9 +950,9 @@ export default {
                 ids.push(e.id)
             })
             if (ids.length) {
-                this.itemIds = ids.join(',')
+                this.itemCIds = ids.join(',')
             } else {
-                this.itemIds = null
+                this.itemCIds = null
             }
             this.selectionCList = list
         },

+ 4 - 1
src/enums/column-name.js

@@ -1862,7 +1862,10 @@ const columnName = [{
   {
     code: 409,
     name: '贸易代理-仓库管理-仓库明细'
-  },
+  },{
+    code: 410,
+    name: '轮胎商城-统计分析-应收款统计'
+  }
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

+ 17 - 10
src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -302,10 +302,12 @@
                 </template>
             </avue-crud>
         </el-card>
-        <avue-crud v-show="assemblyForm.feeCenterAmendList.length>0" id="out-table" class="box-card" :header-cell-class-name="headerClassName" ref="crud"
-            :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :data="assemblyForm.feeCenterAmendList" :option="amendOption"></avue-crud>
+        <avue-crud v-show="assemblyForm.feeCenterAmendList.length > 0" id="out-table" class="box-card"
+            :header-cell-class-name="headerClassName" ref="crud" :row-style="{ height: '16px' }"
+            :cell-style="{ padding: '0px' }" :data="assemblyForm.feeCenterAmendList" :option="amendOption"></avue-crud>
         <avue-crud id="out-table" class="box-card" :header-cell-class-name="headerClassName" ref="crud"
-            :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption" :data="sumData"></avue-crud>
+            :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption"
+            :data="sumData"></avue-crud>
         <!--有admin 显示,有收和付各一个也显示出来-->
         <div v-if="roleName.indexOf('admin') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
             style="display: flex;align-items: center;justify-content: space-around">
@@ -1279,6 +1281,7 @@ export default {
                 },
             ],
             roleName: [], // 当前登录人的角色权限
+            idArr:[],
         }
     },
     async created() {
@@ -1390,15 +1393,12 @@ export default {
         // 打印弹窗里回调
         reportRadio(val) {
             // 多选打印
-            let idArr = this.selectionDList.map(item => {
-                return item.id
-            })
             // 获取报表数据
             reportsGetReportData({
                 billId: this.assemblyForm.id,
                 reportCode: val.classifyCode,
                 groupCode: val.groupCode,
-                itemIds: idArr.join(','),
+                itemIds: this.idArr.join(','),
                 type: 'HYCK'
             }).then(res => {
                 this.handleReportPreview(val.url, res.data.data.data)
@@ -1409,12 +1409,19 @@ export default {
             this.printingDC = dc
             let groupCode = ''
             let selectionArr = []
+            this.idArr = []
             if (dc == 'D') {
                 groupCode = '应收'
                 selectionArr = this.selectionDList
+                this.idArr = this.selectionDList.map(item => {
+                    return item.id
+                })
             } else {
                 groupCode = '应付'
                 selectionArr = this.selectionCList
+                this.idArr = this.selectionCList.map(item => {
+                    return item.id
+                })
             }
             if (selectionArr.length > 0) {
                 // 打开选择弹窗
@@ -2855,9 +2862,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
-::v-deep .box-card .el-card__body{
+::v-deep .box-card .el-card__body {
     padding: 4px !important;
 }
+
 .disabledBox {
     display: flex;
     align-items: center;
@@ -2920,5 +2928,4 @@ export default {
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-}
-</style>
+}</style>

+ 28 - 5
src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -134,7 +134,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 24,
+                searchMenuSpan: 12,
                 border: true,
                 index: false,
                 selection: true,
@@ -144,7 +144,19 @@ export default {
                 viewBtn:false,
                 delBtn:false,
                 editBtn:false,
+                emptyBtnText:'清空所有条件',
                 column:[
+                {
+                        label: "业务类型",
+                        prop: "businessType",
+                        type: 'select',
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=audit_status_los",
+                        props: {
+                            label: 'dictValue',
+                            value: 'dictKey',
+                        },
+                        overHidden: true,
+                    },
                     {
                         label: "结算单位",
                         prop: "corpName",
@@ -153,6 +165,13 @@ export default {
                     {
                         label: "业务编号",
                         prop: "billNo",
+                        search:true,
+                        overHidden:true,
+                    },
+                    {
+                        label: "提单号",
+                        prop: "mblNo",
+                        search:true,
                         overHidden:true,
                     },
                     {
@@ -265,7 +284,7 @@ export default {
                         searchslot:true,
                     },
                     {
-                        label: "ETD",
+                        label: "统计开始",
                         prop: "etdStart",
                         search:true,
                         overHidden:true,
@@ -275,7 +294,7 @@ export default {
                         valueFormat: "yyyy-MM-dd",
                     },
                     {
-                        label: "ETA",
+                        label: "统计结束",
                         prop: "etdEnd",
                         search:true,
                         overHidden:true,
@@ -493,8 +512,8 @@ export default {
                 dc:'D',
                 isBusinessDate:1,
                 isToExamineDate:0,
-                etdStart:defaultDate3()[0],
-                etdEnd:defaultDate3()[1],
+                etdStart:null,
+                etdEnd:null,
             };
             this.onLoad(this.page);
         },
@@ -523,6 +542,10 @@ export default {
                 financeStatisticsFeeSummaryDetailNotSum(Object.assign(params, this.query)).then(re=>{
                     this.commodityData = [re.data.data]
                 })
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                    this.$refs.crud.dicInit();
+                });
                 this.selectionClear();
             });
         },

+ 42 - 0
src/views/iosBasicData/bbusinesstype/bbusinesstype.js

@@ -0,0 +1,42 @@
+import request from '@/router/axios';
+
+export const bbusinesstypeList = (current, size, params) => {
+  return request({
+    url: '/api/blade-los/businesstype/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size: size,
+    }
+  })
+}
+
+export const bbusinesstypeDetail = (id) => {
+  return request({
+    url: '/api/blade-los/businesstype/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const bbusinesstypeRemove = (ids) => {
+  return request({
+    url: '/api/blade-los/businesstype/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const bbusinesstypeSubmit = (row) => {
+  return request({
+    url: '/api/blade-los/businesstype/submit',
+    method: 'post',
+    data: row
+  })
+}
+

+ 5 - 3
src/views/iosBasicData/decisionAnalysis/index.vue

@@ -81,6 +81,7 @@ export default {
                 searchIndex: 3,
                 searchLabelWidth: "80",
                 dialogClickModal: false,
+                emptyBtnText:'清空所有条件',
                 column: [
                     {
                         label: "业务来源",
@@ -180,7 +181,7 @@ export default {
                         }
                     },
                     {
-                        label: "开船日期",
+                        label: "统计期间",
                         prop: "date",
                         search: true,
                         hide: true,
@@ -486,6 +487,7 @@ export default {
                 header: false,
                 searchLabelWidth: "80",
                 align: 'center',
+                emptyBtnText:'清空所有条件',
                 column: [
                     {
                         label: "业务来源",
@@ -576,7 +578,7 @@ export default {
                         }
                     },
                     {
-                        label: "开船日期",
+                        label: "统计期间",
                         prop: "date",
                         search: true,
                         hide: true,
@@ -916,7 +918,7 @@ export default {
                     }
                 },
                 {
-                    label: "开船日期",
+                    label: "统计期间",
                     prop: "date",
                     search: true,
                     hide: true,

+ 6 - 4
src/views/iosBasicData/financeProfit/index.vue

@@ -121,7 +121,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 4,
+                searchMenuSpan: 10,
                 border: true,
                 index: false,
                 selection: true,
@@ -133,7 +133,7 @@ export default {
                 editBtn: false,
                 searchIcon: true,
                 searchIndex: 3,
-
+                emptyBtnText:'清空所有条件',
                 showSummary: true,
                 summaryText: "合计",
                 sumColumnList: [
@@ -224,7 +224,9 @@ export default {
                     {
                         label: "M B/L",
                         prop: "mblNo",
+                        search:true,
                         overHidden: true,
+                        searchOrder: 12
                     },
                     {
                         label: "往来单位",
@@ -665,8 +667,8 @@ export default {
             this.query = {
                 billType: 'SE,SI',
                 costMerge: 1,
-                statisticsDateStart: defaultDate3()[0],
-                statisticsDateEnd: defaultDate3()[1],
+                statisticsDateStart: null,
+                statisticsDateEnd: null,
                 mergeAmendFee: 0,
                 examine: 0,
                 examineDate: 0

+ 245 - 274
src/views/iosBasicData/paymentDetail/index.vue

@@ -1,119 +1,71 @@
 <template>
     <basic-container>
-        <avue-crud :option="option"
-                   :table-loading="loading"
-                   :data="data"
-                   :page.sync="page"
-                   :search.sync="query"
-                   v-model="form"
-                   ref="crud"
-                   id="out-table"
-                   :header-cell-class-name="headerClassName"
-                   @search-change="searchChange"
-                   @search-reset="searchReset"
-                   @current-change="currentChange"
-                   @size-change="sizeChange"
-                   @refresh-change="refreshChange"
-                   @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 333)"
-                   @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 333)"
-                   @on-load="onLoad" >
+        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
+            v-model="form" ref="crud" id="out-table" :header-cell-class-name="headerClassName"
+            @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
+            @size-change="sizeChange" @refresh-change="refreshChange"
+            @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 333)"
+            @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 333)" @on-load="onLoad">
             <template slot="menuLeft">
-                <el-button type="success" size="small" plain @click="exportfun" >导出</el-button>
+                <el-button type="success" size="small" plain @click="exportfun">导出</el-button>
             </template>
             <template slot="header">
-                <el-table
-                    :data="commodityData"
-                    border
-                    size="small"
-                    @header-click="cellClick"
-                    style="width: 100%">
-                    <el-table-column
-                        v-for="(item,index) in commodityLabel" :key="index"
-                        :prop="item.prop"
-                        show-overflow-tooltip
-                        :label="item.label" />
+                <el-table :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%">
+                    <el-table-column v-for="(item, index) in commodityLabel" :key="index" :prop="item.prop"
+                        show-overflow-tooltip :label="item.label" />
                 </el-table>
             </template>
             <template slot="etdDate" slot-scope="{ row }">
-                <span>{{row.etdDate?row.etdDate.slice(0,10):''}}</span>
+                <span>{{ row.etdDate ? row.etdDate.slice(0, 10) : '' }}</span>
             </template>
             <template slot-scope="{disabled,size}" slot="dcSearch">
-                <el-radio v-model="query.dc" label="D" @input="dcInput" >应收</el-radio>
-                <el-radio v-model="query.dc" label="C" @input="dcInput" >应付</el-radio>
+                <el-radio v-model="query.dc" label="D" @input="dcInput">应收</el-radio>
+                <el-radio v-model="query.dc" label="C" @input="dcInput">应付</el-radio>
             </template>
             <template slot-scope="{disabled,size}" slot="typeSearch">
-                <search-query :datalist="typeData"
-                              :selectValue="query.type"
-                              :buttonIf="false"
-                              @corpChange="corpChange($event,'type')">
+                <search-query :datalist="typeData" :selectValue="query.type" :buttonIf="false"
+                    @corpChange="corpChange($event, 'type')">
                 </search-query>
             </template>
             <template slot-scope="{disabled,size}" slot="businessTypeSearch">
-                <search-query :datalist="businessTypeData"
-                              :selectValue="query.businessType"
-                              :clearable="true"
-                              :buttonIf="false"
-                              :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
-                              @corpFocus="businessTypeFocus"
-                              @corpChange="corpChange($event,'businessType')">
+                <search-query :datalist="businessTypeData" :selectValue="query.businessType" :clearable="true"
+                    :buttonIf="false" :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }"
+                    @corpFocus="businessTypeFocus" @corpChange="corpChange($event, 'businessType')">
                 </search-query>
             </template>
             <template slot-scope="{disabled,size}" slot="clientIdSearch">
-                <search-query :datalist="clientIdData"
-                              :selectValue="query.clientName"
-                              :filterable="true"
-                              :remote="true"
-                              :clearable="true"
-                              :disabled="query.type != 2"
-                              :buttonIf="false"
-                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                              @remoteMethod="clientIdListfun"
-                              @corpFocus="clientIdListfun"
-                              @corpChange="corpChange($event,'clientName')">
+                <search-query :datalist="clientIdData" :selectValue="query.clientName" :filterable="true" :remote="true"
+                    :clearable="true" :disabled="query.type != 2" :buttonIf="false"
+                    :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" @remoteMethod="clientIdListfun"
+                    @corpFocus="clientIdListfun" @corpChange="corpChange($event, 'clientName')">
                 </search-query>
             </template>
             <template slot-scope="{disabled,size}" slot="corpIdSearch">
-                <search-query :datalist="corpIdData"
-                              :selectValue="query.corpName"
-                              :disabled="query.type != 1"
-                              :filterable="true"
-                              :remote="true"
-                              :clearable="true"
-                              :buttonIf="false"
-                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                              @remoteMethod="getBcorpsListfun"
-                              @corpFocus="getBcorpsListfun"
-                              @corpChange="corpChange($event,'corpName')">
+                <search-query :datalist="corpIdData" :selectValue="query.corpName" :disabled="query.type != 1"
+                    :filterable="true" :remote="true" :clearable="true" :buttonIf="false"
+                    :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" @remoteMethod="getBcorpsListfun"
+                    @corpFocus="getBcorpsListfun" @corpChange="corpChange($event, 'corpName')">
                 </search-query>
             </template>
             <template slot-scope="{disabled,size}" slot="srcTypeSearch">
-                <search-query :datalist="srcTypeData"
-                              :selectValue="query.srcType"
-                              :disabled="query.type != 3"
-                              :clearable="true"
-                              :buttonIf="false"
-                              :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
-                              @corpFocus="srcTypeWorkDictsfun"
-                              @corpChange="corpChange($event,'srcType')">
+                <search-query :datalist="srcTypeData" :selectValue="query.srcType" :disabled="query.type != 3"
+                    :clearable="true" :buttonIf="false"
+                    :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }"
+                    @corpFocus="srcTypeWorkDictsfun" @corpChange="corpChange($event, 'srcType')">
                 </search-query>
             </template>
             <template slot-scope="{disabled,size}" slot="srcIdSearch">
-                <search-query :datalist="srcIdData"
-                              :selectValue="query.srcName"
-                              :disabled="query.type != 3"
-                              :filterable="true"
-                              :remote="true"
-                              :clearable="true"
-                              :buttonIf="false"
-                              :forParameter="srcforParameter"
-                              @remoteMethod="srcCorpFocus"
-                              @corpFocus="srcCorpFocus"
-                              @corpChange="corpChange($event,'srcName')">
+                <search-query :datalist="srcIdData" :selectValue="query.srcName" :disabled="query.type != 3"
+                    :filterable="true" :remote="true" :clearable="true" :buttonIf="false"
+                    :forParameter="srcforParameter" @remoteMethod="srcCorpFocus" @corpFocus="srcCorpFocus"
+                    @corpChange="corpChange($event, 'srcName')">
                 </search-query>
             </template>
             <template slot-scope="{disabled,size}" slot="isBusinessDateSearch">
-                <el-checkbox v-model="query.isBusinessDate" :true-label="1" :false-label="0" @change="dateChange('isBusinessDate')" >按业务日期</el-checkbox>
-                <el-checkbox v-model="query.isToExamineDate" :true-label="1" :false-label="0" @change="dateChange('isToExamineDate')" >按审核日期</el-checkbox>
+                <el-checkbox v-model="query.isBusinessDate" :true-label="1" :false-label="0"
+                    @change="dateChange('isBusinessDate')">按业务日期</el-checkbox>
+                <el-checkbox v-model="query.isToExamineDate" :true-label="1" :false-label="0"
+                    @change="dateChange('isToExamineDate')">按审核日期</el-checkbox>
             </template>
 
         </avue-crud>
@@ -122,20 +74,20 @@
 
 <script>
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-import {CurrentMonth, dateFormat, defaultDate3, defaultDate4} from "@/util/date";
+import { CurrentMonth, dateFormat, defaultDate3, defaultDate4 } from "@/util/date";
 import {
     financeStatisticsFeeSummaryDetail,
     financeStatisticsFeeSummaryDetailSum
 } from "@/api/iosBasicData/paymentSummary"
-import {getBcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
-import {getWorkDicts} from "@/api/system/dictbiz";
-import {getDeptLazyTree} from "@/api/system/dept";
-import {getList as userGetList} from '@/api/system/user'
-import {getToken} from "@/util/auth";
+import { getBcorpsList, getBcorpslistByType } from "@/api/iosBasicData/bcorps";
+import { getWorkDicts } from "@/api/system/dictbiz";
+import { getDeptLazyTree } from "@/api/system/dept";
+import { getList as userGetList } from '@/api/system/user'
+import { getToken } from "@/util/auth";
 
 export default {
-    components: {SearchQuery},
-    data(){
+    components: { SearchQuery },
+    data() {
         return {
             form: {},
             loading: true,
@@ -145,160 +97,174 @@ export default {
                 total: 0
             },
             query: {
-                dc:'D',
-                isBusinessDate:1,
-                isToExamineDate:0,
-                type:'1',
-                etdStart:defaultDate3()[0],
-                etdEnd:defaultDate3()[1],
+                dc: 'D',
+                isBusinessDate: 1,
+                isToExamineDate: 0,
+                type: '1',
+                etdStart: defaultDate3()[0],
+                etdEnd: defaultDate3()[1],
             },
-            option:{},
-            optionBack:{
-                height:'auto',
+            option: {},
+            optionBack: {
+                height: 'auto',
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 24,
                 border: true,
                 index: false,
                 selection: true,
                 dialogClickModal: false,
-                menu:false,
-                addBtn:false,
-                viewBtn:false,
-                delBtn:false,
-                editBtn:false,
-                column:[
+                menu: false,
+                addBtn: false,
+                viewBtn: false,
+                delBtn: false,
+                editBtn: false,
+                emptyBtnText: '清空所有条件',
+                column: [
+                    {
+                        label: "业务类型",
+                        prop: "businessType",
+                        type: 'select',
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=audit_status_los",
+                        props: {
+                            label: 'dictValue',
+                            value: 'dictKey',
+                        },
+                        overHidden: true,
+                    },
                     {
                         label: "结算单位",
                         prop: "corpName",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "BILLNO",
                         prop: "billNo",
-                        overHidden:true,
+                        search: true,
+                        overHidden: true,
                     },
                     {
                         label: "MBLNO",
                         prop: "mblNo",
-                        overHidden:true,
+                        search: true,
+                        overHidden: true,
                     },
                     {
                         label: "ETD",
                         prop: "etdDate",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "应收美金",
                         prop: "amountUsd",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "应收人民币",
                         prop: "amount",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "已收款美金",
                         prop: "amountUsdAlready",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "已收款人民币",
                         prop: "amountAlready",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "未收款美金",
                         prop: "amountUsdNot",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "未收款人民币",
                         prop: "amountNot",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "开票美金",
                         prop: "amountInvoicingUsd",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "开票人民币",
                         prop: "amountInvoicing",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "未开美金",
                         prop: "amountInvoicingUsdNot",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "未开人民币",
                         prop: "amountInvoicingNot",
-                        overHidden:true,
+                        overHidden: true,
                     },
 
                     {
                         label: "查询方式",
                         prop: "type",
-                        hide:true,
-                        search:true,
+                        hide: true,
+                        search: true,
                         type: 'select',
-                        searchslot:true,
+                        searchslot: true,
                     },
                     {
                         label: "业务类型",
                         prop: "businessType",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
+                        hide: true,
+                        search: true,
+                        searchslot: true,
                     },
                     {
                         label: "委托人",
                         prop: "clientId",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
+                        hide: true,
+                        search: true,
+                        searchslot: true,
                     },
                     {
                         label: "结算单位",
                         prop: "corpId",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
+                        hide: true,
+                        search: true,
+                        searchslot: true,
                     },
                     {
                         label: "业务来源",
                         prop: "srcType",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
+                        hide: true,
+                        search: true,
+                        searchslot: true,
                     },
                     {
                         label: "业务员",
                         prop: "srcId",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
+                        hide: true,
+                        search: true,
+                        searchslot: true,
                     },
                     {
-                        label: "开始日期",
+                        label: "统计开始",
                         prop: "etdStart",
-                        search:true,
-                        overHidden:true,
-                        hide:true,
+                        search: true,
+                        overHidden: true,
+                        hide: true,
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd",
                     },
                     {
-                        label: "结束日期",
+                        label: "统计结束",
                         prop: "etdEnd",
-                        search:true,
-                        overHidden:true,
-                        hide:true,
+                        search: true,
+                        overHidden: true,
+                        hide: true,
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd",
@@ -306,100 +272,100 @@ export default {
                     {
                         label: "",
                         prop: "dc",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
-                        searchLabelWidth:'0'
+                        hide: true,
+                        search: true,
+                        searchslot: true,
+                        searchLabelWidth: '0'
                     },
                     {
                         label: "",
                         prop: "isBusinessDate",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
-                        searchLabelWidth:'0'
+                        hide: true,
+                        search: true,
+                        searchslot: true,
+                        searchLabelWidth: '0'
                     },
                     {
                         label: "",
                         prop: "isToExamineDate",
-                        hide:true,
-                        searchLabelWidth:'0',
+                        hide: true,
+                        searchLabelWidth: '0',
                     },
 
                 ]
             },
-            data:[],
+            data: [],
             // 查询方式
-            typeData:[
+            typeData: [
                 {
-                    label:'结算单位',
-                    value:'1'
-                },{
-                    label:'委托人',
-                    value:'2'
-                },{
-                    label:'业务来源',
-                    value:'3'
+                    label: '结算单位',
+                    value: '1'
+                }, {
+                    label: '委托人',
+                    value: '2'
+                }, {
+                    label: '业务来源',
+                    value: '3'
                 }
             ],
             // 业务类型
-            businessTypeData:[],
-            clientIdData:[], // 委托人
-            corpIdData:[], // 结算单位
-            srcTypeData:[], // 业务来源
-            srcIdData:[], // 业务员
-            srcforParameter:{key:'id', label:'cnName', value:'cnName'},
+            businessTypeData: [],
+            clientIdData: [], // 委托人
+            corpIdData: [], // 结算单位
+            srcTypeData: [], // 业务来源
+            srcIdData: [], // 业务员
+            srcforParameter: { key: 'id', label: 'cnName', value: 'cnName' },
 
-            commodityData:[], // 合计数据
+            commodityData: [], // 合计数据
             // 合计的配置项
-            commodityLabel:[
+            commodityLabel: [
                 {
-                    id:1,
+                    id: 1,
                     label: "应收美金",
                     prop: "amountUsd",
                 },
                 {
-                    id:2,
+                    id: 2,
                     label: "应收人民币",
                     prop: "amount",
                 },
                 {
-                    id:3,
+                    id: 3,
                     label: "已收款美金",
                     prop: "amountUsdAlready",
                 },
                 {
-                    id:4,
+                    id: 4,
                     label: "已收款人民币",
                     prop: "amountAlready",
                 },
                 {
-                    id:5,
+                    id: 5,
                     label: "未收款美金",
                     prop: "amountUsdNot",
                 },
                 {
-                    id:6,
+                    id: 6,
                     label: "未收款人民币",
                     prop: "amountNot",
                 },
                 {
-                    id:7,
+                    id: 7,
                     label: "开票美金",
                     prop: "amountInvoicingUsd",
                 },
                 {
-                    id:8,
+                    id: 8,
                     label: "开票人民币",
                     prop: "amountInvoicing",
                 },
                 {
-                    id:9,
+                    id: 9,
                     label: "未开美金",
                     prop: "amountInvoicingUsdNot",
                 },
                 {
-                    id:10,
+                    id: 10,
                     label: "未开人民币",
                     prop: "amountInvoicingNot",
                 },
@@ -410,9 +376,9 @@ export default {
     async created() {
         this.option = await this.getColumnData(this.getColumnName(333), this.optionBack);
     },
-    methods:{
+    methods: {
         // 导出
-        exportfun(){
+        exportfun() {
             const routeData = this.$router.resolve({
                 path: '/api/blade-los/financeStatistics/feeSummaryDetailExport',//跳转目标窗口的地址
                 query: {
@@ -422,117 +388,117 @@ export default {
             window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
         },
         // 下拉监听
-        corpChange(value,name){
+        corpChange(value, name) {
             if (name == 'type') {
                 if (value == 1) {
-                    this.$set(this.query,'clientId',null)
-                    this.$set(this.query,'clientName',null)
-                    this.$set(this.query,'srcType',null)
-                    this.$set(this.query,'srcId',null)
-                    this.$set(this.query,'srcName',null)
+                    this.$set(this.query, 'clientId', null)
+                    this.$set(this.query, 'clientName', null)
+                    this.$set(this.query, 'srcType', null)
+                    this.$set(this.query, 'srcId', null)
+                    this.$set(this.query, 'srcName', null)
                     this.findObject(this.option.column, "corpName").label = '结算单位'
-                }else if (value == 2) {
-                    this.$set(this.query,'corpId',null)
-                    this.$set(this.query,'corpName',null)
-                    this.$set(this.query,'srcType',null)
-                    this.$set(this.query,'srcId',null)
-                    this.$set(this.query,'srcName',null)
+                } else if (value == 2) {
+                    this.$set(this.query, 'corpId', null)
+                    this.$set(this.query, 'corpName', null)
+                    this.$set(this.query, 'srcType', null)
+                    this.$set(this.query, 'srcId', null)
+                    this.$set(this.query, 'srcName', null)
                     this.findObject(this.option.column, "corpName").label = '委托人'
-                }else if (value == 3) {
-                    this.$set(this.query,'corpId',null)
-                    this.$set(this.query,'corpName',null)
-                    this.$set(this.query,'clientId',null)
-                    this.$set(this.query,'clientName',null)
+                } else if (value == 3) {
+                    this.$set(this.query, 'corpId', null)
+                    this.$set(this.query, 'corpName', null)
+                    this.$set(this.query, 'clientId', null)
+                    this.$set(this.query, 'clientName', null)
                     this.findObject(this.option.column, "corpName").label = '业务来源'
                 }
-                this.$set(this.query,name,value)
-            }else if (name == 'corpName') {
+                this.$set(this.query, name, value)
+            } else if (name == 'corpName') {
                 for (let item of this.corpIdData) {
                     if (item.cnName == value) {
-                        this.$set(this.query,'corpId',item.id)
-                        this.$set(this.query,'corpName',item.cnName)
+                        this.$set(this.query, 'corpId', item.id)
+                        this.$set(this.query, 'corpName', item.cnName)
                     }
                 }
             } else if (name == 'clientName') {
                 for (let item of this.clientIdData) {
                     if (item.cnName == value) {
-                        this.$set(this.query,'clientId',item.id)
-                        this.$set(this.query,'clientName',item.cnName)
+                        this.$set(this.query, 'clientId', item.id)
+                        this.$set(this.query, 'clientName', item.cnName)
                     }
                 }
-            }else if (name == 'srcType') {
+            } else if (name == 'srcType') {
                 if (value == 'OWN') {
                     // 公司
-                    this.srcforParameter = { key:'id', label:'title', value:'title'}
+                    this.srcforParameter = { key: 'id', label: 'title', value: 'title' }
                     this.findObject(this.option.column, "srcId").label = '公司'
                     this.ownDeptLazyTreefun()
-                }else if (value == 'AGENT') {
+                } else if (value == 'AGENT') {
                     // 代理
-                    this.srcforParameter = { key:'id', label:'cnName', value:'cnName'}
+                    this.srcforParameter = { key: 'id', label: 'cnName', value: 'cnName' }
                     this.findObject(this.option.column, "srcId").label = '代理'
                     this.agentBcorpsListfun()
-                }else if (value == 'SALES') {
+                } else if (value == 'SALES') {
                     // 业务员
-                    this.srcforParameter = { key:'id', label:'name', value:'name'}
+                    this.srcforParameter = { key: 'id', label: 'name', value: 'name' }
                     this.findObject(this.option.column, "srcId").label = '业务员'
                     this.salesUserGetListfun()
-                }else {}
-                this.$set(this.query,name,value)
-            }else if (name == 'srcName') {
+                } else { }
+                this.$set(this.query, name, value)
+            } else if (name == 'srcName') {
                 for (let item of this.srcIdData) {
                     if (item[this.srcforParameter.value] == value) {
                         if (this.query.srcType == 'SALES') {
                             // 业务员
-                            this.$set(this.query,'srcId',item.id)
-                            this.$set(this.query,'srcName',item.name)
-                        }else if (this.form.srcType == 'AGENT') {
+                            this.$set(this.query, 'srcId', item.id)
+                            this.$set(this.query, 'srcName', item.name)
+                        } else if (this.form.srcType == 'AGENT') {
                             // 代理
-                            this.$set(this.query,'srcId',item.id)
-                            this.$set(this.query,'srcName',item.cnName)
-                        }else {
-                            this.$set(this.query,'srcId',item.id)
-                            this.$set(this.query,'srcName',item.title)
+                            this.$set(this.query, 'srcId', item.id)
+                            this.$set(this.query, 'srcName', item.cnName)
+                        } else {
+                            this.$set(this.query, 'srcId', item.id)
+                            this.$set(this.query, 'srcName', item.title)
                         }
                     }
                 }
             }
-            this.$set(this.query,name,value)
+            this.$set(this.query, name, value)
         },
         // 业务员下拉
-        srcCorpFocus(value,name){
+        srcCorpFocus(value, name) {
             if (this.query.srcType == 'SALES') {
                 // 业务员
-                this.srcforParameter = { key:'id', label:'name', value:'name'}
+                this.srcforParameter = { key: 'id', label: 'name', value: 'name' }
                 this.salesUserGetListfun(value)
-            }else if (this.form.srcType == 'AGENT') {
+            } else if (this.form.srcType == 'AGENT') {
                 // 代理
-                this.srcforParameter = { key:'id', label:'cnName', value:'cnName'}
+                this.srcforParameter = { key: 'id', label: 'cnName', value: 'cnName' }
                 this.agentBcorpsListfun(value)
-            }else if (this.form.srcType == 'OWN') {
+            } else if (this.form.srcType == 'OWN') {
                 // 公司
-                this.srcforParameter = { key:'id', label:'title', value:'title'}
+                this.srcforParameter = { key: 'id', label: 'title', value: 'title' }
                 this.ownDeptLazyTreefun()
-            }else {}
+            } else { }
         },
         // 多选切换
         dateChange(name) {
             if (name == 'isBusinessDate') {
-                this.$set(this.query,'isToExamineDate',0)
-                this.$set(this.query,'isBusinessDate',1)
+                this.$set(this.query, 'isToExamineDate', 0)
+                this.$set(this.query, 'isBusinessDate', 1)
             }
             if (name == 'isToExamineDate') {
-                this.$set(this.query,'isBusinessDate',0)
-                this.$set(this.query,'isToExamineDate',1)
+                this.$set(this.query, 'isBusinessDate', 0)
+                this.$set(this.query, 'isToExamineDate', 1)
             }
             this.page.currentPage = 1;
             this.onLoad(this.page, this.query);
         },
         // 收付单选
-        dcInput(){
+        dcInput() {
             let dcName = ''
             if (this.query.dc == 'D') {
                 dcName = '收'
-            }else {
+            } else {
                 dcName = '付'
             }
             this.findObject(this.option.column, "amountUsd").label = `应${dcName}美金`
@@ -554,57 +520,57 @@ export default {
         },
         // 接口获取数据
         // 结算单位
-        getBcorpsListfun(cnName){
-            getBcorpsList(1,10,{cnName,status: 0}).then(res=>{
+        getBcorpsListfun(cnName) {
+            getBcorpsList(1, 10, { cnName, status: 0 }).then(res => {
                 this.corpIdData = res.data.data.records
             })
         },
         // 业务类型
-        businessTypeFocus(){
-            getWorkDicts('profit_business_type_los').then(res=>{
+        businessTypeFocus() {
+            getWorkDicts('profit_business_type_los').then(res => {
                 this.businessTypeData = res.data.data
             })
         },
         // 委托人
-        clientIdListfun(cnName){
-            getBcorpsList(1,10,{cnName,status: 0}).then(res=>{
+        clientIdListfun(cnName) {
+            getBcorpsList(1, 10, { cnName, status: 0 }).then(res => {
                 this.clientIdData = res.data.data.records
             })
         },
         // 获取业务来源数据
-        srcTypeWorkDictsfun(){
-            getWorkDicts('src_type_los').then(res=>{
+        srcTypeWorkDictsfun() {
+            getWorkDicts('src_type_los').then(res => {
                 this.srcTypeData = res.data.data
             })
         },
         // 获取公司名称 用户管理左侧
-        ownDeptLazyTreefun(){
-            getDeptLazyTree(0).then(res=>{
+        ownDeptLazyTreefun() {
+            getDeptLazyTree(0).then(res => {
                 this.srcIdData = res.data.data
             })
         },
         // 获取业务来源代理数据
-        agentBcorpsListfun(cnName){
+        agentBcorpsListfun(cnName) {
             let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-            getBcorpslistByType(1,10,{cnName,status: 0,corpTypeName}).then(res=>{
+            getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
                 this.srcIdData = res.data.data.records
             })
         },
         // 获取业务来源业务员数据
-        salesUserGetListfun(account){
-            userGetList(1,10,{account}).then(res=>{
+        salesUserGetListfun(account) {
+            userGetList(1, 10, { account }).then(res => {
                 this.srcIdData = res.data.data.records
             })
         },
         // 清空搜索回调方法
         searchReset() {
             this.query = {
-                dc:'D',
-                isBusinessDate:1,
-                isToExamineDate:0,
-                type:'1',
-                etdStart:defaultDate3()[0],
-                etdEnd:defaultDate3()[1],
+                dc: 'D',
+                isBusinessDate: 1,
+                isToExamineDate: 0,
+                type: '1',
+                etdStart: null,
+                etdEnd: null,
             }
             this.onLoad(this.page);
         },
@@ -614,10 +580,10 @@ export default {
             this.onLoad(this.page, this.query);
             done();
         },
-        currentChange(currentPage){
+        currentChange(currentPage) {
             this.page.currentPage = currentPage;
         },
-        sizeChange(pageSize){
+        sizeChange(pageSize) {
             this.page.pageSize = pageSize;
         },
         refreshChange() {
@@ -630,9 +596,13 @@ export default {
                 this.page.total = data.total;
                 this.data = data.records;
                 this.loading = false;
-                financeStatisticsFeeSummaryDetailSum(Object.assign(params, this.query)).then(re=>{
+                financeStatisticsFeeSummaryDetailSum(Object.assign(params, this.query)).then(re => {
                     this.commodityData = [re.data.data]
                 })
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                    this.$refs.crud.dicInit();
+                });
                 this.selectionClear();
             });
         },
@@ -661,17 +631,17 @@ export default {
                 this.$message.success("重置成功");
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
                 this.query = {
-                    dc:'D',
-                    isBusinessDate:1,
-                    isToExamineDate:0,
-                    type:'1',
-                    etdStart:defaultDate3()[0],
-                    etdEnd:defaultDate3()[1],
+                    dc: 'D',
+                    isBusinessDate: 1,
+                    isToExamineDate: 0,
+                    type: '1',
+                    etdStart: defaultDate3()[0],
+                    etdEnd: defaultDate3()[1],
                 }
             }
         },
         // 更改表格颜色
-        headerClassName(tab){
+        headerClassName(tab) {
             //颜色间隔
             let back = ""
             if (tab.columnIndex >= 0 && tab.column.level === 1) {
@@ -692,6 +662,7 @@ export default {
     background: #ecf5ff !important;
     text-align: center;
 }
+
 ::v-deep#out-table .back-two {
     background: #ecf5ff !important;
     text-align: center;

+ 5 - 4
src/views/iosBasicData/paymentSummary/index.vue

@@ -175,6 +175,7 @@
                     viewBtn:false,
                     delBtn:false,
                     editBtn:false,
+                    emptyBtnText:'清空所有条件',
                     column:[
                         {
                             label: "结算单位",
@@ -197,7 +198,7 @@
                             searchslot:true,
                         },
                         {
-                            label: "开始日期",
+                            label: "统计开始",
                             prop: "etdStart",
                             search:true,
                             overHidden:true,
@@ -207,7 +208,7 @@
                             valueFormat: "yyyy-MM-dd",
                         },
                         {
-                            label: "结束日期",
+                            label: "统计结束",
                             prop: "etdEnd",
                             search:true,
                             overHidden:true,
@@ -563,8 +564,8 @@
                     isBusinessDate:1,
                     isToExamineDate:0,
                     type:'1',
-                    etdStart:startDate(),
-                    etdEnd:endDate(),
+                    etdStart:null,
+                    etdEnd:null,
                 };
                 this.onLoad(this.page);
             },

+ 3 - 3
src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -2056,9 +2056,9 @@ export default {
                     if (valid) {
                         const data = {
                             id: this.form.id,
-                            url: '/tirePartsMall/salesManagement/purchaseOrder/index',
-                            pageStatus: "this.$store.getters.purchaseStatus",
-                            pageLabel: "采购订单",
+                            url: '/tirePartsMall/purchasingManagement/financingProcurement/index',
+                            pageStatus: "this.$store.getters.financingStatus",
+                            pageLabel: "融资采购(L)",
                         }
                         const loading = this.$loading({
                             lock: true,

+ 5 - 5
src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue

@@ -474,19 +474,19 @@ export default {
       console.log(this.$route.query, 400);
       // 主页快捷跳转来的 直接打开新建订单
       if (this.$route.query.showTrue) {
-        this.$store.commit("IN_FINACING_STATUS");
+        this.$store.commit("IN_FINACING_DETAIL");
         this.detailsOpen = true;
       }
       if (this.$route.query.check) {
         this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
-        this.$store.commit("IN_FINACING_STATUS");
+        this.$store.commit("IN_FINACING_DETAIL");
       }
       if (this.$route.query.type == 'F') {
         this.editOpen({ id: this.$route.query.detail.srcParentId }, 1)
       }
       if (this.$route.query.srcId) {
         this.editOpen({ id: this.$route.query.srcId }, 1)
-        this.$store.commit("IN_FINACING_STATUS");
+        this.$store.commit("IN_FINACING_DETAIL");
       }
       this.detailData = {
         id: this.$route.query.check.billId,
@@ -551,7 +551,7 @@ export default {
       if (type === 0) {
         this.detailData = {}
       }
-      this.$store.commit("OUT_FINACING_STATUS");
+      this.$store.commit("OUT_FINACING_DETAIL");
       this.onLoad(this.page, this.search)
     },
     editOpen(row, status) {
@@ -561,7 +561,7 @@ export default {
         status: status
       };
       console.log(status);
-      this.$store.commit("IN_FINACING_STATUS");
+      this.$store.commit("IN_FINACING_DETAIL");
       this.detailsOpen = true;
     },
     //刷新

+ 52 - 23
src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue

@@ -7,13 +7,16 @@
         </el-button>
       </div>
       <div class="add-customer-btn">
+        <el-button class="el-button&#45;&#45;small-yh" type="success" size="small"
+          v-if="form.whetherShippingNotice == 0 && paymentType == 1" @click="notice">微信发货通知
+        </el-button>
         <el-button class="el-button&#45;&#45;small-yh" type="primary" size="small" v-if="editButton"
           @click="confirmEditing">编辑
         </el-button>
         <el-button class="el-button--small-yh" type="primary" size="small" :disabled="isSave" @click="editCustomer">保存数据
         </el-button>
-        <el-button class="el-button--small-yh" type="warning" size="small" v-if="form.statusName == '已出库'" @click="revoke"
-          :disabled="isSave">撤销出库
+        <el-button class="el-button--small-yh" type="warning" size="small" v-if="form.statusName == '已出库'"
+          @click="revoke" :disabled="isSave">撤销出库
         </el-button>
         <el-button class="el-button--small-yh" type="success" size="small" style="margin-left: 6px;"
           v-if="form.statusName == '待出库' || form.statusName == '撤销出库'" @click="complete" :disabled="isSave">出库完成
@@ -53,8 +56,8 @@
                     <el-table-column property="createUserName" label="制单人"></el-table-column>
                     <el-table-column property="createTime" label="制单日期"></el-table-column>
                   </el-table>
-                  <el-button v-if="row.recordList" slot="reference" :size="size" :disabled="!row.id" :type="type" icon="el-icon-view"
-                    style="margin-right: 8px;">
+                  <el-button v-if="row.recordList" slot="reference" :size="size" :disabled="!row.id" :type="type"
+                    icon="el-icon-view" style="margin-right: 8px;">
                     查看记录
                   </el-button>
                 </el-popover>
@@ -69,8 +72,8 @@
             </avue-crud>
           </el-tab-pane>
           <el-tab-pane label="订单信息" name="payment_details">
-            <avue-crud :option="optionPaymentDetails" v-model="formContacts" ref="payment_details" :data="form.shipVOList"
-              :key="key" @row-save="rowSave" @row-update="rowUpdate"
+            <avue-crud :option="optionPaymentDetails" v-model="formContacts" ref="payment_details"
+              :data="form.shipVOList" :key="key" @row-save="rowSave" @row-update="rowUpdate"
               @resetColumn="resetColumnTwo('payment_details', 'optionPaymentDetails', 'optionPaymentDetailsBack', 270.2)"
               @saveColumn="saveColumnTwo('payment_details', 'optionPaymentDetails', 'optionPaymentDetailsBack', 270.2)">
             </avue-crud>
@@ -97,12 +100,11 @@
 
 <script>
 
-import { getDetails, tradingBox, submit, warehousingComplete, revokeOutboundCompleted } from "@/api/tirePartsMall/salesManagement/outboundWorkOrder";
+import { getDetails, tradingBox, submit, warehousingComplete, revokeOutboundCompleted, shippingNotice } from "@/api/tirePartsMall/salesManagement/outboundWorkOrder";
 import { dateFormat } from "@/util/date";
 import reportDialog from "@/components/report-dialog/main";
 import { dotList } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
-
-
+import { getParamservice } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
 export default {
   name: "detailsPage",
   data() {
@@ -459,7 +461,8 @@ export default {
           prop: 'operateTime',
           overHidden: true,
         }]
-      }
+      },
+      paymentType: null,
     }
   },
   components: {
@@ -489,6 +492,11 @@ export default {
       this.refresh(this.$route.query.srcId)
     }
     this.$store.commit("DOMIO_IN_DETAIL");
+    getParamservice(1, 10, { paramKey: 'cashier.payment' }).then(res => {
+      if (res.data.data.records.length > 0) {
+        this.paymentType = res.data.data.records[0].paramValue
+      }
+    })
   },
   activated() {
     if (this.detailData.id) {
@@ -497,6 +505,27 @@ export default {
     this.$store.commit("DOMIO_IN_DETAIL");
   },
   methods: {
+    notice() {
+      this.$confirm('是否微信发货通知?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: '加载中',
+          spinner: 'el-icon-loading',
+          background: 'rgba(255,255,255,0.7)'
+        });
+        shippingNotice(this.form).then(res => {
+          this.$message.success("操作成功");
+          this.refresh(res.data.data.id)
+          loading.close();
+        }).finally(() => {
+          loading.close();
+        })
+      })
+    },
     // 撤销出库
     revoke() {
       this.$refs["form"].validate((valid, done) => {
@@ -586,19 +615,19 @@ export default {
     },
     Jump(row) {
       if (this.$store.getters.financingStatus) {
-          this.$alert("融资采购(L)已存在,请关闭融资采购(L)再进行操作", "温馨提示", {
-            confirmButtonText: "确定",
-            type: "warning",
-          });
-        } else {
-          this.$router.$avueRouter.closeTag("/tirePartsMall/purchasingManagement/financingProcurement/index");
-          this.$router.push({
-            path: "/tirePartsMall/purchasingManagement/financingProcurement/index",
-            query: {
-              srcId: row.srcId
-            },
-          });
-        }
+        this.$alert("融资采购(L)已存在,请关闭融资采购(L)再进行操作", "温馨提示", {
+          confirmButtonText: "确定",
+          type: "warning",
+        });
+      } else {
+        this.$router.$avueRouter.closeTag("/tirePartsMall/purchasingManagement/financingProcurement/index");
+        this.$router.push({
+          path: "/tirePartsMall/purchasingManagement/financingProcurement/index",
+          query: {
+            srcId: row.srcId
+          },
+        });
+      }
     },
     //修改提交触发
     editCustomer() {

+ 19 - 11
src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -43,11 +43,13 @@
                     </el-dropdown-menu>
                 </el-dropdown>
                 <el-dropdown style="line-height: 0">
-                    <el-button type="warning" :loading="buttonLoading" :disabled="!form.id || viewDisabled" size="small">
+                    <el-button type="warning" :loading="buttonLoading" :disabled="!form.id || viewDisabled"
+                        size="small">
                         审 批<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item @click.native="examineBtn('审批')" :disabled="isExamineBtn && !detailData.check">审批
+                        <el-dropdown-item @click.native="examineBtn('审批')"
+                            :disabled="isExamineBtn && !detailData.check">审批
                         </el-dropdown-item>
                         <el-dropdown-item @click.native="checkScheduleDialog = true, checkId = form.id">审核进度
                         </el-dropdown-item>
@@ -123,7 +125,8 @@
                                 </el-select>
                                 <span v-else>{{ row.dot }}</span>
                             </template>
-                            <template slot="subTotalMoney" slot-scope="{ row }">{{ row.goodsNum * row.price }}</template>
+                            <template slot="subTotalMoney" slot-scope="{ row }">{{ row.goodsNum * row.price
+                                }}</template>
 
                             <template slot="remarks" slot-scope="{ row }">
                                 <el-input v-if="!mingxibaocun" size="small" v-model="row.remarks"
@@ -222,7 +225,8 @@
             </el-dialog>
             <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
                 :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-                <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
+                <check-schedule :checkId="checkId" :batchNo="batchNo"
+                    @choceScheduleFun="choceScheduleFun"></check-schedule>
             </el-dialog>
         </div>
 
@@ -242,9 +246,9 @@
                 <el-col :span="19">
                     <basic-container>
                         <avue-crud :option="optionTwo" :table-loading="loading" :data="goodsListShow" ref="crud"
-                            :search.sync="SelectSearch" @refresh-change="refreshChange" @selection-change="selectionChange"
-                            @search-change="goodsSearch" :page.sync="page" @on-load="onLoadfun" @resetColumn="resetCrud"
-                            @saveColumn="saveCrud">
+                            :search.sync="SelectSearch" @refresh-change="refreshChange"
+                            @selection-change="selectionChange" @search-change="goodsSearch" :page.sync="page"
+                            @on-load="onLoadfun" @resetColumn="resetCrud" @saveColumn="saveCrud">
                             <template slot="menuLeft">
                                 <el-tabs v-model="activeNameTabs" @tab-click="tabHandle">
                                     <el-tab-pane label="查询结果" name="searchList" />
@@ -260,15 +264,16 @@
                                 <!--本例还使用了default-first-option属性, 在该属性打开的情况下,按下回车就可以选中当前选项列表中的第一个选项,-->
                                 <!--无需使用鼠标或键盘方向键进行定位。-->
                                 <!--allow-create filterable default-first-option-->
-                                <el-select v-model="row.dot" filterable default-first-option @focus="picihaolistfun(row.id)"
-                                    @change="dotchangefun($event, row)">
+                                <el-select v-model="row.dot" filterable default-first-option
+                                    @focus="picihaolistfun(row.id)" @change="dotchangefun($event, row)">
                                     <el-option v-for="(item, index) in picihaolist" :key="index" :label="item.dot"
                                         :value="item.dot"></el-option>
                                 </el-select>
                                 <!--<span v-else>{{ row.dot }}</span>-->
                             </template>
                             <template slot="price" slot-scope="{row}">
-                                <el-input-number v-model="row.price" size="small" :controls="false" style="width: 100%" />
+                                <el-input-number v-model="row.price" size="small" :controls="false"
+                                    style="width: 100%" />
                             </template>
                             <template slot-scope="scope" slot="menu">
                                 <el-button type="text" icon="el-icon-edit" size="small"
@@ -1998,7 +2003,10 @@ export default {
                                                         }).then(() => {
                                                             checkOrderRW({
                                                                 bsType: "XS",
-                                                                ...this.form
+                                                                ...this.form,
+                                                                url: '/tirePartsMall/salesManagement/saleOrder/index',
+                                                                pageStatus: "this.$store.getters.ltxsStatus",
+                                                                pageLabel: "销售订单(L)",
                                                             }).then(res => {
                                                                 this.$set(this.optionForm, 'disabled', true)
                                                                 this.$set(this.optionContactsBack, 'disabled', true)

+ 5 - 4
src/views/tirePartsMall/statisticAnalysis/accountsReceivableStatistics/index.vue

@@ -3,8 +3,8 @@
     <basic-container v-show="!detailsOpen">
       <avue-crud :option="option" :search.sync="search" v-model="form" :table-loading="loading" :data="dataList"
         ref="crud" :key="key" @on-load="onLoad" @search-change="searchChange" @row-del="rowDel"
-        @refresh-change="refreshChange" @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 268)"
-        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 268)" :page.sync="page">
+        @refresh-change="refreshChange" @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 410)"
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 410)" :page.sync="page">
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
         </template>
@@ -66,6 +66,7 @@ export default {
         dialogWidth: "70%",
         summaryText: "合计",
         showSummary: true,
+        emptyBtnText:'清空所有条件',
         sumColumnList: [
           {
             name: 'opening',
@@ -144,7 +145,7 @@ export default {
           prop: 'unpaidAmount',
           overHidden: true,
         }, {
-          label: '业务日期',
+          label: '统计期间',
           prop: "businesDateList",
           // searchProp: "businesDateList",
           type: "monthrange",
@@ -169,7 +170,7 @@ export default {
     }
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(268), this.optionList);
+    this.option = await this.getColumnData(this.getColumnName(410), this.optionList);
     this.key++
     let i = 0;
     this.option.column.forEach(item => {

+ 22 - 9
src/views/tirePartsMall/statisticAnalysis/customAnalysis/index.vue

@@ -26,19 +26,20 @@
                 <el-dialog title="销售订单" :visible.sync="dialogVisible" width="70%" :close-on-click-modal="false"
                     v-dialog-drag append-to-body :before-close="saleClosed">
                     <span>
-                        <avue-crud :data="saleData" :table-loading="saleLoading" :page.sync="salePage" :option="saleOption"
-                            @current-change="saleCurrentChange" @size-change="saleSizeChange"
+                        <avue-crud ref="saleCrud" :data="saleData" :table-loading="saleLoading" :page.sync="salePage"
+                            :option="saleOption" @current-change="saleCurrentChange" @size-change="saleSizeChange"
                             @on-load="saleOnLoad"></avue-crud>
                     </span>
                 </el-dialog>
             </el-tab-pane>
             <el-tab-pane label="图表" name="second">
-                <div v-loading="loading" ref="echartsContainer" style="width: 90vw; height: 56vh;margin-top: 10px;"></div>
+                <div v-loading="loading" ref="echartsContainer" style="width: 90vw; height: 56vh;margin-top: 10px;">
+                </div>
             </el-tab-pane>
         </el-tabs>
     </basic-container>
 </template>
-  
+
 <script>
 import { getList, corpBuySingularSum, corpBuySingularStatistics } from "@/api/tirePartsMall/salesManagement/customAnalysis";
 import { getList as getSaleList } from "@/api/tirePartsMall/salesManagement/saleOrder";
@@ -76,13 +77,21 @@ export default {
             selectionList: [],
             option: {},
             saleOption: {
-                height: '360px',
+                height: '450px',
                 calcHeight: 30,
                 border: true,
                 index: true,
                 addBtn: false,
                 menu: false,
                 header: false,
+                summaryText: '合计',
+                showSummary: true,
+                sumColumnList: [
+                    {
+                        name: 'goodsTotalNum',
+                        type: 'sum',
+                    }
+                ],
                 column: [
                     {
                         label: "客户名称",
@@ -137,6 +146,7 @@ export default {
                 menu: false,
                 searchIcon: true,
                 searchIndex: 3,
+                emptyBtnText: '清空所有条件',
                 column: [
                     {
                         label: "客户名称",
@@ -168,7 +178,7 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "业务日期",
+                        label: "统计期间",
                         prop: "date",
                         search: true,
                         hide: true,
@@ -460,6 +470,10 @@ export default {
             getSaleList(params).then(res => {
                 this.salePage.total = res.data.data.total;
                 this.saleData = res.data.data.records
+                this.$nextTick(() => {
+                    this.$refs.saleCrud.refreshTable()
+                    // this.$refs.saleCrud.dicInit()
+                })
             }).finally(() => {
                 this.saleLoading = false;
             })
@@ -650,7 +664,7 @@ export default {
     }
 };
 </script>
-  
+
 <style scoped>
 ::v-deep#out-table .back-one {
     background: #ecf5ff !important;
@@ -669,5 +683,4 @@ export default {
 ::v-deep.el-form-item {
     margin-bottom: 0;
 }
-</style>
-  
+</style>

+ 1 - 0
src/views/tirePartsMall/statisticAnalysis/customerTransactions/js/optionList.js

@@ -16,6 +16,7 @@ export const option = {
   searchIcon: true,
   menu: false,
   searchIndex: 2,
+  emptyBtnText:'清空所有条件',
   column: [
     {
       label: "名称",

+ 1 - 0
src/views/tirePartsMall/statisticAnalysis/financingGeneral/index.vue

@@ -115,6 +115,7 @@ export default {
         delBtn: false,
         showSummary: true,
         summaryText: '合计',
+        emptyBtnText:'清空所有条件',
         sumColumnList: [
           {
             name: 'totalMoney',

+ 36 - 66
src/views/tirePartsMall/statisticAnalysis/generalLedgerPayable/index.vue

@@ -1,54 +1,28 @@
 <template>
   <div>
     <basic-container class="page-crad" v-show="show">
-      <avue-crud
-        ref="crud"
-        :option="option"
-        :data="dataList"
-        :page.sync="page"
-        :search.sync="search"
-        :cell-style="cellStyle"
-        @search-change="searchChange"
-        @current-change="currentChange"
-        @size-change="sizeChange"
-        @refresh-change="refreshChange"
-        @on-load="onLoad"
-        :table-loading="loading"
-        @saveColumn="saveColumn"
-        @resetColumn="resetColumn"
-        @search-criteria-switch="searchCriteriaSwitch"
-        @search-reset="searchReset"
-      >
-      <template slot="header">
+      <avue-crud ref="crud" :option="option" :data="dataList" :page.sync="page" :search.sync="search"
+        :cell-style="cellStyle" @search-change="searchChange" @current-change="currentChange" @size-change="sizeChange"
+        @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading" @saveColumn="saveColumn"
+        @resetColumn="resetColumn" @search-criteria-switch="searchCriteriaSwitch" @search-reset="searchReset">
+        <template slot="header">
           <el-table :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%"
             v-loading="itemloading">
-            <el-table-column v-for="(item, index) in commodityLabel" :key="index" :prop="item.prop" show-overflow-tooltip
-              :label="item.label" />
+            <el-table-column v-for="(item, index) in commodityLabel" :key="index" :prop="item.prop"
+              show-overflow-tooltip :label="item.label" />
           </el-table>
         </template>
         <template slot="menuLeft">
-          <el-button
-            type="info"
-            icon="el-icon-printer"
-            size="small"
-            :loading="exportLoading"
-            @click.stop="statement"
-            v-if="false"
-          >报表打印
+          <el-button type="info" icon="el-icon-printer" size="small" :loading="exportLoading" @click.stop="statement"
+            v-if="false">报表打印
           </el-button>
           <el-button type="info" size="small" @click="outExport" icon="el-icon-download">导出</el-button>
         </template>
         <template slot="corpNameSearch">
-          <crop-select
-            v-model="search.corpId"
-            corpType="KG"
-          ></crop-select>
+          <crop-select v-model="search.corpId" corpType="KG"></crop-select>
         </template>
         <template slot="sizeSearch">
-          <el-select
-            v-model="search.size"
-            placeholder="请选择"
-          >
+          <el-select v-model="search.size" placeholder="请选择">
             <el-option label="是" :value="1"></el-option>
             <el-option label="否" :value="0"></el-option>
           </el-select>
@@ -57,22 +31,14 @@
           <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>
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{
+            scope.row.customerName }}</span>
         </template>
       </avue-crud>
     </basic-container>
-    <report-dialog
-      :switchDialog="switchDialog"
-      :searchValue="statementData"
-      :reportName="'经销商-可用库存表'"
-      @onClose="onClose()"
-    />
-    <detail
-      v-if="!show"
-      :detail-data="detailData"
-      :trade-type="tradeType"
-      @goBack="goBack"
-    ></detail>
+    <report-dialog :switchDialog="switchDialog" :searchValue="statementData" :reportName="'经销商-可用库存表'"
+      @onClose="onClose()" />
+    <detail v-if="!show" :detail-data="detailData" :trade-type="tradeType" @goBack="goBack"></detail>
   </div>
 </template>
 
@@ -85,7 +51,7 @@ import _ from "lodash";
 import reportDialog from "@/components/report-dialog/main";
 import { gainUser } from "@/api/basicData/customerInquiry";
 import detail from "./detail";
-import {dateFormat} from "@/util/date";
+import { dateFormat } from "@/util/date";
 export default {
   name: "index",
   components: {
@@ -111,13 +77,13 @@ export default {
         }
       ],
       commodityData: [], // 合计数据
-      exportLoading:false,
-      switchDialog:false,
+      exportLoading: false,
+      switchDialog: false,
       statementData: {},
       form: {},
       search: {
-        whetherSettlement:0,
-        businesDateList:[dateFormat(new Date,'yyyy-MM'),dateFormat(new Date,'yyyy-MM')]
+        whetherSettlement: 0,
+        businesDateList: [dateFormat(new Date, 'yyyy-MM'), dateFormat(new Date, 'yyyy-MM')]
       },
       dataList: [],
       loading: false,
@@ -143,6 +109,7 @@ export default {
         delBtn: false,
         showSummary: true,
         summaryText: '合计',
+        emptyBtnText: '清空所有条件',
         sumColumnList: [
           {
             name: 'totalMoney',
@@ -183,7 +150,7 @@ export default {
             overHidden: true,
           },
           {
-            label: "业务日期",
+            label: "统计期间",
             prop: "businesDateList",
             search: true,
             type: 'monthrange',
@@ -249,7 +216,7 @@ export default {
     gainUser().then(res => {
       this.userList = res.data.data;
     });
-    this.search=this.deepClone(this.search)
+    this.search = this.deepClone(this.search)
     // let i = 0;
     // this.option.column.forEach(item => {
     //   if (item.search) i++
@@ -291,7 +258,7 @@ export default {
       this.page.pageSize = val;
     },
     onLoad(page, params) {
-      this.search=this.deepClone(this.search)
+      this.search = this.deepClone(this.search)
       this.search.customerId = this.search.customerName
       this.sysitemType = localStorage.getItem('sysitemType');
       if (this.sysitemType == 999) {
@@ -339,8 +306,8 @@ export default {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           this.itemloading = true,
-            statisticsSum({type:1,...queryParams}).then(res => {
-              this.commodityData= [res.data.data]
+            statisticsSum({ type: 1, ...queryParams }).then(res => {
+              this.commodityData = [res.data.data]
             }).finally(() => {
               this.itemloading = false;
             });
@@ -370,10 +337,10 @@ export default {
       }
     },
     statement() {
-      this.statementData = {...this.search};
+      this.statementData = { ...this.search };
       if (this.statementData.accDate && this.statementData.accDate.length > 0) {
-        this.statementData.accDateStart = this.statementData.accDate[0]+ " " + "00:00:00"
-        this.statementData.accDateEnd = this.statementData.accDate[1]+ " " + "23:59:59"
+        this.statementData.accDateStart = this.statementData.accDate[0] + " " + "00:00:00"
+        this.statementData.accDateEnd = this.statementData.accDate[1] + " " + "23:59:59"
         delete this.statementData.accDate
       }
       this.switchDialog = !this.switchDialog;
@@ -417,7 +384,7 @@ export default {
       this.show = false;
     },
     goBack() {
-      this.detailData=this.$options.data().detailData
+      this.detailData = this.$options.data().detailData
       if (JSON.stringify(this.$route.query) != "{}") {
         this.$router.$avueRouter.closeTag();
         this.$router.push({
@@ -453,8 +420,8 @@ export default {
         window.open(
           `/api/blade-sales-part/order/statistics-export?${this.website.tokenHeader
           }=${getToken()}&type=1&businesDateList[0]=${this.search.businesDateList[0] == null || this.search.businesDateList[0] === undefined ? '' : this.search.businesDateList[0]
-          }&businesDateList[1]=${this.search.businesDateList[1] == null || this.search.businesDateList[1] === undefined  ? '' : this.search.businesDateList[1]
-          }&customerId=${this.search.customerName == null || this.search.customerName === undefined  ? '' : this.search.customerName}`
+          }&businesDateList[1]=${this.search.businesDateList[1] == null || this.search.businesDateList[1] === undefined ? '' : this.search.businesDateList[1]
+          }&customerId=${this.search.customerName == null || this.search.customerName === undefined ? '' : this.search.customerName}`
         );
       }).catch(() => {
         this.$message({
@@ -471,12 +438,15 @@ export default {
 .page-crad ::v-deep .basic-container__card {
   height: 94.2vh;
 }
+
 ::v-deep .el-table__expanded-cell[class*="cell"] {
   padding: 0px;
 }
+
 .itemTable ::v-deep .el-table {
   width: 100%;
 }
+
 /deep/ .el-col-md-8 {
   width: 24.33333%;
 }

+ 6 - 5
src/views/tirePartsMall/statisticAnalysis/generalLedgerReceivable/index.vue

@@ -8,8 +8,8 @@
         <template slot="header">
           <el-table :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%"
             v-loading="itemloading">
-            <el-table-column v-for="(item, index) in commodityLabel" :key="index" :prop="item.prop" show-overflow-tooltip
-              :label="item.label" />
+            <el-table-column v-for="(item, index) in commodityLabel" :key="index" :prop="item.prop"
+              show-overflow-tooltip :label="item.label" />
           </el-table>
         </template>
         <template slot="menuLeft">
@@ -87,7 +87,7 @@ export default {
       form: {},
       search: {
         whetherSettlement: 0,
-        businesDateList:[dateFormat(new Date,'yyyy-MM'),dateFormat(new Date,'yyyy-MM')]
+        businesDateList: [dateFormat(new Date, 'yyyy-MM'), dateFormat(new Date, 'yyyy-MM')]
       },
       dataList: [],
       loading: false,
@@ -112,6 +112,7 @@ export default {
         delBtn: false,
         showSummary: true,
         summaryText: '合计',
+        emptyBtnText: '清空所有条件',
         sumColumnList: [
           {
             name: 'totalMoney',
@@ -176,7 +177,7 @@ export default {
             overHidden: true,
           },
           {
-            label: "业务日期",
+            label: "统计期间",
             prop: "businesDateList",
             search: true,
             type: 'monthrange',
@@ -252,7 +253,7 @@ export default {
     gainUser().then(res => {
       this.userList = res.data.data;
     });
-    this.search=this.deepClone(this.search)
+    this.search = this.deepClone(this.search)
   },
   methods: {
     cellStyle() {

+ 2 - 1
src/views/tirePartsMall/statisticAnalysis/profitLedger/index.vue

@@ -114,6 +114,7 @@ export default {
         delBtn: false,
         showSummary: true,
         summaryText: '合计',
+        emptyBtnText:'清空所有条件',
         sumColumnList: [
           {
             name: 'totalMoney',
@@ -177,7 +178,7 @@ export default {
             overHidden: true,
           },
           {
-            label: "业务日期",
+            label: "统计期间",
             prop: "businesDateList",
             search: true,
             type: 'monthrange',

+ 1 - 0
src/views/tirePartsMall/statisticAnalysis/supplierTransactions/js/optionList.js

@@ -16,6 +16,7 @@ export const option = {
   searchIcon: true,
   menu:false,
   searchIndex: 2,
+  emptyBtnText:'清空所有条件',
   column: [
     {
       label: "名称",