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

src/components/OP/CarTouristGuideGrounContent.vue

@@ -41,7 +41,7 @@
             <hr style='background-color:#5555; height:1px; border:none;' />
             <div>
                 <template>
-                    <el-table :data="ContenList" border style="width: 100%">
+                    <el-table :data="ContentList" border style="width: 100%">
                         <el-table-column prop="num" label="序 号" width="55">
                             <template slot-scope="scope">
                                 {{ scope.$index + 1 }}
@@ -53,7 +53,7 @@
                                 <span style="display: none;">{{ scope.row.sId }}</span>{{ scope.row.sIdName }}
                             </template>
                         </el-table-column>
-                        <el-table-column label="金额币种">
+                        <el-table-column label="金额/币种" width="400">
                             <template slot-scope="scope">
                                 <el-input placeholder="请输入金额" v-model="scope.row.price" clearable style="width:180px;"
                                     @change="PriceChange" />
@@ -71,11 +71,11 @@
                                     v-model="scope.row.priceContent"></el-input>
                             </template>
                         </el-table-column>
-                        <el-table-column label="备注">
+                        <!-- <el-table-column label="备注">
                             <template slot-scope="scope">
                                 <el-input type="textarea" :rows="1" placeholder="备注" v-model="scope.row.remark"></el-input>
                             </template>
-                        </el-table-column>
+                        </el-table-column> -->
                     </el-table>
                     <hr style='background-color:#5555; height:1px; border:none;' />
                     <el-form :model="OPContenData" ref="OPContenData" :rules="OPContenDataRules" label-width="100px"
@@ -83,15 +83,15 @@
                         <div style="display: flex;">
 
                             <div style="width: 25%;">
-                                <el-form-item label="此次付款百分百:" prop="payPercentage" label-width="160px">
-                                    <el-input placeholder="此次付款百分百" v-model="OPContenData.payPercentage">
+                                <el-form-item label="此次付款百分比:" prop="payPercentage" label-width="160px">
+                                    <el-input placeholder="此次付款百分比" v-model="OPContenData.payPercentage">
                                         <template slot="append">%</template>
                                     </el-input>
                                 </el-form-item>
                             </div>
                             <div style="width: 25%;">
                                 <el-form-item label="收款方:" prop="payee" label-width="160px">
-                                    <el-input placeholder="联系电话" v-model="OPContenData.payee">
+                                    <el-input placeholder="收款方" v-model="OPContenData.payee">
                                     </el-input>
                                 </el-form-item>
                             </div>
@@ -166,7 +166,7 @@ export default {
             tableInitialization: [],
             payment: [],
             IsAuditGM: 0,
-            ContenList: [],
+            ContentList: [],
             OPContenData: {
                 diId: '',
                 cTGGRId: '',
@@ -175,12 +175,12 @@ export default {
                 payee: '',
                 payDId: '',
                 currency: '',
-                OPContenList: [],
+                OPContentList: [],
                 CreateUserId: 0
             },
             OPContenDataRules: {
                 payPercentage: [
-                    { required: true, message: '请输入付款百分百', trigger: ['blur', 'change'] },
+                    { required: true, message: '请输入付款百分比', trigger: ['blur', 'change'] },
                 ],
                 orbitalPrivateTransfer: [
                     { required: true, message: '请选择费用标识', trigger: ['blur', 'change'] },
@@ -218,7 +218,7 @@ export default {
         //初始化下拉框
         initializeSelect() {
             //团组下拉框绑定
-            var url = "/api/Groups/CarTouristGuideGroundContenInitialize"
+            var url = "/api/Groups/CarTouristGuideGroundContentInitialize"
             var that = this
             this.$axios({
                 method: 'post',
@@ -245,13 +245,13 @@ export default {
                     debugger
                     that.tableInitialization = res.data.data.tableInitialization;
                     that.tableInitialization.forEach(function (item) {
-                        that.ContenList.push({
+                        that.ContentList.push({
                             id: 0,
                             sId: item.id,
                             sIdName: item.name,
                             price: '0.00',
                             priceContent: '',
-                            remark: '',
+                            //remark: '',
                         })
                     });
                     that.payment = res.data.data.payment;
@@ -262,7 +262,7 @@ export default {
 
         },
         OpCarTouristGuideGroundContenById() {
-            var url = "/api/Groups/OpCarTouristGuideGroundContenById"
+            var url = "/api/Groups/OpCarTouristGuideGroundContentById"
             var that = this
             this.$axios({
                 method: 'post',
@@ -284,15 +284,15 @@ export default {
                         that.OPContenData.payPercentage = CreditCardPayment.payPercentage
                         that.countCost = CreditCardPayment.payMoney
                     }
-                    var CarTouristsConten = res.data.data.carTouristsConten;
-                    if (CarTouristsConten.length != 0) {
-                        CarTouristsConten.forEach(function (item) {
-                            that.ContenList.forEach(function (item1) {
+                    var CarTouristsContent = res.data.data.carTouristsContent;
+                    if (CarTouristsContent.length != 0) {
+                        CarTouristsContent.forEach(function (item) {
+                            that.ContentList.forEach(function (item1) {
                                 if (item.sId == item1.sId) {
                                     item1.id = item.id
                                     item1.price = item.price
                                     item1.priceContent = item.priceContent
-                                    item1.remark = item.remark
+                                    //item1.remark = item.remark
                                 }
 
                             })
@@ -322,17 +322,17 @@ export default {
                             that.OPContenData.cTGGRId = that.id
                             that.OPContenData.currency = that.currency
                             that.OPContenData.CreateUserId = that.userId
-                            that.ContenList.forEach(function (item) {
-                                that.OPContenData.OPContenList.push({
+                            that.ContentList.forEach(function (item) {
+                                that.OPContenData.OPContentList.push({
                                     id: item.id,
                                     sId: item.sId,
                                     price: item.price,
                                     priceContent: item.priceContent,
-                                    remark: item.remark,
+                                    //remark: item.remark,
                                 })
                             })
 
-                            var url = "/api/Groups/OpCarTouristGuideGroundConten"
+                            var url = "/api/Groups/OpCarTouristGuideGroundContent"
                             that.$axios({
                                 method: 'post',
                                 url: url,
@@ -368,7 +368,7 @@ export default {
         },
         PriceChange() {
             var countCost = 0;
-            this.ContenList.forEach(function (item) {
+            this.ContentList.forEach(function (item) {
                 if (item.price != '') {
                     countCost += parseFloat(item.price)
                 }

src/components/OP/HotelReservations.vue

@@ -0,0 +1,672 @@
+<template>
+    <div>
+        <div class="hotelr-all">
+            <div class="hotelr-head">
+                <div class="hotelr-head-li">
+                    <label>团组名称:</label>
+                    <el-select @change="delegationSelectChange" v-model="OpHotelReservationsData.diid" clearable filterable
+                        placeholder="请选择">
+                        <el-option v-for="item in delegationInfoList" :key="item.id" :label="item.teamName"
+                            :value="item.id">
+                        </el-option>
+                    </el-select>
+                </div>
+                <div class="hotelr-info">
+                    <div class="hotelr-info-li">
+                        <label>团 号：</label>
+                        <span>{{ delegationInfo.tourCode }}</span>
+                    </div>
+                    <div class="hotelr-info-li">
+                        <label>客 户：</label>
+                        <span>{{ delegationInfo.clientName }}</span>
+                    </div>
+                    <div class="hotelr-info-li">
+                        <label>出访国家：</label>
+                        <span>{{ delegationInfo.visitCountry }}</span>
+                    </div>
+                    <div class="hotelr-info-li">
+                        <label>起止日期：</label>
+                        <span>{{ delegationInfo.visitDate }}</span>
+                    </div>
+                    <div class="hotelr-info-li">
+                        <label>天数/人数：</label>
+                        <span>{{ delegationInfo.visitDays }}/{{ delegationInfo.visitPNumber }}</span>
+                    </div>
+                </div>
+            </div>
+            <div class="hotelr-table">
+                <el-table :data="tableDatas.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border
+                    style="width: 100%" v-loading="loading" element-loading-text="拼命加载中...">
+                    <el-table-column type="index" label="序号" width="50">
+                    </el-table-column>
+                    <el-table-column prop="reservationsNo" label="预定号" width="180">
+                    </el-table-column>
+                    <el-table-column prop="hotelName" label="酒店名称" width="180">
+                    </el-table-column>
+                    <el-table-column prop="checkInDate" label="入住日期" width="120">
+                    </el-table-column>
+                    <el-table-column prop="checkOutDate" label="退房日期" width="120">
+                    </el-table-column>
+                    <el-table-column prop="payMoney" label="付款金额" width="180">
+                        <template slot-scope="scope">
+                            {{ scope.row.payMoney }}({{ scope.row.paymentCurrency }})
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="createUserName" label="操作人" width="120">
+                    </el-table-column>
+                    <el-table-column prop="createTime" label="操作时间" width="180">
+                    </el-table-column>
+                    <el-table-column prop="attachment" label="附 件" width="80">
+                        <template>
+                            <i>下载附件</i>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="isAuditGMStr" label="是否审核" width="100">
+                    </el-table-column>
+                    <el-table-column prop="name" label="操 作" width="140">
+                        <template slot-scope="scope">
+                            <el-button-group>
+                                <el-button type="primary" size="mini" icon="el-icon-edit"
+                                    @click="upDate(scope.$index, scope.row)"></el-button>
+                                <el-button type="danger" size="mini" icon="el-icon-delete"
+                                    @click="del(scope.$index, scope.row)"></el-button>
+                            </el-button-group>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="address" label="VOUCHER">
+                        <i>生成</i>
+                    </el-table-column>
+                </el-table>
+                <div class="block">
+                    <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                        :current-page="currentPage" :page-sizes="[3, 5, 7, 9]" :page-size="pageSize"
+                        layout="total, sizes, prev, pager, next" :total="tableDatas.length">
+                    </el-pagination>
+                </div>
+            </div>
+            <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>
+                        </el-table>
+                        <el-button slot="reference">移上提示每天详细房价</el-button>
+                    </el-popover>
+                    <div class="form-head-btn">
+                        <el-button type="primary">确认单</el-button>
+                        <el-button type="primary">预订成本</el-button>
+                        <el-button type="primary">新增切换</el-button>
+                        <el-button type="primary">保存设置</el-button>
+                    </div>
+                </div>
+                <div class="form-foundationone select-bz">
+                    <el-form :model="OpHotelReservationsData" :rules="rules" ref="OpHotelReservationsData"
+                        label-width="110px" class="demo-OpHotelReservationsData">
+                        <div style="display: flex;flex-wrap: wrap;">
+                            <el-form-item style="width:350px ;" label="客人类型" prop="gTId">
+                                <el-select size="medium" v-model="OpHotelReservationsData.gTId" placeholder="请选择客人类型">
+                                    <el-option v-for="item in guestType" :key="item.id" :label="item.name" :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="计算费用币种" prop="region">
+                                <el-select size="medium" v-model="OpHotelReservationsData.budgetCurrency"
+                                    placeholder="请选择币种">
+                                    <el-option v-for="item in currencyList" :key="item.id" :label="item.name"
+                                        :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="当前币种团组汇率" label-width="150px">
+                                <span>7.52</span>
+                            </el-form-item>
+                        </div>
+                        <div style="display: flex;flex-wrap: wrap;">
+                            <el-form-item style="width:350px ;" label="入住卷号码" prop="checkNumber">
+                                <el-input size="medium" type="text"
+                                    v-model="OpHotelReservationsData.checkNumber"></el-input>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="预订网站" prop="reservationsWebsite">
+                                <el-select size="medium" v-model="OpHotelReservationsData.reservationsWebsite"
+                                    placeholder="预订网站">
+                                    <el-option v-for="item in bookingWebsite" :key="item.id" :label="item.name"
+                                        :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="酒店确定号码" prop="determineNo">
+                                <el-input size="medium" type="text"
+                                    v-model="OpHotelReservationsData.determineNo"></el-input>
+                            </el-form-item>
+                        </div>
+                        <div style="display: flex;flex-wrap: wrap;">
+                            <el-form-item style="width:100% ;" label="预订号码" prop="reservationsNo">
+                                <el-input :rows="1" type="textarea"
+                                    v-model="OpHotelReservationsData.reservationsNo"></el-input>
+
+                            </el-form-item>
+                        </div>
+                        <div style="display: flex;flex-wrap: wrap;">
+                            <el-form-item style="width:350px ;" label="所在城市" prop="city">
+                                <el-input size="medium" type="text" v-model="OpHotelReservationsData.city"></el-input>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="酒店名称" prop="hotelName">
+                                <el-input size="medium" type="text" v-model="OpHotelReservationsData.hotelName"></el-input>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="酒店电话" prop="hotelTel">
+                                <el-input size="medium" type="text" v-model="OpHotelReservationsData.hotelTel"></el-input>
+                            </el-form-item>
+                        </div>
+                        <el-form-item label="酒店地址" prop="hotelAddress">
+                            <el-input :rows="1" type="textarea" v-model="OpHotelReservationsData.hotelAddress"></el-input>
+                        </el-form-item>
+                        <el-form-item label="客人姓名" prop="guestName">
+                            <el-input :rows="1" type="textarea" v-model="OpHotelReservationsData.guestName"></el-input>
+                        </el-form-item>
+                        <div class="remcss" style="display: flex;flex-wrap: wrap;">
+                            <el-form-item prop="checkInDate" style="width:350px ;" label="入住时间" required>
+                                <el-date-picker size="medium" type="date" placeholder="选择日期"
+                                    v-model="OpHotelReservationsData.checkInDate" style="width: 100%;"></el-date-picker>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="离店时间" prop="checkOutDate">
+                                <el-date-picker size="medium" type="date" placeholder="选择时间"
+                                    v-model="OpHotelReservationsData.checkOutDate" style="width: 100%;"></el-date-picker>
+                            </el-form-item>
+                        </div>
+                        <div style="display: flex;flex-wrap: wrap;">
+                            <el-form-item style="width:350px ;" label="酒店单间" prop="predictSingleRoom">
+                                <el-input-number style="width:100px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.predictSingleRoom"></el-input-number>
+                                <span>间</span>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="酒店双间" prop="predictDoubleRoom">
+                                <el-input-number style="width:100px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.predictDoubleRoom"></el-input-number>
+                                <span>间</span>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="酒店套房" prop="predictSuiteRoom">
+                                <el-input-number style="width:100px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.predictSuiteRoom"></el-input-number>
+                                <span>间</span>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="其他房型" prop="predictOtherRoom">
+                                <el-input-number style="width:100px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.predictOtherRoom"></el-input-number>
+                                <span>间</span>
+                            </el-form-item>
+                        </div>
+                    </el-form>
+                </div>
+                <div class="form-foundationone">
+                    <el-form :model="OpHotelReservationsData" :rules="rules" ref="OpHotelReservationsData"
+                        label-width="100px" class="demo-OpHotelReservationsData">
+                        <div style="display: flex;flex-wrap: wrap;">
+                            <el-form-item style="width:25% ;" label="酒店单间" prop="singleRoomCount">
+                                <el-input-number style="width:50px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.singleRoomCount"></el-input-number>
+                                <span>间</span>
+                                <el-input-number style="width:80px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.singleRoomPrice"></el-input-number>
+                                <span>单价</span>
+                                <el-select size="medium" v-model="OpHotelReservationsData.budgetCurrency"
+                                    style="width: 80px;" :disabled="true" placeholder="">
+                                    <el-option v-for="item in currencyList" :key="item.id" :label="item.name"
+                                        :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item style="width:25% ;" label="酒店双间" prop="desc">
+                                <el-input-number style="width:50px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.doubleRoomCount"></el-input-number>
+                                <span>间</span>
+                                <el-input-number style="width:80px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.doubleRoomPrice"></el-input-number>
+                                <span>单价</span>
+                                <el-select size="medium" v-model="OpHotelReservationsData.budgetCurrency"
+                                    style="width: 80px;" :disabled="true" placeholder="">
+                                    <el-option v-for="item in currencyList" :key="item.id" :label="item.name"
+                                        :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item style="width:25% ;" label="酒店套房" prop="suiteRoomCount">
+                                <el-input-number style="width:50px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.suiteRoomCount"></el-input-number>
+                                <span>间</span>
+                                <el-input-number style="width:80px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.suiteRoomPrice"></el-input-number>
+                                <span>单价</span>
+                                <el-select size="medium" v-model="OpHotelReservationsData.budgetCurrency"
+                                    style="width: 80px;" :disabled="true" placeholder="">
+                                    <el-option v-for="item in currencyList" :key="item.id" :label="item.name"
+                                        :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item style="width:25% ;" label="其他房型" prop="otherRoomCount">
+                                <el-input-number style="width:50px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.otherRoomCount"></el-input-number>
+                                <span>间</span>
+                                <el-input-number style="width:80px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.fangnum"></el-input-number>
+                                <span>单价</span>
+                                <el-select size="medium" v-model="OpHotelReservationsData.otherRoomPrice"
+                                    style="width: 80px;" :disabled="true" placeholder="">
+                                    <el-option v-for="item in currencyList" :key="item.id" :label="item.name"
+                                        :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </div>
+                        <div style="display: flex;flex-wrap: wrap;">
+                            <el-form-item label-width="100px" style="width:350px ;" label="信用卡金额" prop="cardPrice">
+                                <el-input size="medium" type="text" v-model="OpHotelReservationsData.cardPrice"></el-input>
+                            </el-form-item>
+                            <el-form-item label-width="10px" prop="cTDId">
+                                <el-select size="medium" v-model="OpHotelReservationsData.cTDId" placeholder="请选择信用卡">
+                                    <el-option v-for="item in bankCard" :key="item.id" :label="item.name" :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="地税" prop="governmentRent">
+                                <el-input-number :precision="2" style="width:100px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.governmentRent"></el-input-number>
+                                <el-select style="width:100px ;" size="medium"
+                                    v-model="OpHotelReservationsData.governmentRentCurrency" placeholder="请选择">
+                                    <el-option v-for="item in currencyList" :key="item.id" :label="item.name"
+                                        :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="城市税" prop="cityTax">
+                                <el-input-number :precision="2" style="width:100px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.fangnum"></el-input-number>
+                                <el-select style="width:100px ;" size="medium" v-model="OpHotelReservationsData.cityTax"
+                                    placeholder="请选择">
+                                    <el-option v-for="item in currencyList" :key="item.id" :label="item.name"
+                                        :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </div>
+                        <div style="display: flex;flex-wrap: wrap;">
+                            <el-form-item label-width="100px" style="width:350px ;" label="入住类型" prop="checkType">
+                                <el-select style="width: 100%;" size="medium" v-model="OpHotelReservationsData.checkType"
+                                    placeholder="请选择入住人类型">
+                                    <el-option v-for="item in CheckType" :key="item.value" :label="item.name"
+                                        :value="item.value">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </div>
+                        <el-form-item label="房间说明" prop="roomExplanation">
+                            <el-input :rows="1" type="textarea"
+                                v-model="OpHotelReservationsData.roomExplanation"></el-input>
+                        </el-form-item>
+                        <el-form-item label="附件" prop="attachment">
+                            <input type="file" />
+                        </el-form-item>
+                        <el-form-item label="备注" prop="remark">
+                            <el-input :rows="3" type="textarea" v-model="OpHotelReservationsData.remark"></el-input>
+                        </el-form-item>
+                    </el-form>
+                </div>
+                <div class="form-foundationone">
+                    <div>付款信息</div>
+                    <el-form :model="OpHotelReservationsData" :rules="rules" ref="OpHotelReservationsData"
+                        label-width="100px" class="demo-OpHotelReservationsData">
+                        <div style="display: flex;flex-wrap: wrap;">
+                            <el-form-item style="width:350px ;" label="支付方式" prop="payDId">
+                                <el-select style="width: 100%;" size="medium" v-model="OpHotelReservationsData.payDId"
+                                    placeholder="请选择支付方式">
+                                    <el-option v-for="item in payment" :key="item.id" :label="item.name" :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="消费方式" prop="consumptionPatterns">
+                                <el-input size="medium" type="text"
+                                    v-model="OpHotelReservationsData.consumptionPatterns"></el-input>
+                            </el-form-item>
+                            <el-form-item prop="consumptionDate" style="width:350px ;" label="消费日期" required>
+                                <el-date-picker size="medium" type="date" placeholder="选择日期"
+                                    v-model="OpHotelReservationsData.consumptionDate" style="width: 100%;"></el-date-picker>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="付款金额" prop="cardPrices">
+                                <el-input-number :precision="2" style="width:100px ;" size="medium" :controls="false"
+                                    v-model="OpHotelReservationsData.cardPrice"></el-input-number>
+                                <el-select style="width:100px ;" size="medium"
+                                    v-model="OpHotelReservationsData.budgetCurrency" placeholder="请选择">
+                                    <el-option v-for="item in currencyList" :key="item.id" :label="item.name"
+                                        :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </div>
+                        <div style="display: flex;flex-wrap: wrap;">
+                            <el-form-item style="width:350px ;" label="卡类型" prop="cTDId">
+                                <el-select style="width: 100%;" size="medium" v-model="OpHotelReservationsData.cTDId"
+                                    placeholder="请选择卡类型">
+                                    <el-option v-for="item in bankCard" :key="item.id" :label="item.name" :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="银行卡号" prop="bankNo">
+                                <el-input size="medium" type="text" v-model="OpHotelReservationsData.bankNo"></el-input>
+                            </el-form-item>
+                            <el-form-item prop="cardholderName" style="width:350px ;" label="持卡人姓名" required>
+                                <el-input size="medium" type="text"
+                                    v-model="OpHotelReservationsData.cardholderName"></el-input>
+                            </el-form-item>
+                        </div>
+                        <div style="display: flex;flex-wrap: wrap;">
+                            <el-form-item style="width:350px ;" label="收款方" prop="payee">
+                                <el-input size="medium" type="text" v-model="OpHotelReservationsData.payee"></el-input>
+                            </el-form-item>
+                            <el-form-item style="width:350px ;" label="费用标识" prop="orbitalPrivateTransfer">
+                                <el-select style="width: 100%;" size="medium"
+                                    v-model="OpHotelReservationsData.orbitalPrivateTransfer" placeholder="请选择费用标识">
+                                    <el-option label="公转" :value="0"></el-option>
+                                    <el-option label="私转" :value="1"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </div>
+                        <el-form-item label="备注" prop="desc">
+                            <el-input :rows="3" type="textarea" v-model="OpHotelReservationsData.desc"></el-input>
+                        </el-form-item>
+                    </el-form>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            tableData: [],
+            tableDatas: [],
+            currentPage: 1, // 当前页码
+            pageSize: 5,// 每页的数据条数
+            gridData: [],
+            loading: false,
+            delegationInfoList: [],
+            delegationInfo: {},
+            guestType: [],//客人类型
+            currencyList: [],//币种下拉框
+            bankCard: [],//卡类型下拉框
+            payment: [],//支付方式下拉框
+            bookingWebsite: [],//预订网站
+            CheckType: [
+                {
+                    name: '客人房',
+                    value: '',
+                },
+                {
+                    name: '司机房',
+                    value: 'D',
+                },
+                {
+                    name: '导游房',
+                    value: 'G',
+                },
+                {
+                    name: '司机导游房',
+                    value: 'D&G',
+                },
+            ],
+            OpHotelReservationsData: {
+                status: 0,
+                id: 0,
+                diId: 0,
+                gtId: 0,
+                checkNumber: '',
+                reservationsWebsite: 0,
+                reservationsNo: '',
+                determineNo: '',
+                city: '',
+                hotelName: '',
+                hotelAddress: '',
+                hotelTel: '',
+                guestName: '',
+                checkInDate: '',
+                checkOutDate: '',
+                budget: 0,
+                budgetCurrency: '',
+                singleRoomCount: 0,
+                singleRoomPrice: 0,
+                doubleRoomCount: 0,
+                doubleRoomPrice: 0,
+                suiteRoomCount: 0,
+                suiteRoomPrice: 0,
+                otherRoomCount: 0,
+                otherRoomPrice: 0,
+                roomExplanation: '',
+                attachment: '',
+                cardPrice: 0,
+                isCardPrice: 0,
+                predictSingleRoom: 0,
+                predictDoubleRoom: 0,
+                predictSuiteRoom: 0,
+                predictOtherRoom: 0,
+                governmentRent: 0,
+                governmentRentCurrency: 0,
+                cityTax: 0,
+                cityTaxCurrency: 0,
+                checkType: '',
+                myProperty: 0,
+                createUserId: 0,
+                remark: '',
+                payDId: '',
+                consumptionPatterns: '',
+                consumptionDate: '',
+                ctdId: 0,
+                companyBankNo: '',
+                otherBankName: '',
+                otherSideNo: '',
+                otherSideName: '',
+                bankNo: '',
+                cardholderName: '',
+                payee: '',
+                orbitalPrivateTransfer: 0,
+                cRemark: ''
+            },
+            rules: {
+                checkInDate: [
+                    { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+                ],
+            },
+        }
+    },
+    methods: {
+        //每页条数改变时触发 选择一页显示多少行
+        handleSizeChange(val) {
+            this.currentPage = 1;
+            this.pageSize = val;
+        },
+        //当前页改变时触发 跳转其他页
+        handleCurrentChange(val) {
+            this.currentPage = val;
+        },
+        HotelReservationsInitialize() {
+            var url = "/api/Groups/HotelReservationsInitialize"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    UserId: that.userId,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    debugger
+                    that.guestType = res.data.data.guestType//客人类型
+                    that.currencyList = res.data.data.currencyList//币种下拉框
+                    that.bankCard = res.data.data.bankCard//卡类型下拉框
+                    that.payment = res.data.data.payment//支付方式下拉框
+                    that.bookingWebsite = res.data.data.bookingWebsite//预订网站
+
+                    that.delegationInfoList = res.data.data.delegations;
+                    that.OpHotelReservationsData.diid = that.$route.query.diId
+                    if (that.OpHotelReservationsData.diid == undefined) {
+                        that.delegationInfo = that.delegationInfoList[0]
+                        that.OpHotelReservationsData.diid = that.delegationInfoList[0].id;
+                        that.VisitDate = that.dateFormat(that.delegationInfo.visitStartDate) + '至' + that.dateFormat(that.delegationInfo.visitEndDate);
+                    } else {
+                        for (let index = 0; index < that.delegationInfoList.length; index++) {
+                            debugger
+                            if (that.delegationInfoList[index].id == that.OpHotelReservationsData.diid) {
+                                that.delegationInfo = that.delegationInfoList[index];
+                                that.OpHotelReservationsData.diid = that.delegationInfoList[index].id;
+                                break;
+                            }
+                        }
+                    }
+                    that.HotelReservationsByDiId();
+                }
+            }).catch(function (error) {
+                that.$message.error("网络错误，请稍后重试");
+            });
+        },
+        delegationSelectChange() {
+            for (let index = 0; index < this.delegationInfoList.length; index++) {
+                debugger
+                if (this.delegationInfoList[index].id == this.OpHotelReservationsData.diid) {
+                    this.delegationInfo = this.delegationInfoList[index];
+                    this.OpHotelReservationsData.diid = this.delegationInfoList[index].id;
+                    this.VisitDate = this.dateFormat(this.delegationInfo.visitStartDate) + '至' + this.dateFormat(this.delegationInfo.visitEndDate);
+                    break;
+                }
+            }
+            this.HotelReservationsByDiId();
+        },
+        HotelReservationsByDiId() {
+            var url = "/api/Groups/HotelReservationsByDiId"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    pageIndex: 0,
+                    pageSize: 0,
+                    portType: 1,
+                    diId: that.OpHotelReservationsData.diid,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.tableDatas = res.data.data;
+                    that.tableData = that.tableDatas
+                    if (that.tableDatas.length != 0) {
+                        if (that.tableDatas.slice((that.currentPage - 1) * that.pageSize, that.currentPage * that.pageSize).length == 0) {
+                            if (that.currentPage > 1) {
+                                that.currentPage = that.currentPage - 1;
+                            }
+                        }
+                    }
+                }
+            }).catch(function (error) {
+                that.$message.error("网络错误，请稍后重试");
+            });
+        },
+        submitForm(formName) {
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    alert('submit!');
+                } else {
+                    console.log('error submit!!');
+                    return false;
+                }
+            });
+        },
+        resetForm(formName) {
+            this.$refs[formName].resetFields();
+        },
+
+    },
+    mounted() {
+        this.token = JSON.parse(localStorage.getItem('userinif')).token;
+        this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
+        this.HotelReservationsInitialize();
+        //this.AirTicketResList()
+    }
+}
+</script>
+<style>
+.hotelr-all {
+    background-color: #fff;
+    padding: 10px;
+    box-shadow: 0 0 5px #0005;
+    border-radius: 10px;
+    height: 100%;
+    min-height: 840px;
+}
+
+.hotelr-head-li label {
+    color: #606266;
+    font-size: 15px;
+    font-weight: 600;
+}
+
+.hotelr-head {
+    display: flex;
+    justify-content: space-between;
+}
+
+.hotelr-info {
+    display: flex;
+    margin-top: 10px;
+}
+
+.hotelr-info-li {
+    margin-right: 30px;
+}
+
+.hotelr-info-li label {
+    color: #606266;
+    font-size: 15px;
+    font-weight: 600;
+}
+
+.hotelr-info-li span {
+    color: #606266;
+    font-size: 14px;
+}
+
+.hotelr-table {
+    margin-top: 10px;
+}
+
+.form-head {
+    display: flex;
+    justify-content: space-between;
+}
+
+.hotelr-form {
+    margin-top: 20px;
+}
+
+.form-foundationone {
+    margin-top: 10px;
+    border-top: 2px solid #409EFF;
+    padding-top: 20px;
+}
+
+.form-foundationone .el-form-item {
+    margin-bottom: 12px;
+}
+
+.form-foundationone .el-form-item__error {
+    top: 90%;
+}
+
+.select-bz .el-select {
+    width: 100%;
+}
+</style>

src/components/OP/OpCarTouristGuideGroundId.vue

@@ -58,6 +58,25 @@
                         </el-form-item>
                     </div>
                 </div>
+                <div style="display: flex;">
+                    <div style="width: 25%;">
+                        <el-form-item label="OP提成等级:" prop="tourCode" label-width="160px">
+                            <el-select v-model="delegationInfo.opRoyaltyLv" clearable filterable placeholder="等级"
+                                :disabled="true" style="width: 220px;">
+                                <el-option v-for="item in opRoyaltyLvList" :key="item.id" :label="item.name + '元'"
+                                    :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 60%;">
+                        <el-form-item label="Op提成等级说明:" prop="opRoyaltyRemark" label-width="160px">
+                            <el-input placeholder="Op提成等级说明" v-model="delegationInfo.opRoyaltyRemark" :disabled="true">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+
+                </div>
             </el-form>
             <el-form :model="OpCarTouristGuideGroundData" ref="OpCarTouristGuideGroundData"
                 :rules="OpCarTouristGuideGroundDataRules" label-width="100px" class="demo-ruleForm">
@@ -193,6 +212,7 @@ export default {
             },
             IsAuditGM: 0,
             VisitDate: '',
+            opRoyaltyLvList: [],
             dateFormat: function (value) {
 
                 // 将value转换为Date对象
@@ -230,8 +250,7 @@ export default {
     methods: {
         //初始化下拉框
         initializeSelect() {
-            //团组下拉框绑定
-            var url = "/api/Groups/DecreasePaymentsSelect"
+            var url = "/api/System/QuerySetData"
             var that = this
             this.$axios({
                 method: 'post',
@@ -240,23 +259,43 @@ export default {
                     Authorization: 'Bearer ' + this.token
                 },
                 data: {
-                    userId: that.userId,
-                    ctId: 79
+                    dataType: 70,
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    debugger
-                    that.delegationInfoList = res.data.data.groupName;
-                    for (let index = 0; index < that.delegationInfoList.length; index++) {
-                        debugger
-                        if (that.delegationInfoList[index].id == that.OpCarTouristGuideGroundData.diId) {
-                            that.delegationInfo = that.delegationInfoList[index];
-                            that.VisitDate = that.dateFormat(that.delegationInfo.visitStartDate) + '至' + that.dateFormat(that.delegationInfo.visitEndDate);
-                            break;
+                    that.opRoyaltyLvList = res.data.data;
+                    var url = "/api/Groups/DecreasePaymentsSelect"
+                    that.$axios({
+                        method: 'post',
+                        url: url,
+                        headers: {
+                            Authorization: 'Bearer ' + that.token
+                        },
+                        data: {
+                            userId: that.userId,
+                            ctId: 79
                         }
-                    }
+                    }).then(function (res) {
+                        if (res.data.code == 200) {
+                            debugger
+                            that.delegationInfoList = res.data.data.groupName;
+                            for (let index = 0; index < that.delegationInfoList.length; index++) {
+                                debugger
+                                if (that.delegationInfoList[index].id == that.OpCarTouristGuideGroundData.diId) {
+                                    that.delegationInfo = that.delegationInfoList[index];
+                                    that.VisitDate = that.dateFormat(that.delegationInfo.visitStartDate) + '至' + that.dateFormat(that.delegationInfo.visitEndDate);
+                                    debugger
+                                    that.delegationInfo.opRoyaltyLv = that.delegationInfo.opRoyaltyLv
+                                    break;
+                                }
+                            }
+                        }
+                    })
                 }
             })
+            //团组下拉框绑定
+
+
         },
         DiIdSelectChange() {
             var that = this;

src/components/OP/VisaPriec.vue

@@ -80,7 +80,7 @@
             </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"
+                    :current-page="currentPage" :page-sizes="[5, 10, 12, 15, 20]" :page-size="pageSize"
                     layout="total, sizes, prev, pager, next" :total="tableDatas.length">
                 </el-pagination>
             </div>

src/components/Resource/HotelReservations.vue

@@ -1,459 +0,0 @@
-<template>
-    <div>
-        <div class="hotelr-all">
-            <div class="hotelr-head">
-                <div class="hotelr-head-li">
-                    <label>团组名称:</label>
-                    <el-select @change="Receivables" v-model="value" filterable placeholder="请选择">
-                        <el-option
-                        v-for="item in options"
-                        :key="item.id"
-                        :label="item.groupName"
-                        :value="item.id">
-                        </el-option>
-                    </el-select>
-                </div>
-                <div class="hotelr-info">
-                    <div class="hotelr-info-li">
-                        <label>团 号：</label>
-                        <span>团 号：</span>
-                    </div>
-                    <div class="hotelr-info-li">
-                        <label>客 户：</label>
-                        <span>客 户：</span>
-                    </div>
-                    <div class="hotelr-info-li">
-                        <label>出访国家：</label>
-                        <span>出访国家：</span>
-                    </div>
-                    <div class="hotelr-info-li">
-                        <label>起止日期：</label>
-                        <span> 起止日期：</span>
-                    </div>
-                    <div class="hotelr-info-li">
-                        <label>天数/人数：</label>
-                        <span>天数/人数：</span>
-                    </div>
-                </div>
-            </div>
-            <div class="hotelr-table">
-                <el-table
-                    :data="tableData"
-                    border
-                    style="width: 100%">
-                    <el-table-column
-                    type="index"
-                    label="序号"
-                    width="50">
-                    </el-table-column>
-                    <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="date"
-                    label="入住日期"
-                    width="120">
-                    </el-table-column>
-                    <el-table-column
-                    prop="date"
-                    label="退房日期"
-                    width="120">
-                    </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="name"
-                    label="操作时间"
-                    width="180">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="附 件"
-                    width="80">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="是否审核"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="操 作"
-                    width="140">
-                    </el-table-column>
-                    <el-table-column
-                    prop="address"
-                    label="VOUCHER">
-                    </el-table-column>
-                </el-table>
-            </div>
-            <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>
-                    </el-table>
-                    <el-button slot="reference">hover 激活</el-button>
-                    </el-popover>
-                    <div class="form-head-btn">
-                        <el-button type="primary">确认单</el-button>
-                        <el-button type="primary">预订成本</el-button>
-                        <el-button type="primary">新增切换</el-button>
-                        <el-button type="primary">保存设置</el-button>
-                    </div>
-                </div>
-                <div class="form-foundationone select-bz">
-                    <el-form  :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm">
-                        <div style="display: flex;flex-wrap: wrap;">
-                            <el-form-item style="width:350px ;" label="客人类型" prop="region">
-                                <el-select size="medium" v-model="ruleForm.region" placeholder="请选择活动区域">
-                                    <el-option label="区域一" value="shanghai"></el-option>
-                                    <el-option label="区域二" value="beijing"></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item  style="width:350px ;" label="计算费用币种" prop="region">
-                                <el-select size="medium" v-model="ruleForm.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="汇率">
-                                <span>7.52</span>
-                            </el-form-item>
-                        </div>
-                        <div style="display: flex;flex-wrap: wrap;">
-                            <el-form-item style="width:350px ;" label="入住卷号码" prop="desc">
-                                <el-input size="medium" type="text" v-model="ruleForm.desc"></el-input>
-                            </el-form-item>
-                            <el-form-item style="width:350px ;" label="预订网站" prop="region">
-                                <el-select size="medium" v-model="ruleForm.region" placeholder="请选择活动区域">
-                                    <el-option label="区域一" value="shanghai"></el-option>
-                                    <el-option label="区域二" value="beijing"></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item style="width:350px ;" label="预订号码" prop="desc">
-                                <el-input size="medium" type="text" v-model="ruleForm.desc"></el-input>
-                            </el-form-item>
-                            <el-form-item  style="width:350px ;" label="酒店确定号码" prop="desc">
-                                <el-input size="medium" type="text" v-model="ruleForm.desc"></el-input>
-                            </el-form-item>
-                        </div>
-                        <div style="display: flex;flex-wrap: wrap;">
-                            <el-form-item style="width:350px ;" label="所在城市" prop="desc">
-                                <el-input size="medium" type="text" v-model="ruleForm.desc"></el-input>
-                            </el-form-item>
-                            <el-form-item style="width:350px ;" label="酒店名称" prop="desc">
-                                <el-input size="medium" type="text" v-model="ruleForm.desc"></el-input>
-                            </el-form-item>
-                            <el-form-item  style="width:350px ;" label="酒店电话" prop="desc">
-                                <el-input size="medium" type="text" v-model="ruleForm.desc"></el-input>
-                            </el-form-item>
-                        </div>
-                        <el-form-item label="酒店地址" prop="desc">
-                            <el-input :rows="1" type="textarea" v-model="ruleForm.desc"></el-input>
-                        </el-form-item>
-                        <el-form-item label="客人姓名" prop="desc">
-                            <el-input :rows="1" type="textarea" v-model="ruleForm.desc"></el-input>
-                        </el-form-item>
-                        <div class="remcss" style="display: flex;flex-wrap: wrap;">
-                            <el-form-item prop="date1"  style="width:350px ;" label="入住时间" required>
-                                <el-date-picker size="medium" type="date" placeholder="选择日期" v-model="ruleForm.date1" style="width: 100%;"></el-date-picker>
-                            </el-form-item>
-                            <el-form-item style="width:350px ;" label="离店时间" prop="date2">
-                                <el-date-picker size="medium" type="date" placeholder="选择时间" v-model="ruleForm.date2" style="width: 100%;"></el-date-picker>
-                            </el-form-item>
-                        </div>
-                        <div style="display: flex;flex-wrap: wrap;">
-                            <el-form-item style="width:350px ;" label="酒店单间" prop="desc">
-                                <el-input-number style="width:100px ;" size="medium" :controls="false" v-model="ruleForm.fangnum"></el-input-number>
-                                <span>间</span>
-                            </el-form-item>
-                            <el-form-item style="width:350px ;" label="酒店双间" prop="desc">
-                                <el-input-number style="width:100px ;" size="medium" :controls="false" v-model="ruleForm.fangnum"></el-input-number>
-                                <span>间</span>
-                            </el-form-item>
-                            <el-form-item style="width:350px ;" label="酒店套房" prop="desc">
-                                <el-input-number style="width:100px ;" size="medium" :controls="false" v-model="ruleForm.fangnum"></el-input-number>
-                                <span>间</span>
-                            </el-form-item>
-                            <el-form-item style="width:350px ;" label="其他房型" prop="desc">
-                                <el-input-number style="width:100px ;" size="medium" :controls="false" v-model="ruleForm.fangnum"></el-input-number>
-                                <span>间</span>
-                            </el-form-item>
-                        </div>
-                    </el-form>
-                </div>
-                <div class="form-foundationone">
-                    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-                        <div style="display: flex;flex-wrap: wrap;">
-                            <el-form-item label-width="100px" style="width:350px ;" label="信用卡金额" prop="desc">
-                                <el-input size="medium" type="text" v-model="ruleForm.desc"></el-input>
-                            </el-form-item>
-                            <el-form-item label-width="10px" prop="region">
-                                <el-select size="medium" v-model="ruleForm.region" placeholder="请选择活动区域">
-                                    <el-option label="美元卡" value="shanghai"></el-option>
-                                    <el-option label="欧元卡" value="beijing"></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item style="width:350px ;" label="地税" prop="desc">
-                                <el-input-number :precision="2" style="width:100px ;" size="medium" :controls="false" v-model="ruleForm.fangnum"></el-input-number>
-                                <el-select style="width:100px ;" size="medium" v-model="ruleForm.region" placeholder="请选择">
-                                    <el-option label="CNY" value="shanghai"></el-option>
-                                    <el-option label="USD" value="beijing"></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item style="width:350px ;" label="城市税" prop="desc">
-                                <el-input-number :precision="2" style="width:100px ;" size="medium" :controls="false" v-model="ruleForm.fangnum"></el-input-number>
-                                <el-select style="width:100px ;" size="medium" v-model="ruleForm.region" placeholder="请选择">
-                                    <el-option label="CNY" value="shanghai"></el-option>
-                                    <el-option label="USD" value="beijing"></el-option>
-                                </el-select>
-                            </el-form-item>
-                        </div>
-                        <div style="display: flex;flex-wrap: wrap;">
-                            <el-form-item label-width="100px" style="width:350px ;" label="入住类型" prop="region">
-                                <el-select style="width: 100%;" size="medium" v-model="ruleForm.region" placeholder="请选择活动区域">
-                                    <el-option label="客人房" value="shanghai"></el-option>
-                                    <el-option label="导游房" value="beijing"></el-option>
-                                </el-select>
-                            </el-form-item>
-                        </div>
-                        <el-form-item label="酒店地址" prop="desc">
-                            <el-input :rows="1" type="textarea" v-model="ruleForm.desc"></el-input>
-                        </el-form-item>
-                        <el-form-item label="附件" prop="desc">
-                            <input type="file" />
-                        </el-form-item>
-                        <el-form-item label="备注" prop="desc">
-                            <el-input :rows="3" type="textarea" v-model="ruleForm.desc"></el-input>
-                        </el-form-item>
-                    </el-form>
-                </div>
-                <div class="form-foundationone">
-                    <div>付款信息</div>
-                    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-                        <div style="display: flex;flex-wrap: wrap;">
-                            <el-form-item style="width:350px ;" label="支付方式" prop="region">
-                                <el-select style="width: 100%;" size="medium" v-model="ruleForm.region" placeholder="请选择活动区域">
-                                    <el-option label="区域一" value="shanghai"></el-option>
-                                    <el-option label="区域二" value="beijing"></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item style="width:350px ;" label="消费方式" prop="desc">
-                                <el-input size="medium" type="text" v-model="ruleForm.desc"></el-input>
-                            </el-form-item>
-                            <el-form-item prop="date1"  style="width:350px ;" label="消费日期" required>
-                                <el-date-picker size="medium" type="date" placeholder="选择日期" v-model="ruleForm.date1" style="width: 100%;"></el-date-picker>
-                            </el-form-item>
-                            <el-form-item style="width:350px ;" label="付款金额" prop="desc">
-                                <el-input-number :precision="2" style="width:100px ;" size="medium" :controls="false" v-model="ruleForm.fangnum"></el-input-number>
-                                <el-select style="width:100px ;" size="medium" v-model="ruleForm.region" placeholder="请选择">
-                                    <el-option label="CNY" value="shanghai"></el-option>
-                                    <el-option label="USD" value="beijing"></el-option>
-                                </el-select>
-                            </el-form-item>
-                        </div>
-                        <div style="display: flex;flex-wrap: wrap;">
-                            <el-form-item style="width:350px ;" label="卡类型" prop="region">
-                                <el-select style="width: 100%;" size="medium" v-model="ruleForm.region" placeholder="请选择活动区域">
-                                    <el-option label="区域一" value="shanghai"></el-option>
-                                    <el-option label="区域二" value="beijing"></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item style="width:350px ;" label="银行卡号" prop="desc">
-                                <el-input size="medium" type="text" v-model="ruleForm.desc"></el-input>
-                            </el-form-item>
-                            <el-form-item prop="date1"  style="width:350px ;" label="持卡人姓名" required>
-                                <el-input size="medium" type="text" v-model="ruleForm.desc"></el-input>
-                            </el-form-item>
-                        </div>
-                        <div style="display: flex;flex-wrap: wrap;">
-                            <el-form-item style="width:350px ;" label="收款方" prop="desc">
-                                <el-input size="medium" type="text" v-model="ruleForm.desc"></el-input>
-                            </el-form-item>
-                            <el-form-item style="width:350px ;" label="费用标识" prop="region">
-                                <el-select style="width: 100%;" size="medium" v-model="ruleForm.region" placeholder="请选择活动区域">
-                                    <el-option label="区域一" value="shanghai"></el-option>
-                                    <el-option label="区域二" value="beijing"></el-option>
-                                </el-select>
-                            </el-form-item>
-                        </div>
-                        <el-form-item label="备注" prop="desc">
-                            <el-input :rows="3" type="textarea" v-model="ruleForm.desc"></el-input>
-                        </el-form-item>
-                    </el-form>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-export default {
-    data() {
-      return {
-        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 弄'
-        }],
-        gridData: [{
-          date: '2016-05-02',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        }, {
-          date: '2016-05-04',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        }, {
-          date: '2016-05-01',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        }, {
-          date: '2016-05-03',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        }],
-        ruleForm: {
-          name: '',
-          region: '',
-          date1: '',
-          date2: '',
-          delivery: false,
-          type: [],
-          resource: '',
-          desc: '',
-          fangnum:'',
-        },
-        rules: {
-          name: [
-            { required: true, message: '请输入活动名称', trigger: 'blur' },
-            { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          ],
-          region: [
-            { required: true, message: '请选择活动区域', trigger: 'change' }
-          ],
-          date1: [
-            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
-          ],
-          date2: [
-            { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
-          ],
-          type: [
-            { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
-          ],
-          resource: [
-            { required: true, message: '请选择活动资源', trigger: 'change' }
-          ],
-          desc: [
-            { required: true, message: '请填写活动形式', trigger: 'blur' }
-          ]
-        }
-      }
-    },
-    methods:{
-        submitForm(formName) {
-            this.$refs[formName].validate((valid) => {
-            if (valid) {
-                alert('submit!');
-            } else {
-                console.log('error submit!!');
-                return false;
-            }
-            });
-        },
-        resetForm(formName) {
-            this.$refs[formName].resetFields();
-        }
-    }
-}
-</script>
-<style>
-.hotelr-all{
-    background-color: #fff;
-    padding: 10px;
-    box-shadow: 0 0 5px #0005;
-    border-radius: 10px;
-    height: 100%;
-    min-height: 840px;
-}
-.hotelr-head-li label{
-    color: #606266;
-    font-size: 15px;
-    font-weight: 600;
-}
-.hotelr-head{
-    display: flex;
-    justify-content: space-between;
-}
-.hotelr-info{
-    display: flex;
-    margin-top: 10px;
-}
-.hotelr-info-li{
-    margin-right: 30px;
-}
-.hotelr-info-li label{
-    color: #606266;
-    font-size: 15px;
-    font-weight: 600;
-}
-.hotelr-info-li span{ 
-    color: #606266;
-    font-size: 14px;
-}
-.hotelr-table{
-    margin-top: 10px;
-}
-.form-head{
-    display: flex;
-    justify-content: space-between;
-}
-.hotelr-form{
-    margin-top:20px ;
-}
-.form-foundationone{
-    margin-top: 10px;
-    border-top: 2px solid #409EFF;
-    padding-top: 20px;
-}
-.form-foundationone .el-form-item{
-    margin-bottom: 12px;
-}
-.form-foundationone .el-form-item__error{
-    top: 90%;
-}
-.select-bz .el-select{
-    width: 100%;
-}
-</style>

src/components/child/AuthorityUser.vue

@@ -2,13 +2,12 @@
     <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading">
         <div class="job-box">
             <div class="job-head">
-                <div class="job-user" >
-                    <el-select  @change="Inquirechange()" v-model="value" clearable placeholder="权限模块">
+                <div class="job-user">
+                    <el-select @change="Inquirechange()" v-model="value" clearable placeholder="权限模块">
                         <el-option v-for="item in authority" :key="item.value" :label="item.name" :value="item.id">
                         </el-option>
                     </el-select>
-                    <el-select  v-model="pageValue" filterable placeholder="页面名称搜索"
-                        @change="pageChange">
+                    <el-select v-model="pageValue" filterable placeholder="页面名称搜索" @change="pageChange">
                         <el-option v-for="item in pageOptions" :key="item.pageid" :label="item.pageName"
                             :value="item.pageid">
                         </el-option>
@@ -445,7 +444,8 @@ body {
 .job-input .el-select {
     margin-right: 5px;
 }
-.job-user .el-select{
+
+.job-user .el-select {
     width: 250px;
 }
 </style>

src/router/index.js

@@ -68,7 +68,7 @@ import OfficialActivities from '@/components/Resource/OfficialActivities'
 import OpOfficialActivities from '@/components/Resource/OpOfficialActivities'
 import AskData from '@/components/Resource/AskData'
 import OpAskData from '@/components/Resource/OpAskData'
-import HotelReservations from '@/components/Resource/HotelReservations'
+import HotelReservations from '@/components/OP/HotelReservations'
 import DelegationEnData from '@/components/OP/DelegationEnData'
 import OpDelegationEnData from '@/components/OP/OpDelegationEnData'
 import invitationLetter from '@/components/Resource/invitationLetter'