update

src/api.js

@@ -232,4 +232,19 @@ export default {
 	getAllOrganizer: params => {
 		return axios.get(`${baseURL}/api/admin/journal/organizer/all`, { params: params });
 	},
+	getConferenceList: params => {
+		return axios.get(`${baseURL}/api/admin/conference/list`, { params: params });
+	},
+	getSignupList: params => {
+		return axios.get(`${baseURL}/api/admin/signup/list`, { params: params });
+	},
+	putSignup: params => {
+		return axios.put(`${baseURL}/api/admin/signup `, params);
+	},
+	getVerifierList: params => {
+		return axios.get(`${baseURL}/api/admin/verifier/list`, { params: params });
+	},
+	getHotelList: params => {
+		return axios.get(`${baseURL}/api/admin/hotel/list`, { params: params });
+	},
 }

src/views/conference/Apply.vue

@@ -38,14 +38,14 @@
                             <el-select v-model="form.id" clearable placeholder="请选择酒店"></el-select>
                     </el-form-item>
                     <el-form-item>
-                        <el-button  type="primary">搜索</el-button>
+                        <el-button @click="getData" type="primary">搜索</el-button>
                     </el-form-item>
                     <el-form-item style="float:right" >
                         <el-button plain icon="el-icon-download" type="primary">导出Excel</el-button>
                     </el-form-item>
                 </el-form>
             </div>
-            <el-tabs v-model="order_status" @tab-click="tabClick">
+            <el-tabs v-model="form.order_status" @tab-click="tabClick">
                 <el-tab-pane name="-3" label="待审核"></el-tab-pane>
                 <el-tab-pane name="-1" label="待缴费"></el-tab-pane>
                 <el-tab-pane name="0" label="待上传凭证"></el-tab-pane>
@@ -61,11 +61,11 @@
                     default-expand-all row-key="id"
                     style="width: 100%">
                     <el-table-column
-                    prop="name"  
+                    prop="conference_name"  
                     label="会议名称">
                     </el-table-column>
                     <el-table-column
-                    prop="username"  
+                    prop="name"  
                     label="真实姓名">
                     </el-table-column>
                     <el-table-column
@@ -79,25 +79,28 @@
                     <el-table-column
                     prop=""  
                     label="性别">
+                    <template slot-scope="scope">
+                        {{scope.row.sex==0?'男':'女'}}
+                    </template>
                     </el-table-column>
                     <el-table-column
-                    prop=""  
+                    prop="phone"  
                     label="手机号">
                     </el-table-column>
                     <el-table-column
-                    prop=""  
+                    prop="email"  
                     label="邮箱">
                     </el-table-column>
                     <el-table-column
-                    prop=""  
+                    prop="organizer_unit"  
                     label="单位">
                     </el-table-column>
                     <el-table-column
-                    prop=""  
+                    prop="hotel_id"  
                     label="已选酒店">
                     </el-table-column>
                     <el-table-column
-                    prop=""  
+                    prop="room_id"  
                     label="已选房型">
                     </el-table-column>
                     <el-table-column
@@ -105,11 +108,11 @@
                     label="入住天数">
                     </el-table-column>
                     <el-table-column
-                    prop=""  
+                    prop="room_stime"  
                     label="入住时间">
                     </el-table-column>
                     <el-table-column
-                    prop=""  
+                    prop="room_etime"  
                     label="离开时间">
                     </el-table-column>
                     <el-table-column
@@ -119,9 +122,9 @@
                     <el-table-column  
                     prop="zip"  width="260" fixed="right"
                     label="操作">
-                    <template slot-scope="">
-                        <el-button  @click="dialogVisible2=true" class="edit"  type="text" >审核</el-button>
-                        <el-button @click="dialogVisible=true"  type="text">发票详情</el-button>
+                    <template slot-scope="scope">
+                        <el-button  @click="invoice=scope.row,dialogVisible2=true" class="edit"  type="text" >审核</el-button>
+                        <el-button @click="invoice=scope.row,dialogVisible=true"  type="text">发票详情</el-button>
                         <el-button    type="text" >入住凭证</el-button>
                         <el-button @click="dialogVisible1=true"   type="text" >驳回原因</el-button>
                     </template>
@@ -137,28 +140,28 @@
                         {{invoice.name}}
                     </el-form-item>
                     <el-form-item label="手机号：">
-                        {{invoice.name}}
+                        {{invoice.billphone}}
                     </el-form-item>
                     <el-form-item label="支付方式：">
-                        {{invoice.name}}
+                        {{invoice.paytype==1?'汇款':'支票'}}
                     </el-form-item>
                     <el-form-item label="发票种类：">
-                        {{invoice.name}}
+                        {{invoice.billtype==1?'增值税普通发票':'增值税专用发票'}}
                     </el-form-item>
                     <el-form-item label="纳税人识别号：">
-                        {{invoice.name}}
+                        {{invoice.billno}}
                     </el-form-item>
                     <el-form-item label="注册地址">
-                        {{invoice.name}}
+                        {{invoice.billaddress}}
                     </el-form-item>
                     <el-form-item label="注册电话：">
-                        {{invoice.name}}
+                        {{invoice.billphone}}
                     </el-form-item>
                     <el-form-item label="开户行：">
-                        {{invoice.name}}
+                        {{invoice.billbank}}
                     </el-form-item>
                     <el-form-item label="银行帐号：">
-                        {{invoice.name}}
+                        {{invoice.billbankno}}
                     </el-form-item>
            </el-form>
         </el-dialog>
@@ -195,41 +198,41 @@
         :visible.sync="dialogVisible2">
            <el-form label-width="80px" size='small'>
                     <el-form-item label="会议名称">
-                        {{invoice.name}}
+                        {{invoice.conference_name}}
                     </el-form-item>
                     <el-form-item label="用户姓名">
                         {{invoice.name}}
                     </el-form-item>
                     <el-form-item label="手机号">
-                        {{invoice.name}}
+                        {{invoice.phone}}
                     </el-form-item>
                     <el-form-item label="所在城市">
-                        {{invoice.name}}
+                        <!-- {{invoice.name}} -->
                     </el-form-item>
                     <el-form-item label="所属单位">
-                        {{invoice.name}}
+                        {{invoice.organizer_unit}}
                     </el-form-item>
                     <el-form-item label="入住天数">
-                        {{invoice.name}}
+                        <!-- {{invoice.room_stime}} -->
                     </el-form-item>
                     <el-form-item label="入住时间">
-                        {{invoice.name}}
+                        {{invoice.room_stime}}
                     </el-form-item>
                     <el-form-item label="离开时间">
-                        {{invoice.name}}
+                        {{invoice.room_etime}}
                     </el-form-item>
                     <el-form-item label="报名时间">
-                        {{invoice.name}}
+                        {{invoice.ctime}}
                     </el-form-item>
                     <el-form-item label="入住凭证">
-                        {{invoice.name}}
+                        <!-- {{invoice.name}} -->
                     </el-form-item>
                     <el-form-item label="驳回原因">
-                        <el-input  type="textarea" v-model="form.name"></el-input>
+                        <el-input  type="textarea" v-model="invoice.reject_reason"></el-input>
                     </el-form-item>
                     <el-form-item label="">
-                        <el-button type="primary">通过</el-button>
-                        <el-button type="danger">驳回</el-button>
+                        <el-button @click="check(1)" type="primary">通过</el-button>
+                        <el-button @click="check(-1)"  type="danger">驳回</el-button>
                     </el-form-item>
            </el-form>
         </el-dialog>
@@ -243,8 +246,8 @@ export default {
     },
     data(){
         return{
-            form:{},
-            order_status:'-3',
+            form:{order_status:'-3',},
+            
             list:[{}],
             reason:[],
             invoice:{},
@@ -264,8 +267,30 @@ export default {
             this.getData()
         },
         tabClick(){
-
+            this.getData()
+        },
+        getData(){
+            var parm=this.form;        
+            this.loading=true
+            this.$api.getSignupList(parm).then(res=>{
+                this.list=res.data.data.list;
+                this.total=res.data.data.total
+                this.loading=false
+            })
+        },
+        check(status){
+            this.$api.putSignup({signup_status:status,reject_reason:this.invoice.reject_reason,id:this.invoice.id}).then(res=>{
+                            this.$message({
+                                message: '操作成功',
+                                type: 'success'
+                            })
+                            this.dialogVisible2=false
+                            this.getData()
+            })
         }
+    },
+    created(){
+        this.getData();
     }
 }
 </script>

src/views/conference/Checker.vue

@@ -18,7 +18,7 @@
                             <el-select v-model="form.id" clearable placeholder="请选择核销员"></el-select>
                     </el-form-item>
                     <el-form-item>
-                        <el-button  type="primary">搜索</el-button>
+                        <el-button @click="getData" type="primary">搜索</el-button>
                     </el-form-item>
                     <el-form-item style="float:right" >
                          <el-button @click="dialogVisible=true"  icon="el-icon-plud" type="primary">添加核销员</el-button>
@@ -36,17 +36,18 @@
                     <el-table-column
                     prop="name"  
                     label="核销员头像">
+                    <template slot-scope="scope"><img width="100" :src="scope.row.avatar" alt=""></template>
                     </el-table-column>
                     <el-table-column
-                    prop="username"  
+                    prop="name"  
                     label="核销员昵称">
                     </el-table-column>
                     <el-table-column
-                    prop="username"  
+                    prop="conference_name"  
                     label="所属会议">
                     </el-table-column>
                     <el-table-column
-                    prop="username"  
+                    prop="ctime"  
                     label="加入时间">
                     </el-table-column>
                     <el-table-column
@@ -141,6 +142,18 @@ export default {
                     })
                 })
         },
+        getData(){
+            var parm=this.form;        
+            this.loading=true
+            this.$api.getVerifierList(parm).then(res=>{
+                this.list=res.data.data.list;
+                this.total=res.data.data.total
+                this.loading=false
+            })
+        },
+    },
+    created(){
+        this.getData();
     }
 }
 </script>

src/views/conference/Hotel.vue

@@ -83,7 +83,7 @@
                     label="操作">
                     <template slot-scope="">
                         <el-button  @click="dialogVisible=true,dialogTitle='酒店信息',status='view'" class="edit"  type="text" >查看</el-button>
-                        <el-button @click="dialogVisible=true,dialogTitle='编辑酒店',status='edit'"  type="text">编辑</el-button>
+                        <el-button @click="dialogVisible=true,dialogTitle='编辑酒店',status='add'"  type="text">编辑</el-button>
                         <el-button   class="del" type="text" >删除</el-button>
                     </template>
                     </el-table-column>
@@ -130,7 +130,19 @@ export default {
         },
         tabClick(){
 
-        }
+        },
+        getData(){
+            var parm=this.form;        
+            this.loading=true
+            this.$api.getHotelList(parm).then(res=>{
+                this.list=res.data.data.list;
+                this.total=res.data.data.total
+                this.loading=false
+            })
+        },
+    },
+    created(){
+        this.getData()
     }
 }
 </script>

src/views/conference/Manage.vue

@@ -23,7 +23,7 @@
                             <el-input clearable placeholder="请输入标题" v-model="form.name"></el-input>
                     </el-form-item>
                     <el-form-item>
-                        <el-button  type="primary">搜索</el-button>
+                        <el-button @click="getData"  type="primary">搜索</el-button>
                     </el-form-item>
                     <el-form-item style="float:right" >
                         <el-button @click="addConference" type="primary">新增会议</el-button>
@@ -44,6 +44,7 @@
                     <el-table-column
                     prop="username"  
                     label="会议海报">
+                    <template slot-scope="scope"><img width="100" :src="scope.row.img" alt=""></template>
                     </el-table-column>
                     <el-table-column
                     prop="username"  
@@ -89,6 +90,7 @@
     </section>
 </template>
 <script>
+
 import Page from '../../components/Page';
 import Hotel from '../../components/hotel';
 export default {
@@ -129,7 +131,7 @@ export default {
         getData(){
             var parm=this.form;        
             this.loading=true
-            this.$api.getEnterpriseList(parm).then(res=>{
+            this.$api.getConferenceList(parm).then(res=>{
                 this.list=res.data.data.list;
                 this.total=res.data.data.total
                 this.loading=false
@@ -151,7 +153,7 @@ export default {
   },
   created(){
     //   this.getPermissions()
-    //   this.getData()
+      this.getData()
   }
 }
 </script>

vue.config.js

@@ -2,8 +2,8 @@ module.exports={
     devServer:{
         proxy:{
             '/api':{
-                target:'http://39.107.246.59:81',
-                // target:'https://test.scxjc.club',
+                // target:'http://39.107.246.59:81',
+                target:'https://test.scxjc.club',
                 changeOrigin: true,
             }
         }