样式修改

front-vue/src/components/ZapTip/index.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="zap-tip mb20">
     <img src="../../assets/images/icon_grey_tip.png" alt="">
-    请知悉，资产信息仅能接受指定的销售方与购买方的往来账款(含账款基本信息、贸易合同与贸易发票等)；如须使用系统尚未维护的往来账款，请点击新增应付账款。
+    请知悉，资产信息仅能接受指定的销售方与购买方的往来账款(含账款基本信息、贸易合同与贸易发票等)；如须使用系统尚未维护的往来账款，请点击新增应收账款。
 </div>
 </template>
 

front-vue/src/components/ZapTips/index.vue

@@ -0,0 +1,28 @@
+<template>
+<div class="zap-tip mb20">
+    <img src="../../assets/images/icon_grey_tip.png" alt="">
+    请知悉，资产信息仅能接受指定的销售方与购买方的往来账款(含账款基本信息、贸易合同与贸易发票等)；如须使用系统尚未维护的往来账款，请点击新增应付账款。
+</div>
+</template>
+
+<script>
+export default {
+  name: "ZapTip"
+}
+</script>
+
+<style lang="scss">
+.zap-tip{
+    display: flex;
+    align-items: flex-start;
+    line-height: 20px;
+    font-size: 14px;
+    color: #999999;
+    img{
+        width:16px;
+        height: 16px;
+        margin-top: 2px;
+        margin-right: 8px;
+    }
+}
+</style>

front-vue/src/main.js

@@ -24,6 +24,7 @@ import Pagination from "@/components/Pagination";
 import RightToolbar from "@/components/RightToolbar"
 // 提示信息
 import ZapTip from "@/components/ZapTip"
+import ZapTips from "@/components/ZapTips"
 // 表格标题
 import ContentTitle from "@/components/ContentTitle"
 // 表格合计额
@@ -73,6 +74,7 @@ Vue.prototype.msgInfo = function (msg) {
 Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)
 Vue.component('ZapTip', ZapTip)
+Vue.component('ZapTips', ZapTips)
 Vue.component('ContentTitle', ContentTitle)
 Vue.component('ContentTotal', ContentTotal)
 Vue.component('SearchBar', SearchBar)

front-vue/src/permission.js

@@ -7,7 +7,7 @@ import { getToken, removeToken } from '@/utils/auth'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/registerUser', '/forgetUser', '/register', '/wxLogin', '/userLogin', '/authorizeLogin', '/auth-redirect', '/bind', '/auth']
+const whiteList = ['/login', '/registerUser', '/forgetUser', '/register', '/wxLogin', '/userLogin', '/authorizeLogin', '/auth-redirect', '/bind', '/auth','/serviceAgreement','/privacyPolicy']
 
 
 router.beforeEach((to, from, next) => {

front-vue/src/router/index.js

@@ -49,6 +49,16 @@ export const constantRoutes = [
     hidden: true
   },
   {
+    path: '/serviceAgreement',
+    component: (resolve) => require(['@/views/serviceAgreement'], resolve),
+    hidden: true
+  },
+  {
+    path: '/privacyPolicy',
+    component: (resolve) => require(['@/views/privacyPolicy'], resolve),
+    hidden: true
+  },
+  {
     path: '/forgetUser',
     component: (resolve) => require(['@/views/forgetUser'], resolve),
     hidden: true

front-vue/src/views/login.vue

@@ -33,9 +33,13 @@
                         <el-form-item>
                             <div class="zap-agreement">
                                 <span class="zap-agreement__text">登录视为同意并遵守</span>
-                                <div class="zap-agreement__link">
+                                <div class="zap-agreement__link" >
+                                <el-link href="/serviceAgreement" >
                                     <span>《招采云链服务平台会员注册协议》</span>
-                                    <span>《招采云链服务平台隐私政策》</span>
+                                    </el-link>
+                                <el-link   href="/privacyPolicy">
+                                       《招采云链服务平台隐私政策》
+                                    </el-link>
                                 </div>
                             </div>
                         </el-form-item>
@@ -72,12 +76,18 @@
                             </el-button>
                         </el-form-item>
                         <el-link style="margin-right:50px; font-size: 16px;margin-bottom: 30px;color: #4280F2;" href="/registerUser">还没账号？立即注册！</el-link>
+                     
                         <el-form-item>
-                            <div class="zap-agreement">
+                             <div class="zap-agreement">
                                 <span class="zap-agreement__text">登录视为同意并遵守</span>
                                 <div class="zap-agreement__link">
-                                    <span>《招采云链服务平台会员注册协议》</span>
-                                    <span>《招采云链服务平台隐私政策》</span>
+                                    <el-link href="/serviceAgreement">
+                                    《招采云链服务平台会员注册协议》
+                                    </el-link>
+                                         <el-link   href="/privacyPolicy">
+                                       《招采云链服务平台隐私政策》
+                                    </el-link>
+                                   
                                 </div>
                             </div>
                         </el-form-item>
@@ -105,8 +115,12 @@
                         <div class="zap-agreement" style="padding-top: 32px;">
                             <span class="zap-agreement__text">登录视为同意并遵守</span>
                             <div class="zap-agreement__link">
-                                <span>《招采云链服务平台会员注册协议》</span>
-                                <span>《招采云链服务平台隐私政策》</span>
+                            <el-link href="/serviceAgreement">
+                                    《招采云链服务平台会员注册协议》
+                                    </el-link>
+                                         <el-link   href="/privacyPolicy">
+                                       《招采云链服务平台隐私政策》
+                                    </el-link>
                             </div>
                         </div>
                     </el-form-item>

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

@@ -66,7 +66,7 @@
     </el-row>
     <div class="zap-title zap-margin-top">资产信息</div>
     <el-row class="zap-form">
-        <zap-tip />
+        <zap-tips />
         <el-row type="flex" align="middle" justify="space-between" style="padding-top: 8px;padding-bottom:20px;">
             <el-col>
                 <el-button type="success" @click="openTicket">选择</el-button>
@@ -364,7 +364,6 @@ export default {
             }),
             //获取授信额度
             listCreditLine(this.creditParams).then((response) => {
-                debugger
                 this.creditLineList = response.data.map((item) => {
                     return {
                         value: item.zfpcrId,
@@ -394,6 +393,21 @@ export default {
         this.$set(this.form, "zfiAmount", "0.00");
     },
     methods: {
+        // 表单重置
+        reset() {
+            this.form = {
+                zfiCoreQuotaId: null,
+                zfiSupplierId: null,
+                zfiAmount: null,
+                zfiExpireDate: null,
+                zfiEffectiveDate: null,
+                openName: null,
+            };
+              this.zfpMinimumAmount= [];
+              this.checkTotalAmt =[];
+              this.checkTotalBigAmt =[];
+              this.ticketList =[];
+        },
         //合并单元格
         arraySpanMethod({
             row,
@@ -432,6 +446,7 @@ export default {
         },
         // 取消按钮
         cancel() {
+            this.reset();
             this.$store.dispatch("tagsView/delView", this.$route);
             this.$router.go(-1);
         },
@@ -878,6 +893,7 @@ export default {
                                         if (false == response.data) {
                                             //当前用户不是经办人，返回到列表页
                                             _this.msgSuccess("融信资料已提交企业内部审批");
+                                             this.reset();
                                             _this.$store.dispatch(
                                                 "tagsView/delView",
                                                 _this.$route
@@ -893,6 +909,7 @@ export default {
                                                 //有核心开立内部审批
                                                 if (true == result) {
                                                     _this.msgSuccess("融信资料已提交企业内部审批");
+                                                     this.reset();
                                                     _this.$store.dispatch(
                                                         "tagsView/delView",
                                                         _this.$route
@@ -900,6 +917,7 @@ export default {
                                                     _this.$router.go(-1);
                                                 } else { //无核心开立内部审批
                                                     //关闭当前页面
+                                                     this.reset();
                                                     _this.$store.dispatch(
                                                         "tagsView/delView",
                                                         _this.$route
@@ -947,6 +965,7 @@ export default {
                                     if (false == response.data) {
                                         //当前用户不是经办人，返回到列表页
                                         this.msgSuccess("融信资料已提交企业内部审批");
+                                         this.reset();
                                         this.$store.dispatch(
                                             "tagsView/delView",
                                             this.$route
@@ -962,6 +981,7 @@ export default {
                                             //有核心开立内部审批
                                             if (true == result) {
                                                 this.msgSuccess("融信资料已提交企业内部审批");
+                                                 this.reset();
                                                 this.$store.dispatch(
                                                     "tagsView/delView",
                                                     this.$route
@@ -969,6 +989,7 @@ export default {
                                                 this.$router.go(-1);
                                             } else { //无核心开立内部审批
                                                 //关闭当前页面
+                                                 this.reset();
                                                 this.$store.dispatch(
                                                     "tagsView/delView",
                                                     this.$route
@@ -1013,6 +1034,7 @@ export default {
                                 if (false == response.data) {
                                     //当前用户不是经办人，返回到列表页
                                     this.msgSuccess("融信资料已提交企业内部审批");
+                                     this.reset();
                                     this.$store.dispatch(
                                         "tagsView/delView",
                                         this.$route
@@ -1028,6 +1050,7 @@ export default {
                                         //有核心开立内部审批
                                         if (true == result) {
                                             this.msgSuccess("融信资料已提交企业内部审批");
+                                             this.reset();
                                             this.$store.dispatch(
                                                 "tagsView/delView",
                                                 this.$route
@@ -1035,6 +1058,7 @@ export default {
                                             this.$router.go(-1);
                                         } else { //无核心开立内部审批
                                             //关闭当前页面
+                                             this.reset();
                                             this.$store.dispatch(
                                                 "tagsView/delView",
                                                 this.$route

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

@@ -237,7 +237,7 @@
           <el-button @click="cancel">取 消</el-button>
         </el-row>
         <!-- 应付账款信息 -->
-        <el-dialog :title="payTitle" :visible.sync="open" width="1120px" append-to-body>
+        <el-dialog :title="payTitle" :visible.sync="open" width="1120px" :append-to-body="true">
           <el-form
             :model="queryParamsPay"
             ref="formQuery"
@@ -309,11 +309,11 @@
           </span>
         </el-dialog>
         <!--预览-->
-        <el-dialog :visible.sync="openFile" width="1000px" append-to-body>
+        <el-dialog :visible.sync="openFile" width="1000px" :append-to-body ="true">
           <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 :visible.sync="pdfShowDialog" width="70%" height="60%" append-to-body>
+        <el-dialog :visible.sync="pdfShowDialog" width="70%" height="60%" :append-to-body="fasle">
           <pdf-show
             :pdfFileList="pdfFileList"
             :zfiId="this.form.zfiId"
@@ -325,7 +325,7 @@
           :visible.sync="pdfShowDialogs"
           width="70%"
           height="60%"
-          append-to-body
+          :append-to-body="true"
           :show-close="false"
         >
           <pdf-shows :pdfFileLists="pdfFileLists" :zfiId="this.form.zfiId" :parents="parents"></pdf-shows>

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

@@ -7,7 +7,7 @@
         <el-row type="flex" justify="end" align="middle">
           <el-col :span="12" style="margin-bottom: 22px;">
             <el-button type="success" @click="openTicket">选择</el-button>
-            <el-button type="primary" @click="addPay">新增应付账款</el-button>
+            <el-button type="primary" @click="addPay">新增应收账款</el-button>
             <el-button @click="deleteTicekt">清空全部</el-button>
           </el-col>
           <el-col :span="12">

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

@@ -194,7 +194,7 @@
         <!-- pdf -->
         <el-dialog
             :visible.sync="pdfShowDialog"
-            width="70%" height = "60%" append-to-body  >
+            width="70%" height = "60%" :append-to-body ="true"  >
             <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent" @PDFData="PDFData">
             </pdf-show>
         </el-dialog>
@@ -875,9 +875,9 @@ export default {
                         background: 'rgba(0, 0, 0,0)'
                     });
             contractSigning(this.form).then((response) => {
-                loading.close();
                 //关闭弹窗，回到父页
                 this.goParent();
+                loading.close();
                 //核心开立盖章
                 if(this.form.zfiCreateType == '1' && this.form.zfiCoreStatus == '01' && !this.form.zfiStatus){
                     this.msgSuccess("开立成功，融信已提交"+this.form.receiveName+"签收");

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

@@ -97,7 +97,7 @@
         <el-row>
           <el-col :span="12">
             <el-button type="success" @click="openTicket">选择</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="addPay">新增应付账款</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="addPay">新增应收账款</el-button>
             <el-button @click="deleteTicekt">清空全部</el-button>
           </el-col>
           <el-col :span="12">
@@ -476,6 +476,21 @@ export default {
     this.$set(this.form, "zfiAmount", "0.00");
   },
   methods: {
+            // 表单重置
+        reset() {
+            this.form = {
+                openName: null,
+                zfiSupplierQuotaId: null,
+                receiveName: null,
+                zfiExpireDate: null,
+                zfiEffectiveDate: null,
+                zfiAmount: null,
+            };
+              this.zfpMinimumAmount= [];
+              this.checkTotalAmt =[];
+              this.checkTotalBigAmt =[];
+              this.ticketList =[];
+        },
     //列表格式化金额
     moneyFormat(row, column, cellValue) {
       if (cellValue == null || cellValue == undefined || cellValue == "") {
@@ -976,6 +991,7 @@ export default {
                         console.log(_this,"this====>");
                         console.log(_this.$store,"this====>")
                         _this.msgSuccess("融信资料已提交企业内部审批");
+                        _this.reset();
                           _this.$store.dispatch(
                               "tagsView/delView",
                               _this.$route
@@ -996,6 +1012,7 @@ export default {
                               console.log(_this,"this====>");
                               console.log(_this.$store,"this====>")
                             _this.msgSuccess("融信资料已提交企业内部审批");
+                            _this.reset();
                              _this.$store.dispatch(
                               "tagsView/delView",
                               _this.$route
@@ -1018,6 +1035,7 @@ export default {
                                 );
                                  console.log(_this,"this====>");
                                 console.log(_this.$store,"this====>")
+                                _this.reset();
                                 _this.$store.dispatch(
                                   "tagsView/delView",
                                   _this.$route
@@ -1026,6 +1044,7 @@ export default {
                               } else {
                                 //未开启平台审批
                                 //关闭当前页面
+                                _this.reset();
                                 _this.$store.dispatch(
                                   "tagsView/delView",
                                   _this.$route
@@ -1086,6 +1105,7 @@ export default {
                     debugger;
                     //当前用户不是经办人，返回到列表页
                     this.msgSuccess("融信资料已提交企业内部审批");
+                    this.reset();
                     this.$store.dispatch("tagsView/delView", this.$route);
                     this.$router.go(-1);
                   } else {
@@ -1098,6 +1118,7 @@ export default {
                       //有融信开立内部审批
                       if (true == result) {
                          debugger;
+                        this.reset();
                         this.msgSuccess("融信资料已提交企业内部审批");
                         this.$store.dispatch("tagsView/delView", this.$route);
                         this.$router.go(-1);
@@ -1116,18 +1137,22 @@ export default {
                             this.msgSuccess(
                               "融信资料已提交平台审核，平台审核时间为工作日：9：00—18：00；当日16：00之前提交资料，预计2小时内完成，请留意站内信息"
                             );
+                              this.reset();
                             this.$store.dispatch(
                               "tagsView/delView",
                               this.$route
                             );
                             this.$router.go(-1);
+                          
                           } else {
                             //未开启平台审批
                             //关闭当前页面
+                             this.reset();
                             this.$store.dispatch(
                               "tagsView/delView",
                               this.$route
                             );
+                           
                             //跳转盖章页面
                             Cookies.set(
                               "/credit/creditSeal/" + zfiId + "/",

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

@@ -146,12 +146,14 @@
 
     <!-- 合同预览 -->
     <el-dialog title="预览" :visible.sync="pdfShowDialog" width="60%" append-to-body :show-close="pdfIsShow">
-        <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent"></pdf-show>
-        <span slot="footer" class="dialog-footer" style="float: right">
-            <el-button type="primary" @click="selectType" v-if="pdfIsShow">签署</el-button>
-            <el-button type="primary" plain="" @click="pdfShowDialog = false" v-if="pdfIsShow">取消</el-button>
-            <el-button type="primary" @click="closePDF" v-if="!pdfIsShow">确定</el-button>
-        </span>
+        <div style="margin-bottom:50px">
+            <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent"></pdf-show>
+            <span slot="footer" class="dialog-footer" style="float: right; margin-top: 2%">
+                <el-button type="primary" @click="selectType" v-if="pdfIsShow">签署</el-button>
+                <el-button type="primary" plain="" @click="pdfShowDialog = false" v-if="pdfIsShow">取消</el-button>
+                <el-button type="primary" @click="closePDF" v-if="!pdfIsShow">确定</el-button>
+            </span>
+        </div>
     </el-dialog>
 
     <!--选择签署意愿类型-->

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

@@ -514,7 +514,7 @@ export default {
                 background: 'rgba(0, 0, 0,0)'
              });
             contractSigning(this.financeData).then((response) => {
-                loading.close();
+      
                 if(this.zfpAuthType == '02'){
                     //关闭短信验证
                     this.messageIsShow = false;
@@ -540,6 +540,7 @@ export default {
                         message: "盖章成功",
                         type: 'success'
                     });
+                    loading.close();
                     // if(this.pdfFileLists.length > 0){
                         //this.pdfShowDialogs = true;
                     // }else{

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

@@ -144,7 +144,7 @@
     </el-dialog>
 
     <!-- 合同预览 -->
-    <el-dialog title="预览" :visible.sync="pdfShowDialog" width="60%" append-to-body>
+    <el-dialog title="预览" :visible.sync="pdfShowDialog" width="60%" append-to-body :show-close="!pdfIsShow">
         <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent"></pdf-show>
         <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="selectType" v-if="pdfIsShow">签署</el-button>