Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/Collection.vue

@@ -393,6 +393,9 @@ export default {
                 headers: {
                     Authorization: 'Bearer ' + this.token
                 },
+                data:{
+                    currUserId:that.userid
+                }
             }).then(function (res) {
                     console.log(res)
                     that.options=res.data.data.groupNameData;

src/components/Finance/FeesPage.vue

@@ -90,6 +90,10 @@
                 </el-table-column>
                 <el-table-column prop="overBudget" label="超预算比例" show-overflow-tooltip width="120">
                 </el-table-column>
+                <el-table-column prop="payType" label="支付方式" width="100" >
+                </el-table-column>
+                <el-table-column prop="cardType" label="卡类型" width="100" >
+                </el-table-column>
                 <el-table-column label="审核操作">
                     <template slot-scope="scope">
                         <el-button size="mini" v-if='scope.row.isAuditGM == 0 || scope.row.isAuditGM == 2'

src/components/Finance/LncomingBills.vue

@@ -201,6 +201,9 @@ export default {
                 headers: {
                     Authorization: 'Bearer ' + that.userid
                 },
+                data:{
+                    currUserId:that.userid
+                }
             }).then(function (res) {
                 console.log(res)
                 that.options=res.data.data.groupNameData;

src/components/Finance/PayReceived.vue

@@ -194,6 +194,9 @@ export default {
                 headers: {
                     Authorization: 'Bearer ' + that.userid
                 },
+                data:{
+                    currUserId:that.userid
+                }
             }).then(function (res) {
                 console.log(res)
                 if(res.data.code==200){

src/components/Finance/RvsReport.vue

@@ -66,6 +66,7 @@
 export default {
     data() {
         return {
+            userid:'',
             pickerOptions: {
                 shortcuts: [{
                     text: '最近一周',
@@ -157,6 +158,7 @@ export default {
                     portType: 1,
                     beginDt: beginDt,
                     endDt: endDt,
+                    currUserId:that.userid,
                     requestType: requestType,
                 }
             }).then(function (res) {
@@ -169,6 +171,9 @@ export default {
                 }
             })
         },
+    },
+    mounted(){
+        this.userid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
     }
 }
 </script>

src/components/Finance/Sendack.vue

@@ -252,6 +252,9 @@ export default {
                 headers: {
                     Authorization: 'Bearer ' + that.userid
                 },
+                data:{
+                    currUserId:that.userid
+                }
             }).then(function (res) {
                 console.log(res)
                 if(res.data.code==200){

src/components/Login.vue

@@ -5,7 +5,7 @@
                 <div class="logos">
                     <img src="../assets/logo2.png" />
                 </div>
-                <div class="names">PAN-AMEPICAN INTERNATIONAL</div>
+                <div class="names">PAN-AMERICAN INTERNATIONAL</div>
             </div>
             <div class="help-box">
                 <div class="help-title">没有企业账户？</div>
@@ -42,8 +42,8 @@
             </div>
         </div>
         <div class="fout-box">
-            PAN AMEPICAN INTERNATIONAL OA AI SYSTEM<br>
-            © 2024 PAN AMEPICAN INTERNATIONAL CORPOPATION.ALL Rights Reserved.
+            PAN-AMERICAN INTERNATIONAL OA AI SYSTEM<br>
+            © 2024 PAN-AMERICAN INTERNATIONAL CORPOPATION. ALL Rights Reserved.
         </div>
     </div>
 </template>

src/components/MCR/AssociatedInvitees.vue

@@ -0,0 +1,162 @@
+<template>
+    <div class="AssociatedInvitees-all">
+        <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>
+                </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>
+                </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>
+                </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>
+                </el-form-item>
+            </el-form>
+            <div style="margin-left: 20px;">
+                <el-button type="primary">查询</el-button>
+            </div>
+        </div>
+        <div class="AssociatedInvitees-table">
+            <el-table
+                :data="tableData"
+                border
+                style="width: 100%">
+                <el-table-column
+                prop="date"
+                label="日期"
+                width="180">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="姓名"
+                width="180">
+                </el-table-column>
+                <el-table-column
+                prop="address"
+                label="地址">
+                </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"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="400">
+                </el-pagination>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data () {
+        return {
+            companyname:'',
+            companynamearr:[],
+            currentPage4: 4,
+            tableData: [
+                {
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+                },{
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+                },{
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+                },{
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+                },
+            ] 
+        }
+    },
+    methods: {
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`);
+        },
+        handleCurrentChange(val) {
+            console.log(`当前页: ${val}`);
+        }
+    },
+}
+</script>
+<style>
+.AssociatedInvitees-all{
+    background-color: #fff;
+
+    padding: 10px;
+    box-shadow: 0 0 5px #0005;
+    border-radius: 10px;
+    min-height: 830px;
+    
+}
+.AssociatedInvitees-search-head{
+    display: flex;
+}
+.AssociatedInvitees-search-head .el-form{
+    width: 300px;
+}
+.AssociatedInvitees-search-head .el-select{
+    width: 100%;
+}
+.AssociatedInvitees-table .block{
+    text-align: center;
+}
+</style>

src/components/MCR/DownloadOpitinerary.vue

@@ -1,13 +1,235 @@
 <template>
-    <div>
-        市场部下载op行程单
+    <div class="DownloadOpitinerary-all">
+        <div class="DownloadOpitinerary-search-head">
+            <el-form label-width="75px">
+                <el-form-item label="国家:">
+                    <el-select filterable v-model="countryData" placeholder="请选择国家">
+                        <el-option v-for="(item,index) in countryDatas" :key="index" :label="item" :value="item"></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>
+                </el-form-item>
+            </el-form>
+            <el-form label-width="75px">
+                <el-form-item label="团组名:">
+                    <el-select filterable v-model="teamNameData" placeholder="请选择团组名">
+                        <el-option v-for="(item,index) in teamNameDatas" :key="index" :label="item" :value="item"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+            <div style="margin-left: 20px;">
+                <el-button type="primary">查询</el-button>
+            </div>
+        </div>
+        <div class="DownloadOpitinerary-table">
+            <el-table
+                :data="tableData"
+                border
+                style="width: 100%">
+                    <!-- <el-table-column
+                        prop="num"
+                        label="序 号"
+                        width="55">
+                        <template slot-scope="scope">
+                            {{(currentPage - 1) * pageSize + scope.$index + 1}}
+                        </template>
+                    </el-table-column> -->
+                    <el-table-column
+                        prop="teamLev"
+                        label="级 别"
+                        width="70">
+                        <template slot-scope="scope">
+                            {{ scope.row.teamLev=='暂未定级'?'-':scope.row.teamLev }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="tourCode"
+                        width="100"
+                        label="团 号">
+                    </el-table-column>
+                    <el-table-column
+                        prop="teamType"
+                        label="团组类型"
+                        width="110">
+                    </el-table-column>
+                    
+                    <el-table-column
+                        prop="teamName"
+                        label="团队名称"
+                        >
+                    </el-table-column>
+                    <el-table-column
+                        prop="clientName"
+                        label="客户名称"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="clientUnit"
+                        label="客户单位">
+                    </el-table-column>
+                    <el-table-column
+                        prop="visitDate"
+                        :formatter="filteryear"
+                        label="出访时间"
+                        width="110">
+                    </el-table-column>
+                    <el-table-column
+                        prop="visitDays"
+                        label="天数"
+                        width="50">
+                    </el-table-column>
+                    <el-table-column
+                        prop="visitPNumber"
+                        label="人数"
+                        width="50">
+                    </el-table-column>
+                    <el-table-column
+                        prop="jietuanOperator"
+                        label="接团操作人"
+                        width="110">
+                    </el-table-column>
+                    <el-table-column label="操作"  width="200">
+                        <template slot-scope="scope">
+                            <el-button
+                            size="mini"
+                            title="下载OP行程单"
+                            type="primary"
+                            @click="handleEdit(scope.$index, scope.row)">下载OP行程单</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"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="400">
+                </el-pagination>
+            </div>
+        </div>
     </div>
 </template>
 <script>
 export default {
-    
+    data () {
+        return {
+            userId:'',
+            companyname:'',
+            companynamearr:[],
+            countryData:'',
+            countryDatas:[],
+            teamNameData:'',
+            teamNameDatas:[],
+            currentPage4: 4,
+            tableData: [],
+        }
+    },
+    methods: {
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`);
+        },
+        handleCurrentChange(val) {
+            console.log(`当前页: ${val}`);
+        },
+        filteryear(val){
+            let gstime=val.visitDate.split(' ')[0]
+            return gstime;
+        },
+        //获取下拉框
+        PostMateOpGroupInit() {
+            var url = "/api/Groups/PostMateOpGroupInit"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.countryDatas=res.data.data.countryDatas;
+                    that.teamNameDatas=res.data.data.teamNameDatas;
+                }else{
+                    that.$message({
+                        message:res.data.msg,
+                        duration:1000,
+                        type:"error"
+                    });
+                }
+            }).catch(function (error) {
+                that.$message.error('请联系信息部！');
+            });
+        },
+        //获取表格
+        PostMateOpGroupPageList() {
+            var url = "/api/Groups/PostMateOpGroupPageList"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+                data:{
+                    portType:1,
+                    userId:that.userId,
+                    pageId:183,
+                    pageIndex:1,
+                    pageSize:10,
+                    country:'',
+                    area:'',
+                    teamName:''
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.tableData=res.data.data
+                }else{
+                    that.$message({
+                        message:res.data.msg,
+                        duration:1000,
+                        type:"error"
+                    });
+                }
+            }).catch(function (error) {
+                that.$message.error('请联系信息部！');
+            });
+        },
+    },
+    mounted(){
+        this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
+        this.PostMateOpGroupInit();
+        this.PostMateOpGroupPageList();
+    }
 }
 </script>
 <style>
+.DownloadOpitinerary-all{
+    background-color: #fff;
+
+    padding: 10px;
+    box-shadow: 0 0 5px #0005;
+    border-radius: 10px;
+    min-height: 830px;
     
+}
+.DownloadOpitinerary-search-head{
+    display: flex;
+}
+.DownloadOpitinerary-search-head .el-form{
+    width: 300px;
+}
+.DownloadOpitinerary-search-head .el-select{
+    width: 100%;
+}
+.DownloadOpitinerary-table .block{
+    text-align: center;
+}
 </style>

src/components/MCR/Marketingamount.vue

@@ -898,6 +898,7 @@ export default {
                 data: {
                     portType:1,
                     userId: that.userId,
+                    diId:that.DiId,
                     pageId:180,
                     items:items
                 }
@@ -940,66 +941,7 @@ export default {
                 this.statisone();
             },
             deep: true
-        },
-        // companyname:function(val){
-        //     this.personnelnamearr=[];
-        //     this.personnelname='';
-        //     if(val==-1){
-        //         this.personnelnamearr=this.personnelnamearrs;
-        //         this.personnelname=this.personnelnamearr[0].id;
-        //     }else{
-        //         for(let i=0;i<this.personnelnamearrs.length;i++){
-        //             if(val==this.personnelnamearrs[i].companyId){
-        //                 this.personnelnamearr.push(this.personnelnamearrs[i]);
-        //             }
-        //         }
-        //     }
-        // },
-        // years:function(val){
-        //     for(let j=0;j<this.yearsarr.length;j++){
-        //         if(this.yearsarr[j].year==val){
-        //             this.quarterarr=this.yearsarr[j].quarterData;
-        //             this.quarter=this.quarterarr[0].name;
-        //             this.montharr=this.yearsarr[j].quarterData[1].monthData;
-        //             this.month=this.montharr[0].name;
-        //             this.YbeginDt=this.yearsarr[j].quarterData[0].beginDt;
-        //             this.YendDt=this.yearsarr[j].quarterData[0].endDt;
-        //         }
-        //     }
-        //     this.YPostMarketingSalesStatistic()
-        // },
-        // quarter:function(val){
-        //     this.montharr=[]
-        //     for (let g = 0; g < this.quarterarr.length; g++) {
-        //         if(val==this.quarterarr[g].name){
-        //             if (val=="全部") {
-        //                 this.month="全部";
-        //                 this.QbeginDt=this.quarterarr[g].beginDt;
-        //                 this.QendDt=this.quarterarr[g].endDt;
-        //                 this.QPostMarketingSalesStatistic()
-        //                 return
-        //             }
-        //             this.QbeginDt=this.quarterarr[g].monthData[0].beginDt;
-        //             this.QendDt=this.quarterarr[g].monthData[0].endDt;
-        //             this.montharr=this.quarterarr[g].monthData;
-        //             this.month=this.montharr[0].name;
-        //             this.QPostMarketingSalesStatistic()
-        //         }
-        //     }
-        // },
-        // month:function(val){
-        //     console.log(this.montharr);
-        //     if (this.montharr!=undefined) {
-        //         for (let h = 0; h < this.montharr.length; h++) {
-        //             if(val==this.montharr[h].name){
-        //                 this.MbeginDt=this.montharr[h].beginDt;
-        //                 this.MendDt=this.montharr[h].endDt;
-        //             }
-        //         }
-        //         console.log(this.MbeginDt,this.MendDt);
-        //         // this.MPostMarketingSalesStatistic()
-        //     }
-        // }
+        }
     },
     created(){
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId;

src/components/Resource/CountryFeeCost.vue

@@ -2,7 +2,7 @@
     <div>
         <div class="communal-list">
             <div class="communal-title">
-                <div>签证费用</div>
+                <div>签证费用标准</div>
                 <div class="communal-box">
                     <el-input @input="Inquireclick()" placeholder="国家" v-model="input" clearable style="width: 350px;">
                     </el-input>
@@ -24,29 +24,37 @@
                     </el-table-column>
                     <el-table-column prop="visaCountry" label="国家" width="150">
                     </el-table-column>
-                    <el-table-column prop="isVisaExemption" label="是否对美免签">
+                    <el-table-column prop="isVisaExemption" label="是否免签" width="80">
                         <template slot-scope="is">
                             <span v-if="is.row.isVisaExemption == 1">否</span>
                             <span v-else>是</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="isVisaOnArrival" label="是否落地签">
+                    <el-table-column prop="isVisaOnArrival" label="是否落地签" width="80">
                         <template slot-scope="is">
                             <span v-if="is.row.isVisaOnArrival == 1">否</span>
                             <span v-else>是</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="isElectronicSignature" label="是否电子签">
+                    <el-table-column prop="isElectronicSignature" label="是否电子签" width="80">
                         <template slot-scope="is">
                             <span v-if="is.row.isElectronicSignature == 1">否</span>
                             <span v-else>是</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="visaTime" label="一般签证时间(天)">
+                    <el-table-column prop="visaTime" label="一般签证时间(天)" width="100">
                     </el-table-column>
                     <el-table-column prop="visaPrice" label="费用(元)" :formatter="rounding">
                     </el-table-column>
-                    <el-table-column prop="visaPriceDesc" label="费用描述">
+                    <el-table-column prop="grandBusinessAgencyFee" label="大公务代办费(元)" :formatter="rounding">
+                    </el-table-column>
+                    <el-table-column prop="pettyBusinessAgencyFee" label="小公务代办费(元)" :formatter="rounding">
+                    </el-table-column>
+                    <el-table-column prop="urgentTime" label="加急签证时间(天)">
+                    </el-table-column>
+                    <el-table-column prop="urgentPrice" label="加急签证费用(元)" :formatter="rounding">
+                    </el-table-column>
+                    <el-table-column prop="visaPriceDesc" label="费用描述" width="110">
                         <template slot-scope="visaPriceDesc">
                             <el-popover placement="top-start" title="费用描述" trigger="hover" width="200"
                                 :content="visaPriceDesc.row.visaPriceDesc">
@@ -74,7 +82,7 @@
                             </el-popover>
                         </template>
                     </el-table-column> -->
-                    <el-table-column label="操作">
+                    <el-table-column label="操作" width="160">
                         <template slot-scope="scope">
                             <el-button size="mini" @click="upDate(scope.$index, scope.row)">编辑</el-button>
                             <el-button size="mini" type="danger" @click="del(scope.$index, scope.row)">删除</el-button>

src/components/Resource/CountryFeeCostOperation.vue

@@ -268,7 +268,6 @@ export default {
             that.addData.CreateUserId = that.userId
             that.$refs.addData.validate((valid) => {
                 if (valid) {
-
                     console.log(that.addData)
                     var url = "/api/Resource/OperationCountryFeeCost"
                     that.$axios({
@@ -303,11 +302,12 @@ export default {
         upData() {
             for (var i = 0; i < this.tableData.length; i++) {
                 if (this.tableData[i].id == parseInt(this.addData.Id)) {
-
+                    
                     this.CountryFeeCostData = this.tableData[i];
                     break;
                 }
             }
+            console.log(this.CountryFeeCostData);
             this.addData.Status = 2;
             this.addData.Id = this.CountryFeeCostData.id;
             this.addData.VisaContinent = this.CountryFeeCostData.visaContinent;

src/components/Resource/VisitSchedule.vue

@@ -0,0 +1,171 @@
+<template>
+    <div class="VisitSchedule-all">
+        <div class="VisitSchedule-search-head">
+            <el-form ref="form" label-width="75px">
+                <el-form-item style="width: 340px;" 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>
+                </el-form-item>
+            </el-form>
+            <div>
+                <el-button size="small" type="primary">删除</el-button>
+                <el-button size="small" type="primary">导入机票信息</el-button>
+                <el-button size="small" type="primary">导出word</el-button>
+            </div>
+        </div>
+        <div class="VisitSchedule-content">
+            <div class="VisitSchedule-content-title">出访行程</div>
+            <div class="VisitSchedule-content-table">
+                <div class="VisitSchedule-content-ul">
+                    <div class="content-ul-title">6月26日(星期三)第一天</div>
+                    <div class="VisitSchedule-content-li">
+                        <div class="VisitSchedule-content-time">
+                            <el-time-picker
+                                is-range
+                                v-model="value1"
+                                range-separator="至"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间"
+                                placeholder="选择时间范围">
+                            </el-time-picker>
+                        </div>
+                        <div class="VisitSchedule-content-remark">
+                            <el-input
+                                type="textarea"
+                                :rows="2"
+                                placeholder="请输入内容"
+                                v-model="textarea">
+                            </el-input>
+                        </div>
+                    </div>
+                    <div class="VisitSchedule-content-li">
+                        <div class="VisitSchedule-content-time">
+                            <el-time-picker
+                                is-range
+                                v-model="value1"
+                                range-separator="至"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间"
+                                placeholder="选择时间范围">
+                            </el-time-picker>
+                        </div>
+                        <div class="VisitSchedule-content-remark">
+                            <el-input
+                                type="textarea"
+                                :rows="2"
+                                placeholder="请输入内容"
+                                v-model="textarea">
+                            </el-input>
+                        </div>
+                    </div>
+                </div>
+                <div class="VisitSchedule-content-ul">
+                    <div class="content-ul-title">6月26日(星期三)第一天</div>
+                    <div class="VisitSchedule-content-li">
+                        <div class="VisitSchedule-content-time">
+                            <el-time-picker
+                                is-range
+                                v-model="value1"
+                                range-separator="至"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间"
+                                placeholder="选择时间范围">
+                            </el-time-picker>
+                        </div>
+                        <div class="VisitSchedule-content-remark">
+                            <el-input
+                                type="textarea"
+                                :rows="2"
+                                placeholder="请输入内容"
+                                v-model="textarea">
+                            </el-input>
+                        </div>
+                    </div>
+                    <div class="VisitSchedule-content-li">
+                        <div class="VisitSchedule-content-time">
+                            <el-time-picker
+                                is-range
+                                v-model="value1"
+                                range-separator="至"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间"
+                                placeholder="选择时间范围">
+                            </el-time-picker>
+                        </div>
+                        <div class="VisitSchedule-content-remark">
+                            <el-input
+                                type="textarea"
+                                :rows="2"
+                                placeholder="请输入内容"
+                                v-model="textarea">
+                            </el-input>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data () {
+        return {
+            companyname:'',
+            companynamearr:[],
+            value1: [new Date(2016, 9, 10, 8, 40), new Date(2016, 9, 10, 9, 40)],
+            textarea:'',
+        }
+    }
+}
+</script>
+<style>
+.VisitSchedule-all{
+    background-color: #fff;
+    padding: 10px;
+    box-shadow: 0 0 5px #0005;
+    border-radius: 10px;
+    min-height: 830px;
+}
+.VisitSchedule-search-head{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.VisitSchedule-search-head .el-select{
+    width: 100%;
+}
+.VisitSchedule-content-table{
+    padding: 10px 0;
+    border: 1px solid #DCDFE6;
+}
+.VisitSchedule-content-li{
+    border-top: 1px solid #DCDFE6;
+    display: flex;
+    align-items: center;
+}
+.VisitSchedule-content-time{
+    padding: 10px;
+    width: 25%;
+}
+.VisitSchedule-content-remark{
+    width: 75%;
+    padding: 10px;
+}
+.VisitSchedule-content-time .el-range-editor.el-input__inner{
+    width: 100%;
+}
+.content-ul-title{
+    padding: 10px;
+}
+.VisitSchedule-content-ul .VisitSchedule-content-li:last-child{
+    border-bottom:1px solid #DCDFE6 ;
+}
+.VisitSchedule-content-title{
+    text-align: center;
+    margin-bottom: 10px;
+    color: #555;
+    font-size: 17px;
+    font-weight: 600;
+}
+</style>

src/router/index.js

@@ -110,6 +110,8 @@ import Marketingamount from '@/components/MCR/Marketingamount';
 import downloadpage from '@/components/OP/downloadpage';
 import Supplierinfo from '@/components/ConferenceModule/Supplierinfo';
 import DownloadOpitinerary from '@/components/MCR/DownloadOpitinerary';
+import AssociatedInvitees from '@/components/MCR/AssociatedInvitees';
+import VisitSchedule from '@/components/Resource/VisitSchedule'
 
 Vue.use(Router)
 
@@ -681,6 +683,16 @@ export default new Router({
           name: 'DownloadOpitinerary',
           component: DownloadOpitinerary
         },
+        {
+          path: '/home/AssociatedInvitees',
+          name: 'AssociatedInvitees',
+          component: AssociatedInvitees
+        },
+        {
+          path: '/home/VisitSchedule',
+          name: 'VisitSchedule',
+          component: VisitSchedule
+        },
       ]
     },
     {