Merge branch 'master' of http://git.keao.tech/SupplyChain/front

front-vue/src/views/home.vue

@@ -430,12 +430,9 @@
                     </el-tab-pane>
                     <el-tab-pane label="30天内待还款汇总" name="fourth" style="height:400px">
                         <el-table :data="expiredList" :show-header="true">
-                            <el-table-column label="融资编号" align="center" prop="zfiNumber" :show-overflow-tooltip="true" />
+                            <el-table-column label="融资编号" align="center" prop="zfrNumber" :show-overflow-tooltip="true" />
                             <el-table-column label="金额" align="center" prop="zfrLoanAmount" :show-overflow-tooltip="true" />
-                            <el-table-column label="到期日期" align="center" prop="afiExpireDate" :show-overflow-tooltip="true">
-                                <template slot-scope="scope">
-                                    <span>{{ parseTime(new Date(scope.row.afiExpireDate), '{y}-{m}-{d}') }}</span>
-                                </template>
+                            <el-table-column label="到期日期" align="center" prop="zfiExpireDate" :show-overflow-tooltip="true">
                             </el-table-column>
                             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
                                 <template slot-scope="scope">
@@ -1040,7 +1037,7 @@ export default {
                     this.getFinanceRecordYear()
                     //即将到期额度（30天）
                     this.getExpiredBalance()
-
+                    this.getExpiredList()
                     //查询待办
                     this.getWorkList()
                     //查询消息

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

@@ -53,41 +53,6 @@
                     </div>
                 </el-row>
                 <el-row class="zap-business">
-                    <div v-if="handlerPositiveShow || handlerNegativeShow" class="zap-business__item">
-                        <div class="zap-business__title">经办人信息:</div>
-                        <div class="zap-business__picture">
-                            <el-upload v-if="handlerPositiveShow" ref="handlerPositiveImg" action="" multiple :class="{ uoloadSty: showBtnImg, disUoloadSty: noBtnImg }" list-type="picture-card" :file-list="handlerPositiveList" :auto-upload="false">
-                                <i slot="default" class="el-icon-plus"></i>
-                                <div slot="file" slot-scope="{file}">
-                                    <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                                    <span class="el-upload-list__item-actions">
-                                        <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                                            <i class="el-icon-zoom-in"></i>
-                                        </span>
-                                        <span class="el-upload-list__item-delete" @click="handleImgDownload(file)">
-                                            <i class="el-icon-download"></i>
-                                        </span>
-                                    </span>
-                                </div>
-                            </el-upload>
-                        </div>
-                        <div class="zap-business__picture">
-                            <el-upload v-if="handlerNegativeShow" ref="handlerNegativeImg" action="" multiple :class="{ uoloadSty: showBtnImg, disUoloadSty: noBtnImg }" list-type="picture-card" :file-list="handlerNegativeList" :auto-upload="false">
-                                <i slot="default" class="el-icon-plus"></i>
-                                <div slot="file" slot-scope="{file}">
-                                    <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                                    <span class="el-upload-list__item-actions" >
-                                        <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)"  >
-                                            <i class="el-icon-zoom-in"></i>
-                                        </span>
-                                        <span class="el-upload-list__item-delete" @click="handleImgDownload(file)">
-                                            <i class="el-icon-download"></i>
-                                        </span>
-                                    </span>
-                                </div>
-                            </el-upload>
-                        </div>
-                    </div>
                     <div v-if="commitmentShow" class="zap-business__item">
                         <div class="zap-business__title">数字证书授权与承诺书:</div>
                         <div class="zap-business__picture">
@@ -151,6 +116,46 @@
                         </el-row>
                     </div>
                 </el-row>
+                <!-- 经办人身份证 -->
+                <el-row class="zap-business">
+                     <div v-if="handlerPositiveShow ||handlerNegativeShow" class="zap-business__item">
+                        <div class="zap-business__title">经办人证件:</div>
+                        <el-row type="flex" align="middle">
+                        <div class="zap-business__picture">
+                            <el-upload v-if="handlerPositiveShow" ref="handlerPositiveImg" action="" multiple :class="{ uoloadSty: showBtnImg, disUoloadSty: noBtnImg }" list-type="picture-card" :file-list="handlerPositiveList" :auto-upload="false">
+                                <i slot="default" class="el-icon-plus"></i>
+                                <div slot="file" slot-scope="{file}">
+                                    <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                                    <span class="el-upload-list__item-actions">
+                                        <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                                            <i class="el-icon-zoom-in"></i>
+                                        </span>
+                                        <span class="el-upload-list__item-delete" @click="handleImgDownload(file)">
+                                            <i class="el-icon-download"></i>
+                                        </span>
+                                    </span>
+                                </div>
+                            </el-upload>
+                        </div>
+                        <div class="zap-business__picture">
+                            <el-upload v-if="handlerNegativeShow" ref="handlerNegativeImg" action="" multiple :class="{ uoloadSty: showBtnImg, disUoloadSty: noBtnImg }" list-type="picture-card" :file-list="handlerNegativeList" :auto-upload="false">
+                                <i slot="default" class="el-icon-plus"></i>
+                                <div slot="file" slot-scope="{file}">
+                                    <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                                    <span class="el-upload-list__item-actions" >
+                                        <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)"  >
+                                            <i class="el-icon-zoom-in"></i>
+                                        </span>
+                                        <span class="el-upload-list__item-delete" @click="handleImgDownload(file)">
+                                            <i class="el-icon-download"></i>
+                                        </span>
+                                    </span>
+                                </div>
+                            </el-upload>
+                        </div>
+                        </el-row> 
+                    </div>
+                </el-row>    
                 <el-row>
                      <div v-if="scyCfcaUserId" class="zap-business__text">
                         CFCA企业认证证书:<span>{{scyCfcaUserId}}</span>
@@ -498,7 +503,7 @@ export default {
             activeName: "first",
         };
     },
-    created() {
+    activated() {
         this.getList();
         this.getRelList();
         this.getNowUser();
@@ -790,7 +795,7 @@ export default {
                         response.data.handlerPositiveList[0].pfiUrl;
                     const handlerPositiveImgId =
                         response.data.handlerPositiveList[0].pfiFileId;
-                    if (handlerPositiveImg != "" && handlerPositiveId != "") {
+                    if (handlerPositiveImg != "" && handlerPositiveImgId != "") {
                         this.handlerPositiveShow = true;
                         let imgUrl = (handlerPositiveImg).split(",");
                         let imgUrlId = (handlerPositiveImgId).split(",");

front-vue/src/views/service/contract/addContract.vue

@@ -324,12 +324,12 @@ export default {
           break;
         }
       }
-        this.noneBtnDealImg = fileList.length >= this.limitCountImg;
+        // this.noneBtnDealImg = fileList.length >= this.limitCountImg;
     },
     handleExceed(files, fileList) {
       this.$message.warning(`当前限制选择 1 个文件`);
     },
-    beforeUpload(files){
+    beforeUpload(files,fileList){
       var testmsg=files.name.substring(files.name.lastIndexOf('.')+1);                            
       const extension2 = testmsg === 'docx'
       if(!extension2){
@@ -338,7 +338,12 @@ export default {
       return extension2;
     },
     dealImgChange(files, fileList){
-      this.noneBtnDealImg = fileList.length >= this.limitCountImg;
+      var testmsg=files.name.substring(files.name.lastIndexOf('.')+1);                            
+      const extension2 = testmsg === 'docx'
+      if(extension2){
+         this.noneBtnDealImg = fileList.length >= this.limitCountImg;
+      }
+
      },
     //手动上传文件触发
     httpRequest(param) {
@@ -358,12 +363,11 @@ export default {
           this.msgSuccess("上传成功");
           loading.close();
         }
-        this.noneBtnDealImg = fileList.length >= this.limitCountImg;
       }).catch((response) =>{
           if(!response){
             this.$message.warning(`上传失败`);
           }
-           this.noneBtnDealImg = fileList.length >= this.limitCountImg;
+           this.noneBtnDealImg = this.fileList.length >= this.limitCountImg;
           loading.close();
       });
     },

front-vue/src/views/service/contract/editContract.vue

@@ -153,6 +153,7 @@
           :http-request="httpRequest"
           :before-remove="beforeRemove"
           :on-preview="handleFileDownload"
+           :before-upload="beforeUpload"
           accept=".docx"
           multiple
           :limit="1"

front-vue/src/views/service/credit/addCredit.vue

@@ -115,7 +115,7 @@
             1. 如果因财务处理而引发的重复付款，责任由开立企业自行承担，不免除按照承诺付款日付款的责任；
         </p>
         <p>
-            2. 融资付息的模式默认为：融资人承当，该笔融信及其拆分流转的融信融资付息时息费将由融资申请人负担；
+            2. 融资付息的模式默认为：融资人承担，该笔融信及其拆分流转的融信融资付息时息费将由融资申请人负担；
         </p>
         <p>
             3. 开立方财务标记建议：

front-vue/src/views/service/credit/addInformation.vue

@@ -1260,7 +1260,7 @@ export default {
                                 isOpenApproval(platParam).then((response) => {
                                 var platResult = response.data.isOpen;
                                     if (platResult == true) {
-                                        _this.msgSuccess("平台正在审核资料，平台审核时间为工作日：9：00—18：00；单日16：00之前提交资料，预计2小时内完成，请平台审批通过后，再次签署");
+                                        _this.msgSuccess("平台正在审核资料，平台审核时间为工作日：9：00—18：00；当日16：00之前提交资料，预计2小时内完成，请平台审批通过后，再次签署");
                                     }
                                 })
                                 _this.$store.dispatch("tagsView/delView", _this.$route);
@@ -1277,7 +1277,7 @@ export default {
                     this.form.ticketList = this.ticketList;
                     addInfor(this.form).then(response => {
                         loading.close();
-                        this.msgSuccess("平台正在审核资料，平台审核时间为工作日：9：00—18：00；单日16：00之前提交资料，预计2小时内完成，请平台审批通过后，再次签署");
+                        this.msgSuccess("平台正在审核资料，平台审核时间为工作日：9：00—18：00；当日16：00之前提交资料，预计2小时内完成，请平台审批通过后，再次签署");
                         this.$store.dispatch("tagsView/delView", this.$route);
                         this.$router.go(-1);
                     }).catch((response)=>{

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

@@ -1975,21 +1975,22 @@ export default {
                 return false;
             }
             //查询有无平台审批
-            var platParam = {};
+          /*   var platParam = {};
             platParam.menuId = "1000000004";
             isOpenApproval(platParam).then((response) => {
                 var platResult = response.data.isOpen;
                 //开启平台审批
                 if (platResult == true) {
-                    if (row.zfiPlatformStatus == '00') {
+                    
+                }
+            }) */
+            if (row.zfiPlatformStatus == '00') {
                         this.$message({
-                            message: "平台正在审核资料，平台审核时间为工作日：9：00—18：00；单日16：00之前提交资料，预计2小时内完成，请平台审批通过后，再次签署",
+                            message: "平台正在审核资料，平台审核时间为工作日：9：00—18：00；当日16：00之前提交资料，预计2小时内完成，请平台审批通过后，再次签署",
                             type: 'warning'
                         });
                         return false;
-                    }
-                }
-            })
+            }
             //查询当前用户是否为经办人
             listCompanyHandler().then((response) => {
                 if (false == response.data) {
@@ -2089,7 +2090,7 @@ export default {
                     return false;
                 } else if (row.zfiPlatformStatus != "01") {
                     this.$message({
-                        message: "融信资料已提交平台审核，平台审核时间为工作日：9：00—18：00；单日16：00之前提交资料，预计2小时内完成，请留意站内信息",
+                        message: "融信资料已提交平台审核，平台审核时间为工作日：9：00—18：00；当日16：00之前提交资料，预计2小时内完成，请留意站内信息",
                         type: 'warning'
                     });
                     return false;

front-vue/src/views/service/credit/creditApply.vue

@@ -61,7 +61,7 @@
             2. 选择账款：如需选择多笔账款同时提交，须满足预计还款日期一致；
         </p>
         <p>
-            3. 融信有效期：融信有效期非已核心企业最终确认还款时间为准，而非资产
+            3. 融信有效期：融信有效期非以核心企业最终确认还款时间为准，而非资产
             中预计还款时间；
         </p>
         <p>
@@ -610,7 +610,7 @@ export default {
                                             var platResult = response.data.isOpen;
                                             //开启平台审批
                                             if (platResult) {
-                                                _this.msgSuccess("融信资料已提交平台审核，平台审核时间为工作日：9：00—18：00；单日16：00之前提交资料，预计2小时内完成，请留意站内信息");
+                                                _this.msgSuccess("融信资料已提交平台审核，平台审核时间为工作日：9：00—18：00；当日16：00之前提交资料，预计2小时内完成，请留意站内信息");
                                                 _this.$store.dispatch("tagsView/delView", _this.$route);
                                                 _this.$router.go(-1);
                                             } else {
@@ -657,7 +657,7 @@ export default {
                                         var platResult = response.data.isOpen;
                                         //开启平台审批
                                         if (platResult) {
-                                            this.msgSuccess("融信资料已提交平台审核，平台审核时间为工作日：9：00—18：00；单日16：00之前提交资料，预计2小时内完成，请留意站内信息");
+                                            this.msgSuccess("融信资料已提交平台审核，平台审核时间为工作日：9：00—18：00；当日16：00之前提交资料，预计2小时内完成，请留意站内信息");
                                             this.$store.dispatch("tagsView/delView", this.$route);
                                             this.$router.go(-1);
                                         } else {

front-vue/src/views/service/credit/financeOpen.vue

@@ -855,7 +855,7 @@ export default {
                                                     var platResult = response.data.isOpen;
                                                     //开启平台审批
                                                     if (platResult) {
-                                                        _this.msgSuccess("融信资料已提交平台审核，平台审核时间为工作日：9：00—18：00；单日16：00之前提交资料，预计2小时内完成，请留意站内信息");
+                                                        _this.msgSuccess("融信资料已提交平台审核，平台审核时间为工作日：9：00—18：00；当日16：00之前提交资料，预计2小时内完成，请留意站内信息");
                                                         _this.$store.dispatch("tagsView/delView", _this.$route);
                                                         _this.$router.go(-1);
                                                     } else {
@@ -940,7 +940,7 @@ export default {
                                                 var platResult = response.data.isOpen;
                                                 //开启平台审批
                                                 if (platResult) {
-                                                    this.msgSuccess("融信资料已提交平台审核，平台审核时间为工作日：9：00—18：00；单日16：00之前提交资料，预计2小时内完成，请留意站内信息");
+                                                    this.msgSuccess("融信资料已提交平台审核，平台审核时间为工作日：9：00—18：00；当日16：00之前提交资料，预计2小时内完成，请留意站内信息");
                                                     this.$store.dispatch("tagsView/delView", this.$route);
                                                     this.$router.go(-1);
                                                 } else {

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container zap-main">
-    <search-bar v-if="activeIndex === '0'" :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :companyType="companyType" :tableId="tableId" @query="handleQuery" @reset="resetQuery">
+    <search-bar v-if="activeIndex === '0'" :checkList="checkList" :tableList="tableList" :selfDom="selfDom"  :tableId="tableId" @query="handleQuery" @reset="resetQuery">
         <el-form
           :model="queryParams"
           ref="queryForm"
@@ -74,7 +74,7 @@
             </el-row>
           </el-form>
     </search-bar>
-    <search-bar v-if="activeIndex === '1'" :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :companyType="companyType" :tableId="tableId" @query="secondQuery" @reset="resetSecondQuery">
+    <search-bar v-if="activeIndex === '1'" :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId" @query="secondQuery" @reset="resetSecondQuery">
         <el-form
           :model="unRepayment"
           ref="queryForm1"
@@ -116,7 +116,7 @@
           </el-form-item>
         </el-form>
     </search-bar>
-    <search-bar v-if="activeIndex === '2'" :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :companyType="companyType" :tableId="tableId" @query="thirdQuery" @reset="resetThirdQuery">
+    <search-bar v-if="activeIndex === '2'" :checkList="checkList" :tableList="tableList" :selfDom="selfDom"  :tableId="tableId" @query="thirdQuery" @reset="resetThirdQuery">
         <el-form
           :model="repayment"
           ref="queryForm2"
@@ -159,7 +159,7 @@
           </el-form-item>
         </el-form>
      </search-bar>
-    <search-bar v-if="activeIndex === '3'" :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :companyType="companyType" :tableId="tableId" @query="fouthQuery" @reset="resetFouthQuery">
+    <search-bar v-if="activeIndex === '3'" :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId" @query="fouthQuery" @reset="resetFouthQuery">
         <el-form
           :model="overdue"
           ref="queryForm3"
@@ -967,32 +967,27 @@ export default {
     /** 查询所有还款列表 */
     getList() {
       this.loading = true;
+       return getOwnCompany().then((response) => {
+                this.company = response.data;
       return listRepayment(this.queryParams).then(response => {
         this.allRepaymentList = response.data.records;
-         console.log(this.allRepaymentList,"列表")
         this.total = response.data.total;
-           getOwnCompany().then((response) => {
-                this.company = response.data;
-            });
         this.loading = false;
         return Promise.resolve(response);
       }).catch(response => {
         this.loading = false;
         return Promise.reject("error");
       });
+          });
     },
     /** 查询未还款列表 */
     getUnpayList() {
       this.loading = true;
       this.unRepayment.status = "00";
-        getOwnCompany().then((response) => {
-             console.log(response,"企业数据")
+       return getOwnCompany().then((response) => {
                 this.company = response.data;
       return listRepayment(this.unRepayment).then(response => {
         this.unRepaymentList = response.data.records;
-        console.log(this.unRepaymentList,"列表展示")
-          
-     
         this.total1 = response.data.total;
         this.loading = false;
         return Promise.resolve(response);
@@ -1006,12 +1001,10 @@ export default {
     getRepayList() {
       this.loading = true;
       this.repayment.status = "01";
+       return    getOwnCompany().then((response) => {
+                this.company = response.data;
       return listRepayment(this.repayment).then(response => {
         this.repaymentList = response.data.records;
-            getOwnCompany().then((response) => {
-                console.log(response,"企业数据")
-                this.company = response.data;
-            });
         this.total2 = response.data.total;
         this.loading = false;
         return Promise.resolve(response);
@@ -1019,17 +1012,17 @@ export default {
         this.loading = false;
         return Promise.reject("error");
       });
+          });
     },
     /** 查询逾期列表 */
     getOverdueList() {
       this.loading = true;
       this.overdue.status = "02";
-      return listRepayment(this.overdue).then(response => {
-        this.overdueList = response.data.records;
-            getOwnCompany().then((response) => {
+     return    getOwnCompany().then((response) => {
                 console.log(response,"企业数据")
                 this.company = response.data;
-            });
+      return listRepayment(this.overdue).then(response => {
+        this.overdueList = response.data.records;
         this.total3 = response.data.total;
         this.loading = false;
         return Promise.resolve(response);
@@ -1037,6 +1030,7 @@ export default {
         this.loading = false;
         return Promise.reject("error");
       });
+                  });
     },
     /** 查询带还款金额 */
     getRepaymentAmount() {

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

@@ -794,10 +794,12 @@ export default {
         /** 查询用户列表 */
         getList() {
             this.loading = true;
-            listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
+            listUser(
+                this.addDateRange(this.queryParams, this.dateRange)).then(
                 (response) => {
                     let userList = response.rows;
-                      handlerDo(userList[0]).then((response) => {
+                    console.log(userList)
+                      handlerDo(userList).then((response) => {
                     for (let i = 0; i < userList.length; i++) {
                              for (let j = 0; j < response.data.length; j++) {
                                  console.log(userList[i].userId,"iser")