Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/zky-admin

src/components/hotel.vue

@@ -251,7 +251,7 @@
                     </el-form-item>
                     <el-form-item label-width="30px">
                         已经预定：{{item.order}}  &nbsp;&nbsp;剩余：{{item.surplus_number}}
-                        <el-button size="big" type="text">查看报名老师</el-button>
+                        <el-button @click="view(form.id,item.id)" size="big" type="text">查看报名老师</el-button>
                     </el-form-item>
                 </el-col> 
             </el-row>
@@ -308,6 +308,9 @@ export default {
         }
     },
     methods:{
+        view(hid,rid){
+            this.$emit('view',{hotel_id:hid,room_id:rid})
+        },
         getList(){
             this.$api.getHotelList().then(res=>{
                 this.organizerList=res.data.data.list;

src/views/conference/AddConference.vue

@@ -187,10 +187,10 @@
                             </el-radio-group> -->
                         </el-form-item>
                     </el-col>
-                    <el-col :span="24">
+                    <el-col :span="24" v-if='form.is_signup'>
                       <el-form-item label='报名需提交信息：'>
                         <el-checkbox-group v-model='form.signup_fields'>
-                            <el-checkbox v-for='(item,index) in signup_fields' :key='index' :label='item.id'>{{item.name}}</el-checkbox>
+                            <el-checkbox v-for='(item,index) in signup_fields'   :disabled='item.disabled' :key='index' :label='item.id'>{{item.name}}</el-checkbox>
                         </el-checkbox-group>
                     </el-form-item>
                   </el-col>
@@ -404,7 +404,7 @@ export default {
                     { name: "职务", id: "job" },
                     { name: "职称", id: "title" },
                     { name: "公司", id: "company" },
-                    { name: "电话", id: "phone" },
+                    { name: "电话", id: "phone" ,disabled:true},
                     { name: "邮箱", id: "email" }
             ],
             form: {
@@ -412,7 +412,7 @@ export default {
                 is_popular:0,
                 is_recommend:0,
                 citys:[],
-                signup_fields:[],
+                signup_fields:['name','sex','age','job','title','company','phone','email'],
                 speaker:[
                     {name:'',intruduce:''}
                 ],

src/views/conference/Apply.vue

@@ -145,7 +145,7 @@
                     prop="zip"  width="260" fixed="right"
                     label="操作">
                     <template slot-scope="scope">
-                        <el-button  @click="invoice=scope.row,dialogVisible2=true" class="edit"  type="text" >审核</el-button>
+                        <el-button  @click="invoice=scope.row,dialogVisible2=true,invoice.reject_reason=''" class="edit"  type="text" >审核</el-button>
                         <el-button @click="invoice=scope.row,dialogVisible=true"  type="text">发票详情</el-button>
                         <el-button @click="proof_img=scope.row.proof_img,dialogVisible3=true"    type="text" >入住凭证</el-button>
                         <el-button @click="dialogVisible1=true,getReason(scope.row)"   type="text" >驳回原因</el-button>
@@ -338,4 +338,9 @@ export default {
         this.getData();
     }
 }
-</script>
+
+
+
+</script>
+
+

src/views/conference/Hotel.vue

@@ -98,7 +98,30 @@
         <el-dialog width="80%" class="hotel"
         :title="dialogTitle" :close-on-click-modal='false' 
         :visible.sync="dialogVisible">
-            <Hotel :status='status' :cur_id='cur_id' @addSuccess='add'/>
+            <Hotel @view='viewUser' :status='status' :cur_id='cur_id' @addSuccess='add'/>
+        </el-dialog>
+        <el-dialog width="80%" class="hotel"
+        title="报名列表" :close-on-click-modal='false'
+        :visible.sync="dialogVisible1">
+            <el-table
+                    class="table"
+                    :data="user_list" height="400"
+                    default-expand-all 
+                    style="width: 100%;margin-top:10px;">
+                    <el-table-column prop="name"  label="真实姓名">
+                    </el-table-column>
+                    <el-table-column prop="username"    label="昵称">
+                    </el-table-column>
+                    <el-table-column prop=""    label="头像">
+                    </el-table-column>
+                    <el-table-column prop="ctime"    label="性别">
+                         <template slot-scope="scope">
+                            {{scope.row.sex==0?'男':'女'}}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="phone"    label="手机号">
+                    </el-table-column>
+           </el-table>
         </el-dialog>
     </section>
 </template>
@@ -120,12 +143,20 @@ export default {
             loading:false,
             dialogTitle:'添加酒店',
             dialogVisible:false,
+            dialogVisible1:false,
             status:'add',
             cur_id:'',
-            conference_list:[]
+            conference_list:[],
+            user_list:[]
         }
     },
     methods:{
+        viewUser(data){
+            this.dialogVisible1=true
+            this.$api.getSignupList(data).then(res=>{
+                this.user_list=res.data.data.list;
+            })
+        },
         add(){
             this.dialogVisible=false;
             this.getData();