1

src/pages/financial/financalDocument/BasicDocuments.vue

@@ -365,8 +365,8 @@
         </p>
         <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
           <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
-            <td :colspan="3">
-              {{o.TCNUM}}（{{o.TCID}}）
+            <td :colspan="3" class="_jump_page" @click="getClassInfo(o)">
+              {{o.ClassName}}（{{o.ClassId}}）
               <span v-if="GetDetail.IsShowGuestUrl && GetDetail.IsShowGuestUrl === 1" @click="goInves('investigationList',o.TCID)" class="FD_yijian">旅客意见
                                 <span>{{o.GuestSurveyNum?o.GuestSurveyNum:0}}</span>/
                                 <span>{{o.GuestTotalNum?o.GuestTotalNum:0}}</span>份
@@ -376,8 +376,9 @@
                             </span>
               <span v-if="GetDetail.IsShowDiJieChargeUrl==1" style="margin-left:10px;cursor:pointer;" @click="jumpHotelContract('HotelContract',o)">手配费详情</span>
             </td>
-            <td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
-            <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
+            <td @click="jumpbjPage('classManage',o)"> <span class="_jump_page _font_bold">查看班级</span> </td>
+            <td @click="jumpbjPage('classorder',o)"> <span class="_jump_page _font_bold">查看报名</span> </td>
+            <td  @click="jumpbjPage('paymentDetail',o)"> <span class="_jump_page _font_bold">班级收支</span> </td>
             <td v-if="qjGroupId==userInfo.Group_Id || TeamShouZhi" @click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)"> <span class="_jump_page _font_bold">团队收支</span> </td>
             <td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('SettlementOrder',GetDetail.SourceID,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
             <td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
@@ -504,22 +505,7 @@
       <huijiBill :ID="ID" :disabled="true" :loopNumN="1" :FrID='FrID'  :TemplateId='GetDetail.TemplateId' v-if="GetDetail.AccountantMergeDetailList && GetDetail.AccountantMergeDetailList.length>0" />
 
     </div>
-    <template v-if="sonTCIDList">
-      <div class="w890px">
-        <div class="_tit _tit2 w890px _border_bottom_none">
-          <p>
-            <span class="_text">团队</span>
-            <span class="_btn" v-if="tableShowTeam" @click="tableShowTeam=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
-            <span class="_btn" v-else @click="tableShowTeam=true">展开 <i class="iconfont icon-gengduo"></i> </span>
-          </p>
-          <div v-show="tableShowTeam" >
-            <div>
-              <teamProductModule :ID="sonTCIDList"></teamProductModule>
-            </div>
-          </div>
-        </div>
-      </div>
-    </template>
+
     <div class="w890px">
       <SaleOrderModule v-if="OrderSource==10&&SourceID&&OrderID" :SourceID='SourceID' :orderID='OrderID'/>
       <TicketFinace v-if="OrderSource==4&&SourceID&&Callback&&ID" :SourceID='SourceID' :Callback='Callback' :id='ID'/>
@@ -942,6 +928,7 @@
               <p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
               <p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
             </div>
+
         </template>
         </p>
         <textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea>
@@ -1306,9 +1293,9 @@
       <div>
         <label>下一步：<span class="red">{{GetDetail.AuditDescription}}</span></label>
         <el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote reserve-keyword placeholder="请输入..." :remote-method="remoteMethod" :loading="loadingPeople">
-          <el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId">
+          <el-option v-for="item in peopleData" :key="item.Id" :label="`${item.EmployeeName}`" :value="item.Id">
             <span style="float: left; font-size: 12px">{{ item.name }}</span>
-            <span style="float: right; font-size: 12px; margin-right:20px;">{{ item.departmentName }}</span>
+            <span style="float: right; font-size: 12px; margin-right:20px;">{{ item.EmployeeName }}</span>
           </el-option>
         </el-select>
       </div>
@@ -1332,9 +1319,9 @@
   <div>
     <label>转交人：</label>
     <el-select size="mini" style="width:300px" v-model="zhuanMsg.AuditEmId" filterable remote reserve-keyword placeholder="请选择转交人" :remote-method="remoteMethod" :loading="loadingPeople">
-      <el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId">
+      <el-option v-for="item in peopleData" :key="item.Id" :label="`${item.EmployeeName}`" :value="item.Id">
         <span style="float: left; font-size: 12px">{{ item.name }}</span>
-        <span style="float: right; font-size: 12px; margin-right:20px;">{{ item.departmentName }}</span>
+        <span style="float: right; font-size: 12px; margin-right:20px;">{{ item.EmployeeName }}</span>
       </el-option>
     </el-select>
   </div>
@@ -1350,6 +1337,7 @@
 <viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer" >
   <img v-for="src in images" :src="src" :key="src" style="display: none">
 </viewer>
+<classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshClass"></classinfo-form>
 <a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
 </div>
 </template>
@@ -1373,7 +1361,11 @@
   import czBillModule from "../components/czBillModule.vue";
   // import MsgBus from '../../assets/utils/msgBus.js';
   import {UploadSelfFile} from '../../../api/common/common'
-
+  import {getClassNameList} from '../../../api/finance/index'
+  import classinfoForm from '../../../components/course/classinfo-form';
+  import {
+    queryEmployee //员工列表
+  } from '../../../api/users/user'
   export default {
     data(){
       return{
@@ -1529,6 +1521,8 @@
         LeadState:false,
         huijiShow:false,
         F_PayMoney_CapitalPool:false,
+        classObjOption: null,
+        isShowClassInfo: false, //是否显示课程信息
       }
     },
     components:{
@@ -1548,6 +1542,8 @@
       'myJiPiaoBill': myJiPiaoBill,
       'huijiBill': huijiBill,
       'czBillModule':czBillModule,
+      'classinfo-form':classinfoForm,
+
 
     },
     methods:{
@@ -1972,12 +1968,22 @@
       remoteMethod(query) {
         if (query !== '') {
           this.loadingPeople = true
-          this.apipost('admin_Get_Chat_All_SelectEmpName',{EmName:query}, res => {
-            if(res.data.resultCode == 1) {
-              this.peopleData = res.data.data
+          // this.apipost('admin_Get_Chat_All_SelectEmpName',{EmName:query}, res => {
+          //   if(res.data.resultCode == 1) {
+          //     this.peopleData = res.data.data
+          //   }
+          //   this.loadingPeople = false
+          // }, err => {})
+          var qMsg = {
+            EmployeeName: query
+          }
+          queryEmployee(qMsg).then(res => {
+            if (res.Code == 1) {
+              this.peopleData = res.Data;
             }
-            this.loadingPeople = false
-          }, err => {})
+          }).catch(() => {
+
+          })
         } else {
           this.peopleData = [];
         }
@@ -2513,7 +2519,7 @@
               }
               if(AuditSteps[i].NextStep==1){
                 AuditSteps[i].AuditRecordList.forEach(audit=>{
-                  if(audit.AuditName==userInfo.AccountName){
+                  if(audit.AuditEmId==userInfo.Id){
                     MsgUrl = true
                     return
                   }
@@ -2564,8 +2570,13 @@
               data.TCIDList.forEach(x=>{
                 str = str + x + ',';
               })
+              str = str.slice(0,str.length-1);
+              getClassNameList({ClassIds:str}).then(res => {
+                data.TCIDAndTCNUMList = res.Data
+              }).catch(() => {
+
+              })
             }
-            str = str.slice(0,str.length-1);
             this.sonTCIDList = str==''?null:str;
             if(data.URL){
               // if(this.OrderSource==9){  // 国内票务订单
@@ -2736,6 +2747,30 @@
           }
         });
       },
+      getClassInfo(obj){
+        this.classObjOption = null;
+        this.isShowClassInfo = false;
+        this.classObjOption = obj;
+        this.isShowClassInfo = true;
+      },
+      //关闭班级信息弹窗
+      closeClass() {
+        this.isShowClassInfo = false
+      },
+      //刷新
+      refreshClass() {
+
+      },
+      jumpbjPage(path,item){
+        if(path=='classManage'){
+          this.$router.push({path:'/course/'+path,query:{'ClassName':item.ClassName}})
+        }else if(path=='paymentDetail'){
+          this.$router.push({path:'/course/'+path,query:{'ClassId':item.ClassId,'School_Id':item.School_Id}})
+        }else {
+          this.$router.push({path:'/course/'+path,query:{'ClassId':item.ClassId}})
+
+        }
+      },
     },created(){
       if(this.$route.query.pageIndex){
         this.pageIndex = this.$route.query.pageIndex;

src/pages/financial/financalDocument/FinancialDocuments.vue

@@ -887,7 +887,7 @@
           <td class="_number">
             <template v-if="item.TCIDAndTCNUMList.length>0">
               <div class="_TCIDAndTCNUMList">
-                <span>{{$t('visa.v_tuanhao')}}：</span>
+                <span>班级：</span>
                 <template v-if="item.TCIDAndTCNUMList&&item.TCIDAndTCNUMList.length>0">
                   <p><span v-for="(i,ix) in item.TCIDAndTCNUMList">{{i.ClassName}}（{{i.ClassId}}） <span
                         v-if="ix!=item.TCIDAndTCNUMList.length-1">,<br /></span></span></p>