Merge branch 'master' of http://git.minpay.cc/SupplyChain/front

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

@@ -10,16 +10,15 @@
                 </el-col>
                 <el-col :span="8">
                     <el-form-item label="授信额度" prop="zfiCoreQuotaId">
-                        <el-select style="width: 200px" v-model="form.zfiCoreQuotaId" filterable clearable remote @change="change">
+                        <el-select style="width: 300px" v-model="form.zfiCoreQuotaId" filterable clearable remote @change="change">
                             <el-option v-for="item in creditLineList" :key="item.value" :label="item.label+item.remaining" :value="item.value">
                             </el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                    <span>可用额度:</span>
-                    <span>{{availableAmt}}</span>
-                    <br>
+                    <span  style="display:none">可用额度:</span>
+                    <span  style="display:none">{{availableAmt}}</span>
                     <span>有效期:</span>
                     <span>{{validityDate}}</span>
                     <br>
@@ -530,12 +529,12 @@ export default {
             if (this.chooseTicket) {
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if (this.chooseTicket.length > 1) {
+                if (this.chooseTicket.length > 0) {
                     //获取选中第一个的应收企业
                     var receiveName = this.chooseTicket[0].receiveName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
-                    for (var i = 1; i < this.chooseTicket.length; i++) {
+                    for (var i = 0; i < this.chooseTicket.length; i++) {
                         if (receiveName != this.chooseTicket[i].receiveName) {
                             flag = false
                             this.$message({

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

@@ -525,12 +525,12 @@ export default {
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 1){
+                if(this.chooseTicket.length > 0){
                     //获取选中第一个的应付企业
                     var payName = this.chooseTicket[0].payName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
-                    for(var i = 1 ;i < this.chooseTicket.length;i++){
+                    for(var i = 0 ;i < this.chooseTicket.length;i++){
                         if(payName != this.chooseTicket[i].payName){
                             flag = false
                             this.$message({

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

@@ -85,7 +85,7 @@
                 </el-col>
                 <el-col :span="8" v-if="this.zfiCreateType == 0">
                     <el-form-item label="授信额度" prop="zfiCoreQuotaId">
-                        <el-select style="width: 200px" v-model="form.zfiCoreQuotaId" filterable clearable remote>
+                        <el-select style="width:300px" v-model="form.zfiCoreQuotaId" filterable clearable remote>
                             <el-option v-for="item in creditLineList" :key="item.value" :label="item.label+item.remaining" :value="item.value">
                             </el-option>
                         </el-select>
@@ -93,14 +93,13 @@
                 </el-col>
                 <el-col :span="8" v-if="this.zfiCreateType != 0">
                     <el-form-item label="授信额度" prop="zfpName" >
-                       <el-input v-model="form.zfpName" style="width: 200px" disabled/>
+                       <el-input v-model="form.zfpName" style="width: 300px" disabled/>
                     </el-form-item>
                
                 </el-col>
                 <el-col :span="8" v-if="this.zfiCreateType == 0">
-                    <span>可用额度:</span>
-                    <span>{{availableAmt}}</span>
-                    <br>   
+                    <span style="display:none">可用额度:</span>
+                    <span style="display:none">{{availableAmt}}</span>
                     <span>有效期:</span>
                     <span>{{validityDate}}</span>
                      <br>
@@ -539,7 +538,7 @@ export default {
       closeTicket() {
         if(this.chooseTicket){
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 1){
+                if(this.chooseTicket.length > 0){
                     //获取选中第一个的应付企业
                     var payName = this.chooseTicket[0].payName;
                     //获取选中第一个的预计还款日期

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

@@ -435,12 +435,12 @@ export default {
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 1){
+                if(this.chooseTicket.length > 0){
                     //获取选中第一个的应付企业
                     var payName = this.chooseTicket[0].payName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
-                    for(var i = 1 ;i < this.chooseTicket.length;i++){
+                    for(var i = 0 ;i < this.chooseTicket.length;i++){
                         if(payName != this.chooseTicket[i].payName){
                             flag = false;
                             this.$message({

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

@@ -167,9 +167,8 @@
             <el-button @click="cancel">取消</el-button>
         </div>
         <el-dialog
-            title="预览"
             :visible.sync="pdfShowDialog"
-            width="30%">
+            width="90%">
             <pdf-show :pdfFileList="pdfFileList">
             </pdf-show>
         </el-dialog>
@@ -512,13 +511,19 @@ export default {
     },
      //获取合同文件
     getContractFile(){
+        const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    background: 'rgba(0, 0, 0,0)'
+                });
          getContractFile(this.form).then((response) => {
+                loading.close();
                 if(response.data.list){
                     this.pdfFileList = response.data.list;
                 }
                  //文件存在
                 if(this.pdfFileList.length > 0 ){
-                        this.pdfShowDialog = true;
+                    this.pdfShowDialog = true;
 
                 }else{
                       this.$message({
@@ -526,6 +531,8 @@ export default {
                         type: 'warning'
                       });
                 }
+            }).catch((response)=>{
+                        loading.close();
             });
     },
     //选择类型

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

@@ -69,7 +69,7 @@
                 <el-col :span="8">
                     <el-form-item label="授信额度" prop="zfiCoreQuotaId">
                         <el-select
-                            style="width: 200px"
+                            style="width:300px"
                             v-model="form.zfiCoreQuotaId"
                             filterable
                             clearable
@@ -85,9 +85,8 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                    <span>可用额度:</span>
-                    <span>{{availableAmt}}</span>
-                    <br>   
+                    <span style="display:none">可用额度:</span>
+                    <span style="display:none">{{availableAmt}}</span>
                     <span>有效期:</span>
                     <span>{{validityDate}}</span>
                     <br>
@@ -557,12 +556,12 @@ export default {
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 1){
+                if(this.chooseTicket.length > 0){
                     //获取选中第一个的应收企业
                     var receiveName = this.chooseTicket[0].receiveName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
-                    for(var i = 1 ;i < this.chooseTicket.length;i++){
+                    for(var i = 0 ;i < this.chooseTicket.length;i++){
                         if(receiveName != this.chooseTicket[i].receiveName){
                             flag = false;
                             this.$message({

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

@@ -40,7 +40,7 @@
                 <el-col :span="8">
                     <el-form-item label="授信额度" prop="zfiSupplierQuotaId">
                         <el-select
-                            style="width: 200px"
+                            style="width:300px"
                             v-model="form.zfiSupplierQuotaId"
                             filterable
                             clearable
@@ -58,9 +58,8 @@
                
                 </el-col>
                 <el-col :span="8">
-                    <span>可用额度:</span>
-                    <span>{{availableAmt}}</span>
-                    <br>   
+                    <span style="display:none">可用额度:</span>
+                    <span style="display:none">{{availableAmt}}</span>
                     <span>有效期:</span>
                     <span>{{validityDate}}</span>
                      <br>
@@ -510,15 +509,16 @@ export default {
         },
         // 确认选择
       closeTicket() {
+          debugger;
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 1){
+                if(this.chooseTicket.length > 0){
                     //获取选中第一个的应付企业
                     var payName = this.chooseTicket[0].payName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
-                    for(var i = 1 ;i < this.chooseTicket.length;i++){
+                    for(var i = 0 ;i < this.chooseTicket.length;i++){
                         if(payName != this.chooseTicket[i].payName){
                             flag = false;
                             this.$message({

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

@@ -58,7 +58,7 @@
                 <el-col :span="8">
                     <el-form-item label="授信额度" prop="zfiSupplierQuotaId">
                         <el-select
-                            style="width: 200px"
+                            style="width:300px"
                             v-model="form.zfiSupplierQuotaId"
                             filterable
                             clearable
@@ -75,9 +75,8 @@
                
                 </el-col>
                 <el-col :span="8">
-                    <span>可用额度:</span>
-                    <span>{{availableAmt}}</span>
-                    <br>   
+                    <span style="display:none">可用额度:</span>
+                    <span style="display:none">{{availableAmt}}</span>
                     <span>有效期:</span>
                     <span>{{validityDate}}</span>
                      <br>
@@ -559,12 +558,12 @@ export default {
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 1){
+                if(this.chooseTicket.length > 0){
                     //获取选中第一个的应付企业
                     var payName = this.chooseTicket[0].payName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
-                    for(var i = 1 ;i < this.chooseTicket.length;i++){
+                    for(var i = 0 ;i < this.chooseTicket.length;i++){
                         if(payName != this.chooseTicket[i].payName){
                             flag = false;
                             this.$message({

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

@@ -1,8 +1,8 @@
 <template>
     <div>
-        <el-button type="text" @click="dialogVisible = true">点击打开 Dialog</el-button>
+        <!-- <el-button type="text" @click="dialogVisible = true">点击打开 Dialog</el-button> -->
 
-        <el-dialog title="提示" :visible.sync="dialogVisible" width="80%" height="1080px;" :before-close="handleClose" append-to-body	>
+      <!--   <el-dialog  :visible.sync="dialogVisible" width="80%" height="1080px;" :before-close="handleClose" append-to-body	> -->
             <el-tabs v-model="activeName" type="card">
                 <el-tab-pane v-for="item in pdfFileList" :key="item.value" label="合同信息" name="first"  style="height:780px;">
                     <embed :src="'data:application/pdf;base64,' + item.base64"  type="application/pdf" title="Embedded PDF" style="overflow: auto; width: 100%; height: 100%;"/>
@@ -45,9 +45,9 @@
             </el-tabs>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="selectChildType">确 定</el-button>
+              <!--   <el-button type="primary" @click="selectChildType">确 定</el-button> -->
             </span>
-        </el-dialog>
+        <!-- </el-dialog> -->
     </div>
 </template>
 
@@ -76,6 +76,7 @@ export default {
         };
     },
     created() {
+        this.dialogVisible = true;
         for(var i = 0 ; i < this.pdfFileList.length; i++){
             var base64 = this.pdfFileList[i].base64;
             <embed src="data:application/pdf;base64,"  type="application/pdf" title="Embedded PDF" style="overflow: auto; width: 100%; height: 100%;"/>

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

@@ -475,10 +475,10 @@ export default {
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 1){
+                if(this.chooseTicket.length > 0){
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
-                    for(var i = 1 ;i < this.chooseTicket.length;i++){
+                    for(var i = 0 ;i < this.chooseTicket.length;i++){
                         if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
                             flag = false;
                             this.$message({

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

@@ -90,7 +90,7 @@
               icon="el-icon-delete"
               @click="handleLoan(scope.row)"
               v-hasPermi="['finance:record:edit']"
-              v-if="scope.row.zfrStatus == '00'"
+              v-if="scope.row.zfrStatus == '00' && scope.row.companyType ==('00' || '01')"
               >放款登记</el-button
             >
             <el-button
@@ -215,6 +215,7 @@
               icon="el-icon-delete"
               @click="handleLoan(scope.row)"
               v-hasPermi="['finance:record:edit']"
+              v-if="scope.row.zfrStatus == '00' && scope.row.companyType ==('00' || '01')"
               >放款登记</el-button
             >
             <el-button
@@ -455,7 +456,7 @@
             action=""
             :class="{ showUoload: showBtnImg, uoloadSty: noneBtnImg }"
             :on-change="dealImgChange"
-            accept=".jpg, .jpeg, .png, .JPG, .JPEG, .PNG"
+            accept=".jpg, .jpeg, .png"
             :http-request="httpRequest"
             :on-preview="handlePictureCardPreview"
             :on-remove="handleRemove"
@@ -980,6 +981,8 @@ export default {
             this.msgSuccess("放款登记成功");
             this.open = false;
             this.getList();
+          }).catch((response)=>{
+              loading.close();
           });
         }
       });

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

@@ -239,6 +239,7 @@
             :http-request="httpRequest"
             :on-preview="handlePictureCardPreview"
             :on-remove="handleRemove"
+            :before-upload="beforeAvatarUpload"
             multiple
             :limit="1"
             :on-exceed="handleExceed"
@@ -571,6 +572,19 @@ export default {
             this.open = true;
             this.title = "还款登记";
         },
+        //上传前校验
+        beforeAvatarUpload(file) {
+        const isJPG = file.type === 'image/jpeg' || file.type === 'image/png';
+        const isLt2M = file.size / 1024 / 1024 < 2;
+
+        if (!isJPG) {
+            this.$message.error('上传图片只能是 JPG/PNG 格式');
+        }
+        if (!isLt2M) {
+            this.$message.error('上传图片大小不能超过 2MB');
+        }
+        return isJPG && isLt2M;
+        },
         //还款状态字典反显
         applyStatusFormat(row, column) {
             return this.selectDictLabel(

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

@@ -203,6 +203,14 @@
             label="状态"
             align="center"
             prop="state"
+            :show-overflow-tooltip="true"
+            :formatter="stateFormat"
+            v-if="uncheckList.state"
+          />
+          <!-- <el-table-column
+            label="状态"
+            align="center"
+            prop="state"
             v-if="uncheckList.state"
           >
             <template slot-scope="scope">
@@ -213,7 +221,7 @@
                 @change="handleStatusChange(scope.row)"
               ></el-switch>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             label="创建时间"
             align="center"
@@ -852,6 +860,9 @@ export default {
         this.signCompanyId = response.data.companyId;
       });
     },
+    stateFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
     //根据企业id查询部门和角色信息
     getRodept(item) {
       if (item) {