From 01c48a1cd6c4418b3f19f1fd896679308a0c4912 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Tue, 13 Dec 2022 16:04:54 +0800 Subject: [PATCH] bug --- .../AppMicrodiskManage/components/List.vue | 83 +++++++++++++------ .../app/AppRecoScore/components/Detail.vue | 32 ++++--- vue.config.js | 2 +- 3 files changed, 80 insertions(+), 37 deletions(-) diff --git a/project/hlj/app/AppMicrodiskManage/components/List.vue b/project/hlj/app/AppMicrodiskManage/components/List.vue index 752adc33..36b42d51 100644 --- a/project/hlj/app/AppMicrodiskManage/components/List.vue +++ b/project/hlj/app/AppMicrodiskManage/components/List.vue @@ -20,6 +20,7 @@
@@ -114,6 +114,7 @@ y: '', node: {} }, + isShowTree: true, form: { folderName: '' }, @@ -133,7 +134,7 @@ colConfigs: [ { prop: 'fileName', label: '名称' }, { prop: 'ctime', label: '文件创建时间', formart: v => v ? this.$moment(v * 1000).format('YYYY-MM-DD HH:mm:ss') : '-' }, - { prop: 'departmentNames', label: '创建人' } + // { prop: 'departmentNames', label: '创建人' } ], defaultProps: { children: 'children', @@ -189,33 +190,60 @@ this.isShow = true } else if (e === 'edit') { this.form = { - ...item + ...item, + folderName: item.fileName } this.isShow = true } else if (e === 'remove') { - this.remove(item.fileId, item.spaceid) + this.remove(item.fileId) } }, onConfirm () { this.$refs.form.validate((valid) => { if (valid) { - this.instance.post(`/app/wxwedrive/createWedriveFloder`, null, { - params: { - ...this.form, - spaceid: this.spaceid, - fatherid: this.fatherid - } - }).then(res => { - this.search.spaceid = this.spaceid - this.search.fatherid = this.fatherid - if (res.code == 0) { - this.defaultChecked = [this.spaceid] - this.getList() - this.isShow = false - this.$message.success(this.departId ? '编辑成功' : '新增成功') - } - }) + if (this.form.fileId) { + this.instance.post(`/app/wxwedrive/fileRename`, null, { + params: { + newName: this.form.folderName, + fileid: this.form.fileId + } + }).then(res => { + if (res.code == 0) { + this.isShowTree = false + this.defaultChecked = [this.spaceid] + this.getList() + this.isShow = false + this.$message.success('编辑成功') + + this.$nextTick(() => { + this.isShowTree = true + }) + } + }) + } else { + this.instance.post(`/app/wxwedrive/createWedriveFloder`, null, { + params: { + ...this.form, + spaceid: this.spaceid, + fatherid: this.fatherid + } + }).then(res => { + this.search.spaceid = this.spaceid + this.search.fatherid = this.fatherid + if (res.code == 0) { + this.isShowTree = false + this.defaultChecked = [this.spaceid] + this.getList() + this.isShow = false + this.$message.success('新增成功') + + this.$nextTick(() => { + this.isShowTree = true + }) + } + }) + } } }) }, @@ -256,10 +284,15 @@ remove(id) { this.$confirm('确定删除该数据？').then(() => { - this.instance.post(`/app/wxwedrive/fileDelete?id=${id}`).then(res => { + this.instance.post(`/app/wxwedrive/fileDelete?fileid=${id}`).then(res => { if (res.code == 0) { this.$message.success('删除成功！') + this.isShowTree = false this.getList() + + this.$nextTick(() => { + this.isShowTree = true + }) } }) }) diff --git a/project/hlj/app/AppRecoScore/components/Detail.vue b/project/hlj/app/AppRecoScore/components/Detail.vue index c937d2aa..ddec3a2f 100644 --- a/project/hlj/app/AppRecoScore/components/Detail.vue +++ b/project/hlj/app/AppRecoScore/components/Detail.vue @@ -26,7 +26,7 @@ v-model="search.status" clearable placeholder="请选择完成情况" - :selectList="dict.getDict('ampvFilled')" + :selectList="dict.getDict('hljFillStatus')" @change="search.current = 1, getList()"> @@ -37,7 +37,7 @@ placeholder="输入评分人姓名" clearable v-throttle="() => {search.current = 1, getList()}" - @clear="search.current = 1, search.title = '', getList()" + @clear="search.current = 1, search.name = '', getList()" suffix-icon="iconfont iconSearch"> @@ -83,28 +83,35 @@ name: '', status: '' }, + dictList: [{ + dictName: '未填写', + dictValue: '0' + }, { + dictName: '已填写', + dictValue: '1' + }], total: 0, isShow: false, currIndex: 0, isLoading: false, tableData: [], colConfigs: [ - {prop: 'templateName', label: '参评人员', align: 'center' }, - {prop: 'createUserName', label: '提交时间', align: 'center', width: 150 }, - {prop: 'createUserName', label: '总分', align: 'center' }, + {prop: 'evaluatorsName', label: '参评人员', align: 'center' }, + {prop: 'commitTime', label: '提交时间', align: 'center', width: 150 }, + {prop: 'totalScore', label: '总分', align: 'center' }, { - prop: 'status', + prop: 'examineStatus', align: 'center', label: '审核状态', render: (h, {row}) => { return h('span', { style: { - color: this.dict.getColor('ampvFilled', row.status) + color: this.dict.getColor('auditStatus', row.examineStatus) } - }, this.dict.getLabel('ampvFilled', row.status)) + }, this.dict.getLabel('auditStatus', row.examineStatus)) } }, - {prop: 'createUserName', label: '审核人', align: 'center' }, + {prop: 'examineUserName', label: '审核人', align: 'center' }, ], list: [] } @@ -113,9 +120,11 @@ created () { if (this.params && this.params.id) { this.id = this.params.id - this.$dict.load(['ampvFilled', 'formStatus']).then(() => { + this.$dict.load(['auditStatus', 'hljFillStatus']).then(() => { this.getInfo() }) + + this.getList() } }, @@ -135,7 +144,8 @@ getList () { this.instance.post(`/app/appassessmentscorev2task/fillInfo`, null, { params: { - ...this.search + ...this.search, + taskId: this.params.id } }).then(res => { if (res.code == 0) { diff --git a/vue.config.js b/vue.config.js index 921fed1f..fed6a8c0 100644 --- a/vue.config.js +++ b/vue.config.js @@ -57,7 +57,7 @@ module.exports = { proxy: { //设置代理,可解决跨5 '/lan': { - target: 'http://192.168.1.105:19000', + target: 'http://192.168.1.87:9000', changeOrigin: true, pathRewrite: { //地址重写