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

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

@@ -42,7 +42,7 @@
         <!-- <el-table-column label="签署方" align="center" prop="zfcSubject" :formatter="subjectFormat" :show-overflow-tooltip="true" v-if="uncheckList.zfcSubject"/> -->
         <el-table-column label="创建人" align="center" prop="nickName" :show-overflow-tooltip="true" v-if="uncheckList.nickName" />
         <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" v-if="uncheckList.createTime" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='200px'>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='250px'>
             <template slot-scope="scope">
                 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-if="scope.row.zfcStatus == '01'" v-hasPermi="['service:contract:edit']">修改</el-button>
                 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleChange(scope.row)" v-if="scope.row.zfcStatus == '00'" v-hasPermi="['service:contract:change']">停用</el-button>

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

@@ -294,7 +294,7 @@
             </el-dialog>
         <!--预览-->
         <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
-            <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
+            <img :src="wordUrl" v-if="show" width='950px' height='500px'/>
             <iframe :src="wordUrl" width='800px' height='600px' frameborder='1' v-if="heid"/>
         </el-dialog>
   </div>

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

@@ -180,7 +180,7 @@
             </el-table>
             <!--预览-->
             <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
-                <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
+                <img :src="wordUrl" v-if="show" width='950px' height='500px'/>
                 <iframe :src="wordUrl" width='800px' height='600px' frameborder='1' v-if="heid"/>
             </el-dialog>
         </el-tab-pane>

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

@@ -816,7 +816,10 @@
                                 <el-step :title="item.name" v-for="(item,index) in histaskList" :key="index">
                                     <template slot="description">
                                         <span v-if="item.activityType == 'userTask'">办理人: {{item.displayName}}</span> 节点名称: {{item.activityName}} 任务接收时间 {{parseTime(new Date(item.startTime), '{y}-{m}-{d} {h}:{i}:{s}')}} 任务办结时间 {{item.endTime?parseTime(new Date(item.endTime), '{y}-{m}-{d} {h}:{i}:{s}'):''}}
-                                        <div v-for="(comment,index) in item.commentList" class="text item" :key="index">
+                                        <div v-if="item.deleteReason != null" class="text item">
+                                            {{'拒绝原因: ' + item.deleteReason }}
+                                        </div>
+                                        <div v-else v-for="(comment,index) in item.commentList" class="text item" :key="index">
                                             {{'审批意见: ' + comment.message }}
                                         </div>
                                     </template>

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

@@ -259,7 +259,7 @@
         </el-dialog>
           <!--预览-->
         <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
-            <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
+            <img :src="wordUrl" v-if="show" width='950px' height='500px'/>
             <iframe :src="wordUrl" width='800px' height='600px' frameborder='1' v-if="heid"/>
         </el-dialog>
   </div>

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

@@ -301,7 +301,7 @@
         </el-dialog>
         <!--预览-->
         <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
-            <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
+            <img :src="wordUrl" v-if="show" width='950px' height='500px'/>
             <iframe :src="wordUrl" width='800px' height='600px' frameborder='1' v-if="heid"/>
         </el-dialog>
   </div>

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

@@ -435,7 +435,7 @@
     </el-row> -->
     <el-row style="height: 109px" type="flex" align="middle" justify="center">
       <el-button type="primary" plain @click="cancel">取 消</el-button>
-      <el-button type="primary" @click="submitForm" v-if="!zfrId"
+      <el-button type="primary" @click="submitForm" 
         >确 定</el-button
       >
     </el-row>
@@ -692,6 +692,10 @@ export default {
       // 是否显示弹出层
       open: false,
       openDetailBill: false,
+      //人脸验证结果
+      faceResult:"",
+      //人脸识别结果传参
+      authForm:{},
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -959,7 +963,10 @@ export default {
             spinner: "el-icon-loading",
             background: "rgba(0, 0, 0, 0.7)",
           });
-          console.log(this.form, "AAHAHAHAH");
+       listCompanyHandler().then((response) => {
+         var self = this;
+        if (response.data == true) {
+          this.form.zfrId = this.zfrId;
           addRecord(this.form)
             .then((response) => {
               console.log(response);
@@ -973,8 +980,17 @@ export default {
             .catch((response) => {
               loading.close();
             });
+               } else {
+                  self.$message({
+                    message: "此操作需经办人权限,请确认您是否是经办人",
+                    type: "warning",
+                  });
+                  loading.close();
+                }
+                  });
         }
       });
+    
     },
     /* 清空 */
     clearBoth() {
@@ -1244,6 +1260,7 @@ export default {
       listCompanyHandler().then((response) => {
         var self = this;
         // self.paiAccno = '3115730025233104147';
+        console.log(response)
         if (response.data == true) {
           cfcaProjectNo().then((response) => {
             if (response.data.scyCfcaAuthNumber == null) {
@@ -1328,7 +1345,7 @@ export default {
                               loading.close();
                             });
                         } else {
-                          self.$message({
+                         self.$message({
                             message: "您还没有电子账户,请联系平台开通电子账户",
                             type: "warning",
                           });
@@ -1345,7 +1362,10 @@ export default {
             }
           });
         } else {
-          this.$message.error("此操作需经办人权限,请确认您是否是经办人");
+             this.$message({
+                  message: "此操作需经办人权限,请确认您是否是经办人",
+                  type: 'warning'
+              });
         }
       });
     },

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

@@ -306,7 +306,7 @@
             </el-dialog>
             <!--预览-->
             <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
-                <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
+                <img :src="wordUrl" v-if="show" width='950px' height='500px'/>
                 <iframe :src="wordUrl" width='800px' height='600px' frameborder='1' v-if="heid"/>
             </el-dialog>
             <el-dialog

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

@@ -652,6 +652,10 @@ export default {
       // 是否显示弹出层
       open: false,
       openDetailBill: false,
+      //人脸验证结果
+      faceResult:"",
+      //人脸识别结果传参
+      authForm:{},
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -887,7 +891,7 @@ export default {
           });
             listCompanyHandler().then((response) => {
         if (response.data == true) {
-
+          this.form.zfrId = this.zfrId;
           addRecord(this.form)
             .then((response) => {
               loading.close();

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

@@ -1123,6 +1123,7 @@ export default {
       this.noneBtnImg = this.fileList.length >= this.limitCountImg;
       this.open = true;
       this.title = "还款登记";
+      this.handleQuery();
     },
     //上传前校验
     beforeAvatarUpload(file) {

front-vue/src/views/system/fundSide/fundSide.vue

@@ -66,7 +66,7 @@
 
     <!-- 添加或修改资金方对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px" :inline="true" :disabled="disableds">
+        <el-form ref="form" :model="form" :rules="rules" label-width="140px" :inline="true" :disabled="disableds">
             <el-row type="flex" align="middle" class="zap-title"><span class="zap-title__prefix"></span>渠道信息</el-row>
             <el-form-item label="资金方名称" prop="scyName" size="large">
                 <el-input v-model="form.scyName" clearable style="width: 215px" placeholder="请输入资金方名称" maxlength="15" />
@@ -85,7 +85,7 @@
             <el-form-item label="资金方网点" prop="smiAddress" size="large">
                 <el-input v-model="form.smiAddress" clearable style="width: 215px" placeholder="请输入资金方网点" maxlength="15" />
             </el-form-item>
-            <el-form-item label="社会统一信用代码" prop="scySocialCode" size="large">
+            <el-form-item label="社会统一信用代码" prop="scySocialCode" size="large" >
                 <el-input v-model="form.scySocialCode" clearable style="width: 215px" placeholder="请输入社会统一信用代码" maxlength="18" />
             </el-form-item>
             <el-form-item label="客户经理" prop="smiManager" size="large">
@@ -112,7 +112,7 @@
         </el-form>
         <el-row style="height: 109px;" type="flex" align="middle" justify="center">
             <el-button type="primary" plain @click="cancel">取 消</el-button>
-            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button type="primary" v-if="disabled==disableds" @click="submitForm">确 定</el-button>
         </el-row>
     </el-dialog>
     <el-dialog :visible.sync="sfzVisible">