签证财务单据

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1036,7 +1036,7 @@ export default {
             this.picIsShow= true;
             // this.hideFlashMan = true;
           }else{
-              console.log(i.Url)
+              
             if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
               this.previewPDF(i.Url)
             }else{
@@ -1045,7 +1045,7 @@ export default {
           }
         },
         showUpLoadFile(i){  // 预览上传文件
-        console.log(i.Content)
+        
             if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
                 this.previewPDF(i.Content)
             }else{

src/components/FinancialModule/addFinancialDocuments.vue

@@ -477,8 +477,7 @@
                 </div>
                 <div class="_remark">
                     <p>{{$t('system.label_info')}}</p>
-                    <textarea v-model="msg.Description">
-
+                    <textarea v-model="Description">
                     </textarea>
                 </div>
                 <div>
@@ -556,6 +555,7 @@ import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue";
 export default {
     data(){
         return{
+            Description:"",
             msg:{
               FrID:0,
               ClientType:'',
@@ -567,7 +567,7 @@ export default {
               OrderID:0,
               OrderSource:0,
               TemplateId:0,
-              Description:'',
+              Description:'132356',
               detailList:[],
               RB_Branch_Id:'',
               RB_Depart_Id:'',
@@ -663,6 +663,7 @@ export default {
     methods:{
         deleteRow(i,obj){
             obj.show = false;
+            this.msg.Description=this.Description;
             this.msg.detailList.splice(i,1);
             this.$forceUpdate();
         },
@@ -874,21 +875,25 @@ export default {
             });
           //旅客名单数据组装
           if(this.orderObj!=null&&this.orderObj.OrderSource===10){
-            console.log("getGuestInfo",this.$store.getters.getGuestInfo)
-            let guestInfo = this.$store.getters.getGuestInfo;
+            // console.log("getGuestInfo",this.$store.getters.getGuestInfo)
+            let guestInfo = JSON.parse(sessionStorage.getItem("saveGuestInfo"));
+             console.log("getGuestInfo",guestInfo)
+            //  return;
             this.msg.GuestInfoList=[];
             if(guestInfo!=null&&guestInfo.length>0){
               guestInfo.forEach(t=>{
-                this.msg.GuestInfoList.push({GuestId:t.guestId,GuestName:t.guestName})
+                this.msg.GuestInfoList.push({GuestId:t.Id,GuestName:""})
               })
             }
           }
           console.log("1234",this.msg);
           this.loading = true;
+          this.msg.Description=this.Description;
             this.apipost('Financial_post_Set',this.msg,res=>{
                 if(res.data.resultCode==1){
                   //清除旅客名单数据
-                  this.$store.commit('saveGuestInfo',[])
+                  sessionStorage.removeItem("saveGuestInfo");
+                //   this.$store.commit('saveGuestInfo',[])
                   this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {
                         confirmButtonText: this.$t('fnc.jxzhidan'),
                         cancelButtonText: this.$t('fnc.nothanks'),
@@ -1274,11 +1279,15 @@ export default {
             }, err => {})
         },
     },created(){
+        var that=this;
         this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
-         console.log(this.$route.query.orderObj)
+        //  console.log(this.$route.query.orderObj)
         if(this.orderObj!=null&&this.orderObj.OrderSource===10){
-          console.log("getGuestInfo",this.$store.getters.getGuestInfo)
-          this.describeList=this.$store.getters.getGuestInfo;
+          that.Description="旅客名单：";
+          that.describeList=JSON.parse(sessionStorage.getItem("saveGuestInfo"));
+          that.describeList.forEach(item=>{
+              that.Description+=item.GuestName+" ";
+          })
         }
     },mounted(){
         let userInfo = this.getLocalStorage();

src/components/SalesModule/VisaFinancialDocuments.vue

@@ -83,7 +83,29 @@
   display: inline-block;
   margin:10px 0;
   width: 85px;
+  cursor: pointer;
 }
+  .tickets_red {
+    color: #FF0000;
+    cursor: pointer;
+  }
+
+  .tickets_blue {
+    color: #0000FF;
+    cursor: pointer;
+    
+  }
+
+.tickets_black {
+  color: #000000;
+}
+.color_des{
+  display: inline-block;
+  width: 5px;
+  height: 12px;
+  margin-left:15px;
+}
+
 </style>
 <template>
   <div class="page_SalesFinancialDetail">
@@ -118,6 +140,7 @@
           <th width="100">实收</th>
           <th width="100">平台税金</th>
           <th width="150">交易日期</th>
+          <th width="150">旅客名单</th>
           <th width="100">制单人员</th>
           <th width="120">当前状态</th>
         </tr>
@@ -154,6 +177,19 @@
             <p style="line-height:20px"><span>{{moneyFormat(item.Fee)}}</span></p>
           </td>
           <td width="">{{item.TradeDate}}</td>
+          <!-- 旅客名单 -->
+          <!-- <td width="">旅客名单</td> -->
+          <td>
+            <span v-if="item.GuestInfoList.length>0" >
+               <el-popover class="item" effect="dark" placement="top-start" width="350" trigger="click">
+                 <span style="display:inline-block;cursor:pointer;margin:6px;word-break:break-all;" v-for="item2 in item.GuestInfoList" :key="item2.GuestId">{{item2.GuestName}} </span>
+                 <span slot="reference" style="cursor:pointer" v-if="key==0" v-for="(item2,key) in item.GuestInfoList" :key="key+5000">{{item2.GuestName}}
+                   <span v-if="item.GuestInfoList.length>1">...</span>
+                 </span>
+              </el-popover>
+            </span>
+            <span v-if="item.GuestInfoList.length==0">暂无名单</span>
+          </td>
           <td width="">{{item.EmName}}</td>
           <td width="">
             <i v-if="item.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
@@ -185,7 +221,7 @@
           </td>
         </tr>
         <tr v-if="dataList.length===0">
-          <td colspan="10" class="noDataNotice">
+          <td colspan="11" class="noDataNotice">
             <div>
               <p class="iconfont icon-kong"></p>
               <p class="text">{{`暂无数据`}}</p>
@@ -204,6 +240,7 @@
           <th width="100">实付</th>
           <th width="100">平台税金</th>
           <th width="150">交易日期</th>
+          <th width="150">旅客名单</th>
           <th width="100">制单人员</th>
           <th width="120">当前状态</th>
         </tr>
@@ -240,6 +277,17 @@
             <p style="line-height:20px"><span>{{moneyFormat(item.Fee)}}</span></p>
           </td>
           <td width="">{{item.TradeDate}}</td>
+          <td>
+            <span v-if="item.GuestInfoList.length>0" >
+               <el-popover class="item" effect="dark" placement="top-start" width="350" trigger="click">
+                 <span style="display:inline-block;cursor:pointer;margin:6px;word-break:break-all;" v-for="item2 in item.GuestInfoList" :key="item2.GuestId">{{item2.GuestName}} </span>
+                 <span slot="reference" style="cursor:pointer" v-if="key==0" v-for="(item2,key) in item.GuestInfoList" :key="key+200">{{item2.GuestName}}
+                   <span v-if="item.GuestInfoList.length>1">...</span>
+                 </span>
+              </el-popover>
+            </span>
+            <span v-if="item.GuestInfoList.length==0">暂无名单</span>
+          </td>
           <td width="">{{item.EmName}}</td>
           <td width="">
             <i v-if="item.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
@@ -271,7 +319,7 @@
           </td>
         </tr>
         <tr v-if="dataListP.length===0">
-          <td colspan="10" class="noDataNotice">
+          <td colspan="11" class="noDataNotice">
             <div>
               <p class="iconfont icon-kong"></p>
               <p class="text">{{`暂无数据`}}</p>
@@ -286,11 +334,23 @@
       width="30%">
        <div>
           <input type="checkbox" @change="checkAll" v-model="checkd" >全选
+          <span  style="margin-left:15px">签证状态：</span>
+          <span class="color_des" style="background:#FF0000;margin-left:0"></span>
+          <span>未办理</span>
+          <span class="color_des" style="background:#0000FF"></span>
+          <span>正在办理</span>
+          <span class="color_des" style="background:#000000"></span>
+          <span>办理完成</span>
         </div>
         <ul class="checklist_ul">
           <li v-for="item in checknameList" :key="item.Id">
-            <input type="checkbox" v-model="checkList" :value="item.Id" @change="checkThis">
-              {{item.GuestName}}
+            <input type="checkbox" v-model="checkList" :value="item.Id" @change="checkThis" :id="item.Id">
+            <label :for="item.Id">
+              <span v-if="item.VisaStatus===1" class="tickets_red" >{{item.GuestName}}</span>
+              <span v-if="item.VisaStatus===2" class="tickets_blue" >{{item.GuestName}}</span>
+              <span v-if="item.VisaStatus===3" class="tickets_black" >{{item.GuestName}}</span>
+            </label>
+              
           </li>
         </ul>
       <span slot="footer" class="dialog-footer">
@@ -374,7 +434,6 @@ export default {
         return
       }
       this.checkd = false
-      console.log("checkList",this.checkList)
     },
     checkAll(){ //全选
       if(this.checkList.length==this.checkListAll.length){
@@ -439,6 +498,7 @@ export default {
       }, null)
     },
     OpenOrder(num){
+      this.checkd=false;
       this.checkList=[];
       this.checkAllList=[];
       this.type=num;
@@ -468,7 +528,8 @@ export default {
           }
         })
       })
-      this.$store.commit('saveGuestInfo',userInfo)
+      sessionStorage.setItem("saveGuestInfo",JSON.stringify(userInfo))
+      // this.$store.commit('saveGuestInfo',userInfo)
       // console.log("getGuestInfo",this.$store.getters.getGuestInfo)
       let TCIDARR = [this.tcid];
       let orderObj = {

src/components/VisaCenter/VisaApplicationDetails.vue

@@ -16,6 +16,7 @@
       position: absolute;
       right:10px;
     }
+   
 </style>
 <template>
   <div class="wrapper">
@@ -26,12 +27,7 @@
             {{$t('visa.v_tvisa')}}
             <el-dropdown-menu slot="dropdown" >
               <el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsGroupSigned==1"  :command='{id:item.Id,type:2}'>{{item.Name}}</el-dropdown-item>
-<<<<<<< HEAD
               <el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item>    
-=======
-              <el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item>
-              
->>>>>>> 3f75667611ac72e4be81b0af1210cd16ce00a70b
             </el-dropdown-menu>
           </el-dropdown>
           <el-dropdown split-button type="primary" trigger="click"  @command="bindVisa">
@@ -92,6 +88,8 @@
                  <span v-if="item.VisaManageStatus==1">{{$t('visa.v_weibanli')}}</span> 
                 <span v-if="item.VisaManageStatus==2">{{$t('visa.v_banlizhong')}}</span> 
                 <span v-if="item.VisaManageStatus==3">{{$t('visaT.Completionover')}}</span> 
+                <!--   -->
+                <span @click="goUrl('财务单据','FinancialDocumentsDetail',item.OrderId)" v-if="item.FinanceId>0" style="cursor:pointer" class="_radius _tuan">财</span>
                </span>
               
             </span>
@@ -101,10 +99,9 @@
           <td style="position:relative;width:200px"> <i @click="deletelist(item.Id)" class="iconfont icon-img_delete_small"></i>
           <span v-if="LineID!=14">
             <!-- <button v-if="item.VisaManageStatus==1" @click="UpdateGuestStatus(item,2)" style='background:#3EABFF;padding:4px 6px;color:#fff;cursor:pointer'>办理</button> -->
-            <el-tooltip class="item" effect="dark" content="办理完成" placement="top">
-						  <el-button v-if="item.VisaManageStatus==2" type="primary" class='zidingyiFz' icon="iconfont icon-bangdingzhagnhuxinxi" circle @click="UpdateGuestStatus(item,3)"></el-button>
-					</el-tooltip>
-            <!-- <button v-if="item.VisaManageStatus==2"  style='background:#3EABFF;padding:4px 6px;color:#fff;cursor:pointer'>办理完成</button> -->
+             <el-tooltip class="item" effect="dark" content="办理完成" placement="top-start">
+                <i v-if="item.VisaManageStatus==2" class="iconfont icon-yiqueren" style="color:rgb(75, 202, 129);cursor:pointer;font-size:18px" @click="UpdateGuestStatus(item,3)"></i>
+              </el-tooltip>
             </span>
           </td>
         </tr>
@@ -148,6 +145,9 @@ export default {
   watch:{},
   computed:{},
   methods:{
+    goUrl: function (name, path, id ) {
+      this.$router.push({ name: path, query: { id: id, blank: 'y', tab: name} });
+    },
     UpdateGuestStatus(item,num){
       let msg={
         guestId:item.Id,
@@ -253,6 +253,7 @@ export default {
       this.loading = true
       this.checkListAll=[];
       this.apipost('dmc_get_GetTCGuestList',{TCID:this.id},res=>{
+        // console.log("res",res);
             if(res.data.resultCode==1){
                 this.dataList = res.data.data;
                 if(this.LineID==14){