diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index dda041031..941b85887 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -275,9 +275,8 @@ // 配置 configure(item) { this.itemId = item.id - this.itemRow = item - this.$refs.configureRef.addModel(item.id) + this.$refs.configureRef.addModel(item.id,item) }, handleCancel(val) { this.areaVisible = val diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index b0ae4022b..71e7e0c24 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -95,7 +95,7 @@
- {{$t('addConfiguration')}} + {{$t('addConfiguration')}} {{$t('deleteConfiguration')}} @@ -146,6 +146,7 @@ formInline: {}, confirmLoading: false, visible: false, + loading:false, rules: { // nioNumber:[ // { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'change' }, @@ -155,7 +156,7 @@ projectNameList: [], title: '', stateOne: '', - configFlag:'', + conFlag:'', contentList: [], paramsConfigEOList: [ { @@ -187,19 +188,13 @@ } }) }, - addModel(id) { + addModel(id,item) { this.paramsConfigEOList = [] this.visible = true this.title = this.$t('MaintainConfigureInfo') this.formInline = {} this.getconList(id) - getAction(this.url.configurelist, { paramsManifestId: this.itemRow.id }).then((res) => { - if (res.success) { - this.configFlag = res.result - } else { - this.$message.warning(res.message) - } - }) + }, getconList(id) { getAction(`${this.url.conList}?paramsManifestId=${id}`, {}).then((res) => { @@ -226,19 +221,29 @@ }) }, addConfiguration(item) { - console.log(this.configFlag) - if (this.configFlag == true) { - this.paramsConfigEOList.splice(item.displaySeq + 1, 0, { - id: '', - configName: '', // 配置名称 - version: '', // 版本 - carType: '', // 车型 - battery: '', // 电池 - motor: '' // 电机 - }) - } else { - this.$message.warning(this.$t('Theselectedconfiguration')) - } + this.loading = true + getAction(this.url.configurelist, { paramsManifestId: this.itemRow.id }).then((res) => { + if (res.success) { + this.conFlag = res.result + if (this.conFlag == true) { + this.paramsConfigEOList.splice(item.displaySeq + 1, 0, { + id: '', + configName: '', // 配置名称 + version: '', // 版本 + carType: '', // 车型 + battery: '', // 电池 + motor: '' // 电机 + }) + this.loading = false + } else { + this.loading = false + this.$message.warning(this.$t('Theselectedconfiguration')) + } + } else { + this.$message.warning(res.message) + } + }) + }, deleteConfiguration(displaySeq, index) { if (this.paramsConfigEOList.length === 1) { @@ -262,6 +267,8 @@ }, handleCancel() { this.visible = false + this.$refs.ruleForm.clearValidate() + this.conFlag = '' }, handleSubmit() { let flag = 1