md

src/api/emis/emisSettleBill.js

@@ -25,6 +25,14 @@ export function queryPayBackStatList(query) {
   })
 }
 
+export function checkCanOnlinePay(query) {
+  return request({
+    url: '/emis/emisSettleBill/checkCanOnlinePay',
+    method: 'get',
+    params: query
+  })
+}
+
 export function querySalesPayBackRateList(query) {
   return request({
     url: '/emis/emisSettleBill/querySalesPayBackRateList',

src/api/emis/emisTransPlanRule.js

@@ -9,6 +9,14 @@ export function listEmisTransPlanRule(query) {
   })
 }
 
+export function listTranseRuleSupplier(startSiteCode,nextSiteCode) {
+  return request({
+    url: '/emis/emisTransPlanRule/listSimple',
+    method: 'get',
+    params: {startSiteCode:startSiteCode,nextSiteCode:nextSiteCode}
+  })
+}
+
 // 查询供应商线路规划表详细
 export function getEmisTransPlanRule(id) {
   return request({

src/views/emis/emisSettleBill/CustSettleBillQueryList.vue

@@ -283,7 +283,7 @@
 import JSZip from 'jszip';
 import FileSaver from 'file-saver';
 
-import { listEmisSettleBill,confirmSettleBillBySite, getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill";
+import { listEmisSettleBill,confirmSettleBillBySite, getEmisSettleBill,checkCanOnlinePay, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill";
 
 
 import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
@@ -477,6 +477,24 @@ export default {
     handleGenPayCode(row) {
     // this.$modal.msgSuccess("暂不支持");
     //  const ids = row.id || this.ids;
+
+    let selItem=this.selectList[0];
+     if(selItem.paymentStatus == 1){
+        this.$modal.msgError("已支付，无需再支付");
+        return 
+     }
+
+     try{
+      let res= await checkCanOnlinePay({settleBillNo:selItem.settleBillNo});
+      if(res.data=='0'){
+        this.$modal.msgError("不支持在线支付");
+      }
+     }catch(e){
+      // this.$modal.msgError(e.message);
+      return 
+     }
+
+
      this.resetRefreshId="pay-"+Math.random().toString(36).substring(3,10);
      this.titleForm="微信二维码收款";
      this.openForm=true;

src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue

@@ -282,7 +282,7 @@ import JSZip from 'jszip';
 import FileSaver from 'file-saver';
 
 import { listEmisSettleBill,confirmSettleBillBySite,
-  cancelConfirmBillBySite,
+  cancelConfirmBillBySite,checkCanOnlinePay,
   getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill";
 import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
@@ -493,7 +493,7 @@ export default {
        this.$modal.msgSuccess("操作成功");
      }).catch(() => {});
    },
-   handleGenPayCode(row) {
+   async handleGenPayCode(row) {
     // this.$modal.msgSuccess("暂不支持");
     //  const ids = row.id || this.ids;
      let selItem=this.selectList[0];
@@ -502,6 +502,17 @@ export default {
         return 
      }
 
+     try{
+      let res= await checkCanOnlinePay({settleBillNo:selItem.settleBillNo});
+      if(res.data=='0'){
+        this.$modal.msgError("不支持在线支付");
+      }
+     }catch(e){
+      // this.$modal.msgError(e.message);
+      return 
+     }
+
+
      this.resetRefreshId="pay-"+Math.random().toString(36).substring(3,10);
      this.titleForm="微信二维码收款";
      this.openForm=true;

src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue

@@ -4,20 +4,25 @@
     <el-form id="payPage" ref="form" v-if="settleBillItem!=null" :model="form" size="mini" :rules="rules" label-width="80px">
          <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
           <el-col :span="24">
-            <div style="text-align:center">
+            <div v-if="settleBillItem.blLockOnlinePay!='T'" style="text-align:center">
-              <div style="display: inline-flex;" >
+                <div style="display: inline-flex;" >
-                <span><img :src="shortLogo" style="width: 30px;height: 30px;margin-top: 0px;"  /></span>
+                  <span><img :src="shortLogo" style="width: 30px;height: 30px;margin-top: 0px;"  /></span>
-                <span style="font-size: 20px;font-weight: bold;color: black;">探路供应链（江苏）有限公司</span>
+                  <span style="font-size: 20px;font-weight: bold;color: black;">探路供应链（江苏）有限公司</span>
-              </div>
+                </div>
                 <div style="width:150px;margin: 0 auto;">
                   <img :src="wxPayQrImageUrl" width="100%" draggable="false"/>
                  </div>
                  <!-- -settleBillItem.recedMoney -->
-                <div class="pay-title"><span style="color: red;font-size: 20px;">￥{{ settleBillItem.thisPayMoney }} </span></div>
+                <div class="pay-title">
+                  <span style="color: red;font-size: 20px;">￥{{ settleBillItem.thisPayMoney }} </span>
+                </div>
                 <div style="text-align: center;" >
                   <div>请使用微信[<span style="color:blue;font-weight: bold;">24小时</span>]内完成支付</div>
                 </div>
               </div>
+              <div v-if="settleBillItem.blLockOnlinePay=='T'">
+                <span style="color: red;font-size: 20px;">{{ settleBillItem.lockOnlinePayReason }} </span>
+              </div>
           </el-col>
            <el-col :span="24">
               <el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top:10px">
@@ -67,10 +72,10 @@
                   </el-col>
               </el-row>
            </el-col>
-           <el-col style="border-bottom: 2px solid #f0f0f0 ;padding-top: 10px;color: black;font-weight: bold;" :span="24">
+           <el-col v-if="settleBillItem.blLockOnlinePay!='T'" style="border-bottom: 2px solid #f0f0f0 ;padding-top: 10px;color: black;font-weight: bold;" :span="24">
               运单列表：
            </el-col>
-            <el-col style="border-top: 2px solid #f0f0f0 ;padding-bottom: 10px;" :span="24" v-for="item in emisSettleSubBillList"  :key="item.id">
+            <el-col v-if="settleBillItem.blLockOnlinePay!='T'" style="border-top: 2px solid #f0f0f0 ;padding-bottom: 10px;" :span="24" v-for="item in emisSettleSubBillList"  :key="item.id">
               <el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top:10px">
                 <el-col :span="12">
                     <span class="item-label">运单号:</span><span class="item-value" style="font-size:14px;font-weight: bold;">{{ item.billCode }}</span>
@@ -119,14 +124,14 @@
            </el-col>
         </el-row>
     </el-form>
-    <div v-if="settleBillItem!=null"  style="margin-bottom: 20px;">
+    <div v-if="settleBillItem!=null"  style="margin-bottom: 20px; text-align: center;">
       <el-button type="primary" v-print="'#payPage'" >打印</el-button>
     </div>
   </div>
 </template>
 
 <script>
-import { getInfoBySettleBillNo,getWxPayQrCode} from "@/api/emis/emisSettleBill";
+import { getInfoBySettleBillNo,getWxPayQrCode,checkCanOnlinePay} from "@/api/emis/emisSettleBill";
 import {listEmisSettleSubBill,listHasPayMap} from "@/api/emis/emisSettleSubBill";
 import shortLogoImg from '@/assets/logo/short_logo.png'
 
@@ -152,6 +157,7 @@ export default {
       settleBillItem:this.settleBillObj,
       // 遮罩层
       loading: true,
+      isCanPay:false,
       shortLogo: shortLogoImg,
       // 表单参数
       form: {},