diff --git a/jero-web/src/components/ReferenceParameter/index.vue b/jero-web/src/components/ReferenceParameter/index.vue index e29c23cfa..1124a403c 100644 --- a/jero-web/src/components/ReferenceParameter/index.vue +++ b/jero-web/src/components/ReferenceParameter/index.vue @@ -4,7 +4,7 @@
- + + + + {{ item.label }} + + +
    配置
@@ -22,8 +27,13 @@
- + + + + {{ item.label }} + + +
    配置
@@ -49,8 +59,6 @@ export default { data() { return { token:Vue.ls.get(ACCESS_TOKEN), - title: this.$t('add'), - total: 0, selectedRowKeysDate: {}, loading: false, editId: '', @@ -63,18 +71,23 @@ export default { xs: { span: 24 }, sm: { span: 14 } }, - form: {}, + formInline: {}, rules: {}, areaTable: [], flag: false, //表单提交标识 spinLoading: false, confirmLoading: false, selectedRowKeys: [], - pageNo: 1, - pageSize: 10, + fromDate: [], + fromDateTo: [], } }, props: { + paramsManifest: { + type: Object, + default: {}, + require: true + }, selectedRowKeysArray: { type: String, default: '', @@ -82,24 +95,71 @@ export default { } }, mounted() { - this.loadData() + this.loadData(), + this.loadDataTo() }, methods: { loadData() { - this.loading = true - let params = { - pageNo: this.pageNo, - pageSize: this.pageSize, - ...this.form - } - getAction(`sys/user/page`, params).then(res => { - if (res.success) { - this.areaTable = [...res.result.records] - this.total = res.result.total + let _this = this + let param = {paramsManifestId: this.paramsManifest.id,configFlag: 1} + axios({ + url: '/jero-boot/params/collectManifest/getConfigLableListR', + method: 'post', + data: param, + 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 } - }).finally(() => { - this.loading = false }) + .then( (res) =>{ + console.log(res) + if (res.data.success) { + this.fromDate = res.data.result + }else{ + _this.$message.warning(res.data.result) + } + }) + .catch( (error) =>{ + console.log(error); + }); + }, + loadDataTo() { + let _this = this + let param = {paramsManifestId: this.paramsManifest.id,configFlag: 2} + axios({ + url: '/jero-boot/params/collectManifest/getConfigLableListR', + method: 'post', + data: param, + 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) =>{ + console.log(res) + if (res.data.success) { + this.fromDateTo = res.data.result + }else{ + _this.$message.warning(res.data.result) + } + }) + .catch( (error) =>{ + console.log(error); + }); }, searchQuery() { this.loadData() @@ -117,17 +177,12 @@ export default { }, handleTableChange(val) { }, - //新增 + // 引用参数确定 handleSubmit() { let _this = this - if (this.selectedRowKeys.length == 0) { - this.$message.warning(this.$t('pleaseSelectData')) - } else if (this.selectedRowKeys.length > 1) { - this.$message.warning(this.$t('OnlyOneSelected')) - } else { - let param = {ids: this.selectedRowKeysArray, projectId: this.$route.query.id, dre:this.selectedRowKeysDate[0].username } + let param = {ids: this.selectedRowKeysArray, ...this.formInline } axios({ - url: '/jero-boot/params/collectManifest/updateDreBatch', + url: '/jero-boot/params/collectManifest/referParams', method: 'post', data: param, transformRequest: [function (data) { @@ -145,7 +200,6 @@ export default { .then( (res) =>{ if (res.data.success) { _this.$message.success(res.data.result) - _this.loadData() this.$emit('areaVisibleAssignedbyflag', false) }else{ _this.$message.warning(res.data.result) @@ -154,7 +208,6 @@ export default { .catch( (error) =>{ console.log(error); }); - } } } } diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index fc1e1df27..8a8a08ac1 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -174,7 +174,7 @@ - +