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

src/components/SalesModule/addPassenger.vue

@@ -1522,7 +1522,7 @@
         }
       },
       savePassenger(type) {
-        if ((this.LineId === 14 || this.LineId === 2) && (this.addMsg.IdCard === '' || this.addMsg.IdCard.length < 18)) {
+        if ((this.LineId === 14 || this.LineId === 2) && this.addMsg.IdCard === '') {
           return this.$message.error('请填写身份证号码！'); 
         }
         this.addMsg.EconomicCapabilityList = [];

src/components/SalesModule/groupTourOrder.vue

@@ -1703,7 +1703,7 @@
                 <el-tooltip effect="dark" content="更多" placement="top-start" style="float:left">
                   <el-popover width='100' trigger="hover">
                     <div class="groupTourOrder_more">
-                      <div @click="goUrlT('confirmationOrder',item.orderId)">确认函</div>
+                      <div @click="goUrlT('confirmationOrder',item.orderId)">确认函{{item.operationState === 2 ? '（拒绝）' : item.operationState === 1 ? '（通过）' : item.operationState === 0 ? '(待审核)' : ''}}</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span
                           v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1717,7 +1717,7 @@
                 <el-tooltip  effect="dark" content="更多"  placement="top-start" style="float:left">
                   <el-popover width='100' trigger="hover">
                     <div class="groupTourOrder_more">
-                      <div @click="goUrlT('confirmationOrder',item.orderId)">确认函</div>
+                      <div @click="goUrlT('confirmationOrder',item.orderId)">确认函 {{item.operationState === 2 ? '（拒绝）' : item.operationState === 1 ? '（通过）' : item.operationState === 0 ? '(待审核)' : ''}}</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
                       <div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
@@ -2013,7 +2013,7 @@
               <el-tooltip  effect="dark" content="更多"  placement="top-start" style="float:left">
                 <el-popover width='100' trigger="hover">
                   <div class="groupTourOrder_more">
-                    <div @click="goUrlT('confirmationOrder',item.orderId)">确认函</div>
+                    <div @click="goUrlT('confirmationOrder',item.orderId)">确{{item.operationState}}认函{{item.operationState === 2 ? '（拒绝）' : item.operationState === 1 ? '（通过）' : '（待审核）'}}</div>
                     <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                     <div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
                     <div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>

src/components/SalesModule/groupTourOrderByTuanOne.vue

@@ -1731,7 +1731,7 @@
                 <el-tooltip  effect="dark" content="更多"  placement="top-start" style="float:left">
                   <el-popover width='100' trigger="hover">
                     <div class="groupTourOrder_more">
-                      <div @click="goUrlT('confirmationOrder',item.orderId)">确认函</div>
+                      <div @click="goUrlT('confirmationOrder',item.orderId)">确认函{{item.operationState === 2 ? '（拒绝）' : item.operationState === 1 ? '（通过）' : item.operationState === 0 ? '(待审核)' : ''}}</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
                       <div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
@@ -2024,7 +2024,7 @@
               <el-tooltip  effect="dark" content="更多"  placement="top-start" style="float:left">
                 <el-popover width='100' trigger="hover">
                   <div class="groupTourOrder_more">
-                    <div @click="goUrlT('confirmationOrder',item.orderId)">确认函</div>
+                    <div @click="goUrlT('confirmationOrder',item.orderId)">确认函{{item.operationState === 2 ? '（拒绝）' : item.operationState === 1 ? '（通过）' : item.operationState === 0 ? '(待审核)' : ''}}</div>
                     <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                     <div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
                     <div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>

src/components/SalesModule/groupTourOrderOne.vue

@@ -1696,7 +1696,7 @@
                 <el-tooltip effect="dark" content="更多" placement="top-start" style="float:left">
                   <el-popover width='100' trigger="hover">
                     <div class="groupTourOrder_more">
-                      <div @click="goUrlT('confirmationOrder',item.orderId)">确认函</div>
+                      <div @click="goUrlT('confirmationOrder',item.orderId)">确认函{{item.operationState === 2 ? '（拒绝）' : item.operationState === 1 ? '（通过）' : item.operationState === 0 ? '(待审核)' : ''}}</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span
                           v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>

src/router/config.js

@@ -3019,6 +3019,14 @@ export default {
                                 title: '工作委托'
                             },
                         },
+                        {
+                            path: '/ConfirmationAdui',
+                            name: 'ConfirmationAdui',
+                            component: resolve => require(['@/components/administrative/ConfirmationAdui'], resolve),
+                            meta: {
+                                title: '确认函审核'
+                            },
+                        },
                         {
                             path: '/WorkEntrustment',
                             name: 'WorkEntrustment',
@@ -3511,7 +3519,7 @@ export default {
                 meta: {
                     title: '供应商投诉'
                 },
-            }
+            },
         ]
         },
     ]