页面修改

src/components/SignName.vue

@@ -284,8 +284,9 @@
                 name: 'clientProtocol',
                 query: {
                   TCID: this.msg.TCID,
-                  orderID: this.msg.orderID,
-                  guestId: this.msg.guestId,
+                  OrderId: this.msg.orderID,
+                  GuestId: this.msg.guestId,
+                  ProtocolId:this.msg.ProtocolId,
                 }
               })
             } else {

src/components/clientProtocol.vue

@@ -520,7 +520,6 @@
         <div class="wrap">
           <ul class="Navul">
             <li :class="ActiveTab==1?'ActiveLi':''" @click="ChangeTab(1)">保密协议</li>
-            <li :class="ActiveTab==2?'ActiveLi':''" @click="ChangeTab(2)">签字</li>
           </ul>
         </div>
       </div>
@@ -564,7 +563,7 @@
             </p>
           </div>
           <!-- 盖章签字 -->
-          <div v-show="ActiveTab==2" class="item_content">
+          <div class="item_content">
             <ul class="gzqzUl">
               <li>
                 <el-row>

src/components/discountProtocol.vue

@@ -225,9 +225,9 @@
             </p>
             <p style="text-indent:2em;">甲乙双方在遵循平等、自愿、协商一致、诚实信用的原则下，就双方旅游产品价格保密成如下协议：</p>
             <p>1、价格保密</p>
-            <p style="text-indent:2em;">经甲乙双方商定，在双方建立合同关系基础之上，乙方给予甲方优惠价<el-input v-model="addMsg.DiscountMoney"
-                style="width:110px;" @keyup.native="checkPrice(addMsg,'DiscountMoney')"></el-input>
-              &nbsp;&nbsp;&nbsp;&nbsp;元/人，但双方必须保证，不向外透露具体价格。</p>
+            <p style="text-indent:2em;">经甲乙双方商定，在双方建立合同关系基础之上，乙方给予甲方优惠价&nbsp;<el-input v-model="addMsg.DiscountMoney"
+                style="width:110px;display:inline-flex;" @keyup.native="checkPrice(addMsg,'DiscountMoney')"></el-input>
+              &nbsp;元/人，但双方必须保证，不向外透露具体价格。</p>
             <p>2、双方的权利和义务
             </p>
             <p style="text-indent:2em;">

src/plug/index.js

@@ -261,7 +261,7 @@ export default {
         if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 &&
           this.$route.name.indexOf('confirmationOrderDownLoadNew') === -1 && this.$route.name.indexOf('PrintPage') === -1 &&
           this.$route.name.indexOf('TravelContractConfirm') === -1 && this.$route.name.indexOf('ViittoContractConfirm') === -1 &&
-          this.$route.name.indexOf('OrderProfitLossList') === -1
+          this.$route.name.indexOf('OrderProfitLossList') === -1&&this.$route.name.indexOf('clientProtocol') === -1
         ) {
 
           let previousPathInfo = {
@@ -329,7 +329,21 @@ export default {
               Id: Id
             }
           })
-        } else {
+        }
+        else if (this.$route.path == "/clientProtocol") {
+          let TCID = this.$route.query.TCID;
+          let OrderId = this.$route.query.OrderId;
+          let GuestId = this.$route.query.GuestId;
+          this.$router.push({
+            name: "clientProtocol",
+            query: {
+              TCID: TCID,
+              OrderId: OrderId,
+              GuestId: GuestId,
+            }
+          })
+        }  
+        else {
           if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
             this.goToLogin(1);
           }