06241020lhj

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/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

@@ -48,15 +48,15 @@
             </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">
+                    @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>
     </div>
 </template>
@@ -133,7 +133,7 @@ export default {
 <style>
 .DownloadOpitinerary-all{
     background-color: #fff;
-    
+
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;

src/components/MCR/Marketingamount.vue

@@ -898,6 +898,7 @@ export default {
                 data: {
                     portType:1,
                     userId: that.userId,
+                    diId:that.DiId,
                     pageId:180,
                     items:items
                 }

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
+        },
       ]
     },
     {