diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index f447d50a2..0196295af 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -4,719 +4,766 @@
-
- - - - - - - - - - - -
- +
+
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
- -
- +
+
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- +
+
-
- -
-
- -
-
- - - - - - - - - - - -
- +
+
+
+ + + + + + + + + + + +
+ +
+
+
+
+ +
+
+
-
- -
-
- -
-
- - +
+
+
+ + {{ item.label }} - - + + +
+
+
+ +
+
+ +
-
- -
-
- -
-
- - +
+
+
+ + {{ item.label }} - - + + +
+
+
+ +
+
+ +
-
- -
-
- -
+
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - +
+
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
+
+ +
+
+ +
-
- -
-
- -
-
- - +
+
+
+ + {{ itemin.label }} - - -
-
- - - - - - - - - - - -
- + + +
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
- -
- +
+
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- +
+
-
- -
-
- -
-
- - +
+
+
+ + {{ item.label }} - - -
-
- - - - - - - - - - - -
- + + +
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
- -
- +
+
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- +
+
-
- -
-
- -
+
-
- - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- +
+
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - +
+ +
+
+
-
-
- -
-
-
-
- - +
+
+
+ + {{ itemin.label }} - - + + +
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
+
+ +
+
+ +
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - -
-
-
- -
-
-
-
- - +
+
+
+ + {{ item.label }} - - + + +
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
+
+ +
+
+ +
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - -
-
-
- -
-
-
-
- - +
+
+
+ + {{ itemin.label }} - - + + +
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
+
+ +
+
+ +
-
- - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
-
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} -
-
- -
-
- -
-
+
@@ -743,6 +790,11 @@ watermark: { type: String, default: '' + }, + columName:{ + type: Array, + default: [], + require: true } }, data() { @@ -758,9 +810,20 @@ uploadFileChangeDown }, mounted() { - console.log(this.recordList) - for (const key in this.detailDate.paramsConfigData){ - this.detailDateList = this.detailDate.paramsConfigData[key] + this.detailDateList =[] + let name=[] + this.columName.forEach(item=>{ + if(item.db_field_name&&item.db_field_name!=''){ + name.push(item.db_field_name) + } + }) + for (let key in this.recordList){ + if(name.toString().indexOf(key)>-1){ + if(this.recordList[key].paramsConfigData){ + this.detailDateList.push(this.recordList[key].paramsConfigData) + } + + } } this.detailDateList.forEach((item) => { if (item.type === 'pull_more' && !item.dataValue) { @@ -768,6 +831,7 @@ } // this.detailDatetransformation.push(item) }) + console.log(this.detailDateList,"oooooo") }, methods: { selectChange(val){ @@ -909,6 +973,11 @@ .add_flex { /*display: flex;*/ + display: flex; + flex-direction: column; + } + .iconRow,.valflex{ + display: flex; } /deep/ .box { @@ -941,7 +1010,7 @@ } .addicon{ display: inline-block; - margin-left: 5px; + //margin-left: -34px; margin-top: 8px; } .delicon{ diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index b503f9aee..7c907edf5 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -74,7 +74,7 @@ - +
@@ -779,7 +779,7 @@ align: 'left', ellipsis: true, sorter: res.sort, - width: 500 + width: 600 }) num++ this.content.push(res) @@ -787,6 +787,7 @@ customRender: 'detailClick', title: 'titleName' + num } + console.log( this.content," this.content this.content this.content this.content this.content") // 非配置列 } else { this.columns.push({ @@ -847,6 +848,7 @@ console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii') }, getTableListReset() { + this.formInline = {} this.queryParamQuery = {} let params = { @@ -875,9 +877,12 @@ if (this.currentPersonRole !== 'dre') { res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { + if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { for (const key in Obj[item].paramsConfigData){ - Obj[item].paramsConfigData[key].forEach((itemLi) => { + Obj[item].paramsConfigData[key].forEach((itemLi) => + { + itemLi.isLock = 1 if (itemLi.type === 'pull_more') { itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') @@ -972,6 +977,7 @@ // }) let tt = [] if (this.currentPersonRole !== 'dre') { + console.log(res.result.records, 'res.result.records') res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { @@ -1005,6 +1011,7 @@ tt.push(Obj) }) } else { + res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {