liuhj il y a 1 an
Parent
commit
b122971ecb

+ 599 - 88
src/components/Finance/Collection.vue

@@ -4,7 +4,7 @@
             <div class="collection-head">
                 <div class="collection-head-li">
                     <label>团组名称:</label>
-                    <el-select v-model="value" filterable placeholder="请选择">
+                    <el-select @change="Receivables" v-model="value" filterable placeholder="请选择">
                         <el-option
                         v-for="item in options"
                         :key="item.id"
@@ -14,7 +14,7 @@
                     </el-select>
                 </div>
                 <div class="collection-head-li">
-                    <el-button type="primary">保存数据</el-button>
+                    <el-button type="primary" @click="Saveition">保存数据</el-button>
                     <el-button type="primary">生成收款单(四川)</el-button>
                     <el-button type="primary">生成收款单(北京)</el-button>
                     <el-button type="primary">汇款账单</el-button>
@@ -42,106 +42,221 @@
                     <span>{{groupInfo.visitDays}}天/{{groupInfo.visitPNumber}}人</span>
                 </div>
             </div>
+            <div class="Unassigned-checked">
+                <div class="checked-label">未分配收款账单</div>
+                <el-dropdown @command="assignment">
+                    <el-button type="primary">
+                      分配至<i class="el-icon-arrow-down el-icon--right"></i>
+                    </el-button>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item v-for="(item,index) in tableData" :key="index" :command="item.id">{{item.priceName}}</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+            </div>
+            <div class="Unassigned-form">
+                <el-table
+                :border="true"
+                ref="multipleTable"
+                :data="UnassignedData"
+                tooltip-effect="dark"
+                style="width: 100%"
+                @selection-change="handleSelectionChange">
+                    <el-table-column
+                    type="selection"
+                    width="55">
+                    </el-table-column>
+                    <el-table-column
+                    label="付款时间"
+                    width="180">
+                        <template slot-scope="scope">
+                            <el-input v-model="scope.row.sectionTime"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="付款方信息"
+                        width="230">
+                        <template slot-scope="scope">
+                            <el-input v-model="scope.row.client"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="付款方电话"
+                        width="180">
+                        <template slot-scope="scope">
+                            <el-input v-model="scope.row.customerTel"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="已收金额"
+                        width="120">
+                        <template slot-scope="scope">
+                            <el-input-number :controls="false" :precision="2" v-model="scope.row.price"></el-input-number>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="到款时间"
+                        width="180">
+                        <template slot-scope="scope">
+                            <el-input v-model="scope.row.customerName"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="币种"
+                        width="100">
+                        <template slot-scope="scope">
+                            <el-select v-model="scope.row.currency">
+                                <el-option
+                                        v-for="item in currencyoptions"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="收款类型"
+                        width="140">
+                        <template slot-scope="scope">
+                            <el-select v-model="scope.row.receivablesType">
+                                <el-option
+                                        v-for="item in typeoptions"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="备注">
+                        <template slot-scope="scope">
+                            <el-input v-model="scope.row.remark"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="操作"
+                        width="140">
+                    </el-table-column>
+                </el-table>
+            </div>
             <div class="collection-checked">
-                <div></div>
-                <el-button type="primary">添加一行</el-button>
+                <div class="checked-label">收款账单</div>
+                <el-button @click="addition" type="primary">添加一行</el-button>
             </div>
             <div class="collection-form">
                 <el-table
                 :border="barderis"
                 ref="multipleTable"
                 :data="tableData"
-                style="width: 100%"
+                style="width: 100%;"
                 :expand-row-keys="expends"
                 :row-key="getRowKeys"
+                @expand-change="handledetail"
+                :row-style="TableRowStyle"
                 >
                     <!-- <el-table-column
                     type="selection"
                     width="40">
                     </el-table-column> -->
-                    <el-table-column align="center" type="expand">
+                    <el-table-column 
+                    align="center" 
+                    type="expand" 
+                    >
                         <!-- eslint-disable-next-line -->
                         <template slot-scope="scope">
                             <div class="paid-box">
                                 <div class="paid-label">已收款项</div>
                                 <div>
-                                    <el-button type="primary">新 增</el-button>
+                                    <el-button @click="Saveinif(scope.row._ProceedsReceivedDatas)" type="primary">保 存</el-button>
+                                    <el-button @click="addinif(scope.row)" type="primary">新 增</el-button>
                                 </div>
                             </div>
                             <el-table
                             class="inside-li" 
                             :border="barderis"
                             :data="scope.row._ProceedsReceivedDatas"
-                            style="width: 100%">
-                            <el-table-column
-                                label="付款时间"
-                                width="180">
-                                <template slot-scope="scope">
-                                    <el-input v-model="scope.row.sectionTime"></el-input>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                label="付款方信息"
-                                width="230">
-                                <template slot-scope="scope">
-                                    <el-input v-model="scope.row.client"></el-input>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                label="付款方电话"
-                                width="180">
-                                <template slot-scope="scope">
-                                    <el-input v-model="scope.row.customerTel"></el-input>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                label="已收金额"
-                                width="180">
-                                <template slot-scope="scope">
-                                    <el-input v-model="scope.row.price"></el-input>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                label="到款时间"
-                                width="180">
-                                <template slot-scope="scope">
-                                    <el-input v-model="scope.row.customerName"></el-input>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                label="币种"
-                                width="180">
-                                <template slot-scope="scope">
-                                    <el-select v-model="scope.row.currency">
-                                        <el-option
-                                                v-for="item in currencyoptions"
-                                                :key="item.id"
-                                                :label="item.name"
-                                                :value="item.id">
-                                        </el-option>
-                                    </el-select>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                label="收款类型"
-                                width="180">
+                            style="width: 99%;"
+                            >
+                                <el-table-column
+                                    label="到款时间"
+                                    width="180">
+                                    <template slot-scope="scope">
+                                        <el-input v-model="scope.row.sectionTime"></el-input>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                    label="付款单位"
+                                    width="230">
+                                    <template slot-scope="scope">
+                                        <el-input v-model="scope.row.client"></el-input>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                    label="客户名称"
+                                    width="180">
+                                    <template slot-scope="scope">
+                                        <el-input v-model="scope.row.customerName"></el-input>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                    label="付款方联系电话"
+                                    width="180">
+                                    <template slot-scope="scope">
+                                        <el-input v-model="scope.row.customerTel"></el-input>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                    label="已收金额"
+                                    width="120">
+                                    <template slot-scope="scope">
+                                        <el-input-number :controls="false" :precision="2" v-model="scope.row.price"></el-input-number>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                    label="币种"
+                                    width="100">
+                                    <template slot-scope="scope">
+                                        <el-select v-model="scope.row.currency">
+                                            <el-option
+                                                    v-for="item in currencyoptions"
+                                                    :key="item.id"
+                                                    :label="item.name"
+                                                    :value="item.id">
+                                            </el-option>
+                                        </el-select>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                    label="收款类型"
+                                    width="140">
+                                    <template slot-scope="scope">
+                                        <el-select v-model="scope.row.receivablesType">
+                                            <el-option
+                                                    v-for="item in typeoptions"
+                                                    :key="item.id"
+                                                    :label="item.name"
+                                                    :value="item.id">
+                                            </el-option>
+                                        </el-select>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                    label="备注">
+                                    <template slot-scope="scope">
+                                        <el-input v-model="scope.row.remark"></el-input>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                label="操作"
+                                width="140">
                                 <template slot-scope="scope">
-                                    <el-select v-model="scope.row.receivablesType">
-                                        <el-option
-                                                v-for="item in typeoptions"
-                                                :key="item.id"
-                                                :label="item.name"
-                                                :value="item.id">
-                                        </el-option>
-                                    </el-select>
+                                    <el-button
+                                    size="mini"
+                                    type="danger"
+                                    @click="handleDeleteinif(scope.$index, scope.row)"><i class="el-icon-delete"></i></el-button>
                                 </template>
-                            </el-table-column>
-                            <el-table-column
-                                label="备注">
-                                <template slot-scope="scope">
-                                    <el-input v-model="scope.row.remark"></el-input>
-                                </template>
-                            </el-table-column>
+                                </el-table-column>
                             </el-table>
                         </template>
                     </el-table-column>
@@ -166,14 +281,14 @@
                     label="单 价"
                     width="140">
                         <template slot-scope="scope">
-                            <el-input class="editNum" type="number" oninput="value=value.replace(/[^\d.]/g,'')" v-model="scope.row.price"></el-input>
+                            <el-input-number :controls="false" :precision="2" class="editNum" v-model="scope.row.price"></el-input-number>
                         </template>
                     </el-table-column>
                     <el-table-column
                     label="数 量"
                     width="80">
                         <template slot-scope="scope">
-                            <el-input v-model="scope.row.count"></el-input>
+                            <el-input  v-model="scope.row.count"></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column
@@ -204,25 +319,33 @@
                     label="汇 率"
                     width="100">
                         <template slot-scope="scope">
-                            <el-input v-model="scope.row.rate"></el-input>
+                            <el-input-number  :controls="false" :precision="2" v-model="scope.row.rate"></el-input-number>
                         </template>
                     </el-table-column>
                     <el-table-column
-                    prop="itemSumPrice"
                     label="应收金额"
                     width="120">
+                    <template slot-scope="scope">
+                        <div class="sub-box">{{scope.row.itemSumPrice=(scope.row.price*scope.row.count*scope.row.rate).toFixed(2)}}</div>
+                    </template>
                     </el-table-column>
-                    <el-table-column
-                    prop="attention"
+                    <el-table-column    
+                    prop="remark"
                     label="备注">
                         <template slot-scope="scope">
-                            <el-input v-model="scope.row.attention" placeholder="请输入内容"></el-input>
+                            <el-input v-model="scope.row.remark" placeholder="请输入内容"></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column
                     prop="name"
-                    label="尾 款"
+                    label="操 作"
                     width="100">
+                        <template slot-scope="scope">
+                            <el-button
+                            size="mini"
+                            type="danger"
+                            @click="handleDelete(scope.$index, scope.row,tableData)"><i class="el-icon-delete"></i></el-button>
+                        </template>
                     </el-table-column>
                 </el-table>
             </div>
@@ -230,9 +353,12 @@
     </div>
 </template>
 <script>
+import { cl } from '@fullcalendar/core/internal-common'
 export default {
     data() {
       return {
+        diid:0,
+        userid:'',
         expends:[],
         barderis:true,
         options: [],
@@ -241,10 +367,23 @@ export default {
         typeoptions:[],
         tableData: [],
         multipleSelection: [],
-        groupInfo:{}
+        groupInfo:{},
+        argument:[],
+        UnassignedData:[]
       }
     },
+    computed:{
+        computeReceivables(row){
+            console.log(row)
+        }
+    },
     methods:{
+        //获取diid
+        Receivables(){
+            this.diid=this.value
+            this.GetForeignReceivablesDataSources()
+        },
+        //获取团组
         GetForeignReceivablesDataSources(){
             var url = "/api/Financial/GetForeignReceivablesDataSources"
             var that = this
@@ -262,9 +401,11 @@ export default {
                     if(that.value==""){
                         that.value=that.options[0].id;
                     }
+                    that.diid=that.value;
                     that.GetGroupReceivablesInfoByDiId();
             })
         },
+        //获取收款账单
         GetGroupReceivablesInfoByDiId(){
             var url = "/api/Financial/GetGroupReceivablesInfoByDiId"
             var that = this
@@ -276,15 +417,17 @@ export default {
                 },
                 data:{
                     portType: 1,
-                    diId: 2270
+                    diId: that.diid
                 }
             }).then(function (res) {
                     console.log(res)
                     that.groupInfo=res.data.data.groupInfo;
                     that.tableData=res.data.data.groupCollectionStatementData.receivedData;
+                    that.UnassignedData=res.data.data.groupCollectionStatementData.unallocatedData;
                     that.getExpends();
             })
         },
+        //默认展开
         getExpends(){
             var Id=[]
             this.tableData.forEach(item=>{
@@ -296,7 +439,313 @@ export default {
         },
         getRowKeys(row){
             return row.id
-        }
+        },
+        handledetail(row,expandedRows){
+            this.argument=this.expends;
+            if (this.argument.indexOf(row.id) > -1) {
+                this.argument.splice(this.argument.indexOf(row.id), 1)
+            } else {
+                this.argument.push(row.id)
+            }
+            // console.log(this.argument)
+        },
+        TableRowStyle(row, rowIndex){
+            // console.log(row.row.id)
+            if (row.row.id == 21675) {
+                // console.log(row.rowIndex)
+                return "{background:'#f4f5f6'}"
+				//第二种
+				// return 'cell-grey'
+			}
+        },
+        //未分配多选
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+            console.log(this.multipleSelection)
+        },
+        //分配按钮
+        assignment(row){
+            console.log(row)
+            var arrnews = this.multipleSelection.map((obj,index) => {
+                return obj.id;
+            }).join(",").split(',')
+            console.log(arrnews)
+            if(this.multipleSelection.length!=0){
+                this.$confirm('是否分配此条数据?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    var url = "/api/Financial/PostAllocateAmountReceived"
+                    var that = this
+                    this.$axios({
+                        method: 'post',
+                        url: url,
+                        headers: {
+                            Authorization: 'Bearer ' + this.token
+                        },
+                        data:{
+                            portType:1,
+                            userId:that.userid,
+                            parentId:row,
+                            subIds:arrnews
+                        }
+                    }).then(function (res) {
+                        that.$message({
+                            message: res.data.msg,
+                            type: 'success'
+                        });
+                        that.GetGroupReceivablesInfoByDiId()
+                    })
+                })
+            }
+        },
+        //添加一行
+        addition(){
+            var newinif={
+                id: 0,
+                priceName: "1",//费用名称
+                price: 0,//费用
+                count: 0,//数量
+                unit:'',//单位
+                itemSumPrice:0,// 单项总和
+                rate:1,// 汇率
+                currency:836,//币种
+                addingWay:0,//添加方式
+                remark:""//备注
+            }
+            var url = "/api/Financial/PostReceivablesOperate"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data:{
+                    portType: 1,
+                    diId: that.diid,
+                    userId:that.userid,
+                    foreignReceivablesInfos:[newinif]
+                }
+            }).then(function (res) {
+                if(res.data.code==200){
+                    that.$message({
+                        message: res.data.msg,
+                        type: 'success'
+                    });
+                    console.log(res)
+                    that.GetGroupReceivablesInfoByDiId()
+                }else{
+                    that.$message.error('添加失败!数据异常');
+                }
+            })
+        },
+        //对外收款账单删除
+        handleDelete(index, row,rows) {
+            this.$confirm('此条数据为大项数据删除后子项将一并删除 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                var url = "/api/Financial/PostGroupReceivablesDel"
+                var that = this
+                this.$axios({
+                    method: 'post',
+                    url: url,
+                    headers: {
+                        Authorization: 'Bearer ' + this.token
+                    },
+                    data:{
+                        userId:that.userid,
+                        id:row.id
+                    }
+                }).then(function (res) {
+                    if(res.data.code==200){
+                        that.$message({
+                            message: res.data.msg,
+                            type: 'success'
+                        });
+                        rows.splice(index, 1);
+                    }else{
+                        that.$message.error('删除失败!数据异常');
+                    }
+                })
+            })
+        },
+        //新增已收
+        addinif(row){
+            console.log(row.id)
+            var newReceivedInfos={
+                id: 0,
+                sectionTime: "",
+                price: 0,//费用
+                currency:836,//币种
+                receivablesType:73,
+                client:"",
+                customerName:"",
+                customerTel:"",
+                fid:row.id,
+                remark:""
+            }
+            var url = "/api/Financial/PostAmountReceivedOperate"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data:{
+                    portType: 1,
+                    diId: that.diid,
+                    userId:that.userid,
+                    _ProceedsReceivedInfos:[newReceivedInfos]
+                }
+            }).then(function (res) {
+                if(res.data.code==200){
+                    that.$message({
+                        message: res.data.msg,
+                        type: 'success'
+                    });
+                    console.log(res)
+                    that.GetGroupReceivablesInfoByDiId()
+                }else{
+                    that.$message.error('添加失败!数据异常');
+                }
+            })
+        },
+        //删除已收
+        handleDeleteinif(index, row){
+            this.$confirm('此操作将删除该数据, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                var url = "/api/Financial/PostAmountReceivedDel"
+                var that = this
+                this.$axios({
+                    method: 'post',
+                    url: url,
+                    headers: {
+                        Authorization: 'Bearer ' + this.token
+                    },
+                    data:{
+                        userId:that.userid,
+                        id:row.id
+                    }
+                }).then(function (res) {
+                    if(res.data.code==200){
+                        that.$message({
+                            message: res.data.msg,
+                            type: 'success'
+                        });
+                        that.GetGroupReceivablesInfoByDiId();
+                    }else{
+                        that.$message.error('删除失败!数据异常');
+                    }
+                })
+            })
+        },
+        //保存已收款
+        Saveinif(row){
+            console.log(row)
+            var Savedecide=true
+            for(let i=0;i<row.length;i++){
+                if(row[i].client==""||row[i].currency==""||row[i].customerName==""||row[i].customerTel==""||row[i].price==""||row[i].receivablesType==""||row[i].sectionTime==""){
+                    Savedecide=false
+                    break
+                }
+            }
+            if(Savedecide==true){
+                var url = "/api/Financial/PostAmountReceivedOperate"
+                var that = this
+                this.$axios({
+                    method: 'post',
+                    url: url,
+                    headers: {
+                        Authorization: 'Bearer ' + this.token
+                    },
+                    data:{
+                        portType: 1,
+                        userId:that.userid,
+                        diId: that.diid,
+                        _ProceedsReceivedInfos:row
+                    }
+                }).then(function (res) {
+                    console.log(res)
+                    if(res.data.code==200){
+                        that.$message({
+                            message: res.data.msg,
+                            type: 'success'
+                        });
+                        that.GetGroupReceivablesInfoByDiId()
+                    }else{
+                        that.$message.error('保存失败!数据异常');
+                    }
+                })
+            }else{
+                this.$message.error('请检查数据是否完整!');
+            }
+        },
+        //保存收款单
+        Saveition(){
+            console.log(this.tableData)
+            //提取参数
+            var arrnew = this.tableData.map((item,index) => {
+                return Object.assign({},{
+                    'id':item.id,
+                    'priceName':item.priceName,
+                    'price':item.price,
+                    'count':item.count,
+                    'unit':item.unit,
+                    'itemSumPrice':item.itemSumPrice,
+                    'rate':item.rate,
+                    'currency':item.currency,
+                    'addingWay':item.addingWay,
+                    'remark':item.remark,
+                })
+            })
+            console.log(arrnew)
+            var Savedecides=true
+            for(let g=0;g<arrnew.length;g++){
+                if(arrnew[g].count==""||arrnew[g].currency==""||arrnew[g].itemSumPrice==""||arrnew[g].price==""||arrnew[g].priceName==""||arrnew[g].rate==""||arrnew[g].unit==""){
+                    Savedecides=false
+                    break
+                }
+            }
+            if(Savedecides==true){
+                var url = "/api/Financial/PostReceivablesOperate"
+                var that = this
+                this.$axios({
+                    method: 'post',
+                    url: url,
+                    headers: {
+                        Authorization: 'Bearer ' + this.token
+                    },
+                    data:{
+                        portType: 1,
+                        diId: that.diid,
+                        userId:that.userid,
+                        foreignReceivablesInfos:arrnew
+                    }
+                }).then(function (res) {
+                    if(res.data.code==200){
+                        that.$message({
+                            message: res.data.msg,
+                            type: 'success'
+                        });
+                        console.log(res)
+                        that.GetGroupReceivablesInfoByDiId()
+                    }else{
+                        that.$message.error('保存失败!数据异常');
+                    }
+                })
+            }else{
+                this.$message.error('请检查数据是否完整!');
+            }
+        },
+        //计算应收
     },
     filters:{
         filter_time(value){
@@ -306,7 +755,15 @@ export default {
             return value
         }
     },
+    watch:{
+        // 此处监听variable变量,当期有变化时执行
+        // expends(item1,item2){
+            // item1为新值,item2为旧值
+            // console.log(item1,item2)
+        // }
+    },
     mounted(){
+        this.userid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
         this.GetForeignReceivablesDataSources()
     }
 }
@@ -354,8 +811,14 @@ export default {
     align-items: center;
     justify-content: space-between;
 }
+.Unassigned-checked{
+    margin: 10px 0;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
 .paid-box{
-    margin-left:40px;
+    margin: 0 8px;
     display: flex;
     align-items: center;
     justify-content:space-between;
@@ -372,7 +835,55 @@ export default {
 .editNum input[type="number"] {
     -moz-appearance: textfield;
 }
+.el-table .el-table__expanded-cell[class*="cell"] {
+    background: #F5F7FA;
+}
 .inside-li{
-    margin-left:40px;
+    margin: 0 8px;
+}
+.el-table__expanded-cell:hover {
+    background-color: #F5F7FA!important;
+}
+.checked-label{
+    font-size: 15px;
+    font-weight:600 ;
+    color: #606266;
+}
+
+
+.el-dropdown {
+    vertical-align: top;
+}
+.el-dropdown + .el-dropdown {
+    margin-left: 15px;
+}
+.el-icon-arrow-down {
+    font-size: 12px;
+}
+.collection-all .el-input-number{
+    width: 100%;
+}
+.sub-box{
+    -ms-user-select: none;
+    -khtml-user-select: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    user-select: none;
+    font-family: cursive;
+    background-color: #FFF;
+    background-image: none;
+    border-radius: 4px;
+    border: 1px solid #DCDFE6;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    color: #606266;
+    display: inline-block;
+    height: 40px;
+    line-height: 40px;
+    outline: 0;
+    padding: 0 15px;
+    -webkit-transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+    transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+    width: 100%;  
 }
 </style>

+ 747 - 0
src/components/OP/EntryDetails.vue

@@ -0,0 +1,747 @@
+<template>
+    <div>
+        <div class="Entry-all">
+            <div class="Entry-head">
+                <div class="Entry-head-li">
+                    <label>团组名称:</label>
+                    <el-select 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="Entry-head-li">
+                    <el-button type="primary">计算费用</el-button>
+                    <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="Entry-form">
+                <div class="Entry-form-li">
+                    <div class="Entry-li-lable">
+                        <div class="li-lable">一、境内费用(其他费用)</div>
+                        <div class="li-lable">
+                            <span class="redzhu">(注:填好数值鼠标点击其他区域计算合计)</span>
+                            <label>合计:</label>
+                            <div class="sub-boxs">{{DomesticFees.total=(DomesticFees.visafees+DomesticFees.vaccinefees+DomesticFees.nucleicfees+DomesticFees.serviceCharge+DomesticFees.insurance+DomesticFees.ticketsExhibitionL)|numFilter}}</div>
+                            <span>元/人</span>
+                        </div>
+                    </div>
+                    <div class="Entry-li-inif">
+                        <div class="Entry-inif-box">
+                            <label>签证费:</label>
+                            <el-input-number size="mini"  :controls="false" :precision="2" v-model="DomesticFees.visafees"></el-input-number>
+                            <span>元/人</span>
+                        </div>
+                        <div class="Entry-inif-box">
+                            <label>签证费用描述:</label>
+                            <el-input style="width:250px" size="mini" v-model="DomesticFees.visafeesDescription"></el-input>
+                            <span class="redzhu">* 例:日本:200元/人;加拿大:767.5元/人;</span>
+                        </div>
+                    </div>
+                    <div class="Entry-li-inif">
+                        <div class="Entry-inif-box">
+                            <label>疫苗费:</label>
+                            <el-input-number size="mini"  :controls="false" :precision="2" v-model="DomesticFees.vaccinefees"></el-input-number>
+                            <span>元/人</span>
+                        </div>
+                        <div class="Entry-inif-box">
+                            <label>核酸检测费:</label>
+                            <el-input-number size="mini"  :controls="false" :precision="2" v-model="DomesticFees.nucleicfees"></el-input-number>
+                            <span>元/人;</span>
+                        </div>
+                        <div class="Entry-inif-box">
+                            <label> 服务费:</label>
+                            <el-input-number size="mini"  :controls="false" :precision="2" v-model="DomesticFees.serviceCharge"></el-input-number>
+                            <span>元/人;</span>
+                        </div>
+                    </div>
+                    <div class="Entry-li-inif">
+                        <div class="Entry-inif-box">
+                            <label>保险费:</label>
+                            <el-input-number size="mini"  :controls="false" :precision="2" v-model="DomesticFees.insurance"></el-input-number>
+                            <span>元/人</span>
+                        </div>
+                        <div class="Entry-inif-box">
+                            <label>参展门票:</label>
+                            <el-input-number size="mini"  :controls="false" :precision="2" v-model="DomesticFees.ticketsExhibitionL"></el-input-number>
+                            <span>元/人;</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="Entry-form-li">
+                    <div class="Entry-li-lable">
+                        <div class="li-lable">二、国际旅费合计:</div>
+                        <div style="display: flex;">
+                            <div class="li-lable">
+                                <label>(经济舱)</label>
+                                <div class="sub-boxs">{{TotalExpenses.EconomyClasstotal=(TotalExpenses.EconomyClass+TotalExpenses.TravellingExpenses)|numFilter}}</div>
+                                <span>元/人</span>
+                            </div>
+                            &nbsp;&nbsp;                         
+                            <div class="li-lable">
+                                <label>(公务舱)</label>
+                                <div class="sub-boxs">{{TotalExpenses.EconomyClasstotal=(TotalExpenses.BusinessClass+TotalExpenses.TravellingExpenses)|numFilter}}</div>
+                                <span>元/人</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="Entry-li-inif">
+                        <label>国际机票:&nbsp; &nbsp; &nbsp; </label>
+                        <div class="Entry-inif-box">
+                            <label>(经济舱):</label>
+                            <el-input-number size="mini"  :controls="false" :precision="2" v-model="TotalExpenses.EconomyClass"></el-input-number>
+                            <span>元/人</span>
+                        </div>
+                        <div class="Entry-inif-box">
+                            <label>(公务舱):</label>
+                            <el-input-number size="mini"  :controls="false" :precision="2" v-model="TotalExpenses.BusinessClass"></el-input-number>
+                            <span>元/人;</span>
+                        </div>
+                    </div>
+                    <div class="Entry-li-inif">
+                        <div class="Entry-inif-box">
+                            <label>城市区间交通费:</label>
+                            <el-input-number size="mini"  :controls="false" :precision="2" v-model="TotalExpenses.TravellingExpenses"></el-input-number>
+                            <span>元/人;</span>
+                        </div>
+                    </div>
+                    <div class="Entry-li-inif">
+                        <div v-for="(item,index) in currencys" :key="index" class="Entry-inif-box">
+                            <label>{{item.currencyName}}汇率:</label>
+                            <el-input-number size="mini"  :controls="false" :precision="2" v-model="item.rate"></el-input-number>
+                        </div>
+                    </div>
+                </div>
+                <div class="Entry-form-li">
+                    <div class="Entry-li-lable">
+                        <div class="li-lable">三、住宿费:</div>
+                        <div style="display: flex;">
+                            <div class="li-lable">
+                                <label>合计:</label>
+                                <div class="sub-boxs">{{TotalExpenses.EconomyClasstotal=(TotalExpenses.EconomyClass+TotalExpenses.TravellingExpenses)|numFilter}}</div>
+                                <span>元/人</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="Entry-li-inif">
+                        <el-table
+                            :data="quarterageData"
+                            border
+                            style="width: 100%">
+                            <el-table-column
+                            prop="days"
+                            label="第几晚"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input-number size="mini"  :controls="false" v-model="scope.row.days"></el-input-number>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            style="position: relative;"
+                            prop="city"
+                            label="城 市"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.city"></el-input>
+                                </template>
+                                <!-- <template slot-scope="scope">
+                                    <el-select size="mini" v-model="scope.row.place" filterable placeholder="请选择">
+                                        <el-option
+                                            v-for="item in placeinif"
+                                            :key="item.id"
+                                            :label="item.city=='所有城市'?item.country:item.city"
+                                            :value="item.city=='所有城市'?item.country:item.city"
+                                            >
+                                            <span style="float: left">{{item.city}}</span>
+                                            <span style="float: right; color: #8492a6; font-size: 13px">{{item.country}}</span>
+                                        </el-option>
+                                    </el-select>
+                                </template> -->
+                            </el-table-column>
+                            <el-table-column
+                            prop="cost"
+                            label=" 费用标准"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input-number size="mini" :precision="2" :controls="false" v-model="scope.row.cost"></el-input-number>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="currencyName"
+                            label=" 币 种"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.currencyName"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="subTotal"
+                            label="费用小计"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <div class="sub-boxs">{{scope.row.subTotal|numFilter}}</div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="address"
+                            label="操 作">
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </div>
+                <div class="Entry-form-li">
+                    <div class="Entry-li-lable">
+                        <div class="li-lable">四、伙食费:</div>
+                        <div style="display: flex;">
+                            <div class="li-lable">
+                                <label>合计:</label>
+                                <div class="sub-boxs">{{TotalExpenses.EconomyClasstotal=(TotalExpenses.EconomyClass+TotalExpenses.TravellingExpenses)|numFilter}}</div>
+                                <span>元/人</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="Entry-li-inif">
+                        <el-table
+                            :data="boardWagesData"
+                            border
+                            style="width: 100%">
+                            <el-table-column
+                            prop="days"
+                            label="第几晚"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input-number size="mini"  :controls="false" v-model="scope.row.days"></el-input-number>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            style="position: relative;"
+                            prop="city"
+                            label="城 市"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.city"></el-input>
+                                </template>
+                                <!-- <template slot-scope="scope">
+                                    <el-select size="mini" v-model="scope.row.place" filterable placeholder="请选择">
+                                        <el-option
+                                            v-for="item in placeinif"
+                                            :key="item.id"
+                                            :label="item.city=='所有城市'?item.country:item.city"
+                                            :value="item.city=='所有城市'?item.country:item.city"
+                                            >
+                                            <span style="float: left">{{item.city}}</span>
+                                            <span style="float: right; color: #8492a6; font-size: 13px">{{item.country}}</span>
+                                        </el-option>
+                                    </el-select>
+                                </template> -->
+                            </el-table-column>
+                            <el-table-column
+                            prop="cost"
+                            label=" 费用标准"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input-number size="mini" :precision="2" :controls="false" v-model="scope.row.cost"></el-input-number>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="currencyName"
+                            label=" 币 种"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.currencyName"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="subTotal"
+                            label="费用小计"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <div class="sub-boxs">{{scope.row.subTotal|numFilter}}</div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="address"
+                            label="操 作">
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </div>
+                <div class="Entry-form-li">
+                    <div class="Entry-li-lable">
+                        <div class="li-lable">五、公杂费:</div>
+                        <div style="display: flex;">
+                            <div class="li-lable">
+                                <label>合计:</label>
+                                <div class="sub-boxs">{{TotalExpenses.EconomyClasstotal=(TotalExpenses.EconomyClass+TotalExpenses.TravellingExpenses)|numFilter}}</div>
+                                <span>元/人</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="Entry-li-inif">
+                        <el-table
+                            :data="miscellaneousFeeData"
+                            border
+                            style="width: 100%">
+                            <el-table-column
+                            prop="days"
+                            label="第几晚"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input-number size="mini"  :controls="false" v-model="scope.row.days"></el-input-number>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            style="position: relative;"
+                            prop="city"
+                            label="城 市"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.city"></el-input>
+                                </template>
+                                <!-- <template slot-scope="scope">
+                                    <el-select size="mini" v-model="scope.row.place" filterable placeholder="请选择">
+                                        <el-option
+                                            v-for="item in placeinif"
+                                            :key="item.id"
+                                            :label="item.city=='所有城市'?item.country:item.city"
+                                            :value="item.city=='所有城市'?item.country:item.city"
+                                            >
+                                            <span style="float: left">{{item.city}}</span>
+                                            <span style="float: right; color: #8492a6; font-size: 13px">{{item.country}}</span>
+                                        </el-option>
+                                    </el-select>
+                                </template> -->
+                            </el-table-column>
+                            <el-table-column
+                            prop="cost"
+                            label=" 费用标准"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input-number size="mini" :precision="2" :controls="false" v-model="scope.row.cost"></el-input-number>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="currencyName"
+                            label=" 币 种"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.currencyName"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="subTotal"
+                            label="费用小计"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <div class="sub-boxs">{{scope.row.subTotal|numFilter}}</div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="address"
+                            label="操 作">
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </div>
+                <div class="Entry-form-li">
+                    <div class="Entry-li-lable">
+                        <div class="li-lable">六、培训费</div>
+                        <div style="display: flex;">
+                            <div class="li-lable">
+                                <label>合计:</label>
+                                <div class="sub-boxs">{{TotalExpenses.EconomyClasstotal=(TotalExpenses.EconomyClass+TotalExpenses.TravellingExpenses)|numFilter}}</div>
+                                <span>元/人</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="Entry-li-inif">
+                        <el-table
+                            :data="trainingExpenseData"
+                            border
+                            style="width: 100%">
+                            <el-table-column
+                            prop="days"
+                            label="第几晚"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input-number size="mini"  :controls="false" v-model="scope.row.days"></el-input-number>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            style="position: relative;"
+                            prop="city"
+                            label="城 市"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.city"></el-input>
+                                </template>
+                                <!-- <template slot-scope="scope">
+                                    <el-select size="mini" v-model="scope.row.place" filterable placeholder="请选择">
+                                        <el-option
+                                            v-for="item in placeinif"
+                                            :key="item.id"
+                                            :label="item.city=='所有城市'?item.country:item.city"
+                                            :value="item.city=='所有城市'?item.country:item.city"
+                                            >
+                                            <span style="float: left">{{item.city}}</span>
+                                            <span style="float: right; color: #8492a6; font-size: 13px">{{item.country}}</span>
+                                        </el-option>
+                                    </el-select>
+                                </template> -->
+                            </el-table-column>
+                            <el-table-column
+                            prop="cost"
+                            label=" 费用标准"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input-number size="mini" :precision="2" :controls="false" v-model="scope.row.cost"></el-input-number>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="currencyName"
+                            label=" 币 种"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.currencyName"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="subTotal"
+                            label="费用小计"
+                            width="180">
+                                <template slot-scope="scope">
+                                    <div class="sub-boxs">{{scope.row.subTotal|numFilter}}</div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="address"
+                            label="操 作">
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            value:'',
+            options:[],
+            Visafees:'',
+            Visadepicted:'',
+            currencys: [],
+            DomesticFees:{
+                visafees:'',//签证费
+                visafeesDescription:'',//签证费用描述
+                vaccinefees:0,//疫苗费
+                nucleicfees:0,//核酸检测费
+                serviceCharge:0,//服务费
+                insurance:0,//保险费
+                ticketsExhibitionL:0,//参展门票
+                total:0
+            },
+            TotalExpenses:{
+                EconomyClass:0,//经济舱
+                BusinessClass:0,//公务舱
+                TravellingExpenses:0,//城市区间交通费
+                EconomyClasstotal:0,//经济舱合计
+                BusinessClasstotal:0,//公务舱合计
+            },
+            quarterageData: [],
+            boardWagesData:[],
+            miscellaneousFeeData:[],
+            trainingExpenseData:[],
+            placeinif:[],
+            //下拉框
+            treeData: "",
+            treeDataValue: "",
+            data: [
+                {
+                id: 1,
+                name: "一级 1",
+                children: [
+                    {
+                    id: 4,
+                    label: "二级 1-1",
+                    },
+                ],
+                },
+                {
+                id: 2,
+                name: "一级 2",
+                children: [
+                    {
+                    id: 5,
+                    name: "二级 2-1",
+                    },
+                    {
+                    id: 6,
+                    name: "二级 2-2",
+                    },
+                ],
+                },
+                {
+                id: 3,
+                name: "一级 3",
+                children: [
+                    {
+                    id: 7,
+                    name: "二级 3-1",
+                    },
+                    {
+                    id: 8,
+                    name: "二级 3-2",
+                    },
+                ],
+                },
+            ],
+            defaultProps: {
+                children: "cityData",
+                label:"city",
+                // label: "country",
+            },
+        }
+    },
+    methods:{
+        //获取团组
+        GetEnterExitCostDataSource(){
+            var url = "/api/Groups/GetEnterExitCostDataSource"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data:{
+                    portType: 1
+                }
+            }).then(function (res) {
+                console.log(res)
+                if(res.data.code==200){
+                    that.options=res.data.data.groupNameData;
+                    that.value=res.data.data.groupNameData[0].id;
+                    that.placeinif=res.data.data.nationalTravelFeeData;
+                    that.GetEnterExitCostInfobyDiId()
+                }
+            })
+        },
+        //获取费用标注
+        GetNationalTravelFeeData(){
+            var url = "/api/Groups/GetNationalTravelFeeData"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data:{
+                    portType: 1
+                }
+            }).then(function (res) {
+                console.log(res)
+                if(res.data.code==200){
+                    that.placeinif=res.data.data;
+                    console.log(that.placeinif)
+                }
+            })
+        },
+        GetEnterExitCostInfobyDiId(){
+            var url = "/api/Groups/GetEnterExitCostInfobyDiId"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data:{
+                    portType: 1,
+                    diId: that.value
+                }
+            }).then(function (res) {
+                if(res.data.code==200){
+                    console.log(res)
+                    //汇率
+                    that.currencys=res.data.data.currencys;
+                    //境内费用
+                    that.DomesticFees.visafees=res.data.data.visa;
+                    that.DomesticFees.visafeesDescription=res.data.data.visaRemark;
+                    that.DomesticFees.vaccinefees=res.data.data.yiMiao;
+                    that.DomesticFees.nucleicfees=res.data.data.heSuan;
+                    that.DomesticFees.serviceCharge=res.data.data.service;
+                    that.DomesticFees.insurance=res.data.data.safe;
+                    that.DomesticFees.ticketsExhibitionL=res.data.data.ticket;
+                    //国际旅费
+                    that.TotalExpenses.EconomyClass=res.data.data.outsideJJPay;
+                    that.TotalExpenses.BusinessClass=res.data.data.outsaideGWPay;
+                    that.TotalExpenses.TravellingExpenses=res.data.data.cityTranffic;
+                    //住宿费
+                    that.quarterageData=res.data.data.quarterageData;
+                    //伙食费
+                    that.boardWagesData=res.data.data.boardWagesData;
+                    //公杂费
+                    that.miscellaneousFeeData=res.data.data.miscellaneousFeeData;
+                    //培训费
+                    that.trainingExpenseData=res.data.data.trainingExpenseData;
+                }
+            })
+        },
+        //下拉
+        handNodeClick(data,node,e){
+            console.log(data)
+            console.log(node)
+            console.log(e)
+            this.treeDataValue= data.name
+            this.treeData= data.name
+            console.log(this.treeData)
+        }
+    },
+    filters: {
+        numFilter (value) {
+            // 截取当前数据到小数点后两位
+            let realVal = parseFloat(value).toFixed(2)
+            return realVal
+        }
+    },
+    watch: {
+        //境内费用
+        DomesticFees: {
+            handler(newVal, oldVal) {
+                if(newVal.insurance==undefined){
+                    newVal.insurance=0
+                }
+                if(newVal.nucleicfees==undefined){
+                    newVal.nucleicfees=0
+                }
+                if(newVal.serviceCharge==undefined){
+                    newVal.serviceCharge=0
+                }
+                if(newVal.ticketsExhibitionL==undefined){
+                    newVal.ticketsExhibitionL=0
+                }
+                if(newVal.vaccinefees==undefined){
+                    newVal.vaccinefees=0
+                }
+                if(newVal.visafees==undefined){
+                    newVal.visafees=0
+                }
+            },
+            immediate: true,
+            deep: true // 可以深度检测到 person 对象的属性值的变化
+        },
+        //国际旅费
+        TotalExpenses: {
+            handler(newVal, oldVal) {
+                if(newVal.EconomyClass==undefined){
+                    newVal.EconomyClass=0
+                }
+                if(newVal.BusinessClass==undefined){
+                    newVal.BusinessClass=0
+                }
+                if(newVal.TravellingExpenses==undefined){
+                    newVal.TravellingExpenses=0
+                }
+            },
+            immediate: true,
+            deep: true // 可以深度检测到 person 对象的属性值的变化
+        }
+    },
+    mounted(){
+        this.GetEnterExitCostDataSource();
+        this.GetNationalTravelFeeData();
+    }
+}
+</script>
+<style>
+.Entry-all{
+    background-color: #fff;
+    padding: 10px;
+    box-shadow: 0 0 5px #0005;
+    border-radius: 10px;
+    height: 100%;
+    min-height: 840px;
+}
+.Entry-head-li label{
+    color: #606266;
+    font-size: 15px;
+    font-weight: 600;
+}
+.Entry-head{
+    display: flex;
+    justify-content: space-between;
+}
+.Entry-form{
+    margin-top: 10px;
+    border-top:2px solid #409EFF;
+}
+.Entry-li-inif{
+    display: flex;
+    width: 100%;
+    border-top:1px solid #ebeef5;
+    padding: 5px 0;
+}
+.Entry-li-inif:last-child{
+    border-bottom:1px solid #ebeef5;
+}
+.Entry-li-lable{
+    display: flex;
+    justify-content: space-between;
+    margin: 10px 0;
+}
+.Entry-inif-box .depipt{
+    display: inline-block;
+    width: 240px;
+}
+.Entry-inif-box{
+    margin-right: 20px;
+}
+.Entry-li-inif label{
+    font-size: 14px;
+    color: #606266;
+}
+.Entry-li-inif span{
+    font-size: 14px;
+    color: #606266;
+}
+.Entry-form .redzhu{
+    font-size: 14px;
+    color: red;
+}
+.sub-boxs{
+    -ms-user-select: none;
+    -khtml-user-select: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    font-size: 14px;
+    user-select: none;
+    font-family: cursive;
+    background-color: #FFF;
+    background-image: none;
+    border-radius: 4px;
+    border: 1px solid #DCDFE6;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    color: #606266;
+    display: inline-block;
+    height: 28px;
+    line-height: 28px;
+    outline: 0;
+    padding: 0 15px;
+    -webkit-transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+    transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+}
+.opc-city{
+    
+}
+</style>

+ 13 - 0
src/components/Resource/HotelReservations.vue

@@ -0,0 +1,13 @@
+<template>
+    <div>
+        酒店预订
+    </div>
+</template>
+<script>
+export default {
+    
+}
+</script>
+<style>
+    
+</style>

+ 2 - 2
src/main.js

@@ -19,8 +19,8 @@ Vue.use(VueQuillEditor);
 
 Vue.use(VueTypedJs)
 import axios from 'axios';
-//axios.defaults.baseURL = 'http://132.232.92.186:8888';
-axios.defaults.baseURL = 'http://localhost:5256/';
+axios.defaults.baseURL = 'http://132.232.92.186:8888';
+// axios.defaults.baseURL = 'http://localhost:5256/';
 import { Message } from "element-ui";
 
 import common from './assets/js/common'//全局

+ 12 - 0
src/router/index.js

@@ -68,9 +68,11 @@ 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 DelegationEnData from '@/components/OP/DelegationEnData'
 import OpDelegationEnData from '@/components/OP/OpDelegationEnData'
 import invitationLetter from '@/components/Resource/invitationLetter'
+import EntryDetails from '@/components/OP/EntryDetails'
 Vue.use(Router)
 
 export default new Router({
@@ -412,6 +414,16 @@ export default new Router({
           path: '/home/invitationLetter',
           name: 'invitationLetter',
           component: invitationLetter
+        },
+        {
+          path: '/home/EntryDetails',
+          name: 'EntryDetails',
+          component: EntryDetails
+        },
+        {
+          path: '/home/HotelReservations',
+          name: 'HotelReservations',
+          component: HotelReservations
         }
       ]
     },