From f14ded05b205727f7f919f7361a3be6ef1a30f79 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 30 May 2022 18:10:30 +0800 Subject: [PATCH] [update] 52998 --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + jero-web/src/components/SplitTable/index.vue | 10 ++- .../library/docDetail/index.vue | 4 +- .../dialog/ProjectCollectionParameters.vue | 84 +++---------------- 5 files changed, 26 insertions(+), 74 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 98745f306..1a3566d7b 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -708,6 +708,7 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'Enclosure', // 认证 + Correspondingstandarddeleted: 'Correspondingstandarddeleted', changeTheTitle: 'Title already exists, please change the title', resetPassword: 'reset Password', departmentAllocation: 'department Allocation', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index e515d0a82..2c5d00079 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -718,6 +718,7 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + Correspondingstandarddeleted: '对应标准已删除', changeTheTitle: '标题已存在，请更换标题', resetPassword: '重置密码', departmentAllocation: '部门配置', diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index 1c35e175b..45d17a3fa 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -126,7 +126,15 @@ }, methods: { urlClick(text,record) { - this.$emit('detailClick', record) + if(record.documentId === null) { + this.$message.warning(this.$t('Correspondingstandarddeleted')) + } else { + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', + query: record + }) + window.open(newUrl.href, '_blank') + } }, getTextWith(text, fontStyle) { var canvas = document.createElement('canvas') diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 17d51f430..0a556aa49 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -353,7 +353,9 @@ }, methods: { getInfoById() { - getAction(this.url.getInfo, { id: this.$route.query.id }).then((res) => { + let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId + console.log(_id) + getAction(this.url.getInfo, { id: _id }).then((res) => { if (res.success) { this.detailList = res.result } else { diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue index c21a94af3..f388c53dc 100644 --- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue +++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue @@ -24,10 +24,10 @@ - + + v-model='formData.projectName' /> @@ -90,7 +90,7 @@ export default { columns: [ { title: this.$t('entryName'), - dataIndex: 'region_dictText', + dataIndex: 'projectName', key: 'showArea', align: 'center', ellipsis: true @@ -98,7 +98,7 @@ export default { { title: this.$t('ListTitle'), align: 'center', - dataIndex: 'paramsTemplateName', + dataIndex: 'title', ellipsis: true }, { @@ -168,8 +168,9 @@ export default { let params = { pageNo: this.pageNo, pageSize: this.pageSize, - projectName: this.formData.title + ...this.formData } + this.loading = true axios({ url: `/jero-boot/params/manifest/getAllManifest`, method: 'post', @@ -188,9 +189,12 @@ export default { }) .then( (res) =>{ if (res.data.success) { - // _this.$message.success(res.data.result) + console.log(res.data) + this.loading = false + this.areaTable = res.data.result.records || [] + this.total = res.data.result.total }else{ - // _this.$message.warning(res.data.result) + this.loading = false } }) .catch( (error) =>{ @@ -201,40 +205,12 @@ export default { this.loadData() }, searchReset() { - this.form = {} + this.formData = {} this.loadData() }, handleCancel() { this.$emit('areaVisible', false) }, - // onGetCheckboxProps(val,value) { - // let _val = {} - // // 新增时没有 - // if(this.formData.id === undefined) { - // props : {} - // } else { - // // 编辑 - // props : { - // disabled: val.id === 'ce879dab56a243fd99119553d3899e62' - // } - // } - // console.log(this.formData.id,'this.formData.id') - // console.log(val) - // return(_val - // // { - // // props: { - // // - // // // console.log(value,'value') - // // // // 全部默认禁止选中 - // // // // disabled: true, - // // // // 某几项默认禁止选中(R: 当state等于1时) - // // disabled: val.id === 'ce879dab56a243fd99119553d3899e62' - // // // // 某几项默认选中(R: 当state等于1时) - // // // // defaultChecked: record.state == 1, - // // } - // // } - // ) - // }, onSelectChange(selectedRowKeys, selectedRowKeysDate) { this.selectedRowKeysDate = selectedRowKeysDate this.selectedRowKeys = selectedRowKeys @@ -247,11 +223,6 @@ export default { this.newVisible = true this.form = {} }, - editData(edit) { - - this.formData = {...edit} - this.selectedRowKeys = edit.paramsTemplateId.split(',') - }, //新增 handleSubmit() { if (this.selectedRowKeys.length == 0) { @@ -324,37 +295,6 @@ export default { }) } }, - cancelModel() { - this.newVisible = false - this.$refs.ruleForm.resetFields() - }, - //删除按钮 - deleteArea(val) { - this.$confirm({ - title: this.$t('confirmDeletion'), - content: '', - onOk: - async () => { - getAction(`tag/onlCgformArea/delete`, { id: val }).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - if (this.areaTable.length == 1 && this.queryParams.pageNo != 1) { - this.queryParams.pageNo = this.queryParams.pageNo - 1 - } - this.loadData() - } else { - // this.$message.warning(res.message) - if (res.message == '该展示区域有关联数据，无法删除！') { - this.$message.warning(this.$t('noDelete')) - } else { - this.$message.warning(this.$t('operationFailed')) - } - } - }) - } - }) - }, - // 编辑 }, watch: { selectedRowKeyS(val) {