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

front-vue/src/views/approval/approval/myCompanyTask.vue

@@ -0,0 +1,19 @@
+<template>
+  <div class="app-container">
+   <iframe :src="wordUrl" width='100%' height='1000'  frameborder='0'/>
+  </div>
+</template>
+
+<script>
+import { getToken } from "@/utils/auth";
+export default {
+  name: "myCompanyTask",
+ components: {},
+  data() {
+    return {
+    //  wordUrl:'http://192.168.0.127/flowablePc/#/myStartFlow?token='+getToken(),
+        wordUrl:window.location.protocol+'//'+window.location.host+'/flowablePc/#/myCompanyTask?token='+getToken(),
+    };
+  },
+};
+</script>

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

@@ -1085,11 +1085,11 @@ export default {
     //确权
     confirmApproval(){
         //核心确权通过,直接盖章
-        if(this.form.zfiCoreStatus == '01'){
+        /* if(this.form.zfiCoreStatus == '01'){
             //预览文件
             this.getContractFile(false);
-        }else{
-                this.$refs["form"].validate(valid => {
+        }else{ */
+            this.$refs["form"].validate(valid => {
                 
                 if(!this.form.zfiCoreQuotaId){
                         this.$message({
@@ -1157,7 +1157,7 @@ export default {
                         });
                 }
             });
-        }
+        //}
 
          
     },

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

@@ -851,10 +851,13 @@ export default {
                                                 //查询有无平台审批
                                                 var platParam = {};
                                                 platParam.menuId = "1000000004";
+                                             var zfpPlatform =   this.creditLineList.zfpPlatform;
+                                             console.log(zfpPlatform,"zfpPlatform")
                                                 isOpenApproval(platParam).then((response) => {
                                                     var platResult = response.data.isOpen;
                                                     //开启平台审批
-                                                    if (platResult) {
+                                                      //是否需平台审批(0:不需要,1:需要)
+                                                    if (platResult&&zfpPlatform=='1') {
                                                         _this.msgSuccess("融信资料已提交平台审核，平台审核时间为工作日：9：00—18：00；当日16：00之前提交资料，预计2小时内完成，请留意站内信息");
                                                         _this.$store.dispatch("tagsView/delView", _this.$route);
                                                         _this.$router.go(-1);
@@ -936,10 +939,13 @@ export default {
                                             //查询有无平台审批
                                             var platParam = {};
                                             platParam.menuId = "1000000004";
+                                               var zfpPlatform =   this.creditLineList.zfpPlatform;
+                                             console.log(zfpPlatform,"zfpPlatform") 
                                             isOpenApproval(platParam).then((response) => {
                                                 var platResult = response.data.isOpen;
                                                 //开启平台审批
-                                                if (platResult) {
+                                                //是否需平台审批(0:不需要,1:需要)
+                                                if (platResult&&zfpPlatform=='1') {
                                                     this.msgSuccess("融信资料已提交平台审核，平台审核时间为工作日：9：00—18：00；当日16：00之前提交资料，预计2小时内完成，请留意站内信息");
                                                     this.$store.dispatch("tagsView/delView", this.$route);
                                                     this.$router.go(-1);

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

@@ -2,7 +2,7 @@
 <div class="app-container zap-main">
     <!-- 添加或修改融资记录对话框 -->
     <header-bar :list="headerList"></header-bar>
-    <div class="zap-reason mt20">
+    <div class="zap-reason mt20" v-if="reason">
         <div class="zap-reason__title">资方拒绝放款:</div>
         <div class="zap-reasaon__item">原因:{{reason ? reason : "暂无"}}；</div>
         <div class="zap-reason__item">
@@ -19,7 +19,7 @@
             <text-item label="融资收款账户" :value="form.zfrCollectionAccount"></text-item>
         </el-col>
         <el-col :span="12">
-            <text-item label="融信金额" :value="form.zfrCollectionAccount" suffix="元"></text-item>
+            <text-item label="融信金额" :value="form.zfiAmount" suffix="元"></text-item>
         </el-col>
         <el-col :span="12">
             <text-item label="申请融资方" :value="form.companyName"></text-item>
@@ -74,10 +74,10 @@
         :recipientNum="receiverCode"
         :amountWord="issuedAmount"
         :amount="form.zfiAmount"
-        letter="暂无数据"
-        date="暂无数据"
-        approver="暂无数据"
-        handler="暂无数据"
+        :letter="zfiPaymentNumber"
+        :date="openDate"
+        :approver="coreHandleName"
+        :handler="coreFirstUser"
         ></zap-bill>
     </el-row>
     <div class="zap-title zap-margin-top">资产信息</div>
@@ -230,6 +230,16 @@ export default {
             receiverAccount: "",
             //起止日期
             stopDate: "",
+            //承诺函编号
+            zfiPaymentNumber:"",
+            //电子签章日期
+            openDate:"",
+            //开立方审批人
+            coreHandleName:"",
+            //开立方经办人
+            coreFirstUser:"",
+            //税率
+            zfiRate:"",
             //签发金额大写
             issuedAmount: "零元整",
             //拒绝放款原因
@@ -509,6 +519,14 @@ export default {
                         this.receiverAccount = response.data.receiverAccount;
                         this.stopDate = response.data.stopDate;
                         this.zfiRate = response.data.financeInf.zfiRate;
+                        //付款承诺函编号
+                        this.zfiPaymentNumber = response.data.financeInf.zfiPaymentNumber;
+                        //电子签章日期
+                        this.openDate = response.data.openDate;
+                        //开立方审批人
+                        this.coreHandleName = response.data.coreHandleName;
+                        //开立方经办人
+                        this.coreFirstUser = response.data.coreFirstUser;
 
                     }
                 })

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

@@ -83,7 +83,7 @@
                   scope.row.handleChange == '00' &&
                   company.scyId == '000000'
                 ">确认变更经办人</el-button>
-                            <el-button v-if="scope.row.userId !== 1" class="zap-button-confirmation" size="mini" type="text" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
+                            <el-button v-if="scope.row.userId !== 1 && scope.row.sucrHandler == '0'" class="zap-button-confirmation" size="mini" type="text" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
                             <el-button v-if="scope.row.status == '0'" class="zap-button-plain" size="mini" type="text" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']">重置</el-button>
                             <el-button v-if="scope.row.status != '0'" class="zap-button-primary" size="mini" type="text" @click="handleStatusChange(scope.row)" v-hasPermi="['system:user:statusChange']">解冻</el-button>
                         </template>
@@ -292,6 +292,19 @@
             <el-button @click="upload.open = false">取 消</el-button>
         </div>
     </el-dialog>
+        <!-- 查看图片 -->
+    <el-dialog :visible.sync="sfzVisible">
+      <img width="100%" :src="sfzImageUrl" alt="" />
+    </el-dialog>
+    <el-dialog :visible.sync="sqsVisible">
+      <img width="100%" :src="sqsImageUrl" alt="" />
+    </el-dialog>
+    <el-dialog :visible.sync="jsfzzVisible">
+      <img width="100%" :src="jsfzzImageUrl" alt="" />
+    </el-dialog>
+    <el-dialog :visible.sync="jsfzfVisible">
+      <img width="100%" :src="jsfzfImageUrl" alt="" />
+    </el-dialog>
 </div>
 </template>
 
@@ -352,6 +365,10 @@ export default {
             sfzVisible: false,
             sqsImageUrl: "",
             sqsVisible: false,
+             jsfzzImageUrl: "",
+            jsfzzVisible: false,
+            jsfzfImageUrl: "",
+            jsfzfVisible: false,
             showBtnImg: false,
             noneBtnImg: false,
             showsBtnImg: false,
@@ -638,7 +655,7 @@ export default {
         },
         jsfzfPictureCardPreview(file) {
             this.jsfzfImageUrl = file.url;
-            this.jsffzVisible = true;
+            this.jsfzfVisible = true;
         },
         jsfzfImgChange(file, jsfzfList) {
             this.jsfzfBtnImg = jsfzfList.length >= this.limitCountImg;