xjc 4 سال پیش
والد
کامیت
9a768dc6ac
3فایلهای تغییر یافته به همراه19 افزوده شده و 9 حذف شده
  1. 17 7
      src/views/conference/Apply.vue
  2. 1 1
      src/views/conference/Hotel.vue
  3. 1 1
      src/views/system/Account.vue

+ 17 - 7
src/views/conference/Apply.vue

@@ -90,7 +90,7 @@
                         <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&&scope.row.contype=="offline"'><el-tag >待选酒店</el-tag></span>
-                        <span v-if='scope.row.signup_status>=2&&scope.row.contype=="online"'><el-tag >已审核</el-tag></span>
+                        <span v-if='scope.row.signup_status>=2&&scope.row.contype=="online"'><el-tag type="success">已审核</el-tag></span>
                         <span v-if='scope.row.signup_status==3&&scope.row.contype=="offline"'><el-tag >待核销</el-tag></span>
                         <span v-if='scope.row.signup_status==4&&scope.row.contype=="offline"'><el-tag type="success">已核销</el-tag></span>
                         <span v-if='scope.row.signup_status==-1&&scope.row.contype=="offline"'><el-tag type="info">已驳回</el-tag></span>
@@ -113,7 +113,8 @@
                     prop=""  
                     label="性别">
                     <template slot-scope="scope">
-                        {{scope.row.sex==0?'男':'女'}}
+                        <span v-if="scope.row.sex==0">男</span>
+                        <span v-if="scope.row.sex==1">女</span>
                     </template>
                     </el-table-column>
                     <el-table-column
@@ -152,10 +153,10 @@
                     prop="zip"  width="260" fixed="right"
                     label="操作">
                     <template slot-scope="scope">
-                        <el-button  @click="invoice=scope.row,dialogVisible2=true,invoice.reject_reason=''" class="edit"  type="text" 
+                        <el-button  @click="proof_img=scope.row.proof_img,srcList=[proof_img],invoice=scope.row,dialogVisible2=true,invoice.reject_reason=''" class="edit"  type="text" 
                             :disabled="scope.row.signup_status==2||scope.row.signup_status==3||scope.row.signup_status==4">审核</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="proof_img=scope.row.proof_img,srcList=[proof_img],dialogVisible3=true"    type="text" >入住凭证</el-button>
                         <el-button @click="dialogVisible1=true,getReason(scope.row)"   type="text" >驳回原因</el-button>
                     </template>
                     </el-table-column>
@@ -255,7 +256,11 @@
                         {{invoice.ctime}}
                     </el-form-item>
                     <el-form-item label="入住凭证">
-                        <!-- {{invoice.name}} -->
+                        <el-image 
+                            style="width: 100px;"
+                            :src="proof_img"
+                            :preview-src-list="srcList">
+                        </el-image>
                     </el-form-item>
                     <el-form-item label="驳回原因">
                         <el-input  type="textarea" v-model="invoice.reject_reason"></el-input>
@@ -269,7 +274,11 @@
         <el-dialog class="hotel"
         title="入住凭证" :close-on-click-modal='false'
         :visible.sync="dialogVisible3">
-           <img width="100%" :src="proof_img" alt="">
+           <el-image 
+                style="width: 100px; "
+                :src="proof_img"
+                :preview-src-list="srcList">
+            </el-image>
         </el-dialog>
     </section>
 </template>
@@ -293,7 +302,8 @@ export default {
             dialogVisible1:false,
             dialogVisible2:false,
             dialogVisible3:false,
-            proof_img:''
+            proof_img:'',
+            srcList:[]
         }
     },
     methods:{

+ 1 - 1
src/views/conference/Hotel.vue

@@ -34,7 +34,7 @@
             <div class="filter">
                 <el-form size="small" label-width="70px" :inline="true"  label-position="left">
                     <el-form-item label="">
-                            <el-select v-model="form.conference_id" clearable placeholder="请选择会议">
+                            <el-select v-model="form.conference_id" clearable placeholder="请选择会议" @clear="getData">
                                 <el-option
                                     v-for="(item, index) in conference_list"
                                     :key="index"

+ 1 - 1
src/views/system/Account.vue

@@ -21,7 +21,7 @@
             <div class="filter">
                 <el-form size="small" label-width="70px" :inline="true"  label-position="left">
                     <el-form-item label="">
-                        <el-input clearable placeholder="请输入信息标题" v-model="form.name"></el-input>
+                        <el-input clearable placeholder="请输入账号/姓名" v-model="form.name"></el-input>
                     </el-form-item>
                     <el-form-item label="">
                         <el-select v-model="form.journal_id" placeholder="请选择期刊" clearable filterable>