Merge branch 'master' of http://git.minpay.cc/SupplyChain/front

front-vue/src/permission.js

@@ -25,6 +25,9 @@ router.beforeEach((to, from, next) => {
       if (store.getters.roles.length === 0) {
         // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetInfo').then(res => {
+          if (res.code == 501) {
+            return;
+          }
           // 拉取user_info
           const roles = res.roles
           // 未选择企业或者企业状态不是正常

front-vue/src/store/modules/user.js

@@ -96,7 +96,7 @@ const user = {
             commit('SET_EXPIRES_IN', data.tokenInfo.expires_in)
           // 未注册用户
           } else {
-            
+
           }
           resolve(res)
         }).catch(error => {
@@ -142,6 +142,9 @@ const user = {
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo(state.token).then(res => {
+          if (res.code == 501) {
+            resolve(res)
+          }
           const user = res.user
           const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组

front-vue/src/utils/request.js

@@ -96,6 +96,18 @@ service.interceptors.response.use(res => {
         type: 'error'
       })
       return Promise.reject(new Error(msg))
+    }  else if (code === 501) {
+      MessageBox.confirm('您的账号已在其他地方登录，请重新登录!', '系统提示', {
+          confirmButtonText: '重新登录',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        store.dispatch('LogOut').then(() => {
+          location.href = '/home';
+        })
+      })
+      return res.data;
     } else if (code !== 200) {
       Notification.error({
         title: msg

front-vue/src/views/home.vue

@@ -236,7 +236,7 @@
             <el-row :gutter="20">
                 <!-- 第一行 -->
                 <el-col :xs="24" :sm="12" :md="8" :lg="8">
-                    <div class="zap-card">
+                    <div class="zap-card" @click="toCredit()">
                         <div class="zap-card__title">我开立的融信</div>
                         <div class="zap-card__wrap zap-card__blue">
                             <span class="zap-card__num">{{handleInput(getFinancedNum())}}</span>
@@ -244,7 +244,7 @@
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8">
-                    <div class="zap-card">
+                    <div class="zap-card" @click="toCreditLine()">
                         <div class="zap-card__title">可用授权额度</div>
                         <div class="zap-card__wrap zap-card__gold">
                             <span class="zap-card__num">{{handleInput(getsubNum())}}</span>
@@ -252,7 +252,7 @@
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8">
-                    <div class="zap-card">
+                    <div class="zap-card" @click="toRepayment()">
                         <div class="zap-card__title">即将到期付款</div>
                         <div class="zap-card__wrap zap-card__pink">
                             <span class="zap-card__num">{{handleInput(expiredBalance)}}</span>
@@ -269,7 +269,7 @@
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8">
-                    <div class="zap-card">
+                    <div class="zap-card" @click="toCreditLine()">
                         <div class="zap-card__title">可用授权额度(正向保理)</div>
                         <div class="zap-card__wrap zap-card__gold">
                             <span class="zap-card__num">{{handleInput(getsubNumForward())}}</span>
@@ -277,7 +277,7 @@
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8">
-                    <div class="zap-card">
+                    <div class="zap-card" @click="toCreditLine()">
                         <div class="zap-card__title">总授权额度(正向保理)</div>
                         <div class="zap-card__wrap zap-card__pink">
                             <span class="zap-card__num">{{handleInput(creditLineAllForward)}}</span>
@@ -339,11 +339,62 @@
                             @pagination="getNoticeList"
                             />
                         </el-tab-pane>
+                        <el-tab-pane label="已办记录" name="third" style="height:400px">
+                            <el-table :data="oldWorkList" :show-header="false">
+                                <el-table-column label="标题" align="center" prop="noticeTitle" :show-overflow-tooltip="true"/>
+                                <el-table-column label="时间" align="center" prop="createTime" :show-overflow-tooltip="true">
+                                    <template slot-scope="scope">
+                                        <span>{{ parseTime(new Date(scope.row.createTime)) }}</span>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                            
+                            <pagination
+                            v-show="oldWorkTotal>0"
+                            :total="oldWorkTotal"
+                            :page.sync="queryParamsOldWork.pageNum"
+                            :limit.sync="queryParamsOldWork.pageSize"
+                            :pager-count="5"
+                            :page-sizes="[5]"
+                            @pagination="getOldWorkList"
+                            />
+                        </el-tab-pane>
+                        <el-tab-pane label="30天内待还款汇总" name="fourth" style="height:400px">
+                            <el-table :data="expiredList" :show-header="true">
+                                <el-table-column label="融资编号" align="center" prop="zfiNumber" :show-overflow-tooltip="true"/>
+                                <el-table-column label="金额" align="center" prop="afiAmount" :show-overflow-tooltip="true"/>
+                                <el-table-column label="到期时间" align="center" prop="afiExpireDate" :show-overflow-tooltip="true">
+                                    <template slot-scope="scope">
+                                        <span>{{ parseTime(new Date(scope.row.afiExpireDate), '{y}-{m}-{d}') }}</span>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
+                                    <template slot-scope="scope">
+                                        <el-button
+                                            size="mini"
+                                            type="text"
+                                            icon="el-icon-info"
+                                            @click="handleInfo(scope.row)"
+                                        >详情</el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                            
+                            <pagination
+                            v-show="expiredTotal>0"
+                            :total="expiredTotal"
+                            :page.sync="queryParamsExpired.pageNum"
+                            :limit.sync="queryParamsExpired.pageSize"
+                            :pager-count="5"
+                            :page-sizes="[5]"
+                            @pagination="getExpiredList"
+                            />
+                        </el-tab-pane>
                     </el-tabs>
                 </div>
             </el-row>
             <!-- 融信授权额度、融信统计 -->
-            <el-row class="zap-margin" :gutter="20">
+            <!-- <el-row class="zap-margin" :gutter="20">
                 <el-col class="zap-chart-quto" :xs="24" :sm="16" :md="16" :lg="16">
                     <div style="padding: 0 20px;background: #fff;" class="zap-home-chart__title zap-home-chart__title--align-left zap-padding-clear zap-home-chart__title--middle">
                         融信授权额度
@@ -415,7 +466,7 @@
                 </el-col>
                 <el-col :span="12">
                     <div class="zap-bg zap-padding zap-home-chart__title zap-home-chart__title--align-left zap-padding-clear zap-home-chart__title--middle">
-                        融资开立资金表(7天内)
+                        融资开立资金表(30天内)
                         <span class="zap-home-chart__circle zap-home-chart__circle--blue" style="margin-left: 45px"></span>
                         <span class="zap-home-chart__text">开立额度</span>
                         <span class="zap-home-chart__circle zap-home-chart__circle--red zap-home-chart__circle--margin"></span>
@@ -423,12 +474,12 @@
                     </div>
                     <div id="echartBarCapitalDay" class="zap-bg " style="height: 300px"></div>
                 </el-col>
-            </el-row>
+            </el-row> -->
         </div>
 
         <!-- 融资企业 -->
         <div v-if="company.scyType == '02'">
-            <el-card class="box-card" style="width:22.4%;margin:0.6%;float:left;">
+            <el-card class="box-card" style="width:22.4%;margin:0.6%;float:left;" @click="toCredit()">
                 <div slot="header" class="clearfix">
                     <span style="color: #666ee8; font-weight: bold;">持有融信额度</span>
                 </div>
@@ -436,7 +487,7 @@
                     <span style="color: #666ee8; font-weight: bold;">{{handleInput(effectBalance)}}</span>
                 </div>
             </el-card>
-            <el-card class="box-card" style="width:22.4%;margin:0.6%;float:left;">
+            <el-card class="box-card" style="width:22.4%;margin:0.6%;float:left;" @click="toFinanceRecord()">
                 <div slot="header" class="clearfix">
                     <span style="color: #666ee8; font-weight: bold;">融资中额度</span>
                 </div>
@@ -444,7 +495,7 @@
                     <span style="color: #666ee8; font-weight: bold;">{{handleInput(availableBalance)}}</span>
                 </div>
             </el-card>
-            <el-card class="box-card" style="width:22.4%;margin:0.6%;float:left;">
+            <el-card class="box-card" style="width:22.4%;margin:0.6%;float:left;" @click="toFinanceRecord()">
                 <div slot="header" class="clearfix">
                     <span style="color: #666ee8; font-weight: bold;">已融资额度</span>
                 </div>
@@ -452,7 +503,7 @@
                     <span style="color: #666ee8; font-weight: bold;">{{handleInput(loanBalance)}}</span>
                 </div>
             </el-card>
-            <el-card class="box-card" style="width:22.4%;margin:0.6%;float:left;">
+            <el-card class="box-card" style="width:22.4%;margin:0.6%;float:left;" @click="toRepayment()">
                 <div slot="header" class="clearfix">
                     <span style="color: #666ee8; font-weight: bold;">即将到期融资额度(30天)</span>
                 </div>
@@ -515,6 +566,57 @@
                             @pagination="getNoticeList"
                             />
                         </el-tab-pane>
+                        <el-tab-pane label="已办记录" name="third" style="height:400px">
+                            <el-table :data="oldWorkList" :show-header="false">
+                                <el-table-column label="标题" align="center" prop="noticeTitle" :show-overflow-tooltip="true"/>
+                                <el-table-column label="时间" align="center" prop="createTime" :show-overflow-tooltip="true">
+                                    <template slot-scope="scope">
+                                        <span>{{ parseTime(new Date(scope.row.createTime)) }}</span>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                            
+                            <pagination
+                            v-show="oldWorkTotal>0"
+                            :total="oldWorkTotal"
+                            :page.sync="queryParamsOldWork.pageNum"
+                            :limit.sync="queryParamsOldWork.pageSize"
+                            :pager-count="5"
+                            :page-sizes="[5]"
+                            @pagination="getOldWorkList"
+                            />
+                        </el-tab-pane>
+                        <el-tab-pane label="30天内到期融信汇总" name="fourth" style="height:400px">
+                            <el-table :data="expiredList" :show-header="true">
+                                <el-table-column label="融资编号" align="center" prop="zfiNumber" :show-overflow-tooltip="true"/>
+                                <el-table-column label="金额" align="center" prop="afiAmount" :show-overflow-tooltip="true"/>
+                                <el-table-column label="到期时间" align="center" prop="afiExpireDate" :show-overflow-tooltip="true">
+                                    <template slot-scope="scope">
+                                        <span>{{ parseTime(new Date(scope.row.afiExpireDate), '{y}-{m}-{d}') }}</span>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
+                                    <template slot-scope="scope">
+                                        <el-button
+                                            size="mini"
+                                            type="text"
+                                            icon="el-icon-info"
+                                            @click="handleInfo(scope.row)"
+                                        >详情</el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                            
+                            <pagination
+                            v-show="expiredTotal>0"
+                            :total="expiredTotal"
+                            :page.sync="queryParamsExpired.pageNum"
+                            :limit.sync="queryParamsExpired.pageSize"
+                            :pager-count="5"
+                            :page-sizes="[5]"
+                            @pagination="getExpiredList"
+                            />
+                        </el-tab-pane>
                     </el-tabs>
                 </div>
             </el-card>
@@ -566,7 +668,7 @@
 </template>
 <script>
 import * as echarts from 'echarts';
-import { getCreditLineAll, getAvailableBalance, getEffectBalance, getLoanBalance, getLoseEffectBalance, getReturnBalance, getFinanceAmount, getFinanceAmountAll, getExpiredBalance, getCoreCreditLine, getCreditLineList, getCreditLineNumList, financeRecordMonth } from '@/api/service/report/credit'
+import { getCreditLineAll, getAvailableBalance, getEffectBalance, getLoanBalance, getLoseEffectBalance, getReturnBalance, getFinanceAmount, getFinanceAmountAll, getExpiredBalance, getCoreCreditLine, getCreditLineList, getCreditLineNumList, financeRecordMonth, getExpiredList } from '@/api/service/report/credit'
 import { getCompanyNum, getFinanceSupplier, getFinanceNum, getCompanyReport } from '@/api/service/report/company'
 import { getOwnCompany } from "@/api/common/company";
 import { accAdd, accSub } from "@/utils/calculation";
@@ -577,6 +679,7 @@ import  EchartBar  from '@/components/Echart/bar/index'
 import { EventBus } from '@/util/event-bus.js'
 import WorkDeal from "@/views/workDeal";
 import { getRouters } from '@/api/menu'
+import Cookies from 'js-cookie'
 export default {
   components: {
     EchartPie,
@@ -708,6 +811,20 @@ export default {
                 pageSize:5,
                 type:'01'
             },
+            oldWorkList:[],
+            oldWorkTotal: 0,
+            queryParamsOldWork:{
+                pageNum:1,
+                pageSize:5,
+                type:'00',
+                status:'1'
+            },
+            expiredList:[],
+            expiredTotal: 0,
+            queryParamsExpired:{
+                pageNum:1,
+                pageSize:5,
+            },
             activeName:'first',
             company:{},
             openWork:false,
@@ -878,11 +995,13 @@ export default {
                     //融信统计 -- 列表
                     this.getNumList()
                     //融资开立月度统计 -- 柱状图
-                    this.getFinanceRecordMonth()  
-                    //融资开立年度统计 -- 柱状图
                     this.getFinanceRecord()  
+                    //融资开立年度统计 -- 柱状图
+                    this.getFinanceRecordYear()  
                     //即将到期额度（30天）
                     this.getExpiredBalance()
+                    //即将到期额度（30天）-- 列表
+                    this.getExpiredList()
                     //查询代办
                     this.getWorkList()
                     //查询消息
@@ -899,6 +1018,8 @@ export default {
                     this.getEffectBalance()
                     //即将到期额度（30天）
                     this.getExpiredBalance()
+                    //即将到期额度（30天）-- 列表
+                    this.getExpiredList()
                     //查询代办
                     this.getWorkList()
                     //查询消息
@@ -1259,12 +1380,7 @@ export default {
             financeRecordMonth(queryParams).then((response) => {
                 this.yearDataList = response.data.dataList
                 this.yearExtraOption.xAxis[0].data = response.data.dateList
-                if (this.company.scyType == '01') {
-                    // 核心企业
-                    this.initEchartBarCapital('echartBarCapitalDay', response.data.dataList, response.data.dateList, true)
-                } else {
-                    this.iniEcharBar('echarBarBusiness', response.data.dataList, response.data.dateList)
-                }
+                this.iniEcharBar('echarBarBusiness', response.data.dataList, response.data.dateList)
             });
         },
         //查询代办
@@ -1281,6 +1397,20 @@ export default {
                 this.noticeTotal = response.total 
             });
         },
+        //查询已办
+        getOldWorkList(){
+            listNotice(this.queryParamsOldWork).then((response) => {
+                this.oldWorkList = response.rows
+                this.oldWorkTotal = response.total
+            });
+        },
+        //企业即将到期额度（30天） -- 列表
+        getExpiredList(){
+            getExpiredList(this.queryParamsExpired).then(response => {
+                this.expiredList = response.data.records;
+                this.expiredTotal = response.data.total
+            })
+        },
         //即将到期额度（30天）
         getExpiredBalance(){
             getExpiredBalance().then(response => {
@@ -1288,7 +1418,7 @@ export default {
             })
         },
         //融资开立年度统计 -- 柱状图
-        getFinanceRecord(){
+        getFinanceRecordYear(){
             let queryParams = {}
             queryParams.dateType = "01"
             financeRecordMonth(queryParams).then((response) => {
@@ -1297,6 +1427,16 @@ export default {
                 this.initEchartBarCapital('echartBarCapital', response.data.dataList, response.data.dateList)
             });
         },
+        //融资开立月度统计 -- 柱状图
+        getFinanceRecord(){
+            let queryParams = {}
+            queryParams.dateType = "03"
+            financeRecordMonth(queryParams).then((response) => {
+                this.monthDataList = response.data.dataList
+                this.monthExtraOption.xAxis[0].data = response.data.dateList
+                this.initEchartBarCapital('echartBarCapitalDay', response.data.dataList, response.data.dateList, true)
+            });
+        },
         initEchartBarCapital  (id, series, dateList, transform) {   
             if (transform) {
                 // 时间选择是周的时候进行转换 YYYY-MM-D 2 MM.D
@@ -1439,6 +1579,28 @@ export default {
             this.getWorkList()
             this.openWork = false;
         },
+        //去融信
+        toCredit(){
+          this.$router.push({ path: "/Bill/credit" });
+        },
+        //去授信
+        toCreditLine(){
+          this.$router.push({ path: "/Bill/creditLine" });
+        },
+        //去还款
+        toRepayment(){
+          this.$router.push({ path: "/Bill/repayment" });
+        },
+        //去融资
+        toFinanceRecord(){
+          this.$router.push({ path: "/Bill/financeRecord" });
+        },
+        /** 详情按钮操作 */
+        handleInfo(row) {
+            const zfrId = row.zfrId;
+            Cookies.set("/repayment/detailRepayment/"+zfrId+"/", this.$route.fullPath);
+            this.$router.push({path:"/repayment/detailRepayment/"+zfrId+"/"});
+        },
     },
 };
 </script>

front-vue/src/views/service/bill/addBill.vue

@@ -141,6 +141,19 @@
               type="date"
               placeholder="选择日期"
               :picker-options="pickerOptionsEnd"
+              v-if="payDate"
+              :disabled="true"
+            >
+            </el-date-picker>
+            <el-date-picker
+              style="width: 300px"
+              v-model="form.zbiPayDate"
+              clearable
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="选择日期"
+              :picker-options="pickerOptionsEnd"
+              v-if="!payDate"
             >
             </el-date-picker>
           </el-form-item>
@@ -457,10 +470,10 @@
                     <el-input v-model="invoice.ziiSellerNo" maxlength="20" />
                   </el-form-item>
                   <el-form-item label="发票金额：">
-                    <el-input v-model="invoice.ziiTotalAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiTotalAmount)" />
+                    <el-input v-model="invoice.ziiTotalAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiTotalAmount,'0')" />
                   </el-form-item>
                   <el-form-item label="税价金额：">
-                    <el-input v-model="invoice.ziiAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiAmount)"/>
+                    <el-input v-model="invoice.ziiAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiAmount,'1')"/>
                   </el-form-item>
                 </el-form>
               </el-main>
@@ -611,6 +624,11 @@ export default {
       required: true,
       default: () => "",
     },
+    payDate: {
+      type: String,
+      required: false,
+      default: () => null,
+    },
   },
   data() {
     return {
@@ -756,6 +774,8 @@ export default {
     // debugger;
     const companyId = this.companyId;
     const type = this.companyType;
+    const payDate = this.payDate;
+    this.form.zbiPayDate = payDate
     getOwnCompany()
       .then((response) => {
         this.company = response.data;
@@ -895,10 +915,14 @@ export default {
         });
     },
     //金额校验格式
-    changeRate(e,input){
+    changeRate(e,input,type){
       e.target.value=(e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
-      this.input=e.target.value
-      input=this.input
+      this.input=e.target.value;
+      if("0"==type){
+        this.invoice.ziiTotalAmount = e.target.value;
+      }else if("1"==type){
+        this.invoice.ziiAmount = e.target.value;
+      }
     },
     //表格置灰
     tableRowClassName({ row, rowIndex }) {

front-vue/src/views/service/bill/bill.vue

@@ -339,16 +339,19 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(row) {
+      this.resetQuery();
       Cookies.set("/bill/billAdd", this.$route.fullPath)
       this.$router.push({ path: "/bill/billAdd" });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.resetQuery();
       Cookies.set("/bill/billEdit/" + row.zbiId, this.$route.fullPath)
       this.$router.push({ path: "/bill/billEdit/" + row.zbiId });
     },
     /** 详情按钮操作 */
     handleDetail(row) {
+      this.resetQuery();
       Cookies.set("/bill/billDetail/" + row.zbiId, this.$route.fullPath)
       this.$router.push({ path: "/bill/billDetail/" + row.zbiId });
     },

front-vue/src/views/service/bill/billAdd.vue

@@ -451,10 +451,10 @@
                     <el-input v-model="invoice.ziiSellerNo" maxlength="20" />
                   </el-form-item>
                  <el-form-item label="发票金额：">
-                    <el-input v-model="invoice.ziiTotalAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiTotalAmount)" />
+                    <el-input v-model="invoice.ziiTotalAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiTotalAmount,'0')" />
                   </el-form-item>
                   <el-form-item label="税价金额：">
-                    <el-input v-model="invoice.ziiAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiAmount)"/>
+                    <el-input v-model="invoice.ziiAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiAmount,'1')"/>
                   </el-form-item>
                 </el-form>
               </el-main>
@@ -882,10 +882,14 @@ export default {
         });
     },
     //金额校验格式
-    changeRate(e,input){
+    changeRate(e,input,type){
       e.target.value=(e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
-      this.input=e.target.value
-      input=this.input
+      this.input=e.target.value;
+      if("0"==type){
+        this.invoice.ziiTotalAmount = e.target.value;
+      }else if("1"==type){
+        this.invoice.ziiAmount = e.target.value;
+      }
     },
     //表格置灰
     tableRowClassName({ row, rowIndex }) {

front-vue/src/views/service/bill/billEdit.vue

@@ -503,10 +503,10 @@
                     <el-input v-model="invoice.ziiSellerNo" maxlength="20" />
                   </el-form-item>
                   <el-form-item label="发票金额：">
-                    <el-input v-model="invoice.ziiTotalAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiTotalAmount)" />
+                    <el-input v-model="invoice.ziiTotalAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiTotalAmount,'0')" />
                   </el-form-item>
                   <el-form-item label="税价金额：">
-                    <el-input v-model="invoice.ziiAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiAmount)"/>
+                    <el-input v-model="invoice.ziiAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiAmount,'1')"/>
                   </el-form-item>
                 </el-form>
               </el-main>
@@ -969,10 +969,14 @@ export default {
         });
     },
     //金额校验格式
-    changeRate(e,input){
+    changeRate(e,input,type){
       e.target.value=(e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
-      this.input=e.target.value
-      input=this.input
+      this.input=e.target.value;
+      if("0"==type){
+        this.invoice.ziiTotalAmount = e.target.value;
+      }else if("1"==type){
+        this.invoice.ziiAmount = e.target.value;
+      }
     },
     //表格置灰
     tableRowClassName({ row, rowIndex }) {

front-vue/src/views/service/bill/editBill.vue

@@ -507,10 +507,10 @@
                     <el-input v-model="invoice.ziiSellerNo" maxlength="20" />
                   </el-form-item>
                   <el-form-item label="发票金额：">
-                    <el-input v-model="invoice.ziiTotalAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiTotalAmount)" />
+                    <el-input v-model="invoice.ziiTotalAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiTotalAmount,'0')" />
                   </el-form-item>
                   <el-form-item label="税价金额：">
-                    <el-input v-model="invoice.ziiAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiAmount)"/>
+                    <el-input v-model="invoice.ziiAmount" maxlength="16" @input.native="changeRate($event,invoice.ziiAmount,'1')"/>
                   </el-form-item>
                 </el-form>
               </el-main>
@@ -982,10 +982,14 @@ export default {
         });
     },
     //金额校验格式
-    changeRate(e,input){
+    changeRate(e,input,type){
       e.target.value=(e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
-      this.input=e.target.value
-      input=this.input
+      this.input=e.target.value;
+      if("0"==type){
+        this.invoice.ziiTotalAmount = e.target.value;
+      }else if("1"==type){
+        this.invoice.ziiAmount = e.target.value;
+      }
     },
     //表格置灰
     tableRowClassName({ row, rowIndex }) {

front-vue/src/views/service/company/coreCompanyManage.vue

@@ -449,6 +449,7 @@ export default {
     /* 企业详情 */
     handleDetail(row) {
       this.reset();
+      this.resetQuery();
       let scyId = row.scyId || this.ids;
       let scyAuthStatus = row.scyAuthStatus || this.ids;
       let scyStatus = row.scyStatus || this.ids;
@@ -580,12 +581,14 @@ export default {
           this.getList();
           this.msgSuccess("删除成功");
         })
-        .catch(() => {
+        .catch((c) => {
+          if(c == "cancel"){
           this.$message({
             type: "warning",
             message: "已取消删除",
            
           });
+          }
         }); 
     },
 

front-vue/src/views/service/company/supCompanyManage.vue

@@ -412,6 +412,7 @@ export default {
     /* 企业详情 */
     handleDetail(row) {
       this.reset();
+      this.resetQuery();
       let scyId = row.scyId || this.ids;
       let scyAuthStatus = row.scyAuthStatus || this.ids;
       let scyStatus = row.scyStatus || this.ids;
@@ -479,6 +480,8 @@ export default {
 
     //四要素审核
     handleExamine(row){
+      this.reset();
+      this.resetQuery();
       const scyId = row.scyId || this.ids;
       Cookies.set("/company/detailComPanyExam/" + scyId + '/', this.$route.fullPath)
       this.$router.push("/company/detailComPanyExam/" + scyId + '/');

front-vue/src/views/service/contract/contract.vue

@@ -265,18 +265,21 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.resetQuery();
       Cookies.set("/contract/addContract/", this.$route.fullPath);
       this.$router.push({path:"/contract/addContract/"});
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       const zfcId = row.zfcId
+      this.resetQuery();
       Cookies.set("/contract/editContract/"+zfcId+"/", this.$route.fullPath);
       this.$router.push({path:"/contract/editContract/"+zfcId+"/"});
     },
     /** 详情按钮操作 */
     handleInfo(row) {
       const zfcId = row.zfcId
+      this.resetQuery();
       Cookies.set("/contract/detailContract/"+zfcId+"/", this.$route.fullPath);
       this.$router.push({path:"/contract/detailContract/"+zfcId+"/"});
     },

front-vue/src/views/service/cost/costManage.vue

@@ -770,7 +770,7 @@ export default {
         .catch(() => {
           this.$message({
             type: "warning",
-            message: "已取消删除",
+            message: "已取消作废",
           });
         }); 
     },

front-vue/src/views/service/credit/addCredit.vue

@@ -11,7 +11,7 @@
                 <el-col :span="8">
                     <el-form-item label="授信额度" prop="zfiCoreQuotaId">
                         <el-select style="width: 300px" v-model="form.zfiCoreQuotaId" filterable clearable remote @change="change">
-                            <el-option v-for="item in creditLineList" :key="item.value" :label="item.label+item.remaining" :value="item.value">
+                            <el-option v-for="item in creditLineList" :key="item.value" :label="item.label+'/'+item.remaining" :value="item.value">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -223,7 +223,7 @@
         
         <!-- 新增往来账款 -->
         <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
-            <add-bill :companyId="form.zfiSupplierId" companyType="00" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
+            <add-bill :companyId="form.zfiSupplierId" companyType="00" :payDate="payDate" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
         </el-dialog>
         <!-- 修改往来账款 -->
         <el-dialog title="修改往来账款" :visible.sync="openEditBill" width="1120px" append-to-body>
@@ -398,7 +398,8 @@ export default {
             wordUrl: "",
             show:false,
             heid:false,
-            chooseTicket:[]
+            chooseTicket:[],
+            payDate:null
         };
     },
     created() {
@@ -411,6 +412,7 @@ export default {
         }),
             //获取授信额度
             listCreditLine(this.creditParams).then((response) => {
+                debugger
                 this.creditLineList = response.data.map((item) => {
                     return {
                         value: item.zfpcrId,
@@ -1035,6 +1037,11 @@ export default {
         },
         //新增应付
         addPay(){
+            //获取选中第一个的预计还款日期
+            if(this.chooseTicket[0]){
+                var zbiPayDate = this.chooseTicket[0].zbiPayDate;
+                this.payDate = zbiPayDate;
+            }
             if(this.form.zfiSupplierId){
                 this.openAddBill = true
             }else{

front-vue/src/views/service/credit/addInformation.vue

@@ -271,7 +271,7 @@
             
             <!-- 新增往来账款 -->
             <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
-                <add-bill :companyId="form.zfiCoreId" companyType="01" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
+                <add-bill :companyId="form.zfiCoreId" companyType="01" :payDate="payDate" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
             </el-dialog>
 
             <!--预览-->
@@ -393,7 +393,8 @@ export default {
           wordUrl: "",
           show:false,
           heid:false,
-          chooseTicket:[]
+          chooseTicket:[],
+          payDate:null
         };
     },
     /* watch:{
@@ -900,6 +901,11 @@ export default {
     },
     //新增应付
     addPay(){
+        //获取选中第一个的预计还款日期
+        if(this.chooseTicket[0]){
+            var zbiPayDate = this.chooseTicket[0].zbiPayDate;
+            this.payDate = zbiPayDate;
+        }
         if(this.form.zfiCoreId){
             this.openAddBill = true
         }else{

front-vue/src/views/service/credit/applyCreditEdit.vue

@@ -264,7 +264,7 @@
         
         <!-- 新增往来账款 -->
         <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
-            <add-bill :companyId="form.zfiCoreId" companyType="01" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
+            <add-bill :companyId="form.zfiCoreId" companyType="01" :payDate="payDate" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
         </el-dialog>
 
         <!--预览-->
@@ -399,7 +399,8 @@ export default {
             wordUrl: "",
             show:false,
             heid:false,
-            chooseTicket:[]
+            chooseTicket:[],
+            payDate:null
         };
     },
     watch:{
@@ -834,6 +835,11 @@ export default {
     },
     //新增应付
     addPay(){
+        //获取选中第一个的预计还款日期
+        if(this.chooseTicket[0]){
+            var zbiPayDate = this.chooseTicket[0].zbiPayDate;
+            this.payDate = zbiPayDate;
+        }
         if(this.form.zfiCoreId){
             this.openAddBill = true
         }else{

front-vue/src/views/service/credit/credit.vue

@@ -2437,7 +2437,7 @@ export default {
   position: relative;
 }
 .zap-credit__buttons{
-  position: absolute;
+  // position: absolute;  此属性导致按钮无法点击
   top: 0;
   right: 13px;
   display: flex;

front-vue/src/views/service/credit/creditApply.vue

@@ -274,7 +274,7 @@
         
         <!-- 新增往来账款 -->
         <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
-            <add-bill :companyId="form.zfiCoreId" companyType="01" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
+            <add-bill :companyId="form.zfiCoreId" companyType="01" :payDate="payDate" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
         </el-dialog>
         <!-- 附件详情 -->
         <el-dialog title="详情" :visible.sync="openDetailBill" width="1120px" append-to-body>
@@ -371,7 +371,8 @@ export default {
             wordUrl: "",
             show:false,
             heid:false,
-            chooseTicket:[]
+            chooseTicket:[],
+            payDate:null
           
         };
     },
@@ -861,6 +862,11 @@ export default {
     },
     //新增应付
     addPay(){
+        //获取选中第一个的预计还款日期
+        if(this.chooseTicket[0]){
+            var zbiPayDate = this.chooseTicket[0].zbiPayDate;
+            this.payDate = zbiPayDate;
+        }
         this.openAddBill = true
     },
     //新增账款回调

front-vue/src/views/service/credit/creditReport.vue

@@ -0,0 +1,700 @@
+<template >
+    <div id="" class="zap-home__main">
+        <!-- 融信授权额度、融信统计 -->
+            <el-col class="zap-chart-quto" :xs="24" :sm="12" :md="12" :lg="12" style="margin-top:25px">
+                <div style="padding: 0 20px;background: #fff;" class="zap-home-chart__title zap-home-chart__title--align-left zap-padding-clear zap-home-chart__title--middle">
+                    融信授权额度
+                    <span class="zap-home-chart__circle zap-home-chart__circle--blue" style="margin-left: 45px"></span>
+                    <span class="zap-home-chart__text">可用</span>
+                    <span class="zap-home-chart__circle zap-home-chart__circle--red zap-home-chart__circle--margin"></span>
+                    <span class="zap-home-chart__text">已用</span>
+                </div>
+                <el-row style="background: #fff;padding-right: 20px;height: 678px;">
+                    <el-col :span="24">
+                        <div id="echartPie" style="height: 300px;"></div>
+                    </el-col>
+                    <el-col :span="24">
+                        <div style="height:300px;padding: 0 20px;">
+                            <el-table :data="creditLineList">
+                                <el-table-column label="渠道名称" align="center" prop="managementName" :show-overflow-tooltip="true"/>
+                                <el-table-column label="额度" align="center" prop="allAmount" :show-overflow-tooltip="true"/>
+                                <el-table-column label="可用金额" align="center" prop="subAmount" :show-overflow-tooltip="true"/>
+                                <el-table-column label="已用金额" align="center" prop="availableAmount" :show-overflow-tooltip="true"/>
+                            </el-table>
+                            
+                            <pagination
+                            v-show="creditLineTotal>0"
+                            :total="creditLineTotal"
+                            :page.sync="queryParams.pageNum"
+                            :limit.sync="queryParams.pageSize"
+                            :pager-count="5"
+                            :page-sizes="[5]"
+                            @pagination="getList"
+                            />
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-col>
+            <el-col class="zap-statistics" :xs="24" :sm="12" :md="12" :lg="12" style="margin-top:25px">
+                <div class="zap-bg zap-padding zap-home-chart__title zap-home-chart__title--align-left zap-padding-clear zap-home-chart__title--middle">
+                    融资开立资金表(年)
+                    <span class="zap-home-chart__circle zap-home-chart__circle--blue" style="margin-left: 45px"></span>
+                    <span class="zap-home-chart__text">开立额度</span>
+                    <span class="zap-home-chart__circle zap-home-chart__circle--red zap-home-chart__circle--margin"></span>
+                    <span class="zap-home-chart__text">还款额度</span>
+                </div>
+                <div id="echartBarCapital" class="zap-bg " style="height: 300px"></div>
+            </el-col>
+            <el-col class="zap-statistics" :xs="24" :sm="12" :md="12" :lg="12">
+                <div class="zap-bg zap-padding zap-home-chart__title zap-home-chart__title--align-left zap-padding-clear zap-home-chart__title--middle">
+                    融资开立资金表(30天内)
+                    <span class="zap-home-chart__circle zap-home-chart__circle--blue" style="margin-left: 45px"></span>
+                    <span class="zap-home-chart__text">开立额度</span>
+                    <span class="zap-home-chart__circle zap-home-chart__circle--red zap-home-chart__circle--margin"></span>
+                    <span class="zap-home-chart__text">还款额度</span>
+                </div>
+                <div id="echartBarCapitalDay" class="zap-bg " style="height: 300px"></div>
+            </el-col>
+            <el-col :xs="24" :sm="12" :md="12" :lg="12">
+                <div style="background: #fff;padding: 0 20px;" class="zap-home-chart__title zap-home-chart__title--align-left zap-padding-clear zap-home-chart__title--middle">
+                    融信统计
+                </div>
+                <div style="height:300px;background: #fff;padding: 0 20px;">
+                    <el-table :data="creditLineNumList">
+                        <el-table-column label="渠道名称" align="center" prop="managementName" :show-overflow-tooltip="true"/>
+                        <el-table-column label="数量" align="center" prop="num" :show-overflow-tooltip="true"/>
+                        <el-table-column label="额度" align="center" prop="allAmount" :show-overflow-tooltip="true"/>
+                    </el-table>
+                    
+                    <pagination
+                    v-show="creditLineNumTotal>0"
+                    :total="creditLineNumTotal"
+                    :page.sync="queryParamsNum.pageNum"
+                    :limit.sync="queryParamsNum.pageSize"
+                    :pager-count="5"
+                    :page-sizes="[5]"
+                    @pagination="getNumList"
+                    />
+                </div>
+            </el-col>
+    </div>
+</template>
+<script>
+import * as echarts from 'echarts';
+import { getCoreCreditLine, getCreditLineList, getCreditLineNumList, financeRecordMonth } from '@/api/service/report/credit'
+import { amtformat } from "@/utils/amtCommon"
+import  EchartPie  from '@/components/Echart/pie/index'
+import  EchartBar  from '@/components/Echart/bar/index'
+export default {
+  components: {
+    EchartPie,
+    EchartBar,
+  },
+    data() {
+        return {
+            dateType: "00",
+            financeDateType: "00",
+            dataList:[],
+            creditLineList:[],
+            creditLineTotal:0,
+            queryParams:{
+                pageNum:1,
+                pageSize:5
+            },
+            creditLineNumList:[],
+            creditLineNumTotal:0,
+            queryParamsNum:{
+                pageNum:1,
+                pageSize:5
+            },
+        }
+    },
+    created: function () {
+        this.selectHome()
+    },
+    activated () {
+        this.selectHome()
+    }, 
+    mounted() {
+    },
+    methods: {
+        initChartPie (data, name, color, formatter) {
+            let chartPie = document.getElementById('echartPie');
+            let myChart = echarts.init(chartPie);
+            let option = {
+                tooltip: {
+                    trigger: 'item',
+                    formatter: '{b}： {d}%'
+                },
+                color: color,
+                label: {
+                    alignTo: 'edge',
+                    formatter: formatter,
+                    minMargin: 5,
+                    edgeDistance: 10,
+                    rich: {
+                        name: {
+                            lineHeight: 14,
+                            fontSize: 14,
+                            color: '#333'
+                        },
+                        percent: {
+                            lineHeight: 14,
+                            fontSize: 14,
+                        },
+                        percentUnit: {
+                            lineHeight: 34,
+                            fontSize: 14,
+                        },
+                        unit: {
+                            lineHeight: 46,
+                            fontSize: 22,
+                        }
+                    }
+                },
+                series: [
+                    {
+                        name: name,
+                        type: 'pie',
+                        radius: '50%',
+                        data: data,
+                        emphasis: {
+                            itemStyle: {
+                                shadowBlur: 10,
+                                shadowOffsetX: 0,
+                                shadowColor: 'rgba(0, 0, 0, 0.5)'
+                            }
+                        }
+                    }
+                ]
+            };
+            myChart.setOption(option);
+        },
+        //查询各角色首页模块
+        selectHome(){
+            //融信授权额度 -- 饼图
+            this.getCreditLine()
+            //融信授权额度 -- 列表
+            this.getList()
+            //融信统计 -- 列表
+            this.getNumList()
+            //融资开立月度统计 -- 柱状图
+            this.getFinanceRecord()  
+            //融资开立年度统计 -- 柱状图
+            this.getFinanceRecordYear()  
+        },
+        iniEcharBar (id, series, dateList) {
+            // 时间选择是周的时候进行转换 YYYY-MM-D 2 MM.D
+            if (this.dateType === '00') {
+                dateList = dateList.map(item => {
+                    let arr = item.split('-').slice(1)
+                    return arr.join('.')
+                })
+            }
+            
+            let _series = series.map(item => {
+                item.type = 'bar'
+                item.barWidth = 12
+                item.barGap = '25%'
+                return item
+            })
+            // _series.push({
+            //     name: '供应商',
+            //     type: 'line',
+            //     yAxisIndex: 1,
+            //     data: _series[0].data.map(item => {
+            //         return item / eval(_series[0].data.join('+')) * 100
+            //     })
+            // })
+            // _series.push({
+            //     name: '核心企业',
+            //     type: 'line',
+            //     yAxisIndex: 1,
+            //     data: _series[1].data.map(item => {
+            //         return item / eval(_series[1].data.join('+')) * 100
+            //     })
+            // })
+            let option = {
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'cross',
+                        crossStyle: {
+                            color: '#999'
+                        }
+                    }
+                },
+                color: ["#4280f2", "#30d894"],
+                xAxis: [
+                    {
+                        type: 'category',
+                        axisLine: {
+                            show: false
+                        },
+                        axisTick: {
+                            show:false //y轴坐标点消失
+                        },
+                        data: dateList,
+                        axisPointer: {
+                            type: 'shadow'
+                        },
+                        axisLabel: {
+                            margin: 34,
+                            fontSize: 16,
+                            color: '#666666',
+                        },
+                    }
+                ],
+                yAxis: [
+                    {
+                        type: 'value',
+                        name: '',
+                        axisLine:{
+                            show:false //y轴线消失
+                        },
+                        axisTick: {
+                            show:false //y轴坐标点消失
+                        },
+                        axisLabel: {
+                            margin: 11,
+                            fontSize: 16,
+                            color: '#666666',
+                            formatter: '{value}'
+                        },
+                        splitLine: {
+                            lineStyle: {
+                                 color: ['#e5e5e5'],
+                                 width: 2
+                            }
+                        }
+                    },
+                    {
+                        type: 'value',
+                        name: '',
+                        axisLine:{
+                            show:false //y轴线消失
+                        },
+                        axisTick: {
+                            show:false //y轴坐标点消失
+                        },
+                        // min: 0,
+                        // max: 100,
+                        // axisLabel: {
+                        //     margin: 11,
+                        //     fontSize: 16,
+                        //     color: '#666666',
+                        //     formatter: '{value}%'
+                        // },
+                        splitLine: {
+                            lineStyle: {
+                                 color: ['#e5e5e5'],
+                                 width: 2
+                            }
+                        }
+                    }
+                ],
+                series:  _series
+            };
+            let chartBar = document.getElementById(id);
+            let myChart = echarts.init(chartBar);
+            myChart.clear()
+            myChart.setOption(option)
+        },
+        iniEchartBarCore (series, dateList) {
+            if (this.financeDateType === '00') {
+                dateList = dateList.map(item => {
+                    let arr = item.split('-').slice(1)
+                    return arr.join('.')
+                })
+            }
+            var barCore = document.getElementById('echarBarCore');
+            var myChart = echarts.init(barCore);
+            let _series = series.map(item => {
+                item.type = 'bar'
+                item.barWidth = 75
+
+                item.label = {show: true}
+                return item
+            })
+            var option = {
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'shadow'
+                    }
+                },
+                color: ["#4280f2", "#30d894"],
+                grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        data: dateList,
+                         axisLine:{
+                            show:false //y轴线消失
+                        },
+                        axisTick: {
+                            show:false //y轴坐标点消失
+                        },
+                        axisLabel: {
+                            margin: 34,
+                            fontSize: 16,
+                            color: '#666666',
+                        },
+                    }
+                ],
+                yAxis: [
+                    {
+                        show: false
+                    }
+                ],
+                series: _series
+            };
+
+            option && myChart.setOption(option);
+        },
+        //融资开立年度统计 -- 柱状图
+        getFinanceRecordYear(){
+            let queryParams = {}
+            queryParams.dateType = "01"
+            financeRecordMonth(queryParams).then((response) => {
+                this.initEchartBarCapital('echartBarCapital', response.data.dataList, response.data.dateList)
+            });
+        },
+        //融资开立月度统计 -- 柱状图
+        getFinanceRecord(){
+            let queryParams = {}
+            queryParams.dateType = "03"
+            financeRecordMonth(queryParams).then((response) => {
+                this.initEchartBarCapital('echartBarCapitalDay', response.data.dataList, response.data.dateList, true)
+            });
+        },
+        initEchartBarCapital  (id, series, dateList, transform) {   
+            if (transform) {
+                // 时间选择是周的时候进行转换 YYYY-MM-D 2 MM.D
+                dateList = dateList.map(item => {
+                    let arr = item.split('-').slice(1)
+                    return arr.join('.')
+                })
+            }          
+            let _series = series.map(item => {
+                item.type = 'bar'
+                item.barWidth = 12
+                item.barGap = '20%'
+                return item
+            })
+            let option = {
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'cross',
+                        crossStyle: {
+                            color: '#999'
+                        }
+                    }
+                },
+                grid: {
+                    left: '20%'
+                },
+                color: ["#4280f2", "#fb738a"],
+                xAxis: [
+                    {
+                        type: 'category',
+                        axisLine: {
+                            show: false
+                        },
+                        axisTick: {
+                            show:false //y轴坐标点消失
+                        },
+                        data: dateList,
+                        axisPointer: {
+                            type: 'shadow'
+                        },
+                        axisLabel: {
+                            margin: 34,
+                            fontSize: 16,
+                            color: '#666666',
+                        },
+                    }
+                ],
+                yAxis: [
+                    {
+                        type: 'value',
+                        name: '',
+                        axisLine:{
+                            show:false //y轴线消失
+                        },
+                        axisTick: {
+                            show:false //y轴坐标点消失
+                        },
+                        axisLabel: {
+                            margin: 11,
+                            fontSize: 16,
+                            color: '#666666',
+                            formatter: '{value}'
+                        },
+                        splitLine: {
+                            lineStyle: {
+                                type: 'dashed',
+                                color: ['#e5e5e5'],
+                            }
+                        }
+                    },
+                    {
+                        type: 'value',
+                        name: '',
+                        axisLine:{
+                            show:false //y轴线消失
+                        },
+                        axisTick: {
+                            show:false //y轴坐标点消失
+                        },
+                        axisLabel: {
+                            margin: 11,
+                            fontSize: 16,
+                            color: '#666666',
+                            formatter: '{value}%'
+                        },
+                        splitLine: {
+                            lineStyle: {
+                                type: 'dashed',
+                                color: ['#e5e5e5'],
+                            }
+                        }
+                    }
+                ],
+                series:  _series
+            };
+            let chartBar = document.getElementById(id);
+            let myChart = echarts.init(chartBar);
+            myChart.clear()
+            myChart.setOption(option)
+        },
+        //融信授权额度 -- 饼图
+        getCreditLine(){
+            getCoreCreditLine().then(response => {
+                this.dataList = response.data;
+                this.initChartPie(response.data, '融信授权额度', ['#ff6d8a', '#4280f2'], '{percent|{d}%}\n{percentUnit|{c} 元}')
+            })
+        },
+        //融信授权额度 -- 列表
+        getList(){
+            getCreditLineList(this.queryParams).then(response => {
+                this.creditLineList = response.data.records;
+                this.creditLineTotal = response.data.total
+            })
+        },
+        //融信统计 -- 列表
+        getNumList(){
+            getCreditLineNumList(this.queryParamsNum).then(response => {
+                this.creditLineNumList = response.data.records;
+                this.creditLineNumTotal = response.data.total
+            })
+        },
+        /* 金额展示 */
+        handleInput(str) {
+            return amtformat(str,2, ".", ",");
+        },
+    },
+};
+</script>
+<style>
+.labelData .el-collapse-item__header{
+    height: 200px;
+}
+.app-main{
+    padding: 0 25px 30px 20px;
+    background-color: #f4f5f6;
+}
+</style>
+<style lang="scss">
+.zap-home__main .el-input--medium .el-input__inner{
+    font-size: 16px;
+    border-color: transparent;
+}
+.zap-card{
+    padding: 40px 28px 42px;
+    height: 160px;
+    background-color: #ffffff;
+    box-sizing: border-box;
+}
+.zap-card__title{
+    font-size: 18px;
+    font-weight: normal;
+    color: #666666;
+}
+.zap-card__wrap{
+    margin-top: 30px;
+    font-size: 0;
+}
+.zap-card__slash,
+.zap-card__num{
+    display: inline-block;
+    line-height: 1;
+    font-size: 40px;
+}
+.zap-card__slash{
+    padding: 0 8px;
+}
+.zap-card__unit{
+    display: inline-block;
+    line-height: 1;
+    font-size: 20px;
+}
+.zap-card__blue{
+    color: #4280f2;
+}
+.zap-card__gold{
+    color: #e6a71b;   
+}
+.zap-card__pink{
+    color: #fb738a;
+}
+.zap-home__main{
+    .el-col{
+        margin-bottom: 20px;
+    }
+    .zap-home__title{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 78px;
+        font-size: 18px;
+        color: #333333;
+    }
+
+    .zap-home-chart{
+        background-color: #ffffff;
+    }
+    .zap-home-chart__title{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 78px;
+        padding: 0 30px;
+        font-size: 18px;
+        color: #333333;
+        white-space: nowrap;
+    }
+    .zap-home-chart__title--middle{
+        height: 58px;
+    }
+    .zap-home-chart__title--align-left{
+        justify-content: flex-start;
+    }
+    .zap-home-chart--space{
+        margin-top: 20px;
+    }
+    .zap-home-chart__wrap{
+        display: flex;
+        align-items: center;
+    }
+    .zap-home-chart__select{    
+        width: 116px;
+        height: 40px;
+        margin-left: 26px;
+        background-image: linear-gradient(
+            #ffffff, 
+            #ffffff), 
+        linear-gradient(
+            #71befe, 
+            #71befe);
+        background-blend-mode: normal, 
+            normal;
+        border: solid 1px #ebebeb;
+        .el-input--medium .el-input__inner{
+            line-height: 38px;
+            height: 38px;
+            font-size: 14px;
+        }
+    }
+    // 自定义图例
+    .zap-home-chart__legend{
+        display: flex;
+        align-items: center;
+    }
+    .zap-home-chart__circle{
+        display: inline-block;
+        width: 11px;
+        height: 11px;
+        border-radius: 50%;
+    }
+    .zap-home-chart__circle--blue{
+        background-color: #4280f2;
+    }
+    .zap-home-chart__circle--green{
+        background-color: #30d894;
+    }
+    .zap-home-chart__circle--red{
+        background-color: #ff6d8a;
+    }
+    .zap-home-chart__circle--margin{
+        margin-left: 25px;
+    }
+    .zap-home-chart__text{
+        margin-left: 10px;
+        font-size: 14px;
+        color: #666666;
+    }
+    .zap-home-chart__search{
+        width: 199px;
+        height: 40px;
+        margin-left: 30px;
+        background-image: linear-gradient(
+            #ffffff, 
+            #ffffff), 
+        linear-gradient(
+            #71befe, 
+            #71befe);
+        background-blend-mode: normal, 
+            normal;
+        border: solid 1px #ebebeb;
+        .zap-home .el-input--medium .el-input__inner{
+            height: 38px;
+            line-height: 38px;
+            font-size: 14px;
+        }
+    }
+    .zap-margin{
+        margin-top: 25px;
+    }
+    // 消息列表
+    .el-card__body{
+        padding: 0 18px;
+    }
+    .el-tabs__item{
+        height: 54px;
+        line-height: 54px;
+        font-size: 16px;
+        color: #666;
+    }
+    .el-table th.el-table__cell.is-leaf, .el-table td.el-table__cell{
+        border-bottom: 1px dashed #999999;
+    }
+    .zap-padding-clear{
+        padding: 0;
+    }
+    .zap-list{
+        padding: 0 18px;
+        background-color: #ffffff;
+    }
+    .zap-chart-quto{
+        height: 720px;
+    }
+    .zap-statistics{
+        height: 358px;
+        padding: 0 20px;
+    }
+    .zap-padding{
+        padding: 0 20px;
+    }
+    .zap-bg{
+        background-color: #fff;
+    }
+}
+
+</style>

front-vue/src/views/service/credit/creditUpdate.vue

@@ -275,14 +275,14 @@
         
         <!-- 新增往来账款 -->
         <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
-            <add-bill :companyId="form.zfiSupplierId" companyType="00" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
+            <add-bill :companyId="form.zfiSupplierId" companyType="00" :payDate="payDate" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
         </el-dialog>
 
         <!--预览-->
-        <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
-            <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
-            <iframe :src="wordUrl" width='800px' height='600px' frameborder='1' v-if="heid"/>
-        </el-dialog>
+        <el-dialog  :visible.sync="openFile" width="900px" append-to-body>
+            <img :src="wordUrl" v-if="show" width='800px' height='500px'/>
+            <iframe :src="wordUrl" width='800px' height='500px' frameborder='1' v-if="heid"/>
+      </el-dialog>
   </div>
 </template>
 <script>
@@ -412,7 +412,8 @@ export default {
             wordUrl: "",
             show:false,
             heid:false,
-            chooseTicket:[]    
+            chooseTicket:[],
+            payDate:null 
         };
     },
     watch:{
@@ -945,6 +946,11 @@ export default {
     },
     //新增应付
     addPay(){
+        //获取选中第一个的预计还款日期
+        if(this.chooseTicket[0]){
+            var zbiPayDate = this.chooseTicket[0].zbiPayDate;
+            this.payDate = zbiPayDate;
+        }
         this.openAddBill = true
     },
     //新增账款回调

front-vue/src/views/service/credit/financeOpen.vue

@@ -258,7 +258,7 @@
         
         <!-- 新增往来账款 -->
         <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
-            <add-bill :companyId="form.zfiCoreId" companyType="01" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
+            <add-bill :companyId="form.zfiCoreId" companyType="01" :payDate="payDate" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
         </el-dialog>
         <!-- 附件详情 -->
         <el-dialog title="详情" :visible.sync="openDetailBill" width="1120px" append-to-body>
@@ -412,7 +412,8 @@ export default {
             wordUrl: "",
             show:false,
             heid:false,
-            chooseTicket:[]
+            chooseTicket:[],
+            payDate:null
         };
     },
     created() {
@@ -970,6 +971,11 @@ export default {
     },
     //新增应付
     addPay(){
+        //获取选中第一个的预计还款日期
+        if(this.chooseTicket[0]){
+            var zbiPayDate = this.chooseTicket[0].zbiPayDate;
+            this.payDate = zbiPayDate;
+        }
         this.openAddBill = true
     },
     //新增账款回调

front-vue/src/views/service/credit/financeOpenUpdate.vue

@@ -268,7 +268,7 @@
         
         <!-- 新增往来账款 -->
         <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
-            <add-bill :companyId="form.zfiCoreId" companyType="01" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
+            <add-bill :companyId="form.zfiCoreId" companyType="01" :payDate="payDate" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
         </el-dialog>
 
         <!--预览-->
@@ -410,7 +410,8 @@ export default {
             wordUrl: "",
             show:false,
             heid:false,
-            chooseTicket:[]
+            chooseTicket:[],
+            payDate:null
         };
     },
     watch:{
@@ -975,6 +976,11 @@ export default {
     },
     //新增应付
     addPay(){
+        //获取选中第一个的预计还款日期
+        if(this.chooseTicket[0]){
+            var zbiPayDate = this.chooseTicket[0].zbiPayDate;
+            this.payDate = zbiPayDate;
+        }
         this.openAddBill = true
     },
     //新增账款回调

front-vue/src/views/service/credit/goFinance.vue

@@ -143,9 +143,9 @@
             <el-button @click="cancel">取 消</el-button>
         </div>
           <!--预览-->
-        <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
-            <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
-            <iframe :src="wordUrl" width='800px' height='600px' frameborder='1' v-if="heid"/>
+        <el-dialog  :visible.sync="openFile" width="900px" append-to-body>
+          <img :src="wordUrl" v-if="show" width='800px' height='500px'/>
+          <iframe :src="wordUrl" width='800px' height='500px' frameborder='1' v-if="heid"/>
         </el-dialog>
   </div>
 </template>

front-vue/src/views/service/credit/signFor.vue

@@ -221,7 +221,7 @@
             
             <!-- 新增往来账款 -->
             <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
-                <add-bill :companyId="form.zfiCoreId" companyType="01" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
+                <add-bill :companyId="form.zfiCoreId" companyType="01" :payDate="payDate" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
             </el-dialog>
             <el-dialog title="详情" :visible.sync="openDetailBill" width="1120px" append-to-body>
                 <detail-bill :zbiId="this.zbiId"   v-if="openDetailBill"></detail-bill>
@@ -357,6 +357,7 @@ export default {
           show:false,
           heid:false,
           chooseTicket:[],
+          payDate:null,
           //开立方
           openName:"",
           //开立社会码
@@ -903,6 +904,11 @@ export default {
     },
     //新增应付
     addPay(){
+        //获取选中第一个的预计还款日期
+        if(this.chooseTicket[0]){
+            var zbiPayDate = this.chooseTicket[0].zbiPayDate;
+            this.payDate = zbiPayDate;
+        }
         if(this.form.zfiCoreId){
             this.openAddBill = true
         }else{

front-vue/src/views/service/creditLine/addCreditLine.vue

@@ -248,8 +248,8 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <!-- <el-button @click="cancel">取 消</el-button> -->
       </div>
-    <el-dialog :title="title" :visible.sync="openWord" width="1000px" append-to-body>
-      <iframe :src="wordUrl" width='700px' height='500px' frameborder='1' />
+    <el-dialog :title="title" :visible.sync="openWord" width="900px" append-to-body>
+      <iframe :src="wordUrl" width='800px' height='500px' frameborder='1' />
     </el-dialog>
   </div>
 </template>

front-vue/src/views/service/creditLine/creditLine.vue

@@ -9,8 +9,8 @@
                          <column-setting :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId" style="margin-left:5px" v-if="this.companyType != '02'"></column-setting>
          </div>
          <hr  style="margin-top: 16px;">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item prop="rzScyName" label="资金方名称" label-width="77px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" >
+      <el-form-item prop="rzScyName" label="资金方名称" label-width="82px" v-if="this.companyType != '02'">
         <el-input
           v-model="queryParams.rzScyName"
           placeholder="请输入资金方名称"
@@ -30,7 +30,7 @@
           style="width: 190px"
         />
       </el-form-item>
-      <el-form-item prop="AmountA"  label="授信额度范围" label-width="90px">
+      <el-form-item prop="AmountA"  label="授信额度范围" label-width="96px">
         <el-input
           v-model="queryParams.AmountA"
           placeholder="请输授信额度"
@@ -63,8 +63,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="授信类型" prop="zfpType">
-        <el-select v-model="queryParams.zfpType" placeholder="请选择类型" clearable size="small">
+      <el-form-item label="授信类型" prop="zfpType" v-if="this.companyType != '02'">
+        <el-select v-model="queryParams.zfpType" placeholder="请选择类型" clearable size="small" >
           <el-option
             v-for="dict in typeOptions"
             :key="dict.dictValue"
@@ -336,11 +336,11 @@ export default {
         },
         {
           label: "zfpcrStartDate",
-          value: "开始日期"
+          value: "生效日期"
         },
         {
           label: "zfpcrEndDate",
-          value: "结束日期"
+          value: "到期日期"
         },
         {
           label: "zfpcrStatus",
@@ -413,6 +413,7 @@ export default {
     getList() {
       this.loading = true;
       listCreditLine(this.queryParams).then(response => {
+        debugger
         this.creditLineList = response.data.records;
         if(response.data.records[0]){
           this.companyType = response.data.records[0].companyType
@@ -520,6 +521,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.resetQuery();
       Cookies.set("/creditLine/addCreditLine/", this.$route.fullPath)
       this.$router.push("/creditLine/addCreditLine/");
     },
@@ -528,6 +530,7 @@ export default {
       const zfpcrId = row.zfpcrId || this.ids;
       const zfiAmount = row.zfiAmount;
       const usableAmount = row.usableAmount;
+      this.resetQuery();
       Cookies.set("/creditLine/editCreditLine/" + zfpcrId + '/' + zfiAmount + '/' + usableAmount + '/', this.$route.fullPath)
       this.$router.push("/creditLine/editCreditLine/" + zfpcrId + '/' + zfiAmount + '/' + usableAmount + '/');
     },
@@ -536,6 +539,7 @@ export default {
       const zfpcrId = row.zfpcrId || this.ids;
       const zfiAmount = row.zfiAmount;
       const usableAmount = row.usableAmount;
+      this.resetQuery();
       Cookies.set("/creditLine/detailCreditLine/" + zfpcrId + '/' + zfiAmount + '/' + usableAmount + '/', this.$route.fullPath)
       this.$router.push("/creditLine/detailCreditLine/" + zfpcrId + '/' + zfiAmount + '/' + usableAmount + '/',);
     },
@@ -564,6 +568,7 @@ export default {
     handleSupplier(row){
       const zfpcrId = row.zfpcrId || this.ids;
       const zfpcrCompanyId = row.zfpcrCompanyId;
+      this.resetQuery();
       Cookies.set("/creditLine/supplierCreditLine/" + zfpcrId + '/' + zfpcrCompanyId, this.$route.fullPath)
       this.$router.push("/creditLine/supplierCreditLine/" + zfpcrId + '/' + zfpcrCompanyId);
     },

front-vue/src/views/service/creditLine/detailCreditLine.vue

@@ -261,13 +261,13 @@
         <el-button size="mini" type="primary" @click="closeTicket">确认</el-button>
       </span>
     </el-dialog>
-      <div class="footer" style="margin-top: 100px; float: right">
-      <el-button type="info" @click="cancel">取消</el-button>
-      <!-- <el-button type="success" @click="submitForm"
-        >提交</el-button> -->
-    </div>
-    <el-dialog :title="title" :visible.sync="openWord" width="1000px" append-to-body>
-      <iframe :src="wordUrl" width='700px' height='500px' frameborder='1' />
+       <div style="margin-top: 100px; margin-left:45%">
+        <el-button type="info" @click="cancel">取消</el-button>
+        <!-- <el-button type="success" @click="submitForm"
+            >提交</el-button> --> 
+      </div>
+    <el-dialog :title="title" :visible.sync="openWord" width="900px" append-to-body>
+      <iframe :src="wordUrl" width='800px' height='500px' frameborder='1' />
     </el-dialog>
   </div>
 </template>

front-vue/src/views/service/creditLine/editCreditLine.vue

@@ -271,8 +271,8 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <!-- <el-button @click="cancel">取 消</el-button> -->
       </div>
-    <el-dialog :title="title" :visible.sync="openWord" width="1000px" append-to-body>
-      <iframe :src="wordUrl" width='700px' height='500px' frameborder='1' />
+    <el-dialog :title="title" :visible.sync="openWord" width="900px" append-to-body>
+      <iframe :src="wordUrl" width='800px' height='500px' frameborder='1' />
     </el-dialog>
   </div>
 </template>

front-vue/src/views/service/creditLine/supplierCreditLine.vue

@@ -159,7 +159,7 @@
           <el-input v-model="form.zfsqAccountBank"  placeholder="请输入还款账户开户行" style="width:300px" maxlength="30"/>
         </el-form-item>
         <el-form-item label="授信额度:" prop="zfsqAmount">
-            <el-input v-model="form.zfsqAmount" placeholder="请输入授信额度"  style="width:300px">
+            <el-input v-model="form.zfsqAmount" @input.native="changeRate($event,form.zfsqAmount)" placeholder="请输入授信额度"  style="width:300px">
               <template slot="append">元</template>
             </el-input>
         </el-form-item>
@@ -308,18 +308,13 @@ export default {
         zfsqAccountBank: [
           { required: true, message: "还款账户开户行不能为空", trigger: ["blur", "change"] },
           {
-            pattern: /^[u4e00-u9fa5]$/,
+            pattern: /[\u4e00-\u9fa5]/,
             message: "请输入正确的账户开户行",
             trigger: ["blur", "change"],
           },
         ],
         zfsqAmount: [
           { required: true, message: "授信额度不能为空", trigger: ["blur", "change"] },
-          {
-            pattern: /^[0-9][0-9]{0,7}$|^[1-9][0-9]{0,7}[.]\d{1,2}$/,
-            message: "请输入正确的额度",
-            trigger: ["blur", "change"],
-          },
         ],
       }
     };
@@ -432,6 +427,11 @@ export default {
         this.title = "修改供应商授信额度";
       });
     },
+    changeRate(e,input){
+      e.target.value=(e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
+      this.input=e.target.value
+      this.form.zfsqAmount=this.input
+    },
     /** 冻结/解冻按钮操作 */
     handleUpdate(row) {
       let text = row.zfsqStatus === "0" ? "解冻" : "冻结";

front-vue/src/views/service/financeProduct/financeProduct.vue

@@ -312,23 +312,25 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.resetQuery();
       Cookies.set("/financeProduct/addFinanceProduct/", this.$route.fullPath);
       this.$router.push({path:"/financeProduct/addFinanceProduct/"});
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       const zfpId = row.zfpId
+      this.resetQuery();
       Cookies.set("/financeProduct/editFinanceProduct/"+zfpId+"/", this.$route.fullPath);
       this.$router.push({path:"/financeProduct/editFinanceProduct/"+zfpId+"/"});
     },/** 修改按钮操作 */
     handleInfo(row) {
       const zfpId = row.zfpId
+      this.resetQuery();
       Cookies.set("/financeProduct/detailFinanceProduct/"+zfpId+"/", this.$route.fullPath);
       this.$router.push({path:"/financeProduct/detailFinanceProduct/"+zfpId+"/"});
     },
     /** 启用按钮操作 */
      handleChange(row) {
-       
          let text = row.zfpStatus === "00" ? "开启产品" : "停用产品";
             this.$confirm(
                 "确认要" + text + '"' + row.zfpName + '"吗?',

front-vue/src/views/service/financeRecord/addFinanceRecord.vue

@@ -127,7 +127,7 @@
       </div>
       <!--预览-->
       <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
-        <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
+        <img :src="wordUrl" v-if="show" width='700px' height='500px'/>
         <iframe :src="wordUrl" width='800px' height='600px' frameborder='1' v-if="heid"/>
       </el-dialog>
   </div>

front-vue/src/views/service/financeRecord/approvalRecordDetail.vue

@@ -132,9 +132,9 @@
         <!-- <el-button @click="cancel">取 消</el-button> -->
       </div>
       <!--预览-->
-      <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
-        <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
-        <iframe :src="wordUrl" width='800px' height='600px' frameborder='1' v-if="heid"/>
+      <el-dialog  :visible.sync="openFile" width="900px" append-to-body>
+        <img :src="wordUrl" v-if="show" width='800px' height='500px'/>
+        <iframe :src="wordUrl" width='800px' height='500px' frameborder='1' v-if="heid"/>
       </el-dialog>
   </div>
 </template>

front-vue/src/views/service/financeRecord/detailFinanceRecord.vue

@@ -135,9 +135,9 @@
             >提交</el-button> -->
       </div>
       <!--预览-->
-      <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
-        <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
-        <iframe :src="wordUrl" width='800px' height='600px' frameborder='1' v-if="heid"/>
+      <el-dialog  :visible.sync="openFile" width="900px" append-to-body>
+        <img :src="wordUrl" v-if="show" width='800px' height='500px'/>
+        <iframe :src="wordUrl" width='800px' height='500px' frameborder='1' v-if="heid"/>
       </el-dialog>
   </div>
 </template>

front-vue/src/views/service/financeRecord/financeRecord.vue

@@ -995,6 +995,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.resetQuery();
       Cookies.set("/financeRecord/addFinanceRecord/", this.$route.fullPath);
       this.$router.push("/financeRecord/addFinanceRecord/");
       // this.reset();
@@ -1024,6 +1025,7 @@ export default {
     handleDetail(row) {
       this.reset();
       const zfrId = row.zfrId || this.ids;
+      this.resetQuery();
       Cookies.set(
         "/financeRecord/detailFinanceRecord/" + zfrId,
         this.$route.fullPath
@@ -1033,6 +1035,7 @@ export default {
     //盖章
     seal(row){
         const zfrId = row.zfrId || this.ids
+        this.resetQuery();
         Cookies.set("/financeRecord/recordSeal/"+zfrId + "/", this.$route.fullPath)
         this.$router.push({ path: "/financeRecord/recordSeal/"+zfrId + "/" });
     },

front-vue/src/views/service/financeRecord/recordSeal.vue

@@ -197,10 +197,10 @@
              <img :src="'data:image/jpeg;base64,' + this.fileUrl" style="overflow: auto; width: 100%; height: 100%;"/>
         </el-dialog>
         <!--预览-->
-      <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
-        <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
-        <iframe :src="wordUrl" width='800px' height='600px' frameborder='1' v-if="heid"/>
-      </el-dialog>
+        <el-dialog  :visible.sync="openFile" width="900px" append-to-body>
+            <img :src="wordUrl" v-if="show" width='800px' height='500px'/>
+            <iframe :src="wordUrl" width='800px' height='500px' frameborder='1' v-if="heid"/>
+        </el-dialog>
   </div>
 </template>
 <script>

front-vue/src/views/service/invoice/invoice.vue

@@ -303,15 +303,16 @@ export default {
     },
     //文件下载
     handleDownload(row){
+      this.resetQuery();
         const pfiUrl = row.pfiUrl;
         if(pfiUrl != null && pfiUrl != ''){
         window.open(pfiUrl +"/"+ getToken());
         }else{
-            this.$message({
-            message: '该附件不存在！',
-            type: 'warning'
-            });
-            return;
+          this.$message({
+          message: '该附件不存在！',
+          type: 'warning'
+          });
+          return;
         }
     },
     /** 查询收开票信息列表 */

front-vue/src/views/service/rel/companyRel.vue

@@ -912,7 +912,8 @@ export default {
     },
     //查询企业详情
     handleCompanyQuery(row){
-      this.reset();
+      this.resetQuery();
+      this.resetSpareQuery();
       if(row.receive == true){
       const scyId = row.launchCompanyId;
       listCompanyQuery(scyId).then(response => {

front-vue/src/views/service/rel/companyRelManage.vue

@@ -529,6 +529,8 @@ export default {
     //查询企业详情
     handleCompanyQuery(row){
       this.reset();
+      this.resetQuery();
+      this.resetSpareQuery();
       if(row.receive == true){
       const scyId = row.launchCompanyId;
       listCompanyQuery(scyId).then(response => {

front-vue/src/views/service/repayment/repayment.vue

@@ -540,6 +540,7 @@ export default {
         /** 详情按钮操作 */
         handleInfo(row) {
             const zfrId = row.zfrId;
+            this.resetQuery();
             Cookies.set("/repayment/detailRepayment/"+zfrId+"/", this.$route.fullPath);
             this.$router.push({path:"/repayment/detailRepayment/"+zfrId+"/"});
         },

front-vue/src/views/system/role/index.vue

@@ -363,7 +363,7 @@ export default {
     this.getList();
     this.getCompanyList();
     this.getUserProfile();
-    this.getDicts("sys_normal_disable").then(response => {
+    this.getDicts("role_state").then(response => {
       this.statusOptions = response.data;
     });
   },

front-vue/src/views/system/user/index.vue

@@ -1150,6 +1150,7 @@ export default {
     },
     /** 确认变更经办人*/
     confirmHandler(row) {
+      this.resetQuery();
       Cookies.set("/user/detail/" + row.userId, this.$route.fullPath)
       this.$router.push({ path: "/user/detail/" + row.userId });
     },
@@ -1188,6 +1189,12 @@ export default {
       if(userName){
       this.$set(this.form, "userName", userName);
       }
+      if(userId){
+      this.$set(this.form, "userId", userId);
+      }
+      if(scyId){
+      this.$set(this.form, "scyId", scyId);
+      }
       getUser(userId, scyId).then((response) => {
         this.uinParams.ssId = response.data.staffCode;
         this.getRodept(scyId);