个人中心修改,融资管理筛选条件修改

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>