06281434lhj周整理

src/components/Finance/GroupStatus.vue

@@ -69,7 +69,7 @@
                         prop="visitDate"
                         :formatter="filteryear"
                         label="出访时间"
-                        width="100">
+                        width="110">
                     </el-table-column>
                     <el-table-column
                         prop="visitDays"

src/components/MCR/AssociatedInvitees.vue

@@ -1,31 +1,41 @@
 <template>
     <div class="AssociatedInvitees-all">
+        <el-dialog title="邀请方列表" :visible.sync="dialogTableVisible">
+            <el-table height="600px" :border="true" :data="invitingInfos">
+                <el-table-column property="country" label="国家" width="150"></el-table-column>
+                <el-table-column property="area" label="地区" width="200"></el-table-column>
+                <el-table-column property="client" label="单位" width="200"></el-table-column>
+                <el-table-column property="contact" label="名称" width="200"></el-table-column>
+                <el-table-column property="job" label="职位"></el-table-column>
+            </el-table>
+        </el-dialog>
+          
         <div class="AssociatedInvitees-search-head">
             <el-form label-width="75px">
                 <el-form-item label="国家:">
-                    <el-select filterable v-model="companyname" placeholder="请选择国家">
-                        <el-option v-for="(item,index) in companynamearr" :key="index" :label="item.name" :value="item.id"></el-option>
+                    <el-select @change="Countryswitching" clearable filterable v-model="nation" placeholder="请选择国家">
+                        <el-option v-for="(item,index) in nationarr" :key="index" :label="item.name" :value="item.name"></el-option>
                     </el-select>
                 </el-form-item>
             </el-form>
             <el-form label-width="75px">
                 <el-form-item label="地区:">
-                    <el-select filterable v-model="companyname" placeholder="请选择地区">
-                        <el-option v-for="(item,index) in companynamearr" :key="index" :label="item.name" :value="item.id"></el-option>
+                    <el-select @change="Cityswitching" :disabled='disabled' clearable filterable v-model="district" placeholder="请选择地区">
+                        <el-option v-for="(item,index) in districtarr" :key="index" :label="item.name" :value="item.name"></el-option>
                     </el-select>
                 </el-form-item>
             </el-form>
             <el-form label-width="75px">
                 <el-form-item label="团组名:">
-                    <el-select filterable v-model="companyname" placeholder="请选择团组名">
-                        <el-option v-for="(item,index) in companynamearr" :key="index" :label="item.year" :value="item.year"></el-option>
+                    <el-select @change="Groupswitching" clearable filterable v-model="GroupName" placeholder="请选择团组名">
+                        <el-option v-for="(item,index) in GroupNamearr" :key="index" :label="item.name" :value="item.name"></el-option>
                     </el-select>
                 </el-form-item>
             </el-form>
             <el-form label-width="90px">
                 <el-form-item label="邀请方名称:">
-                    <el-select filterable v-model="companyname" placeholder="请选择邀请方名称">
-                        <el-option v-for="(item,index) in companynamearr" :key="index" :label="item.year" :value="item.year"></el-option>
+                    <el-select @change="Invitingswitching" clearable filterable v-model="Invitingparty" placeholder="请选择邀请方名称">
+                        <el-option v-for="(item,index) in Invitingpartyarr" :key="index" :label="item.unitName" :value="item.unitName"></el-option>
                     </el-select>
                 </el-form-item>
             </el-form>
@@ -84,24 +94,25 @@
                 width="80">
                 </el-table-column>
                 <el-table-column label="操作"  width="200">
-                    <el-button
-                    size="mini"
-                    title="查看邀请方"
-                    type="primary"
-                    >查看邀请方</el-button>
-                    <!-- <template slot-scope="scope">
-                    </template> -->
+                    <template slot-scope="scope">
+                        <el-button
+                        @click="clickInviting(scope.row)"
+                        size="mini"
+                        title="查看邀请方"
+                        type="primary"
+                        >查看邀请方</el-button>
+                    </template>
                 </el-table-column>
             </el-table>
             <div class="block">
                 <el-pagination
                     @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"
-                    :current-page="currentPage4"
-                    :page-sizes="[100, 200, 300, 400]"
-                    :page-size="100"
+                    :current-page="pageIndex"
+                    :page-sizes="[10, 12, 20, 50]"
+                    :page-size="pageSize"
                     layout="total, sizes, prev, pager, next, jumper"
-                    :total="400">
+                    :total="totals">
                 </el-pagination>
             </div>
         </div>
@@ -111,18 +122,32 @@
 export default {
     data () {
         return {
-            companyname:'',
-            companynamearr:[],
-            currentPage4: 4,
-            tableData: [] 
+            pageIndex:1,
+            pageSize:12,
+            tableData: [] ,
+            Invitingparty:'',
+            Invitingpartyarr:[],
+            GroupName:'',
+            GroupNamearr:[],
+            district:'',
+            districtarr:[],
+            nation:'',
+            nationarr:[],
+            totals:0,
+            countiesId:0,
+            disabled:true,
+            invitingInfos:[],
+            dialogTableVisible:false,
         }
     },
     methods: {
         handleSizeChange(val) {
-            console.log(`每页 ${val} 条`);
+            this.pageSize=val;
+            this.PostGroupLinkInvitingPageList();
         },
         handleCurrentChange(val) {
-            console.log(`当前页: ${val}`);
+            this.pageIndex=val;
+            this.PostGroupLinkInvitingPageList();
         },
         filteryear(val){
             let gstime=val.visitStartDate.split(' ')[0]
@@ -132,6 +157,130 @@ export default {
             let gstime=val.visitEndDate.split(' ')[0]
             return gstime;
         },
+        //获取基础数据（邀请方）
+        PostGroupLinkInvitingUnitNameInit() {
+            var url = "/api/Groups/PostGroupLinkInvitingUnitNameInit"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+                data:{
+                    portType:1,
+                    pageIndex:1,
+                    pageSize:9999,
+                    search:'',
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.Invitingpartyarr=res.data.data;
+                }else{
+                    that.$message({
+                        message:res.data.msg,
+                        duration:1000,
+                        type:"error"
+                    });
+                }
+            }).catch(function (error) {
+                that.$message.error('请联系信息部！');
+            });
+        },
+        //获取基础数据（国家）
+        PostGroupLinkInvitingCountryInit() {
+            var url = "/api/Groups/PostGroupLinkInvitingCountryInit"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+                data:{
+                    portType:1,
+                    pageIndex:1,
+                    pageSize:9999,
+                    search:'',
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.nationarr=res.data.data;
+                }else{
+                    that.$message({
+                        message:res.data.msg,
+                        duration:1000,
+                        type:"error"
+                    });
+                }
+            }).catch(function (error) {
+                that.$message.error('请联系信息部！');
+            });
+        },
+        //获取基础数据（团组名称）
+        PostGroupLinkInvitingGroupInit() {
+            var url = "/api/Groups/PostGroupLinkInvitingGroupInit"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+                data:{
+                    portType:1,
+                    pageIndex:1,
+                    pageSize:9999,
+                    search:'',
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.GroupNamearr=res.data.data;
+                }else{
+                    that.$message({
+                        message:res.data.msg,
+                        duration:1000,
+                        type:"error"
+                    });
+                }
+            }).catch(function (error) {
+                that.$message.error('请联系信息部！');
+            });
+        },
+        //获取基础数据（地区）
+        PostGroupLinkInvitingCityInit() {
+            var url = "/api/Groups/PostGroupLinkInvitingCityInit"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+                data:{
+                    portType:1,
+                    pageIndex:1,
+                    pageSize:9999,
+                    search:'',
+                    countiesId:that.countiesId
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.districtarr=res.data.data;
+                    if(that.districtarr.length>0){
+                        that.disabled=false
+                    }
+                }else{
+                    that.$message({
+                        message:res.data.msg,
+                        duration:1000,
+                        type:"error"
+                    });
+                }
+            }).catch(function (error) {
+                that.$message.error('请联系信息部！');
+            });
+        },
         //获取表格
         PostGroupLinkInvitingPageList() {
             var url = "/api/Groups/PostGroupLinkInvitingPageList"
@@ -144,15 +293,16 @@ export default {
                 },
                 data:{
                     portType:1,
-                    pageIndex:1,
-                    pageSize:10,
-                    counrty:'',
-                    area:'',
-                    teamName:'',
-                    unitName:'',
+                    pageIndex:that.pageIndex,
+                    pageSize:that.pageSize,
+                    counrty:that.nation,
+                    area:that.district,
+                    teamName:that.GroupName,
+                    unitName:that.Invitingparty,
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
+                    that.totals=res.data.count;
                     that.tableData=res.data.data;
                 }else{
                     that.$message({
@@ -165,9 +315,45 @@ export default {
                 that.$message.error('请联系信息部！');
             });
         },
+        //国家切换
+        Countryswitching(val){
+            this.pageIndex=1;
+            for(let i=0;i<this.nationarr.length;i++){
+                if(this.nationarr[i].name==val){
+                    this.countiesId=this.nationarr[i].id;
+                }
+            }
+            this.PostGroupLinkInvitingCityInit();
+            this.PostGroupLinkInvitingPageList();
+        },
+        //城市切换
+        Cityswitching(){
+            this.pageIndex=1;
+            this.PostGroupLinkInvitingPageList();
+        },
+        //团组切换
+        Groupswitching(){
+            this.pageIndex=1;
+            this.PostGroupLinkInvitingPageList();
+        },
+        //邀请方切换
+        Invitingswitching(){
+            this.pageIndex=1;
+            this.PostGroupLinkInvitingPageList();
+        },
+        //查看邀请方
+        clickInviting(val){
+            console.log(val);
+            this.invitingInfos=[];
+            this.dialogTableVisible=true;
+            this.invitingInfos=val.invitingInfos;
+        }
     },
     mounted(){
         this.PostGroupLinkInvitingPageList();
+        this.PostGroupLinkInvitingUnitNameInit();
+        this.PostGroupLinkInvitingCountryInit();
+        this.PostGroupLinkInvitingGroupInit();
     }
 }
 </script>

src/components/MCR/DownloadOpitinerary.vue

@@ -103,6 +103,7 @@
                     @current-change="handleCurrentChange"
                     :current-page="pageIndex"
                     :page-sizes="[10, 12, 20, 50]"
+                    :page-size="pageSize"
                     layout="total, sizes, prev, pager, next, jumper"
                     :total="tabletotal">
                 </el-pagination>

src/components/OP/PickupList.vue

@@ -1051,7 +1051,6 @@ export default {
             if (tourClientList) {
                 this.PostTourClientListAddMultiple(tourClientList)
             }
-            console.log(tourClientList)
         },
         //多存api
         PostTourClientListAddMultiple(listinif) {
@@ -1184,7 +1183,7 @@ export default {
                                 {
                                     lastName: dataarr[i].lastName,
                                     firstName: dataarr[i].firstName,
-                                    pinyin: '',
+                                    pinyin: dataarr[i].pinyin,
                                     sex: dataarr[i].sex == 0 ? '男' : '女',
                                     companyFullName: dataarr[i].companyFullName,
                                     job: dataarr[i].job,

src/components/Resource/CarData.vue

@@ -22,16 +22,34 @@
                         </template>
                     </el-table-column>
                     <el-table-column prop="unitArea" label="单位地区" width="180">
+                        <template slot-scope="scope">
+                            {{scope.row.unitArea|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="unitName" label="单位名称">
+                        <template slot-scope="scope">
+                            {{scope.row.unitName|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="contact" label="联系人" width="220">
+                        <template slot-scope="scope">
+                            {{scope.row.contact|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="contactTel" label="联系电话" width="180">
+                        <template slot-scope="scope">
+                            {{scope.row.contactTel|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="score" label="评分" width="55">
+                        <template slot-scope="scope">
+                            {{scope.row.score|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="createTime" label="更新时间" width="180">
+                        <template slot-scope="scope">
+                            {{scope.row.createTime|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">
@@ -262,6 +280,13 @@ export default {
             });
         }
     },
+    filters:{
+        //空默认值
+        filter_emptyAcquiesce(value) {
+            let fhz= value==""?"--":value
+            return fhz
+        },
+    },
     mounted() {
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId

src/components/Resource/HotelData.vue

@@ -22,16 +22,34 @@
                         </template>
                     </el-table-column>
                     <el-table-column prop="city" label="所在城市" width="150">
+                        <template slot-scope="scope">
+                            {{scope.row.city|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="name" label="酒店名称" width="300">
+                        <template slot-scope="scope">
+                            {{scope.row.name|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="tel" label="酒店电话" width="200">
+                        <template slot-scope="scope">
+                            {{scope.row.tel|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="fax" label="酒店传真" width="180">
+                        <template slot-scope="scope">
+                            {{scope.row.fax|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="contact" label="联系人" width="180">
+                        <template slot-scope="scope">
+                            {{scope.row.contact|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="contactPhone" label="联系电话" width="200">
+                        <template slot-scope="scope">
+                            {{scope.row.contactPhone|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">
@@ -231,6 +249,13 @@ export default {
         //     this.tableDatas = newarr;
         // }
     },
+    filters:{
+        //空默认值
+        filter_emptyAcquiesce(value) {
+            let fhz= value==""?"--":value
+            return fhz
+        },
+    },
     mounted() {
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId

src/components/Resource/InvitationOfficialActivityData.vue

@@ -50,18 +50,39 @@
                         </template>
                     </el-table-column>
                     <el-table-column prop="country" width="100" label="国家">
+                        <template slot-scope="scope">
+                            {{scope.row.country|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="city" label="城市">
+                        <template slot-scope="scope">
+                            {{scope.row.city|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="unitName" label="邀请方名称">
+                        <template slot-scope="scope">
+                            {{scope.row.unitName|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="field" label="涉及领域">
+                        <template slot-scope="scope">
+                            {{scope.row.field|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="contact" width="100" label="联系人">
+                        <template slot-scope="scope">
+                            {{scope.row.contact|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="job" label="职务">
+                        <template slot-scope="scope">
+                            {{scope.row.job|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="tel" width="120px" label="手机">
+                        <template slot-scope="scope">
+                            {{scope.row.tel|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="delegationStr" label="关联团组">
                         <template slot-scope="scope">
@@ -498,6 +519,13 @@ export default {
             })
         },
     },
+    filters:{
+        //空默认值
+        filter_emptyAcquiesce(value) {
+            let fhz= value==""?"--":value
+            return fhz
+        },
+    },
     created(){
         this.estimatevuex()
     },

src/components/Resource/LocalGuide.vue

@@ -22,16 +22,34 @@
                         </template>
                     </el-table-column>
                     <el-table-column prop="unitArea" label="单位地区" width="180">
+                        <template slot-scope="scope">
+                            {{scope.row.unitArea|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="unitName" label="单位名称">
+                        <template slot-scope="scope">
+                            {{scope.row.unitName|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="contact" label="联系人" width="220">
+                        <template slot-scope="scope">
+                            {{scope.row.contact|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="contactTel" label="联系电话" width="180">
+                        <template slot-scope="scope">
+                            {{scope.row.contactTel|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="score" label="评分" width="55">
+                        <template slot-scope="scope">
+                            {{scope.row.score|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column prop="lastUpdate" label="更新时间" width="180">
+                        <template slot-scope="scope">
+                            {{scope.row.lastUpdate|filter_emptyAcquiesce}}
+                        </template>
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">
@@ -73,6 +91,7 @@ export default {
         }
     },
     methods: {
+        
         //每页条数改变时触发 选择一页显示多少行
         handleSizeChange(val) {
             this.currentPage = 1;
@@ -142,8 +161,8 @@ export default {
                     }
                 }
                 that.loading = false
+                console.log(that.tableDatas);
             }).catch(function (error) {
-                console.log(error);
                 that.loading = false
                 that.$message.error("网络错误，请稍后重试");
             });
@@ -225,10 +244,18 @@ export default {
             });
         }
     },
+    filters:{
+        //空默认值
+        filter_emptyAcquiesce(value) {
+            let fhz= value==""?"--":value
+            return fhz
+        },
+    },
     mounted() {
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
         this.LocalGuide();
+        
     }
 }
 </script>

src/components/Resource/VisitSchedule.vue

@@ -18,7 +18,7 @@
         <div class="VisitSchedule-content">
             <div class="VisitSchedule-content-title">出访行程</div>
             <div class="VisitSchedule-content-info">
-                团组名:{{groupInfo.teamName}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;团组号:{{groupInfo.tourCode}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;出访日期:{{visitStartDate+'~'+visitEndDate}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{groupInfo.visitDays+'天/'+groupInfo.visitPNumber+'人'}}
+                团组名:{{groupInfo.teamName}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;团组号:{{groupInfo.tourCode}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;出访日期:{{groupInfo.visitStartDate+'~'+groupInfo.visitEndDate}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{groupInfo.visitDays+'天/'+groupInfo.visitPNumber+'人'}}
             </div>
             <div class="VisitSchedule-content-table">
                 <div v-for="(item,index) in tablearr" :key="index" class="VisitSchedule-content-ul">

src/components/statistics/Groupreports.vue

@@ -99,7 +99,7 @@
                         prop="lastCollectionTime"
                         :formatter="filteryear"
                         label="收款时间"
-                        width="100">
+                        width="110">
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">