06151052lhj酒店模块修改完毕

src/components/ConferenceModule/Supplierinfo.vue

@@ -0,0 +1,186 @@
+<template>
+    <div class="supplierinfo-all">
+        <div class="supplierinfo-screen">
+            <div class="supplierinfo-screen-ul">
+                <div class="supplierinfo-screen-li">
+                    <div class="supplierinfoscreen-li-title">供应商类型:&nbsp;</div>
+                    <el-select size="small" v-model="value" filterable placeholder="请选择">
+                        <el-option
+                          v-for="item in options"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </el-option>
+                      </el-select>
+                </div>
+                <div class="supplierinfo-screen-li">
+                    <div class="supplierinfoscreen-li-title">供应商名称:&nbsp;</div>
+                    <el-input size="small" v-model="value" placeholder="请输入内容"></el-input>
+                </div>
+                <div class="supplierinfo-screen-li">
+                    <div class="supplierinfoscreen-li-title">供应商单位:&nbsp;</div>
+                    <el-input size="small" v-model="value" placeholder="请输入内容"></el-input>
+                </div>
+                <div class="supplierinfo-screen-li">
+                    <div class="supplierinfoscreen-li-title">供应商电话:&nbsp;</div>
+                    <el-input size="small" v-model="value" placeholder="请输入内容"></el-input>
+                </div>
+                <el-button size="small" type="primary">查询</el-button>
+            </div>
+            <el-button size="small" type="primary">新增数据</el-button>
+        </div>
+        <div class="supplierinfo-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 {
+            options: [{
+            value: '选项1',
+            label: '黄金糕'
+            }, {
+            value: '选项2',
+            label: '双皮奶'
+            }, {
+            value: '选项3',
+            label: '蚵仔煎'
+            }, {
+            value: '选项4',
+            label: '龙须面'
+            }, {
+            value: '选项5',
+            label: '北京烤鸭'
+            }],
+            value: '',
+            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 弄'
+            }],
+            currentPage4: 4
+        }
+    },
+    methods:{
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`);
+        },
+        handleCurrentChange(val) {
+            console.log(`当前页: ${val}`);
+        },
+        testfun(){
+            var kvArray = [["key1", "value1"], ["key2", "value2"]];
+            // Map 构造函数可以将一个 二维 键值对数组转换成一个 Map 对象
+            var myMap = new Map(kvArray);
+            console.log(myMap)
+            // 使用 Array.from 函数可以将一个 Map 对象转换成一个二维键值对数组
+            var outArray = Array.from(myMap);
+            console.log(outArray)
+            var first = new Map([[1, 'one'], [2, 'two'], [3, 'three'],]);
+            var second = new Map([[1, 'uno'], [2, 'dos']]);
+            
+            // 合并两个 Map 对象时，如果有重复的键值，则后面的会覆盖前面的，对应值即 uno，dos， three
+            var merged = new Map([...first, ...second]);
+            console.log(merged);
+
+            let mySet = new Set();
+            // mySet.add(1); // Set(1) {1}
+            // mySet.add(5); // Set(2) {1, 5}
+            // mySet.add(5); // Set(2) {1, 5} 这里体现了值的唯一性
+            // mySet.add("some text"); 
+            // Set(3) {1, 5, "some text"} 这里体现了类型的多样性
+            var o = {a: 1, b: 2}; 
+            mySet.add(o);
+            // mySet.add({a: 1, b: 2}); 
+            console.log(mySet);
+        }
+    },
+    mounted(){
+        this.testfun()
+    }
+}
+</script>
+<style>
+.supplierinfo-all {
+    background-color: #fff;
+    padding: 10px;
+    box-shadow: 0 0 5px #0005;
+    border-radius: 10px;
+    height: 100%;
+    min-height: 840px;
+}
+.supplierinfo-screen{
+    display: flex;
+    justify-content: space-between;
+}
+.supplierinfo-screen-ul{
+    display: flex;
+}
+.supplierinfo-screen-li{
+    width: 280px;
+    display: flex;
+    align-items: center;
+}
+.supplierinfoscreen-li-title{
+    width: 80px;
+    text-align: end;
+    font-size: 14px;
+    color: #555;
+}
+.supplierinfo-screen-li .el-input{
+    width: 184px;
+}
+.supplierinfo-screen-li .el-select{
+    width: 184px;
+}
+.supplierinfo-table{
+    margin-top: 15px;
+}
+.supplierinfo-table .block{
+    margin-top: 20px;
+    text-align: center;
+}
+</style>

src/components/Finance/PaymentFiled.vue

@@ -102,7 +102,7 @@
                                     <span>
                                         {{ data.cnySubTotalAmount!=undefined?'  、 CNY  '+twonumder(data.cnySubTotalAmount=data.paymentAmount*data.payRate)+'&nbsp;&nbsp;&nbsp;汇率：':'' }}
                                     </span>
-                                    <el-input-number v-if="data.payRate!=undefined" style="width:100px" @blur="inputblur(data.id,data.payRate)" :precision="4" placeholder="公务翻译费" v-model="data.payRate" :controls='false'>
+                                    <el-input-number v-if="data.payRate!=undefined" style="width:100px" @blur="inputblur(data.id,data.payRate,data.hotelSubId)" :precision="4" placeholder="公务翻译费" v-model="data.payRate" :controls='false'>
                                     </el-input-number>
                                 </span>
                             </el-tree>
@@ -297,8 +297,26 @@ export default {
         },
         //勾选
         handleSelectionChange(data,node) {
-            this.defaultarr=this.filt(node.checkedKeys);
-            console.log(this.arrstring(this.defaultarr));
+            // var arrid=[]
+            // for(let i=0;i<node.checkedKeys.length;i++){
+            //     if(Number(node.checkedKeys[i].split('p')[1])==Number(node.checkedKeys[i].split('p')[1])){
+            //         arrid.push(Number(node.checkedKeys[i].split('p')[1]));
+            //     }
+            // }
+            
+            // for(let j=0;j<this.groupstableData.length;j++){
+            //     for(let s=0;s<this.groupstableData[j].childList.length;s++){
+            //         for(let x=0;x<arrid.length;x++){
+            //             if(arrid[x]==Number(this.groupstableData[j].childList[s].id.split("p")[1])){
+            //                 console.log(this.groupstableData[j].childList[s].id);
+            //                 this.defaultarr.push(this.groupstableData[j].childList[s].id)
+            //             }
+            //         }
+            //     }
+            // }
+            // arrid=Array.from(new Set(arrid))
+            this.defaultarr=node.checkedKeys
+            // console.log(this.arrstring(this.defaultarr));
         },
         //日付勾选
         everydayChange(data,node){
@@ -356,9 +374,8 @@ export default {
             // this.PostPayRequest_Center('2023-01-01','2024-03-25',1);
         },
         //汇率更改
-        inputblur(id,raet){
-            console.log(id,raet)
-            this.PostPayRequestRateChange(id,raet)
+        inputblur(id,raet,hotelSubId){
+            this.PostPayRequestRateChange(id,raet,hotelSubId)
         },
         //获取付款申请list
         PostPayRequest_Center(beginDt,endDt,status){
@@ -389,13 +406,17 @@ export default {
                     that.tzprivateTransfer=res.data.data.group.sz;
                     that.groupstableData=res.data.data.group.dataList;
                     if(that.groupstableData!=null){
+                        var arrid=[]
                         for(let i=0;i<that.groupstableData.length;i++){
                             for(let j=0;j<that.groupstableData[i].childList.length;j++){
+                                that.groupstableData[i].childList[j].id=j+'p'+that.groupstableData[i].childList[j].id
+                                arrid.push(that.groupstableData[i].childList[j].id)
                                 if(that.groupstableData[i].childList[j].isChecked==true){
                                     that.defaultarr.push(that.groupstableData[i].childList[j].id)
                                 }
                             }
                         }
+                        console.log(that.defaultarr);
                     }
                     that.everydayData=res.data.data.daily.dataList;
                     if(that.everydayData!=null){
@@ -417,6 +438,16 @@ export default {
         },
         //保存勾选
         PostPayRequestCheckedChange(type){
+            var arrid=[]
+            for(let i=0;i<this.defaultarr.length;i++){
+                if(typeof this.defaultarr[i]!== 'number'){
+                    if(Number(this.defaultarr[i].split('p')[1])==Number(this.defaultarr[i].split('p')[1])){
+                        arrid.push(Number(this.defaultarr[i].split('p')[1]));
+                    }
+                }
+            }
+            arrid=Array.from(new Set(arrid))
+            this.defaultarr=this.filt(arrid);
             var url = "/api/Financial/PostPayRequestCheckedChange"
             var that = this
             this.$axios({
@@ -452,7 +483,7 @@ export default {
             })
         },
         //修改汇率
-        PostPayRequestRateChange(id,rate){
+        PostPayRequestRateChange(id,rate,hotelSubId){
             var url = "/api/Financial/PostPayRequestRateChange"
             var that = this
             this.$axios({
@@ -468,7 +499,8 @@ export default {
                     status:1,
                     beginDt:that.getdate(that.value2[0]),
                     endDt:that.getdate(that.value2[1]),
-                    id:id,
+                    id:Number(id.split('p')[1]),
+                    hotelSubId:hotelSubId,
                     rate:rate
                 }
             }).then(function (res) {

src/components/OP/OpDecreasePayments.vue

@@ -504,7 +504,7 @@ export default {
                                         });
                                         that.loading = true;
                                         setTimeout(() => {
-                                            that.fullscreenLoading=false;
+                                             that.fullscreenLoading=false;
                                             that.$router.push('/home/DecreasePayments')
                                         }, 1000);
                                     } else {

src/components/statistics/Reportstbale.vue

@@ -302,27 +302,27 @@
                         label="酒店预订费用">
                             <el-table-column
                             prop="city"
-                            label="城市"
-                            width="100">
+                            label="城市">
                             </el-table-column>
                             <el-table-column
                             prop="hotelName"
-                            label="酒店名称"
-                            width="100">
+                            label="酒店名称">
                             </el-table-column>
                             <el-table-column
                             prop="checkInDate"
-                            label="入住时间">
+                            label="入住时间"
+                            width="78">
                             </el-table-column>
                             <el-table-column
                             prop="checkOutDate"
-                            label="退房时间">
+                            label="退房时间"
+                            width="78">
                             </el-table-column>
-                            <el-table-column
+                            <!-- <el-table-column
                             prop="paymentCurrency"
                             label="币种"
                             width="40">
-                            </el-table-column>
+                            </el-table-column> -->
                             <el-table-column label="费用">
                                 <el-table-column
                                     label="单间">
@@ -345,6 +345,9 @@
                                     prop="doubleRoomPrice"
                                     label="单价"
                                     width="60">
+                                    <template slot-scope="scope">
+                                        {{ scope.row.doubleRoomPrice.toFixed(2)}}
+                                    </template>
                                     </el-table-column>
                                     <el-table-column
                                     prop="doubleRoomCount"
@@ -358,6 +361,9 @@
                                     prop="suiteRoomPrice"
                                     label="单价"
                                     width="60">
+                                    <template slot-scope="scope">
+                                        {{ scope.row.suiteRoomPrice.toFixed(2)}}
+                                    </template>
                                     </el-table-column>
                                     <el-table-column
                                     prop="suiteRoomCount"
@@ -371,6 +377,9 @@
                                     prop="otherRoomPrice"
                                     label="单价"
                                     width="60">
+                                    <template slot-scope="scope">
+                                        {{ scope.row.otherRoomPrice.toFixed(2)}}
+                                    </template>
                                     </el-table-column>
                                     <el-table-column
                                     prop="otherRoomCount"
@@ -381,67 +390,99 @@
                                 <el-table-column
                                     label="金额计算">
                                     <el-table-column
+                                    label="总房费"
+                                    width="100">
+                                        <template slot-scope="scope">
+                                            <el-popover
+                                            placement="top"
+                                            trigger="hover">
+                                                <div v-html="scope.row.roomInfoTips"></div>
+                                                <span slot="reference">{{ scope.row.roomPrice.toFixed(2)+' '+scope.row.roomPriceCurrency}}</span>
+                                            </el-popover>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column
                                     label="早餐"
-                                    width="85">
+                                    width="100">
                                         <template slot-scope="scope">
-                                            {{ scope.row.breakfastPrice.toFixed(2)+' '+scope.row.breakfastCurrency}}
+                                            <el-popover
+                                            placement="top"
+                                            trigger="hover">
+                                                <div v-html="scope.row.breakfastInfoTips"></div>
+                                                <span slot="reference">{{ scope.row.breakfastPrice.toFixed(2)+' '+scope.row.breakfastCurrency}}</span>
+                                            </el-popover>
                                         </template>
                                     </el-table-column>
                                     <el-table-column
                                     prop="governmentRent"
                                     label="地税"
-                                    width="85">
+                                    width="100">
                                         <template slot-scope="scope">
-                                            {{ scope.row.governmentRent.toFixed(2)+' '+scope.row.governmentRentCurrency}}
+                                            <el-popover
+                                            placement="top"
+                                            trigger="hover">
+                                                <div v-html="scope.row.governmentRentTips"></div>
+                                                <span slot="reference">{{ scope.row.governmentRent.toFixed(2)+' '+scope.row.governmentRentCurrency}}</span>
+                                            </el-popover>
                                         </template>
                                     </el-table-column>
                                     <el-table-column
                                     prop="cityTax"
                                     label="城市税"
-                                    width="85">
+                                    width="100">
                                         <template slot-scope="scope">
-                                            {{ scope.row.cityTax.toFixed(2)+' '+scope.row.cityTaxCurrency}}
+                                            <el-popover
+                                            placement="top"
+                                            trigger="hover">
+                                                <div v-html="scope.row.cityTaxTips"></div>
+                                                <span slot="reference">{{ scope.row.cityTax.toFixed(2)+' '+scope.row.cityTaxCurrency}}</span>
+                                            </el-popover>
+                                            
                                         </template>
                                     </el-table-column>
-                                    <el-table-column
-                                    prop="payMoney"
+                                    <!-- <el-table-column
                                     label="信用卡金额">
-                                    </el-table-column>
+                                        <template slot-scope="scope">
+                                            {{ scope.row.roomPrice.toFixed(2)+' '+scope.row.roomPriceCurrency}}
+                                        </template>
+                                    </el-table-column> -->
                                 </el-table-column>
                                 <el-table-column label="人民币">
                                     <el-table-column
-                                    prop="cnyPrice"
                                     label="总金额">
+                                        <template slot-scope="scope">
+                                            {{ scope.row.payMoney.toFixed(2)+' '+scope.row.paymentCurrency}}
+                                        </template>
                                     </el-table-column>
-                                    <el-table-column
+                                    <!-- <el-table-column
                                     prop="currencyRateStr"
                                     label="当时汇率">
-                                    </el-table-column>
-                                    <el-table-column
+                                    </el-table-column> -->
+                                    <!-- <el-table-column
                                     prop="payee"
                                     label="收款方"
                                     width="70">
-                                    </el-table-column>
-                                    <el-table-column
+                                    </el-table-column> -->
+                                    <!-- <el-table-column
                                     label="费用标识"
                                     width="40">
                                         <template slot-scope="scope">
                                             {{ scope.row.OrbitalPrivateTransfer==-1?'未选择':scope.row.OrbitalPrivateTransfer==0?'公转':'私转' }}
                                         </template>
-                                    </el-table-column>
-                                    <el-table-column
+                                    </el-table-column> -->
+                                    <!-- <el-table-column
                                     prop="payWay"
                                     label="支付方式"
                                     width="40">
-                                    </el-table-column>
-                                    <el-table-column
+                                    </el-table-column> -->
+                                    <!-- <el-table-column
                                     prop="cardType"
                                     label="卡类型"
                                     width="50">
                                         <template slot-scope="scope">
                                             {{ scope.row.cardType=='其他'?'—':scope.row.cardType==''?'—':scope.row.cardType }}
                                         </template>
-                                    </el-table-column>
+                                    </el-table-column> -->
                                     <el-table-column
                                     label="状态"
                                     width="50">

src/main.js

@@ -26,7 +26,7 @@ Vue.prototype.$cookie = cookie;  //配置时候prototype.$这里的名字自己
 
 Vue.use(VueTypedJs)
 import axios from 'axios';
-axios.defaults.baseURL = 'http://132.232.92.186:8888';
+axios.defaults.baseURL = 'http://132.232.92.186:8080';
 //axios.defaults.baseURL = 'http://localhost:5256/';
 import { Message } from "element-ui";
 

src/router/index.js

@@ -108,6 +108,7 @@ import visaAgencyfee from '@/components/OP/visaAgencyfee'
 import Hotelenquiry from '@/components/OP/Hotelenquiry'
 import Marketingamount from '@/components/MCR/Marketingamount';
 import downloadpage from '@/components/OP/downloadpage';
+import Supplierinfo from '@/components/ConferenceModule/Supplierinfo';
 
 Vue.use(Router)
 
@@ -665,6 +666,11 @@ export default new Router({
           name: 'downloadpage',
           component: downloadpage
         },
+        {
+          path: '/home/Supplierinfo',
+          name: 'Supplierinfo',
+          component: Supplierinfo
+        },
       ]
     },
     {