Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/settings.js

@@ -1,7 +1,7 @@
 module.exports = {
-	// urls: `https://rzdb.qs163.cn`,
+	urls: `https://rzdb.qs163.cn`,
   // 114.99.127.243:2004
-	urls:`http://192.168.101.245:8056`,
+	// urls:`http://192.168.101.245:8056`,
   // 192.168.101.168:8056
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

ruoyi-ui/src/views/dabgs/application/index.vue

@@ -122,7 +122,7 @@
       </el-row>
     </el-form>
    <div class="ntgs">
-      <p class='jivb'><span>申报业务审核</span></p>
+      <p class='jivb'><span>申报业务信息</span></p>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button

ruoyi-ui/src/views/dabgs/applicationbao/index.vue

@@ -189,7 +189,7 @@
 
       <el-table-column label="还款来源" align="center" prop="repaymentSource" width="100"/>
 
-      <el-table-column label="行业类型" align="center" prop="categoryType" width="100"/>
+      <!-- <el-table-column label="行业类型" align="center" prop="categoryType" width="100"/> -->
       <el-table-column label="用户类型" align="center" prop="customerType" width="100">
         <template slot-scope="scope">
               <dict-tag :options="dict.type.customer_type" :value="scope.row.customerType"/>
@@ -206,7 +206,7 @@
           <span>{{ scope.row.applicationTime}}</span>
         </template>
       </el-table-column>
-      
+
       <el-table-column label="贷款申请进度" align="center" prop="loanSchedule" width="100">
         <template slot-scope="scope">
           <div @click="dakjnd(scope.row)" >

ruoyi-ui/src/views/dabgs/applicationgd/index.vue

@@ -122,7 +122,7 @@
       </el-row>
     </el-form>
    <div class="ntgs">
-      <p class='jivb'><span>申报业务审核</span></p>
+      <p class='jivb'><span>归档申报业务</span></p>
     <el-row :gutter="10" class="mb8">
      <!-- <el-col :span="1.5">
         <el-button
@@ -182,7 +182,7 @@
       <el-table-column label="资金用途" align="center" prop="purposeFunds" width="100"/>
       <el-table-column label="还款来源" align="center" prop="repaymentSource" width="100"/>
       <el-table-column label="企业名称" align="center" prop="enterpriseName" width="100"/>
-      <el-table-column label="行业类型" align="center" prop="categoryType" width="100"/>
+      <!-- <el-table-column label="行业类型" align="center" prop="categoryType" width="100"/> -->
       <el-table-column label="用户类型" align="center" prop="customerType" width="100">
         <template slot-scope="scope">
               <dict-tag :options="dict.type.customer_type" :value="scope.row.customerType"/>

ruoyi-ui/src/views/dabgs/applicationhshou/index.vue

@@ -182,7 +182,7 @@
       <el-table-column label="资金用途" align="center" prop="purposeFunds" width="100"/>
       <el-table-column label="还款来源" align="center" prop="repaymentSource" width="100"/>
       <el-table-column label="企业名称" align="center" prop="enterpriseName" width="100"/>
-      <el-table-column label="行业类型" align="center" prop="categoryType" width="100"/>
+      <!-- <el-table-column label="行业类型" align="center" prop="categoryType" width="100"/> -->
       <el-table-column label="用户类型" align="center" prop="customerType" width="100">
         <template slot-scope="scope">
               <dict-tag :options="dict.type.customer_type" :value="scope.row.customerType"/>

ruoyi-ui/src/views/dabgs/applicationme/index.vue

@@ -18,7 +18,7 @@
             <span style="width:15%">(万元)</span>
           </el-form-item>
         </el-col>
-    
+
         <el-col :span="8" >
           <el-form-item label="申请银行" prop="applicationBank" style="width:100%;">
             <el-select style="width:100%" v-model="queryParams.applicationBank" placeholder="请选择申请银行" clearable>
@@ -52,7 +52,7 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-    
+
         <el-col :span="8" >
           <el-form-item label="申请状态" prop="loanApplicationType" style="width:100%;">
             <el-select v-model="queryParams.loanApplicationType" placeholder="请选择申请状态" clearable>
@@ -122,7 +122,7 @@
       </el-row>
     </el-form>
    <div class="ntgs">
-      <p class='jivb'><span>申报业务审核</span></p>
+      <p class='jivb'><span>我的申报业务</span></p>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -182,8 +182,7 @@
       <el-table-column label="使用期限(月)" align="center" prop="usagePeriod" width="100"/>
       <el-table-column label="资金用途" align="center" prop="purposeFunds" width="100"/>
       <el-table-column label="还款来源" align="center" prop="repaymentSource" width="100"/>
-
-      <el-table-column label="行业类型" align="center" prop="categoryType" width="100"/>
+      <!-- <el-table-column label="行业类型" align="center" prop="categoryType" width="100"/> -->
       <el-table-column label="用户类型" align="center" prop="customerType" width="100">
         <template slot-scope="scope">
               <dict-tag :options="dict.type.customer_type" :value="scope.row.customerType"/>

ruoyi-ui/src/views/dabgs/applicationsh/index.vue

@@ -182,8 +182,7 @@
       <el-table-column label="使用期限(月)" align="center" prop="usagePeriod" width="100"/>
       <el-table-column label="资金用途" align="center" prop="purposeFunds" width="100"/>
       <el-table-column label="还款来源" align="center" prop="repaymentSource" width="100"/>
-      
-      <el-table-column label="行业类型" align="center" prop="categoryType" width="100"/>
+      <!-- <el-table-column label="行业类型" align="center" prop="categoryType" width="100"/> -->
       <el-table-column label="用户类型" align="center" prop="customerType" width="100">
         <template slot-scope="scope">
               <dict-tag :options="dict.type.customer_type" :value="scope.row.customerType"/>
@@ -447,7 +446,7 @@
          </div>
          </template>
        </el-table-column>
-       <el-table-column label="审核状态" align="center" prop="auditType" width="100"> 
+       <el-table-column label="审核状态" align="center" prop="auditType" width="100">
        <template slot-scope="scope">
            <dict-tag :options="dict.type.sh_status" :value="scope.row.auditType"/>
          </template>

ruoyi-ui/src/views/dabgs/applicationshang/index.vue

@@ -115,7 +115,7 @@
       </el-table-column>
       <el-table-column label="使用期限(月)" align="center" prop="usagePeriod" width="100"/>
       <el-table-column label="资金用途" align="center" prop="purposeFunds" width="100"/>
-      <el-table-column label="行业类型" align="center" prop="categoryType" width="100"/>
+      <!-- <el-table-column label="行业类型" align="center" prop="categoryType" width="100"/> -->
       <!-- <el-table-column label="用户类型" align="center" prop="customerType" width="100">
         <template slot-scope="scope">
               <dict-tag :options="dict.type.customer_type" :value="scope.row.customerType"/>

ruoyi-ui/src/views/dabgs/applicationshensu/index.vue

@@ -122,7 +122,7 @@
       </el-row>
     </el-form>
    <div class="ntgs">
-      <p class='jivb'><span>申报业务审核</span></p>
+      <p class='jivb'><span>申诉申报业务</span></p>
     <el-row :gutter="10" class="mb8">
      <!-- <el-col :span="1.5">
         <el-button
@@ -182,7 +182,7 @@
       <el-table-column label="使用期限(月)" align="center" prop="usagePeriod" width="100"/>
       <el-table-column label="资金用途" align="center" prop="purposeFunds" width="100"/>
       <el-table-column label="还款来源" align="center" prop="repaymentSource" width="100"/>
-      
+
       <el-table-column label="行业类型" align="center" prop="categoryType" width="100"/>
       <el-table-column label="用户类型" align="center" prop="customerType" width="100">
         <template slot-scope="scope">

ruoyi-ui/src/views/dabgs/applicationzc/index.vue

@@ -18,7 +18,7 @@
             <span style="width:15%">(万元)</span>
           </el-form-item>
         </el-col>
-    
+
         <el-col :span="8" >
           <el-form-item label="申请银行" prop="applicationBank" style="width:100%;">
             <el-select style="width:100%" v-model="queryParams.applicationBank" placeholder="请选择申请银行" clearable>
@@ -52,7 +52,7 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-    
+
         <el-col :span="8" >
           <el-form-item label="申请状态" prop="loanApplicationType" style="width:100%;">
             <el-select v-model="queryParams.loanApplicationType" placeholder="请选择申请状态" clearable>
@@ -122,7 +122,7 @@
       </el-row>
     </el-form>
    <div class="ntgs">
-      <p class='jivb'><span>申报业务审核</span></p>
+      <p class='jivb'><span>暂存申报业务</span></p>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -182,7 +182,7 @@
       <el-table-column label="使用期限(月)" align="center" prop="usagePeriod" width="100"/>
       <el-table-column label="资金用途" align="center" prop="purposeFunds" width="100"/>
       <el-table-column label="还款来源" align="center" prop="repaymentSource" width="100"/>
-    
+
       <el-table-column label="行业类型" align="center" prop="categoryType" width="100"/>
       <el-table-column label="用户类型" align="center" prop="customerType" width="100">
         <template slot-scope="scope">
@@ -210,7 +210,7 @@
           <div @click="dakjnd(scope.row)">
             <dict-tag :options="dict.type.loan_schedule" :value="scope.row.loanSchedule"/>
           </div>
-    
+
           </template>
         </el-table-column>
       <el-table-column label="贷款申请状态 " align="center" prop="loanApplicationType" width="120">

ruoyi-ui/src/views/system/bjqs/index.vue

@@ -79,7 +79,7 @@
                 </el-col>
                 <el-col :span="8" v-if="inghegs">
                   <el-form-item label="行业类型" prop="categoryType">
-                    <treeselect style="width: 100%;" @select="jhgewl" v-model="form.categoryType" :options="deptOptions"
+                    <treeselect style="width: 100%;" @select="jhgewl" v-model="form.categoryName" :options="deptOptions"
                       :normalizer="normalizer" placeholder="选择行业类型" />
                   </el-form-item>
                 </el-col>
@@ -1476,6 +1476,7 @@
       jhgewl(row) {
         console.log(row, 1)
         this.form.categoryType = row.categoryName
+        console.log(this.form.categoryType, 1)
       },
       getListue() {
         this.loading = true;
@@ -2016,6 +2017,8 @@
         getApplication(row).then(response => {
           this.fullscreenLoading = false
           this.form = response.data
+           this.$set(this.form,"categoryName", this.form.categoryType)
+          this.form.categoryName
           if(this.form.guaranteeInfoIdList == null){
             this.form.guaranteeInfoIdList = []
           }