diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 5bf3d620c..7d87e51ab 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -902,6 +902,7 @@ // }) // this.detailDatetransformation.push(item) }) + console.log(this.detailDate) console.log(this.detailDateList, 'oooooo') }, methods: { diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index fe5619225..5ac5ad696 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -931,6 +931,10 @@ if (itemLi.type === 'pull_more') { itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') } + if (Obj.state == '已同步至上报库' || Obj.state == 'Synced to library'){ + Obj[item].referencesColFlag = '1' + itemLi.isLock = '1' + } }) } // Obj[item].list.forEach((itemLi) => { @@ -1025,6 +1029,7 @@ for (const key in Obj[item].paramsConfigData){ Obj[item].paramsConfigData[key].forEach((itemLi) => { console.log(item) + console.log(this.currentPersonRole) if((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol'){ itemLi.isLock = 0 }else{ @@ -1060,6 +1065,10 @@ if (itemLi.type === 'pull_more') { itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') } + if (Obj.state == '已同步至上报库' || Obj.state == 'Synced to library'){ + itemLi.isLock = '1' + Obj[item].referencesColFlag = '1' + } }) } // Obj[item].list.forEach((itemLi) => { diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue index 8a302361f..b173f2f30 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue @@ -18,7 +18,7 @@ @@ -226,6 +226,9 @@ } else { url = this.url.setBatch } + if (!query.configItem){ + query.configItem = undefined + } postAction(url, query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 684a6383f..6ff3d7b40 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -383,6 +383,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :pageSizeOptions="['50','100','200','300']" :current="pageNo" @change="onChange" @showSizeChange="SizeChange" @@ -510,7 +511,7 @@ return { queryParam: {}, pageNo: 1, - pageSize: 10, + pageSize: 50, total: 0, CertificationColor: { 'Test passed': 'accordColor',