diff --git a/package.json b/package.json index fbd19451..9d10fc00 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "vue-draggable-resizable": "^2.3.0", "vue-json-editor": "^1.4.3", "vue-ruler-tool": "^1.2.4", + "vue-style-loader": "^4.1.3", "vuedraggable": "^2.24.3" }, "devDependencies": { @@ -59,7 +60,6 @@ "v-viewer": "^1.6.4", "vue": "^2.6.14", "vue-router": "^3.3.4", - "vue-style-loader": "^4.1.3", "vue-template-compiler": "^2.6.14", "vuex": "^3.5.1", "vuex-persistedstate": "^2.7.1" diff --git a/project/hlj/app/AppFormAudit/components/List.vue b/project/hlj/app/AppFormAudit/components/List.vue index 5c6442da..b6bc9fc2 100644 --- a/project/hlj/app/AppFormAudit/components/List.vue +++ b/project/hlj/app/AppFormAudit/components/List.vue @@ -22,7 +22,8 @@ @@ -38,7 +39,7 @@ - +
@@ -90,9 +91,11 @@ examineUserNames: '', fillingUserNames: '' }, + id: '', colConfigs: [ - { prop: 'title', label: '模板名称' }, - { prop: 'updateTime', align: 'center', label: '更新时间' } + { prop: 'name', label: '审批分组' }, + { prop: 'examineUserNames', align: 'center', label: '填报人员' }, + { prop: 'fillingUserNames', align: 'center', label: '审批人员' } ], isShow: false, tableData: [], @@ -128,6 +131,38 @@ }) }, + edit (e) { + this.id = e.id + this.form.name = e.name + this.form.examineUserIds = e.examineUserIds.split(',').map((v, index) => { + return { + id: v, + name: e.examineUserNames.split(',')[index] + } + }) + this.form.fillingUserIds = e.fillingUserIds.split(',').map((v, index) => { + return { + id: v, + name: e.fillingUserNames.split(',')[index] + } + }) + + this.form.examineUserNames = 1 + this.form.fillingUserNames = 1 + this.isShow = true + }, + + remove (id) { + this.$confirm('确定删除该数据?').then(() => { + this.instance.post(`/app/appassessmentscorev2examinegroup/delete?ids=${id}`).then(res => { + if (res.code == 0) { + this.$message.success('删除成功!') + this.getList() + } + }) + }) + }, + onUserChange(e, type) { if (e.length) { this.form[type] = '1' @@ -137,6 +172,7 @@ }, onClose () { + this.id = '' this.form.name = '' this.form.fillingUserIds = [] this.form.examineUserIds = [] @@ -149,8 +185,11 @@ if (valid) { this.instance.post(`/app/appassessmentscorev2examinegroup/addOrUpdate`, { ...this.form, - fillingUserIds: this.form.fillingUserIds.map(v => v.id), - examineUserIds: this.form.examineUserIds.map(v => v.id) + id: this.id || '', + fillingUserIds: this.form.fillingUserIds.map(v => v.id).join(','), + examineUserIds: this.form.examineUserIds.map(v => v.id).join(','), + fillingUserNames: this.form.fillingUserIds.map(v => v.name).join(','), + examineUserNames: this.form.examineUserIds.map(v => v.name).join(',') }).then(res => { if (res.code == 0) { this.$message.success('提交成功!') @@ -161,15 +200,6 @@ }) } }) - }, - - toAdd (id) { - this.$emit('change', { - type: 'Add', - params: { - id: id || '' - } - }) } } } diff --git a/project/hlj/app/AppRecoScore/components/Detail.vue b/project/hlj/app/AppRecoScore/components/Detail.vue index a9e5d7c1..c937d2aa 100644 --- a/project/hlj/app/AppRecoScore/components/Detail.vue +++ b/project/hlj/app/AppRecoScore/components/Detail.vue @@ -49,7 +49,7 @@ :tableData="tableData" :col-configs="colConfigs" @getList="getList"> - +