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

src/components/SalesModule/groupTourOrder.vue

@@ -734,7 +734,11 @@
     margin: 5px;
     text-align: center;
   }
-
+ .GO_Contract{
+    color:blue;
+    display: block;
+    cursor: pointer;
+  }
 </style>
 
 <template>
@@ -1815,6 +1819,7 @@
                     </span>
 
               </div>
+              <span class="GO_Contract" @click="goContract(item)" style="display:none;">领取合同</span>
             </td>
           </tr>
           <tr>
@@ -2275,6 +2280,18 @@
           }
         });
       },
+      //跳转至领取合同
+      goContract(item){
+        let routeData = this.$router.resolve({
+          name: 'TravelContract',
+          query: {
+            TCID: item.tcid,
+            orderID:item.orderId,
+            blank: 'y'
+          }
+        })
+        window.open(routeData.href, '_blank')
+      },
       goUrlHappy(item){
         this.happy=false;
         this.$router.push({

src/components/administrative/ElectronicAudit.vue

+<style>
+</style>
+
+<template>
+  <div class="flexOne ElectronicAudit">
+    <div class="query-box">
+      <ul>
+        <li>
+          <label class="">合同编号</label>
+          <el-input :placeholder="$t('system.ph_in')" v-model="msg.contractNum" @keyup.native.enter="getList" class="w210"></el-input>
+        </li>
+        <li>
+          <label class="">产品名称</label>
+          <el-input :placeholder="$t('system.ph_in')" v-model="msg.productName" @keyup.native.enter="getList" class="w210"></el-input>
+        </li>
+        <li>
+          <label class="">订单号</label>
+          <el-input :placeholder="$t('system.ph_in')" v-model="msg.orderID" @keyup.native.enter="getList" class="w210"></el-input>
+        </li>
+        <li>
+            <label class="">团号</label>
+            <el-input :placeholder="$t('system.ph_in')" v-model="msg.tcid" @keyup.native.enter="getList" class="w210"></el-input>
+        </li>
+        <li>
+            <el-date-picker
+                @change="dateChange"
+                size="small"
+                value-format="yyyy-MM-dd"
+                v-model="DateList"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="返回日期">
+            </el-date-picker>
+        </li>
+        <li>
+          <input type="button" class="hollowFixedBtn" value="查询" @click="getList()" />
+        </li>
+      </ul>
+    </div>
+    <div class="commonContent" v-loading="loading">
+      <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
+        <tr>
+          <th>合同编号</th>
+          <th>订单号</th>
+          <th>团号</th>
+          <th>产品名称</th>
+          <th>出发日期</th>
+          <th>返回日期</th>
+          <th width="200">操作</th>
+        </tr>
+        <tr>
+          <td>123</td>
+          <td>456</td>
+          <td>123123213</td>
+          <td>123</td>
+          <td>2019-08-06</td>
+          <td>2019-08-13</td>
+          <td>
+            <el-row>
+              <el-tooltip class="item" effect="dark" content="审核通过" placement="top-start">
+                <el-button type="primary" icon="iconfont icon-shenpi" circle></el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
+                <el-button type="danger" icon="iconfont icon-chakan" @click="goToDetail()" circle></el-button>
+              </el-tooltip>
+            </el-row>
+          </td>
+        </tr>
+      </table>
+      <!-- <div class="noData" v-show="noData">
+        {{$t('system.content_noData')}}
+      </div> -->
+    </div>
+     </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      msg: {
+        contractNum:'',
+        productName:'',
+        orderID:'',
+        tcid:'',
+        startDate:'',
+        returnDate:''
+      },
+      DateList:[],
+    //   pickerOptions0: {
+    //     disabledDate(time) {
+    //         return time.getTime() < Date.now() - 8.64e7;
+    //     }
+    //   },
+    };
+  },
+  methods: {
+    dateChange(val){
+      if(val){
+        this.msg.startDate=val[0];
+        this.msg.returnDate=val[1];
+      }
+    },
+    //跳转至详情
+    goToDetail(){
+        this.$router.push({
+            name: 'ElectronicContract',
+            query: {
+                // TCID: this.$route.query.TCID,
+                // orderID: this.$route.query.orderID,
+                TCID:5560,
+                orderID:28807,
+                blank: "y",
+            }
+        });
+    },
+    getList() {
+
+    },
+  },
+  
+  mounted() {
+    this.getList();
+  }
+};
+</script>

src/router/config.js

 import login from '../components/Login'
 import index from '../components/index'
+import clientConfirm from '../components/clientConfirm'
 import supplierLogin from '../components/SupplierLogin'
 import supplierIndex from '../components/SupplierIndex'
 export default {
@@ -358,6 +359,14 @@ export default {
                                 title: '考核管理'
                             },
                         },
+                        {
+                            path: '/ElectronicAudit', //行政-电子合同审核
+                            name: 'ElectronicAudit',
+                            component: resolve => require(['@/components/administrative/ElectronicAudit'], resolve),
+                            meta: {
+                                title: '电子合同审核'
+                            },
+                        },
                         {
                             path: '/leaderManagement', //领队导游管理
                             name: 'leaderManagement',
@@ -2455,6 +2464,22 @@ export default {
                                 title: '跟团游订单分团查询'
                             },
                         },
+                        {
+                            path: '/TravelContract', //出境合同
+                            name: 'TravelContract',
+                            component: resolve => require(['@/components/Contract/TravelContract'], resolve),
+                            meta: {
+                                title: '出境合同'
+                            }
+                        },
+                        {
+                            path: '/ElectronicContract',  //合同预览
+                            name: 'ElectronicContract',
+                            component: resolve => require(['@/components/Contract/ElectronicContract'], resolve),
+                            meta: {
+                                title: '合同预览'
+                            }
+                        },
                         { // 销售 一日游订单分团查询
                             path: '/groupTourOrderByTuanOne',
                             name: 'groupTourOrderByTuanOne',
@@ -3768,6 +3793,11 @@ export default {
             name: 'BusExport',
             component: resolve => require(['@/components/BusExport'], resolve),
         },
+        {
+            path: '/clientConfirm',
+            name: 'clientConfirm',
+            component: clientConfirm
+        },
         {
             path: '/leaderPay2', //领队报账
             name: 'leaderPay2',