update

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/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