Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -606,7 +606,9 @@ export default {
       timer:'',
       hideFlashMan:false,
       imgList:[],
-      resultCode:null
+      resultCode:null,
+      templateType: 1,
+      setCode:'',
     }
   },
   methods:{
@@ -785,8 +787,38 @@ export default {
                     Type:fileTypeNumber,
                     Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
                 })
-                this.$message.success(this.$t('tips.scchenggong'))
-            });
+                this.Success(this.$t('tips.scchenggong'))
+                if(this.bankType==13&&x.data.Ocr.length>0){
+                    var OcrStr = '';
+                    x.data.Ocr.forEach(x=>{
+                        OcrStr+=x.words
+                    })
+                    var wechat=[];
+                    var zhifu=[];
+                    wechat = OcrStr.match(/(?<=商户单号)(\d*)/);
+                    zhifu = OcrStr.match(/(?<=商家可扫码退款或查询交易)(\d*)/);
+                    if(wechat==null&&zhifu==null){
+                          return;  
+                    }
+                    if(zhifu==null&&wechat.length>0){
+                        this.setCode = wechat[wechat.length-1]
+                    }else if(wechat==null&&zhifu.length>0){
+                        this.setCode = zhifu[zhifu.length-1]
+                    }
+                    this.$confirm('匹配到交易流水号是否替换?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        this.msg.AccountNumber = this.setCode
+                    }).catch(() => {
+                        this.$message({
+                            type: 'info',
+                            message: '已取消删除'
+                        });
+                    });
+                }
+            },1);
         },
         countFee(){  // 输入原币手续费计算本位币手续费
             if(this.msg.detailList.length>0&&this.msg.detailList[0].Rate&&this.msg.OriginalFee){
@@ -1452,7 +1484,6 @@ export default {
         if(this.$route.query.Conditon){
             this.returnCode = this.$route.query.Conditon;
         }
-
         this.BankAccount_post_GetAccountType();
         // this.admin_get_DepartmentGetList();
         //this.hasnextpoint()