diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 94961b84c..3d2a8abce 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -680,8 +680,9 @@ uploadFileChangeDown }, mounted() { + console.log(this.detailDate) this.detailDate.list.forEach((item) => { - if (item.type === 'pull_more') { + if (item.type === 'pull_more' && !item.dataValue) { item.dataValue = [] } // this.detailDatetransformation.push(item) @@ -737,11 +738,11 @@ }, watch: { detailDate(newold, oldold) { - console.log(newold, oldold, 'll') + // console.log(newold, oldold, 'll') }, formInline: { handler(newOld, oldval) { - console.log(newOld, oldval, 'll') + // console.log(newOld, oldval, 'll') }, deep: true } diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 7719c8388..63bcabf5f 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -220,10 +220,10 @@ type: Object, default: true }, - queryParamQuery: { - type: Object, - default: true - }, + // queryParamQuery: { + // type: Object, + // default: true + // }, currentPersonRole: { type: String, default: true @@ -649,7 +649,6 @@ } }) this.columns = [...this.columns] - console.log(this.columns) } }) }, @@ -726,9 +725,6 @@ this.selectedRowKeys = [] }, getTableList(currentPersonRole) { - console.log(currentPersonRole) - console.log(this.queryParamQuery) - // todo let paramsManifestid let url if (this.$route.query.it === undefined) { @@ -752,7 +748,6 @@ this.loading = true getAction(url, params).then((res) => { if (res.success) { - // todo // console.log(res.result,'res.result') // let tt = [] // this.dataSource = [] @@ -771,13 +766,14 @@ // }) let tt = [] if (this.currentPersonRole !== 'dre') { + console.log(res.result.records,'res.result.records') res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { Obj[item].list.forEach((itemLi) => { itemLi.isLock = 1 if (itemLi.type === 'pull_more') { - itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') + itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') } }) } @@ -790,7 +786,7 @@ if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { Obj[item].list.forEach((itemLi) => { if (itemLi.type === 'pull_more') { - itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') + itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') } }) } @@ -798,7 +794,7 @@ tt.push(Obj) }) } - this.dataSource = tt + this.dataSource = JSON.parse(JSON.stringify(tt)) this.total = res.result.total this.selectedRowKeys = [] this.selectedRowrowValue = [] diff --git a/jero-web/src/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue index df598bc41..e742821cb 100644 --- a/jero-web/src/components/uploadFileChangeDown/file.vue +++ b/jero-web/src/components/uploadFileChangeDown/file.vue @@ -62,7 +62,7 @@ import { mapGetters } from 'vuex' } }, created() { - console.log(this.detailDate, 'detailDate') + // console.log(this.detailDate, 'detailDate') // this.detailDate.list.forEach((item) => { // if (item.type == 'file' && item.isLock == '1') { // this.disabled = true diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 9a0bd9f7f..335d28489 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -235,6 +235,7 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, + createBy: this.userInfo().username, ...queryParam } this.loading = true @@ -476,7 +477,8 @@ .text-operation { margin-right: 8px; } - ::v-deep .ant-select-dropdown{ + + ::v-deep .ant-select-dropdown { z-index: 100; } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index cb0b66ab6..d851a0ecf 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -44,8 +44,10 @@ {{$t('selectedStandard')}}