..

src/views/modules/admin/lecture-add-or-update.vue

@@ -4,9 +4,6 @@
    :close-on-click-modal="false"
    :visible.sync="visible">
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
    <el-form-item label="会议id" prop="meetingId">
      <el-input v-model="dataForm.meetingId" placeholder="会议id"></el-input>
    </el-form-item>
    <el-form-item label="参会人员id" prop="attendersId">
       <template>
        <el-select
@@ -39,12 +36,6 @@
    <el-form-item label="摘要" prop="summary">
      <el-input v-model="dataForm.summary" placeholder="摘要"></el-input>
    </el-form-item>
    <el-form-item label="創建時間" prop="createTime">
      <el-input v-model="dataForm.createTime" placeholder="創建時間"></el-input>
    </el-form-item>
    <el-form-item label="是否被删除 状态  0：正常   1：删除" prop="isDel">
      <el-input v-model="dataForm.isDel" placeholder="是否被删除 状态  0：正常   1：删除"></el-input>
    </el-form-item>
    </el-form>
    <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">取消</el-button>
@@ -107,14 +98,13 @@
              params: this.$http.adornParams()
            }).then(({data}) => {
              if (data && data.code === 0) {
                this.dataForm.meetingId = data.lecture.meetingId
                this.options.add({'id': data.attenders.id, 'name': data.attenders.name})
                // 表单数据
                this.dataForm.attendersId = data.lecture.attendersId
                this.dataForm.topic = data.lecture.topic
                this.dataForm.branchId = data.lecture.branchId
                this.dataForm.speechTime = data.lecture.speechTime
                this.dataForm.summary = data.lecture.summary
                this.dataForm.createTime = data.lecture.createTime
                this.dataForm.isDel = data.lecture.isDel
              }
            })
          }
@@ -135,9 +125,7 @@
                'topic': this.dataForm.topic,
                'branchId': this.dataForm.branchId,
                'speechTime': this.dataForm.speechTime,
                'summary': this.dataForm.summary,
                'createTime': this.dataForm.createTime,
                'isDel': this.dataForm.isDel
                'summary': this.dataForm.summary
              })
            }).then(({data}) => {
              if (data && data.code === 0) {

src/views/modules/admin/lecture.vue

@@ -35,10 +35,10 @@
        label="会议id">
      </el-table-column>
      <el-table-column
        prop="attendersId"
        prop="attendersName"
        header-align="center"
        align="center"
        label="参会人员id">
        label="演讲人">
      </el-table-column>
      <el-table-column
        prop="topic"
@@ -68,13 +68,7 @@
        prop="createTime"
        header-align="center"
        align="center"
        label="創建時間">
      </el-table-column>
      <el-table-column
        prop="isDel"
        header-align="center"
        align="center"
        label="是否被删除 状态  0：正常   1：删除">
        label="创建时间">
      </el-table-column>
      <el-table-column
        fixed="right"

src/views/modules/admin/member-add-or-update.vue

@@ -17,31 +17,31 @@
      <el-form-item label="用户名" prop="username">
        <el-input v-model="dataForm.username" placeholder="用户名"></el-input>
      </el-form-item>
      <el-form-item label="密码" prop="password">
      <el-form-item label="密码" prop="password" v-if="!dataForm.id">
        <el-input v-model="dataForm.password" placeholder="密码"></el-input>
      </el-form-item>
      <el-form-item label="头像" prop="titlePic">
        <el-input v-model="dataForm.titlePic" placeholder="头像"></el-input>
      </el-form-item>
      <el-row>
        <img :src="showimg" alt="">
        <img :src="showimg" alt="" style="width:300px;">
      </el-row>
      <el-upload
      :action="upload_url"
      ref="upload"
      :before-upload="beforeUploadHandle"
      :on-success="successHandle"
      name="upload_file"
      :auto-upload="false"
      :data="thumb"
      style="text-align: center;">
      <i class="el-icon-upload"></i>
       <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
      <div class="el-upload__tip" slot="tip">只支持jpg、png、gif格式的图片！只能上传jpg/png文件，且不超过2M</div>
      <el-radio v-model="radio" label="1">是</el-radio>
      <el-radio v-model="radio" label="0" >否</el-radio>
      <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
    </el-upload>
        :action="upload_url"
        ref="upload"
        :before-upload="beforeUploadHandle"
        :on-success="successHandle"
        name="upload_file"
        :auto-upload="false"
        :data="thumb"
        style="text-align: center;">
        <i class="el-icon-upload"></i>
        <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
        <div class="el-upload__tip" slot="tip">只支持jpg、png、gif格式的图片！只能上传jpg/png文件，且不超过2M</div>
        <el-radio v-model="radio" label="1">是</el-radio>
        <el-radio v-model="radio" label="0" >否</el-radio>
        <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
      </el-upload>
      <el-form-item label="所属机构" prop="organization">
        <el-input v-model="dataForm.organization" placeholder="所属机构"></el-input>
      </el-form-item>
@@ -57,15 +57,61 @@
      <el-form-item label="邮箱" prop="email">
        <el-input v-model="dataForm.email" placeholder="邮箱"></el-input>
      </el-form-item>
      <el-form-item label="审核" prop="isCheck">
      <el-form-item label="办公电话" prop="officephone">
        <el-input v-model="dataForm.officephone" placeholder="办公电话"></el-input>
      </el-form-item>
       <el-form-item label="其他联系方式" prop="otherphone">
        <el-input v-model="dataForm.otherphone" placeholder="其他联系方式"></el-input>
      </el-form-item>
      <!-- <el-form-item label="审核" prop="isCheck">
        <el-radio v-model="dataForm.isCheck" :label="0">否</el-radio>
        <el-radio v-model="dataForm.isCheck" :label="1">是</el-radio>
      </el-form-item> -->
       <el-form-item label="负责人" prop="servicerId">
        <!-- <el-input v-model="dataForm.email" placeholder="其他联系方式"></el-input> -->
        <template>
          <el-select
            v-model="dataForm.servicerId"
            filterable
            remote
            reserve-keyword
            placeholder="请输入工作人员姓名"
            @change="$forceUpdate()"
            :remote-method="selectEmployeeIdByname"
            :loading="loading">
            <el-option
              v-for="item in employeeList"
              :key="item.id"
              :label="item.truename"
              :value="item.id">
            </el-option>
          </el-select>
        </template>
      </el-form-item>
       <el-form-item label="备注" prop="note">
        <el-input  type="textarea" v-model="dataForm.note" :rows="3" placeholder="备注"></el-input>
      </el-form-item>
    </el-form>
    <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">取消</el-button>
      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
      <el-button type="primary" @click="dataFormSubmit()">保存</el-button>
    </span>
    <div v-if="dataForm.id">
      <h3>参会信息</h3>
      <span>参会次数: </span><span> {{this.meetingList.length}}</span>
      <div>
        <span>选择会议</span>
        <el-select v-model="meetingId" placeholder="请输入选择会议">
          <el-option
            v-for="item in meetingList"
            :key="item.meeting_id"
            :label="item.name_cn"
            :value="item.meeting_id">
          </el-option>
        </el-select>
        <span>查看</span>
      </div>
    </div>
  </el-dialog>
</template>
@@ -125,8 +171,10 @@ export default {
        jobTitle: '',
        phone: '',
        email: '',
        createTime: '',
        isCheck: 0
        officephone: '',
        otherphone: '',
        servicerId: 0,
        note: ''
      },
      dataRule: {
        username: [
@@ -135,12 +183,6 @@ export default {
        truename: [
          { required: true, message: '姓名不能为空', trigger: 'blur' }
        ],
        // password: [
        //   { required: true, message: '密码不能为空', trigger: 'blur' }
        // ],
        // phone: [
        //   { required: true, message: '电话不能为空', trigger: 'blur' }
        // ]
        password: [{ validator: checkPwd, trigger: 'blur' }],
        phone: [{ validator: checkPhone, trigger: 'blur' }],
        email: [{ validator: checkEmail, trigger: 'blur' }]
@@ -148,7 +190,11 @@ export default {
      upload_url: '',
      radio: '0',
      thumb: {'isthumb': 0},
      showimg: ''
      showimg: '',
      employeeList: [],
      loading: false,
      meetingList: [],
      meetingId: ''
    }
  },
  methods: {
@@ -167,7 +213,9 @@ export default {
            params: this.$http.adornParams()
          }).then(({ data }) => {
            if (data && data.code === 0) {
              console.log(data.member)
              this.employeeList = [{'id': data.employee.id, 'truename': data.employee.truename}]
              this.meetingList = data.meetingList
              // console.log(data.member)
              this.dataForm.username = data.member.username
              this.dataForm.truename = data.member.truename
              this.dataForm.titlePic = data.member.titlePic
@@ -176,9 +224,10 @@ export default {
              this.dataForm.jobTitle = data.member.jobTitle
              this.dataForm.phone = data.member.phone
              this.dataForm.email = data.member.email
              this.dataForm.createTime = data.member.createTime
              this.dataForm.modifyTime = data.member.modifyTime
              this.dataForm.isCheck = data.member.isCheck
              this.dataForm.officephone = data.member.officephone
              this.dataForm.otherphone = data.member.otherphone
              this.dataForm.servicerId = data.member.servicerId
              this.dataForm.note = data.member.note
              this.showimg = 'http://121.42.53.174:9008/static' + data.member.titlePic
            }
          })
@@ -197,21 +246,21 @@ export default {
            ),
            method: 'post',
            data: this.$http.adornData({
              id: this.dataForm.id || undefined,
              username: this.dataForm.username,
              password: this.dataForm.password,
              truename: this.dataForm.truename,
              sex: this.dataForm.sex,
              titlePic: this.dataForm.titlePic,
              organization: this.dataForm.organization,
              position: this.dataForm.position,
              jobTitle: this.dataForm.jobTitle,
              phone: this.dataForm.phone,
              email: this.dataForm.email,
              createTime: this.dataForm.createTime,
              modifyTime: this.dataForm.modifyTime,
              isCheck: this.dataForm.isCheck,
              isDel: this.dataForm.isDel
              'id': this.dataForm.id || undefined,
              'username': this.dataForm.username,
              'password': this.dataForm.password,
              'truename': this.dataForm.truename,
              'sex': this.dataForm.sex,
              'titlePic': this.dataForm.titlePic,
              'organization': this.dataForm.organization,
              'position': this.dataForm.position,
              'jobTitle': this.dataForm.jobTitle,
              'phone': this.dataForm.phone,
              'email': this.dataForm.email,
              'officephone': this.dataForm.officephone,
              'otherphone': this.dataForm.otherphone,
              'servicerId': this.dataForm.servicerId,
              'note': this.dataForm.note
            })
          }).then(({ data }) => {
            if (data && data.code === 0) {
@@ -257,6 +306,22 @@ export default {
      } else {
        this.$message.error(response.msg)
      }
    },
    // 通过姓名模糊查询参会人员id
    selectEmployeeIdByname (name) {
      this.loading = true
      this.$http({
        url: this.$http.adornUrl(`/admin/employee/listbyname`),
        method: 'get',
        params: this.$http.adornParams({
          'truename': name
        })
      }).then(({data}) => {
        if (data && data.code === 0) {
          this.loading = false
          this.employeeList = data.list
        }
      })
    }
  }
}

src/views/modules/admin/member.vue

@@ -26,19 +26,19 @@
        prop="id"
        header-align="center"
        align="center"
        label="会员id (会员表)">
        label="id">
      </el-table-column>
      <el-table-column
        prop="username"
        prop="truename"
        header-align="center"
        align="center"
        label="用户名">
        label="姓名">
      </el-table-column>
      <el-table-column
        prop="truename"
        prop="username"
        header-align="center"
        align="center"
        label="姓名">
        label="账号">
      </el-table-column>
      <el-table-column
        prop="organization"
@@ -70,10 +70,29 @@
        align="center"
        label="邮箱">
      </el-table-column>
      <el-table-column
        prop="meetingCounts"
        header-align="center"
        align="center"
        label="参会场次">
      </el-table-column>
      <el-table-column
        prop="meetingName"
        header-align="center"
        align="center"
        label="最后参加会议">
      </el-table-column>
      <el-table-column
        prop="servicerName"
        header-align="center"
        align="center"
        label="负责人">
      </el-table-column>
      <el-table-column
        prop="createTime"
        header-align="center"
        align="center"
        width="160"
        label="创建时间">
      </el-table-column>
      <el-table-column

src/views/modules/admin/paper-add-or-update.vue

@@ -4,11 +4,26 @@
    :close-on-click-modal="false"
    :visible.sync="visible">
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
    <el-form-item label="会员id" prop="meetingId">
      <el-input v-model="dataForm.meetingId" placeholder="会员id"></el-input>
    </el-form-item>
    <el-form-item label="参会人员id" prop="attendersId">
      <el-input v-model="dataForm.attendersId" placeholder="参会人员id"></el-input>
    <el-form-item label="投稿人" prop="attendersId">
      <!-- <el-input v-model="dataForm.attendersId" placeholder="参会人员id"></el-input> -->
      <template>
        <el-select
          v-model="dataForm.attendersId"
          filterable
          remote
          reserve-keyword
          placeholder="请输入姓名"
          @change="$forceUpdate()"
          :remote-method="selectAttendersIdByname"
          :loading="loading">
          <el-option
            v-for="item in options"
            :key="item.id"
            :label="item.name"
            :value="item.id">
          </el-option>
        </el-select>
      </template>
    </el-form-item>
    <el-form-item label="论文题目" prop="title">
      <el-input v-model="dataForm.title" placeholder="论文题目"></el-input>
@@ -19,12 +34,23 @@
    <el-form-item label="论文存放地址" prop="paperurl">
      <el-input v-model="dataForm.paperurl" placeholder="论文存放地址"></el-input>
    </el-form-item>
    <el-form-item label="创建时间" prop="createTime">
      <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
    </el-form-item>
    <el-form-item label="是否被删除 状态  0：正常   1：删除" prop="isDel">
      <el-input v-model="dataForm.isDel" placeholder="是否被删除 状态  0：正常   1：删除"></el-input>
    </el-form-item>
      <el-upload
        :action="upload_url"
        ref="upload"
        :before-upload="beforeUploadHandle"
        :on-success="successHandle"
        name="upload_file"
        :auto-upload="false"
        :data="oldname"
        style="text-align: center;">
        <i class="el-icon-upload"></i>
        <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
        <div class="el-upload__tip" slot="tip">只支持pdf、doc、docx格式的文件</div>
        <span>是否使用原文件名</span>
        <el-radio v-model="radio" label="1">是</el-radio>
        <el-radio v-model="radio" label="0" >否</el-radio>
        <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
      </el-upload>
    </el-form>
    <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">取消</el-button>
@@ -40,18 +66,12 @@
        visible: false,
        dataForm: {
          id: 0,
          meetingId: '',
          attendersId: '',
          title: '',
          summary: '',
          paperurl: '',
          createTime: '',
          isDel: ''
          paperurl: ''
        },
        dataRule: {
          meetingId: [
            { required: true, message: '会员id不能为空', trigger: 'blur' }
          ],
          attendersId: [
            { required: true, message: '参会人员id不能为空', trigger: 'blur' }
          ],
@@ -60,17 +80,14 @@
          ],
          summary: [
            { required: true, message: '摘要不能为空', trigger: 'blur' }
          ],
          paperurl: [
            { required: true, message: '论文存放地址不能为空', trigger: 'blur' }
          ],
          createTime: [
            { required: true, message: '创建时间不能为空', trigger: 'blur' }
          ],
          isDel: [
            { required: true, message: '是否被删除 状态  0：正常   1：删除不能为空', trigger: 'blur' }
          ]
        }
        },
        upload_url: '',
        radio: '0',
        oldname: {'useoldname': 0},
        options: [],
        loading: false,
        meetingId: 0
      }
    },
    methods: {
@@ -86,17 +103,17 @@
              params: this.$http.adornParams()
            }).then(({data}) => {
              if (data && data.code === 0) {
                this.dataForm.meetingId = data.paper.meetingId
                this.options = [{'id': data.attenders.id, 'name': data.attenders.name}]
                this.dataForm.attendersId = data.paper.attendersId
                this.dataForm.title = data.paper.title
                this.dataForm.summary = data.paper.summary
                this.dataForm.paperurl = data.paper.paperurl
                this.dataForm.createTime = data.paper.createTime
                this.dataForm.isDel = data.paper.isDel
              }
            })
          }
        })
        // 上传路径
        this.upload_url = this.$http.adornUrl(`/sys/filemanager/uploadimg?token=${this.$cookie.get('token')}`)
      },
      // 表单提交
      dataFormSubmit () {
@@ -107,13 +124,10 @@
              method: 'post',
              data: this.$http.adornData({
                'id': this.dataForm.id || undefined,
                'meetingId': this.dataForm.meetingId,
                'attendersId': this.dataForm.attendersId,
                'title': this.dataForm.title,
                'summary': this.dataForm.summary,
                'paperurl': this.dataForm.paperurl,
                'createTime': this.dataForm.createTime,
                'isDel': this.dataForm.isDel
                'paperurl': this.dataForm.paperurl
              })
            }).then(({data}) => {
              if (data && data.code === 0) {
@@ -132,6 +146,44 @@
            })
          }
        })
      },
      // 上传图像
      submitUpload () {
        this.$refs.upload.submit()
      },
      // 上传之前
      beforeUploadHandle (file) {
        this.oldname.useoldname = this.radio
        if (file.type !== 'application/pdf' && file.type !== 'application/msword') {
          this.$message.error('只支持jpg、png、gif格式的图片！')
          return false
        }
      },
      // 上传成功
      successHandle (response) {
        console.log(response)
        if (response && response.code === 0) {
          this.dataForm.paperurl = response.filename
        } else {
          this.$message.error(response.msg)
        }
      },
      // 通过姓名模糊查询参会人员id
      selectAttendersIdByname (name) {
        this.loading = true
        this.$http({
          url: this.$http.adornUrl(`/admin/attenders/selectbyname`),
          method: 'get',
          params: this.$http.adornParams({
            'name': name,
            'meetingId': this.meetingId
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
            this.loading = false
            this.options = data.list
          }
        })
      }
    }
  }

src/views/modules/admin/paper.vue

@@ -10,7 +10,7 @@
        <el-button v-if="isAuth('admin:paper:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
      </el-form-item>
       <el-form-item>
        <el-button v-if="isAuth('admin:paperrequire:save')" type="primary" @click="addOrUpdateHandle()">征文要求设置</el-button>
        <el-button v-if="isAuth('admin:paperrequire:save')" type="primary" @click="setPagerRequireHandle()">征文要求设置</el-button>
      </el-form-item>
    </el-form>
    <el-table
@@ -29,49 +29,37 @@
        prop="id"
        header-align="center"
        align="center"
        label="论文id">
      </el-table-column>
      <el-table-column
        prop="meetingId"
        header-align="center"
        align="center"
        label="会员id">
      </el-table-column>
      <el-table-column
        prop="attendersId"
        header-align="center"
        align="center"
        label="参会人员id">
        label="id">
      </el-table-column>
      <el-table-column
        prop="title"
        header-align="center"
        align="center"
        label="论文题目">
        label="投稿题目">
      </el-table-column>
      <el-table-column
        prop="summary"
        prop="truename"
        header-align="center"
        align="center"
        label="摘要">
        label="姓名">
      </el-table-column>
      <el-table-column
        prop="paperurl"
        prop="phone"
        header-align="center"
        align="center"
        label="论文存放地址">
        label="联系电话">
      </el-table-column>
      <el-table-column
        prop="createTime"
       <el-table-column
        prop="email"
        header-align="center"
        align="center"
        label="创建时间">
        label="联系邮箱">
      </el-table-column>
      <el-table-column
        prop="isDel"
        prop="createTime"
        header-align="center"
        align="center"
        label="是否被删除 状态  0：正常   1：删除">
        label="投稿时间">
      </el-table-column>
      <el-table-column
        fixed="right"
@@ -96,12 +84,14 @@
    </el-pagination>
    <!-- 弹窗, 新增 / 修改 -->
    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
    <!-- 设置征文要求 -->
    <set-pager-require v-if="setPagerRequireVisible" ref="SetPagerRequire"></set-pager-require>
  </div>
</template>
<script>
  import AddOrUpdate from './paper-add-or-update'
//  import PagerRequireSet from './paperrequire-add-or-update'
  import SetPagerRequire from './paperrequire-add-or-update'
  export default {
    data () {
      return {
@@ -114,13 +104,17 @@
        totalPage: 0,
        dataListLoading: false,
        dataListSelections: [],
        addOrUpdateVisible: false
        addOrUpdateVisible: false,
        setPagerRequireVisible: false,
        meetingId: 0
      }
    },
    components: {
      AddOrUpdate
      AddOrUpdate,
      SetPagerRequire
    },
    activated () {
      this.meetingId = this.$route.params.id
      this.getDataList()
    },
    methods: {
@@ -131,6 +125,7 @@
          url: this.$http.adornUrl('/admin/paper/list'),
          method: 'get',
          params: this.$http.adornParams({
            'meetingId': this.meetingId,
            'page': this.pageIndex,
            'limit': this.pageSize,
            'key': this.dataForm.key
@@ -168,6 +163,12 @@
          this.$refs.addOrUpdate.init(id)
        })
      },
      setPagerRequireHandle () {
        this.setPagerRequireVisible = true
        this.$nextTick(() => {
          this.$refs.SetPagerRequire.init(this.meetingId)
        })
      },
      // 删除
      deleteHandle (id) {
        var ids = id ? [id] : this.dataListSelections.map(item => {