From d2148b9b31d6a578187034ab9b2156ff3a883fc2 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 12 May 2022 14:29:41 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/ParameterLibrary/index.vue | 67 +++++-------------- .../ProjectDetails/index.vue | 2 + .../ParameterItemCollectionList.vue | 15 +++-- 3 files changed, 27 insertions(+), 57 deletions(-) diff --git a/jero-web/src/components/ParameterLibrary/index.vue b/jero-web/src/components/ParameterLibrary/index.vue index 25286b1fc..749dde3a7 100644 --- a/jero-web/src/components/ParameterLibrary/index.vue +++ b/jero-web/src/components/ParameterLibrary/index.vue @@ -97,7 +97,7 @@ export default { }, { title: this.$t('areaOfResponsibility'), - dataIndex: 'dutyTerritory', + dataIndex: 'dutyTerritory_dictText', align: 'center', ellipsis: true } @@ -181,63 +181,30 @@ export default { handleSubmit() { if (this.selectedRowKeys.length == 0) { this.$message.warning(this.$t('pleaseSelectData')) - } else if (this.selectedRowKeys.length > 1) { - this.$message.warning(this.$t('OnlyOneSelected')) } else { this.$refs.ruleForm.validate(valid => { if (valid) { this.flag = true this.spinLoading = true - // 新增編輯之前 判断 标题唯一 - getAction(`params/manifest/verifyTitle?projectId=${this.$route.query.id} - &title=${this.templatetitle}`, {}) - .then(res => { - if (res.success) { - let postDate = { - title: this.templatetitle, - paramsTemplateId: this.rowId || this.selectedRowKeysDate[0].id, - paramsTemplatePublishVersion: this.version || this.selectedRowKeysDate[0].version, - projectId: this.projectId - } - if (this.rowId) { - //编辑 - postAction(`params/manifest/edit`, postDate).then(res => { - if (res.success) { - this.newVisible = false - this.$emit('areaVisible', false) - this.$message.success(this.$t('OperationSuccessful')) - } else { - this.$message.warning(res.message) - } - } - ).finally(() => { - this.flag = false - this.spinLoading = false - this.newVisible = false - }) + //新增 + let postDate = { + paramsInfoPublishEOList: this.selectedRowKeysDate, + paramsManifestId: this.paramsManifest.id, + projectId: this.$route.query.id + } + postAction(`params/collectManifest/add`, postDate).then(res => { + if (res.success) { + this.newVisible = false + this.$message.success(this.$t('OperationSuccessful')) } else { - //新增 - postAction(`params/manifest/add`, postDate).then(res => { - if (res.success) { - this.newVisible = false - this.$emit('areaVisible', false) - this.$message.success(this.$t('OperationSuccessful')) - } else { - this.$message.warning(res.message) - } - } - ).finally(() => { - this.flag = false - this.spinLoading = false - this.newVisible = false - }) + this.$message.warning(res.message) } - } else { - this.$message.warning(res.message) } - }).finally(() => { - this.loading = false - }) + ).finally(() => { + this.flag = false + this.spinLoading = false + this.newVisible = false + }) } else { return false } diff --git a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue index d4590295c..7d8efe6c1 100644 --- a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue @@ -1,5 +1,6 @@