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

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -795,15 +795,15 @@ export default {
                     })
                     var wechat=[];
                     var zhifu=[];
-                    wechat = OcrStr.match(/(\?<=商户单号)(\d*)/);
-                    zhifu = OcrStr.match(/(\?<=商家可扫码退款或查询交易)(\d*)/);
+                    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]
+                        this.setCode = wechat[wechat.length-1].replace('商户单号','');
                     }else if(wechat==null&&zhifu.length>0){
-                        this.setCode = zhifu[zhifu.length-1]
+                        this.setCode = zhifu[zhifu.length-1].replace('商家可扫码退款或查询交易','');
                     }
                     this.$confirm('匹配到交易流水号是否替换?', '提示', {
                         confirmButtonText: '确定',

src/components/SalesVisa/VisaProduct.vue

@@ -291,8 +291,8 @@
         </li>
         <li>
           <button class="hollowFixedBtn" @click="getList()">查询</button>
-          <button class="normalBtn" @click="cancelEdit(),addShow=true" v-if="msg.isFinacial==1">添加</button>
-          <button class="normalBtn" v-show="buttonshow" @click="AddVisaProduct" v-if="msg.isFinacial==1">添加11</button>
+          <button class="normalBtn" v-show="!buttonshow" @click="cancelEdit(),addShow=true" v-if="msg.isFinacial==1">添加</button>
+          <button class="normalBtn" v-show="buttonshow" @click="AddVisaProduct" v-if="msg.isFinacial==1">添加(新)</button>
         </li>
       </ul>
     </div>
@@ -378,7 +378,7 @@
               placement="top-start"
               v-if="item.SendVisaStatus==1&&msg.isFinacial==1"
             >
-              <el-button
+              <el-button v-show="!buttonshow"
                 type="primary"
                 style="background:#409EFF; border-color:#409EFF"
                 icon="iconfont icon-img_bianji_small"
@@ -388,7 +388,7 @@
             <el-tooltip
               class="item"
               effect="dark"
-              content="修改"
+              content="修改(新)"
               placement="top-start"
               v-if="item.SendVisaStatus==1&&msg.isFinacial==1"
             >
@@ -399,7 +399,7 @@
                 @click="EditVisaProduct(item)"
               ></el-button>
             </el-tooltip>
-            <el-tooltip effect="dark" content="查看11" placement="top-start" v-if="msg.isFinacial==1">
+            <el-tooltip effect="dark" content="查看" placement="top-start" v-if="msg.isFinacial==1">
               <el-button
                 type="primary"
                 style="background:#25C1C3; border-color:#25C1C3"

src/components/SalesVisa/VisaProductCountryManager.vue

@@ -564,7 +564,7 @@ export default {
         this.inputVisible3 = false;
           this.tagloading=true;
           this.productlabel.VisaCountryId=item.Id;
-          this.GetProductLabel(item.CountryId);
+          this.GetProductLabel(item.Id);
           this.CPBQ=true;
       },
     // 新增
@@ -587,6 +587,7 @@ export default {
          "dmc_post_visa_GetVisaProductCountryTagList",
         {VisaCountryId:item},
         res => {
+          console.log(res);
           this.tagloading=false;
           if (res.data.resultCode == 1) {
               this.CountryTagList=res.data.data;