酒店

src/views/conference/Apply.vue

@@ -87,12 +87,12 @@
                     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>
+                        <span v-if='scope.row.signup_status==0'><el-tag>待上传凭证</el-tag></span>
+                        <span v-if='scope.row.signup_status==1'><el-tag type="warning">待审核</el-tag></span>
+                        <span v-if='scope.row.signup_status==2'><el-tag type="warning">待选酒店</el-tag></span>
+                        <span v-if='scope.row.signup_status==3'><el-tag type="warning">待核销</el-tag></span>
+                        <span v-if='scope.row.signup_status==4'><el-tag type="success">已核销</el-tag></span>
+                        <span v-if='scope.row.signup_status==-1'><el-tag type="info">已驳回</el-tag></span>
                     </template>
                     </el-table-column>
                     <el-table-column
@@ -118,7 +118,7 @@
                     prop="email"  width="120"
                     label="邮箱">
                     </el-table-column>
-                    <el-table-column width="200"
+                    <el-table-column width="250"
                     prop="organizer_unit"  
                     label="单位">
                     </el-table-column>
@@ -135,11 +135,11 @@
                     label="入住天数">
                     </el-table-column>
                     <el-table-column
-                    prop="room_stime"  
+                    prop="room_stime"  width="120"
                     label="入住时间">
                     </el-table-column>
                     <el-table-column
-                    prop="room_etime"  
+                    prop="room_etime"   width="120"
                     label="离开时间">
                     </el-table-column>
                     <el-table-column  
@@ -254,7 +254,7 @@
                         <el-input  type="textarea" v-model="invoice.reject_reason"></el-input>
                     </el-form-item>
                     <el-form-item label="">
-                        <el-button @click="check(1)" type="primary">通过</el-button>
+                        <el-button @click="check(2)" type="primary">通过</el-button>
                         <el-button @click="check(-1)"  type="danger">驳回</el-button>
                     </el-form-item>
            </el-form>

src/views/conference/Hotel.vue

@@ -80,7 +80,7 @@
                     label="已举办会议">
                     </el-table-column>
                     <el-table-column
-                    prop=""  
+                    prop="ctime"  
                     label="创建时间">
                     </el-table-column>
                     <el-table-column  
@@ -105,7 +105,7 @@
         :visible.sync="dialogVisible1">
             <el-table
                     class="table"
-                    :data="user_list" height="400"
+                    :data="user_list" height="300"
                     default-expand-all 
                     style="width: 100%;margin-top:10px;">
                     <el-table-column prop="name"  label="真实姓名">