diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index d1a9038a1..605be9a05 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -6,7 +6,7 @@
@@ -16,7 +16,7 @@
- + {{ item.label }} @@ -30,7 +30,7 @@
- + {{ item.label }} @@ -45,7 +45,7 @@
+ @click="clickButtonToUpload('fileTemplateConnectId')" :disabled="item.isLock == '1' ? true: false"> {{ (item.dataValue === 'null' || item.dataValue === '' || item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} @@ -56,7 +56,7 @@
- + {{ itemin.label }} @@ -66,7 +66,7 @@
@@ -77,12 +77,12 @@
- + {{ item.label }} @@ -97,13 +97,13 @@
+ @click="clickButtonToUpload('fileTemplateConnectId')" :disabled="item.isLock == '1' ? true: false"> {{ (item.dataValue === 'null' || item.dataValue === '' || item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} @@ -114,7 +114,7 @@
- + {{ itemin.label }} @@ -124,6 +124,7 @@
{{ (item.dataValue === 'null' || item.dataValue === '' || item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} @@ -135,7 +136,7 @@
- + {{ item.label }} @@ -145,6 +146,7 @@
{{ (item.dataValue === 'null' || item.dataValue === '' || item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} @@ -156,7 +158,7 @@
- + {{ itemin.label }} @@ -166,13 +168,13 @@
+ @click="clickButtonToUpload('fileTemplateConnectId')" :disabled="item.isLock == '1' ? true: false"> {{ (item.dataValue === 'null' || item.dataValue === '' || item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} @@ -198,7 +200,7 @@ export default { }, data() { return { - disabled: false, + isLock: '0', formInline: {}, visible: false } diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 64f120367..03371aea7 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -140,8 +140,8 @@ - - + + {{ item.label }} @@ -264,7 +264,8 @@ export default { xs: { span: 24 }, sm: { span: 7 } }, - rules: {} + rules: {}, + FreezeList: [], // 冻结字段 } }, props: { @@ -332,7 +333,37 @@ export default { }, // 冻结配置提交 handleSubmitFreeze() { - this.areaVisibleFreeze = false + let _this = this + let param = {paramsManifestId: this.paramsManifest.id, paramsConfigIds: this.Dateline.paramsConfig} + axios({ + url: '/jero-boot/params/collectManifest/lockConfigColumn', + 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.$message.success(res.data.result) + this.areaVisibleFreeze = false + this.$refs.CollectionTabel.getTableList() + }else{ + _this.$message.warning(res.data.result) + } + }) + .catch( (error) =>{ + console.log(error); + }); }, // 冻结配置取消 cancleImportsFreeze() { @@ -340,8 +371,7 @@ export default { }, getFreeze() { let _this = this - console.log(this.paramsManifest,'this.paramsManifest,') - let param = {paramsManifestId: this.$route.query.id, configFlag: 2} + let param = {paramsManifestId: this.paramsManifest.id, configFlag: 2} axios({ url: '/jero-boot/params/collectManifest/getConfigLableList', method: 'post', @@ -361,10 +391,7 @@ export default { .then( (res) =>{ console.log(res) if (res.data.success) { - _this.$message.success(res.data.result) - _this.areaVisible = false - _this.getTableList() - _this.selectedRowKeysValue=[] + this.FreezeList = res.data.result }else{ _this.$message.warning(res.data.result) }