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

src/components/hotel.vue

@@ -419,7 +419,41 @@ export default {
         save(type){
             var form=this.form;
             form.rooms=this.type;
-            
+            if(!form.name){
+                this.$message({
+                    message: '请输入酒店名称',
+                    type: 'error'
+                })
+                return
+            }
+            if(!form.telphone){
+                this.$message({
+                    message: '请输入酒店电话',
+                    type: 'error'
+                })
+                return
+            }
+            if(!form.address){
+                this.$message({
+                    message: '请输入酒店地址',
+                    type: 'error'
+                })
+                return
+            }
+            if(form.imgs.length<=0){
+                this.$message({
+                    message: '请上传酒店图片',
+                    type: 'error'
+                })
+                return
+            }
+            if(!form.longitude||!form.latitude){
+                this.$message({
+                    message: '请获取酒店位置',
+                    type: 'error'
+                })
+                return
+            }
             //会议添加酒店
             if(this.h_status == 'bind'){
                 form.conference_id=this.huiyi_id;

src/views/conference/Apply.vue

@@ -60,6 +60,7 @@
                 </el-form>
             </div>
             <el-tabs v-model="form.order_status" @tab-click="tabClick">
+                <el-tab-pane name="-2" label="全部"></el-tab-pane>
                 <el-tab-pane name="0" label="待上传凭证"></el-tab-pane>
                 <el-tab-pane name="1" label="待审核"></el-tab-pane>
                 <el-tab-pane name="2" label="待选酒店"></el-tab-pane>
@@ -83,15 +84,15 @@
                     label="真实姓名">
                     </el-table-column>
                     <el-table-column
-                    prop=""  
+                    prop=""  width="130"
                     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 type="danger">待上传凭证</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 >待选酒店</el-tag></span>
+                        <span v-if='scope.row.signup_status==3'><el-tag >待核销</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
@@ -117,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>
@@ -134,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  
@@ -253,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>
@@ -273,7 +274,7 @@ export default {
     },
     data(){
         return{
-            form:{order_status:0,},
+            form:{order_status:'-2',},
             conferenceList:[],
             hotelList:[],
             list:[{}],
@@ -308,7 +309,8 @@ export default {
             this.reason=data
         },
         getData(){
-            var parm=this.form;        
+            var parm={...this.form};        
+            if(parm.order_status==-2){parm.order_status=''}
             this.loading=true
             this.$api.getSignupList(parm).then(res=>{
                 this.list=res.data.data.list;

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="真实姓名">