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

front-vue/src/api/service/companyInformation/companyInformation.js

@@ -17,3 +17,20 @@ export function listRel(query) {
     params: query
   })
 }
+//发送短信
+export function sendMessage() {
+  return request({
+    url: '/sc-service/companyInformation/sendMessage',
+    method: 'get'
+  })
+}
+
+
+//校验验证码
+export function checkCode(query) {
+  return request({
+    url: '/sc-service/companyInformation/checkCode',
+    method: 'get',
+    params: query
+  })
+}

front-vue/src/views/home.vue

@@ -240,6 +240,7 @@
                         <div class="zap-card__title">我开立的融信</div>
                         <div class="zap-card__wrap zap-card__blue">
                             <span class="zap-card__num">{{handleInput(getFinancedNum())}}</span>
+                            <span class="zap-card__unit">元</span>
                         </div>
                     </div>
                 </el-col>
@@ -248,6 +249,7 @@
                         <div class="zap-card__title">可用授权额度</div>
                         <div class="zap-card__wrap zap-card__gold">
                             <span class="zap-card__num">{{handleInput(getsubNum())}}</span>
+                            <span class="zap-card__unit">元</span>
                         </div>
                     </div>
                 </el-col>
@@ -256,6 +258,7 @@
                         <div class="zap-card__title">即将到期付款</div>
                         <div class="zap-card__wrap zap-card__pink">
                             <span class="zap-card__num">{{handleInput(expiredBalance)}}</span>
+                            <span class="zap-card__unit">元</span>
                         </div>
                     </div>
                 </el-col>
@@ -265,6 +268,7 @@
                         <div class="zap-card__title">我的代办</div>
                         <div class="zap-card__wrap zap-card__blue">
                             <span class="zap-card__num">{{workTotal}}</span>
+                            <span class="zap-card__unit">个</span>
                         </div>
                     </div>
                 </el-col>
@@ -273,6 +277,7 @@
                         <div class="zap-card__title">可用授权额度(正向保理)</div>
                         <div class="zap-card__wrap zap-card__gold">
                             <span class="zap-card__num">{{handleInput(getsubNumForward())}}</span>
+                            <span class="zap-card__unit">元</span>
                         </div>
                     </div>
                 </el-col>
@@ -281,6 +286,7 @@
                         <div class="zap-card__title">总授权额度(正向保理)</div>
                         <div class="zap-card__wrap zap-card__pink">
                             <span class="zap-card__num">{{handleInput(creditLineAllForward)}}</span>
+                            <span class="zap-card__unit">元</span>
                         </div>
                     </div>
                 </el-col>
@@ -478,39 +484,47 @@
         </div>
 
         <!-- 融资企业 -->
-        <div v-if="company.scyType == '02'">
-            <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>
-                <div class="text item" style="height:100px">
-                    <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;" @click="toFinanceRecord()">
-                <div slot="header" class="clearfix">
-                    <span style="color: #666ee8; font-weight: bold;">融资中额度</span>
-                </div>
-                <div class="text item" style="height:100px">
-                    <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;" @click="toFinanceRecord()">
-                <div slot="header" class="clearfix">
-                    <span style="color: #666ee8; font-weight: bold;">已融资额度</span>
-                </div>
-                <div class="text item" style="height:100px">
-                    <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;" @click="toRepayment()">
-                <div slot="header" class="clearfix">
-                    <span style="color: #666ee8; font-weight: bold;">即将到期融资额度(30天)</span>
-                </div>
-                <div class="text item" style="height:100px">
-                    <span style="color: #666ee8; font-weight: bold;">{{handleInput(expiredBalance)}}</span>
-                </div>
-            </el-card>
+        <div v-if="company.scyType == '02'" class="zap-margin">
+            <el-row :gutter="20">
+                <!-- 第一行 -->
+                <el-col :xs="24" :sm="12" :md="8" :lg="8">
+                    <div class="zap-card">
+                        <div class="zap-card__title">持有融信额度</div>
+                        <div class="zap-card__wrap zap-card__blue">
+                            <span class="zap-card__num">{{handleInput(effectBalance)}}</span>
+                            <span class="zap-card__unit">元</span>
+                        </div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="12" :md="8" :lg="8">
+                    <div class="zap-card">
+                        <div class="zap-card__title">融资中额度</div>
+                        <div class="zap-card__wrap zap-card__gold">
+                            <span class="zap-card__num">{{handleInput(availableBalance)}}</span>
+                            <span class="zap-card__unit">元</span>
+                        </div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="12" :md="8" :lg="8">
+                    <div class="zap-card">
+                        <div class="zap-card__title">已融资额度</div>
+                        <div class="zap-card__wrap zap-card__pink">
+                            <span class="zap-card__num">{{handleInput(loanBalance)}}</span>
+                            <span class="zap-card__unit">元</span>
+                        </div>
+                    </div>
+                </el-col>
+                <!-- 第二行 -->
+                <el-col :xs="24" :sm="12" :md="8" :lg="8">
+                    <div class="zap-card">
+                        <div class="zap-card__title">即将到期融资额度(30天)</div>
+                        <div class="zap-card__wrap zap-card__blue">
+                            <span class="zap-card__num">{{handleInput(expiredBalance)}}</span>
+                            <span class="zap-card__unit">元</span>
+                        </div>
+                    </div>
+                </el-col>
+            </el-row>
             <el-card class="box-card" style="width:93%;margin:0.6%;float:left;">
                 <!-- <div slot="header" class="clearfix">
                 </div> -->
@@ -631,6 +645,7 @@
                         <div class="zap-card__title">总授信额度</div>
                         <div class="zap-card__wrap zap-card__blue">
                             <span class="zap-card__num">{{handleInput(creditLineAll)}}</span>
+                            <span class="zap-card__unit">元</span>
                         </div>
                     </div>
                 </el-col>
@@ -639,6 +654,7 @@
                         <div class="zap-card__title">已用额度</div>
                         <div class="zap-card__wrap zap-card__gold">
                             <span class="zap-card__num">{{handleInput(getFinancedNum())}}</span>
+                            <span class="zap-card__unit">元</span>
                         </div>
                     </div>
                 </el-col>
@@ -647,6 +663,7 @@
                         <div class="zap-card__title">可用额度</div>
                         <div class="zap-card__wrap zap-card__pink">
                             <span class="zap-card__num">{{handleInput(getsubNum())}}</span>
+                            <span class="zap-card__unit">元</span>
                         </div>
                     </div>
                 </el-col>
@@ -656,14 +673,16 @@
                         <div class="zap-card__title">即将到期融资额度(30天)</div>
                         <div class="zap-card__wrap zap-card__blue">
                             <span class="zap-card__num">{{handleInput(expiredBalance)}}</span>
+                            <span class="zap-card__unit">元</span>
                         </div>
                     </div>
                 </el-col>
             </el-row>
-            <el-dialog title="待办处理" :visible.sync="openWork" width="500px" append-to-body>
-                <work-deal :tableId="tableId" :workType="workType" :noticeId="noticeId" @cancelOpen="cancel"></work-deal>
-            </el-dialog>
         </div>
+
+        <el-dialog title="待办处理" :visible.sync="openWork" width="500px" append-to-body>
+            <work-deal :tableId="tableId" :workType="workType" :noticeId="noticeId" @cancelOpen="cancel"></work-deal>
+        </el-dialog>
     </div>
 </template>
 <script>

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

@@ -9,9 +9,60 @@
             <column-setting :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId" style="margin-left:5px"></column-setting>
          </div>
          <hr  style="margin-top: 16px;">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
+      <el-form-item prop="value">
+         <el-select v-model="queryParams.value" placeholder="请选择" clearable v-if="companyType !='00'" @change="change">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+        <el-select v-model="queryParams.value" placeholder="请选择" clearable v-if="companyType =='00'" @change="change">
+          <el-option
+            v-for="item in optionsPlus"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="queryValue" v-if="queryParams.value !='02'">
+        <el-input
+          v-model="queryParams.queryValue"
+          placeholder="请输入关键字模糊查询"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+          maxlength="30"
+        />
+      </el-form-item>
+      <el-form-item prop="queryValue" v-if="queryParams.value =='02'">
+         <el-select v-model="queryParams.queryValue" placeholder="请选择账款类型" clearable>
+          <el-option
+            v-for="item in newOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="预计还款日" prop="expireDate">
+        <el-date-picker 
+          clearable 
+          unlink-panels 
+          v-model="queryParams.expireDate" 
+          value-format="yyyy-MM-dd" 
+          format="yyyy-MM-dd" 
+          type="daterange" 
+          range-separator="-" 
+          start-placeholder="开始日期" 
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
   
-      <el-form-item label="账款编号" prop="zbiNumber">
+      <!-- <el-form-item label="账款编号" prop="zbiNumber">
         <el-input
           v-model="queryParams.zbiNumber"
           placeholder="请输入账款编号"
@@ -83,7 +134,7 @@
                   :value="dict.dictValue"
                 ></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
   
 
     </el-form>
@@ -172,6 +223,7 @@
 <script>
 import { listBill, deleteBill } from "@/api/service/bill/bill";
 import { getOwnCompany } from "@/api/common/company";
+import { getUserProfile } from "@/api/system/user";
 import {columnQuery,columnfilter} from "@/api/common/columnSetting";
 import ColumnSetting from '../../../components/Table/columnSetting.vue';
 import Cookies from 'js-cookie'
@@ -182,12 +234,51 @@ export default {
   },
   data() {
     return {
+      options: [{
+          value: '00',
+          label: '按账款名称查询'
+        }, {
+          value: '01',
+          label: '按账款编号查询'
+        }, {
+          value: '02',
+          label: '按账款类型查询'
+        }, {
+          value: '03',
+          label: '按应收企业名称查询'
+        }, {
+          value: '04',
+          label: '按应付企业名称查询'
+      }],
+      optionsPlus: [{
+          value: '00',
+          label: '按账款名称查询'
+        }, {
+          value: '01',
+          label: '按账款编号查询'
+        }, {
+          value: '03',
+          label: '按应收企业名称查询'
+        }, {
+          value: '04',
+          label: '按应付企业名称查询'
+      }],
+      newOptions: [{
+          value: '00',
+          label: '应收账款'
+        }, {
+          value: '01',
+          label: '应付账款'
+      }],
+      value:null,
       // 遮罩层
       loading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
       total: 0,
+      //企业类型
+      companyType:null,
       // 资料目录表格数据
       billList: [],
       //账款类型
@@ -198,12 +289,16 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        zbiNumber: null,
-        zbiName: null,
-        zbiType: null,
-        payeeName: null,
-        payerName: null,
-        zbiStatus:null
+        // zbiNumber: null,
+        // zbiName: null,
+        // zbiType: null,
+        // payeeName: null,
+        // payerName: null,
+        // zbiStatus:null,
+        value:null,
+        // queryType:null,
+        queryValue:null,
+        expireDate:null,
       },
       company:{},
       //筛选按钮的数据列表，与table表头的数据一致 --显示隐藏列用
@@ -256,6 +351,16 @@ export default {
     };
   },
   created() {
+      getUserProfile().then((response) =>{
+        this.companyType = response.data.companyType
+        if("00" == response.data.companyType){
+          this.queryParams.value = "01"
+        }else if("01" == response.data.companyType){
+          this.queryParams.value = "03"
+        }else if("02" == response.data.companyType){
+          this.queryParams.value = "04"
+        }
+      });
       getOwnCompany().then((response) => {
         this.company = response.data;
       });
@@ -320,6 +425,9 @@ export default {
     statusFormat(row, column) {
       return this.selectDictLabel(this.statusOptions, row.zbiStatus);
     },
+    change(){
+      this.queryParams.queryValue = null
+    },
     // 表单重置
     reset() {
       this.form = {

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

@@ -142,7 +142,9 @@
             </el-row>
             <el-row>
                 <el-col :span="12" style="margin-top:2%;margin-left:2%;line-height: 34px; text-align:left;">
-                   CFCA授权编号:<span v-if="scyCfcaAuthNumber">{{scyCfcaAuthNumber}}</span><button v-else @click="openWindows">开炮</button>
+                   CFCA授权编号:<span v-if="scyCfcaAuthNumber">{{scyCfcaAuthNumber}}</span>
+                   <label v-else text="abcdef" id="lab1" style="color:blue" @click="openWindows">激活</label>
+                   <span v-else @click="openWindows">激活</span>
                 </el-col>
                 <!-- <el-upload v-if="commitmentShow" ref="upload" class="upload-demo" action="" 
                 :on-preview="handleFilePreview" multiple :file-list="commitmentFileList" :auto-upload="false">
@@ -540,6 +542,7 @@ export default {
         send(){
             //发送
             sendMessage().then((response) => {
+                debugger
                 if(response.data){
                     //手机号
                     var newIphone = response.data.newIphone;
@@ -609,6 +612,11 @@ export default {
             this.messageIsShow = false;
             this.resetMessage();
         },
+        resetUpdate() {
+        this.messShow = true;
+        clearInterval(this.auth_timer);
+        this.timer = 60;
+        },
         resetMessage() {
             this.messageForm = {
                 validCode:""

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

@@ -22,7 +22,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item prop="zfrQuery" v-if="this.companyId != '000000' ">
+          <!-- <el-form-item prop="zfrQuery" v-if="this.companyId != '000000' ">
             <el-select v-model="queryParams.zfrQuery" clearable size="small">
               <el-option
                 v-for="dict in queryOptions"
@@ -31,8 +31,8 @@
                 :value="dict.dictValue"
               />
             </el-select>
-          </el-form-item>
-          <el-form-item prop="zfrQuery" v-if="this.companyId == '000000' ">
+          </el-form-item> -->
+          <el-form-item prop="zfrQuery" >
             <el-select v-model="queryParams.zfrQuery" clearable size="small">
               <el-option
                 v-for="dict in adminQueryOptions"
@@ -42,7 +42,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item prop="zfrValue" v-if="this.queryParams.zfrQuery && this.queryParams.zfrQuery != '03' ">
+          <el-form-item prop="zfrValue" v-if="this.queryParams.zfrQuery">
             <el-input
               v-model="queryParams.zfrValue"
               clearable
@@ -51,7 +51,19 @@
               style="width: 190px"
             />
           </el-form-item>
-          <el-form-item prop="zfrValue" v-if="this.queryParams.zfrQuery && this.queryParams.zfrQuery == '03' ">
+          <el-form-item label="承若还款日期" prop="zfrRepaymentDate" label-width="96px">
+            <el-date-picker  size="small"
+            v-model="queryParams.zfrRepaymentDate"
+            style="width: 240px"
+            unlink-panels
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+          <!-- <el-form-item prop="zfrValue" v-if="this.queryParams.zfrQuery && this.queryParams.zfrQuery == '03' ">
             <el-select v-model="queryParams.zfrValue" clearable size="small">
               <el-option
                 v-for="dict in statusOptions"
@@ -60,7 +72,7 @@
                 :value="dict.dictValue"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
       </el-card>
       <el-row :gutter="10" class="mb8">
@@ -179,7 +191,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item prop="zfrQuery" v-if="this.companyId != '000000' ">
+          <!-- <el-form-item prop="zfrQuery" v-if="this.companyId != '000000' ">
             <el-select v-model="queryParamsIng.zfrQuery" clearable size="small">
               <el-option
                 v-for="dict in queryOptions"
@@ -188,8 +200,8 @@
                 :value="dict.dictValue"
               />
             </el-select>
-          </el-form-item>
-          <el-form-item prop="zfrQuery" v-if="this.companyId == '000000' ">
+          </el-form-item> -->
+          <el-form-item prop="zfrQuery">
             <el-select v-model="queryParamsIng.zfrQuery" clearable size="small">
               <el-option
                 v-for="dict in adminQueryOptions"
@@ -199,7 +211,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item prop="zfrValue" v-if="this.queryParamsIng.zfrQuery && this.queryParamsIng.zfrQuery != '03' ">
+          <el-form-item prop="zfrValue" v-if="this.queryParamsIng.zfrQuery">
             <el-input
               v-model="queryParamsIng.zfrValue"
               clearable
@@ -208,7 +220,7 @@
               style="width: 190px"
             />
           </el-form-item>
-          <el-form-item prop="zfrValue" v-if="this.queryParamsIng.zfrQuery && this.queryParamsIng.zfrQuery == '03' ">
+          <!-- <el-form-item prop="zfrValue" v-if="this.queryParamsIng.zfrQuery && this.queryParamsIng.zfrQuery == '03' ">
             <el-select v-model="queryParamsIng.zfrValue" clearable size="small">
               <el-option
                 v-for="dict in statusOptions"
@@ -217,6 +229,18 @@
                 :value="dict.dictValue"
               />
             </el-select>
+          </el-form-item> -->
+          <el-form-item label="承若还款日期" prop="zfrRepaymentDate">
+            <el-date-picker  size="small"
+            v-model="queryParamsIng.zfrRepaymentDate"
+            style="width: 240px"
+            unlink-panels
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+            </el-date-picker>
           </el-form-item>
         </el-form>
       </el-card>
@@ -307,7 +331,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item prop="zfrQuery" v-if="this.companyId != '000000' ">
+          <!-- <el-form-item prop="zfrQuery" v-if="this.companyId != '000000' ">
             <el-select v-model="queryParamsEnd.zfrQuery" clearable size="small">
               <el-option
                 v-for="dict in queryOptions"
@@ -316,8 +340,8 @@
                 :value="dict.dictValue"
               />
             </el-select>
-          </el-form-item>
-          <el-form-item prop="zfrQuery" v-if="this.companyId == '000000' ">
+          </el-form-item> -->
+          <el-form-item prop="zfrQuery">
             <el-select v-model="queryParamsEnd.zfrQuery" clearable size="small">
               <el-option
                 v-for="dict in adminQueryOptions"
@@ -327,7 +351,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item prop="zfrValue" v-if="this.queryParamsEnd.zfrQuery && this.queryParamsEnd.zfrQuery != '03' ">
+          <el-form-item prop="zfrValue" v-if="this.queryParamsEnd.zfrQuery">
             <el-input
               v-model="queryParamsEnd.zfrValue"
               clearable
@@ -336,7 +360,7 @@
               style="width: 190px"
             />
           </el-form-item>
-          <el-form-item prop="zfrValue" v-if="this.queryParamsEnd.zfrQuery && this.queryParamsEnd.zfrQuery == '03' ">
+          <!-- <el-form-item prop="zfrValue" v-if="this.queryParamsEnd.zfrQuery && this.queryParamsEnd.zfrQuery == '03' ">
             <el-select v-model="queryParamsEnd.zfrValue" clearable size="small">
               <el-option
                 v-for="dict in statusOptions"
@@ -345,6 +369,18 @@
                 :value="dict.dictValue"
               />
             </el-select>
+          </el-form-item> -->
+          <el-form-item label="承若还款日期" prop="zfrRepaymentDate">
+            <el-date-picker  size="small"
+            v-model="queryParamsEnd.zfrRepaymentDate"
+            style="width: 240px"
+            unlink-panels
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+            </el-date-picker>
           </el-form-item>
         </el-form>
       </el-card>
@@ -431,7 +467,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item prop="zfrQuery" v-if="this.companyId != '000000' ">
+          <!-- <el-form-item prop="zfrQuery" v-if="this.companyId != '000000' ">
             <el-select v-model="queryParamsLose.zfrQuery" clearable size="small">
               <el-option
                 v-for="dict in queryOptions"
@@ -440,8 +476,8 @@
                 :value="dict.dictValue"
               />
             </el-select>
-          </el-form-item>
-          <el-form-item prop="zfrQuery" v-if="this.companyId == '000000' ">
+          </el-form-item> -->
+          <el-form-item prop="zfrQuery">
             <el-select v-model="queryParamsLose.zfrQuery" clearable size="small">
               <el-option
                 v-for="dict in adminQueryOptions"
@@ -460,7 +496,7 @@
               style="width: 190px"
             />
           </el-form-item>
-          <el-form-item prop="zfrValue" v-if="this.queryParamsLose.zfrQuery && this.queryParamsLose.zfrQuery == '03' ">
+          <!-- <el-form-item prop="zfrValue" v-if="this.queryParamsLose.zfrQuery && this.queryParamsLose.zfrQuery == '03' ">
             <el-select v-model="queryParamsLose.zfrValue" clearable size="small">
               <el-option
                 v-for="dict in statusOptions"
@@ -469,6 +505,18 @@
                 :value="dict.dictValue"
               />
             </el-select>
+          </el-form-item> -->
+          <el-form-item label="承若还款日期" prop="zfrRepaymentDate">
+            <el-date-picker  size="small"
+            v-model="queryParamsLose.zfrRepaymentDate"
+            style="width: 240px"
+            unlink-panels
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+            </el-date-picker>
           </el-form-item>
         </el-form>
       </el-card>
@@ -592,6 +640,7 @@ import Cookies from "js-cookie";
 import { getToken } from "@/utils/auth";
 import { columnQuery } from "@/api/common/columnSetting";
 import ColumnSetting from "../../../components/Table/columnSetting.vue";
+import { getUserProfile } from "@/api/system/user";
 export default {
   name: "finaceRecord",
   components: {ColumnSetting},
@@ -657,14 +706,14 @@ export default {
         zfrAmount: null,
         zfrRate: null,
         zfrHandler: null,
-        zfrRepaymentDate: null,
+        zfrRepaymentDate: [],
         zfrApplyDate: null,
         zfrLoanDate: null,
         zfrApplyAmount: null,
         zfrApplyType: null,
         zfrStatus: null,
         zfrApproveStt: null,
-        zfrTypes: null,
+        zfrTypes: '00',
         zfrQuery: null,
         zfrValue: null,
       },
@@ -676,14 +725,14 @@ export default {
         zfrAmount: null,
         zfrRate: null,
         zfrHandler: null,
-        zfrRepaymentDate: null,
+        zfrRepaymentDate: [],
         zfrApplyDate: null,
         zfrLoanDate: null,
         zfrApplyAmount: null,
         zfrApplyType: null,
         zfrStatus: null,
         zfrApproveStt: null,
-        zfrTypes: null,
+        zfrTypes: '00',
         zfrQuery: null,
         zfrValue: null,
       },
@@ -695,14 +744,14 @@ export default {
         zfrAmount: null,
         zfrRate: null,
         zfrHandler: null,
-        zfrRepaymentDate: null,
+        zfrRepaymentDate: [],
         zfrApplyDate: null,
         zfrLoanDate: null,
         zfrApplyAmount: null,
         zfrApplyType: null,
         zfrStatus: null,
         zfrApproveStt: null,
-        zfrTypes: null,
+        zfrTypes: '00',
         zfrQuery: null,
         zfrValue: null,
       },
@@ -714,14 +763,14 @@ export default {
         zfrAmount: null,
         zfrRate: null,
         zfrHandler: null,
-        zfrRepaymentDate: null,
+        zfrRepaymentDate: [],
         zfrApplyDate: null,
         zfrLoanDate: null,
         zfrApplyAmount: null,
         zfrApplyType: null,
         zfrStatus: null,
         zfrApproveStt: null,
-        zfrTypes: null,
+        zfrTypes: '00',
         zfrQuery: null,
         zfrValue: null,
       },
@@ -818,10 +867,6 @@ export default {
     };
   },
   created() {
-    this.getList();
-    this.getIngList();
-    this.getEndList();
-    this.getLoseList();
     this.getDicts("ser_zfr_status").then((response) => {
       this.statusOptions = response.data;
     });
@@ -837,15 +882,70 @@ export default {
     this.getDicts("zc_zfr_approve_stt").then((response) => {
       this.approveOptions = response.data;
     });
-  },
-  activated() {
-    this.getList();
+    this.getList().then(() =>{
+        getUserProfile().then((response) => {
+        if("00" == response.data.companyType){
+          this.queryParams.zfrQuery = '02';
+          this.queryParamsIng.zfrQuery = '02';
+          this.queryParamsEnd.zfrQuery = '02';
+          this.queryParamsLose.zfrQuery = '02';
+        }else if("01" == response.data.companyType){
+          this.queryParams.zfrQuery = '04';
+          this.queryParamsIng.zfrQuery = '04';
+          this.queryParamsEnd.zfrQuery = '04';
+          this.queryParamsLose.zfrQuery = '04';
+        }else if("02" == response.data.companyType){
+          this.queryParams.zfrQuery = '00';
+          this.queryParamsIng.zfrQuery = '00';
+          this.queryParamsEnd.zfrQuery = '00';
+          this.queryParamsLose.zfrQuery = '00';
+        }
+      })
+    });
     this.getIngList();
     this.getEndList();
     this.getLoseList();
+    
+  },
+  activated() {
     this.getDicts("ser_zfr_status").then((response) => {
       this.statusOptions = response.data;
     });
+    this.getDicts("zc_zfr_types").then((response) => {
+      this.typesOptions = response.data;
+    });
+    this.getDicts("zc_zfr_query").then((response) => {
+      this.queryOptions = response.data;
+    });
+    this.getDicts("ser_zfr_query").then((response) => {
+      this.adminQueryOptions = response.data;
+    });
+    this.getDicts("zc_zfr_approve_stt").then((response) => {
+      this.approveOptions = response.data;
+    });
+    this.getList().then(() =>{
+        getUserProfile().then((response) => {
+        if("00" == response.data.companyType){
+          this.queryParams.zfrQuery = '02';
+          this.queryParamsIng.zfrQuery = '02';
+          this.queryParamsEnd.zfrQuery = '02';
+          this.queryParamsLose.zfrQuery = '02';
+        }else if("01" == response.data.companyType){
+          this.queryParams.zfrQuery = '04';
+          this.queryParamsIng.zfrQuery = '04';
+          this.queryParamsEnd.zfrQuery = '04';
+          this.queryParamsLose.zfrQuery = '04';
+        }else if("02" == response.data.companyType){
+          this.queryParams.zfrQuery = '00';
+          this.queryParamsIng.zfrQuery = '00';
+          this.queryParamsEnd.zfrQuery = '00';
+          this.queryParamsLose.zfrQuery = '00';
+        }
+      })
+    });
+    this.getIngList();
+    this.getEndList();
+    this.getLoseList();
   },
   mounted() {
     this.columnQuery();
@@ -854,7 +954,7 @@ export default {
     /** 查询全部融资记录列表 */
     getList() {
       this.loading = true;
-      listRecord(this.queryParams).then((response) => {
+      return listRecord(this.queryParams).then((response) => {
         this.companyId = response.msg;
         this.recordList = response.data.records;
         if(response.data.records[0]){
@@ -862,6 +962,10 @@ export default {
         }
         this.total = response.data.total;
         this.loading = false;
+        return Promise.resolve(response)
+      }).catch((response) => {
+        this.loading = false;
+        return Promise.reject('error')
       });
     },
     /** 查询融资中融资记录列表 */

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

@@ -20,6 +20,10 @@
                 <div class="pull-right">{{ user.email }}</div>
               </li>
               <li class="list-group-item">
+                <svg-icon icon-class="company" />所属企业
+                <div class="pull-right">{{ company.scyName }}</div>
+              </li>
+              <li class="list-group-item">
                 <svg-icon icon-class="tree" />所属部门
                 <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }}</div>
               </li>
@@ -74,6 +78,7 @@ export default {
   data() {
     return {
       user: {},
+      company: {},
       roleGroup: '',
       activeTab: "userinfo"
     };
@@ -85,7 +90,9 @@ export default {
     getUser() {
       var sscDomain = document.location.hostname;
       getUserProfile(sscDomain).then(response => {
+        debugger
         this.user = response.data;
+        this.company = response.company;
         var roles = response.roleGroup.roles;
         for (var i = 0; i < roles.length; i ++) {
           this.roleGroup += roles[i];

front-vue/src/views/system/user/profile/userInfo.vue

@@ -9,12 +9,12 @@
     <el-form-item label="邮箱" prop="email">
       <el-input v-model="user.email" maxlength="50" :disabled="true"/>
     </el-form-item>
-    <el-form-item label="性别">
+    <!-- <el-form-item label="性别">
       <el-radio-group v-model="user.sex">
         <el-radio label="0" disabled>男</el-radio>
         <el-radio label="1" disabled>女</el-radio>
       </el-radio-group>
-    </el-form-item>
+    </el-form-item> -->
   </el-form>
 </template>
 <script>