添加预付款 费用打印 报表 禅道1962

src/api/tirePartsMall/financingManagement/advanceCharge.js

@@ -0,0 +1,38 @@
+import request from '@/router/axios';
+//贸易预付款列表
+export const getList = (current, size, params) => {
+    return request({
+        url: '/api/blade-sales-part/advancecharge/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size
+        }
+    })
+}
+//贸易预付款明细
+export const getDetail = (data) => {
+    return request({
+        url: '/api/blade-sales-part/advancecharge/detail',
+        method: 'get',
+        params: data
+    })
+}
+
+//贸易预付款保存
+export const submit = (data) => {
+    return request({
+        url: '/api/blade-sales-part/advancecharge/submit',
+        method: 'post',
+        data: data
+    })
+}
+//贸易预付款删除
+export const remove = (data) => {
+  return request({
+      url: '/api/blade-sales-part/advancecharge/remove',
+      method: 'post',
+      params: data
+  })
+}

src/api/tirePartsMall/salesManagement/saleOrder.js

@@ -316,4 +316,12 @@ export const getParamservice = (current, size, params) => {
       size,
     }
   })
+}
+// 
+export const getAdvancePaymentBalance = (params) => {
+  return request({
+    url: '/api/blade-sales-part/advancecharge/getAdvancePaymentBalance',
+    method: 'get',
+    params: params
+  })
 }

src/components/tradeAgency/businessReports.vue

@@ -8,7 +8,7 @@
         @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
         @size-change="sizeChange" @refresh-change="refreshChange">
         <template slot-scope="scope" slot="menu">
-          <el-link type="primary" :disabled="scope.row.status == 1||(roleName!='财务'&&scope.row.groupCode=='配单')"
+          <el-link type="primary" :disabled="scope.row.status == 1"
             @click="reportsGetReportDatafun(scope.row.url, scope.row)">预览报表</el-link>
         </template>
         <template slot="curCode" slot-scope="{ row }">

src/components/tradeAgency/businessReportsJK.vue

@@ -2,8 +2,8 @@
   <div>
     <el-dialog class="dialogClass" append-to-body title="预览报表" :visible.sync="previewDialog" width="60%"
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-      <avue-crud :option="selecList.length||type==1 ? optionBack : optionPrinting" :table-loading="loading" :data="data"
-        :page.sync="page" :permission="permissionList" v-model="form" ref="crud" id="out-table"
+      <avue-crud :option="selecList.length || type == 1 ? optionBack : optionPrinting" :table-loading="loading"
+        :data="data" :page.sync="page" :permission="permissionList" v-model="form" ref="crud" id="out-table"
         :header-cell-class-name="headerClassName" :search.sync="query" @search-change="searchChange"
         @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
         @size-change="sizeChange" @refresh-change="refreshChange">
@@ -12,8 +12,16 @@
             @click="reportsGetReportDatafun(scope.row.url, scope.row)">预览报表</el-link>
         </template>
         <template slot="curCode" slot-scope="{ row }">
-          <dic-select v-model="row.curCode" placeholder="币别" key="id" keyValue="key" label="code" :mockData="curCodeList"
-            :filterable="true" :activateCreated="false"></dic-select>
+          <dic-select v-model="row.curCode" placeholder="币别" key="id" keyValue="key" label="code"
+            :mockData="curCodeList" :filterable="true" :activateCreated="false"></dic-select>
+        </template>
+        <template slot="type" slot-scope="{ row }">
+          <!-- <dic-select v-model="row.type" placeholder="报表类型" key="id" keyValue="cnName" label="enName"
+            :mockData="typeList" :filterable="true" :activateCreated="false"></dic-select> -->
+          <el-select v-model="row.type" placeholder="请选择" size="small">
+            <el-option v-for="item in typeList" :key="item.id" :label="item.cnName" :value="item.cnName">
+            </el-option>
+          </el-select>
         </template>
       </avue-crud>
     </el-dialog>
@@ -84,6 +92,7 @@ export default {
           code: 'USD'
         }
       ],
+      typeList: [],
       userList: [],
       previewDialog: false,
       isPrintTheBoxNumber: false,
@@ -126,6 +135,11 @@ export default {
             overHidden: true,
           },
           {
+            label: "报表类型",
+            prop: "type",
+            overHidden: true,
+          },
+          {
             label: "客户名称",
             prop: "cnName",
             overHidden: true,
@@ -588,27 +602,40 @@ export default {
     // 打印报表获取数据
     reportsGetReportDatafun(url, row) {
       let obj = {}
-      if (this.selecList.length||this.type==1) {
+      if (this.selecList.length || this.type == 1) {
         obj = {
           billId: this.id,
           reportCode: row.classifyCode,
-          groupCode: this.groupCode,
+          groupCode: row.groupCode,
           itemIds: this.itemIds,
           type: this.businessValue
         }
       } else {
-        obj = {
-          billId: this.id,
-          reportCode: this.classifyCode,
-          groupCode: this.groupCode,
-          type: this.businessValue,
-          corpIds: row.id,
-          curCode: row.curCode,
-        }
+        if(!row.type) return this.$message.error('请选择报表类型');
+        this.typeList.forEach(e => {
+          if (row.type == e.cnName) {
+            obj = {
+              billId: this.id,
+              reportCode: e.classifyCode,
+              groupCode: e.groupCode,
+              type:this.businessValue,
+              corpIds: row.id,
+              curCode: row.curCode,
+            }
+          }
+        })
+        // obj = {
+        //   billId: this.id,
+        //   reportCode: this.classifyCode,
+        //   groupCode: this.groupCode,
+        //   type: this.businessValue,
+        //   corpIds: row.id,
+        //   curCode: row.curCode,
+        // }
       }
 
       reportsGetReportData(obj).then(res => {
-        if (this.selecList.length||this.type==1) {
+        if (this.selecList.length || this.type == 1) {
           this.handleReportPreview(url, res.data.data.data)
         } else {
           this.handleReportPreview(this.url, res.data.data.data)
@@ -974,11 +1001,13 @@ export default {
       params.businessType = this.businessValue
       params.classifyCode = this.classifyCode
       params.groupCode = this.groupCode
-      if (this.selecList.length||this.type==1) {
+      if (this.selecList.length || this.type == 1) {
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
+          this.typeList = data.records
+          console.log(res.data.data, 123)
           this.selectionClear();
         }).finally(() => {
           this.loading = false;
@@ -986,15 +1015,18 @@ export default {
       } else {
         getFeeCenterCorpIds({
           billId: this.id,
-          dc: this.groupCode == '应收' ? 'D' : 'C',
+          dc: this.groupCode == '应收,应收-账单' ? 'D' : 'C',
           type: 'HYJK',
         }).then(res => {
           res.data.data.forEach(e => {
             e.curCode = null
+            e.type = null
           })
           this.data = res.data.data;
           getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
             this.url = res.data.data.records.length ? res.data.data.records[0].url : null;
+            console.log(res.data.data.records, 321)
+            this.typeList = res.data.data.records
           })
           this.selectionClear();
         }).finally(() => {
@@ -1066,5 +1098,4 @@ export default {
 
 // .dialogClass{
 //   padding-bottom: 10px !important;
-// }
-</style>
+// }</style>

src/components/tradeAgency/fee-info.vue

@@ -23,9 +23,11 @@
                     @click="allClick('应收模板', 'D')">应收模板</el-button>
                 <!-- <el-button type="primary" plain size="small" :disabled="disabled"
                     @click="allClick('生成应收', 'D')">生成应收</el-button> -->
+                <span style="color: #67C23A;">金额合计:{{ sumDamount }}</span>
             </template>
             <template slot="indexHeader" slot-scope="{row,index}">
-                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled" circle @click="addRow('D')">
+                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled" circle
+                    @click="addRow('D')">
                 </el-button>
             </template>
             <template slot="index" slot-scope="{row,index}">
@@ -33,8 +35,8 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true"
-                    dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
+                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
+                    @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
             <template slot="cntrNoForm" slot-scope="{ row }">
@@ -55,8 +57,8 @@
                 <span v-else>{{ row.unitNo }}</span>
             </template>
             <tempalte slot="quantityForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit" v-model="row.quantity" @change="countChange(row)" :controls="false"
-                    placeholder="请输入 数量" size="small" style="width: 100%;"></el-input-number>
+                <el-input-number v-if="row.$cellEdit" v-model="row.quantity" @change="countChange(row)"
+                    :controls="false" placeholder="请输入 数量" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
             </tempalte>
             <tempalte slot="priceForm" slot-scope="{ row }">
@@ -66,8 +68,8 @@
             </tempalte>
             <template slot="curCodeForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.curCode" placeholder="币别" key="id" label="code"
-                    :url="'/blade-los/bcurrency/getExrate?date=' + form.contractDate + '&dc=' + row.dc" :filterable="true"
-                    @selectChange="rowDicChange('curCode', $event, row)"></dic-select>
+                    :url="'/blade-los/bcurrency/getExrate?date=' + form.contractDate + '&dc=' + row.dc"
+                    :filterable="true" @selectChange="rowDicChange('curCode', $event, row)"></dic-select>
                 <span v-else>{{ row.curCode }}</span>
             </template>
             <tempalte slot="exrate" slot-scope="{ row }">
@@ -105,9 +107,11 @@
                     @click="allClick('应付模板', 'C')">应付模板</el-button>
                 <!-- <el-button type="primary" plain size="small" :disabled="disabled"
                     @click="allClick('生成应付', 'C')">生成应付</el-button> -->
+                <span style="color: #67C23A;">金额合计:{{ sumCamount }}</span>
             </template>
             <template slot="indexHeader" slot-scope="{row,index}">
-                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled" circle @click="addRow('C')">
+                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled" circle
+                    @click="addRow('C')">
                 </el-button>
             </template>
             <template slot="index" slot-scope="{row,index}">
@@ -115,8 +119,8 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true"
-                    dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
+                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
+                    @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
             <template slot="cntrNoForm" slot-scope="{ row }">
@@ -137,8 +141,8 @@
                 <span v-else>{{ row.unitNo }}</span>
             </template>
             <tempalte slot="quantityForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit" v-model="row.quantity" @change="countChange(row)" :controls="false"
-                    placeholder="请输入 数量" size="small" style="width: 100%;"></el-input-number>
+                <el-input-number v-if="row.$cellEdit" v-model="row.quantity" @change="countChange(row)"
+                    :controls="false" placeholder="请输入 数量" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
             </tempalte>
             <tempalte slot="priceForm" slot-scope="{ row }">
@@ -148,8 +152,8 @@
             </tempalte>
             <template slot="curCodeForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.curCode" placeholder="币别" key="id" label="code"
-                    :url="'/blade-los/bcurrency/getExrate?date=' + form.contractDate + '&dc=' + row.dc" :filterable="true"
-                    @selectChange="rowDicChange('curCode', $event, row)"></dic-select>
+                    :url="'/blade-los/bcurrency/getExrate?date=' + form.contractDate + '&dc=' + row.dc"
+                    :filterable="true" @selectChange="rowDicChange('curCode', $event, row)"></dic-select>
                 <span v-else>{{ row.curCode }}</span>
             </template>
             <tempalte slot="exrate" slot-scope="{ row }">
@@ -186,7 +190,8 @@
                 </el-row>
             </div>
             <span slot="footer" class="dialog-footer">
-                <el-button size="mini" @click="templateVisible = false; feesselectionList = []; templateRightData = []">取
+                <el-button size="mini"
+                    @click="templateVisible = false; feesselectionList = []; templateRightData = []">取
                     消</el-button>
                 <el-button type="primary" size="mini" @click="templateExport">导 入</el-button>
             </span>
@@ -677,6 +682,8 @@ export default {
             templateRightData: [],
             itemDIds: null,
             itemCIds: null,
+            sumDamount: 0.00,
+            sumCamount: 0.00
         }
     },
     async created() {
@@ -744,7 +751,7 @@ export default {
                         pid: this.form.id,
                         dc: type,
                         accStatus: 0,
-                        auditStatus:'0',
+                        auditStatus: '0',
                         businessType: this.form.businessType,
                         billNo: this.form.businessNo,
                         billDate: this.form.businessDate,
@@ -756,7 +763,7 @@ export default {
                         pid: this.form.id,
                         dc: type,
                         accStatus: 0,
-                        auditStatus:'0',
+                        auditStatus: '0',
                         businessType: this.form.businessType,
                         billNo: this.form.businessNo,
                         billDate: this.form.businessDate,
@@ -777,7 +784,7 @@ export default {
                         pid: this.form.id,
                         dc: type,
                         accStatus: 0,
-                        auditStatus:'0',
+                        auditStatus: '0',
                         businessType: this.form.businessType,
                         billNo: this.form.businessNo,
                         billDate: this.form.businessDate,
@@ -789,7 +796,7 @@ export default {
                         pid: this.form.id,
                         dc: type,
                         accStatus: 0,
-                        auditStatus:'0',
+                        auditStatus: '0',
                         businessType: this.form.businessType,
                         billNo: this.form.businessNo,
                         billDate: this.form.businessDate,
@@ -811,26 +818,32 @@ export default {
         },
         selectionDChange(list) {
             let ids = []
+            let sum=0
             list.forEach(e => {
                 ids.push(e.id)
+                sum=sum+Number(e.amount)
             })
             if (ids.length) {
                 this.itemDIds = ids.join(',')
             } else {
                 this.itemDIds = null
             }
+            this.sumDamount=sum.toFixed(2)
             this.selectionDList = list
         },
         selectionCChange(list) {
             let ids = []
+            let sum=0
             list.forEach(e => {
                 ids.push(e.id)
+                sum=sum+Number(e.amount)
             })
             if (ids.length) {
                 this.itemCIds = ids.join(',')
             } else {
                 this.itemCIds = null
             }
+            this.sumCamount=sum.toFixed(2)
             this.selectionCList = list
         },
         rowDicChange(name, row, el) {
@@ -948,17 +961,17 @@ export default {
                 if (type == 'D') {
                     this.form.feeCenterListD.forEach(e => {
                         if (e.accStatus == 0) {
-                            if(e.auditStatus=='0'){
+                            if (e.auditStatus == '0') {
                                 this.$set(e, '$cellEdit', true)
                             }
-                           
+
                         }
                     })
                 }
                 if (type == 'C') {
                     this.form.feeCenterListC.forEach(e => {
                         if (e.accStatus == 0) {
-                            if(e.auditStatus=='0'){
+                            if (e.auditStatus == '0') {
                                 this.$set(e, '$cellEdit', true)
                             }
                         }

src/components/tradeAgency/fee-infosimple.vue

@@ -9,6 +9,7 @@
                     <i class="el-icon-coin"></i>
                     <span>应收费用</span>
                 </div>
+                <span style="color: #67C23A;">金额合计:{{ sumDamount }}</span>
                 <!-- <el-button type="success" plain size="small" :disabled="disabled"
                     @click="allClick('确认首款', 'D')">确认首款</el-button>
                 <el-button type="primary" plain size="small" :disabled="disabled"
@@ -91,6 +92,7 @@
                     @click="allClick('确认首款', 'C')">确认首款</el-button>
                 <el-button type="primary" plain size="small" :disabled="disabled"
                     @click="allClick('确认尾款', 'C')">确认尾款</el-button> -->
+                    <span style="color: #67C23A;">金额合计:{{ sumCamount }}</span>
             </template>
             <template slot="indexHeader" slot-scope="{row,index}">
                 <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled|| form.firstStatus == '审核通过'" circle @click="addRow('C')">
@@ -534,8 +536,9 @@ export default {
                 ]
             },
             selectionDList: [],
-            selectionCList: []
-
+            selectionCList: [],
+            sumDamount: 0.00,
+            sumCamount: 0.00
         }
     },
     async created() {
@@ -620,9 +623,19 @@ export default {
             }
         },
         selectionDChange(list) {
+            let sum=0
+            list.forEach(e => {
+                sum=sum+Number(e.amount)
+            })
+            this.sumDamount=sum.toFixed(2)
             this.selectionDList = list
         },
         selectionCChange(list) {
+            let sum=0
+            list.forEach(e => {
+                sum=sum+Number(e.amount)
+            })
+            this.sumCamount=sum.toFixed(2)
             this.selectionCList = list
         },
         rowDicChange(name, row, el) {

src/components/tradeAgency/fee-oceanFreight.vue

@@ -23,6 +23,7 @@
                     @click="allClick('应收模板', 'D')">应收模板</el-button>
                 <el-button type="primary" plain size="small" :disabled="disabled || selectionDList.length == 0"
                     @click="allClick('生成应付', 'D')">生成应付</el-button>
+                    <span style="color: #67C23A;">金额合计:{{ sumDamount }}</span>
             </template>
             <template slot="indexHeader" slot-scope="{row,index}">
                 <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled" circle
@@ -110,6 +111,7 @@
                 <el-button plain size="small" :disabled="disabled" @click="allClick('撤销转押', 'C')">撤销转押</el-button>
                 <el-button type="info" plain size="small" :disabled="disabled"
                     @click="allClick('付费申请', 'C')">付费申请</el-button>
+                    <span style="color: #67C23A;">金额合计:{{ sumCamount }}</span>
             </template>
             <template slot="indexHeader" slot-scope="{row,index}">
                 <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled" circle
@@ -271,9 +273,9 @@
             </span>
         </el-dialog>
         <business-reports :id="form.id" :itemIds="itemDIds" ref="printD" businessValue="HYJK" classifyCode="费用"
-            groupCode="应收" :selecList="selectionDList"></business-reports>
+            groupCode="应收,应收-账单" :selecList="selectionDList"></business-reports>
         <business-reports :id="form.id" :itemIds="itemCIds" ref="printC" businessValue="HYJK" classifyCode="费用"
-            groupCode="应付" :selecList="selectionCList"></business-reports>
+            groupCode="应付,应付-账单" :selecList="selectionCList"></business-reports>
     </div>
 </template>
 
@@ -869,6 +871,8 @@ export default {
             itemDIds: null,
             itemCIds: null,
             roleName: null,
+            sumDamount: 0.00,
+            sumCamount: 0.00
         }
     },
     async created() {
@@ -1101,26 +1105,32 @@ export default {
         },
         selectionDChange(list) {
             let ids = []
+            let sum=0
             list.forEach(e => {
                 ids.push(e.id)
+                sum=sum+Number(e.amount)
             })
             if (ids.length) {
                 this.itemDIds = ids.join(',')
             } else {
                 this.itemDIds = null
             }
+            this.sumDamount=sum.toFixed(2)
             this.selectionDList = list
         },
         selectionCChange(list) {
             let ids = []
+            let sum=0
             list.forEach(e => {
                 ids.push(e.id)
+                sum=sum+Number(e.amount)
             })
             if (ids.length) {
                 this.itemCIds = ids.join(',')
             } else {
                 this.itemCIds = null
             }
+            this.sumCamount=sum.toFixed(2)
             this.selectionCList = list
         },
         rowDicChange(name, row, el) {

src/views/approveDataH/configuration/mainList.json

@@ -23,6 +23,7 @@
   "searchIndex": 2,
   "addBtn": false,
   "headerAlign": "center",
+  "columnBtn":false,
   "column": [
     {
       "label": "业务类型",
@@ -122,6 +123,13 @@
       "width": 150
     },
     {
+      "label": "订单备注",
+      "prop": "orderRemark",
+      "overHidden": true,
+      "width": 100,
+      "index": 10
+    },
+    {
       "label": "业务日期",
       "prop": "billTime",
       "type": "date",
@@ -130,7 +138,7 @@
       "unlinkPanels": true,
       "searchRange": true,
       "overHidden": true,
-      "index": 10,
+      "index": 11,
       "width": 150
     },
     {
@@ -144,7 +152,7 @@
       "searchRange": true,
       "search": true,
       "overHidden": true,
-      "index": 11,
+      "index": 12,
       "width": 150
     },
     {
@@ -152,27 +160,20 @@
       "prop": "receivableAmount",
       "overHidden": true,
       "width": 100,
-      "index": 12
+      "index": 13
     },
     {
       "label": "应付金额",
       "prop": "payAmount",
       "overHidden": true,
       "width": 100,
-      "index": 13
+      "index": 14
     },
     {
       "label": "利润",
       "prop": "grossProfit",
       "overHidden": true,
       "width": 100,
-      "index": 14
-    },
-    {
-      "label": "订单备注",
-      "prop": "orderRemark",
-      "overHidden": true,
-      "width": 100,
       "index": 15
     }
   ]

src/views/approveDataH/index.vue

@@ -5,19 +5,15 @@
       @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
       @refresh-change="refreshChange" @on-load="onLoad">
       <template slot="corpIdSearch">
-<!--        <select-component v-model="search.corpId" :configuration="configuration"></select-component>-->
+        <!--        <select-component v-model="search.corpId" :configuration="configuration"></select-component>-->
         <el-select v-model="search.corpId" clearable placeholder="请选择">
-          <el-option
-            v-for="item in corpsList"
-            :key="item.id"
-            :label="item.cname"
-            :value="item.id">
+          <el-option v-for="item in corpsList" :key="item.id" :label="item.cname" :value="item.id">
           </el-option>
         </el-select>
       </template>
       <template slot-scope="scope" slot="checkType">
         <span v-if="scope.row.checkType == 'HYCK-FFSQ'">付费申请</span>
-          <span v-if="scope.row.checkType == 'HYCK-FPSQ'">发票申请</span>
+        <span v-if="scope.row.checkType == 'HYCK-FPSQ'">发票申请</span>
         <span v-else-if="scope.row.checkType == 'HYCK-DJ'">海运出口</span>
         <span v-else-if="scope.row.checkType == 'HYCK-FY'">海运出口费用</span>
         <span v-else-if="scope.row.checkType == 'HYJK-DJ'">海运进口</span>
@@ -37,68 +33,48 @@
         <span v-else-if="scope.row.checkType == 'YSQR-C'">贸易代理货款付费确认</span>
         <span v-else-if="scope.row.checkType == 'YSQR-D'">贸易代理货款收费确认</span>
       </template>
-        <template slot-scope="scope" slot="billNo">
-            <span style="color: #1e9fff;cursor: pointer;" @click="billNoDetails(scope.row)">{{scope.row.billNo}}</span>
-        </template>
+      <template slot-scope="scope" slot="billNo">
+        <span style="color: #1e9fff;cursor: pointer;" @click="billNoDetails(scope.row)">{{ scope.row.billNo }}</span>
+      </template>
       <!-- <template slot="menuLeft">
         <el-button size="small" type="success" :disabled="selectionList.length == 0" @click.stop="batchCheck">批量审批
         </el-button>
       </template> -->
       <template slot-scope="scope" slot="menu">
-<!--        <el-button type="text" size="small" :disabled="scope.row.operate" @click.stop="jumpPage(scope.row)">查看-->
-<!--        </el-button>-->
+        <!--        <el-button type="text" size="small" :disabled="scope.row.operate" @click.stop="jumpPage(scope.row)">查看-->
+        <!--        </el-button>-->
         <el-button type="text" size="small" :disabled="scope.row.operate" @click.stop="jumpPage(scope.row)">查看
         </el-button>
-          <el-button type="text" size="small"
-                     v-if="scope.row.checkType == 'HYCK-DJ'"
-                     :disabled="scope.row.auditStatus != 'S'"
-                     @click.stop="printWindowfun(scope.row,'HYCK-DJ')">审批
-          </el-button>
-          <el-button type="text" size="small"
-                     v-else-if="scope.row.checkType == 'HYJK-DJ'"
-                     :disabled="scope.row.auditStatus != 'S'"
-                     @click.stop="printWindowfun(scope.row,'HYJK-DJ')">审批
-          </el-button>
-          <el-button type="text" size="small"
-                     v-else-if="scope.row.checkType == 'KYCK-DJ'"
-                     :disabled="scope.row.auditStatus != 'S'"
-                     @click.stop="printWindowfun(scope.row,'KYCK-DJ')">审批
-          </el-button>
-          <el-button type="text" size="small"
-                     v-else-if="scope.row.checkType == 'KYJK-DJ'"
-                     :disabled="scope.row.auditStatus != 'S'"
-                     @click.stop="printWindowfun(scope.row,'KYJK-DJ')">审批
-          </el-button>
-          <el-button type="text" size="small"
-                     v-else-if="scope.row.checkType == 'HYCK-FFSQ'"
-                     :disabled="scope.row.auditStatus != 'S'"
-                     @click.stop="printWindowfun(scope.row,'HYCK-FFSQ')">审批
-          </el-button>
-          <el-button type="text" size="small"
-                     v-else-if="scope.row.checkType == 'sea-approve'"
-                     :disabled="scope.row.auditStatus != 'S'"
-                     @click.stop="printWindowfun(scope.row,'sea-approve')">审批
-          </el-button>
-          <el-button type="text" size="small"
-                     v-else-if="scope.row.checkType == 'sia-approve'"
-                     :disabled="scope.row.auditStatus != 'S'"
-                     @click.stop="printWindowfun(scope.row,'sia-approve')">审批
-          </el-button>
-          <el-button type="text" size="small"
-                     v-else-if="scope.row.checkType == 'aea-approve'"
-                     :disabled="scope.row.auditStatus != 'S'"
-                     @click.stop="printWindowfun(scope.row,'aea-approve')">审批
-          </el-button>
-          <el-button type="text" size="small"
-                     v-else-if="scope.row.checkType == 'aia-approve'"
-                     :disabled="scope.row.auditStatus != 'S'"
-                     @click.stop="printWindowfun(scope.row,'aia-approve')">审批
-          </el-button>
-          <el-button type="text" size="small"
-                     v-else
-                     :disabled="scope.row.auditStatus != 'S'"
-                     @click.stop="openCheck(scope.row)">审批
-          </el-button>
+        <el-button type="text" size="small" v-if="scope.row.checkType == 'HYCK-DJ'"
+          :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row, 'HYCK-DJ')">审批
+        </el-button>
+        <el-button type="text" size="small" v-else-if="scope.row.checkType == 'HYJK-DJ'"
+          :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row, 'HYJK-DJ')">审批
+        </el-button>
+        <el-button type="text" size="small" v-else-if="scope.row.checkType == 'KYCK-DJ'"
+          :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row, 'KYCK-DJ')">审批
+        </el-button>
+        <el-button type="text" size="small" v-else-if="scope.row.checkType == 'KYJK-DJ'"
+          :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row, 'KYJK-DJ')">审批
+        </el-button>
+        <el-button type="text" size="small" v-else-if="scope.row.checkType == 'HYCK-FFSQ'"
+          :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row, 'HYCK-FFSQ')">审批
+        </el-button>
+        <el-button type="text" size="small" v-else-if="scope.row.checkType == 'sea-approve'"
+          :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row, 'sea-approve')">审批
+        </el-button>
+        <el-button type="text" size="small" v-else-if="scope.row.checkType == 'sia-approve'"
+          :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row, 'sia-approve')">审批
+        </el-button>
+        <el-button type="text" size="small" v-else-if="scope.row.checkType == 'aea-approve'"
+          :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row, 'aea-approve')">审批
+        </el-button>
+        <el-button type="text" size="small" v-else-if="scope.row.checkType == 'aia-approve'"
+          :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row, 'aia-approve')">审批
+        </el-button>
+        <el-button type="text" size="small" v-else :disabled="scope.row.auditStatus != 'S'"
+          @click.stop="openCheck(scope.row)">审批
+        </el-button>
         <el-button type="text" size="small" @click.stop="openCheckSchedule(scope.row)">审批流程
         </el-button>
       </template>
@@ -108,32 +84,32 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun">
       </check-schedule>
     </el-dialog>
-      <!--单个审批-->
+    <!--单个审批-->
     <el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
       <check :checkData="checkData" :checkDetail="true" :idList="idList" @operationType="operationTypeFFSQ"
         @choceCheckFun="choceCheckFFSQ">
       </check>
     </el-dialog>
-      <!--报表+审批-->
+    <!--报表+审批-->
     <reportContainerlos style="width: 100%; height: 100vh" ref="reportContainer">
-        <check :checkData="checkData" :checkDetail="true" :idList="idList" @operationType="operationType"
-               @choceCheckFun="choceCheckFun">
-        </check>
+      <check :checkData="checkData" :checkDetail="true" :idList="idList" @operationType="operationType"
+        @choceCheckFun="choceCheckFun">
+      </check>
     </reportContainerlos>
-      <!--<el-dialog-->
-      <!--    title="打印"-->
-      <!--    :visible.sync="selectPrintingDialog"-->
-      <!--    append-to-body-->
-      <!--    width="70%"-->
-      <!--    :before-close="handleClose">-->
-      <!--    <div>-->
-      <!--        <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>-->
-      <!--    </div>-->
-      <!--    <span slot="footer" class="dialog-footer">-->
-      <!--        <el-button size="small" @click="selectPrintingDialog = false;">取 消</el-button>-->
-      <!--    </span>-->
-      <!--</el-dialog>-->
+    <!--<el-dialog-->
+    <!--    title="打印"-->
+    <!--    :visible.sync="selectPrintingDialog"-->
+    <!--    append-to-body-->
+    <!--    width="70%"-->
+    <!--    :before-close="handleClose">-->
+    <!--    <div>-->
+    <!--        <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>-->
+    <!--    </div>-->
+    <!--    <span slot="footer" class="dialog-footer">-->
+    <!--        <el-button size="small" @click="selectPrintingDialog = false;">取 消</el-button>-->
+    <!--    </span>-->
+    <!--</el-dialog>-->
 
   </basic-container>
 </template>
@@ -148,28 +124,28 @@ import checkSchedule from "@/components/checkH/checkSchedule";
 import check from "./check";
 import { getUserInfo } from "@/api/system/user";
 import { gainUser } from "@/api/basicData/customerInquiry";
-import {corpsDescListAll} from "../../api/tirePartsMall/salesManagement/saleOrder";
+import { corpsDescListAll } from "../../api/tirePartsMall/salesManagement/saleOrder";
 
 import reportContainerlos from "@/views/iosBasicData/report-container/report-container-los.vue"
-import {finstlbillsDetail} from "../../api/iosBasicData/finstlbills";
-import {reportsGetReportData} from "@/api/iosBasicData/reports";
+import { finstlbillsDetail } from "../../api/iosBasicData/finstlbills";
+import { reportsGetReportData } from "@/api/iosBasicData/reports";
 import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
-import {getList as getreportsList} from "@/api/iosBasicData/reports";
+import { getList as getreportsList } from "@/api/iosBasicData/reports";
 
 let previousRouterName = "";
 let checkRefresh = "";
 export default {
   components: {
-      reportformsList,
+    reportformsList,
     check,
     checkSchedule,
-      reportContainerlos
+    reportContainerlos
   },
   data() {
     return {
-        selectPrintingDialog:false, // 打印弹窗
-        reportsData:{}, // 当前要审核数据
-        reportlist:[], // 报表数据
+      selectPrintingDialog: false, // 打印弹窗
+      reportsData: {}, // 当前要审核数据
+      reportlist: [], // 报表数据
       corpsList: [],
       loading: false,
       form: {},
@@ -211,9 +187,9 @@ export default {
       } else {
         if (this.$store.getters.userInfo.tenant_id === "681169") {
           this.option = option3;
-        }else if (this.$store.getters.userInfo.tenant_id === "673511") {
+        } else if (this.$store.getters.userInfo.tenant_id === "673511") {
           this.option = option4;
-        }else if (this.$store.getters.userInfo.tenant_id === "064132") {
+        } else if (this.$store.getters.userInfo.tenant_id === "064132") {
           this.option = option4;
         } else {
           this.option = option;
@@ -246,110 +222,110 @@ export default {
     }
   },
   methods: {
-      // 点击审核弹出打印表格
-      printWindowfun(row,type){
-          // 当时选择的数据
-          this.reportsData = row
-          this.checkData = row
-          let obj = {}
-          if (type == 'HYCK-DJ') {
-              obj = {
-                  businessType:'HYCK',
-                  classifyCode:'业务',
-                  groupCode:'销售报告'
-              }
-          }else if (type == 'HYJK-DJ') {
-              obj = {
-                  businessType:'HYJK',
-                  classifyCode:'业务',
-                  groupCode:'销售报告'
-              }
-          } else if (type == 'KYCK-DJ') {
-              obj = {
-                  businessType:'KYCK',
-                  classifyCode:'业务',
-                  groupCode:'销售报告'
-              }
-          }else if (type == 'KYJK-DJ') {
-              obj = {
-                  businessType:'KYJK',
-                  classifyCode:'业务',
-                  groupCode:'销售报告'
-              }
-          } else if (type == 'HYCK-FFSQ') {
-              obj = {
-                  businessType:'FFSQ',
-                  classifyCode:'付费申请',
-                  groupCode:'付费申请'
-              }
-          }else if (type == 'sea-approve') {
-              obj = {
-                  businessType:'AMEND',
-                  classifyCode:'AMENDSE',
-                  groupCode:'SE'
-              }
-          }else if (type == 'sia-approve') {
-              obj = {
-                  businessType:'AMEND',
-                  classifyCode:'AMENDSI',
-                  groupCode:'SI'
-              }
-          }else if (type == 'aea-approve') {
-              obj = {
-                  businessType:'AMEND',
-                  classifyCode:'AMENDAE',
-                  groupCode:'AE'
-              }
-          }else if (type == 'aia-approve') {
-              obj = {
-                  businessType:'AMEND',
-                  classifyCode:'AMENDAI',
-                  groupCode:'AI'
-              }
-          }else {}
-          getreportsList(1, 10, obj).then(res=>{
-              this.reportRadio(res.data.data.records[0])
-          })
-          // this.selectPrintingDialog = true
-          // let page = {
-          //     pageSize: 10,
-          //     currentPage: 1,
-          //     total: 0
-          // }
-          // this.$nextTick(()=>{
-          //     this.$refs.reportformsList.onLoad(page,{
-          //         businessType:'HYCK',
-          //         classifyCode:'业务',
-          //         groupCode:'销售报告'
-          //     })
-          // })
-      },
-      // 获取报表数据
-      reportRadio(val){
-          console.log(val,240)
-          reportsGetReportData({
-              billId:this.reportsData.billId,
-              reportCode:val.classifyCode,
-              groupCode:val.groupCode,
-              type:val.businessType
-          }).then(res=>{
-              // 关闭弹窗
-              this.selectPrintingDialog = false
-              this.handleReportPreview(val.url,res.data.data.data)
-          })
-      },
-      // 关闭弹窗
-      handleClose(done) {
-        done()
-      },
+    // 点击审核弹出打印表格
+    printWindowfun(row, type) {
+      // 当时选择的数据
+      this.reportsData = row
+      this.checkData = row
+      let obj = {}
+      if (type == 'HYCK-DJ') {
+        obj = {
+          businessType: 'HYCK',
+          classifyCode: '业务',
+          groupCode: '销售报告'
+        }
+      } else if (type == 'HYJK-DJ') {
+        obj = {
+          businessType: 'HYJK',
+          classifyCode: '业务',
+          groupCode: '销售报告'
+        }
+      } else if (type == 'KYCK-DJ') {
+        obj = {
+          businessType: 'KYCK',
+          classifyCode: '业务',
+          groupCode: '销售报告'
+        }
+      } else if (type == 'KYJK-DJ') {
+        obj = {
+          businessType: 'KYJK',
+          classifyCode: '业务',
+          groupCode: '销售报告'
+        }
+      } else if (type == 'HYCK-FFSQ') {
+        obj = {
+          businessType: 'FFSQ',
+          classifyCode: '付费申请',
+          groupCode: '付费申请'
+        }
+      } else if (type == 'sea-approve') {
+        obj = {
+          businessType: 'AMEND',
+          classifyCode: 'AMENDSE',
+          groupCode: 'SE'
+        }
+      } else if (type == 'sia-approve') {
+        obj = {
+          businessType: 'AMEND',
+          classifyCode: 'AMENDSI',
+          groupCode: 'SI'
+        }
+      } else if (type == 'aea-approve') {
+        obj = {
+          businessType: 'AMEND',
+          classifyCode: 'AMENDAE',
+          groupCode: 'AE'
+        }
+      } else if (type == 'aia-approve') {
+        obj = {
+          businessType: 'AMEND',
+          classifyCode: 'AMENDAI',
+          groupCode: 'AI'
+        }
+      } else { }
+      getreportsList(1, 10, obj).then(res => {
+        this.reportRadio(res.data.data.records[0])
+      })
+      // this.selectPrintingDialog = true
+      // let page = {
+      //     pageSize: 10,
+      //     currentPage: 1,
+      //     total: 0
+      // }
+      // this.$nextTick(()=>{
+      //     this.$refs.reportformsList.onLoad(page,{
+      //         businessType:'HYCK',
+      //         classifyCode:'业务',
+      //         groupCode:'销售报告'
+      //     })
+      // })
+    },
+    // 获取报表数据
+    reportRadio(val) {
+      console.log(val, 240)
+      reportsGetReportData({
+        billId: this.reportsData.billId,
+        reportCode: val.classifyCode,
+        groupCode: val.groupCode,
+        type: val.businessType
+      }).then(res => {
+        // 关闭弹窗
+        this.selectPrintingDialog = false
+        this.handleReportPreview(val.url, res.data.data.data)
+      })
+    },
+    // 关闭弹窗
+    handleClose(done) {
+      done()
+    },
     // 预览报表
-     handleReportPreview(url,data){
-        this.reportlist = data // 存一下数据 打印的时候需要传
+    handleReportPreview(url, data) {
+      this.reportlist = data // 存一下数据 打印的时候需要传
 
       Stimulsoft.Base.StiLicense.key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHn0s4gy0Fr5YoUZ9V00Y0igCSFQzwEqYBh/N77k4f0fWXTHW5rqeBNLkaurJDenJ9o97TyqHs9HfvINK18Uwzsc/bG01Rq+x3H3Rf+g7AY92gvWmp7VA2Uxa30Q97f61siWz2dE5kdBVcCnSFzC6awE74JzDcJMj8OuxplqB1CYcpoPcOjKy1PiATlC3UsBaLEXsok1xxtRMQ283r282tkh8XQitsxtTczAJBxijuJNfziYhci2jResWXK51ygOOEbVAxmpflujkJ8oEVHkOA/CjX6bGx05pNZ6oSIu9H8deF94MyqIwcdeirCe60GbIQByQtLimfxbIZnO35X3fs/94av0ODfELqrQEpLrpU6FNeHttvlMc5UVrT4K+8lPbqR8Hq0PFWmFrbVIYSi7tAVFMMe2D1C59NWyLu3AkrD3No7YhLVh7LV0Tttr/8FrcZ8xirBPcMZCIGrRIesrHxOsZH2V8t/t0GXCnLLAWX+TNvdNXkB8cF2y9ZXf1enI064yE5dwMs2fQ0yOUG/xornE'
       // Stimulsoft.Base.StiLicense.Key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHkcgIvwL0jnpsDqRpWg5FI5kt2G7A0tYIcUygBh1sPs7plofUOqPB1a4HBIXJB621mau2oiAIj+ysU7gKUXfjn/D5BocmduNB+ZMiDGPxFrAp3PoD0nYNkkWh8r7gBZ1v/JZSXGE3bQDrCQCNSy6mgby+iFAMV8/PuZ1z77U+Xz3fkpbm6MYQXYp3cQooLGLUti7k1TFWrnawT0iEEDJ2iRcU9wLqn2g9UiWesEZtKwI/UmEI2T7nv5NbgV+CHguu6QU4WWzFpIgW+3LUnKCT/vCDY+ymzgycw9A9+HFSzARiPzgOaAuQYrFDpzhXV+ZeX31AxWlnzjDWqpfluygSNPtGul5gyNt2CEoJD1Yom0VN9fvRonYsMsimkFFx2AwyVpPcs+JfVBtpPbTcZscnzUdmiIvxv8Gcin6sNSibM6in/uUKFt3bVgW/XeMYa7MLGF53kvBSwi78poUDigA2n12SmghLR0AHxyEDIgZGOTbNI33GWu7ZsPBeUdGu55R8w='
-      Stimulsoft.Base.Localization.StiLocalization.addLocalizationFile( '/reports/stimulsoft/Localization/zh-CHS.xml', true, 'zh-CHS')
-      Stimulsoft.Base.Localization.StiLocalization.setLocalizationFile('/reports/stimulsoft/Localization/zh-CHS.xml' )
+      Stimulsoft.Base.Localization.StiLocalization.addLocalizationFile('/reports/stimulsoft/Localization/zh-CHS.xml', true, 'zh-CHS')
+      Stimulsoft.Base.Localization.StiLocalization.setLocalizationFile('/reports/stimulsoft/Localization/zh-CHS.xml')
 
       // 工具栏
       var options = new Stimulsoft.Viewer.StiViewerOptions()
@@ -377,65 +353,65 @@ export default {
       console.log("从url加载报表");
       // report.loadFile("/reports/stimulsoft/demos/SimpleList.mrt");
       // report.load(row.url)
-        report.load(url)
+      report.load(url)
 
       // 加载数据
-        var dataSet = new Stimulsoft.System.Data.DataSet(
-            'reportData'
-        )
-        dataSet.readJson(data)
-        report.regData('reportData', 'reportData', dataSet)
-        // 从模版和数据加载报表
-        // loadReport(report, '', {})
+      var dataSet = new Stimulsoft.System.Data.DataSet(
+        'reportData'
+      )
+      dataSet.readJson(data)
+      report.regData('reportData', 'reportData', dataSet)
+      // 从模版和数据加载报表
+      // loadReport(report, '', {})
 
-        viewer.report = report;
+      viewer.report = report;
 
 
       this.$refs.reportContainer.showContainer(
-        ()=> {
+        () => {
           setTimeout(() => {
             viewer.renderHtml('reportContainer')
             this.createViewerButtons(viewer)
           }, 50)
         },
-        ()=>{
+        () => {
         },
       )
-        console.log(report,301)
-        // var printButton = report.renderedPages[0].components.find(function(c) {
-        //     return c.name === 'printButton';
-        // });
-        // // 为按钮控件添加“PrintReport”事件
-        // printButton.events.add('PrintReport', handlePrintReport);
+      console.log(report, 301)
+      // var printButton = report.renderedPages[0].components.find(function(c) {
+      //     return c.name === 'printButton';
+      // });
+      // // 为按钮控件添加“PrintReport”事件
+      // printButton.events.add('PrintReport', handlePrintReport);
       console.log("加载成功完成!");
     },
-      // 报表的按钮
-      createViewerButtons (viewer){
-          viewer.jsObject.collections.images['myClose.png'] =
-              'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAA0ElEQVQ4ja3TO05CQRQG4A8iOwAbtYWETndAaecK7NwCKmETtJZsSBNLobEz8ZFIJQ0UnOGSm3DnYviTybzO/895DQXGWGCVGQuMEqkRcwcfuMOLalziCaf4TIe9UG9nyMJmFRzNGoRK1BU4xxx9G7cfwostciGk+x8MqgySwDXe4tU53hVV+MNtTmAoX84JGv9NYgrHyR6DV8wUSW7hItZLm36ZVoVQxsFJLOMsPOrH/h7dQwR2cdxOTEn8DtUbPGc4V2H7Vb4Yqfedf/GYSGt8VUmxgyfuBAAAAABJRU5ErkJggg=='
-          const closeBtn = viewer.jsObject.SmallButton(
-              'closeBtn',
-              '关闭',
-              'myClose.png'
-          )
+    // 报表的按钮
+    createViewerButtons(viewer) {
+      viewer.jsObject.collections.images['myClose.png'] =
+        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAA0ElEQVQ4ja3TO05CQRQG4A8iOwAbtYWETndAaecK7NwCKmETtJZsSBNLobEz8ZFIJQ0UnOGSm3DnYviTybzO/895DQXGWGCVGQuMEqkRcwcfuMOLalziCaf4TIe9UG9nyMJmFRzNGoRK1BU4xxx9G7cfwostciGk+x8MqgySwDXe4tU53hVV+MNtTmAoX84JGv9NYgrHyR6DV8wUSW7hItZLm36ZVoVQxsFJLOMsPOrH/h7dQwR2cdxOTEn8DtUbPGc4V2H7Vb4Yqfedf/GYSGt8VUmxgyfuBAAAAABJRU5ErkJggg=='
+      const closeBtn = viewer.jsObject.SmallButton(
+        'closeBtn',
+        '关闭',
+        'myClose.png'
+      )
 
-          const toolbarTable = viewer.jsObject.controls.toolbar.firstChild.firstChild
-          const buttonsTable = toolbarTable.rows[0].lastChild.lastChild
-          const userButtonCell = buttonsTable.rows[0].insertCell(0)
-          userButtonCell.className = 'stiJsViewerClearAllStyles'
-          userButtonCell.appendChild(closeBtn)
+      const toolbarTable = viewer.jsObject.controls.toolbar.firstChild.firstChild
+      const buttonsTable = toolbarTable.rows[0].lastChild.lastChild
+      const userButtonCell = buttonsTable.rows[0].insertCell(0)
+      userButtonCell.className = 'stiJsViewerClearAllStyles'
+      userButtonCell.appendChild(closeBtn)
 
-          let that = this
-          closeBtn.action = function() {
-              console.log(that.$refs.ReportContainer)
-              if (that.$refs.reportContainer)
-                  that.$refs.reportContainer.hideContainer()
-          }
-      },
+      let that = this
+      closeBtn.action = function () {
+        console.log(that.$refs.ReportContainer)
+        if (that.$refs.reportContainer)
+          that.$refs.reportContainer.hideContainer()
+      }
+    },
 
 
 
-      batchCheck() {
+    batchCheck() {
       for (let i = 0; i < this.selectionList.length; i++) {
         if (this.selectionList[i].auditStatus != "S") {
           return this.$message.error("审核状态必须都为待审核状态!");
@@ -448,29 +424,24 @@ export default {
     },
     operationType() {
       // this.checkDialog = false;
-        this.$refs.reportContainer.visible = false
+      this.$refs.reportContainer.visible = false
       this.refreshChange();
       this.idList = [];
     },
-      operationTypeFFSQ() {
-          this.checkDialog = false;
-          this.refreshChange();
-          this.idList = [];
-      },
-      // 业务编号跳转详情
-      billNoDetails(row){
-          this.$router.push({
-              path: '/iosBasicData/SeafreightExportF/bills/index',
-              query: {
-                  id:row.billId
-              }
-          });
-      },
+    operationTypeFFSQ() {
+      this.checkDialog = false;
+      this.refreshChange();
+      this.idList = [];
+    },
+    // 业务编号跳转详情
+    billNoDetails(row) {
+      this.jumpPage(row)
+    },
     //跳转页面
     jumpPage(row) {
-      console.log('row',row);
+      console.log('row', row);
       if (row.url) {
-        if (row.pageStatus&&eval("(" + row.pageStatus + ")")) {
+        if (row.pageStatus && eval("(" + row.pageStatus + ")")) {
           this.$alert(
             "" +
             row.pageLabel +
@@ -489,12 +460,12 @@ export default {
           this.$router.push({
             path: row.url,
             query: {
-                billId:row.billId
+              billId: row.billId
             }
           });
         }
-      }else {
-          this.$message.warning('当前数据无法跳转')
+      } else {
+        this.$message.warning('当前数据无法跳转')
       }
     },
     //审批通过
@@ -537,13 +508,13 @@ export default {
     },
     choceCheckFun() {
       // this.checkDialog = false;
-        this.$refs.reportContainer.visible = false
+      this.$refs.reportContainer.visible = false
+      this.refreshChange();
+    },
+    choceCheckFFSQ() {
+      this.checkDialog = false;
       this.refreshChange();
     },
-      choceCheckFFSQ() {
-          this.checkDialog = false;
-          this.refreshChange();
-      },
     openCheckSchedule(row) {
       this.checkId = row.srcBillId;
       this.batchNo = row.batchNo;
@@ -615,6 +586,4 @@ export default {
 };
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -234,7 +234,7 @@
 
             <el-card style="margin-top: 10px">
                 <div style="margin-bottom: 10px">
-                    <el-button size="small" type="info" :disabled="editSave" :loading="saveLoading"
+                    <el-button size="small" type="success" :disabled="editSave" :loading="saveLoading"
                         @click="SelectedRows">确认选定行
                     </el-button>
                     <el-button size="small" type="danger" style="margin-left: 10px" :disabled="editSave"

src/views/iosBasicData/advanceCharge/detailsPage.vue

@@ -19,20 +19,23 @@
                         <dic-select v-model="form.corpName" placeholder="客户" key="id" label="cnName" res="records"
                             url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
                             dataName="cnName" @selectChange="dicChange('corpName', $event)"
-                            :disabled="form.advanceChargeItemList.length>0"></dic-select>
+                            :disabled="form.advanceChargeItemList.length > 0"></dic-select>
                     </tempalte>
                     <tempalte slot="advancePaymentBalance">
                         <el-input-number v-model="form.advancePaymentBalance"
                             @change="dicChange('advancePaymentBalance', form)" :controls="false" placeholder="请输入 预付款余额"
-                            size="small" style="width: 100%;" :disabled="form.advanceChargeItemList.length>0"></el-input-number>
+                            size="small" style="width: 100%;"
+                            :disabled="form.advanceChargeItemList.length > 0"></el-input-number>
                     </tempalte>
                     <tempalte slot="inOverpayment">
                         <el-input-number v-model="form.inOverpayment" @change="dicChange('inOverpayment', form)"
-                            :controls="false" placeholder="请输入 增加金额" size="small" style="width: 100%;" :disabled="form.advanceChargeItemList.length>0"></el-input-number>
+                            :controls="false" placeholder="请输入 增加金额" size="small" style="width: 100%;"
+                            :disabled="form.advanceChargeItemList.length > 0"></el-input-number>
                     </tempalte>
                     <tempalte slot="outOverpaymen">
                         <el-input-number v-model="form.outOverpaymen" @change="dicChange('outOverpaymen', form)"
-                            :controls="false" placeholder="请输入 消费金额" size="small" style="width: 100%;" :disabled="form.advanceChargeItemList.length>0"></el-input-number>
+                            :controls="false" placeholder="请输入 消费金额" size="small" style="width: 100%;"
+                            :disabled="form.advanceChargeItemList.length > 0"></el-input-number>
                     </tempalte>
                 </avue-form>
             </trade-card>
@@ -40,12 +43,22 @@
                 <avue-crud :option="option" :data="form.advanceChargeItemList" id="out-table" ref="crud"
                     @selection-change="selectionChange" @resetColumn="resetColumn('crud', 'option', 'optionBack', 400)"
                     @saveColumn="saveColumn('crud', 'option', 'optionBack', 400)">
+                    <template slot="menuLeft">
+                        <el-button type="primary" size="small" icon="el-icon-plus" @click="addRow">新 增
+                        </el-button>
+                    </template>
                     <template slot="orderNo" slot-scope="{ row }">
                         <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.orderNo }}</span>
                     </template>
                     <template slot="billNo" slot-scope="{ row }">
                         <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.billNo }}</span>
                     </template>
+                    <template slot="menu" slot-scope="{ row, index }">
+                        <el-button v-if="row.identifier == 1" size="small" icon="el-icon-edit" type="text"
+                            @click="inEdit(row)">{{ row.$cellEdit ?
+                                "保存" :
+                                "编辑" }}</el-button>
+                    </template>
                 </avue-crud>
             </trade-card>
         </div>
@@ -106,30 +119,40 @@ export default {
             optionBack: {
                 height: 'auto',
                 calcHeight: 30,
-                menuWidth: 140,
+                menuWidth: 60,
                 border: true,
                 index: true,
                 addBtn: false,
                 viewBtn: false,
                 editBtn: false,
                 delBtn: false,
-                menu: false,
+                menu: true,
                 refreshBtn: false,
                 align: 'center',
                 column: [
                     {
                         label: "订单号",
                         prop: "orderNo",
+                        cell: true,
                         overHidden: true
                     },
                     {
                         label: "提单号",
                         prop: "billNo",
+                        cell: true,
                         overHidden: true
                     },
                     {
                         label: "金额",
                         prop: "overpayment",
+                        type: 'number',
+                        controls: false,
+                        cell: true,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }],
                         overHidden: true
                     },
                     {
@@ -146,6 +169,7 @@ export default {
                         label: "消费类型",
                         prop: "overpaymentType",
                         type: 'select',
+                        cell: true,
                         dicData: [{
                             label: '增加',
                             value: 0
@@ -153,6 +177,11 @@ export default {
                             label: '消费',
                             value: 1
                         }],
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }],
                         overHidden: true
                     },
                     {
@@ -176,6 +205,10 @@ export default {
                     {
                         label: "生成时间",
                         prop: "createTime",
+                        type: "datetime",
+                        format: "yyyy-MM-dd HH:mm:ss",
+                        valueFormat: "yyyy-MM-dd HH:mm:ss",
+                        cell: true,
                         overHidden: true
                     },
                     {
@@ -200,6 +233,22 @@ export default {
         }
     },
     methods: {
+        addRow() {
+            this.form.advanceChargeItemList.push({
+                $cellEdit: true,
+                identifier: 1
+            })
+        },
+        // 编辑
+        inEdit(row) {
+            if (row.$cellEdit == true) {
+                if (!row.overpayment || row.overpaymentType == null) return this.$message.error("请完善明细信息");
+                this.$set(row, '$cellEdit', false)
+            } else {
+                this.$set(row, '$cellEdit', true)
+            }
+
+        },
         dicChange(name, row) {
             if (name == 'corpName') {
                 if (row) {
@@ -270,6 +319,13 @@ export default {
             })
         },
         submit() {
+            for (let row of this.form.advanceChargeItemList) {
+                if (row.identifier == 1) {
+                    if (!row.overpayment || row.overpaymentType == null) {
+                        return this.$message.error("请完善明细信息");
+                    }
+                }
+            }
             this.$refs["form"].validate((valid, done) => {
                 done();
                 if (valid) {

src/views/maintenance/overpayment/detailsPage.vue

@@ -130,7 +130,11 @@ export default {
                 loading()
                 return
             }
-            submit(form).then(res => {
+            let obj={
+                ...form,
+                pid:this.detailData.id
+            }
+            submit(obj).then(res => {
                 this.$message.success('保存成功')
                 this.page.currentPage = 1
                 this.getDetails(this.detailData.id, this.page)

src/views/maintenance/rebate/detailsPage.vue

@@ -113,7 +113,11 @@ export default {
                 loading()
                 return
             }
-            typeSave2(form).then(res => {
+            let obj={
+                ...form,
+                corpId:this.detailData.id
+            }
+            typeSave2(obj).then(res => {
                 this.$message.success('保存成功')
                 this.page.currentPage = 1
                 this.getDetails(this.detailData.id, this.page)

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

@@ -87,9 +87,10 @@ export default {
           searchOrder: 4,
           search: true,
           overHidden: true,
-        }, {
+        }, 
+        {
           label: "客户",
-          prop: "corpName",
+          prop: "corpId",
           search: true,
           // remote: true,
           filterable:true,
@@ -98,10 +99,28 @@ export default {
           overHidden: true,
           props: {
             label: 'cname',
-            value: 'cname'
+            value: 'id'
           },
+          showColumn: false,
+          hide: true,
           dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH',
-        }, {
+        }, 
+        {
+          label: "客户",
+          prop: "corpName",
+          search: true,
+          // remote: true,
+          // filterable:true,
+          // searchOrder: 1,
+          // type: 'select',
+          overHidden: true,
+          // props: {
+          //   label: 'cname',
+          //   value: 'cname'
+          // },
+          // dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH',
+        }, 
+        {
           label: "结算日期",
           prop: "settlementDate",
           searchProp: "settlementDateList",

src/views/tirePartsMall/financingManagement/advanceCharge/detailsPage.vue

@@ -16,9 +16,9 @@
             <trade-card title="基础信息">
                 <avue-form :option="optionForm" v-model="form" ref="form">
                     <tempalte slot="corpName" slot-scope="{ row }">
-                        <dic-select v-model="form.corpName" placeholder="客户" key="id" label="cnName" res="records"
-                            url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
-                            dataName="cnName" @selectChange="dicChange('corpName', $event)"
+                        <dic-select v-model="form.corpName" placeholder="客户" key="id" label="cname" res="records"
+                            url="/blade-sales-part/corpsDesc/list?corpType=KH" :filterable="true" :remote="true"
+                            dataName="cname" @selectChange="dicChange('corpName', $event)"
                             :disabled="form.advanceChargeItemList.length>0"></dic-select>
                     </tempalte>
                     <tempalte slot="advancePaymentBalance">
@@ -32,7 +32,7 @@
                     </tempalte>
                     <tempalte slot="outOverpaymen">
                         <el-input-number v-model="form.outOverpaymen" @change="dicChange('outOverpaymen', form)"
-                            :controls="false" placeholder="请输入 消费金额" size="small" style="width: 100%;" :disabled="form.advanceChargeItemList.length>0"></el-input-number>
+                            :controls="false" placeholder="请输入 使用金额" size="small" style="width: 100%;" :disabled="form.advanceChargeItemList.length>0"></el-input-number>
                     </tempalte>
                 </avue-form>
             </trade-card>
@@ -53,7 +53,7 @@
 </template>
 
 <script>
-import { submit, getDetail } from "@/api/iosBasicData/advanceCharge";
+import { submit, getDetail } from "@/api/tirePartsMall/financingManagement/advanceCharge";
 import dicSelect from "@/components/dicSelect/main";
 
 import { bfeesList } from "@/api/iosBasicData/bfees";
@@ -89,7 +89,7 @@ export default {
                         prop: "inOverpayment",
                     },
                     {
-                        label: "消费金额",
+                        label: "使用金额",
                         prop: "outOverpaymen",
                     },
                     {
@@ -133,24 +133,14 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "收款金额",
-                        prop: "amountD",
-                        overHidden: true
-                    },
-                    {
-                        label: "付款金额",
-                        prop: "amountC",
-                        overHidden: true
-                    },
-                    {
-                        label: "消费类型",
+                        label: "类型",
                         prop: "overpaymentType",
                         type: 'select',
                         dicData: [{
                             label: '增加',
                             value: 0
                         }, {
-                            label: '消费',
+                            label: '使用',
                             value: 1
                         }],
                         overHidden: true

src/views/tirePartsMall/financingManagement/advanceCharge/index.vue

@@ -30,7 +30,7 @@
 </template>
   
 <script>
-import { getList, remove, submit } from "@/api/iosBasicData/advanceCharge";
+import { getList, remove, submit } from "@/api/tirePartsMall/financingManagement/advanceCharge";
 import detailsPage from "./detailsPage";
 import _ from "lodash";
 
@@ -73,9 +73,9 @@ export default {
                         type: 'select',
                         filterable: true,
                         remote: true,
-                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        dicUrl: "/api/blade-sales-part/corpsDesc/list?corpType=KH&cname={{key}}",
                         props: {
-                            label: 'cnName',
+                            label: 'cname',
                             value: 'id',
                             res: 'data.records'
                         },
@@ -100,7 +100,7 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "消费金额",
+                        label: "使用金额",
                         prop: "outOverpaymen",
                         overHidden: true
                     },

src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -14,7 +14,8 @@
                     :disabled="isSaveBtn" @click="editCustomer">保 存
                 </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" :type="buttonColor" size="small"
-                    :disabled="isDisabledTask || form.status !== '待确认' && form.status !== '待收货'" @click="generateOutbound">
+                    :disabled="isDisabledTask || form.status !== '待确认' && form.status !== '待收货'"
+                    @click="generateOutbound">
                     {{ buttonText }}
                 </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="info" size="small"
@@ -38,11 +39,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>
@@ -77,9 +80,9 @@
                         </el-select>
                     </template>
                     <tempalte slot="fundingPartyName" slot-scope="{ row }">
-                        <dic-select v-model="form.fundingPartyName" placeholder="资金方" key="id" label="cname" res="records"
-                            url="/blade-sales-part/corpsDesc/list?corpType=GYS" :filterable="true" :remote="true"
-                            dataName="cname" @selectChange="dicChange('fundingPartyName', $event)"
+                        <dic-select v-model="form.fundingPartyName" placeholder="资金方" key="id" label="cname"
+                            res="records" url="/blade-sales-part/corpsDesc/list?corpType=GYS" :filterable="true"
+                            :remote="true" dataName="cname" @selectChange="dicChange('fundingPartyName', $event)"
                             :disabled="editButton"></dic-select>
                     </tempalte>
                 </avue-form>
@@ -232,7 +235,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>
 
             <el-dialog title="导入明细" append-to-body :visible.sync="excelBox" v-if="excelBox" width="555px"
@@ -267,9 +271,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" />
@@ -291,7 +295,8 @@
                             </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%" />
                                 <!--<span v-else>{{ row.price }}</span>-->
                             </template>
 
@@ -339,7 +344,8 @@ import {
     revokeCheckOrderCG,
     revokeInboundTask,
     goodsListAll,
-    shortcutWarehousing
+    shortcutWarehousing,
+    getAdvancePaymentBalance
 } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { dotList, goodsDetail, getParamservice } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
 import reportDialog from "@/components/report-dialog/main";
@@ -613,6 +619,13 @@ export default {
                     disabled: true,
                 },
                 {
+                    label: '预付款',
+                    prop: "useAdvanceChargeAmount",
+                    type: 'number',
+                    controls: false,
+                    disabled: false,
+                },
+                {
                     label: '保证金',
                     prop: "bondAmount",
                     disabled: true,
@@ -690,7 +703,7 @@ export default {
                     prop: "remarks",
                     type: 'textarea',
                     disabled: false,
-                    span: 16,
+                    span: 12,
                     minRows: 1
                 }]
             },
@@ -1268,8 +1281,12 @@ export default {
             if (name == 'fundingPartyName') {
                 if (row) {
                     this.form.fundingPartyId = row.id
+                    getAdvancePaymentBalance({ corpId: row.id }).then(res => {
+                        this.form.useAdvanceChargeAmount = res.data.data
+                    })
                 } else {
                     this.form.fundingPartyId = null
+                    this.form.useAdvanceChargeAmount = null
                 }
             }
         },

src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue

@@ -338,6 +338,17 @@ export default {
             overHidden: true,
           },
           {
+            label: '预付款',
+            prop: "useAdvanceChargeAmount",
+            overHidden: true,
+          },
+          {
+            label: '产生预付款',
+            width: 120,
+            prop: "produceAdvanceChargeAmount",
+            overHidden: true,
+          },
+          {
             label: '保证金',
             prop: "bondAmount",
             overHidden: true,

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -10,6 +10,9 @@
                 <el-button size="small" style="margin-right: 8px" :disabled="!form.id"
                     @click="$refs.print.openDialog()">预 览
                 </el-button>
+                <el-button v-if="roleName.indexOf('admin') != -1" size="small" style="margin-right: 8px" :disabled="!form.id"
+                    @click="$refs.report.openDialog()">报表设计
+                </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
                     v-if="editButton"
                     :disabled="showLock || !(roleName.indexOf('admin') != -1 || roleName.indexOf('允许修改他人业务') != -1 || saberUserInfo.user_id == form.createUser|| saberUserInfo.user_name == form.operatorName)"
@@ -400,6 +403,7 @@
         </div>
         <business-reports :id="form.id" ref="print" businessValue="HYJK" classifyCode="业务" groupCode="销售报告"
             :type="1"></business-reports>
+            <reports :id="form.id" :assemblyForm="form" businessValue="HYJK" ref="report"></reports>
         <!--审核弹窗-->
         <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>
@@ -458,6 +462,7 @@
 import { storagefeeitems, submit, getDetail, detailTradeByMblno, remove, checkAgent, revokeCheckAgent, copyAgent, generateDispatchVehicles, confirmDispatchVehicles, generateWarehouseEntry, confirmWarehouseEntry, generateOutbound, dispatchvehiclesRemove, inoutstorageRemove, calculationWarehouseUnitPrice, billsCopyBills, submitList1, submitList2, revokePrecontainers, revokeDispatchVehicles, revokeWarehouseEntry, revokeInoutstorage, revokeOutbound, confirmInspection, revokeInspection, confirmReturnBox, revokeReturnBox } from "@/api/tradeAgency/oceanFreightImport";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import feeInfo from "@/components/tradeAgency/fee-oceanFreight";
+import reports from "@/components/tradeAgency/reports.vue";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
 import businessReports from "@/components/tradeAgency/businessReportsJK.vue";
@@ -1537,7 +1542,8 @@ export default {
         dicSelect,
         feeInfo,
         checkSchedule,
-        businessReports
+        businessReports,
+        reports
     },
     props: {
         detailData: Object

src/views/tradeAgency/oceanFreightImport/index.vue

@@ -132,8 +132,8 @@ export default {
                             label: '否',
                             value: 0
                         }],
-                        searchOrder: 10,
-                        search: true,
+                        // searchOrder: 10,
+                        // search: true,
                         overHidden: true
                     },
                     {
@@ -159,7 +159,7 @@ export default {
                         width: "140",
                         overHidden: true,
                         search: true,
-                        searchOrder: 2,
+                        searchOrder: 3,
                     },
                     {
                         label: "提单号",
@@ -167,7 +167,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         search: true,
-                        searchOrder: 3,
+                        searchOrder: 2,
                     },
                     {
                         label: "委托编号",
@@ -382,6 +382,24 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "是否退押",
+                        prop: "billingStatus",
+                        width: "70",
+                        type: 'select',
+                        dicData: [{
+                            label: '是',
+                            value: 1
+                        }, {
+                            label: '否',
+                            value: 0
+                        }],
+                        hide: true,
+                        showColumn: false,
+                        searchOrder: 10,
+                        search: true,
+                        overHidden: true
+                    },
+                    {
                         label: '操作员',
                         prop: 'operatorName',
                         width: "80",

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -8,6 +8,9 @@
             </div>
             <div class="add-customer-btn">
                 <el-button size="small" style="margin-right: 8px" :disabled="!form.id"
+                    @click="$refs.print.openDialog()">预 览
+                </el-button>
+                <el-button v-if="roleName.indexOf('admin') != -1" size="small" style="margin-right: 8px" :disabled="!form.id"
                     @click="$refs.report.openDialog()">报表设计
                 </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
@@ -389,7 +392,13 @@
         <el-dialog append-to-body title="尾款账单" class="el-dialogDeep" :visible.sync="wkDialog" width="50%" top="30vh"
             :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" @closed="wkClosed"
             v-dialog-drag>
-            <avue-form v-model="wkForm" :option="wkOption"></avue-form>
+            <avue-form v-model="wkForm" :option="wkOption">
+                <tempalte slot="contractDate" slot-scope="{ row }">
+                    <el-date-picker v-model="wkForm.contractDate" type="date" placeholder="请选择 汇率日期" format="yyyy-MM-dd"
+                        valueFormat="yyyy-MM-dd 00:00:00" @change="wkChange2()">
+                    </el-date-picker>
+                </tempalte>
+            </avue-form>
             <avue-crud :data="wkForm.agentItemsRList" :option="wkOptionList">
                 <tempalte slot="thisSettlementAmount" slot-scope="{ row }">
                     <el-input-number v-if="row.$cellEdit" v-model="row.thisSettlementAmount" @change="wkChange(row)"
@@ -436,7 +445,7 @@
             :close-on-press-escape="false" @closed="skClosed" v-dialog-drag>
             <avue-form v-model="skForm" :option="skOption">
                 <tempalte slot="contractDate" slot-scope="{ row }">
-                    <el-date-picker v-model="skForm.contractDate" type="date" placeholder="请选择 合同日期" format="yyyy-MM-dd"
+                    <el-date-picker v-model="skForm.contractDate" type="date" placeholder="请选择 汇率日期" format="yyyy-MM-dd"
                         valueFormat="yyyy-MM-dd 00:00:00" @change="skChange()">
                     </el-date-picker>
                 </tempalte>
@@ -541,6 +550,10 @@ export default {
                         disabled: true,
                     },
                     {
+                        label: '汇率日期',
+                        prop: 'contractDate'
+                    },
+                    {
                         label: '汇率',
                         prop: 'exchangeRate'
                     }
@@ -1834,6 +1847,15 @@ export default {
                 })
             })
         },
+        wkChange2(){
+            bcurrencyGetExrate({ date: this.wkForm.contractDate, dc: 'D' }).then(res => {
+                res.data.data.forEach(e => {
+                    if (this.form.currency == e.code) {
+                        this.wkForm.exchangeRate = e.exrate
+                    }
+                })
+            })
+        },
         allClick(name) {
             if (name == '一键保存') {
                 for (let row of this.form.agentItemsList) {

src/views/tradeAgency/tradeAgency/index.vue

@@ -24,7 +24,7 @@
                     </el-button>
                     <el-button type="warning" size="small" @click="outExport">导 出
                     </el-button>
-                    <el-button type="info" size="small" :disabled="selectionList.length == 0"
+                    <el-button type="success" size="small" :disabled="selectionList.length == 0"
                         @click="allClick('生成申请收款')">生成货款收款
                     </el-button>
                     <el-button type="warning" size="small" :disabled="selectionList.length == 0"