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

src/components/Finance/Cost.vue

@@ -1008,6 +1008,9 @@ export default {
         box-shadow: 0 0 5px #0005;
         border-radius: 10px;
     }
+    .cost-box .el-button+.el-button{
+        margin-left: 0;
+    }
     .fade-enter-active,
     .fade-leave-active {
         transition: opacity 1;

src/components/Finance/ExpenseReview.vue

@@ -0,0 +1,349 @@
+<template>
+    <div v-loading="fullscreenLoading">
+        <div class="group-list">
+            <div class="group-title">
+                <div>团组列表</div>
+                <div class="group-box">
+                    <el-select v-model="value" clearable placeholder="请选择" @change="filterStatus(value)">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                    <el-input
+                    style="width:200px;"
+                    @input="Inquireclick()"
+                    placeholder="请输入查询内容"
+                    v-model="input"
+                    clearable>
+                    </el-input>
+                </div>
+            </div>
+            <template>
+                <el-table
+                :data="groupDatas.slice((currentPage-1)*pageSize,currentPage*pageSize)"
+                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="tourCode"
+                        width="100"
+                        label="团 号">
+                    </el-table-column>
+                    <el-table-column
+                        width="100" 
+                        prop="salesQuoteNo"
+                        label="销售报价号">
+                    </el-table-column>
+                    <el-table-column
+                        prop="teamType"
+                        label="团组类型"
+                        width="150">
+                    </el-table-column>
+                    <!-- <el-table-column
+                        prop="teamLev"
+                        label="级 别"
+                        width="80">
+                    </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="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="visitDays"
+                        label="出访天数"
+                        width="80">
+                    </el-table-column>
+                    <el-table-column
+                        prop="visitPNumber"
+                        label="出访人数"
+                        width="80">
+                    </el-table-column>
+                    <el-table-column
+                        prop="jietuanOperator"
+                        label="接团操作人"
+                        width="110">
+                    </el-table-column>
+                    <el-table-column label="操作">
+                        <template slot-scope="scope">
+                          <el-button
+                            type="primary"
+                            size="mini"
+                            title="查看费用清单"
+                            @click="handleView(scope.$index, scope.row)">查看费用清单</el-button>
+                        </template>
+                      </el-table-column>
+                </el-table>
+            </template>
+            <div class="block">
+                <el-pagination align='center' 
+                    @size-change="handleSizeChange" 
+                    @current-change="handleCurrentChange"
+                    :current-page="currentPage" 
+                    :page-sizes="[10,12,15,20]" 
+                    :page-size="pageSize" 
+                    layout="total, sizes, prev, pager, next" 
+                    :total="groupDatas.length">
+                </el-pagination>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            options: [
+                {
+                    value: '0',
+                    label: '全部'
+                }, {
+                    value: '1',
+                    label: '已完成'
+                }, {
+                    value: '2',
+                    label: '未完成'
+                }
+            ],
+            value: '0',
+            groupDatas:[],
+            groupData: [],
+            groupDatass:[],
+            currentPage: 1, // 当前页码
+            pageSize: 12 ,// 每页的数据条数
+            input:'',
+            token:'',
+            fullscreenLoading:false,
+            userid:''
+        }
+    },
+    methods:{
+         //每页条数改变时触发 选择一页显示多少行
+         handleSizeChange(val) {
+            this.currentPage = 1;
+            this.pageSize = val;
+        },
+        //当前页改变时触发 跳转其他页
+        handleCurrentChange(val) {
+            this.currentPage = val;
+        },
+        //查看费用申请
+        handleView(index, row) {
+            this.$router.push({path: '/home/FeesPage?id=' + row.id +''});
+        },
+        //模糊查询
+        Inquireclick(){
+            var newarr=[];
+            if(this.input==""){
+                if(this.value=="0"){
+                    newarr=this.groupData;
+                }else{
+                    newarr=this.groupDatass;
+                }
+            }else{
+                for(var i=0;i<this.groupDatas.length;i++){
+                    if(this.groupDatas[i].clientName.indexOf(this.input)!=-1){
+                        newarr.push(this.groupDatas[i]);
+                    }
+                    else if(this.groupDatas[i].clientUnit.indexOf(this.input)!=-1){
+                        newarr.push(this.groupDatas[i]);
+                    }
+                    else if(this.groupDatas[i].jietuanOperator.indexOf(this.input)!=-1){
+                        newarr.push(this.groupDatas[i]);
+                    }
+                    else if(this.groupDatas[i].salesQuoteNo.indexOf(this.input)!=-1){
+                        newarr.push(this.groupDatas[i]);
+                    }
+                    else if(this.groupDatas[i].teamLev.indexOf(this.input)!=-1){
+                        newarr.push(this.groupDatas[i]);
+                    }
+                    else if(this.groupDatas[i].teamName.indexOf(this.input)!=-1){
+                        newarr.push(this.groupDatas[i]);
+                    }
+                    else if(this.groupDatas[i].teamType.indexOf(this.input)!=-1){
+                        newarr.push(this.groupDatas[i]);
+                    }
+                    else if(this.groupDatas[i].tourCode.indexOf(this.input)!=-1){
+                        newarr.push(this.groupDatas[i]);
+                    }else if(this.groupDatas[i].visitDate.indexOf(this.input)!=-1){
+                        newarr.push(this.groupDatas[i]);
+                    }
+                }
+            }
+            this.currentPage=1;
+            this.groupDatas=newarr;
+        },
+        //获取列表
+        Grouplist(){
+            var url="/api/Groups/GetGroupList"
+            var that=this
+            that.fullscreenLoading = true;
+            this.$axios({
+                method: 'post',
+                url:url,
+                headers:{
+                    Authorization:'Bearer '+this.token
+                },
+                data:{
+                    portType: 1,
+                }
+            }).then(function(res){
+                if(res.data.code==200){
+                    that.groupData=res.data.data
+                    that.groupData.forEach(item=>{
+                        if(item.clientName==null){
+                            item.clientName = ''
+                        } 
+                        if(item.clientUnit==null){
+                            item.clientUnit = ''
+                        } 
+                        if(item.id==null){
+                            item.id = ''
+                        } 
+                        if(item.isSure==null){
+                            item.isSure = ''
+                        } 
+                        if(item.jietuanOperator==null){
+                            item.jietuanOperator = ''
+                        } 
+                        if(item.salesQuoteNo==null){
+                            item.salesQuoteNo = ''
+                        } 
+                        if(item.teamName==null){
+                            item.teamName = ''
+                        } 
+                        if(item.teamType==null){
+                            item.teamType = ''
+                        } 
+                        if(item.tourCode==null){
+                            item.tourCode = ''
+                        } 
+                        if(item.visitDate==null){
+                            item.visitDate = ''
+                        } 
+                        if(item.visitDays==null){
+                            item.visitDays = ''
+                        } 
+                        if(item.visitPNumber==null){
+                            item.visitPNumber = ''
+                        } 
+                    })
+                    that.groupDatas=that.groupData;
+                    console.log(that.groupData)
+                    that.fullscreenLoading = false;
+                }
+            })
+        },
+        //处理时间
+        filteryear(val){
+            let gstime=val.visitDate.split(' ')[0]
+            return gstime;
+        },
+        //筛选状态
+        filterStatus(val){
+            var newgroup=[];
+            if(this.input==""){
+                if(val=="0"||val==""){
+                    newgroup=this.groupData;
+                }else if(val=="1"){
+                    for(var j=0;j<this.groupData.length;j++){
+                        if(this.groupData[j].isSure==1){
+                            newgroup.push(this.groupData[j])
+                        }
+                    }
+                }else if(val=="2"){
+                    for(var j=0;j<this.groupData.length;j++){
+                        if(this.groupData[j].isSure==0){
+                            newgroup.push(this.groupData[j])
+                        }
+                    }
+                }
+                this.currentPage=1;
+                this.groupDatas=newgroup
+                this.groupDatass=newgroup 
+            }else{
+                if(val=="0"||val==""){
+                    newgroup=this.groupData
+                }else if(val=="1"){
+                    for(var j=0;j<this.groupData.length;j++){
+                        if(this.groupData[j].isSure==1){
+                            newgroup.push(this.groupData[j])
+                        }
+                    }
+                }else if(val=="2"){
+                    for(var j=0;j<this.groupData.length;j++){
+                        if(this.groupData[j].isSure==0){
+                            newgroup.push(this.groupData[j])
+                        }
+                    }
+                }
+                this.currentPage=1;
+                this.groupDatas=newgroup
+                this.groupDatass=newgroup 
+                this.Inquireclick()
+            }
+        },
+    },
+    mounted(){
+        this.token=JSON.parse(localStorage.getItem('userinif')).token;
+        this.userid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
+        this.Grouplist();
+    }
+}
+</script>
+<style>
+    .group-list{
+        background-color: #fff;
+        padding: 10px;
+        box-shadow: 0 0 5px #0005;
+        border-radius: 10px;
+    }
+    .group-title{
+        display: flex;
+        font-size: 17px;
+        font-weight:600 ;
+        color: #555;
+        margin-top: 8px;
+        margin-bottom: 2px;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .group-box{
+        display: flex;
+    }
+    .group-box>button{
+        margin-left: 10px;
+        padding: 8px 20px;
+    }
+    .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+        text-align: center;
+    }
+    .group-box>.el-input{
+        margin-left: 10px;
+    }
+</style>

src/components/Finance/FeesPage.vue

@@ -0,0 +1,278 @@
+<template>
+    <div class="fesspage-box">
+        <div class="fesspage-head">
+            <el-form :inline="true" :model="formInline" class="demo-form-inline">
+                <el-form-item>
+                    <el-select v-model="formInline.Status" @change="shStatus()" placeholder="审核状态">
+                        <el-option v-for="(item,index) in AuditStatus" :key="index" :label="item.title" :value="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="团队名称:">
+                    {{ formInline.name }}
+                </el-form-item>
+                <el-form-item label="客户:">
+                    {{ formInline.clientName }}
+                </el-form-item>
+                <el-form-item label="出访国家:">
+                    {{ formInline.CountriesVisited }}
+                </el-form-item>
+                <el-form-item label="起止日期:">
+                    {{ formInline.StartTime }}
+                </el-form-item>
+                <el-form-item label="天数/人数:">
+                    {{ formInline.Days }}天 / {{ formInline.Number }}人
+                </el-form-item>
+            </el-form>
+            <el-form :inline="true" :model="formInline" class="demo-form-inline">
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">通 过(多选)</el-button>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">拒 绝(多选)</el-button>
+                </el-form-item>
+                <el-form-item label="审核未通过原因:">
+                    <el-radio-group @change="onSubmit" v-model="formInline.resource">
+                        <el-radio label="1、成本太高"></el-radio>
+                        <el-radio label="2、金额填写错误 "></el-radio>
+                        <el-radio label="3、其他"></el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item v-show="causetrue">
+                    <el-input v-model="formInline.cause"></el-input>
+                  </el-form-item>
+            </el-form>
+        </div>
+        <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+            <el-tab-pane label="所有" name="-1"></el-tab-pane>
+            <el-tab-pane label="酒店预订" name="76"></el-tab-pane>
+            <el-tab-pane label="车导地接" name="79"></el-tab-pane>
+            <el-tab-pane label="签证" name="80"></el-tab-pane>
+            <el-tab-pane label="邀请公务" name="81"></el-tab-pane>
+            <el-tab-pane label="机票预订" name="85"></el-tab-pane>
+            <el-tab-pane label="团组增减款项" name="98"></el-tab-pane>
+        </el-tabs>
+        <div>
+            <el-table
+            ref="multipleTable"
+            border
+            :data="tableData"
+            tooltip-effect="dark"
+            style="width: 100%"
+            @selection-change="handleSelectionChange">
+                <el-table-column
+                type="selection"
+                width="40">
+                </el-table-column>
+                <el-table-column
+                prop="priceNameContent"
+                label="费用所属"
+                width="200">
+                    <template slot-scope="scope">
+                        <el-popover style="white-space: pre-wrap;" placement="top-start" width="100" trigger="click" :content="scope.row.priceMsgContent">
+                            <span slot="reference">{{ scope.row.priceNameContent}}</span>
+                        </el-popover>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                prop="priceName"
+                label="费用模块"
+                width="120">
+                </el-table-column>
+                <el-table-column
+                prop="busName"
+                label="Bus名称"
+                show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column
+                prop="waitPay"
+                label="应付款金额"
+                show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column
+                prop="currPay"
+                label="此次付款金额"
+                show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column
+                prop="balance"
+                label="剩余尾款"
+                show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column
+                prop="operatorName"
+                label="申请人"
+                width="100"
+                show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column
+                prop="auditOperatorName"
+                label="审核人"
+                width="100"
+                show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column
+                prop="overBudget"
+                label="超预算比例"
+                show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column
+                prop="address"
+                label="审核操作"
+                >
+                    <template slot-scope="scope">
+                        <el-button
+                        size="mini"
+                        @click="handleEdit(scope.$index, scope.row)">通 过</el-button>
+                        <el-button
+                        size="mini"
+                        type="danger"
+                        @click="handleDelete(scope.$index, scope.row)">拒 绝</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+    </div>
+</template>
+
+<script>
+import { co } from '@fullcalendar/core/internal-common';
+export default {
+    data() {
+        return {
+            activeName: '-1',
+            diid:'',
+            token:'',
+            causetrue:false,
+            formInline: {
+                Status: -1,
+                name: '甘孜州州长团赴瑞士、希腊、奥地利10日团',
+                clientName:'兰卡彬真',
+                // clientPhone:'15884061115',
+                CountriesVisited:'瑞士 希腊 奥地利',
+                StartTime:' 2023-08-20',
+                // EndTime:'2023-08-29',
+                Number:5,
+                Days:10,
+                resource:'',
+                cause:""
+            },
+            AuditStatus:[
+                {
+                    id:-1,
+                    title:'全部'
+                },
+                {
+                    id:0,
+                    title:'未审核'
+                },
+                {
+                    id:1,
+                    title:'审核通过'
+                },
+                {
+                    id:2,
+                    title:'审核不通过'
+                },
+            ],
+            tableData: [],
+            multipleSelection: []
+        }
+    },
+    methods: {
+        onSubmit() {
+            console.log(this.formInline.resource);
+            if(this.formInline.resource=='3、其他'){
+                this.causetrue=true;
+            }else{
+                this.causetrue=false;
+            }
+        },
+        getPostSearchGrpCreditCardPayment(){
+            var url="/api/Groups/PostSearchGrpCreditCardPayment"
+            var that=this
+            this.$axios({
+                method: 'post',
+                url:url,
+                headers:{
+                    Authorization:'Bearer '+that.token
+                },
+                data:{
+                    diId: 2270,
+                    label:that.activeName,
+                    auditStatus:that.formInline.Status
+                }
+            }).then(function(res){
+                console.log(res);
+                if(res.data.code==200){
+                    that.formInline.name=res.data.data.teamName;
+                    that.formInline.clientName=res.data.data.clientName;
+                    that.formInline.CountriesVisited=res.data.data.visitCountry;
+                    that.formInline.StartTime=res.data.data.visitDate;
+                    that.formInline.Days=res.data.data.visitDays;
+                    that.formInline.Number=res.data.data.visitPNumber;
+                    that.tableData=res.data.data.detailList;
+                }
+            })
+        },
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        },
+        handleClick(tab, event) {
+            this.activeName=tab.name;
+            this.getPostSearchGrpCreditCardPayment();
+        },
+        shStatus(){
+            this.getPostSearchGrpCreditCardPayment();
+        },
+        handleEdit(index, row) {
+            console.log(index, row);
+        },
+        handleDelete(index, row) {
+            console.log(index, row);
+        },
+        PostAuditGrpCreditCardPayment(){
+            var url="/api/Groups/PostAuditGrpCreditCardPayment"
+            var that=this
+            this.$axios({
+                method: 'post',
+                url:url,
+                headers:{
+                    Authorization:'Bearer '+that.token
+                },
+                data:{
+                    creditId: 2270,
+                    auditCode:that.activeName,
+                    user:that.formInline.Status
+                }
+            }).then(function(res){
+                console.log(res);
+                if(res.data.code==200){
+                    
+                }
+            })
+        },
+    },
+    mounted(){
+        this.diid=this.$route.query.id;
+        this.token=JSON.parse(localStorage.getItem('userinif')).token;
+        this.getPostSearchGrpCreditCardPayment();
+    }
+}
+</script>
+<style>
+    .fesspage-box{
+        background-color: #fff;
+        padding: 10px;
+        box-shadow: 0 0 5px #0005;
+        border-radius: 10px;
+    }
+    .fesspage-head .el-form-item__label{
+        font-weight: 600;
+    }
+    .fesspage-head .el-form--inline .el-form-item__content{
+        color: #606266;
+    }
+    .fesspage-head .el-form-item{
+        margin-bottom: 10px;
+    }
+</style>

src/components/MCR/MarketCustomerResourcesHome.vue

@@ -255,11 +255,14 @@ export default {
             this.pageloadData.client = this.inputDW;  //单位
             this.pageloadData.contact = this.inputLXR; //联系人
             this.pageloadData.userid = this.principalSel.toString(); //负责人
-            this.pageloadData.Range = this.territorySel;//省域
+            this.pageloadData.Range = this.territorySel == '' ? 0 : this.territorySel;//省域
+            this.pageloadData.Lvlid = this.clientLvSel == '' ? 0 : this.clientLvSel; //客户级别
+            this.pageloadData.Category = this.clientTypeSel == '' ? 0 : this.clientTypeSel;//客户类别
+            this.pageloadData.business = this.businessClassSel.toString();//业务分类
             this.pageload();
         },
         Edit(row) {
-            this.$router.push("/home/MCROper");
+            this.$router.push('/home/MCROper?id=' + row.id);
         },
         Del(row) {
             console.log(row.id);

src/components/MCR/MarketCustomerResourcesOperation.vue

@@ -1,7 +1,206 @@
 <template>
-    <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading">
-        <div class="operationMCR-Box">
+    <div class="operationMCR-Box">
+        <div class="operationMCR-topOper">
+            <el-button type="primary" @click="Getback">返回</el-button>
+            <el-button type="primary" @click="save">{{ BtnTitle }}</el-button>
+        </div>
+        <div>
+            <el-form ref="form" :model="requestData" label-width="110px">
+                <div>
+                    <el-row>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="客户级别:">
+                                    <el-select v-model="requestData.lvlid" placeholder="请选择活动区域">
+                                        <el-option v-for="item in level" :key="item.id" :label="item.name"
+                                            :value="item.id"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="客户类别:">
+                                    <el-select v-model="requestData.category" placeholder="请选择活动区域">
+                                        <el-option v-for="item in customerClass" :key="item.id" :label="item.name"
+                                            :value="item.id"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="权重:">
+                                    <el-select v-model="requestData.weight" placeholder="请选择活动区域">
+                                        <el-option label="A" value="393"></el-option>
+                                        <el-option label="B" value="392"></el-option>
+                                        <el-option label="C" value="391"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                    </el-row>
+                </div>
+                <div>
+                    <el-row>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="联系人">
+                                    <el-input v-model="requestData.contact"></el-input>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="性别">
+                                    <el-select v-model="requestData.gender" placeholder="请选择活动区域">
+                                        <el-option label="男" value="0"></el-option>
+                                        <el-option label="女" value="1"></el-option>
+                                        <el-option label="暂无" value="2"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="手机号">
+                                    <el-input v-model="requestData.telephone"></el-input>
+                                </el-form-item></div>
+                        </el-col>
+                    </el-row>
+                </div>
+                <div>
+                    <el-row>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="座机号:">
+                                    <el-input v-model="requestData.phone"></el-input>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="邮箱:">
+                                    <el-input v-model="requestData.email"></el-input>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="职务:">
+                                    <el-input v-model="requestData.job"></el-input>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                    </el-row>
+                </div>
+                <div>
+                    <el-row>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="单位名称:">
+                                    <el-input v-model="requestData.client"></el-input>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="单位名称缩写:">
+                                    <el-input v-model="requestData.clientshort"></el-input>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple"><el-form-item label="所在城市:">
+                                    <el-input v-model="requestData.location"></el-input>
+                                </el-form-item></div>
+                        </el-col>
+                    </el-row>
+                </div>
+                <div>
+                    <el-row>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="具体地址:">
+                                    <el-input v-model="requestData.address"></el-input>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="护照:">
+                                    <el-input v-model="requestData.passport"></el-input>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple"><el-form-item label="护照有效期:">
+                                    <el-input v-model="requestData.passportDate"></el-input>
+                                </el-form-item></div>
+                        </el-col>
+                    </el-row>
+                </div>
+                <div>
+                    <el-row>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="生日信息:">
+                                    <el-input v-model="requestData.birthday"></el-input>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="今年预计出团:">
+                                    <el-input v-model="requestData.predele"></el-input>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple"><el-form-item label="今年已出团:">
+                                    <el-input v-model="requestData.finlishedDele"></el-input>
+                                </el-form-item></div>
+                        </el-col>
+                    </el-row>
+                </div>
+                <div id="BiTian">
+                    <el-row>
+                        <el-col :span="12">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="负责人:">
+                                    <el-select v-model="usersSel" multiple placeholder="请选择">
+                                        <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="12">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="业务归属:">
+                                    <el-select v-model="serviceClassSel" multiple placeholder="请选择" width="300px">
+                                        <el-option v-for="item in serviceClass" :key="item.id" :label="item.name"
+                                            :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                    </el-row>
 
+                </div>
+                <div>
+                    <el-row>
+                        <el-col :span="24">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="备注:">
+                                    <el-input v-model="requestData.remark" type="textarea" :rows="5"></el-input>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                    </el-row>
+                </div>
+            </el-form>
         </div>
     </div>
 </template>
@@ -12,8 +211,116 @@
 export default {
     data() {
         return {
+            requestData: {
+                "status": 0,
+                "id": 0,
+                "number": 0, //number
+                "lvlid": 0, //地市州Id
+                "client": "", //客户单位
+                "weight": "", 
+                "clientshort": "",
+                "contact": "",
+                "gender": 0,
+                "passport": "",
+                "passportDate": "",
+                "job": "",
+                "telephone": "",
+                "phone": "",
+                "email": "",
+                "location": "",
+                "address": "",
+                "birthday": "",
+                "otherinfo": "",
+                "wechat": "",
+                "category": 0,
+                "predele": 0,
+                "finlishedDele": 0,
+                "createUserId": parseInt(JSON.parse(localStorage.getItem("userinif")).userInfo.userId),
+                "remark": ""
+            },
+            BtnTitle: '保存新增数据',
+            customerClass: [],//客户类别
+            level: [], //客户级别
+            clientTypeList: [],
+            serviceClass: [],//业务归属
+            users: [],//负责人
+            serviceClassSel: [],
+            usersSel: [],
+        }
+    },
+    methods: {
+        Getback() {
+            this.$router.push('/home/MCR');
+        },
+        QueryPageData() {
+            var that = this;
+            //初始化界面数据
+            this.$axios.post('/api/MarketCustomerResources/QuerySelectAndSingleData', { Id: this.requestData.id }, {
+                headers: {
+                    'Authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1laWRlbnRpZmllciI6IkZ1dHVyZSIsImV4cCI6MTY3OTU0MjgwNSwiaXNzIjoiT0FTeXN0ZW0uY29tIiwiYXVkIjoiT0FTeXN0ZW0uY29tIn0.iy5SUInq1p3yjZultRPyzCa2ekLeepSdMLxvPwXY6MI',
+                }
+            }).then(resp => {
+                console.log(resp);
+                if (resp.data.code == 200) {
+                    //下拉列表
+                    that.customerClass = resp.data.data.customerClass;//客户类别
+                    that.level = resp.data.data.level;//客户级别
+
+                    that.serviceClass = resp.data.data.serviceClass;//业务分类
+                    that.users = resp.data.data.users; //负责人
+
+                    if (resp.data.data.data != null) { //单条数据
+                        var obj = resp.data.data.data;
+                        that.requestData.lvlid = obj.lvlid;
+                        that.requestData.category = obj.category;
+                        that.requestData.weight = obj.weight;
+                        that.requestData.contact = obj.contact;
+                        that.requestData.gender = obj.gender.toString();
+                        that.requestData.telephone = obj.telephone;
+                        that.requestData.phone = obj.phone;
+                        that.requestData.email = obj.email;
+                        that.requestData.job = obj.job;
+                        that.requestData.client = obj.client;
+                        that.requestData.clientshort = obj.clientshort;
+                        that.requestData.location = obj.location;
+                        that.requestData.address = obj.address;
+                        that.requestData.passport = obj.passport;
+                        that.requestData.passportDate = obj.passportDate;
+                        that.requestData.birthday = obj.birthday;
+                        that.requestData.predele = obj.predele;
+                        that.requestData.finlishedDele = obj.finlishedDele;
+                        that.usersSel = obj.ascribedUser.map(x=>x.userId);
+                        that.serviceClassSel = obj.ascribedDepartment.map(x=>x.id);
+                        that.requestData.remark = obj.remark;
+                    }
+                }
+
+            })
+        },
+        save(){
+
+            if(this.requestData.id == 0){
+
+            }
+            
         }
     },
+    mounted() {
+        try {
+            this.requestData.id = parseInt(this.$route.query.id);
+        } catch (err) {
+            this.requestData.id = 0;
+            console.log('未获取id');
+        }
+
+        if (this.requestData.id == 0) {
+            this.BtnTitle = '保存新增数据';
+        } else {
+            this.BtnTitle = '保存修改数据';
+        }
+
+        this.QueryPageData();
+    }
 }
 </script>
 <style>
@@ -21,4 +328,21 @@ body {
     margin: 0;
     padding: 0;
 }
+
+.operationMCR-Box {
+    background-color: #fff;
+    padding: 30px 30px 20px 0px;
+    border-radius: 10px;
+}
+
+.operationMCR-topOper {
+    text-align: right;
+    padding: 0 10px 20px 0px;
+
+}
+
+#BiTian .el-select {
+    width: 400px;
+
+}
 </style>

src/main.js

@@ -10,8 +10,8 @@ import store from './store/index.js';
 import VueTypedJs from 'vue-typed-js'
 Vue.use(VueTypedJs)
 import axios from 'axios';
-//axios.defaults.baseURL = 'http://132.232.92.186:8888';
-axios.defaults.baseURL = 'http://localhost:5256/';
+axios.defaults.baseURL = 'http://132.232.92.186:8888';
+// axios.defaults.baseURL = 'http://localhost:5256/';
 import { Message } from "element-ui";
 Vue.prototype.$message = Message
 Vue.prototype.$axios = axios;

src/router/index.js

@@ -49,6 +49,8 @@ import GroupsTaskAssignment from '@/components/OP/GroupsTaskAssignment';
 import DailyFeePayment from '@/components/Finance/DailyFeePayment';
 import DailyFeeedit from '@/components/Finance/DailyFeeedit';
 import GPTindex from '@/components/GPT/GPTindex';
+import ExpenseReview from '@/components/Finance/ExpenseReview';
+import FeesPage from '@/components/Finance/FeesPage';
 import AirTicketAgent from '@/components/Resource/AirTicketAgent';
 import AirTicketRes from '@/components/OP/AirTicketRes';
 import OpAirTicketRes from '@/components/OP/OpAirTicketRes';
@@ -285,6 +287,16 @@ export default new Router({
           name: 'GPTindex',
           component: GPTindex
         },
+        {
+          path: '/home/ExpenseReview',
+          name: 'ExpenseReview',
+          component: ExpenseReview
+        },
+        {
+          path: '/home/FeesPage',
+          name: 'FeesPage',
+          component: FeesPage
+        },
         {
           path: '/home/AirTicketAgent',
           name: 'AirTicketAgent',