Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/settings.js

@@ -1,7 +1,7 @@
 module.exports = {
 	// urls: `https://rzdb.qs163.cn`,
   // 114.99.127.243:2004
-	urls:`http://192.168.101.168: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

@@ -307,7 +307,7 @@
 
 <script>
 import { listApplication, getApplication, delApplication, addApplication, updateApplication,schedule } from "@/api/dabgs/application";
-
+import { listEnterprise } from "@/api/dabgs/enterprise";
 export default {
   name: "Application",
   dicts: ['shendai_bank','marital_status','guarantee_type','customer_type','sys_yes_no','loan_schedule','sh_status','loan_application_type','audit_schedule'],
@@ -405,11 +405,13 @@ export default {
       scheduleList:[],
       dkId:0,
       jidneg:0,
-      openh:false
+      openh:false,
+      enterpriseList:[]
     };
   },
   created() {
     this.getList();
+    this.getListenter()
   window.onresize = () => {
   	      this.changeTableMaxHeight()
   	    }
@@ -538,6 +540,14 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    /** 查询用户企业信息列表 */
+    getListenter() {
+      let nsg={'userId':this.$store.state.user.id,'pageNum': 1,
+        'pageSize': 10, }
+      listEnterprise(nsg).then(response => {
+        this.enterpriseList = response.rows;
+      });
+    },
     /** 新增按钮操作 */
     handleAdd() {
       if(this.$store.state.user.userType == '01'){
@@ -546,6 +556,14 @@ export default {
           return
         }
       }
+      if(this.enterpriseList.length == 0){
+         this.$message({
+                  showClose: true,
+                  message: '先填写公司信息',
+                  type: 'error'
+                });
+         return
+      }
       this.$router.push({
         path: '/shenbaoxinx/bjqs',
       		query: {
@@ -566,6 +584,15 @@ export default {
           return
         }
       }
+      if(this.enterpriseList.length == 0){
+         this.$message({
+                  showClose: true,
+                  message: '先填写公司信息',
+                  type: 'error'
+                });
+         return
+      }
+
       this.$router.push({
         path: '/shenbaoxinx/bjqs',
       		query: {

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

@@ -132,21 +132,21 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.remindType != 11 &&scope.row.remindType != 12 "
+            v-if="scope.row.remindType != 13 &&scope.row.remindType != 12 "
             @click="handleUpdatech(scope.row)"
           >查看详情</el-button>
           <el-button
                       size="mini"
                       type="text"
                       icon="el-icon-edit"
-                      v-if="scope.row.remindType == 11"
+                      v-if="scope.row.remindType == 12"
                       @click="handleUpdatechxq(scope.row)"
                     >查看详情</el-button>
           <el-button
                       size="mini"
                       type="text"
                       icon="el-icon-edit"
-                      v-if="scope.row.remindType == 12"
+                      v-if="scope.row.remindType == 13"
                       @click="handleUpdatechxqbao(scope.row)"
                     >查看详情</el-button>
           <el-button

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

@@ -132,21 +132,21 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.remindType != 11 &&scope.row.remindType != 12 "
+            v-if="scope.row.remindType != 13 &&scope.row.remindType != 12 "
             @click="handleUpdatech(scope.row)"
           >查看详情</el-button>
           <el-button
                       size="mini"
                       type="text"
                       icon="el-icon-edit"
-                      v-if="scope.row.remindType == 11"
+                      v-if="scope.row.remindType == 12"
                       @click="handleUpdatechxq(scope.row)"
                     >查看详情</el-button>
           <el-button
                       size="mini"
                       type="text"
                       icon="el-icon-edit"
-                      v-if="scope.row.remindType == 12"
+                      v-if="scope.row.remindType == 13"
                       @click="handleUpdatechxqbao(scope.row)"
                     >查看详情</el-button>
           <el-button

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

@@ -1034,7 +1034,7 @@
               </el-carousel-item>
          </el-carousel>
          <div v-for="(iteme,index) in item.exlefj" :key="iteme" v-if="item.exlefj.length != 0" >
-           <VueOfficeExcel  style="height: 80vh;" :template=" defaultSettings.urls +ijsget + iteme" :src="defaultSettings.urls+ijsget + iteme" :options="editorOptions"  ref="docxEditor"></VueOfficeExcel>
+           <VueOfficeExcel  style="height: 80vh;" :template="defaultSettings.urls+ijsget + iteme" :src="defaultSettings.urls+ijsget + iteme" :options="editorOptions"  ref="docxEditor"></VueOfficeExcel>
          </div>
          <div v-for="(itemw,index) in item.wordfj" :key="itemw" v-if="item.wordfj.length != 0">
            <!-- <VueOfficeDocx style="height: 80vh;" :template="defaultSettings.urls+ijsget + itemw" :src="defaultSettings.urls+ijsget + itemw" :options="editorOptions" ref="docxEditorf">
@@ -1178,7 +1178,7 @@
 
                <!-- <div v-for="(iteme,index) in item.exlefj" :key="iteme" v-if="item.exlefj.length != 0 && isshouty==3" > -->
                  <el-carousel trigger="click" height="430px"   v-if="item.exlefj.length != 0 && (isguelse == false  || isshouty==3) ">
-                      <!-- <el-carousel-item v-for="(iteme,index) in item.exlefj" :key="iteme"> -->
+                      <el-carousel-item v-for="(iteme,index) in item.exlefj" :key="iteme">
                           <!-- <VueOfficeExcel v-if="isurw ==true"  style="height: 72vh;" :template=" defaultSettings.urls +ijsget + iteme" :src="defaultSettings.urls+ijsget + iteme" :options="editorOptions"  ref="docxEditor"></VueOfficeExcel> -->
                           <iframe v-if="isurw" :src="'https://view.officeapps.live.com/op/view.aspx?src=' + defaultSettings.urls+ijsget  + iteme " frameborder="0" style="width:100%;height:100%;"></iframe>
                            <!-- <VueOfficeExcel v-if="isurw ==false"  style="height: 72vh;"  :src="defaultSettings.urls  + iteme"   ref="docxEditor"></VueOfficeExcel> -->
@@ -2126,7 +2126,7 @@
                 if(fandanr[q].guaranteeInfoFjList != null && fandanr[q].guaranteeInfoFjList.length !=0){
                   for(var n = 0; n < fandanr[q].guaranteeInfoFjList.length;n++){
                       if(fandanr[q].guaranteeInfoFjList[n].type =='fdbrsfzrmx'){
-                        fandanr[q].guaranteeInfoFjList[n].name="反担保人" + (q + 1) +"身份证国徽面"
+                        fandanr[q].guaranteeInfoFjList[n].name="反担保人" + (q + 1) +"身份证人像面"
                         fandanr[q].guaranteeInfoFjList[n].fjId = fandanr[q].guaranteeInfoFjList[n].guaranteeInfoFjId
                         hg.fdbrsfzrmx[0] = fandanr[q].guaranteeInfoFjList[n]
                       }
@@ -2146,7 +2146,7 @@
                         hg.fdbrgrgzzm.push(fandanr[q].guaranteeInfoFjList[n])
                       }
                       if(fandanr[q].guaranteeInfoFjList[n].type =='fdbrsfzghm'){
-                        fandanr[q].guaranteeInfoFjList[n].name="反担保人" + (q + 1) +"身份证人像面"
+                        fandanr[q].guaranteeInfoFjList[n].name="反担保人" + (q + 1) +"身份证国徽面"
                          fandanr[q].guaranteeInfoFjList[n].fjId = fandanr[q].guaranteeInfoFjList[n].guaranteeInfoFjId
                         hg.fdbrsfzghm.push(fandanr[q].guaranteeInfoFjList[n])
                       }
@@ -4212,6 +4212,8 @@
             loanSchedule:_this.form.loanSchedule,
             enterpriseName:_this.form.enterpriseName,
             aUserId:_this.form.aUserId,
+            bUserId:_this.form.bUserId,
+            fUserId:_this.form.fUserId,
             // xmStatus:row.xmStatus
           })
         }).then(() => {