wangmengwei 4 달 전
부모
커밋
52f3ef47fd

+ 1 - 0
ruoyi-ui/src/components/FileUploadf/index.vue

@@ -163,6 +163,7 @@ export default {
     // 删除文件
     handleDelete(index) {
       this.fileList.splice(index, 1);
+      console.log(this.fileList)
       this.$emit("input", this.fileList);
     },
     // 上传结束处理

+ 29 - 13
ruoyi-ui/src/components/FileUploadgdfm/index.vue

@@ -92,7 +92,8 @@ export default {
         Authorization: "Bearer " + getToken(),
       },
       fileList: [],
-      fileListki:[]
+      fileListki:[],
+      ksge:''
     };
   },
   watch: {
@@ -165,6 +166,7 @@ export default {
       if (res.code === 200) {
         let ddd = ((this.data.fileName.split("").reverse().join("")).substring(0,4)).split("").reverse().join("")
         this.fileList = []
+        this.ksge = ddd
         if(ddd == '营业执照'){
           this.uploadList.push({ name: res.newFileName, url: res.fileName });
            let nget={image:res.urlOnline,}
@@ -179,7 +181,9 @@ export default {
             // console.log(this.uploadList,82)
           });
         }else{
-          this.uploadList.push({ name: res.newFileName, url: res.fileName });
+         this.uploadList.push({ name: res.newFileName, url: res.fileName });
+         this.uploadedSuccessfully();
+         console.log(this.uploadList,82)
           this.uploadedSuccessfully();
         }
 
@@ -200,17 +204,29 @@ export default {
     },
     // 上传结束处理
     uploadedSuccessfully() {
-      if (this.number > 0 && this.uploadList.length === this.number) {
-        // this.fileList = this.fileList.concat(this.uploadList);
-        // this.fileListki = this.fileList;
-        this.fileList = this.uploadList.slice(-1)
-        console.log(this.fileList,this.uploadList)
-        this.uploadList = [];
-        this.number = 0;
-
-        this.$emit("input", this.fileList);
-        // this.listToString(
-        this.$modal.closeLoading();
+      if(this.ksge == '营业执照'){
+        if (this.number > 0 && this.uploadList.length === this.number) {
+          // this.fileList = this.fileList.concat(this.uploadList);
+          // this.fileListki = this.fileList;
+          this.fileList = this.uploadList.slice(-1)
+          console.log(this.fileList,this.uploadList,89)
+          this.uploadList = [];
+          this.number = 0;
+          this.$emit("input", this.fileList);
+          // this.listToString(
+          this.$modal.closeLoading();
+        }
+      }else{
+        if (this.number > 0 && this.uploadList.length === this.number) {
+          this.fileList = this.fileList.concat(this.uploadList);
+          console.log(this.fileList,87)
+          // this.fileList = this.uploadList
+          this.uploadList = [];
+          this.number = 0;
+          this.$emit("input", this.fileList);
+          // this.listToString(
+          this.$modal.closeLoading();
+        }
       }
     },
     // 获取文件名称

+ 10 - 10
ruoyi-ui/src/components/ViewFile/index.vue

@@ -23,10 +23,10 @@ export default {
                 console.log(_this.wps,_this.wps.default.OfficeType.Writer,url,_this.token,_this.officeType,356)
                 if(_this.officeType == 'w'){
                   const wps = _this.wps.default.init({
-                      // appId: 'AK20240724JZQZVF',
-                      // AppSecret:'vkjGMdBUEQUpkhxcwEEjEOUyXxvowmWW',
-                      appId: 'SX20240516EYFBUA',
-                      AppSecret:'vwJbZyZwrwaHMZKcPRFoCHyrlnTiswfI',
+                      appId: 'AK20240724JZQZVF',
+                      AppSecret:'vkjGMdBUEQUpkhxcwEEjEOUyXxvowmWW',
+                      // appId: 'SX20240516EYFBUA',
+                      // AppSecret:'vwJbZyZwrwaHMZKcPRFoCHyrlnTiswfI',
                       officeType:_this.wps.default.OfficeType.Writer,
                       mode: _this.simpleMode?'simple':'normal',
                       mount: document.querySelector('#layoutBox'),
@@ -65,8 +65,8 @@ export default {
                  console.log(4,instance.save())
                 }else if(_this.officeType == 's'){
                   const wps = _this.wps.default.init({
-                    appId: 'SX20240516EYFBUA',
-                    AppSecret:'vwJbZyZwrwaHMZKcPRFoCHyrlnTiswfI',
+                    appId: 'AK20240724JZQZVF',
+                    AppSecret:'vkjGMdBUEQUpkhxcwEEjEOUyXxvowmWW',
                       officeType:_this.wps.default.OfficeType.Spreadsheet,
                       mode: _this.simpleMode?'simple':'normal',
                       mount: document.querySelector('#layoutBox'),
@@ -108,8 +108,8 @@ export default {
                   console.log(2)
                 }else if(_this.officeType == 'p'){
                   const wps = _this.wps.default.init({
-                     appId: 'SX20240516EYFBUA',
-                     AppSecret:'vwJbZyZwrwaHMZKcPRFoCHyrlnTiswfI',
+                    appId: 'AK20240724JZQZVF',
+                    AppSecret:'vkjGMdBUEQUpkhxcwEEjEOUyXxvowmWW',
                       officeType:_this.wps.default.OfficeType.Presentation,
                       mode: _this.simpleMode?'simple':'normal',
                       mount: document.querySelector('#layoutBox'),
@@ -143,8 +143,8 @@ export default {
                   console.log(3)
                 }else if(_this.officeType == 'f'){
                   const wps = _this.wps.default.init({
-                     appId: 'SX20240516EYFBUA',
-                     AppSecret:'vwJbZyZwrwaHMZKcPRFoCHyrlnTiswfI',
+                    appId: 'AK20240724JZQZVF',
+                    AppSecret:'vkjGMdBUEQUpkhxcwEEjEOUyXxvowmWW',
                       officeType:_this.wps.default.OfficeType.Pdf,
                       mode: _this.simpleMode?'simple':'normal',
                       mount: document.querySelector('#layoutBox'),

+ 2 - 2
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.168:8056`,
   // 192.168.101.168:8056
   /**
    * 侧边栏主题 深色主题theme-dark,浅色主题theme-light

+ 2 - 0
ruoyi-ui/src/views/dabgs/applicationshang/index.vue

@@ -254,6 +254,7 @@
     <el-dialog title="审核进度" :visible.sync="opensh" width="1000px" append-to-body>
       <el-table height="300" v-loading="loading" :data="enterpriseList" >
         <el-table-column label="申请编号" align="center" prop="loanApplicationNumber" width="120" />
+
        <el-table-column label="审核进度" align="center" prop="auditSchedule" width="100">
        <template slot-scope="scope">
          <div @click="shegjis(scope.row)">
@@ -313,6 +314,7 @@
         <el-table-column label="担保额度" align="center" prop="lineGuarantee" />
         <el-table-column label="担保期限" align="center" prop="guaranteePeriod" />
         <el-table-column label="表决不通过原因" align="center" prop="argument" />
+         <el-table-column label="投票用户" align="center" prop="realName"  />
          <el-table-column label="投票结果" align="center" prop="votingResult" >
          <template slot-scope="scope">
            <span>{{scope.row.votingResult == 'Y'? '同意' : scope.row.votingResult == 'N'? '不同意' :''}}</span>

+ 16 - 10
ruoyi-ui/src/views/dabgs/remind/index.vue

@@ -7,13 +7,15 @@
           <p class='jivbf'> <img src="../../../assets/images/icon_htgl_cxtj.png" alt="" style="width:15px;height: 15px;">查询条件</p>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="贷款申请编号" prop="loanApplicationNumber">
-            <el-input
-              v-model="queryParams.loanApplicationNumber"
-              placeholder="请输入贷款申请编号"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
+          <el-form-item label="是否完成" prop="isRead">
+            <el-select v-model="queryParams.isRead" placeholder="请选择是否完成" clearable>
+              <el-option
+                v-for="dict in dict.type.sys_yes_no"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -118,7 +120,11 @@
           <dict-tag :options="dict.type.is_read" :value="scope.row.isRead"/>
         </template>
       </el-table-column> -->
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="是否完成" align="center" prop="isRead">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isRead"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
          <!-- <el-button
@@ -232,7 +238,7 @@ import { listRemind, getRemind, delRemind, addRemind, updateRemind } from "@/api
 
 export default {
   name: "Remind",
-  dicts: ['remind_type', 'is_read'],
+  dicts: ['remind_type', 'is_read','sys_yes_no'],
   data() {
     return {
       // 遮罩层
@@ -264,7 +270,7 @@ export default {
         remindContent: null,
         remindTime: null,
         readUserId: null,
-        isRead: null,
+        isRead: 'N',
         status: null,
       },
       // 表单参数

+ 16 - 9
ruoyi-ui/src/views/dabgs/remindgl/index.vue

@@ -7,13 +7,15 @@
           <p class='jivbf'> <img src="../../../assets/images/icon_htgl_cxtj.png" alt="" style="width:15px;height: 15px;">查询条件</p>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="贷款申请编号" prop="loanApplicationNumber">
-            <el-input
-              v-model="queryParams.loanApplicationNumber"
-              placeholder="请输入贷款申请编号"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
+          <el-form-item label="是否完成" prop="isRead">
+            <el-select v-model="queryParams.isRead" placeholder="请选择是否完成" clearable>
+              <el-option
+                v-for="dict in dict.type.sys_yes_no"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -118,6 +120,11 @@
           <dict-tag :options="dict.type.is_read" :value="scope.row.isRead"/>
         </template>
       </el-table-column> -->
+      <el-table-column label="是否完成" align="center" prop="isRead">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isRead"/>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -232,7 +239,7 @@ import { listRemind, getRemind, delRemind, addRemind, updateRemind } from "@/api
 
 export default {
   name: "Remind",
-  dicts: ['remind_type', 'is_read'],
+  dicts: ['remind_type', 'is_read','sys_yes_no'],
   data() {
     return {
       // 遮罩层
@@ -264,7 +271,7 @@ export default {
         remindContent: null,
         remindTime: null,
         readUserId: null,
-        isRead: null,
+        isRead: 'N',
         status: null,
       },
       // 表单参数

+ 7 - 4
ruoyi-ui/src/views/index.vue

@@ -337,9 +337,9 @@
                   </template>
                 </el-table-column>
                 <!-- <el-table-column label="已读过的用户ID" align="center" prop="readUserId" /> -->
-                <el-table-column label="是否已读" align="center" prop="isRead">
+                <el-table-column label="是否完成" align="center" prop="isRead">
                   <template slot-scope="scope">
-                    <dict-tag :options="dict.type.is_read" :value="scope.row.isRead"/>
+                    <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isRead"/>
                   </template>
                 </el-table-column>
                 <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
@@ -619,7 +619,7 @@ export default {
         postCode: undefined,
         postName: undefined,
         status: undefined,
-        reservatType:undefined
+        reservatType:undefined,
       },
       queryParamss:{
         pageNum: 1,
@@ -857,7 +857,9 @@ export default {
     // 待办
     getListdb() {
       this.loading = true;
-      listRemind(this.queryParams).then(response => {
+      let jhe = this.queryParams
+      jhe.isRead = 'N'
+      listRemind(jhe).then(response => {
         this.infoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -894,6 +896,7 @@ export default {
       this.loading = true;
       let nghe={pageNum: 1,
         pageSize: 7,noticeType:1}
+        this.queryParams.isRead = undefined
       listNotice(this.queryParams).then(response => {
         this.noticeList = response.rows;
         if(this.noticeList.length == 0){

+ 17 - 7
ruoyi-ui/src/views/system/bjq/index.vue

@@ -793,7 +793,7 @@
                 <el-option
                   v-for="dict in userList"
                   :key="dict.userId"
-                  :label="dict.userName"
+                  :label="dict.nickName"
                   :value="dict.userId"
                   @click.native = "fena(dict)"
                 />
@@ -817,7 +817,7 @@
                  @click.native = "fenb(dict)"
                   v-for="dict in userList"
                   :key="dict.userId"
-                  :label="dict.userName"
+                  :label="dict.nickName"
                   :value="dict.userId"
                 />
               </el-select>
@@ -840,7 +840,7 @@
                  @click.native = "fenf(dict)"
                   v-for="dict in userList"
                   :key="dict.userId"
-                  :label="dict.userName"
+                  :label="dict.nickName"
                   :value="dict.userId"
                 />
               </el-select>
@@ -1193,9 +1193,10 @@
                     <el-carousel-item v-for="(itemw,index) in item.wordfj" :key="itemw" >
                        <!-- <VueOfficeDocx v-if="isurw" style="height: 72vh;" :template="defaultSettings.urls+ijsget + itemw" :src="defaultSettings.urls+ijsget  + itemw" :options="editorOptions" ref="docxEditorfg">
                        </VueOfficeDocx> -->
-                       <VueOfficeDocx v-if="!isurw" style="height: 72vh;" :template="defaultSettings.urls + itemw" :src="defaultSettings.urls + itemw" :options="editorOptions" ref="docxEditorfg">
-                       </VueOfficeDocx>
                        <iframe v-if="isurw" :src="'https://view.officeapps.live.com/op/view.aspx?src=' + defaultSettings.urls+ijsget  + itemw" frameborder="0" style="width:100%;height:100%;"></iframe>
+                       <VueOfficeDocx v-if="isurw == false" style="height: 72vh;" :template="defaultSettings.urls + itemw" :src="defaultSettings.urls + itemw" :options="editorOptions" ref="docxEditorfg">
+                       </VueOfficeDocx>
+
                         <!-- <iframe v-if="!isurw" :src="'https://view.officeapps.live.com/op/view.aspx?src=' + defaultSettings.urls + itemw" frameborder="0" style="width:100%;height:100%;"></iframe> -->
                        <!-- <vue-doc-preview v-if="isurw" :file-url="defaultSettings.urls +ijsget + itemw" style="height: 73vh;"  /> -->
                        <!-- 线下环境 -->
@@ -2024,18 +2025,27 @@
             }
           }
           if(this.form.basicFj != null){
+            let nghw=[]
+            let nsgs = []
             for(var i in this.form.basicFj){
+              this.form.basicFj[i].filter(rjs=>{
+                if(rjs.type=='gsyyzhz'){
+                  nghw = this.form.basicFj[i]
+                }
+              })
                 this.form.basicFj[i] = this.form.basicFj[i].filter(tret=>{
                   return  this.matchType(tret.url) != 'image'
                 })
 
               for(var t =0; t<this.form.basicFj[i].length; t++){
                 // console.log(this.form.basicFj[i][t],i,t,186)
-                this.jisfile.push(this.form.basicFj[i][t])
+                nsgs.push(this.form.basicFj[i][t])
               }
+
             }
+            this.jisfile = nsgs.concat(nghw)
           }
-          console.log(this.fskgt,92)
+          console.log(this.fskgt,this.jisfile,92)
           if(this.form.shareholderFjList != null){
             // 股东
             let ndgse=[]

+ 4 - 2
ruoyi-ui/src/views/system/bjqbao/index.vue

@@ -919,12 +919,14 @@
               </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>
+            <iframe  :src="'https://view.officeapps.live.com/op/view.aspx?src=' + defaultSettings.urls+ijsget  + iteme " frameborder="0" style="width:100%;height:100%;"></iframe>
+           <!-- <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">
            </VueOfficeDocx> -->
-           <vue-doc-preview :file-url="defaultSettings.urls+ijsget + itemw" style="height: 80vh;"  />
+           <iframe  :src="'https://view.officeapps.live.com/op/view.aspx?src=' + defaultSettings.urls+ijsget  + itemw" frameborder="0" style="width:100%;height:100%;"></iframe>
+           <!-- <vue-doc-preview :file-url="defaultSettings.urls+ijsget + itemw" style="height: 80vh;"  /> -->
          </div>
          <div v-for="(itemp,index) in item.pdffj" :key="itemp" v-if="item.pdffj.length != 0">
            <iframe :src="defaultSettings.urls+ijsget + itemp" frameborder="0" style="width:100%;height:100%;"></iframe>

+ 41 - 12
ruoyi-ui/src/views/system/bjqs/index.vue

@@ -168,7 +168,7 @@
                 <el-col style="position: relative;">
                   <el-col :span="12">
                     <el-form-item :label="'股东' + (index-0+1) + '征信'" class="qiuchu">
-                      <file-uploadgdfm :data="item.gszhx.data" v-model="item.gszhx.shareholderZxUrl" />
+                      <file-uploadboty :data="item.gszhx.data" v-model="item.gszhx.shareholderZxUrl" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
@@ -517,7 +517,7 @@
               {{item.dictLabel}} <span style="color: red;">(需面签)</span>
               </el-col> -->
                 <el-col :span="8" style="text-align: center;" >
-                  <span style="color: red;" v-if="item.dictValue == 'wtdbsqs'">*</span>
+                  <span style="color: red;" v-if="item.dictValue == 'wtdbsqs'"></span>
                   <!-- <span style="color: red;" v-if="item.dictValue == 'gdhyjy'">*</span> -->
                   <span style="color: red;" v-if="item.dictValue == 'syndcwbb'">*</span>
                   <span style="color: red;" v-if="item.dictValue == 'dqcwbb' && form.applicationType == 1" >*</span>
@@ -672,13 +672,13 @@
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align: center;">
           <el-button style="background-color: #00A9F0; border-color: #00A9F0; color: #fff;" size="mini"
-            @click="znsheu(0)" v-if="isguanle == true && form.auditSchedule == 1">暂 存</el-button>
+            @click="znsheu(0)" v-if="isguanle == true && form.auditSchedule == 1"  >暂 存</el-button>
             <el-button style="background-color: #00A9F0; border-color: #00A9F0; color: #fff;" size="mini"
               @click="znsheu(0)" v-if="isguanle == false">暂 存</el-button>
           <el-button style="background-color: #032C7B; border-color: #032C7B; color: #fff;" size="mini"
-            @click="submitForm(0)" v-if="isguanle == true &&(form.loanSchedule <3 ||(isgsneg == true && form.loanSchedule>2)) && isnge == false">确 定</el-button>
+            @click="submitForm(0)"  v-hasPermi="['system:application:qued']"  v-if="isguanle == true && (form.auditSchedule == 1 || (isgsneg == true && form.loanSchedule>2))">确 定</el-button>
             <el-button style="background-color: #032C7B; border-color: #032C7B; color: #fff;" size="mini"
-              @click="submitForm(0)" v-if="isguanle == false  || isnge == true">确 定</el-button>
+              @click="submitForm(0)"  v-if="isguanle == false  || isnge == true">确 定</el-button>
           <el-button size="mini" @click="cancelf">取 消</el-button>
           <!-- 企业 -->
           <!-- <el-tooltip class="item" effect="dark" content="点击下一步" placement="top" v-if="isshangx ==0">
@@ -1155,6 +1155,7 @@
           fdbgrzx: [],
           fdbqyzx: [],
           fdbqyyyzz: [],
+          gsyyzhz:[]
         },
         jlsk: {
           loanApplicationNumber: 0,
@@ -1193,6 +1194,10 @@
           loanApplicationNumber: 0,
           fileName: 1
         },
+        gsyyzhz: {
+          loanApplicationNumber: 0,
+          fileName: 1
+        },
         jhz: {
           loanApplicationNumber: 0,
           fileName: 1
@@ -1270,7 +1275,8 @@
           {fdbqyzx:null,fdbqyyyzz:null,},
         ],
         fisdIdl:[],
-        fiseaids:[]
+        fiseaids:[],
+        ghsejg:''
       };
     },
     watch: {
@@ -2025,7 +2031,7 @@
 
           this.inghegs = true
           this.form.shareholderFjIdList = []
-           this.refsgk = []
+          this.refsgk = []
           this.banghao = response.data.loanApplicationNumber;
           this.isgueg.loanApplicationNumber = response.data.loanApplicationNumber
           this.movelist = []
@@ -2038,10 +2044,13 @@
           if(response.data.loanApplicationFjList != null){
             for(var z =0; z<response.data.loanApplicationFjList.length;z++){
               if(response.data.loanApplicationFjList[z].remark !='1'){
-                if(response.data.loanApplicationFjList[z].bigType =='a' &&response.data.loanApplicationFjList[z].bigType =='b'){
+                if(response.data.loanApplicationFjList[z].bigType =='a' || response.data.loanApplicationFjList[z].bigType =='b'){
                    this.movelist.push(response.data.loanApplicationFjList[z].fjId)
                    this.movelistto.push(response.data.loanApplicationFjList[z])
                 }
+                if(response.data.loanApplicationFjList[z].type == 'gsyyzhz'){
+                  this.ghsejg = response.data.loanApplicationFjList[z].url
+                }
 
 
               }
@@ -2325,6 +2334,7 @@
 
 
                this.refsgk = this.refsgk.concat(nhgs)
+
              for(let o in this.shenbs) {
                if(i == o){
                  // console.log(i,o,345)
@@ -2341,6 +2351,7 @@
       }
          this.jlsk.loanApplicationNumber = response.data.loanApplicationNumber;
          this.gszc.loanApplicationNumber = response.data.loanApplicationNumber;
+         this.gsyyzhz.loanApplicationNumber = response.data.loanApplicationNumber;
          this.gsjj.loanApplicationNumber = response.data.loanApplicationNumber;
          this.khxkz.loanApplicationNumber = response.data.loanApplicationNumber;
          this.shqqy.loanApplicationNumber = response.data.loanApplicationNumber;
@@ -2409,6 +2420,7 @@
         }
         this.form.loanApplicationFjList = []
         this.form.shareholderFjList = []
+
         console.log(this.fanqy,this.jigvfh,this.fangeren,16)
         let asngs = []
         let isdeshe = []
@@ -2554,7 +2566,6 @@
         }
         console.log(this.fjshareholderFjList)
         this.fjshareholderFjList.filter( route=>{
-
           let nhget={shareholderFrontUrl:'',
                      shareholderName:'',
                      shareholderIdCard:'',
@@ -2619,6 +2630,9 @@
               return
             }
 
+            // if(this.jigvfh.gsyyzhz.length == 0){
+
+            // }
 
             if(this.form.customerType == null || this.form.customerType == ''){
               this.$message.error("请填写用户类型信息");
@@ -2861,7 +2875,7 @@
                 for(var c = 0 ; c < this.form.loanApplicationFjList.length; c++){
                   if(this.form.loanApplicationFjList[c].remark != '1'){
                     if(this.form.loanApplicationFjList[c].fjId != undefined){
-                      if(this.form.loanApplicationFjList[c].bigType == 'a' && this.form.loanApplicationFjList[c].bigType == 'b'  ){
+                      if(this.form.loanApplicationFjList[c].bigType == 'a' || this.form.loanApplicationFjList[c].bigType == 'b'  ){
                         this.misgw.push(this.form.loanApplicationFjList[c].fjId)
                       }
 
@@ -2969,6 +2983,14 @@
         let isssid=[]
         let gsef = 0
         let gsefd = 0
+        // if(this.ghsejg !=''){
+        //   if(this.ghsejg !=null){
+        //     if(this.jigvfh.gsyyzhz.length == 0){
+        //       this.jigvfh.gsyyzhz=[{url:this.ghsejg,name:'公司营业执照',bigType:'a',loanApplicationNumber:this.gsyyzhz.loanApplicationNumber,remark:'1'}]
+        //     }
+        //   }
+        // }
+
         if(this.form.guaranteeType != null ){
           gsef = this.form.guaranteeType.indexOf('2')
            gsefd = this.form.guaranteeType.indexOf('4')
@@ -3135,12 +3157,13 @@
              for(var c = 0 ; c < this.form.loanApplicationFjList.length; c++){
                if(this.form.loanApplicationFjList[c].remark != '1'){
                  if(this.form.loanApplicationFjList[c].fjId != undefined){
-                   if(this.form.loanApplicationFjList[c].bigType == 'a' && this.form.loanApplicationFjList[c].bigType == 'b'){
+                   if(this.form.loanApplicationFjList[c].bigType == 'a' || this.form.loanApplicationFjList[c].bigType == 'b'){
                      this.misgw.push(this.form.loanApplicationFjList[c].fjId)
                    }
                  }
                }
              }
+             console.log(1244,this.misgw,this.movelist)
              // this.form.loanApplicationFjList.
              // this.misgw = this.form.loanApplicationFjList
             this.form.loanApplicationFjIdList = this.findOperate(this.movelist,this.misgw)
@@ -3458,6 +3481,9 @@
             // if (rou.dictValue == "frhkbbry") {
             //   this.hkbdy.fileName = rou.dictLabel
             // }
+            if (rou.dictValue == "gsyyzhz") {
+              this.gsyyzhz.fileName = rou.dictLabel
+            }
             if (rou.dictValue == "fdbrgrgzzm") {
               this.grgzzm.fileName = rou.dictLabel
             }
@@ -3493,6 +3519,7 @@
         getLoanApplicationNumber().then(response => {
           this.jlsk.loanApplicationNumber = response.data;
           this.gszc.loanApplicationNumber = response.data;
+          this.gsyyzhz.loanApplicationNumber = response.data;
           this.gsjj.loanApplicationNumber = response.data;
           this.khxkz.loanApplicationNumber = response.data;
           this.shqqy.loanApplicationNumber = response.data;
@@ -3509,7 +3536,7 @@
           this.fdbqyzx.loanApplicationNumber = response.data;
           this.fdbqyyyzz.loanApplicationNumber = response.data;
           this.fadse.loanApplicationNumber = response.data;
-           this.fanfes.loanApplicationNumber = response.data
+          this.fanfes.loanApplicationNumber = response.data
           this.fanpgfe.loanApplicationNumber = response.data
           this.banghao = response.data;
           this.form.loanApplicationNumber = response.data
@@ -3533,6 +3560,8 @@
       qiyegs(item){
         console.log(item,2)
         this.form.enterpriseName = item.enterpriseName
+        this.ghsejg = item.imageUrl
+        this.jigvfh.gsyyzhz=[{url:this.ghsejg,name:'公司营业执照',bigType:'a',loanApplicationNumber:this.gsyyzhz.loanApplicationNumber,}]
         this.$set(this.form,'businessScope',item.businessScope)
       },
       // 下载模板

+ 8 - 7
ruoyi-ui/src/views/system/bjqsh/index.vue

@@ -577,7 +577,7 @@
                 <el-option
                   v-for="dict in userList"
                   :key="dict.userId"
-                  :label="dict.userName"
+                  :label="dict.nickName"
                   :value="dict.userId"
                   @click.native = "fena(dict)"
                 />
@@ -601,7 +601,7 @@
                  @click.native = "fenb(dict)"
                   v-for="dict in userList"
                   :key="dict.userId"
-                  :label="dict.userName"
+                  :label="dict.nickName"
                   :value="dict.userId"
                 />
               </el-select>
@@ -624,7 +624,7 @@
                  @click.native = "fenf(dict)"
                   v-for="dict in userList"
                   :key="dict.userId"
-                  :label="dict.userName"
+                  :label="dict.nickName"
                   :value="dict.userId"
                 />
               </el-select>
@@ -819,7 +819,8 @@
          <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">
            </VueOfficeDocx> -->
-           <vue-doc-preview :file-url="defaultSettings.urls+ijsget + itemw" style="height: 80vh;"  />
+            <iframe  :src="'https://view.officeapps.live.com/op/view.aspx?src=' + defaultSettings.urls+ijsget  + itemw" frameborder="0" style="width:100%;height:100%;"></iframe>
+           <!-- <vue-doc-preview :file-url="defaultSettings.urls+ijsget + itemw" style="height: 80vh;"  /> -->
          </div>
          <div v-for="(itemp,index) in item.pdffj" :key="itemp" v-if="item.pdffj.length != 0">
            <iframe :src="defaultSettings.urls+ijsget + itemp" frameborder="0" style="width:100%;height:100%;"></iframe>
@@ -1464,7 +1465,7 @@
             }else{
               window.open(this.defaultSettings.urls+this.ijsget  + row.url )
             }
-      
+
           }
           if( row.fjtypr == "word"){
             // row.wordfj.push(row.url)
@@ -1482,8 +1483,8 @@
             // row.exlefj.push(row.url)
             window.open('https://view.officeapps.live.com/op/view.aspx?src=' + this.defaultSettings.urls+this.ijsget  + row.url )
           }
-      
-      
+
+
       },
       iszvr(row){
         this.iscsessie=row