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

src/components/FinancialModule/FinancialSubmodule/FlowChartModule.vue

@@ -80,7 +80,7 @@ export default {
             deep: true
         }
     },created(){        
-        this.dataList =  this.data
+        this.dataList =  this.data;
     }
 }
 </script>

src/components/SalesVisa/OrderSplitting.vue

@@ -16,7 +16,7 @@
 <template>
   <div class="wrapper">
        <div class="_vad_top clearfix">
-         <el-button @click="OrderSplit" style="float:right;background:#E95252;color:#fff" size="mini">拆分</el-button>
+         <!-- <el-button @click="OrderSplit" style="float:right;background:#E95252;color:#fff" size="mini">拆分</el-button> -->
        <!-- <span class="_num PingFangSC">{{$t('visa.v_tuan')}}：{{num}}</span>
         <div class="fr">
           <el-dropdown split-button type="primary" trigger="click" @command="bindVisa">
@@ -108,7 +108,7 @@ export default {
   methods:{
     // 订单拆分
     OrderSplit(){
-      
+
     },
 
     checkThis(){ // 单选

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -396,8 +396,8 @@
                           ({{subItem.DIATA}}){{subItem.DepartureName}}
                           {{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
                           {{subItem.ArrivalCityName==''?'':'-('+subItem.AIATA+')'+subItem.ArrivalCityName}}
-                          <span v-if="subItem.FlightState==1" class="TCL-greenType">【确定】</span>
-                          <span v-if="subItem.FlightState==2" class="TCL-redType">【暂定】</span>
+                          <span v-if="item.OutNotice==1" class="TCL-greenType">【确定】</span>
+                          <span v-else class="TCL-redType">【暂定】</span>
                         </span>
                       </div>
                     </div>

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -324,8 +324,8 @@
                           {{subItem.DepartureName}}
                           {{subItem.StopoverName==""?"":"-"+subItem.StopoverName}}
                           {{subItem.ArrivalCityName==""?"":"-"+subItem.ArrivalCityName}}
-                          <span v-if="subItem.FlightState==1" class="TCL-greenType">【确定】</span>
-                          <span v-if="subItem.FlightState==2" class="TCL-redType">【暂定】</span>
+                          <span v-if="subItem.OutNotice==1" class="TCL-greenType">【确定】</span>
+                          <span v-else class="TCL-redType">【暂定】</span>
                         </span>
                       </div>
                     </div>

src/components/dmc/manager/teamReimbursement.vue

@@ -384,7 +384,7 @@
                   <el-button-group>
                     <el-button @click.native="goUrl('leaderReimbursement',outItem,'用款计划')" type="primary" style="background:#E95252; border-color:#E95252">领队用款</el-button>
                     <!-- <el-button @click.native="goToExport('leaderPay2',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账 -->
-                    <el-button @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账
+                    <el-button v-show="outItem.TravelPriceList.LeaderApplyStatus==1" @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账
 
                     </el-button>
                   </el-button-group>

src/components/leaderPay2.vue

@@ -223,10 +223,10 @@
                     <td>{{totalHotelPrice}}</td>
                 </tr>
             </table>
-            <el-input type="textarea" v-if="isShowRemark" placeholder="请输入备注信息" v-model="dataList.LeaderApply.AccountForReason" class="wLeader2"/>
-            <div class="btnListDiv">
-                <input type="button" class="leader2Btn" @click="AuditOrder(2)" value="审核通过"/>
-                <input type="button" class="leader2Btn" @click="AuditOrder(1)" value="审核不通过"/>
+            <el-input type="textarea" v-show="dataList.LeaderApply.Status==1" placeholder="请输入备注信息" v-model="dataList.LeaderApply.AccountForReason" class="wLeader2"/>
+            <div class="btnListDiv" >
+                <input type="button" class="leader2Btn" @click="AuditOrder(2)" value="审核通过" v-show="dataList.LeaderApply.Status==1"/>
+                <input type="button" class="leader2Btn" @click="AuditOrder(1)" value="审核不通过" v-show="dataList.LeaderApply.Status==1"/>
                 <input type="button" class="leader2Btn" value="打印" @click="printTable()">
             </div>
         </div>