酒店

src/api.js

@@ -255,6 +255,9 @@ export default {
 	getConferenceList: params => {
 		return axios.get(`${baseURL}/api/admin/conference/list`, { params: params });
 	},
+	putConference: params => {
+		return axios.put(`${baseURL}/api/admin/conference`, params);
+	},
 	getSignupList: params => {
 		return axios.get(`${baseURL}/api/admin/signup/list`, { params: params });
 	},

src/components/hotel.vue

@@ -53,16 +53,16 @@
 <template>
     <section class="add_hotel">
         <el-form label-width="100px" size='small'>
-            <!-- 新增 编辑-->
+            <!-- 新增 编辑 绑定-->
             <el-row v-if='h_status!=="view"'>
                 <el-col :span="12">
                     <el-form-item label="会议名称">
-                        <el-input disabled v-model="form.name"></el-input>
+                        <el-input disabled v-model="huiyi_name"></el-input>
                     </el-form-item>
                 </el-col>                
                 <el-col :span="10">
                    <el-form-item label="选择历史酒店">
-                        <el-select placeholder="请选择酒店" v-model="form.sponsor" clearable filterable>
+                        <el-select placeholder="请选择酒店" @change="getData" v-model="cur_id" clearable filterable>
                             <el-option
                                 v-for="(item, index) in organizerList"
                                 :key="index"
@@ -231,8 +231,8 @@
                     <p style="color:#999;padding:10px 33px;">房型1</p>
                     <el-form-item label="房型名称">
                         <p style="color:#666;">
-                            房型名称：{{item.name}}|数量：{{item.room_number}}间|可住人数：{{item.enable_number}}人|面积：{{item.room_area}}平方米|
-                        楼层：{{item.floor}}层|床型：{{item.bed_type}}|餐食：{{item.food_condition}}|窗户：{{item.window_condition}}|房型：{{item.room_type}}|房价：{{item.unit_price}}
+                            {{item.name}} | 数量：{{item.room_number}}间 | 可住人数：{{item.enable_number}}人 | 面积：{{item.room_area}}平方米 |
+                        楼层：{{item.floor}}层 | 床型：{{item.bed_type}} | 餐食：{{item.food_condition}} | 窗户：{{item.window_condition}} | 房型：{{item.room_type}} | 房价：{{item.unit_price}}
                         </p>
                     </el-form-item>
                     <el-form-item label="房型图片">
@@ -243,7 +243,7 @@
                         </ul>
                     </el-form-item>
                     <el-form-item label-width="30px">
-                        已经预定：9  &nbsp;&nbsp;剩余：31
+                        已经预定：{{item.order}}  &nbsp;&nbsp;剩余：{{item.surplus_number}}
                         <el-button size="big" type="text">查看报名老师</el-button>
                     </el-form-item>
                 </el-col> 
@@ -272,10 +272,13 @@ export default {
     name:'hotel',
     props:{
         status:'',
-        cur_id:''
+        cur_id:'',  //酒店ID
+        huiyi_id:'', //会议ID
+        huiyi_name:''
     },
     data(){
         return{
+            id:'',
             dialogVisible:false,
             h_status:'view',
             organizerList:[],
@@ -293,7 +296,7 @@ export default {
                 { name:'一人单住或标间合住',value:2 }
             ],
             local:null,
-            keyword:''
+            keyword:'',
         }
     },
     methods:{
@@ -305,7 +308,7 @@ export default {
         },
         //添加房型
         add_type(){
-            this.type.push({img:[]})
+            this.type.push({imgs:[]})
         },
         //删除
         del(index){
@@ -397,20 +400,28 @@ export default {
         save(type){
             var form=this.form;
             form.rooms=this.type;
-            if(this.h_status == 'add'){
+            if(this.h_status == 'add' || this.h_status == 'bind'){
                 this.$api.addHotel(form).then(res=>{
                     if(res.data.code == 0){
                         this.$message({
                                     message: '添加成功',
                                     type: 'success'
                         })
-                        if(type==1){
-                            this.form={imgs:[]};
-                            this.type=[{imgs:[]}];
+                        if(this.h_status == 'add'){
+                            if(type==1){
+                                this.form={imgs:[]};
+                                this.type=[{imgs:[]}];
+                            }else{
+                                this.$emit('addSuccess')
+                            }
                         }else{
-                            this.$emit('addSuccess')
+                            //绑定酒店
+                            this.$api.putConference().then(res=>{
+                                
+                            })
                         }
                         
+                        
                     }else{
                         this.$message({
                                     message: res.data.message,
@@ -472,7 +483,7 @@ export default {
     watch:{
         status(curVal,oldVal){
             this.h_status=curVal
-            if(curVal!='add'){
+            if(curVal!='add' && curVal!='bind'){
                 this.getData();
             }
         },
@@ -481,8 +492,12 @@ export default {
         }
     },
     created(){
+        console.log(this.huiyi_id,this.huiyi_name)
+        this.$api.getHotelList().then(res=>{
+                this.organizerList=res.data.data.list;
+        })
         this.h_status=this.status;
-        if(this.h_status!='add'){
+        if(this.h_status!='add'&&this.h_status!='bind'){
                 this.getData();
         }
     }

src/views/conference/Apply.vue

@@ -118,6 +118,14 @@
                     <el-table-column
                     prop=""  
                     label="状态">
+                    <template slot-scope="scope">
+                        <span v-if='scope.row.signup_status==0'>待上传</span>
+                        <span v-if='scope.row.signup_status==1'>待审核</span>
+                        <span v-if='scope.row.signup_status==2'>待选酒店</span>
+                        <span v-if='scope.row.signup_status==3'>待核销</span>
+                        <span v-if='scope.row.signup_status==4'>已核销</span>
+                        <span v-if='scope.row.signup_status==-1'>已驳回</span>
+                    </template>
                     </el-table-column>
                     <el-table-column  
                     prop="zip"  width="260" fixed="right"

src/views/conference/Hotel.vue

@@ -79,7 +79,7 @@
                     prop="zip"  width="200" fixed="right"
                     label="操作">
                     <template slot-scope="scope">
-                        <el-button  @click="dialogVisible=true,dialogTitle='酒店信息',status='view'" class="edit"  type="text" >查看</el-button>
+                        <el-button  @click="dialogVisible=true,dialogTitle='酒店信息',status='view',cur_id=scope.row.id" class="edit"  type="text" >查看</el-button>
                         <el-button @click="dialogVisible=true,dialogTitle='编辑酒店',status='edit',cur_id=scope.row.id"  type="text">编辑</el-button>
                         <el-button @click="del(scope.row.id)"  class="del" type="text" >删除</el-button>
                     </template>
@@ -118,7 +118,6 @@ export default {
     },
     methods:{
         add(){
-            console.log(233)
             this.dialogVisible=false;
             this.getData();
         },

src/views/conference/Manage.vue

@@ -38,7 +38,7 @@
                     default-expand-all row-key="id"
                     style="width: 100%">
                     <el-table-column
-                    prop="name"  
+                    prop="name"   width="200"
                     label="会议名称">
                     </el-table-column>
                     <el-table-column
@@ -73,8 +73,8 @@
                     <el-table-column  
                     prop="zip"  width="150"
                     label="操作">
-                    <template slot-scope="">
-                        <el-button  @click="dialogVisible=true"  type="text" >添加酒店</el-button>
+                    <template slot-scope="scope">
+                        <el-button  @click="dialogVisible=true,status='bind',cur_id=scope.row.id,name=scope.row.name"  type="text" >添加酒店</el-button>
                         <el-button class="edit" type="text">查看酒店</el-button>
                     </template>
                     </el-table-column>
@@ -85,7 +85,7 @@
         <el-dialog width="80%" class="hotel"
         :title="dialogTitle" :close-on-click-modal='false'
         :visible.sync="dialogVisible">
-            <Hotel/>
+            <Hotel :status='status' :huiyi_name='name' :huiyi_id='cur_id' @addSuccess='add'/>
         </el-dialog>
     </section>
 </template>
@@ -100,6 +100,9 @@ export default {
   data(){
     return{
       edit:0,
+      cur_id:'',
+      name:'',
+      status:'',
       form:{name:'',page:1,page_size:20},
       form1:{},
       total:1,
@@ -115,6 +118,10 @@ export default {
   methods:{
       addConference(){
           this.$router.push({path:'/conference/conference/add'})
+      },
+      //添加酒店
+      add(){
+
       },
       gopage(size){
             if(size){