页面修改

src/components/SignName.vue

@@ -119,6 +119,7 @@
           orderID: 0,
           guestId: 0,
         },
+        isRB: 0, //1-出境日本合同，0-其它合同
       }
     },
     created() {
@@ -127,6 +128,7 @@
     mounted() {
       this.msg.TCID = this.$route.query.TCID;
       this.msg.orderID = this.$route.query.orderID;
+      this.isRB = this.$route.query.isRB;
       this.getCanvas();
       document.getElementsByTagName('body')[0].style = "overscroll-behavior-y: contain;"
     },
@@ -216,8 +218,12 @@
         this.apipost("travelcontract_post_UpdateCompanySignatureService", this.SignInfo, res => {
           if (res.data.resultCode === 1) {
             this.Success(res.data.message);
+            var path = "clientConfirm";
+            if (this.isRB == 1) {
+              path = "clientConfirmRB"
+            }
             this.$router.push({
-              name: "clientConfirm",
+              name: path,
               query: {
                 TCID: this.msg.TCID,
                 orderID: this.msg.orderID,

src/components/TravelContractDetailRB.vue

@@ -665,7 +665,7 @@
               <template v-else-if="dataList.serviceNum=='5'">
                 <span style="font-weight:bold:color:red;">伍</span>
               </template>（大写）项服务。 </p>
-            <p>费用总额（小写）人民币 {{dataList.orderPrice}} 元, （大写）人民币 </p>
+            <p>费用总额（小写）人民币 {{dataList.orderPrice}} 元, （大写）人民币 {{dataList.bigOrderPrice}} </p>
             <p>
               {{dataList.clientNumber?dataList.clientNumber:''}}人合计 {{dataList.totalMoneyInfo}}
             </p>
@@ -745,92 +745,6 @@
               </tbody>
             </table>
           </div>
-          <!-- 游客名单 -->
-          <div class="guests" :class="{'checkedNav':cked==4}">
-
-          </div>
-          <!-- 团队行程 -->
-          <div class="routes" :class="{'checkedNav':cked==5}">
-            <table class="ZTable">
-              <tbody>
-                <tr>
-                  <td width="10%">团号</td>
-                  <td width="36%">
-                    <span>{{dataList.tCNum}}</span>
-                  </td>
-                  <td width="12%">出团日期</td>
-                  <td width="15%">
-                    <span>{{getDate(dataList.startDate)}}</span>
-                  </td>
-                  <td width="12%">返回日期</td>
-                  <td width="15%">
-                    <span>{{getDate(dataList.returnDate)}}</span>
-                  </td>
-                </tr>
-                <tr>
-                  <td>线路名称</td>
-                  <td colspan="5">
-                    <span>{{dataList.productName}}</span>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-            <br>
-            <div v-html="dataList.travelContent">
-
-            </div>
-            <!-- <table class="TDteam_Table">
-                            <tbody>
-                                <tr>
-                                    <td colspan="5">
-                                        组团社：印象之旅
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="5">
-                                        旅游线路名称：{{LineName}}&nbsp;&nbsp;&nbsp;&nbsp;行程共计：{{dataList.dayNum}}天 {{dataList.nightNum}}晚（含在途时间）
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="5">
-                                        出发时间：{{getDate(dataList.startDate)}}&nbsp;&nbsp;
-                                        出发地点：{{startCityName}}
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="5">
-                                        结束时间：{{getDate(dataList.returnDate)}}&nbsp;&nbsp;
-                                        返回地点：{{returnArriveCityName}}
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>行程时间</td>
-                                    <td>主要景点名称（游览时间）</td>
-                                    <td>交通工具（标准）</td>
-                                    <td>酒店标准</td>
-                                    <td>房间标准</td>
-                                </tr>
-                                <tr v-for="(item,index) in tripList">
-                                    <td>{{getDayAddOne(dataList.startDate,index)}}</td>
-                                    <td>
-                                        <div v-for="subItem in item.details">
-                                            <span v-if="subItem.title">{{subItem.title}}</span>
-                                            <span v-else>温暖的家</span>
-                                        </div>
-                                    </td>
-                                    <td>
-                                        <span>{{item.TrifficType}}</span>
-                                    </td>
-                                    <td>
-                                        <span v-if="index!=tripList.length-1">旅游酒店</span>
-                                    </td>
-                                    <td>
-                                        <span v-if="index!=tripList.length-1">双人间</span>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table> -->
-          </div>
         </div>
       </div>
     </div>
@@ -863,15 +777,6 @@
         isShowFade: false,
         QRCodeStr: "",
         pdfLoading: false,
-        //线路名称
-        LineName: '',
-        //出发地点
-        startCityName: '',
-        //返回地点
-        returnArriveCityName: '',
-        tripList: [],
-        //交通
-        trifficList: [],
         isShowZhang: 0,
       };
     },
@@ -888,7 +793,7 @@
           orderID: this.$route.query.orderID,
           guestId: guestId,
           Id: this.$route.query.ID,
-          pUrl: "clientConfirm",
+          pUrl: "clientConfirmRB",
         };
         this.$http({
           headers: {
@@ -902,12 +807,9 @@
         }).then(res => {
           if (res.data.resultCode === 1) {
             this.QRCodeStr = res.data.data;
-          } else {
-
-          }
+          } else {}
         }).catch(err => {})
       },
-
       // 生成pdf
       toContractPDF: function (title) {
         let urlObj = this.domainManager();
@@ -944,7 +846,6 @@
       },
       //获取数据
       getList() {
-        //this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
         this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
           if (res.data.resultCode === 1) {
             this.dataList = res.data.data;
@@ -956,10 +857,6 @@
       getDate(date) {
         return moment(date).format("YYYY-MM-DD");
       },
-      //加一天返回
-      getDayAddOne(day, num) {
-        return moment(day).add(num, 'days').format('YYYY-MM-DD')
-      },
       //获取是否显示公司章
       getShow(ID) {
         if (ID != null && ID != undefined) {
@@ -975,41 +872,6 @@
           });
         }
       },
-      //获取大写
-      getTotalNum(num) {
-        switch (num) {
-          case 1:
-            return '壹';
-            break;
-          case 2:
-            return '贰';
-            break;
-          case 3:
-            return '叁';
-            break;
-          case 4:
-            return '肆';
-            break;
-          case 5:
-            return '伍';
-            break;
-          case 6:
-            return '陆';
-            break;
-          case 7:
-            return '柒';
-            break;
-          case 8:
-            return '捌';
-            break;
-          case 9:
-            return '玖';
-            break;
-          case 10:
-            return '玖';
-            break;
-        }
-      },
       //作废
       getinvalid() {
         this.$confirm('是否作废?', '提示', {
@@ -1018,7 +880,6 @@
           type: 'warning'
         }).then(() => {
           this.dataList.status = 0;
-          //  this.apiJavaPost("/api/contract/dosaveOrUpdate", this.dataList, res => {
           this.apipost("travelcontract_post_UpdateStatusContractService", this.dataList, res => {
             if (res.data.resultCode === 1) {
               this.Success(res.data.message);

src/components/TravelContractNewRB.vue

@@ -930,8 +930,8 @@
           serviceNum: 1,
           contactsName: "", //紧急联系人
           contactsMobile: "", //紧急联系电话
-          templateType:1,
-          serviceNum:0,
+          templateType: 1,
+          serviceNum: 0,
         },
         //旅客名单
         guestList: [],
@@ -1129,7 +1129,7 @@
           orderID: this.$route.query.orderID,
           guestId: this.$route.query.guestId,
           Id: this.$route.query.ID,
-          pUrl: "clientConfirm",
+          pUrl: "clientConfirmRB",
         };
         this.$http({
           headers: {

src/router/config.js

@@ -2,6 +2,7 @@
 import login from '../components/Login2019'
 import index from '../components/index'
 import clientConfirm from '../components/clientConfirm'
+import clientConfirmRB from '../components/clientConfirmRB'
 import SignName from '../components/SignName'
 import supplierLogin from '../components/SupplierLogin'
 import supplierIndex from '../components/SupplierIndex'
@@ -5842,6 +5843,11 @@ export default {
       name: 'clientConfirm',
       component: clientConfirm
     },
+    {
+      path: '/clientConfirmRB',
+      name: 'clientConfirmRB',
+      component: clientConfirmRB
+    },    
     {
       path: '/SignName',
       name: 'SignName',