diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index de2138c64..d3f760def 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -345,21 +345,33 @@ export default { addList() { dicTypeData().then(res => { this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - }) - standUnqualified(this.queryUnqualidiedData).then(res => { - this.unqualidiedData = res.data.records - this.unqualidiedData.forEach(item => { - this.$set(item,'engineer','') - this.$set(item,'engineerId','') - this.$set(item,'dutyPeopleInfo','') - this.$set(item,'dutyPeople','') - this.$set(item,'dutyPeopleInfoId','') - this.$set(item,'dutyPeopleId','') - this.$set(item,'fileText',[]) - this.$set(item,'fileTextId',[]) - this.$set(item,'fileTextPath',[]) + standUnqualified(this.queryUnqualidiedData).then(res => { + this.unqualidiedData = res.data.records + this.unqualidiedData.forEach(item => { + // 责任部门转换 + if (item.responsibleUnit !== null || item.responsibleUnit !== "") { + let k = (item.responsibleUnit || "").split(',') + for (let i in this.zrbmOptions) { + for (let m = 0; m< k.length; m++) { + if (this.zrbmOptions[i].value === k[m]) { + k[m] = this.zrbmOptions[i].label + } + item.responsibleUnit = k.join(',') + } + } + } + this.$set(item,'engineer','') + this.$set(item,'engineerId','') + this.$set(item,'dutyPeopleInfo','') + this.$set(item,'dutyPeople','') + this.$set(item,'dutyPeopleInfoId','') + this.$set(item,'dutyPeopleId','') + this.$set(item,'fileText',[]) + this.$set(item,'fileTextId',[]) + this.$set(item,'fileTextPath',[]) + }) + this.total = res.data.total }) - this.total = res.data.total }) this.standModel = true; }, diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 04bb340e5..0d07c9321 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -371,13 +371,13 @@ export default { loading: 'loading' }, res => { if (res.ok) { - res.data.records.forEach((item)=>{ - for(let key in item){ - if(item[key] == null){ - item[key]='无' - } - } - }) + // res.data.records.forEach((item)=>{ + // for(let key in item){ + // if(item[key] == null){ + // item[key]='无' + // } + // } + // }) this.sarProStateListDatas = res.data.records this.sarProStateTotal = res.data.total } diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index a704c9847..864bd9717 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -27,7 +27,7 @@
- {{ this.$route.query.item.endTime || '-' }} + {{ this.$route.query.item.startTime || '-' }}
@@ -193,7 +193,6 @@
_this: this
}, res => {
this.standinfoList = res.data.records
- console.log(this.standinfoList);
this.total = res.data.total
this.spinShow = false
}, e => {
@@ -277,10 +276,10 @@
cid: this.$route.query.item.cid,
content: this.opinionContent.content,
partCode: this.opinionContent.partCode,
- userId: this.$store.getters.userInfo.userId,
- userName: this.$store.getters.userInfo.account,
- deptName: this.$store.getters.userInfo.orgName,
- deptId: this.$store.getters.userInfo.orgId
+ userId: this.$store.getters.userInfo.userId || '',
+ userName: this.$store.getters.userInfo.userName || '',
+ deptName: this.$store.getters.userInfo.orgName || '',
+ deptId: this.$store.getters.userInfo.orgId || ''
}
if (this.type === 'edit') {
form.id = this.id
diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index ffcef1be5..d3bdaaeb9 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -324,8 +324,8 @@