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

src/components/FinancialModule/CashierWork.vue

@@ -95,6 +95,9 @@
                                 <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
                                     <el-button type="primary" class="iconfont icon-bianji-smal" circle @click="editCurency(item.ID),text=$t('pub.updateMsg')"></el-button>
                                 </el-tooltip>
+                                <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')+'(新页面打开)'" placement="top-start">
+                                    <el-button type="primary" class="iconfont icon-bianji-smal" circle @click="goUrlCashierWorkAccount('CashierWorkAccount',item.ID),text=$t('pub.updateMsg')"></el-button>
+                                </el-tooltip>
                                 <el-tooltip class="item" effect="dark" :content="$t('fnc.w_djxinxi')" placement="top-start">
                                     <el-button type="danger" class="iconfont icon-img-rili" circle @click="goUrlDetail('CashierWorkDetail',1,item.Name,item.ID)"></el-button>
                                 </el-tooltip>
@@ -276,8 +279,8 @@
                                 <thead>
                                     <tr>
                                         <th>{{$t('fnc.acc')}}</th>
-                                        <th width="150px">{{$t('fnc.shoukuan')}} <input type="checkbox" v-model="shouChe" @change="isCheckAll(1)"><span class="_check_all">{{$t('table.table_chekAll')}}</span></th>
-                                        <th width="150px">{{$t('fnc.zhikuan')}} <input type="checkbox" v-model="zhiChe" @change="isCheckAll(2)"><span class="_check_all">{{$t('table.table_chekAll')}}</span></th>
+                                        <th width="150px">{{$t('fnc.shoukuan')}} <input type="checkbox" v-model="shouChe" @change="isCheckAll(1)"><span class="_check_all">{{$t('system.table_chekAll')}}</span></th>
+                                        <th width="150px">{{$t('fnc.zhikuan')}} <input type="checkbox" v-model="zhiChe" @change="isCheckAll(2)"><span class="_check_all">{{$t('system.table_chekAll')}}</span></th>
                                         <th width="90px">{{$t('system.table_operation')}}</th>
                                     </tr>
                                 </thead>
@@ -664,6 +667,9 @@ export default {
                     this.loading = false;
             }, err => {this.loading = false;})
         },
+        goUrlCashierWorkAccount(path,id){
+            this.$router.push({name:path,query:{ID:id,blank:'y'}})
+        },
         editCurency(id){  //  修改  根据id 获取信息
             this.apipost('Window_post_Get',{ID:id}, res => {
                 if(res.data.resultCode == 1) {

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1880,7 +1880,7 @@
                   {{ $t("ground.lduikongwei") }}
                 </template>
                 <template v-else>
-                   导游
+                  导游
                 </template>
                 <input type="button" class="normalBtn" @click="UpdateLeaderSeat(item)" style="display: none"
                   :value="ConfigData.Config.IsLeaderUseSeat == 0?'占机位' :'取消机位'" />
@@ -2684,7 +2684,13 @@
                       @click="goToPassenger2(msg.TCID, fourthItem.OrderId, 2)">{{ fourthItem.userName }}
                       <span style="color:#f56c6c">{{fourthItem.VisaType==1?'(个签)':''}}
                       </span>
-                      <span style="color:#f56c6c">{{fourthItem.TicketOutTypeStr}}
+                      <span v-if="fourthItem.TicketOutType==1"
+                        style="color:rgb(26, 168, 107);">{{fourthItem.TicketOutTypeStr}}
+                      </span>
+                      <span v-if="fourthItem.TicketOutType==2"
+                        style="color:blue;">{{fourthItem.TicketOutTypeStr}}
+                      </span>
+                      <span v-else style="color:#f56c6c">{{fourthItem.TicketOutTypeStr}}
                       </span>
                     </span>
                   </template>
@@ -2855,19 +2861,20 @@
                     </el-popover>
                   </div>
                   <div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;">
-                    <span>改价申请: 申请金额【<span style="color:red;">{{childItem.ChangePriceMoney}}</span>元】{{childItem.ChangePriceReason}}</span>
-                          <div style="text-align:right;" v-if="childItem.ChangePriceState==1">
-                            待{{childItem.ChangePriceType=="2"?"OP":"主管"}}{{childItem.ManagerExamineName}}审核
-                        </div>
-                        <div style="text-align:right;" v-if="childItem.ChangePriceState==2">
-                          待{{childItem.ChangePriceType=="2"?"会计":"总经理"}}{{childItem.ExamineByName}}审核
-                        </div>
-                        <div v-if="childItem.ChangePriceState==4" style="text-align:right;">
-                            已驳回
-                          </div>
-                          <div v-if="childItem.ChangePriceState==3" style="text-align:right;">
-                            已通过
-                        </div>
+                    <span>改价申请: 申请金额【<span
+                        style="color:red;">{{childItem.ChangePriceMoney}}</span>元】{{childItem.ChangePriceReason}}</span>
+                    <div style="text-align:right;" v-if="childItem.ChangePriceState==1">
+                      待{{childItem.ChangePriceType=="2"?"OP":"主管"}}{{childItem.ManagerExamineName}}审核
+                    </div>
+                    <div style="text-align:right;" v-if="childItem.ChangePriceState==2">
+                      待{{childItem.ChangePriceType=="2"?"会计":"总经理"}}{{childItem.ExamineByName}}审核
+                    </div>
+                    <div v-if="childItem.ChangePriceState==4" style="text-align:right;">
+                      已驳回
+                    </div>
+                    <div v-if="childItem.ChangePriceState==3" style="text-align:right;">
+                      已通过
+                    </div>
                   </div>
                 </div>
               </td>

src/router/config.js

@@ -4202,6 +4202,14 @@ export default {
               meta: {
                 title: '出纳工作台'
               },
+            },
+            { //财务 财务单据 出纳工作台账户信息
+              path: '/CashierWorkAccount',
+              name: 'CashierWorkAccount',
+              component: resolve => require(['@/components/FinancialModule/CashierWorkAccount'], resolve),
+              meta: {
+                title: '出纳工作台'
+              },
             }, { //财务 财务单据 会计工作台
               path: '/accountingWork',
               name: 'accountingWork',