diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 13958c86b..5ed715460 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -226,7 +226,6 @@ }, // 历史版本 historicalVersion(historicalRow) { - console.log(historicalRow) this.historicalVisible = true this.historicalRow = historicalRow }, @@ -271,33 +270,40 @@ handleAdd() { this.areaVisible = true }, + // 变更扩展 handleModule() { let _this = this - axios({ - url: `/jero-boot/params/manifest/changeExtension?id=${this.selectedRowKeys[0]}`, - method: 'get', - transformRequest: [function(data) { - let ret = '' - for (let it in data) { - ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' - } - return ret - }], - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'X-Access-Token': _this.token - } - }) - .then((res) => { - if (res.data.success) { - _this.$message.success(res.data.message) - } else { - _this.$message.warning(res.data.message) + if(this.selectedRowKeys.length == 0){ + this.$message.warning(_this.$t('pleaseSelectData')) + }else if(this.selectedRowKeys.length > 2){ + this.$message.warning(_this.$t('OnlyOneSelected')) + } else { + axios({ + url: `/jero-boot/params/manifest/changeExtension?id=${this.selectedRowKeys[0]}`, + method: 'get', + transformRequest: [function(data) { + let ret = '' + for (let it in data) { + ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' + } + return ret + }], + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + 'X-Access-Token': _this.token } }) - .catch((error) => { - console.log(error) - }) + .then((res) => { + if (res.data.success) { + _this.$message.success(res.data.message) + } else { + _this.$message.warning(res.data.message) + } + }) + .catch((error) => { + console.log(error) + }) + } }, handleDel() { let param = { @@ -323,7 +329,8 @@ } }, handleCody() { - this.areaVisibleCody = true + console.log('复制') + // this.areaVisibleCody = true }, getPersonnelList() { diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue index 3648de881..57a7b1f9f 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue @@ -11,9 +11,11 @@ > + * + :placeholder="$t('PleaseEnter')+$t('title')" + v-model='form.templatetitle' /> @@ -37,6 +39,7 @@ @@ -62,6 +65,17 @@ v-has="'area:delete'">{{ $t('delete') }} +
+ +
{{ $t('cancel') }} {{ $t('submit') }} @@ -108,16 +122,18 @@ export default { }, form: {}, rules: { - // templatetitle: [ - // { required: true, message: this.$t('enterTitle'), trigger: 'blur' } - // ] + templatetitle: [ + { required: true, message: this.$t('enterTitle'), trigger: 'blur' } + ] }, areaTable: [], flag: false, //表单提交标识 spinLoading: false, confirmLoading: false, templatetitle: '', - selectedRowKeys: [] + selectedRowKeys: [], + pageNo: 1, + pageSize: 10 } }, props: { @@ -151,14 +167,25 @@ export default { this.loadData() }, methods: { + pageOnChange(page, pageSize) { + this.pageNo = page + this.loadData() + }, + SizeChange(page, pageSize) { + this.pageNo = 1 + this.pageSize = pageSize + this.loadData() + }, loadData() { this.loading = true let params = { + pageNo: this.pageNo, + pageSize: this.pageSize, ...this.form } - getAction(`params/manifest/getParamsTemplateList`, params).then(res => { + getAction(`params/manifest/getParamsTemplatePage`, params).then(res => { if (res.success) { - this.areaTable = [...res.result] + this.areaTable = [...res.result.records] this.total = res.result.total } }).finally(() => { @@ -331,6 +358,10 @@ export default { display: flex; justify-content: center; } +.Required { + color: red; + margin-left: 20px; +}