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

src/components/activity/pushManagement.vue

@@ -194,11 +194,11 @@ export default {
     return {
       modeList: [
         {
-          name: "小程序",
+          name: "APP",
           id: 1
         },
         {
-          name: "APP",
+          name: "小程序",
           id: 2
         }
       ],

src/components/administrative/ContractManage.vue

@@ -87,10 +87,10 @@
             <el-select v-model="msg.Status" :placeholder="$t('pub.pleaseSel')">
               <el-option label="请选择" :value="-1" :key="-1"> </el-option>
               <el-option label="草稿" :value="0" :key="0"> </el-option>
-              <el-option label="已取消" :value="1" :key="1"> </el-option>
-              <el-option label="已提交" :value="2" :key="2"> </el-option>
-              <el-option label="已盖章" :value="3" :key="3"> </el-option>
-              <el-option label="已签字" :value="4" :key="4"> </el-option>
+              <el-option label="提交审核" :value="1" :key="1"> </el-option>
+              <el-option label="审核通过" :value="2" :key="2"> </el-option>
+              <el-option label="驳回" :value="3" :key="3"> </el-option>
+              <el-option label="取消" :value="4" :key="4"> </el-option>
             </el-select>
           </span>
         </li>
@@ -118,12 +118,6 @@
               </el-dropdown-menu>
             </el-dropdown>
         </li>
-        <!-- <li>
-          <input type="button" @click="goContract('onedayTripContract', 0, '一日游合同')" class="normalBtn" value="一日游合同" />
-          <input type="button" @click="goContract('DomesticTravelcontract', 0, '境内旅游合同')" class="normalBtn"
-            value="境内旅游合同" />
-          <input type="button" @click="goContract('SingleContract', 0, '单项委托合同')" class="normalBtn" value="单项委托合同" />
-        </li> -->
       </ul>
     </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
@@ -165,7 +159,7 @@
         <td>{{ item.CreateByName }}</td>
         <td>{{ item.CreateTimeStr }}</td>
         <td>
-          <el-tooltip class="item" effect="dark" content="修改" placement="top-start">
+          <el-tooltip class="item" effect="dark" content="修改" placement="top-start" v-if="item.Status==0||item.Status==3">
             <template v-if="item.CType == 3">
               <el-button type="primary" icon="el-icon-edit" circle
                 @click="goContract('onedayTripContract', item.ID, '一日游合同')"></el-button>
@@ -184,19 +178,23 @@
             <el-button type="warning" icon="iconfont icon-copy" circle @click="CopyContract(item)" style="padding:4px;">
             </el-button>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" content="下载" placement="top-start">
+          <el-tooltip class="item" effect="dark" content="下载" placement="top-start" v-if="item.Status==2">
             <el-button type="success" icon="el-icon-download" circle @click="DownLoadContract(item)"></el-button>
           </el-tooltip>
 
-          <el-tooltip class="item" effect="dark" content="提交并盖章" placement="top-start">
+          <el-tooltip class="item" effect="dark" content="提交审核" placement="top-start" v-if="item.Status==0">
             <el-button type="info" icon="el-icon-upload2" circle @click="SubmitContract(item)"></el-button>
           </el-tooltip>
-          <el-tooltip class="item" v-if="item.Status==2" effect="dark" content="复制链接发送给客户" placement="top-start">
+          <el-tooltip class="item" v-if="item.Status==2" effect="dark" content="复制链接发送给客户">
             <el-button type="info" icon="iconfont icon-copy-l" circle @click="CopyUrl(item)" style="padding:4px;background-color:#9266f9;border-color:#9266f9;"></el-button>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" content="取消" placement="top-start">
+          <el-tooltip class="item" effect="dark" content="取消" placement="top-start" v-if="item.Status==0">
             <el-button type="danger" icon="el-icon-close" circle @click="DeleteContract(item)"></el-button>
           </el-tooltip>
+
+          <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
+            <el-button type="danger" icon="iconfont icon-chakan" circle @click="ViewContract(item)" style="padding:4px;"></el-button>
+          </el-tooltip>
         </td>
       </tr>
     </table>
@@ -257,7 +255,7 @@
           that.apipost(
             "travelcontract_post_UpdateTravelContractStatusService", {
               ID: item.ID,
-              Status: 2
+              Status: 1
             },
             res => {
               if (res.data.resultCode == 1) {
@@ -351,7 +349,7 @@
         this.Confirm("是否取消此合同?", function () {
           var msg = {
             ID: item.ID,
-            Status: 1
+            Status: 4
           };
           that.apipost(
             "travelcontract_post_UpdateTravelContractStatusService",
@@ -404,6 +402,17 @@
         this.msg.pageIndex = val;
         this.getList();
       },
+      ViewContract(item)
+      {
+        this.$router.push({
+          name: "TravelContractView",
+          query: {
+            id: item.ID,
+            blank: "y",
+            tab: '预览合同'
+          }
+        });
+      },
       goContract(path, Id, title) {
         var nId = 0;
         if (Id && Id > 0) {

src/router/config.js

@@ -4267,13 +4267,21 @@ export default {
             },
         },
         {
-            path: '/TravelContractConfirm',  //电子合同签名
+            path: '/TravelContractConfirm',  //其他电子合同签名
             name: 'TravelContractConfirm',
             component: resolve => require(['@/components/TravelContractConfirm'], resolve),
             meta: {
                 title: '电子合同签名'
             },
         },
+        {
+            path: '/TravelContractView',  //其他电子合同签名
+            name: 'TravelContractView',
+            component: resolve => require(['@/components/TravelContractView'], resolve),
+            meta: {
+                title: '电子合同签名'
+            },
+        },
         {
             path: '/TravelContractDetail', //新电子合同详情
             name: 'TravelContractDetail',