diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue
index 3d30631ee..2d477c1bd 100644
--- a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue
+++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue
@@ -46,9 +46,6 @@
:scroll='{x: 600}'
:rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
@change='handleTableChange'>
-
- {{ text }}
-
{
+ if (res.success) {
+ this.areaTable = [...res.result.records]
+ this.total = res.result.total
}
+ }).finally(() => {
+ this.loading = false
})
- .then( (res) =>{
- if (res.data.success) {
- console.log(res.data)
- this.loading = false
- this.areaTable = res.data.result.records || []
- this.total = res.data.result.total
- }else{
- this.loading = false
- }
- })
- .catch( (error) =>{
- console.log(error);
- });
},
searchQuery() {
this.loadData()
},
searchReset() {
- this.formData = {}
+ this.form = {}
this.loadData()
},
handleCancel() {
@@ -222,63 +190,7 @@ export default {
} 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.formData.title}`, {})
- .then(res => {
- if (res.result) {
- let postDate = {
- title: this.formData.title,
- paramsTemplateId: this.paramsTemplateId || this.selectedRowKeys[0],
- paramsTemplatePublishVersion: this.version,
- projectId: this.projectId
- }
- if (this.formData.id) {
- //编辑
- postDate = {
- id : this.formData.id,
- ...postDate
- }
- 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
- })
- } 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
- })
- }
- } else {
- this.$message.warning(this.$t('changeTheTitle'))
- this.spinLoading = false
- }
- }).finally(() => {
- this.loading = false
- })
+ this.$emit('listVisibleRow', this.selectedRowKeysDate)
} else {
return false
}
diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
index acbb104cc..bd7f9aa2e 100644
--- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
+++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
@@ -72,7 +72,7 @@
-
+
@@ -142,7 +142,8 @@ export default {
selectedRowKeys: [],
pageNo: 1,
pageSize: 10,
- listVisible: false
+ listVisible: false,
+ listVisibleRowDate: {}
}
},
props: {
@@ -166,6 +167,11 @@ export default {
this.loadData()
},
methods: {
+ // 清单列表传出数据
+ listVisibleRow(val) {
+ this.listVisibleRowDate = val
+ this.listVisible = false
+ },
editArea() {
this.listVisible = true
},