diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 2da67b9..b4bd111 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -29,7 +29,8 @@
  • - {{ getFileName(file.name) }} + {{ file.name }} +
    删除 @@ -153,7 +154,7 @@ export default { handleUploadSuccess(res, file) { if (res.code === 0) { // edit by 新疆事务通 - this.uploadList.push({ name: res.data, url: res.data }); + this.uploadList.push({ name:file.name.split('.')[0], url: res.data }); this.uploadedSuccessfully(); } else { this.number--; @@ -166,15 +167,29 @@ export default { // 删除文件 handleDelete(index) { this.fileList.splice(index, 1); - this.$emit("input", this.listToString(this.fileList)); + this.$emit("input", this.fileListMap(this.fileList)); + }, + fileListMap(list) { + return list + if(!list.length) return [] + let arr = list.map(item=>{ + let obj = { + name: item.name, + url: item.url + } + return obj + }) + return arr }, // 上传结束处理 uploadedSuccessfully() { if (this.number > 0 && this.uploadList.length === this.number) { + console.log(this.fileList, '分开', this.uploadList) this.fileList = this.fileList.concat(this.uploadList); this.uploadList = []; this.number = 0; - this.$emit("input", this.listToString(this.fileList)); + console.log(this.fileListMap(this.fileList)) + this.$emit("input", this.fileListMap(this.fileList)); this.$modal.closeLoading(); } }, diff --git a/src/views/business/Information/index.vue b/src/views/business/Information/index.vue index 50d7394..fbee5bc 100644 --- a/src/views/business/Information/index.vue +++ b/src/views/business/Information/index.vue @@ -160,7 +160,7 @@ export default { }, methods: { inputFn(val) { - this.form.attachmentList = val.split(',') + this.form.attachmentList = val }, /** 查询列表 */ getList() { diff --git a/src/views/business/vote/index.vue b/src/views/business/vote/index.vue index 569ff88..173be8d 100644 --- a/src/views/business/vote/index.vue +++ b/src/views/business/vote/index.vue @@ -128,7 +128,7 @@
    - + 增加议题 @@ -238,24 +238,27 @@ 投票结果
    -
    -
    -
    {{ item.voteName }}
    -
    -
    {{ item2.itemName }}
    - - -

    {{ item2.itemCount }}人

    -
    +
    +
    +
    {{ + item.voteName }} +
    +
    +
    {{ item2.itemName }}
    + + +
    {{ item2.itemCount }}人
    +
    {{ item.itemName }} (已投) - @@ -267,15 +270,36 @@ 投票详情 - - - - - - +
    + + + + + + + +
    + +
    + + + + + + +
    +
    @@ -344,6 +368,7 @@ export default { ] } ], + voteType3List: [], tableData: [{ date: '投票人员', name: 'Tom', @@ -413,12 +438,17 @@ export default { }, methods: { inputFn(val) { - this.form.attachmentList = val.split(',') + console.log(val) + this.form.attachmentList = val }, handleQuery() { this.getList(); }, - + reaplas(val) { + if(!val) return 0 + return val.itemRate.replace('%', '') + + }, resetQuery() { this.queryParams = {} this.getList(); @@ -429,7 +459,7 @@ export default { this.exportLoading = true; return exportVoteResults({ id: this.form.id }); }).then(response => { - this.$download.excel(response, '投票结果.pdf'); + this.$download.excel(response, this.form.voteName + '投票结果.pdf'); this.exportLoading = false; }).catch(() => { }); }, @@ -521,13 +551,17 @@ export default { handleResult(row) { this.tableData2 = [], getVoteItem(row.id).then(res => { - - this.resultVoteOpend = true; this.form = res.data; - res.data.voteItemResultVOS.forEach(item => { - this.tableData2.push({ name: item.itemName, arr: item.voteUserVO }) - }) + if (row.voteType == 3) { + this.voteType3List = res.data.voteResultTableList + console.log(this.voteType3List,'数据') + } else { + res.data.voteItemResultVOS.forEach(item => { + this.tableData2.push({ name: item.itemName, arr: item.voteUserVO }) + }) + } + this.resultVoteOpend = true; this.title = "投票结果" }) @@ -567,9 +601,11 @@ export default { this.reset(); this.title = "修改投票" this.textVote = false; - this.addVoteOpend = true; + this.loading = true + let _this = this getVoteItem(row.id).then(res => { - + _this.addVoteOpend = true; + _this.loading = false if (!res.data.voteMultipleItemInfoRespList) { res.data.voteMultipleInfoList = [ { @@ -577,24 +613,26 @@ export default { "voteItemList": [''] } ] - }else { - res.data.voteMultipleInfoList = res.data.voteMultipleItemInfoRespList.map(item=>{ + } else { + res.data.voteMultipleInfoList = res.data.voteMultipleItemInfoRespList.map(item => { let obj = { "voteName": item.voteName, - voteItemList: item.voteMultipleResultList?item.voteMultipleResultList.map(item2=>item2.itemName):[''] + voteItemList: item.voteMultipleResultList ? item.voteMultipleResultList.map(item2 => item2.itemName) : [''] } return obj }) console.log(res.data.voteMultipleInfoList) } - this.form = res.data; - console.log(this.form) + _this.form = res.data; res.data.voteItemVO?.forEach(item => { - this.options.push({ id: item.id, value: item.itemName }) + _this.options.push({ id: item.id, value: item.itemName }) }) - }) + if (!_this.options.length) { + _this.options = [{ id: '', value: '' }] + } + }).catch(() => { _this.loading = false }) }, @@ -622,6 +660,7 @@ export default { const values = this.options.map(obj => obj.value); this.form.itemIds = values.toString(); this.form.voteRoomRangs = this.$refs.roomInfo?.getCheckedKeys(true).join(',') + this.$refs["form"].validate(valid => { if (!valid) { return; diff --git a/src/views/login.vue b/src/views/login.vue index 716edc9..925c74e 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -22,7 +22,7 @@