liuhj месяцев назад: 8
Родитель
Сommit
0eef4f0484

+ 29 - 2
src/components/OP/CarTouristGuideGrounContent.vue

@@ -137,6 +137,34 @@
                         </span>
                     </template>
                 </el-table-column>
+                <el-table-column width="70" label="会务活动费">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.officialActivitiesFee) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column width="70" label="公务翻译费">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.officialTransFee) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column width="70" label="邀请函费用">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.invitationFee) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column width="70" label="会务费">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.activitiesFee) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
                 <el-table-column width="70" label="饮料零食水果">
                     <template slot-scope="scope">
                         <span style="white-space: pre-wrap;text-align: center;">
@@ -421,9 +449,8 @@ export default {
                 if (res.data.code == 200) {
                     that.budgeting = res.data.data.modulePromptInfos[0].data;
                     that.bizhong = res.data.data.modulePromptInfos[0].currencyCode;
-                    //console.log(that.budgeting)
                 } else {
-                    // that.$message.error(res.data.msg);
+                    that.$message.error(res.data.msg);
                 }
             })
         },

+ 79 - 4
src/components/OP/OpInvitationOfficialActivities.vue

@@ -1,9 +1,43 @@
 <template>
     <div class="car_add">
-        <div>
+        <div class="haed-yqgw">
             <div class="communal-title">
                 <div>{{ title }}</div>
             </div>
+            <el-popover placement="right" trigger="hover">
+                <el-table height="700" :data="budgeting" border>
+                    <el-table-column width="100" property="date" label="日期"></el-table-column>
+                    <el-table-column width="120" label="会务活动费">
+                        <template slot-scope="scope">
+                            <span>
+                                {{ townum(scope.row.officialActivitiesFee)+'  '+ bizhong }}
+                            </span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column width="120" label="公务翻译费">
+                        <template slot-scope="scope">
+                            <span>
+                                {{ townum(scope.row.officialTransFee)+'  '+ bizhong }}
+                            </span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column width="120" label="邀请函费用">
+                        <template slot-scope="scope">
+                            <span>
+                                {{ townum(scope.row.invitationFee) +'  '+ bizhong }}
+                            </span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column width="120" label="会务费">
+                        <template slot-scope="scope">
+                            <span>
+                                {{ townum(scope.row.activitiesFee)+'  ' + bizhong }}
+                            </span>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-button type="primary" class="oprompt" slot="reference">移上提示成本</el-button>
+            </el-popover>
         </div>
         <hr style='background-color:#5555; height:1px; border:none;' />
         <div>
@@ -467,9 +501,19 @@ export default {
 
             },
             rateList: [],
+            budgeting:[],
+            bizhong:'',
         }
     },
     methods: {
+        //保留两位小数
+        townum(val) {
+            if (val == 0.00) {
+                return '--'
+            } else {
+                return val.toFixed(2)
+            }
+        },
         //卡类型切换
         cardhandoff(val){
             console.log(val)
@@ -518,6 +562,32 @@ export default {
                 }
             })
         },
+        //获取成本提示
+        getcostbudgeting() {
+            this.budgeting = [];
+            this.bizhong = '';
+            var url = "/api/Groups/PostGroupCostModulePrompt"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    userId: that.userId,
+                    diId: that.DiIdSelect ? that.DiIdSelect : that.DiId,
+                    cTable: 79,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.budgeting = res.data.data.modulePromptInfos[0].data;
+                    that.bizhong = res.data.data.modulePromptInfos[0].currencyCode;
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
         //团组下拉框
         AirTicketResSelect() {
             var url = "/api/Groups/DecreasePaymentsSelect"
@@ -880,20 +950,21 @@ export default {
                 },
                 data: {
                     "portType": 1,
-                    "diId": this.DiIdSelect ? this.DiIdSelect : this.DiId,
+                    "diId": that.DiIdSelect ? that.DiIdSelect : that.DiId,
                     "cTable": 81 //商邀
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
                     //汇率
-                    console.log("汇率--", res.data.data);
+                    // console.log("汇率--", res.data.data);
                     that.rateList = res.data.data.teamRates;
-                    console.log(that.rateList[0].currencyId)
+                    // console.log(that.rateList[0].currencyId)
                     // that.InvitationOfficialActivities.inviteCurrency=that.rateList[0].currencyId;
                     // that.InvitationOfficialActivities.eventsCurrency=that.rateList[0].currencyId;
                     // that.InvitationOfficialActivities.translateCurrency=that.rateList[0].currencyId;
                     // that.InvitationOfficialActivities.sendCurrency=that.rateList[0].currencyId;
                     // that.InvitationOfficialActivities.paymentCurrency=that.rateList[0].currencyId;
+                    that.getcostbudgeting()
                 }
             })
         },
@@ -959,6 +1030,10 @@ export default {
     min-height: 810px;
     
 }
+.haed-yqgw{
+    display: flex;
+    justify-content: space-between;
+}
 
 .ExpressPirce .el-input input {
     text-align: left;

+ 8 - 1
src/components/statistics/Reportstbale.vue

@@ -1036,6 +1036,12 @@
 </template>
 <script>
 export default {
+    beforeRouteLeave(to, from, next) {
+        if(to.name!='Groupreports'){
+            localStorage.removeItem('tzbbval');
+        }
+        next()
+    },
     data () {
         return {
             groupInfo:{},
@@ -1113,7 +1119,8 @@ export default {
                     portType:1,
                     userId: that.userid,
                     pageId: that.pageId,
-                    diId: that.diid
+                    diId: that.diid,
+                    isAudit:true
                 }
             }).then(function (res) {
                 console.log(res)

+ 1 - 1
src/components/statistics/Statistically.vue

@@ -12,8 +12,8 @@
             </div>
             <div class="canvas-box">
                 <div id="statisticallyone" style="width: 100%;height:400px;"></div>
-                <div id="grossmargin" style="width: 100%;height:400px;"></div>
                 <div id="grossmargins" style="width: 100%;height:400px;"></div>
+                <div id="grossmargin" style="width: 100%;height:400px;"></div>
                 <!-- <div id="grossmarginss" style="width: 50%;height:400px;"></div> -->
             </div>
         </div>

+ 290 - 0
src/components/statistics/TellerStatement.vue

@@ -0,0 +1,290 @@
+<template>
+    <div v-loading="fullscreenLoading">
+        <div class="reports-list">
+            <div class="reports-title">
+                <div>团组列表</div>
+                <div class="reports-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;"
+
+                    placeholder="请输入查询内容"
+                    v-model="input"
+                    clearable>
+                    </el-input>
+                    <el-button 
+                    type="primary"
+                    size=""
+                    title="查看费用清单"
+                    @click="Inquireclick()">查 询</el-button>
+                </div>
+            </div>
+            <template>
+                <el-table
+                :data="groupDatas"
+                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
+                        width="100" 
+                        prop="isSure"
+                        :formatter="zhuangtai"
+                        label="团组状态">
+                    </el-table-column>
+                    <el-table-column
+                        prop="tourCode"
+                        width="100"
+                        label="团 号">
+                    </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="teamType"
+                        label="团组类型"
+                        width="90">
+                    </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
+                        prop="lastCollectionTime"
+                        :formatter="filteryear"
+                        label="收款时间"
+                        width="110">
+                    </el-table-column>
+                    <el-table-column label="操作">
+                        <template slot-scope="scope">
+                          <el-button Inquireclick
+                            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="count">
+                </el-pagination>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+
+export default {
+    beforeRouteLeave(to, from, next) {
+        if(to.name!='TellerStatementTB'){
+            localStorage.removeItem('tzbbval');
+        }
+        next()
+    },
+    data() {
+        return {
+            pageId:0,
+            options: [
+                {
+                    value: '-1',
+                    label: '全部'
+                }, {
+                    value: '1',
+                    label: '已完成'
+                }, {
+                    value: '0',
+                    label: '未完成'
+                }
+            ],
+            value: '-1',
+            groupDatas:[],
+            groupData: [],
+            groupDatass:[],
+            currentPage: 1, // 当前页码
+            pageSize: 10 ,// 每页的数据条数
+            count:0,//总数
+            input:'',
+            token:'',
+            fullscreenLoading:false,
+            userid:''
+        }
+    },
+    methods:{
+        //分页api
+        PostGroupPageList(){
+            var url = "/api/Statistics/PostGroupStatementItems"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    portType: 1,
+                    pageId:that.pageId,
+                    userId:that.userid,
+                    pageIndex: that.currentPage,
+                    pageSize: that.pageSize,
+                    isSure: that.value,
+                    searchCriteria: that.input,
+                }
+            }).then(function (res) {
+                console.log(res)
+                if (res.data.code == 200) {
+                    that.groupDatas=res.data.data.data
+                    that.count=res.data.count
+                }
+                console.log(that.count)
+            })
+        },
+         //每页条数改变时触发 选择一页显示多少行
+         handleSizeChange(val) {
+            this.currentPage = 1;
+            this.pageSize = val;
+            this.PostGroupPageList();
+        },
+        //当前页改变时触发 跳转其他页
+        handleCurrentChange(val) {
+            this.currentPage = val;
+            this.PostGroupPageList();
+        },
+        //查看费用申请
+        handleView(index, row) {
+            var tzbbval={
+                currentPage:this.currentPage,
+                value:this.value,
+                input:this.input,
+            }
+            localStorage.setItem('tzbbval', JSON.stringify(tzbbval));
+            this.$router.push({path: '/home/TellerStatementTB?id=' + row.id +''});
+        },
+        //模糊查询
+        Inquireclick(){
+            this.currentPage=1;
+            this.PostGroupPageList()
+        },
+        //处理时间
+        filteryear(val){
+            let gstime=val.visitDate.split(' ')[0]
+            return gstime;
+        },
+        zhuangtai(val){
+            if(val.isSure==0){
+                return '未完成'
+            }
+            if(val.isSure==1){
+                return '已完成'
+            }
+        },
+        //筛选状态
+        filterStatus(){
+            this.currentPage=1;
+            this.PostGroupPageList();
+        },
+    },
+    created(){
+        if(JSON.parse(localStorage.getItem('tzbbval'))){
+            this.currentPage=JSON.parse(localStorage.getItem('tzbbval')).currentPage;
+            this.value=JSON.parse(localStorage.getItem('tzbbval')).value;
+            this.input=JSON.parse(localStorage.getItem('tzbbval')).input;
+        }
+    },
+    mounted(){
+        this.token=JSON.parse(localStorage.getItem('userinif')).token;
+        this.pageId=Number(localStorage.getItem('indexs').split('-')[1]);//页面id
+        this.userid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
+        this.PostGroupPageList();
+    }
+}
+</script>
+<style>
+    .reports-list{
+        background-color: #fff;
+        padding: 10px;
+        box-shadow: 0 0 5px #0005;
+        border-radius: 10px;
+        min-height: 840px;
+    }
+    .reports-list .block{
+        margin-top: 10px;
+    }
+    .reports-title{
+        display: flex;
+        font-size: 17px;
+        font-weight:600 ;
+        color: #555;
+        margin-top: 8px;
+        margin-bottom: 2px;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 10px;
+    }
+    .reports-box{
+        display: flex;
+    }
+    .reports-box>button{
+        margin-left: 10px;
+        padding: 8px 20px;
+    }
+    .reports-list .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+        text-align: center;
+    }
+    .reports-box>.el-input{
+        margin-left: 10px;
+    }
+</style>

Разница между файлами не показана из-за своего большого размера
+ 1107 - 0
src/components/statistics/TellerStatementTB.vue


+ 13 - 0
src/router/index.js

@@ -117,6 +117,8 @@ import DownloadOpitinerary from '@/components/MCR/DownloadOpitinerary';
 import AssociatedInvitees from '@/components/MCR/AssociatedInvitees';
 import VisitSchedule from '@/components/Resource/VisitSchedule'
 import billUploading from '@/components/Finance/billUploading';
+import TellerStatement from '@/components/statistics/TellerStatement';
+import TellerStatementTB from '@/components/statistics/TellerStatementTB';
 
 Vue.use(Router)
 
@@ -708,6 +710,17 @@ export default new Router({
           name: 'paymentstatement',
           component: paymentstatement
         },
+        {
+          path: '/home/TellerStatement',
+          name: 'TellerStatement',
+          component: TellerStatement
+        },
+        ,
+        {
+          path: '/home/TellerStatementTB',
+          name: 'TellerStatementTB',
+          component: TellerStatementTB
+        },
       ]
     },
     {