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

front-vue/src/permission.js

@@ -41,7 +41,16 @@ router.beforeEach((to, from, next) => {
             // 测试 默认静态页面
             // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => {
               // 根据roles权限生成可访问的路由表
-              if (accessRoutes.length == 0) {
+              console.log(accessRoutes);
+              if("000000"== accessRoutes){
+                Message.error("用户角色更变，请重新登录!");
+                setTimeout(() => {
+                  removeToken()
+                  next({ path: '/login' })
+                  NProgress.done()
+                }, 5000);
+                
+              }else if (accessRoutes.length == 0) {
                 Message.error("用户数据异常!")
                 return;
               }

front-vue/src/store/modules/permission.js

@@ -20,13 +20,18 @@ const permission = {
       return new Promise(resolve => {
         // 向后端请求路由数据
         getRouters().then(res => {
-          const accessedRoutes = filterAsyncRouter(res.data)
-          if (accessedRoutes.length == 0) {
-            resolve(accessedRoutes)
-          } else {
-            accessedRoutes.push({ path: '*', redirect: '/404', hidden: true })
-            commit('SET_ROUTES', accessedRoutes)
-            resolve(accessedRoutes)
+          console.log(res);
+          if("000000" == res.msg){
+            resolve(res.msg);
+          }else{
+            const accessedRoutes = filterAsyncRouter(res.data)
+            if (accessedRoutes.length == 0) {
+              resolve(accessedRoutes)
+            } else {
+              accessedRoutes.push({ path: '*', redirect: '/404', hidden: true })
+              commit('SET_ROUTES', accessedRoutes)
+              resolve(accessedRoutes)
+            }
           }
         })
       })

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

@@ -320,9 +320,15 @@
             width="70%"
             height = "60%"
             append-to-body>
-                <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent">
+                <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent" @PDFData="PDFData">
                 </pdf-show>
             </el-dialog>
+            <el-dialog
+            :visible.sync="pdfShowDialogs"
+            width="70%" height = "60%" append-to-body :show-close="false" >
+            <pdf-shows :pdfFileLists="pdfFileLists" :zfiId="this.form.zfiId" :parents="parents">
+            </pdf-shows>
+            </el-dialog>
               <!--去融资-->
             <el-dialog  :visible.sync="goShow" width="300px"  append-to-body :before-close = "cancelGo" center>
                     <!-- <p>恭喜您成功签收一笔融信</p> -->
@@ -390,10 +396,11 @@ import {contractSigning} from "@/api/service/credit/message";
 import { listCompanyHandler } from "@/api/common/companyHandler";
 import { amtformat } from "@/utils/amtCommon";
 import pdfShow from "./pdfShow";
+import pdfShows from "./showStampedPdf";
 import Cookies from 'js-cookie';
 export default {
     name: "addCredit",
-    components: {AddBill,pdfShow,EditBill},
+    components: {AddBill,pdfShow,EditBill,pdfShows},
     data() {
         return {
             //往来账款id
@@ -483,6 +490,9 @@ export default {
           pdfFileList : [],
           pdfShowDialog : false,
           parent : this,
+          pdfShowDialogs : false,
+          pdfFileLists : [],
+          parents : this,
           //平台审批状态
           zfiPlatformStatus:"",
            //显示去融资框
@@ -535,6 +545,12 @@ export default {
         })
     },
     methods: {
+        PDFData(val){
+            console.log(val,"子传父")
+            this.pdfFileLists = val;
+            this.pdfShowDialogs = true;
+            
+        },
         //列表格式化金额
         moneyFormat(row, column, cellValue) {
         if (cellValue == null || cellValue == undefined || cellValue == "") {
@@ -1374,6 +1390,9 @@ export default {
     closePdfShow(){
         this.pdfShowDialog = false;
     },
+    closePdfShows(){
+        this.pdfShowDialogs = false;
+    },
     //盖章
     contractSigning(){
             const loading = this.$loading({

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

@@ -606,6 +606,7 @@ import {
   updateChargeStatus,
   listChargeStatus,
   cancelContract,
+  listStamped
 } from "@/api/service/financeRecord/record";
 import { listFinanceInf } from "@/api/common/financeInf";
 import { getFile } from "@/api/service/credit/credit";
@@ -1617,10 +1618,10 @@ export default {
           });
           listStamped(queryStamped).then((response) =>{
             if(response.data){
-              this.pdfFileList = response.data.list;
+              self.pdfFileList = response.data.list;
             }
-            this.pdfShowDialog = true;
-            this.pdfIsShow = false;
+            self.pdfShowDialog = true;
+            self.pdfIsShow = false;
             load.close()
           }).catch((response) => {
              load.close();

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

@@ -276,6 +276,7 @@ export default {
     goFinance(){
         //关闭弹框
         this.goShow = false;
+        this.closePdfShows();
          this.goParent();
         Cookies.set("/credit/goFinance/"+this.zfiId + "/", this.$route.fullPath)
         this.$router.push({ path: "/credit/goFinance/"+this.zfiId + "/" });

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

@@ -314,9 +314,15 @@
             width="70%"
             height = "60%"
             append-to-body>
-                <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent">
+                <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent" @PDFData="PDFData">
                 </pdf-show>
             </el-dialog>
+            <el-dialog
+            :visible.sync="pdfShowDialogs"
+            width="70%" height = "60%" append-to-body :show-close="false" >
+            <pdf-shows :pdfFileLists="pdfFileLists" :zfiId="this.form.zfiId" :parents="parents">
+            </pdf-shows>
+        </el-dialog>
             <!--去融资-->
             <el-dialog  :visible.sync="goShow" width="300px"  append-to-body :before-close = "cancelGo" center>
                     <!-- <p>恭喜您成功签收一笔融信</p> -->
@@ -381,6 +387,7 @@ import AddBill from "@/views/service/bill/addBill";
 import EditBill from "@/views/service/bill/editBill";
 import {isOpenApproval} from "@/api/service/credit/approvalRelatedCredit";
 import pdfShow from "./pdfShow";
+import pdfShows from "./showStampedPdf";
 import DetailBill from "@/views/service/credit/billDetail";
 import {contractSigning} from "@/api/service/credit/message";
 import { listFinanceInf } from "@/api/common/financeInf";
@@ -389,7 +396,7 @@ import { amtformat } from "@/utils/amtCommon";
 import Cookies from 'js-cookie';
 export default {
     name: "addCredit",
-    components: {AddBill,DetailBill,pdfShow,EditBill},
+    components: {AddBill,DetailBill,pdfShow,EditBill,pdfShows},
     data() {
         return {
             //往来账款id
@@ -501,6 +508,9 @@ export default {
           pdfFileList : [],
           pdfShowDialog : false,
           parent : this,
+          pdfShowDialogs : false,
+            pdfFileLists : [],
+            parents : this,
           //显示去融资框
           goShow:false,
           //状态
@@ -565,6 +575,12 @@ export default {
         this.getFinanceInf(zfiId);
     },
     methods: {
+        PDFData(val){
+            console.log(val,"子传父")
+            this.pdfFileLists = val;
+            this.pdfShowDialogs = true;
+            
+        },
         /** 查询融信编号 */
         getFinanceInf(zfrFinanceId) {
             this.loading = true;
@@ -1271,6 +1287,9 @@ export default {
     closePdfShow(){
         this.pdfShowDialog = false;
     },
+    closePdfShows(){
+        this.pdfShowDialogs = false;
+    },
     //盖章
     contractSigning(){
             const loading = this.$loading({

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

@@ -395,7 +395,7 @@
             </el-table>
         </el-row> -->
       <el-row type="flex" align="middle" justify="center" style="height: 77px">
-        <el-button type="primary" @click="submitForm" v-if="!zfrId"
+        <el-button type="primary" @click="submitForm"
           >确 定</el-button
         >
         <!-- <el-button @click="cancel">取 消</el-button> -->
@@ -842,6 +842,10 @@ export default {
                 this.$set(this.form, "zfrCollectionAccount", response.msg);
                 this.onlyRead = true;
               });
+            }else{
+               //其余类型，清空后可以手动输入
+                this.$set(this.form, "zfrCollectionAccount","");
+                this.onlyRead = false;
             }
           });
         getCreditDetail(item.zfiId).then((response) => {

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

@@ -1588,10 +1588,10 @@ export default {
           });
           listStamped(queryStamped).then((response) =>{
             if(response.data){
-              this.pdfFileList = response.data.list;
+              self.pdfFileList = response.data.list;
             }
-            this.pdfShowDialog = true;
-            this.pdfIsShow = false;
+            self.pdfShowDialog = true;
+            self.pdfIsShow = false;
             load.close()
           }).catch((response) => {
              load.close();

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

@@ -359,6 +359,7 @@
             <el-col :span="12">
               <el-form-item label="用户姓名" prop="nickName">
                 <el-input
+                 clearable
                   v-model="form.nickName"
                   placeholder="请输入用户姓名"
                   maxlength="50"
@@ -383,6 +384,7 @@
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
               <el-input
+              clearable
                 v-model="form.email"
                 placeholder="请输入邮箱"
                 maxlength="50"
@@ -1147,6 +1149,13 @@ export default {
           }
         })
         .catch((response) => {
+          console.log(this.$refs.upload,"删除路径")
+          let uid = fileObj.uid; // 关键作用代码，去除文件列表失败文件
+                    let idx = this.$refs.upload.uploadFiles.findIndex(
+                        (item) => item.uid === uid
+                    ); // 关键作用代码，去除文件列表失败文件（uploadFiles为el-upload中的ref值）
+                    this.$refs.upload.uploadFiles.splice(idx, 1); // 关键作用代码，去除文件列表失败文件
+                     this.showBtnImg = false;
           loading.close();
         });
     },
@@ -1485,7 +1494,7 @@ export default {
     },
     //上传前校验
     beforeAvatarUpload(file) {
-      var testmsg = files.name.substring(files.name.lastIndexOf(".") + 1);
+      var testmsg = file.name.substring(file.name.lastIndexOf(".") + 1);
             const extension = testmsg === "jpg";
             const extension2 = testmsg === "jpeg";
             const extension3 = testmsg === "png";