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

src/components/FinancialModule/RecPayQuery.vue

@@ -315,18 +315,10 @@
             </v-table>
         </div>
 
-        <el-dialog custom-class='w400' title="转交" :visible.sync="zhuanjiaoBox" center>
+        <el-dialog custom-class='w400' title="制单人转交" :visible.sync="zhuanjiaoBox" center>
             <template>
-                <el-form label-width="80px">
-                    <el-form-item label="转交人：">
-                        <!-- <el-select  filterable  v-model='zhuanjiaoMsg.CreateBy'  class="">
-                            <el-option :value="0" label="不限"></el-option>
-                            <el-option v-for='item in EmployeeList'
-                                :label='item.EmName'
-                                :value='item.EmployeeId'
-                                :key='item.EmployeeId'>
-                            </el-option>
-                        </el-select> -->
+                <el-form label-width="100px">
+                    <el-form-item label="制单人转交：">
                         <el-select
                             v-model="zhuanjiaoMsg.CreateBy"
                             filterable
@@ -1041,7 +1033,7 @@ export default {
                     let data = res.data.data.pageData.list;
                     let userInfo=this.getLocalStorage();
                     data.forEach(x=>{
-                        if((","+userInfo.ActionMenuCode+",").indexOf(',Finance_CreateByCareOf,')>0){
+                        if((","+userInfo.ActionMenuCode+",").indexOf(',Finance_CreateByCareOf,')!=-1){
                             x.isExchange = true
                         } else{
                             x.isExchange = false

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -515,14 +515,14 @@ tr._item_list td:last-child {
           <el-col :span="4">
             <el-form-item label="数据类别：">
               <el-select v-model="msg.DataType" :disabled="shujuType" filterable class="w150">
-                <el-option value="-1" label="不限"></el-option>
-                <el-option value="1" label="团队营收"></el-option>
-                <el-option value="3" label="单办签证"></el-option>
+                <el-option value="-1" v-if="isShowType" label="不限"></el-option>
+                <el-option value="1" v-if="isShowType" label="团队营收"></el-option>
+                <el-option value="3" v-if="isShowType" label="单办签证"></el-option>
                 <el-option value="2" label="国际机票"></el-option>
-                <el-option value="4" label="国内票务"></el-option>
-                <el-option value="5" label="散卖机票"></el-option>
-                <el-option value="6" label="日本地接部专户"></el-option>
-                <el-option value="7" label="老挝地接部专户"></el-option>
+                <el-option value="4" v-if="isShowType" label="国内票务"></el-option>
+                <el-option value="5" v-if="isShowType" label="散卖机票"></el-option>
+                <el-option value="6" v-if="isShowType" label="日本地接部专户"></el-option>
+                <el-option value="7" v-if="isShowType" label="老挝地接部专户"></el-option>
                 <el-option value="8" label="票务部专户"></el-option>
               </el-select>
             </el-form-item>
@@ -820,6 +820,8 @@ export default {
       showID: false,
       active: 1,
       userId: 0,
+      //是否显示
+      isShowType:true,
       msg: {
         Is_Open:-1,
         pageIndex: 1,
@@ -1585,6 +1587,11 @@ export default {
     if(this.msg.LineId==-4){
       this.msg.DataType="3";
     }
+    let userInfo = this.getLocalStorage();
+    if((","+userInfo.ActionMenuCode+",").indexOf(',F_Query_TicketTeamRevenueReport,')!=-1){
+        this.isShowType = false;
+        this.msg.DataType='2';
+    }
   },
   components: {},
   mounted() {