1

src/components/FinancialModule/groupApproval.vue

@@ -86,11 +86,11 @@
                         <div>{{item.OutGroupAuditDate}}</div>
                     </td>
                     <td class="_icon_btn">
-                        <el-tooltip class="item" effect="dark" content="审核" placement="top" v-if="active==1">
-                            <i class="iconfont icon-ico_commodity_defaul" @click="shenhei(item)" v-if="active==1"></i>
+                        <el-tooltip class="item" effect="dark" content="审核" placement="top" v-if="active==1 && EmployeeId==item.OutGroupAuditEmpId">
+                            <i class="iconfont icon-ico_commodity_defaul" @click="shenhei(item)" v-if="active==1 && EmployeeId==item.OutGroupAuditEmpId"></i>
                         </el-tooltip>
-                        <el-tooltip class="item" effect="dark" content="驳回" placement="top" v-if="active==1">
-                            <i class="iconfont icon-shenhebohui" @click="bohui(item)" v-if="active==1"></i>
+                        <el-tooltip class="item" effect="dark" content="驳回" placement="top" v-if="active==1 && EmployeeId==item.OutGroupAuditEmpId">
+                            <i class="iconfont icon-shenhebohui" @click="bohui(item)" v-if="active==1 && EmployeeId==item.OutGroupAuditEmpId"></i>
                         </el-tooltip>
                         <el-tooltip class="item" effect="dark" content="明细" placement="top">
                             <i class="iconfont icon-mingxi" @click="goTeamBalance(item.TCID)"></i>
@@ -134,11 +134,13 @@
                 },
                 TeamListArr:[],
                 total:0,
+                EmployeeId:0,
             }
         },
         created() { 
             this.getTeamList()
             let userinfo = this.getLocalStorage();
+            this.EmployeeId = userinfo.EmployeeId
             let ActionMenuCode=userinfo.ActionMenuCode;
             if(ActionMenuCode.indexOf('Finance_clumpSeeAll')!=-1){//如果有权限 可以查看所有 如果没有只能看自己审核的
                 this.msg.OutGroupAuditEmpId = 0

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -395,6 +395,7 @@
                       class="MainTeam">{{$t('Operation.Op_zhu')}}</span>
                     <span v-if="item.IsUnion==1&&item.UnionTypeStr==2" title="联">{{$t('Operation.Op_lian')}}</span>
                     <span v-if="item.Status==2" title="结团">{{$t('Operation.Op_jietuan')}}</span>
+                    <span v-if="item.Status==5" title="审核" style="background: rgb(0 128 255);">审核中</span>
                     <span v-if="item.Status==1" title="销售">{{$t('visaT.sale')}}</span>
                     <span v-if="item.GroupRecommendType==1" title="精品">精</span>
                     <label style="display:inline-block;margin:5px 0 0 5px;font-size:12px;">{{item.PriceTeamTypeName}}</label>
@@ -2208,7 +2209,7 @@
         };
         if(TravelEndAudit==1){
             let that = this;
-                that.$confirm('一旦审批,不能再进行再制单的操作?', '提示', {
+                that.$confirm('此团线路已开启结团审批,一旦申请结团,不能再进行财务单据的操作,确定结团？', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'

src/components/systemManagement/lineManagement.vue

@@ -1357,7 +1357,7 @@
             RB_Group_id: "0",
             RB_Branch_id: "-1",
             departmentId: "0",
-            IsLeave: "-1"
+            IsLeave: "0",
           }
         this.apipost(
           "app_get_company_employee",