Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/api/financialManagement/paymentRequest.js

@@ -91,8 +91,8 @@ export const paymentCheck = (data) => {
 //账单明细列表
 export function getBillList(current,size,params) {
   return request({
-    // url: '/api/trade-finance/acc/list',
-    url: '/api/trade-finance/acc/billList',
+    url: '/api/trade-finance/acc/list',
+    // url: '/api/trade-finance/acc/billList',
     method: 'get',
     params: {
       ...params,

src/views/basicData/container/archives.vue

@@ -0,0 +1,142 @@
+<template>
+  <basic-container>
+    <avue-crud
+        :option="option"
+        :search.sync="search"
+        v-model="form"
+        :data="dataList"
+        ref="crud"
+        :page.sync="page">
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+export default {
+  name: "archives",
+  data() {
+    return {
+      search: {},
+      form: {},
+      dataList: [],
+      page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+      },
+      option: {
+        index:true,
+        span:8,
+        searchMenuPosition: "right",
+        searchSpan: 8,
+        searchIcon: true,
+        searchIndex: 2,
+        highlightCurrentRow: true,
+        dialogWidth:"70%",
+        column: [{
+          label: '合同号',
+          prop: 'name',
+          search: true,
+        },{
+          label: '箱号',
+          prop: 'name',
+          search: true,
+        },{
+          label: '箱类型',
+          prop: 'name',
+          search: true,
+        },{
+          label: '最新地点',
+          prop: 'name',
+          search: true,
+        },{
+          label: '最新日期',
+          prop: 'name',
+          search: true,
+        },{
+          label: '租赁公司',
+          prop: 'name',
+          search: true,
+        },{
+          label: '箱来源',
+          prop: 'name',
+          search: true,
+        },{
+          label: '箱状态',
+          prop: 'name',
+          search: true,
+        },{
+          label: '租赁方式',
+          prop: 'name'
+        },{
+          label: '空重',
+          prop: 'name'
+        },{
+          label: '毛重',
+          prop: 'name'
+        },{
+          label: '皮重',
+          prop: 'name'
+        },{
+          label: '装载重量',
+          prop: 'name'
+        },{
+          label: '容积',
+          prop: 'name'
+        },{
+          label: '状态',
+          prop: 'name'
+        },{
+          label: '造箱公司',
+          prop: 'name',
+          search: true,
+        },{
+          label: '造箱日期',
+          prop: 'name',
+          search: true,
+        },{
+          label: '起租日期',
+          prop: 'name',
+          search: true,
+        },{
+          label: '购入日期',
+          prop: 'name'
+        },{
+          label: '箱龄',
+          prop: 'name'
+        }, {
+          label: '照片',
+          prop: 'imgUrl4',
+          type: 'upload',
+          span: 24,
+          listType: 'picture-card',
+          tip: '只能上传jpg/png文件，且不超过500kb',
+          propsHttp: {
+            url:'url',
+            name:'name',
+            res: 'data'
+          },
+          action: 'https://api.avuejs.com/imgupload'
+        }]
+      }
+    }
+  },
+  created() {
+    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: {}
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/bidingDocument/issueTender/detailsPageEdit.vue

@@ -966,6 +966,7 @@ export default {
     // 请核
     pleaseCheck(){
       this.$refs['form'].validate((valid, done) => {
+        done()
         if (valid){
           this.$confirm('是否确认请核?', '提示', {
             confirmButtonText: '确定',

src/views/businessManagement/deliveryNotice/configuration/mainList.json

@@ -71,12 +71,25 @@
       "width": 100,
       "pickerOptions": {},
       "overHidden": true
+    },{
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "label": "到货时间",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "prop": "arrivalTime",
+      "search": true,
+      "index": 5,
+      "width": 100,
+      "pickerOptions": {},
+      "overHidden": true
     },
     {
       "label": "仓库",
       "prop": "storageId",
       "search": true,
-      "index": 5,
+      "index": 6,
       "width": 100,
       "overHidden": true
     },
@@ -84,7 +97,7 @@
       "label": "出库数量",
       "prop": "totalQuantity",
       "search": false,
-      "index": 6,
+      "index": 7,
       "width": 100,
       "overHidden": true
     },
@@ -92,7 +105,7 @@
       "label": "出库金额",
       "prop": "deliveryAmount",
       "search": false,
-      "index": 7,
+      "index": 8,
       "width": 100,
       "overHidden": true
     },
@@ -100,7 +113,7 @@
       "label": "收货地址",
       "prop": "arrivalAddress",
       "search": true,
-      "index": 8,
+      "index": 9,
       "width": 100,
       "overHidden": true
     },
@@ -108,7 +121,7 @@
       "label": "收货人",
       "prop": "arrivalContact",
       "search": true,
-      "index": 9,
+      "index": 10,
       "width": 100,
       "overHidden": true
     },
@@ -116,7 +129,7 @@
       "label": "收货电话",
       "prop": "arrivalTel",
       "search": true,
-      "index": 10,
+      "index": 11,
       "width": 100,
       "overHidden": true
     },
@@ -130,7 +143,7 @@
       "label": "制单人",
       "prop": "createUser",
       "search": true,
-      "index": 11,
+      "index": 12,
       "width": 100,
       "overHidden": true
     },
@@ -141,7 +154,7 @@
       "searchRange": true,
       "prop": "createTime",
       "search": true,
-      "index": 12,
+      "index": 13,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -152,7 +165,7 @@
       "label": "系统编号",
       "prop": "sysNo",
       "search": false,
-      "index": 13,
+      "index": 14,
       "width": 100,
       "overHidden": true
     },
@@ -160,7 +173,7 @@
       "label": "匹配订单号",
       "prop": "srcOrderNo",
       "search": false,
-      "index": 14,
+      "index": 15,
       "width": 100,
       "overHidden": true
     },
@@ -168,7 +181,7 @@
       "label": "更改人",
       "prop": "updateUserName",
       "search": false,
-      "index": 15,
+      "index": 16,
       "width": 100,
       "overHidden": true
     },
@@ -176,7 +189,7 @@
       "label": "更改时间",
       "prop": "updateTime",
       "search": false,
-      "index": 16,
+      "index": 17,
       "width": 100,
       "overHidden": true
     },{
@@ -198,7 +211,7 @@
           "value": "已到货"
         }
       ],
-      "index": 16,
+      "index": 18,
       "width": 100,
       "overHidden": true
     }

src/views/businessManagement/deliveryNotice/index.vue

@@ -11,6 +11,7 @@
           <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制单据</el-button>
           <el-button type="info" :size="size" icon="el-icon-printer" :loading="exportLoading" @click.stop="statement">
             报表打印</el-button>
+          <el-button type="warning" size="small" icon="el-icon-top" @click.stop="openExport()">导出</el-button>
         </template>
         <template slot-scope="scope" slot="orgOrderNo">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{
@@ -69,6 +70,7 @@ import detailPage from "./detailsPageEdit";
 import { defaultDate } from "@/util/date";
 import reportDialog from "@/components/report-dialog/main";
 import { gainUser } from "@/api/basicData/customerInquiry";
+import {getToken} from "@/util/auth";
 
 export default {
   name: "customerInformation",
@@ -307,6 +309,7 @@ export default {
       if (params.businessDate) {
         params.businessStartDate = params.businessDate[0] + " " + "00:00:00"
         params.businessEndDate = params.businessDate[1] + " " + "23:59:59"
+        this.$delete(params, 'businessDate')
       }
       if (params.createTime) {
         params.createStartTime = params.createTime[0] + " " + "00:00:00"
@@ -397,6 +400,11 @@ export default {
         params.createEndTime = params.createTime[1] + " " + "23:59:59"
         this.$delete(params, 'createTime')
       }
+      if (params.arrivalTime && params.arrivalTime != '') {
+        params.arrivalStartTime = params.arrivalTime[0] + " " + "00:00:00"
+        params.arrivalEndTime = params.arrivalTime[1] + " " + "23:59:59"
+        this.$delete(params, 'arrivalTime')
+      }
       return params
     },
     //列保存触发
@@ -454,6 +462,31 @@ export default {
       this.$delete(this.statementData, 'businessDate')
       this.switchDialog = !this.switchDialog;
     },
+    openExport(){
+      let params = Object.assign({}, this.search)
+      if (params.businessDate && params.businessDate != '') {
+        params.businessStartDate = params.businessDate[0] + " " + "00:00:00"
+        params.businessEndDate = params.businessDate[1] + " " + "23:59:59"
+        this.$delete(params, 'businessDate')
+      }
+      if (params.createTime && params.createTime != '') {
+        params.createStartTime = params.createTime[0] + " " + "00:00:00"
+        params.createEndTime = params.createTime[1] + " " + "23:59:59"
+        this.$delete(params, 'createTime')
+      }
+      if (params.arrivalTime && params.arrivalTime != '') {
+        params.arrivalStartTime = params.arrivalTime[0] + " " + "00:00:00"
+        params.arrivalEndTime = params.arrivalTime[1] + " " + "23:59:59"
+        this.$delete(params, 'arrivalTime')
+      }
+      const routeData = this.$router.resolve({
+        path: '/api/blade-deliver-goods/delivery/saleDeliveryExport',      //跳转目标窗口的地址
+        query: {
+          ...params    //括号内是要传递给新窗口的参数
+        }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+    },
     onClose(val) {
       this.switchDialog = val;
     },

src/views/businessManagement/receipt/configuration/mainList.json

@@ -69,7 +69,7 @@
       "type": "date",
       "unlinkPanels": true,
       "searchRange": true,
-      "label": "入库日期",
+      "label": "发货时间",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
       "prop": "businessDate",

src/views/businessManagement/receipt/index.vue

@@ -11,8 +11,7 @@
         <template slot="menuLeft" slot-scope="{size}">
           <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制单据</el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报表打印</el-button>
-          <el-button type="warning" size="small" icon="el-icon-top" @click.stop="openExport()">导出
-          </el-button>
+          <el-button type="warning" size="small" icon="el-icon-top" @click.stop="openExport()">导出</el-button>
         </template>
         <template slot-scope="scope" slot="orgOrderNo">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{
@@ -329,11 +328,11 @@ export default {
     },
     //点击搜索按钮触发
     searchChange(params, done) {
-      if (params.businessDate) {
-        this.$set(params, 'businessStartDate', params.businessDate[0] + " " + "00:00:00")
-        this.$set(params, 'businessEndDate', params.businessDate[1] + " " + "23:59:59")
-        this.$delete(params, 'businessDate')
-      }
+      // if (params.businessDate) {
+      //   this.$set(params, 'businessStartDate', params.businessDate[0] + " " + "00:00:00")
+      //   this.$set(params, 'businessEndDate', params.businessDate[1] + " " + "23:59:59")
+      //   this.$delete(params, 'businessDate')
+      // }
       if (params.createTime) {
         this.$set(params, 'createStartTime', params.createTime[0] + " " + "00:00:00")
         this.$set(params, 'createEndTime', params.createTime[1] + " " + "23:59:59")
@@ -362,19 +361,23 @@ export default {
     },
     openExport() {
       let queryParams = this.search
-      console.log(queryParams)
       if (queryParams.createTime) {
         queryParams.createStartTime = queryParams.createTime[0]
         queryParams.createEndTime = queryParams.createTime[1]
         delete queryParams.createTime
       }
+      if (queryParams.businessDate) {
+        this.$set(queryParams, 'businessStartDate', queryParams.businessDate[0] + " " + "00:00:00")
+        this.$set(queryParams, 'businessEndDate', queryParams.businessDate[1] + " " + "23:59:59")
+        this.$delete(queryParams, 'businessDate')
+      }
       const routeData = this.$router.resolve({
         path: '/api/blade-deliver-goods/reCeVing/exportOutFactoryDelivery',      //跳转目标窗口的地址
         query: {
           ...queryParams    //括号内是要传递给新窗口的参数
         }
       })
-      window.open(routeData.href.slice(1, routeData.href.length - 1) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
     },
     onLoad(page, params) {
       let data = this.gobackSearch(params)

src/views/businessManagement/salesOrder/configuration/mainList.json

@@ -255,9 +255,25 @@
       "prop": "receiptTime",
       "index": 22,
       "width": 100,
+      "unlinkPanels": true,
+      "searchRange": true,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
+      "search": true,
       "overHidden": true
+    },{
+      "label": "确认到货时间",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "prop": "arrivalTime",
+      "search": true,
+      "index": 22,
+      "width": 100,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "overHidden": true,
+      "pickerOptions": {}
     },
     {
       "type": "select",

src/views/businessManagement/salesOrder/index.vue

@@ -459,7 +459,7 @@ export default {
         this.$refs.crud.toggleRowExpansion(item, false);
       });
       let data = this.gobackSearch(params);
-
+      console.log(data)
       let queryParams = Object.assign({}, data, {
         size: page.pageSize,
         current: page.currentPage,
@@ -509,6 +509,16 @@ export default {
         params.orderEndDate = params.businesDate[1] + " " + "23:59:59";
         this.$delete(params, "businesDate");
       }
+      if (params.receiptTime) {
+        params.receiptTimeStart = params.receiptTime[0] + " " + "00:00:00";
+        params.receiptTimeEnd = params.receiptTime[1] + " " + "23:59:59";
+        this.$delete(params, "receiptTime");
+      }
+      if (params.arrivalTime) {
+        params.arrivalTimeStart = params.arrivalTime[0] + " " + "00:00:00";
+        params.arrivalTimeEnd = params.arrivalTime[1] + " " + "23:59:59";
+        this.$delete(params, "arrivalTime");
+      }
       if (params.requiredDeliveryDate && params.requiredDeliveryDate != "") {
         params.deliveryStartDate =
           params.requiredDeliveryDate[0] + " " + "00:00:00";

src/views/financialManagement/paymentSettle/configuration/mainList.json

@@ -87,25 +87,36 @@
       "overHidden": true,
       "width": 120,
       "index": 5
-    },
-    {
+    },{
       "label": "结算日期",
       "prop": "settlementDate",
       "overHidden": true,
       "type": "date",
       "search": true,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
       "unlinkPanels": true,
       "searchRange": true,
       "width": 150,
       "index": 6
-    },
-
-    {
+    },{
+      "label": "完成时间",
+      "prop": "completionTime",
+      "overHidden": true,
+      "type": "date",
+      "search": true,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "width": 150,
+      "index": 7
+    },{
       "label": "银行名称",
       "prop": "accountBank",
       "overHidden": true,
       "width": 150,
-      "index": 7
+      "index": 8
     },
     {
       "label": "银行户头",
@@ -113,20 +124,20 @@
       "search": true,
       "overHidden": true,
       "width": 150,
-      "index": 8
+      "index": 9
     },
     {
       "label": "银行卡号",
       "prop": "accountNo",
       "overHidden": true,
       "width": 150,
-      "index": 9
+      "index": 10
     },
     {
       "label": "创建人",
       "prop": "createUserName",
       "overHidden": true,
-      "index": 10,
+      "index": 11,
       "width":100
     },
     {
@@ -135,14 +146,14 @@
       "type": "date",
       "format": "yyyy-MM-dd HH:mm:ss",
       "overHidden": true,
-      "index": 11,
+      "index": 12,
       "width":160
     },
     {
       "label": "修改人",
       "prop": "updateUserName",
       "overHidden": true,
-      "index": 12,
+      "index": 13,
       "width":100
     },
     {
@@ -151,7 +162,7 @@
       "type": "date",
       "format": "yyyy-MM-dd HH:mm:ss",
       "overHidden": true,
-      "index": 13,
+      "index": 14,
       "width":160
     },
     {
@@ -159,7 +170,7 @@
       "prop": "remark",
       "search": true,
       "overHidden": true,
-      "index": 14,
+      "index": 15,
       "width": 120
     }
   ]

src/views/financialManagement/paymentSettle/paymentSettle.vue

@@ -30,11 +30,7 @@
                    icon="el-icon-plus"
                    @click="addReceipt">创建单据
         </el-button>
-        <el-button size="small"
-                   type="info"
-                   @click.stop="openReport()"
-        >报表打印
-        </el-button>
+        <el-button type="warning" size="small" icon="el-icon-top" @click.stop="openExport()">导出</el-button>
       </template>
       <template slot-scope="scope" slot="menu">
         <el-button
@@ -65,6 +61,7 @@
   import option from "./configuration/mainList.json";
   import {getList ,remove} from "@/api/financialManagement/financialManagement"
   import detailPage from "./paymentSettleDetailsPage";
+  import {getToken} from "@/util/auth";
 
   export default {
     data() {
@@ -114,6 +111,15 @@
     },
     async created() {
       this.option = await this.getColumnData(this.getColumnName(63), option);
+      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";
+      }
     },
     mounted() {
       // this.option.height = window.innerHeight - 200;
@@ -199,6 +205,11 @@
           params.settlementEndDate = params.settlementDate[1] + " " + "23:59:59";
           this.$delete(params,'settlementDate')
         }
+        if (params.completionTime &&  params.completionTime.length !==0 ) {
+          params.completionTimeStart = params.completionTime[0]+ " " + "00:00:00";
+          params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
+          this.$delete(params,'completionTime')
+        }
         return params
       },
       onLoad(page, params) {
@@ -258,6 +269,29 @@
           this.$refs.crud.$refs.dialogColumn.columnBox = false;
         }
       },
+      openExport() {
+        let params = JSON.parse(JSON.stringify(this.search))
+        if (params.settlementDate &&  params.settlementDate.length !==0 ) {  //合同
+          params.settlementStartDate = params.settlementDate[0]+ " " + "00:00:00";
+          params.settlementEndDate = params.settlementDate[1] + " " + "23:59:59";
+          this.$delete(params,'settlementDate')
+        }
+        if (params.completionTime &&  params.completionTime.length !==0 ) {
+          params.completionTimeStart = params.completionTime[0]+ " " + "00:00:00";
+          params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
+          this.$delete(params,'completionTime')
+        }
+        params.billType = "付费"
+        params.settlementType = 1
+        console.log(params)
+        const routeData = this.$router.resolve({
+          path: '/api/trade-finance/settlement/expenseExport',      //跳转目标窗口的地址
+          query: {
+            ...params    //括号内是要传递给新窗口的参数
+          }
+        })
+        window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+      },
     }
   }
 </script>

src/views/financialManagement/receiptSettle/configuration/mainList.json

@@ -98,14 +98,24 @@
       "searchRange": true,
       "width": 150,
       "index": 6
-    },
-
-    {
+    },{
+      "label": "完成时间",
+      "prop": "completionTime",
+      "overHidden": true,
+      "type": "date",
+      "search": true,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "width": 150,
+      "index": 7
+    },{
       "label": "银行名称",
       "prop": "accountBank",
       "overHidden": true,
       "width": 150,
-      "index": 7
+      "index": 8
     },
     {
       "label": "银行户头",
@@ -113,20 +123,20 @@
       "search": true,
       "overHidden": true,
       "width": 150,
-      "index": 8
+      "index": 9
     },
     {
       "label": "银行卡号",
       "prop": "accountNo",
       "overHidden": true,
       "width": 150,
-      "index": 9
+      "index": 10
     },
     {
       "label": "创建人",
       "prop": "createUserName",
       "overHidden": true,
-      "index": 10,
+      "index": 11,
       "width":100
     },
     {
@@ -135,14 +145,14 @@
       "type": "date",
       "format": "yyyy-MM-dd HH:mm:ss",
       "overHidden": true,
-      "index": 11,
+      "index": 12,
       "width":160
     },
     {
       "label": "修改人",
       "prop": "updateUserName",
       "overHidden": true,
-      "index": 12,
+      "index": 13,
       "width":100
     },
     {
@@ -151,7 +161,7 @@
       "type": "date",
       "format": "yyyy-MM-dd HH:mm:ss",
       "overHidden": true,
-      "index": 13,
+      "index": 14,
       "width":160
     },
     {
@@ -159,7 +169,7 @@
       "prop": "remark",
       "search": true,
       "overHidden": true,
-      "index": 14,
+      "index": 15,
       "width": 120
     }
   ]

src/views/financialManagement/receiptSettle/receiptSettle.vue

@@ -30,11 +30,7 @@
                    icon="el-icon-plus"
                    @click="addReceipt">创建单据
         </el-button>
-        <el-button size="small"
-                   type="info"
-                   @click.stop="openReport()"
-        >导出报表
-        </el-button>
+        <el-button type="warning" size="small" icon="el-icon-top" @click.stop="openExport()">导出</el-button>
       </template>
       <template slot-scope="scope" slot="menu">
         <el-button
@@ -65,6 +61,7 @@
   import option from "./configuration/mainList.json";
   import {getList ,remove} from "@/api/financialManagement/financialManagement"
   import detailPage from "./receiptSettleDetailsPage.vue";
+  import {getToken} from "@/util/auth";
 
   export default {
     data() {
@@ -102,6 +99,15 @@
     },
     async created() {
       this.option = await this.getColumnData(this.getColumnName(64), option);
+      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";
+      }
     },
     mounted() {
       // this.option.height = window.innerHeight - 200;
@@ -192,6 +198,12 @@
           params.settlementEndDate = params.settlementDate[1] + " " + "23:59:59";
           this.$delete(params,'settlementDate')
         }
+
+        if (params.completionTime &&  params.completionTime.length !==0 ) {
+          params.completionTimeStart = params.completionTime[0]+ " " + "00:00:00";
+          params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
+          this.$delete(params,'completionTime')
+        }
         return params
       },
       onLoad(page, params) {
@@ -242,6 +254,28 @@
           this.$refs.crud.$refs.dialogColumn.columnBox = false;
         }
       },
+      openExport() {
+        let params = JSON.parse(JSON.stringify(this.search))
+        if (params.settlementDate &&  params.settlementDate.length !==0 ) {  //合同
+          params.settlementStartDate = params.settlementDate[0]+ " " + "00:00:00";
+          params.settlementEndDate = params.settlementDate[1] + " " + "23:59:59";
+          this.$delete(params,'settlementDate')
+        }
+        if (params.completionTime &&  params.completionTime.length !==0 ) {
+          params.completionTimeStart = params.completionTime[0]+ " " + "00:00:00";
+          params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
+          this.$delete(params,'completionTime')
+        }
+        params.billType = "收费"
+        params.settlementType = 1
+        const routeData = this.$router.resolve({
+          path: '/api/trade-finance/settlement/expenseExport',      //跳转目标窗口的地址
+          query: {
+            ...params    //括号内是要传递给新窗口的参数
+          }
+        })
+        window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+      },
     }
   }
 </script>

src/views/reimbursement/config/mainList.json

@@ -30,6 +30,13 @@
       "search": true
     },
     {
+      "label": "所属公司",
+      "prop": "belongToCorpName",
+      "overHidden": true,
+      "minWidth": 120,
+      "search": true
+    },
+    {
       "label": "报销人",
       "prop": "userName",
       "overHidden": true,
@@ -65,6 +72,19 @@
       "search": false
     },
     {
+      "label": "状态",
+      "width": 100,
+      "type": "select",
+      "overHidden": true,
+      "search": true,
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=claim_status",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dataType": "string",
+      "prop": "status"
+    },{
       "label": "备注",
       "prop": "remarks",
       "overHidden": true,

src/views/reimbursement/index.vue

@@ -9,6 +9,7 @@
         :page.sync="page"
         :search.sync="search"
         :table-loading="loading"
+        :key="key"
         :cell-style="cellStyle"
         @selection-change="selectionChange"
         @search-change="searchChange"
@@ -67,6 +68,9 @@
             ></el-option>
           </el-select>
         </template>
+        <template slot="belongToCorpNameSearch">
+          <crop-select v-model="search.belongToCorpId" :refresh="false" corpType="GS" style="width: 100%" ref="KHSelect"></crop-select>
+        </template>
         <template slot-scope="scope" slot="userName">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.userName }}</span>
         </template>
@@ -106,6 +110,7 @@ export default {
         total: 0,
         pageSizes: [10, 50, 100, 200, 300, 400, 500]
       },
+      key:0,
       search: {},
       show: true,
       loading: false,
@@ -119,6 +124,7 @@ export default {
     gainUser().then(res => {
       this.userOption = res.data.data;
     })
+    this.key++
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++