0402-lhj17:43

src/components/Finance/Overspend.vue

@@ -12,7 +12,7 @@
                         </el-select>
                     </div>
                     <div class="preserve-btn">
-                        <el-button class="preserve" type="primary">导出超支明细</el-button>
+                        <el-button class="preserve" @click="PostGroupExtraCost_OutputExcel" type="primary">导出超支明细</el-button>
                         <el-button class="preserve" @click="addlist()" type="primary">新增数据</el-button>
                     </div>
                 </div>
@@ -254,6 +254,32 @@ export default {
             
             // rows.splice(index, 1);
         },
+        //生成
+        PostGroupExtraCost_OutputExcel(){
+            var url = "/api/Financial/PostGroupExtraCost_OutputExcel"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data:{
+                    portType: 1,
+                    diId:this.diId
+                }
+            }).then(function (res) {
+                console.log(res)
+                if(res.data.code==200){
+                   window.open(res.data.data.url)
+                }else{
+                    that.$message({
+                        message:res.data.msg ,
+                        type: 'warning',
+                    });
+                }
+            })
+        },
         //超支费用api
         PostGroupExtraCost_Operator(id){
             var url = "/api/Financial/PostGroupExtraCost_Operator"

src/components/OP/CarTouristGuideGrounContent.vue

@@ -1,10 +1,62 @@
 <template>
-    <div class="car_add">
+    <div class="car_add opcar_add">
         <div>
             <div class="communal-title">
                 <div>OP费用填写明细</div>
             </div>
         </div>
+        <el-popover placement="right" trigger="hover">
+            <el-table :data="budgeting" border>
+                <el-table-column width="100" property="date" label="日期"></el-table-column>
+                <el-table-column width="100" label="车费用">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.carFee)+' '+bizhong  }}
+                    </template>
+                </el-table-column>
+                <el-table-column width="100" label="导游费用">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.guideFee)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+                <el-table-column width="100" label="餐食费">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.mealFee)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+                <el-table-column width="100" label="门票费">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.ticketFee)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+                <el-table-column width="100" label="小费">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.tipFee)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+                <el-table-column width="110" label="饮料零食水果">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.drinksSnacksFruitFee)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+                <el-table-column width="100" label="出行物资">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.travelSupplies)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+                <el-table-column property="carType" width="100" label="车型"></el-table-column>
+                <el-table-column width="100" label="领队费">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.leadersFee)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+                <el-table-column width="100" label="零用金">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.spentCash)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-button type="primary" class="oprompt" slot="reference">移上提示成本</el-button>
+        </el-popover>
         <el-skeleton :rows="28" animated :loading="loading">
             <div style="display: flex;justify-content: space-between;">
                 <div style="width: 80%;display: flex;">
@@ -190,6 +242,7 @@
 export default {
     data() {
         return {
+            bizhong:'',
             startPickerOptions: {
             },
             pageId: '',
@@ -237,9 +290,41 @@ export default {
             checkList: [],
             sourceList: [],
             ListCount: 1,
+            budgeting:[]
         }
     },
     methods: {
+        //保留两位小数
+        townum(val){
+            return val.toFixed(2)
+        },
+        //获取成本提示
+        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.diId,
+                    cTable:that.cTable,
+                }
+            }).then(function (res) {
+                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);
+                }
+            })
+        },
         //初始化下拉框
         initializeSelect() {
             //团组下拉框绑定
@@ -319,6 +404,7 @@ export default {
                 if (res.data.code == 200) {
                     that.cTable = res.data.data.cTable
                     that.PostGroupTeamRateByDiIdAndCTableId();
+                    that.getcostbudgeting();
                 }
             })
         },
@@ -585,4 +671,13 @@ export default {
     width: 120px;
     margin: 10px 10px;
 }
+.opcar_add{
+    position: relative;
+}
+.oprompt{
+    position: fixed;
+    top: 150px;
+    right: 70px;
+    z-index: 99999;
+}
 </style>

src/components/OP/HotelReservations.vue

@@ -84,10 +84,20 @@
             <div class="hotelr-form">
                 <div class="form-head">
                     <el-popover placement="right" trigger="hover">
-                        <el-table :data="gridData" border>
-                            <el-table-column width="150" property="date" label="日期"></el-table-column>
-                            <el-table-column width="100" property="name" label="姓名"></el-table-column>
-                            <el-table-column width="300" property="address" label="地址"></el-table-column>
+                        <div>币种：{{bizhong}}&nbsp;&nbsp;&nbsp;汇率：{{fournum(huilv)}}</div>
+                        <el-table :data="budgeting" border>
+                            <el-table-column width="50" property="day" label="天数"></el-table-column>
+                            <el-table-column width="100" property="date" label="日期"></el-table-column>
+                            <el-table-column width="300" property="accon" label="酒店名称"></el-table-column>
+                            <el-table-column width="300" property="itin" label="行程描述"></el-table-column>
+                            <el-table-column width="110" property="sgr" label="单人间(SGR)"></el-table-column>
+                            <el-table-column width="100" property="tbr" label="双人(TBR)"></el-table-column>
+                            <el-table-column width="100" property="jS_ES" label="套间(JS_ES)"></el-table-column>
+                            <el-table-column width="100" label="价格">
+                                <template slot-scope="scope">
+                                    {{ townum(scope.row.suite) }}
+                                </template>
+                            </el-table-column>
                         </el-table>
                         <el-button slot="reference">移上提示每天详细房价</el-button>
                     </el-popover>
@@ -627,10 +637,47 @@ export default {
                     { required: true, message: '请输入备注', trigger: ['blur', 'change'] }
                 ],
             },
-
+            budgeting:[],
+            bizhong:'',
+            huilv:0,
         }
     },
     methods: {
+        //保留两位小数
+        townum(val){
+            return val.toFixed(2)
+        },
+        //保留4位小数
+        fournum(val){
+            return val.toFixed(4)
+        },
+        //获取成本提示
+        getcostbudgeting(){
+            this.budgeting=[];
+            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.OpHotelReservationsData.diId,
+                    cTable:that.cTable,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.budgeting=res.data.data.modulePromptInfos[0].data;
+                    that.bizhong=res.data.data.modulePromptInfos[0].currencyCode;
+                    that.huilv=res.data.data.modulePromptInfos[0].rate;
+                    console.log(that.budgeting)
+                } else {
+                    // that.$message.error(res.data.msg);
+                }
+            })
+        },
         //每页条数改变时触发 选择一页显示多少行
         handleSizeChange(val) {
             this.currentPage = 1;
@@ -658,7 +705,8 @@ export default {
                 console.log(res)
                 if (res.data.code == 200) {
                     that.cTable=res.data.data.cTable;
-                    that.PostGroupListByCTableAndUserId()
+                    that.PostGroupListByCTableAndUserId();
+                    that.getcostbudgeting()
                 }else{
                     that.$message({
                         message:"获取cTable失败",
@@ -1396,7 +1444,8 @@ export default {
         delegationSelectChange() {
             this.delegationInfo=[];
             this.PostGroupListByCTableAndUserId();
-            this.AddToggle()
+            this.AddToggle();
+            this.getcostbudgeting();
         },