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

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

@@ -25,5 +25,13 @@ export default {
         // this.wordUrl = 'http://localhost:8080/flowablePc/#/openDeal?instId='+ instId + '&processId=' + processId + '&nodeId=' + nodeId + '&taskId=' + taskId + '&token' + getToken();
         this.iframeShow = true
     },
+    mounted(){
+         window.goParent = this.goParent;
+    },
+    methods:{
+        goParent(){
+            this.$store.dispatch("tagsView/delView", this.$route);  
+        }
+    }
 };
 </script>

front-vue/src/views/registerUser.vue

@@ -139,29 +139,34 @@ export default {
                 company: [
                     {
                         required: true,
-                        trigger: "blur",
+                        trigger: ["blur", "change"],
                         message: "企业名称不能为空",
                     },
                 ],
                 username: [
                     {
                         required: true,
-                        trigger: "blur",
+                        trigger:["blur", "change"],
                         message: "联系人不能为空",
                     },
+                    {
+                        pattern:/^[\u4E00-\u9FA5]+$/,
+                        trigger: ["blur", "change"],
+                        message: "联系人只能输入汉字",
+                    }
                 ],
                 phone: [
                     {
                         required: true,
                         pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
-                        trigger: "blur",
+                        trigger: ["blur", "change"],
                         message: "请输入正确的手机号",
                     },
                 ],
                 shortMessageCode: [
                     {
                         required: true,
-                        trigger: "blur",
+                        trigger:["blur", "change"],
                         message: "验证码不能为空",
                     },
                 ],
@@ -169,7 +174,7 @@ export default {
                     {
                         required: true,
                         pattern: /^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9]{6,12}$/,
-                        trigger: "blur",
+                        trigger: ["blur", "change"],
                         message: "密码必须由字母、数字组成，区分大小写",
                     },
                 ],
@@ -212,6 +217,8 @@ export default {
           this.wxSrc = require("../assets/images/wx1.png")
       },
       getCode() {
+          //先清空
+          this.$set(this.loginForm, "code","");
           getCodeImg().then((res) => {
               this.codeUrl = "data:image/gif;base64," + res.img;
               this.loginForm.uuid = res.uuid;
@@ -242,9 +249,11 @@ export default {
                   this.loginForm.type = "2";
                   registerUser(this.loginForm).then((res) => {
                     this.loading = false;
+                    this.msgSuccess("注册成功");
                     if (res.data.code == "0") {
-                        console.log("未认证!")
-                        this.$router.push({ path: "/login" });
+                         setTimeout(() => {
+                              this.$router.push({ path: "/login" });
+                        }, 5000);
                     }
                   }).catch(() => {
                     this.loading = false;
@@ -289,7 +298,8 @@ export default {
                   }
                   // 调用获取短信验证码接口
                   sendShortMessage(this.loginForm.phone, this.loginForm.code, this.loginForm.uuid).then(response => {
-                    this.sendShortMessageBtn = true;
+
+                   /*  this.sendShortMessageBtn = true; 这句话会使倒计时的按钮隐藏*/
                     this.msgSuccess("发送成功!");
 
                     // 因为下面用到了定时器，需要保存this指向

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

@@ -262,6 +262,7 @@ export default {
     //回到父页
     cancelGo(){
         this.goShow = false;
+        this.closePdfShows();
         this.goParent();
     },
     
@@ -284,7 +285,6 @@ export default {
     submit(){
         //状态判断为盖完章之后的
         debugger
-        //确权：状态为待确权
         if(this.zfiStatus == '01' && this.zfiCreateType == '0'){
            //供应商申请
             this.msgSuccess("确权成功，融信已提交,"+this.receiveName+"签收");
@@ -318,6 +318,7 @@ export default {
                 this.financeSignForm.validity = response.data.validity;
                 }
                 this.goShow = true;
+                this.closePdfShows();
             });
         }else if(this.zfiCreateType == '1' && this.zfiCoreStatus == '01' && this.zfiStatus=='01'){//核心开立
             this.msgSuccess("开立成功，融信已提交"+this.receiveName+"签收");
@@ -351,6 +352,7 @@ export default {
                 this.financeSignForm.validity = response.data.validity;
                 }
                 this.goShow = true;
+                this.closePdfShows();
             });
         }
     },

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

@@ -658,6 +658,10 @@ export default {
       // 是否显示弹出层
       open: false,
       openDetailBill: false,
+      //人脸验证结果
+      faceResult:"",
+      //人脸识别结果传参
+      authForm:{},
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -1349,6 +1353,7 @@ export default {
       if (this.zfpAuthType == "01") {
         //调用人脸识别生成二维码
         faceAuth().then((response) => {
+          console.log(response);
           if (response.data) {
             //获取二维码
             this.fileUrl = response.data.fileUrl;
@@ -1365,6 +1370,7 @@ export default {
                   checkFaceAuth(this.authForm).then((res) => {
                     //认证结果
                     this.faceResult = res.data.Verification;
+                    console.log("result:"+res.data.Verification);
                     //成功
                     if (this.faceResult == "20") {
                       this.msgSuccess("验证成功");