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

src/components/Finance/Overspend.vue

@@ -0,0 +1,162 @@
+<template>
+    <div>
+        <div class="overspend-all">
+            <div class="overspend-head">
+                <div class="head-ipt">
+                    <div class="name-ipt">
+                        <label>团组名称:</label>
+                        <el-select style="width:250px" @change="chkg" v-model="gname" filterable placeholder="请选择">
+                            <!-- <el-option
+                              v-for="item in restaurants"
+                              :key="item.id"
+                              :label="item.groupName"
+                              :value="item.id">
+                            </el-option> -->
+                          </el-select>
+                    </div>
+                    <div class="preserve-btn">
+                        <el-button class="preserve" type="primary">导出超支明细</el-button>
+                        <el-button class="preserve" type="primary">新增数据</el-button>
+                    </div>
+                </div>
+                <div class="overspend-info">
+                    <div class="overspend-info-li">
+                        <label>团 号：</label>
+                        <span>{{1}}</span>
+                    </div>
+                    <div class="overspend-info-li">
+                        <label>客 户：</label>
+                        <span>{{1}}</span>
+                    </div>
+                    <div class="overspend-info-li">
+                        <label>出访国家：</label>
+                        <span>{{1}}</span>
+                    </div>
+                    <div class="overspend-info-li">
+                        <label>起止日期：</label>
+                        <span>{{1}} ~ {{1}}</span>
+                    </div>
+                    <div class="overspend-info-li">
+                        <label>天数/人数：</label>
+                        <span>{{1}}天/{{1}}人</span>
+                    </div>
+                </div>
+            </div>
+            <div>
+                <el-table
+                    :data="tableData"
+                    border
+                    style="width: 100%">
+                    <el-table-column
+                    prop="date"
+                    label="序号"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="费用名称"
+                    width="180">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="费用类型"
+                    width="180">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="费用"
+                    width="180">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="附件"
+                    width="180">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="操作人"
+                    width="90">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="操作时间"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="是否审核"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="address"
+                    label="操作">
+                    </el-table-column>
+                </el-table>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+      return {
+        gname:'',
+        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 弄'
+        }]
+      }
+    }
+}
+</script>
+<style>
+.overspend-all{
+    background-color: #fff;
+    padding: 10px;
+    box-shadow: 0 0 5px #0005;
+    border-radius: 10px;
+    height: 100%;
+    min-height: 830px;
+}
+.overspend-info{
+    display: flex;
+}
+.overspend-info-li{
+    margin-right: 30px;
+}
+.overspend-info-li label{
+    color: #606266;
+    font-size: 15px;
+    font-weight: 600;
+}
+.overspend-info-li span{
+    color: #606266;
+    font-size: 14px;
+}
+.name-ipt label{
+    color: #606266;
+    font-size: 15px;
+    font-weight: 600;
+}
+.head-ipt{
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 10px;
+}
+.overspend-head{
+    margin-bottom: 10px;
+}
+</style>

src/components/Finance/Overspendedit.vue

@@ -0,0 +1,131 @@
+<template>
+    <div>
+        <div class="overspendedit-all">
+            <div class="overspendedit-form">
+                <el-form ref="form" :model="form" label-width="100px">
+                    <el-form-item label="团队名称">
+                        <el-select v-model="form.region" placeholder="请选择活动区域">
+                            <el-option label="区域一" value="shanghai"></el-option>
+                            <el-option label="区域二" value="beijing"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="团 号">
+                        <el-input v-model="form.name"></el-input>
+                    </el-form-item>
+                    <el-form-item label="客 户">
+                        <el-input v-model="form.name"></el-input>
+                    </el-form-item>
+                    <el-form-item label="出访国家">
+                        <el-input v-model="form.name"></el-input>
+                    </el-form-item>
+                    <el-form-item label="费用名称">
+                        <el-input v-model="form.name"></el-input>
+                    </el-form-item>
+                    <el-form-item label="费用金额">
+                        <div style="display: flex;justify-content: space-between;">
+                            <el-input style="width:60%" v-model="form.name"></el-input>
+                            <el-select  style="width:38%" v-model="form.region" placeholder="币种">
+                                <el-option label="区域一" value="shanghai"></el-option>
+                                <el-option label="区域二" value="beijing"></el-option>
+                            </el-select>
+                        </div>
+                    </el-form-item>
+                    <el-form-item label="收款方">
+                        <el-input v-model="form.name"></el-input>
+                    </el-form-item>
+                    <el-form-item label="团队名称">
+                        <el-select v-model="form.region" placeholder="请选择活动区域">
+                            <el-option label="区域一" value="shanghai"></el-option>
+                            <el-option label="区域二" value="beijing"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="费用标识">
+                        <el-select v-model="form.region" placeholder="请选择活动区域">
+                            <el-option label="区域一" value="shanghai"></el-option>
+                            <el-option label="区域二" value="beijing"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="支付方式">
+                        <el-select v-model="form.region" placeholder="请选择活动区域">
+                            <el-option label="区域一" value="shanghai"></el-option>
+                            <el-option label="区域二" value="beijing"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="卡类型:">
+                        <el-select v-model="form.region" placeholder="请选择活动区域">
+                            <el-option label="区域一" value="shanghai"></el-option>
+                            <el-option label="区域二" value="beijing"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="费用类型">
+                        <el-select v-model="form.region" placeholder="请选择活动区域">
+                            <el-option label="区域一" value="shanghai"></el-option>
+                            <el-option label="区域二" value="beijing"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="详细类型">
+                        <el-select v-model="form.region" placeholder="请选择活动区域">
+                            <el-option label="区域一" value="shanghai"></el-option>
+                            <el-option label="区域二" value="beijing"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="费用系数">
+                        <el-input v-model="form.name"></el-input>
+                    </el-form-item>
+                    <el-form-item style="width:100%" label="备注">
+                        <el-input type="textarea" :rows="5" v-model="form.desc"></el-input>
+                    </el-form-item>
+                    <el-form-item style="width:100%;text-align: right;">
+                        <el-button type="primary" @click="onSubmit">保 存</el-button>
+                        <el-button>返 回</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            form: {
+                name: '',
+                region: '',
+                date1: '',
+                date2: '',
+                delivery: false,
+                type: [],
+                resource: '',
+                desc: ''
+            }
+        }
+    },
+    methods: {
+        onSubmit() {
+            console.log('submit!');
+        }
+    }
+}
+</script>
+<style>
+.overspendedit-all{
+    background-color: #fff;
+    padding: 10px;
+    box-shadow: 0 0 5px #0005;
+    border-radius: 10px;
+    height: 100%;
+    min-height: 830px;
+}
+.overspendedit-form .el-form-item{
+    width:25%;
+    min-width:370px;
+}
+.overspendedit-form .el-form{
+    display: flex;
+    flex-wrap: wrap;
+    
+}
+.overspendedit-form .el-select{
+    width: 100%;
+}
+</style>.

src/components/OP/EntryDetails.vue

@@ -25,7 +25,7 @@
                           :value="item.id">
                         </el-option>
                       </el-select>
-                    <el-button type="primary">导出所选明细表</el-button>
+                    <el-button @click="eptschedule(1)" type="primary">导出所选明细表</el-button>
                     <el-select style="width:202px" v-model="tablevalue" placeholder="请选择">
                         <el-option
                           v-for="item in tablevalueoptions"
@@ -34,7 +34,8 @@
                           :value="item.id">
                         </el-option>
                       </el-select>
-                    <el-button type="primary">导出下拉所选表格</el-button>
+                    <el-button @click="eptschedule(2)" type="primary">导出下拉所选表格</el-button>
+                    <el-button @click="eptschedule(3)" type="primary">团组成员名单</el-button>
                 </div>
             </div>
             <div class="Entry-form">
@@ -1135,6 +1136,47 @@ export default {
         chengvalue(){
             this.fullscreenLoading=true;
             this.GetEnterExitCostInfobyDiId()
+        },
+        eptschedule(val){
+            var subTypeId=0
+            if(this.listvalue==""||this.tablevalue==""){
+                this.$message.error('请选择需要导出的表格');
+                return
+            }
+            if(val==1){
+                subTypeId=this.listvalue
+            }else if(val==2){
+                subTypeId=this.tablevalue
+            }else{
+                subTypeId=1
+            }
+            var url = "/api/Groups/PostEnterExitCostDownload"
+            var that = this
+            var data={
+                    portType: 1,
+                    diId: that.value,
+                    exportType: val,
+                    subTypeId:subTypeId
+                }
+            console.log(JSON.stringify(data))
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data:{
+                    portType: 1,
+                    diId: that.value,
+                    exportType: val,
+                    subTypeId:subTypeId
+                }
+            }).then(function (res) {
+                console.log(res)
+                if(res.data.code==200){
+                    // window.open(res.data.data.url)
+                }
+            })
         }
     },
     filters: {
@@ -1229,7 +1271,8 @@ export default {
             },
             immediate: true,
             deep: true // 可以深度检测到 person 对象的属性值的变化
-        }
+        },
+        
     },
     mounted(){
         this.userId=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;

src/router/index.js

@@ -100,6 +100,8 @@ import MyTasksinif from '@/components/system/MyTasksinif';
 import test from '@/components/child/test';
 import Statistically from '@/components/statistics/Statistically';
 import RvsReport from '@/components/Finance/RvsReport';
+import Overspend from '@/components/Finance/Overspend';
+import Overspendedit from '@/components/Finance/Overspendedit';
 
 
 
@@ -619,6 +621,17 @@ export default new Router({
           name: 'RvsReport',
           component: RvsReport
         },
+        {
+          path: '/home/Overspend',
+          name: 'Overspend',
+          component: Overspend
+        },
+        ,
+        {
+          path: '/home/Overspendedit',
+          name: 'Overspendedit',
+          component: Overspendedit
+        },
       ]
     },
     {