diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 761d5a4e7..289fbc3d9 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -98,14 +98,16 @@ +
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -134,14 +136,16 @@ +
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -162,14 +166,16 @@ +
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -192,14 +198,16 @@ +
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -216,14 +224,16 @@ +
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -335,14 +345,16 @@ +
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -456,14 +468,16 @@ +
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -570,14 +584,16 @@ +
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -607,14 +623,16 @@ +
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -646,14 +664,16 @@ +
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -774,14 +794,17 @@ -
+ +
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
+
@@ -816,6 +839,10 @@ type: Array, default: [], require: true + }, + currentPersonRole: { + type: String, + default: '' } }, data() { @@ -839,6 +866,7 @@ this.paramsConfigData = this.detailDate.paramsConfigData let name = [] console.log(this.detailDate) + console.log(this.currentPersonRole) // this.columName.forEach(item => { // if (item.db_field_name && item.db_field_name != '') { // name.push(item.db_field_name) @@ -1091,12 +1119,13 @@ display: inline-block; //margin-left: -34px; margin-top: 8px; + margin-right: 5px; cursor: pointer; } .delicon { display: inline-block; - margin-left: 5px; + /*margin-left: 5px;*/ margin-top: 8px; cursor: pointer; } diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 3a162c3e3..b26dfdece 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -75,6 +75,7 @@ diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 6bd1aaa9f..99fd6d070 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1408,10 +1408,10 @@ }, Updateparametercolumn() { let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource)) - console.log(data) let referencesCol = [] let postDate = [] let colunmnFlag = '' + this.colunmnFlag = false data.forEach((item, index) => { if (!item.referencesCol) { this.colunmnFlag = true @@ -1433,7 +1433,7 @@ if (referencesCol[i][itemIn[j]] instanceof Object && !(referencesCol[i][itemIn[j]] instanceof Array)) { postDateobj[itemIn[j]] = referencesCol[i][itemIn[j]] for (let k = 0; k < referencesCol[i][itemIn[j]].list.length; k++) { - if (referencesCol[i][itemIn[j]].list[k].type == 'pull_more') { + if (referencesCol[i][itemIn[j]].list[k].type == 'pull_more' && referencesCol[i][itemIn[j]].list[k].dataValue instanceof Array) { referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.join(',') } if (referencesCol[i][itemIn[j]].list[k].type == 'text' && referencesCol[i][itemIn[j]].list[k].dataValue !== null) {