diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue index 2992eb2..4fc7fe4 100644 --- a/src/components/XyTable/index.vue +++ b/src/components/XyTable/index.vue @@ -630,7 +630,9 @@ export default { let dom = []; this.moreAuths.forEach(i => { - this.$scopedSlots[i] ? dom.push(({ this.$scopedSlots[i](scope) })) : '' + if (this.auths.indexOf(i) !== -1) { + this.$scopedSlots[i] ? dom.push(({ this.$scopedSlots[i](scope) })) : '' + } }) if (this.auths.indexOf('edit') !== -1) { diff --git a/src/views/component/table.vue b/src/views/component/table.vue index de508b4..948505d 100644 --- a/src/views/component/table.vue +++ b/src/views/component/table.vue @@ -339,6 +339,22 @@ >跟进 + + examine(command,row)"> + + 审核 + + + + 通过 + 驳回 + + + import { index as fieldIndex } from "@/api/system/customFormField"; import { authMixin } from "@/mixin/authMixin"; -import { index, destroy } from "@/api/system/baseForm"; +import { index, destroy, save } from "@/api/system/baseForm"; import { op } from "@/const/op"; import { download } from "@/utils/downloadRequest"; import { getparameter } from "@/api/system/dictionary"; @@ -399,6 +415,7 @@ import { show } from "@/api/system/customForm"; import * as XLSX from "xlsx"; import { saveAs } from "file-saver"; import { listdept } from "@/api/system/department"; +import { deepCopy } from "@/utils"; import dialoger from "./dialog.vue"; import LxHeader from "@/components/LxHeader/index.vue"; @@ -449,6 +466,27 @@ export default { }; }, methods: { + examine (command, row) { + let copyRow = deepCopy(row); + copyRow.status = command; + for (let key in copyRow) { + if (/_relation/g.test(key)) { + delete copyRow[key] + } + } + console.log(copyRow) + save({ + table_name: this.customForm.tableName, + ...copyRow + }).then(_ => { + this.$message({ + type: 'success', + message: '操作成功' + }) + this.$refs['xyTable'].getTableData() + }) + }, + index, destroy, download, diff --git a/src/views/h5/exhibitor/form.vue b/src/views/h5/exhibitor/form.vue index f1678b4..b8f611b 100644 --- a/src/views/h5/exhibitor/form.vue +++ b/src/views/h5/exhibitor/form.vue @@ -222,6 +222,7 @@ export default { message: '上传成功' }) + this.fileList = []; this.$refs['elForm'].resetFields(); this.$emit('success'); }) diff --git a/src/views/h5/exhibitor/myExhibitor.vue b/src/views/h5/exhibitor/myExhibitor.vue index 08bdcd8..6c5c166 100644 --- a/src/views/h5/exhibitor/myExhibitor.vue +++ b/src/views/h5/exhibitor/myExhibitor.vue @@ -1,40 +1,55 @@ - - - - - - {{ item.meeting_id_meetings_id_relation ? item.meeting_id_meetings_id_relation.name : '' }} - - - {{ status(item.status) }} - - 附件 - - 111 - + + + + + + + + + {{ item.meeting_id_meetings_id_relation ? item.meeting_id_meetings_id_relation.name : '' }} + {{ status(item.status) }} + + + + {{ item.meeting_id_meetings_id_relation.start_date }} ~ {{ item.meeting_id_meetings_id_relation.end_date }} + + + + + + + + {{ item.fujian_uploads_id_relation.original_name }} + + + {{ item.remark }} + + 删除 + + - - - - + { exhibitorSelect.page = e; getExhibitors(); } " - /> + /> + + diff --git a/src/views/h5/index.vue b/src/views/h5/index.vue index 55df889..2370b92 100644 --- a/src/views/h5/index.vue +++ b/src/views/h5/index.vue @@ -1,17 +1,24 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -45,11 +52,41 @@ export default {
- - {{ item.meeting_id_meetings_id_relation ? item.meeting_id_meetings_id_relation.name : '' }} -
删除