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

src/components/FinancialModule/RecPayQuery.vue

@@ -929,6 +929,7 @@ export default {
             if(!this.msg.TradeWay)this.msg.TradeWay=0;
             if(!this.msg.AccountType)this.msg.AccountType=0;
             this.loading= true;
+            console.log(this.msg)
             this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
                 if(res.data.resultCode == 1) {
                     let data = res.data.data.pageData.list;
@@ -1239,7 +1240,7 @@ export default {
                 pageSize:6,
                 FrID:this.msg.FrID==0?'':this.msg.FrID,
                 sDate:this.msg.sDate,
-                eDate:this.msg.sDate,
+                eDate:this.msg.eDate,
                 Status:this.msg.Status,
                 TemplateId:this.msg.TemplateId,
                 RB_Branch_Id:this.msg.RB_Branch_Id,

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -1683,8 +1683,8 @@ export default {
     getPageList() {
       // 获取列表数据
       this.loading = true;
-      if (!this.msg.OutBranchId)
-        this.msg.OutBranchId = -1;
+      // if (!this.msg.OutBranchId)
+      //   this.msg.OutBranchId = -1;
       if(!this.msg.Is_Transport&&this.msg.Is_Transport!==0)
         this.msg.Is_Transport=-1;
       if (!this.msg.StartCityId) this.msg.StartCityId = 0;

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -157,7 +157,7 @@
       <button class="normalBtn" @click="dialogFormVisible2 = true">通过</button>
       <button class="hollowFixedBtn" @click="dialogFormVisible = true">拒绝</button>
     </div>
-    <div class="iis_save" v-else-if="noDetail && detail.InvoiceApplyState===1">
+    <div class="iis_save" v-else-if="noDetail && detail.InvoiceApplyState===1 && EmployeeId === detail.CreateBy && EmployeeId === 1">
       <button class="normalBtn" @click="setStatus(2)">{{$t('pub.cancelBtn')}}</button>
     </div>
     <el-dialog title="提示信息" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie" >
@@ -190,6 +190,7 @@ export default {
         InvoiceNo: '',
       },
       noDetail: false,
+      EmployeeId: 0,
     };
   },
   methods: {
@@ -274,6 +275,8 @@ export default {
     },
   },
   mounted() {
+    let userInfo = this.getLocalStorage();
+    this.EmployeeId=userInfo.EmployeeId;
     let id = this.$route.query.id
     this.noDetail = this.$route.query.noDetail ? true : false
     this.msg.ID = id

src/components/SalesVisa/ModifyVisaProduct.vue

@@ -409,10 +409,10 @@
                     
                    
                     <el-form-item label="同业价" prop="VisaPrice">
-                    <el-input v-model.number="addMsg.VisaPrice" @keyup.native="checkPrice(addMsg,'VisaPrice')" placeholder="请输入" maxlength="20"></el-input>
+                    <el-input v-model="addMsg.VisaPrice" @keyup.native="checkPrice(addMsg,'VisaPrice')" placeholder="请输入" maxlength="20"></el-input>
                     </el-form-item>
                     <el-form-item label="直客价" prop="VisaB2CPrice">
-                    <el-input v-model.number="addMsg.VisaB2CPrice" @keyup.native="checkPrice(addMsg,'VisaB2CPrice')" placeholder="请输入" maxlength="20"></el-input>
+                    <el-input v-model="addMsg.VisaB2CPrice" @keyup.native="checkPrice(addMsg,'VisaB2CPrice')" placeholder="请输入" maxlength="20"></el-input>
                     </el-form-item>
                     
                     <el-form-item label="提成金额" prop="CommissionPrice">
@@ -766,7 +766,7 @@ export default {
         VisaPrice: "",
         PeopleNum: "0",
         CostPrice: "",
-        EntryType:0,
+        EntryType:1,
         CommissionPrice: "",
         VisaManagementId: "",
         VisaB2CPrice: "",

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1895,6 +1895,16 @@
                   </span>
                   <span v-if="childItem.FinanceList.length===0">暂无数据</span>
                 </div>
+                <div>
+                  <span>发票单据：</span>
+                  <span v-for="(item2,index2) in childItem.InvoiceApplyList" :key="index2">
+                    <span v-if="item2.InvoiceApplyState===6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
+                    <span v-else-if="item2.InvoiceApplyState===1" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
+                    <span v-else-if="item2.InvoiceApplyState===5" class="groupTourOrder_tickets_red" @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
+                    <span v-else-if="item2.InvoiceApplyState===3" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
+                  </span>
+                  <span v-if="childItem.InvoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
+                </div>
               </td>
             </tr>
           </tbody>
@@ -2796,6 +2806,12 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
       updateSalesMan:updateSalesMan
   },
     methods: {
+      goIisDetail: function (id) {  // 跳转发票详情页面
+        this.$router.push({
+          name: 'invoicesManagerDetail',
+          query: { id: id,noDetail: 1,blank: "y",}
+        });
+      },
       // 给其他费用赋值
   Yszefz(){
     this.Ysze=true;

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -919,7 +919,7 @@
           noData: false,
           currentPage: 1,
           //航班配置
-          FlightState: 1,
+          FlightState: 0,
           //预警团
           IsWarning: false,
           WarningQuery: '-1',
@@ -943,12 +943,12 @@
         flightStatus: [{
             Id: 0,
             Name: '不限',
-            Checked: false
+            Checked: true
           },
           {
             Id: 1,
             Name: '已配置',
-            Checked: true
+            Checked: false
           },
           {
             Id: 2,
@@ -1672,39 +1672,13 @@
 
       this.$route.query.tcmun = this.$route.query.tcmun
       if (this.$route.query.tcmun) {
-        this.queryCommonData.flightCKed = [];
-        this.queryCommonData.flightCKed.push(0);
-        this.flightStatus.forEach((subItem, subIndex) => {
-          if (subIndex == 0) {
-            subItem.Checked = true;
-          } else {
-            subItem.Checked = false;
-          }
-        });
         this.queryMsg.TCNUM = this.$route.query.tcmun;
       }
       if (this.$route.query.HotelId) {
-        this.queryCommonData.flightCKed = [];
-        this.queryCommonData.flightCKed.push(0);
-        this.flightStatus.forEach((subItem, subIndex) => {
-          if (subIndex == 0) {
-            subItem.Checked = true;
-          } else {
-            subItem.Checked = false;
-          }
-        });
+       
         this.queryMsg.HotelId = this.$route.query.HotelId;
       }
       if (this.$route.query.HotelUseTime) {
-        this.queryCommonData.flightCKed = [];
-        this.queryCommonData.flightCKed.push(0);
-        this.flightStatus.forEach((subItem, subIndex) => {
-          if (subIndex == 0) {
-            subItem.Checked = true;
-          } else {
-            subItem.Checked = false;
-          }
-        });
         this.queryMsg.HotelUseTime = this.$route.query.HotelUseTime
       }
 

src/components/administrative/ExaminationStatistics.vue

@@ -107,19 +107,20 @@ export default {
       console.log("filter", filters);
       let data = JSON.parse(JSON.stringify(this.dataListTwo))
       let dataListTwo = JSON.parse(JSON.stringify(this.dataListTwo))
-      if (filters.bName!='' && filters.bName!='__all__'){
-        data = data.filter(item => item.bName.indexOf(filters.bName)!=-1);
+      debugger;
+      if (filters.bName && filters.bName!='' && filters.bName!='__all__'){
+        data = data.filter(item => item.bName && item.bName.indexOf(filters.bName)!=-1);
       }
-      if (filters.departmentName!=''){
+      if (filters.departmentName && filters.departmentName!=''){
         data = data.filter(item => item.departmentName.indexOf(filters.departmentName)!=-1);
       }
-      if (filters.emName!=''){
+      if (filters.emName && filters.emName!=''){
         data = data.filter(item => item.emName.indexOf(filters.emName)!=-1);
       }
-      if (filters.periods!=''){
+      if (filters.periods && filters.periods!=''){
         data = data.filter(item => item.periods.indexOf(filters.periods)!=-1);
       }
-      if ((filters.bName === '' || filters.bName==='__all__') && filters.departmentName === '' && filters.createByStr === ''){
+      if ((filters.bName === '' || filters.bName==='__all__') && filters.departmentName === '' && filters.emName === '' && filters.periods === ''){
         data = dataListTwo
       }
       this.dataList = data

src/components/dmc/manager/dmcTotalTable.vue

@@ -225,7 +225,7 @@
                 </div>
               </td>
               <td>
-                <div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderPay',item,outItem,'领队报账')">
+                <div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderPay2',item,outItem,'领队报账')">
                   <span style="color: #4BCA81;" v-if="item.ResultReport.LeaderIsApply==2">√</span>
                   <span class="colorE95252" v-else>{{item.ResultReport.LeaderIsApply=='0'?"x":"O"}}</span>
                 </div>
@@ -453,7 +453,7 @@
         this.$router.push({
           name: path,
           query: {
-            "id": obj.TCIDS,
+            "id": outItem.TCIDs,
             NewCombinationNum:outItem.NewCombinationNum,
             isUpdate: true,
             blank: 'y',