修改导出问题 和 发票检索弹窗方式

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -483,6 +483,22 @@
                         </span>
                     </div>
                 </template>
+                <template slot="checkCrStatusDescr" slot-scope="{ row }">
+                    <div>
+                        <span v-if="row.checkCrStatusDescr == '未申请'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
+                            未申请
+                        </span>
+                        <span v-if="row.checkCrStatusDescr == '部分申请'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
+                            部分申请
+                        </span>
+                        <span v-if="row.checkCrStatusDescr == '全部申请'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
+                            全部申请
+                        </span>
+                    </div>
+                </template>
             </avue-crud>
         </basic-container>
 
@@ -1167,6 +1183,12 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "付费申请状态",
+                        prop: "checkCrStatusDescr",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
                         label: "应收对账状态",
                         prop: "checkDrStatusDescr",
                         width: "160",

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -372,7 +372,8 @@
                                             :disabled="statusType || (tableData.length > 0 && appendType == '检索')" plain
                                             @click="finstlbillslistAccBillV1fun(appendType)">提取费用
                                         </el-button>
-                                        <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
+                                        <el-button size="small" :disabled="tableData.length > 0"
+                                            @click="ResetFilter">重置条件
                                         </el-button>
                                     </el-col>
                                     <el-col :span="24">
@@ -479,7 +480,18 @@
                 <el-button size="small" @click="selectPrintingDialog = false;">取 消</el-button>
             </span>
         </el-dialog>
-
+        <el-dialog title="选择数据"  :visible.sync="retrievePopupsType" append-to-body width="70%"
+            :close-on-click-modal="false">
+            <div>
+                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
+                    id="out-table">
+                    <template slot="menu" slot-scope="{ row }">
+                        <el-button type="text" size="small" @click.stop="retrievePopupsSelect(row)">选择
+                        </el-button>
+                    </template>
+                </avue-crud>
+            </div>
+        </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>
@@ -515,11 +527,40 @@ import { getList as getreportsList, reportsGetReportData } from "@/api/iosBasicD
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
 import dicSelect from "@/components/dicSelect/main";
-
+import { finstlbillslistAccBillByCorp } from '@/api/iosBasicData/finstlbills'
 export default {
     components: { checkSchedule, reportContainer, reportformsList, reports, SearchQuery, fininvoicesitems, fininvoiceitemdetail, dicSelect },
     data() {
         return {
+            retrievePopupsType: false, // 弹窗开启关闭
+            retrievePopupsData: [], // 选择弹窗数据
+            retrievePopupsOption: {
+                border: true,
+                calcHeight: 30,
+                tip: false,
+                height: '500px',
+                index: true,
+                addBtn: false,
+                viewBtn: false,
+                delBtn: false,
+                editBtn: false,
+                refreshBtn: false,
+                columnBtn: false,
+                menuWidth: '60',
+                header:false,
+                column: [
+                    {
+                        label: "客户中文名",
+                        prop: "cnName",
+                        overHidden: true,
+                    },
+                    {
+                        label: "客户英文文名",
+                        prop: "cnName",
+                        overHidden: true,
+                    },
+                ]
+            },
             checkId: '', // 审核需要的id
             batchNo: '',
             checkScheduleDialog: false,
@@ -639,6 +680,13 @@ export default {
                 isExchangeToCny: 0,
                 billDate: getCurrentDate(),
             }
+            getRateList({ current: 1, size: 30 }).then(res => {
+                for (let item of res.data.data.records) {
+                    if (item.code == "USD") {
+                        this.$set(this.form, 'exrate', item.exrate)
+                    }
+                }
+            })
         },
         //请核关闭
         choceScheduleFun() {
@@ -1110,12 +1158,67 @@ export default {
                 }
             })
         },
+        retrievePopupsSelect(row) {
+            this.$set(this.form, 'corpId', row.id)
+            this.$set(this.form, 'corpCnName', row.cnName)
+            this.$set(this.form, 'corpEnName', row.enName)
+            bcorpsbankList(1, 10, { pid: row.id }).then(res => {
+                if (res.data.data.records.length != 0) {
+                    this.$set(this.form, 'bankReceiptAccountNo', res.data.data.records[0].accountNo)
+                    this.$set(this.form, 'bankReceiptBankName', res.data.data.records[0].accountBank)
+                }
+            })
+            // 带出开票单位数据
+            corpsinvoiceheaderList(1, 20, { pid: row.id }).then(res => {
+                if (res.data.data.records.length != 0) {
+                    this.$set(this.form, 'invCorpId', res.data.data.records[0].id)
+                    this.$set(this.form, 'invCorpCnName', res.data.data.records[0].invoiceHeader)
+                    this.$set(this.form, 'invCorpTaxNo', res.data.data.records[0].uscc) // 税号
+                    this.$set(this.form, 'invCorpAccountBankUsd', res.data.data.records[0].accountBankUsd) // 美元银行
+                    this.$set(this.form, 'invCorpAccountNoUsd', res.data.data.records[0].accountNoUsd) // 美元账户
+                    this.$set(this.form, 'invCorpAccountBankCny', res.data.data.records[0].accountBankUsd) // 人民币银行
+                    this.$set(this.form, 'invCorpAccountNoCny', res.data.data.records[0].accountNoUsd) // 人民币账户
+                }
+            })
+            this.retrievePopupsType = false
+            this.finstlbillslistAccBillV1fun(this.appendType)
+        },
+        finstlbillslistAccBillByCorpfun() {
+            let obj = {}
+            if (this.form.accountDateFrom) {
+                obj.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+            }
+            if (this.form.accountDateTo) {
+                obj.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+            }
+            obj.type = '3'
+            obj.billNo = this.form.businessNo // 业务编号
+            obj.businessBillNo = this.form.billNo // 业务编号
+            obj.mblno = this.form.mblno // 主单编号
+            obj.hblno = this.form.hblno // 分单编号
+            obj.bookingNo = this.form.bookingNo // 订舱号(BOOK NO)
+            obj.curCode = this.form.curCode // 币种
+            obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(',') : '' // 业务类型
+            obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(',') : ''
+            finstlbillslistAccBillByCorp(obj).then(res => {
+                this.retrievePopupsType = true
+                this.retrievePopupsData = res.data.data
+            })
+        },
         // 检索
         finstlbillslistAccBillV1fun(type) {
-            if (!this.form.corpId) {
-                this.$message.warning('请选择结算单位');
-                return
+            if (this.form.businessNo || this.form.mblno||this.form.checkNo) {
+                if (!this.form.corpId) {
+                    this.finstlbillslistAccBillByCorpfun()
+                    return
+                }
+            } else {
+                if (!this.form.corpId) {
+                    this.$message.warning('请选择结算单位');
+                    return
+                }
             }
+
             let obj = {}
             // //开票日期
             // if(this.form.invoiceDate) {
@@ -1187,6 +1290,7 @@ export default {
                         item.lineNo = Number(index) + 1 // 行号
                         item.accBillId = item.id
                         item.accBillNo = item.billNo // JOB NO
+                        item.billNo=item.businessBillNo
                         item.billNo = item.businessBillNo // 账单编号
                         item.accDate = item.createTime
                         item.currentCurCode = item.curCode

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -375,7 +375,8 @@
                                             :disabled="editSave || (tableData.length > 0 && appendType == '检索')" plain
                                             @click="finstlbillslistAccBillV1fun(appendType)">提取费用
                                         </el-button>
-                                        <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
+                                        <el-button size="small" :disabled="tableData.length > 0"
+                                            @click="ResetFilter">重置条件
                                         </el-button>
                                     </el-col>
                                     <el-col :span="24">
@@ -463,7 +464,18 @@
                 </el-card>
             </el-form>
         </div>
-
+        <el-dialog title="选择数据"  :visible.sync="retrievePopupsType" append-to-body width="70%"
+            :close-on-click-modal="false">
+            <div>
+                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
+                    id="out-table">
+                    <template slot="menu" slot-scope="{ row }">
+                        <el-button type="text" size="small" @click.stop="retrievePopupsSelect(row)">选择
+                        </el-button>
+                    </template>
+                </avue-crud>
+            </div>
+        </el-dialog>
 
 
     </div>
@@ -491,10 +503,40 @@ import {
 import { getWorkDicts } from "@/api/system/dictbiz";
 import { getCurrentDate } from "@/util/date";
 import dicSelect from "@/components/dicSelect/main";
+import { finstlbillslistAccBillByCorp } from '@/api/iosBasicData/finstlbills'
 export default {
     components: { SearchQuery, fininvoicesitems, fininvoiceitemdetail, dicSelect },
     data() {
         return {
+            retrievePopupsType: false, // 弹窗开启关闭
+            retrievePopupsData: [], // 选择弹窗数据
+            retrievePopupsOption: {
+                border: true,
+                calcHeight: 30,
+                tip: false,
+                height: '500px',
+                index: true,
+                addBtn: false,
+                viewBtn: false,
+                delBtn: false,
+                editBtn: false,
+                refreshBtn: false,
+                columnBtn: false,
+                menuWidth: '60',
+                header:false,
+                column: [
+                    {
+                        label: "客户中文名",
+                        prop: "cnName",
+                        overHidden: true,
+                    },
+                    {
+                        label: "客户英文文名",
+                        prop: "cnName",
+                        overHidden: true,
+                    },
+                ]
+            },
             invoiceAmountCNY: 0, // 费用明细开票金额输入框CNY
             invoiceAmountUSD: 0, // 费用明细开票金额输入框USD
             statusType: false, // 是否确认开票
@@ -592,8 +634,8 @@ export default {
         }
     },
     methods: {
-        ResetFilter(){
-            this.form={
+        ResetFilter() {
+            this.form = {
                 invCurCode: 'CNY',
                 isRp: 1,
                 invType: '全电发票',
@@ -1010,7 +1052,9 @@ export default {
                         }).finally(() => {
                             this.saveLoading = false
                         });
-                    })
+                    }).catch(() => {
+                        this.saveLoading = false
+                    });
                 } else if (type == 'toAddEdit') {
                     fininvoicesSubmit(this.form).then(res => {
                         this.$message.success('操作成功');
@@ -1024,11 +1068,65 @@ export default {
                 }
             })
         },
+        retrievePopupsSelect(row) {
+            this.$set(this.form, 'corpId', row.id)
+            this.$set(this.form, 'corpCnName', row.cnName)
+            this.$set(this.form, 'corpEnName', row.enName)
+            bcorpsbankList(1, 10, { pid: row.id }).then(res => {
+                if (res.data.data.records.length != 0) {
+                    this.$set(this.form, 'bankReceiptAccountNo', res.data.data.records[0].accountNo)
+                    this.$set(this.form, 'bankReceiptBankName', res.data.data.records[0].accountBank)
+                }
+            })
+            // 带出开票单位数据
+            corpsinvoiceheaderList(1, 20, { pid: row.id }).then(res => {
+                if (res.data.data.records.length != 0) {
+                    this.$set(this.form, 'invCorpId', res.data.data.records[0].id)
+                    this.$set(this.form, 'invCorpCnName', res.data.data.records[0].invoiceHeader)
+                    this.$set(this.form, 'invCorpTaxNo', res.data.data.records[0].uscc) // 税号
+                    this.$set(this.form, 'invCorpAccountBankUsd', res.data.data.records[0].accountBankUsd) // 美元银行
+                    this.$set(this.form, 'invCorpAccountNoUsd', res.data.data.records[0].accountNoUsd) // 美元账户
+                    this.$set(this.form, 'invCorpAccountBankCny', res.data.data.records[0].accountBankUsd) // 人民币银行
+                    this.$set(this.form, 'invCorpAccountNoCny', res.data.data.records[0].accountNoUsd) // 人民币账户
+                }
+            })
+            this.retrievePopupsType = false
+            this.finstlbillslistAccBillV1fun(this.appendType)
+        },
+        finstlbillslistAccBillByCorpfun() {
+            let obj = {}
+            if (this.form.accountDateFrom) {
+                obj.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+            }
+            if (this.form.accountDateTo) {
+                obj.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+            }
+            obj.type = '3'
+            obj.billNo = this.form.businessNo // 业务编号
+            obj.businessBillNo = this.form.billNo // 业务编号
+            obj.mblno = this.form.mblno // 主单编号
+            obj.hblno = this.form.hblno // 分单编号
+            obj.bookingNo = this.form.bookingNo // 订舱号(BOOK NO)
+            obj.curCode = this.form.curCode // 币种
+            obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(',') : '' // 业务类型
+            obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(',') : ''
+            finstlbillslistAccBillByCorp(obj).then(res => {
+                this.retrievePopupsType = true
+                this.retrievePopupsData = res.data.data
+            })
+        },
         // 检索
         finstlbillslistAccBillV1fun(type) {
-            if (!this.form.corpId) {
-                this.$message.warning('请选择结算单位');
-                return
+            if (this.form.businessNo || this.form.mblno||this.form.checkNo) {
+                if (!this.form.corpId) {
+                    this.finstlbillslistAccBillByCorpfun()
+                    return
+                }
+            } else {
+                if (!this.form.corpId) {
+                    this.$message.warning('请选择结算单位');
+                    return
+                }
             }
             let obj = {}
             //开票日期
@@ -1045,7 +1143,7 @@ export default {
 
             obj.type = '3'
             obj.billNo = this.form.bookingNo // 账单号
-            obj.businessBillNo = this.form.billNo // 业务编号
+            obj.businessBillNo = this.form.businessNo // 业务编号
             obj.mblno = this.form.mblno // 主单编号
             obj.hblno = this.form.hblno // 分单编号
             obj.bookingNo = this.form.bookingNo // 订舱号(BOOK NO)
@@ -1095,13 +1193,16 @@ export default {
                     }
                 })
             } else {
+                obj.billNo = this.form.businessNo // 业务编号
                 obj.corpCnName = this.form.corpId // 结算单位
                 obj.checkBillNo = this.form.checkNo // 对账单号
                 finstlbillslistAccBillV1(obj).then(res => {
                     let arr = res.data.data.map((item, index) => {
+                        console.log(item)
                         item.lineNo = Number(index) + 1 // 行号
                         item.accBillId = item.id
                         item.accBillNo = item.billNo
+                        item.billNo=item.businessBillNo
                         item.accDate = item.createTime
                         item.currentCurCode = item.curCode
                         item.currentExrate = item.exrate

src/views/tirePartsMall/financialManagement/collectionSettlement/index.vue

@@ -35,7 +35,7 @@
 // import {getList, remove} from "@/api/oceanShipping/maritimeExport/index.js";
 import { getList, remove } from "@/api/collectionSettlement/index.js";
 import detailsPage from "./detailsPage"
-
+import { getToken } from "@/util/auth";
 export default {
   name: "index",
   components: {
@@ -87,7 +87,7 @@ export default {
           searchOrder: 4,
           search: true,
           overHidden: true,
-        }, 
+        },
         // {
         //   label: "客户",
         //   prop: "corpId",
@@ -119,7 +119,7 @@ export default {
           //   value: 'cname'
           // },
           // dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH',
-        }, 
+        },
         {
           label: "结算日期",
           prop: "settlementDate",
@@ -259,6 +259,37 @@ export default {
     )
   },
   methods: {
+    //导出
+    outExport() {
+      let config = {
+        params: {
+          ...this.search,
+          billType: "SK",
+          dc: 'd'
+        }
+      }
+      if (config.params) {
+        for (const propName of Object.keys(config.params)) {
+          const value = config.params[propName];
+          if (value !== null && typeof (value) !== "undefined") {
+            if (value instanceof Array) {
+              for (const key of Object.keys(value)) {
+                let params = propName + '[' + key + ']';
+                config.params[params] = value[key]
+              }
+              delete config.params[propName]
+            }
+          }
+        }
+      }
+      const routeData = this.$router.resolve({
+        path: '/api/blade-sales-part/settlement/export',   //跳转目标窗口的地址
+        query: {
+          ...config.params,    //括号内是要传递给新窗口的参数
+        }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+    },
     check(row) {
       this.form = row
       this.detailsOpen = true

src/views/tirePartsMall/financialManagement/paymentSettlement/index.vue

@@ -1,21 +1,10 @@
 <template>
   <div>
     <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',266)"
-          @saveColumn="saveColumnTwo('crud','option','optionList',266)"
-          :page.sync="page">
+      <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', 266)"
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 266)" :page.sync="page">
         <template slot-scope="{ row, index }" slot="sysNo">
           <span style="color: #409EFF;cursor: pointer" @click.stop="check(row)">{{ row.sysNo }}
           </span>
@@ -26,7 +15,8 @@
         </template>
         <template slot-scope="{type,size,row,index}" slot="menu">
           <!-- <el-button  :size="size" :type="type" @click="check(row)">查看</el-button> -->
-          <el-button :size="size" :disabled="row.financeStatus == '已付款' || item>=1" :type="type" @click="$refs.crud.rowDel(row,index)">删除</el-button>
+          <el-button :size="size" :disabled="row.financeStatus == '已付款' || item >= 1" :type="type"
+            @click="$refs.crud.rowDel(row, index)">删除</el-button>
         </template>
         <!-- <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
@@ -42,9 +32,9 @@
 </template>
 
 <script>
-import {getList, remove} from "@/api/collectionSettlement/index.js";
+import { getList, remove } from "@/api/collectionSettlement/index.js";
 import detailsPage from "./detailsPage"
-
+import { getToken } from "@/util/auth";
 export default {
   name: "index",
   components: {
@@ -97,7 +87,7 @@ export default {
         }, {
           label: "供应商",
           prop: "corpName",
-            searchOrder:1,
+          searchOrder: 1,
           search: true,
           // type: "select",
           // filterable: true,
@@ -107,20 +97,20 @@ export default {
           //   value: 'id'
           // },
           // dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS',
-        },{
-            label: '结算日期',
-            prop: "settlementDate",
-            searchProp:"settlementDateList",
-            search: true,
-            overHidden: true,
-            type: "date",
-            searchOrder:2,
-            width: 100,
-            searchRange: true,
-            unlinkPanels: true,
-            searchDefaultTime: ["00:00:00", "23:59:59"],
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
+        }, {
+          label: '结算日期',
+          prop: "settlementDate",
+          searchProp: "settlementDateList",
+          search: true,
+          overHidden: true,
+          type: "date",
+          searchOrder: 2,
+          width: 100,
+          searchRange: true,
+          unlinkPanels: true,
+          searchDefaultTime: ["00:00:00", "23:59:59"],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss"
         }, {
           label: '账户',
           prop: "accountName",
@@ -130,7 +120,7 @@ export default {
           props: {
             label: 'cname',
             value: 'id',
-            res:'data.records'
+            res: 'data.records'
           },
           dicUrl: '/api/blade-sales-part/accountManagement/list?enableOrNot=1&cname={{key}}&billType=HYCK',
           // dicFormatter: (res => {
@@ -146,13 +136,13 @@ export default {
           prop: "financeStatus",
           search: true,
           overHidden: true,
-          type:'select',
+          type: 'select',
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_Status",
           props: {
             label: "dictValue",
             value: "dictKey"
           }
-        },  {
+        }, {
           label: "制单时间",
           prop: "createTime",
           // searchProp: "createTimeList",
@@ -164,50 +154,50 @@ export default {
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
         },
-        //  {
-        //   label: "创建人",
-        //   prop: "createUserName",
-        //   searchProp: "createUser",
-        //   overHidden: true,
-        //   width: 100,
-        //   filterable: true,
-        //   remote: true,
-        //   type: "select",
-        //   dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
-        //   props: {
-        //     label: "account",
-        //     value: "id",
-        //     res: 'data.records'
-        //   }
-        // }, {
-        //   label: "修改人",
-        //   prop: "updateUserName",
-        //   searchProp: "updateUser",
-        //   overHidden: true,
-        //   width: 100,
-        //   filterable: true,
-        //   remote: true,
-        //   type: "select",
-        //   dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
-        //   props: {
-        //     label: "account",
-        //     value: "id",
-        //     res: 'data.records'
-        //   }
-        // },
-        // {
-        //   label: "更新日期",
-        //   prop: "updateTime",
-        //   searchProp: "updateTimeList",
-        //   type: "date",
-        //   overHidden: true,
-        //   width: 100,
-        //   searchRange: true,
-        //   searchDefaultTime: ["00:00:00", "23:59:59"],
-        //   format: "yyyy-MM-dd",
-        //   valueFormat: "yyyy-MM-dd HH:mm:ss"
-        // }
-      ]
+          //  {
+          //   label: "创建人",
+          //   prop: "createUserName",
+          //   searchProp: "createUser",
+          //   overHidden: true,
+          //   width: 100,
+          //   filterable: true,
+          //   remote: true,
+          //   type: "select",
+          //   dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
+          //   props: {
+          //     label: "account",
+          //     value: "id",
+          //     res: 'data.records'
+          //   }
+          // }, {
+          //   label: "修改人",
+          //   prop: "updateUserName",
+          //   searchProp: "updateUser",
+          //   overHidden: true,
+          //   width: 100,
+          //   filterable: true,
+          //   remote: true,
+          //   type: "select",
+          //   dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
+          //   props: {
+          //     label: "account",
+          //     value: "id",
+          //     res: 'data.records'
+          //   }
+          // },
+          // {
+          //   label: "更新日期",
+          //   prop: "updateTime",
+          //   searchProp: "updateTimeList",
+          //   type: "date",
+          //   overHidden: true,
+          //   width: 100,
+          //   searchRange: true,
+          //   searchDefaultTime: ["00:00:00", "23:59:59"],
+          //   format: "yyyy-MM-dd",
+          //   valueFormat: "yyyy-MM-dd HH:mm:ss"
+          // }
+        ]
       }
     }
   },
@@ -225,6 +215,37 @@ export default {
     }
   },
   methods: {
+    //导出
+    outExport() {
+      let config = {
+        params: {
+          ...this.search,
+          billType: "FK",
+          dc: 'c'
+        }
+      }
+      if (config.params) {
+        for (const propName of Object.keys(config.params)) {
+          const value = config.params[propName];
+          if (value !== null && typeof (value) !== "undefined") {
+            if (value instanceof Array) {
+              for (const key of Object.keys(value)) {
+                let params = propName + '[' + key + ']';
+                config.params[params] = value[key]
+              }
+              delete config.params[propName]
+            }
+          }
+        }
+      }
+      const routeData = this.$router.resolve({
+        path: '/api/blade-sales-part/settlement/export',   //跳转目标窗口的地址
+        query: {
+          ...config.params,    //括号内是要传递给新窗口的参数
+        }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+    },
     check(row) {
       this.form = row
       this.detailsOpen = true
@@ -247,7 +268,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        remove({ids:form.id}).then(res => {
+        remove({ ids: form.id }).then(res => {
           this.$message({
             type: 'success',
             message: '删除成功!'
@@ -259,7 +280,7 @@ export default {
       });
     },
     searchChange(params, done) {
-        this.page.currentPage = 1;
+      this.page.currentPage = 1;
       done();
       this.onLoad(this.page, params)
     },
@@ -272,7 +293,7 @@ export default {
         current: page.currentPage,
         size: page.pageSize,
         billType: "FK",
-        dc:'c',
+        dc: 'c',
         ...Object.assign(params, this.search)
       }
       this.loading = true
@@ -311,6 +332,4 @@ export default {
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>