lyn7568 лет назад: 4
Родитель
Сommit
c83b9787dc

+ 30 - 12
src/components/meetingbox/index.vue

@ -1,13 +1,19 @@
1 1
<template>
2
  <el-col :span="4" style="margin-left:30px"  @click.native="handClick()" >
3
    <el-card :body-style="{ padding: '8px' }" style="height:380px">
4
      <div class="bg" :style="{backgroundImage: 'url(' + httpimage + ')', backgroundSize:'cover'}"></div>
2
  <el-col :span="4" style="margin-left:30px">
3
    <el-card :body-style="{ padding: '8px' }" style="height:400px">
4
      <div
5
        class="bg"
6
        :style="{backgroundImage: 'url( http://121.42.53.174:9008/static' + image + ')', backgroundSize:'cover'}"
7
        @click="handClick()"
8
      ></div>
5 9
      <div style="padding: 14px;">
6 10
        <span style="font-size:20px">{{this.list.nameCn}}</span>
7 11
        <div class="bottom clearfix">
8 12
          <time class="time">{{this.list.address}}</time>
9 13
          <p class="time">举办时间:{{this.list.startTime}}</p>
10
          <!-- <el-button type="text" class="button">操作按钮</el-button> -->
14
          <el-button type="text" class="button" v-if="this.list.isCheck===0">发布</el-button>
15
          <el-button type="text" class="button" v-if="this.list.isCheck===1">会议结束</el-button>
16
          <el-button type="text" class="button" v-if="this.list.isCheck===2">会议结束</el-button>
11 17
        </div>
12 18
      </div>
13 19
    </el-card>
@ -18,9 +24,9 @@ export default {
18 24
  name: "",
19 25
  data() {
20 26
    return {
21
      id:'',
22
      httpimage:
23
        "http://a2.att.hudong.com/36/48/19300001357258133412489354717.jpg"
27
      id: "",
28
      httpimage: "",
29
      image: []
24 30
    };
25 31
  },
26 32
  props: {
@ -30,20 +36,29 @@ export default {
30 36
  computed: {},
31 37
  beforeMount() {},
32 38
  mounted() {
33
    this.getMeetingId()
39
    this.getMeetingId();
34 40
  },
35 41
  methods: {
36
    handClick(){
37
      this.$router.push({path:`/admin-meeting/${this.id}`})
42
    handClick() {
43
      this.$router.push({ path: `/admin-meeting/${this.id}` });
38 44
    },
39 45
    getMeetingId() {
40
      this.id = this.list.id
46
      this.id = this.list.id;
47
      this.httpimage = this.list.titlePicture;
48
      this.image =
49
        this.httpimage.length === 1
50
          ? this.httpimage
51
          : this.httpimage.split(",").splice(0, 1).join();
41 52
    }
42 53
  },
43 54
  watch: {}
44 55
};
45 56
</script>
46 57
<style scoped lang='scss'>
58
.el-card {
59
  position: relative;
60
}
61
47 62
.time {
48 63
  font-size: 13px;
49 64
  color: #999;
@ -55,7 +70,10 @@ export default {
55 70
}
56 71
57 72
.button {
58
  padding: 0;
73
  position: absolute;
74
  bottom: -2px;
75
  right: 15px;
76
  padding-top: 0px;
59 77
  float: right;
60 78
}
61 79

+ 1 - 1
src/views/modules/admin/attenders-add-or-update.vue

@ -285,7 +285,7 @@ export default {
285 285
            method: "post",
286 286
            data: this.$http.adornData({
287 287
              id: this.dataForm.id || undefined,
288
              meetingId: this.dataForm.meetingId,
288
              meetingId: this.$route.params.id,
289 289
              memberId: this.dataForm.memberId,
290 290
              name: this.dataForm.name,
291 291
              organization: this.dataForm.organization,

+ 1 - 1
src/views/modules/admin/meeting.vue

@ -2,7 +2,7 @@
2 2
  <div class="ll-content">
3 3
    <h1>{{meetingData.nameCn}}</h1>
4 4
    <div class="box">
5
      <div class="bgMeeting" :style="{ background: 'url(' + meetingData.titlePicture + ')' }"></div>
5
      <div class="bgMeeting" :style="{ background: 'url(http://121.42.53.174:9008/static' + meetingData.titlePicture + ') 100% 100%' }"></div>
6 6
7 7
      <el-form label-width="200px">
8 8
        <el-form-item label="会议名称" class="fz_30">{{meetingData.nameCn}}</el-form-item>

+ 52 - 23
src/views/modules/admin/payment-add-or-update.vue

@ -9,7 +9,7 @@
9 9
      :rules="dataRule"
10 10
      ref="dataForm"
11 11
      @keyup.enter.native="dataFormSubmit()"
12
      label-width="120px"
12
      label-width="150px"
13 13
    >
14 14
      <!-- <el-form-item label="订单号" prop="orderId">
15 15
        <el-input v-model="dataForm.orderId" placeholder="订单号"></el-input>
@ -46,23 +46,33 @@
46 46
          value-format="yyyy-MM-dd HH:mm:ss"
47 47
        ></el-date-picker>
48 48
      </el-form-item>
49
      <el-form-item label="费用类型" prop="feeId">
50
        <el-select v-model="dataForm.feeId" placeholder="请选择">
51
          <el-option
52
            v-for="item in option"
53
            :key="item.value"
54
            :label="item.label"
55
            :value="item.value"
56
          ></el-option>
57
        </el-select>
58
      </el-form-item>
49 59
      <el-form-item label="缴费方式" prop="payType">
50 60
        <!-- <el-input v-model="dataForm.payType" placeholder="缴费方式"></el-input> -->
51
        <el-select v-model="dataForm.payType" placeholder="请选择">
61
        <!-- <el-select v-model="dataForm.payType" placeholder="请选择">
52 62
          <el-option
53 63
            v-for="item in payTypeList"
54 64
            :key="item.value"
55 65
            :label="item.label"
56 66
            :value="item.value"
57 67
          ></el-option>
58
        </el-select>
68
        </el-select>-->
69
        <el-radio v-model="dataForm.payType" :label="1">线上缴费</el-radio>
70
        <el-radio v-model="dataForm.payType" :label="2">现场缴费</el-radio>
59 71
      </el-form-item>
72
60 73
      <el-form-item label="缴费项目" prop="payOption">
61 74
        <el-input v-model="dataForm.payOption" placeholder="缴费项目"></el-input>
62 75
      </el-form-item>
63
      <el-form-item label="费用类型" prop="feeId">
64
        <el-input v-model="dataForm.feeId" placeholder="缴费项目"></el-input>
65
      </el-form-item>
66 76
      <el-form-item label="金额" prop="money">
67 77
        <el-input v-model="dataForm.money" placeholder="金额"></el-input>
68 78
      </el-form-item>
@ -72,7 +82,7 @@
72 82
      <el-form-item label="纳税人税号" prop="taxNumber">
73 83
        <el-input v-model="dataForm.taxNumber" placeholder="纳税人税号"></el-input>
74 84
      </el-form-item>
75
      <el-form-item label="地址 电话" prop="addrPhone">
85
      <el-form-item label="公司注册地址电话" prop="addrPhone">
76 86
        <el-input v-model="dataForm.addrPhone" placeholder="电话"></el-input>
77 87
      </el-form-item>
78 88
      <el-form-item label="开户行及账号" prop="bankAddrAccount">
@ -81,7 +91,7 @@
81 91
      <el-form-item label="邮寄地址" prop="taxAddress">
82 92
        <el-input v-model="dataForm.taxAddress" placeholder="邮寄地址"></el-input>
83 93
      </el-form-item>
84
      <el-form-item label="确认是否已缴费" prop="isCheck">
94
      <el-form-item label="确认是否已缴费" prop="isPay">
85 95
        <!-- <el-input v-model="dataForm.isPay" placeholder="确认是否已缴费"></el-input> -->
86 96
        <el-radio v-model="dataForm.isPay" :label="1">是</el-radio>
87 97
        <el-radio v-model="dataForm.isPay" :label="0">否</el-radio>
@ -162,19 +172,13 @@ export default {
162 172
        taxAddress: [
163 173
          { required: true, message: "邮寄地址不能为空", trigger: "blur" }
164 174
        ],
165
        isCheck: [
175
        isPay: [
166 176
          { required: true, message: "确认是否已缴费不能为空", trigger: "blur" }
167 177
        ],
168 178
        createTime: [
169 179
          { required: true, message: "创建时间不能为空", trigger: "blur" }
170 180
        ],
171
        isDel: [
172
          {
173
            required: true,
174
            message: "是否被删除 状态  0:正常   1:删除不能为空",
175
            trigger: "blur"
176
          }
177
        ],
181
178 182
        meetingId: [
179 183
          { required: true, message: "会议id不能为空", trigger: "blur" }
180 184
        ],
@ -195,11 +199,19 @@ export default {
195 199
          value: "2",
196 200
          label: "现场缴费"
197 201
        }
198
      ]
202
      ],
203
      typesoffeeList: [],
204
      option: [],
205
      feeIdTypeList: [], //费用类型
206
      option: [],
207
      page: 0,
208
      limit: 10,
209
      meetingId: this.$route.params.id
199 210
    };
200 211
  },
201 212
  created() {
202 213
    this.getPaymentByname();
214
    this.getTypesoffee();
203 215
  },
204 216
  methods: {
205 217
    init(id) {
@ -213,6 +225,7 @@ export default {
213 225
            method: "get",
214 226
            params: this.$http.adornParams()
215 227
          }).then(({ data }) => {
228
            window.console.log(data);
216 229
            if (data && data.code === 0) {
217 230
              this.dataForm.orderId = data.payment.orderId;
218 231
              this.dataForm.attenders = data.payment.attenders;
@ -228,7 +241,7 @@ export default {
228 241
              this.dataForm.taxAddress = data.payment.taxAddress;
229 242
              this.dataForm.isCheck = data.payment.isCheck;
230 243
              this.dataForm.createTime = data.payment.createTime;
231
              this.dataForm.isDel = data.payment.isDel;
244
              this.dataForm.isPay = data.payment.isPay;
232 245
              this.dataForm.meetingId = data.payment.meetingId;
233 246
              this.dataForm.taxType = data.payment.taxType;
234 247
            }
@ -247,8 +260,7 @@ export default {
247 260
            method: "post",
248 261
            data: this.$http.adornData({
249 262
              id: this.dataForm.id || undefined,
250
              orderId: this.dataForm.orderId,
251
              attendersId: this.dataForm.attendersId,
263
              attenders: this.dataForm.attenders,
252 264
              feeId: this.dataForm.feeId,
253 265
              payTime: this.dataForm.payTime,
254 266
              payType: this.dataForm.payType,
@ -259,9 +271,8 @@ export default {
259 271
              addrPhone: this.dataForm.addrPhone,
260 272
              bankAddrAccount: this.dataForm.bankAddrAccount,
261 273
              taxAddress: this.dataForm.taxAddress,
262
              isCheck: this.dataForm.isCheck,
274
              isPay: this.dataForm.isPay,
263 275
              createTime: this.dataForm.createTime,
264
              isDel: this.dataForm.isDel,
265 276
              meetingId: this.dataForm.meetingId,
266 277
              taxType: this.dataForm.taxType
267 278
            })
@ -293,7 +304,6 @@ export default {
293 304
          meetingId: this.$route.params.id
294 305
        })
295 306
      }).then(({ data }) => {
296
        window.console.log(data);
297 307
        if (data) {
298 308
          this.loading = false;
299 309
          this.meetingList = data.list;
@ -315,6 +325,25 @@ export default {
315 325
      } else {
316 326
        this.options = [];
317 327
      }
328
    },
329
    getTypesoffee() {
330
      this.$http({
331
        url: this.$http.adornUrl(
332
          `/admin/typesoffee/listbymid/${this.meetingId}`
333
        ),
334
        methods: "get",
335
        params: {}
336
      }).then(({ data }) => {
337
        if (data && data.code === 0) {
338
          this.typesoffeeList = data.list;
339
          this.option = this.typesoffeeList.map(item => {
340
            return {
341
              value: item.id,
342
              label: item.name
343
            };
344
          });
345
        }
346
      });
318 347
    }
319 348
  }
320 349
};

+ 19 - 6
src/views/modules/admin/payment.vue

@ -10,7 +10,7 @@
10 10
          v-if="isAuth('admin:payment:save')"
11 11
          type="primary"
12 12
          @click="addOrUpdateHandle()"
13
        >新增</el-button> -->
13
        >新增</el-button>-->
14 14
        <el-button
15 15
          v-if="isAuth('admin:payment:delete')"
16 16
          type="danger"
@ -31,16 +31,26 @@
31 31
      <el-table-column prop="truename" header-align="center" align="center" label="缴费人"></el-table-column>
32 32
      <el-table-column prop="organization" header-align="center" align="center" label="所在机构"></el-table-column>
33 33
      <!-- <el-table-column prop="feeId" header-align="center" align="center" label="费用类型id"></el-table-column> -->
34
      <el-table-column prop="payType" header-align="center" align="center" label="缴费方式"></el-table-column>
34
      <el-table-column prop="payType" header-align="center" align="center" label="缴费方式">
35
        <template slot-scope="scope">
36
          <el-tag v-if="scope.row.payType===1" type="success">线上缴费</el-tag>
37
          <el-tag v-else="scope.row.payType===2">现场缴费</el-tag>
38
        </template>
39
      </el-table-column>
35 40
      <!-- <el-table-column prop="payOption" header-align="center" align="center" label="缴费项目"></el-table-column> -->
36
      <el-table-column prop="isPay" header-align="center" align="center" label="是否付"></el-table-column>
41
      <el-table-column prop="isPay" header-align="center" align="center" label="是否付费">
42
        <template slot-scope="scope">
43
          <el-tag v-if="scope.row.isPay===0" type="danger">否</el-tag>
44
          <el-tag v-else="scope.row.isPay===1">是</el-tag>
45
        </template>
46
      </el-table-column>
37 47
      <!-- <el-table-column prop="taxTitle" header-align="center" align="center" label="发票抬头"></el-table-column>
38
      <el-table-column prop="taxNumber" header-align="center" align="center" label="纳税人税号"></el-table-column> -->
48
      <el-table-column prop="taxNumber" header-align="center" align="center" label="纳税人税号"></el-table-column>-->
39 49
      <el-table-column prop="phone" header-align="center" align="center" label="联系电话"></el-table-column>
40 50
      <!-- <el-table-column prop="bankAddrAccount" header-align="center" align="center" label="开户行及账号"></el-table-column> -->
41 51
      <!-- <el-table-column prop="taxAddress" header-align="center" align="center" label="邮寄地址"></el-table-column> -->
42 52
      <!-- <el-table-column prop="isCheck" header-align="center" align="center" label="确认是否已缴费"></el-table-column>
43
      <el-table-column prop="taxType" header-align="center" align="center" label="发票类型0普1专"></el-table-column> -->
53
      <el-table-column prop="taxType" header-align="center" align="center" label="发票类型0普1专"></el-table-column>-->
44 54
      <el-table-column prop="payTime" header-align="center" align="center" label="缴费时间"></el-table-column>
45 55
46 56
      <el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
@ -73,7 +83,7 @@ export default {
73 83
        key: ""
74 84
      },
75 85
      dataList: [],
76
      pageIndex: 1,
86
      pageIndex: 0,
77 87
      pageSize: 10,
78 88
      totalPage: 0,
79 89
      dataListLoading: false,
@ -168,6 +178,9 @@ export default {
168 178
          }
169 179
        });
170 180
      });
181
    },
182
    handClick(id) {
183
      window.console.log(id);
171 184
    }
172 185
  }
173 186
};