WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改点击责任领域后，跳转未筛选状态

Browse Source
This commit is contained in:
范强强
2023-10-26 12:24:45 +08:00
parent c4659076b2
commit 3a0a48ec66
7 changed files with 554 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/certificationList/index.vue
+16 -7
View File
@@ -21,6 +21,7 @@
class="box-input"
mode="multiple"
allowClear
@change="ProcessStatusChange"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam.flowStatus">
<a-select-option v-for="(item, key) in processStatusList"
@@ -85,8 +86,10 @@
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }"
@click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary"
@click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
@@ -896,7 +899,7 @@
align: 'left',
dataIndex: 'remark',
width: 210,
ellipsis: true,
ellipsis: true
},
{
title: this.$t('operation'),
@@ -913,7 +916,7 @@
toDoNotConditions: [],
userInfoQuery: {},
DeliverableTreeList: [],
firstLevelDutyTerritoryList:[],
firstLevelDutyTerritoryList: []
}
},
mounted() {
@@ -922,9 +925,9 @@
this.long = localStorage.getItem('language') || 'zh-cn'
this.loading = true
this.userInfoQuery = this.userInfo()
console.log(this.areaOfResponsibility)
if (this.areaOfResponsibility && this.areaOfResponsibility.dutyTerritoryName) {
this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibility.dutyTerritoryName
this.queryParam.flowStatus = this.areaOfResponsibility.processState ? this.areaOfResponsibility.processState.split(',') : []
this.queryParam = { ...this.queryParam }
}
this.getProcessStatus()
@@ -1206,6 +1209,9 @@
}
downloadFile(this.url.exportData, this.$route.query.projectName + '.zip', query, this.Deselect)
},
ProcessStatusChange(value) {
console.log(value)
},
handleDel() {
let _this = this
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
@@ -1727,7 +1733,10 @@
this.$confirm({
content: _this.$t('ConfirmDelete'),
onOk() {
deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
deleteAction(_this.url.deleteOne, {
id: val.id,
projectLibraryId: _this.$route.query.id
}).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.getList()
@@ -2526,7 +2535,7 @@
// } else {
// this.$message.warning(this.$t('selectLeastOne'))
// }
},
}
}
}
</script>
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+12 -4
View File
@@ -58,6 +58,7 @@
style="width: calc(100% - 80px);"
mode="multiple"
optionFilterProp="label"
@change="listOptionsChange"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam[selectModel]">
<a-select-option v-for="(item, key) in listOptions"
@@ -113,8 +114,10 @@
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }"
@click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary"
@click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
@@ -440,7 +443,8 @@
<transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
<associatedplat :url="url" @associatedplatForm="associatedplatForm" ref="associatedplatRef"/>
<associatedplattwo :url="url" @associatedplattwoForm="associatedplattwoForm" ref="associatedplattwoRef"/>
<associatedplatthree :url="url" @associatedplatthreeFormHomo="associatedplatthreeFormHomo" @associatedplatthreeForm="associatedplatthreeForm" ref="associatedplatthreeRef"/>
<associatedplatthree :url="url" @associatedplatthreeFormHomo="associatedplatthreeFormHomo"
@associatedplatthreeForm="associatedplatthreeForm" ref="associatedplatthreeRef"/>
<customizeList :url="url" @customizeListForm="customizeListForm" ref="customizeListRef"/>
<transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
<fixedPlate @fixedPlateForm="addModelList" ref="fixedPlateRef"/>
@@ -1585,6 +1589,8 @@
this.getFirstLevelDutyTerritory()
if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritoryName) {
this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibilityList.dutyTerritoryName
this.selectModel = this.areaOfResponsibilityList.selectModel
this.queryParam[this.selectModel] = this.areaOfResponsibilityList.processState ? this.areaOfResponsibilityList.processState.split(',') : []
this.queryParam = { ...this.queryParam }
}
this.long = localStorage.getItem('language') || 'zh-cn'
@@ -1942,7 +1948,9 @@
downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('complianceReporting') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') })
}
},
listOptionsChange(row) {
console.log(row)
},
//导出
handleExport() {
let roleCodeIndex = this.roleSwitchingCode
jero-web/src/views/projectManagement/components/responsibilityList.vue
+114 -5
View File
@@ -82,7 +82,101 @@
width: 240,
sorter: true
}
],
//法规清单
taskProcessState: {//设计、验证任务确认
'Duty Person Accepted': [//设计、验证任务确认-责任人接受
'Results to be submitted',
'Results to be reviewed',
'Compliance',
'Non-Compliance',
'To be tracked'
],
'List to be released': [//设计、验证任务确认-清单待发布
'List to be released',
'Regulatory engineer returns'
],
'Task to be confirmed': [//设计、验证任务确认-任务待确认
'Task to be confirmed'
],
'Duty Person Rejected': [//设计、验证任务确认-责任人拒绝
'Duty Person Rejected'
],
'List to be checked': [//设计、验证任务确认-任务待发起
'List to be checked'
]
},
complianceProcessState: {//设计、验证符合性
'Task to be confirmed': [//任务待确认
'List to be released',
'Regulatory engineer returns',
'List to be checked',
'Task to be confirmed',
'Duty Person Rejected'
],
'Results to be submitted': [//结果待提交
'Results to be submitted'
],
'Results to be reviewed': [//结果待审查
'Results to be reviewed'
],
'To be tracked': [//待追踪
'To be tracked'
],
'Compliance': [//符合
'Compliance'
],
'Non-Compliance': [//不符合
'Non-Compliance'
]
},
//认证清单-认证任务确认
authenticationProcessState: {
'List to be released': [//清单待发布
'List to be released',
'Certification returned'
],
'List to be checked': [//任务待发起
'List to be checked'
],
'Task to be confirmed': [//任务待确认
'Task to be confirmed'
],
'Accepted of responsible person': [//责任人接受
'Results to be submitted',
'Results to be reviewed',
'Review and pass',
'Review and return'
],
'Refusal of responsible person': [//责任人拒绝
'Refusal of responsible person'
]
},
//认证清单-Pro-homo流程
proHomoProcessState: {
'Task to be confirmed': [//任务待确认
'List to be released',
'Certification returned',
'List to be checked',
'Task to be confirmed',
'Refusal of responsible person'
],
'Results to be submitted': [//结果待提交
'Results to be submitted'
],
'Results to be reviewed': [//结果待审查
'Results to be reviewed'
],
'Review and pass': [//审查通过
'Review and pass'
],
'Review and return': [//审查退回
'Review and return'
]
},
//认证清单-认证进度
progressProcessState: {}
}
},
mounted() {
@@ -122,7 +216,7 @@
let query = {
...this.queryParam,
orderBy: this.orderBy,
orderByField: this.orderByField,
orderByField: this.orderByField
}
getAction(this.url.GroupByTerritory, query).then((res) => {
if (res.success) {
@@ -141,11 +235,26 @@
this.visible = false
},
areaOfResponsibilityClick(item) {
if (this.queryParam.operatorType == 'queryDesignTaskConfirmation' ||
this.queryParam.operatorType == 'queryVerificationTaskConfirmation' ||
this.queryParam.operatorType == 'queryDesignStatistics' ||
this.queryParam.operatorType == 'queryVerifyStatistics') {
if (this.queryParam.operatorType == 'queryDesignTaskConfirmation') {
item.isListing = '1'
item.processState = this.taskProcessState[this.queryParam.status].join(',')
item.selectModel = 'designFlowStatus'
} else if (this.queryParam.operatorType == 'queryVerificationTaskConfirmation') {
item.isListing = '1'
item.processState = this.taskProcessState[this.queryParam.status].join(',')
item.selectModel = 'verifyFlowStatus'
} else if (this.queryParam.operatorType == 'queryDesignStatistics') {
item.processState = this.complianceProcessState[this.queryParam.status].join(',')
item.isListing = '1'
item.selectModel = 'designFlowStatus'
} else if (this.queryParam.operatorType == 'queryVerifyStatistics') {
item.processState = this.complianceProcessState[this.queryParam.status].join(',')
item.isListing = '1'
item.selectModel = 'verifyFlowStatus'
} else if (this.queryParam.operatorType == 'queryRZTaskToConfirmStatistics') {
item.processState = this.authenticationProcessState[this.queryParam.status].join(',')
} else if (this.queryParam.operatorType == 'queryPrehomoStatistics') {
item.processState = this.proHomoProcessState[this.queryParam.status].join(',')
}
this.$emit('responsibility', item)
}
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+8 -6
View File
@@ -85,8 +85,10 @@
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }"
@click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary"
@click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
@@ -825,7 +827,7 @@
align: 'left',
dataIndex: 'remark',
width: 180,
ellipsis: true,
ellipsis: true
},
{
title: this.$t('operation'),
@@ -842,7 +844,7 @@
toDoNotConditions: [],
userInfoQuery: {},
DeliverableTreeList: [],
firstLevelDutyTerritoryList:[],
firstLevelDutyTerritoryList: []
}
},
mounted() {
@@ -851,9 +853,9 @@
this.long = localStorage.getItem('language') || 'zh-cn'
this.loading = true
this.userInfoQuery = this.userInfo()
console.log(this.areaOfResponsibility)
if (this.areaOfResponsibility && this.areaOfResponsibility.dutyTerritoryName) {
this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibility.dutyTerritoryName
this.queryParam.flowStatus = this.areaOfResponsibility.processState ? this.areaOfResponsibility.processState.split(',') : []
this.queryParam = { ...this.queryParam }
}
this.getProcessStatus()
@@ -2210,7 +2212,7 @@
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
}
}
}
</script>
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
+2
View File
@@ -1521,6 +1521,8 @@
this.getFirstLevelDutyTerritory()
if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritoryName) {
this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibilityList.dutyTerritoryName
this.selectModel = this.areaOfResponsibilityList.selectModel
this.queryParam[this.selectModel] = this.areaOfResponsibilityList.processState ? this.areaOfResponsibilityList.processState.split(',') : []
this.queryParam = { ...this.queryParam }
}
this.long = localStorage.getItem('language') || 'zh-cn'
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/responsibilityList.vue
+111 -4
View File
@@ -82,7 +82,99 @@
width: 240,
sorter: true
}
],
//法规清单
taskProcessState: {//设计、验证任务确认
'Duty Person Accepted': [//设计、验证任务确认-责任人接受
'Results to be submitted',
'Results to be reviewed',
'Compliance',
'Non-Compliance',
'To be tracked'
],
'List to be released': [//设计、验证任务确认-清单待发布
'List to be released',
'Regulatory engineer returns'
],
'Task to be confirmed': [//设计、验证任务确认-任务待确认
'Task to be confirmed'
],
'Duty Person Rejected': [//设计、验证任务确认-责任人拒绝
'Duty Person Rejected'
],
'List to be checked': [//设计、验证任务确认-任务待发起
'List to be checked'
]
},
complianceProcessState: {//设计、验证符合性
'Task to be confirmed': [//任务待确认
// 'List to be released',
// 'Regulatory engineer returns',
'List to be checked',
'Task to be confirmed',
'Duty Person Rejected'
],
'Results to be submitted': [//结果待提交
'Results to be submitted'
],
'Results to be reviewed': [//结果待审查
'Results to be reviewed'
],
'To be tracked': [//待追踪
'To be tracked'
],
'Compliance': [//符合
'Compliance'
],
'Non-Compliance': [//不符合
'Non-Compliance'
]
},
//认证清单-认证任务确认
authenticationProcessState: {
'List to be released': [//清单待发布
'List to be released',
'Certification returned'
],
'List to be checked': [//任务待发起
'List to be checked'
],
'Task to be confirmed': [//任务待确认
'Task to be confirmed'
],
'Accepted of responsible person': [//责任人接受
'Results to be submitted',
'Results to be reviewed',
'Review and pass',
'Review and return'
],
'Refusal of responsible person': [//责任人拒绝
'Refusal of responsible person'
]
},
//认证清单-Pro-homo流程
proHomoProcessState: {
'Task to be confirmed': [//任务待确认
'List to be released',
'Certification returned',
'List to be checked',
'Task to be confirmed',
'Refusal of responsible person'
],
'Results to be submitted': [//结果待提交
'Results to be submitted'
],
'Results to be reviewed': [//结果待审查
'Results to be reviewed'
],
'Review and pass': [//审查通过
'Review and pass'
],
'Review and return': [//审查退回
'Review and return'
]
},
}
},
mounted() {
@@ -141,11 +233,26 @@
this.visible = false
},
areaOfResponsibilityClick(item) {
if (this.queryParam.operatorType == 'queryDesignTaskConfirmation' ||
this.queryParam.operatorType == 'queryVerificationTaskConfirmation' ||
this.queryParam.operatorType == 'queryDesignStatistics' ||
this.queryParam.operatorType == 'queryVerifyStatistics') {
if (this.queryParam.operatorType == 'queryDesignTaskConfirmation') {
item.isListing = '1'
item.processState = this.taskProcessState[this.queryParam.status].join(',')
item.selectModel = 'designFlowStatus'
} else if (this.queryParam.operatorType == 'queryVerificationTaskConfirmation') {
item.isListing = '1'
item.processState = this.taskProcessState[this.queryParam.status].join(',')
item.selectModel = 'verifyFlowStatus'
} else if (this.queryParam.operatorType == 'queryDesignStatistics') {
item.processState = this.complianceProcessState[this.queryParam.status].join(',')
item.isListing = '1'
item.selectModel = 'designFlowStatus'
} else if (this.queryParam.operatorType == 'queryVerifyStatistics') {
item.processState = this.complianceProcessState[this.queryParam.status].join(',')
item.isListing = '1'
item.selectModel = 'verifyFlowStatus'
} else if (this.queryParam.operatorType == 'queryRZTaskToConfirmStatistics') {
item.processState = this.authenticationProcessState[this.queryParam.status].join(',')
} else if (this.queryParam.operatorType == 'queryPrehomoStatistics') {
item.processState = this.proHomoProcessState[this.queryParam.status].join(',')
}
this.$emit('responsibility', item)
}
jero-web/src/views/projectManagement/projectStatusBoard/components/responsibilityList.vue
+118 -8
View File
@@ -83,7 +83,99 @@
width: 240,
sorter: true
}
],
//法规清单
taskProcessState: {//设计、验证任务确认
'Duty Person Accepted': [//设计、验证任务确认-责任人接受
'Results to be submitted',
'Results to be reviewed',
'Compliance',
'Non-Compliance',
'To be tracked'
],
'List to be released': [//设计、验证任务确认-清单待发布
'List to be released',
'Regulatory engineer returns'
],
'Task to be confirmed': [//设计、验证任务确认-任务待确认
'Task to be confirmed'
],
'Duty Person Rejected': [//设计、验证任务确认-责任人拒绝
'Duty Person Rejected'
],
'List to be checked': [//设计、验证任务确认-任务待发起
'List to be checked'
]
},
complianceProcessState: {//设计、验证符合性
'Task to be confirmed': [//任务待确认
'List to be released',
'Regulatory engineer returns',
'List to be checked',
'Task to be confirmed',
'Duty Person Rejected'
],
'Results to be submitted': [//结果待提交
'Results to be submitted'
],
'Results to be reviewed': [//结果待审查
'Results to be reviewed'
],
'To be tracked': [//待追踪
'To be tracked'
],
'Compliance': [//符合
'Compliance'
],
'Non-Compliance': [//不符合
'Non-Compliance'
]
},
//认证清单-认证任务确认
authenticationProcessState: {
'List to be released': [//清单待发布
'List to be released',
'Certification returned'
],
'List to be checked': [//任务待发起
'List to be checked'
],
'Task to be confirmed': [//任务待确认
'Task to be confirmed'
],
'Accepted of responsible person': [//责任人接受
'Results to be submitted',
'Results to be reviewed',
'Review and pass',
'Review and return'
],
'Refusal of responsible person': [//责任人拒绝
'Refusal of responsible person'
]
},
//认证清单-Pro-homo流程
proHomoProcessState: {
'Task to be confirmed': [//任务待确认
'List to be released',
'Certification returned',
'List to be checked',
'Task to be confirmed',
'Refusal of responsible person'
],
'Results to be submitted': [//结果待提交
'Results to be submitted'
],
'Results to be reviewed': [//结果待审查
'Results to be reviewed'
],
'Review and pass': [//审查通过
'Review and pass'
],
'Review and return': [//审查退回
'Review and return'
]
},
}
},
mounted() {
@@ -144,14 +236,6 @@
},
areaOfResponsibilityClick(item) {
let type = ''
if (this.queryParam.operatorType == 'queryDesignTaskConfirmation' ||
this.queryParam.operatorType == 'queryVerificationTaskConfirmation' ||
this.queryParam.operatorType == 'queryDesignStatistics' ||
this.queryParam.operatorType == 'queryVerifyStatistics') {
type = '102'
} else {
type = '106'
}
let query = {
id: this.projectInfo.id,
projectName: this.projectInfo.projectName,
@@ -161,6 +245,32 @@
type: type,
dutyTerritoryName: item.dutyTerritoryName
}
if (this.queryParam.operatorType == 'queryDesignTaskConfirmation') {
query.processState = this.taskProcessState[this.queryParam.status].join(',')
query.selectModel = 'designFlowStatus'
type = '102'
} else if (this.queryParam.operatorType == 'queryVerificationTaskConfirmation') {
query.processState = this.taskProcessState[this.queryParam.status].join(',')
query.selectModel = 'verifyFlowStatus'
type = '102'
} else if (this.queryParam.operatorType == 'queryDesignStatistics') {
query.processState = this.complianceProcessState[this.queryParam.status].join(',')
query.selectModel = 'designFlowStatus'
type = '102'
} else if (this.queryParam.operatorType == 'queryVerifyStatistics') {
query.processState = this.complianceProcessState[this.queryParam.status].join(',')
query.selectModel = 'verifyFlowStatus'
type = '102'
} else if (this.queryParam.operatorType == 'queryRZTaskToConfirmStatistics') {
query = '106'
item.processState = this.authenticationProcessState[this.queryParam.status].join(',')
} else if (this.queryParam.operatorType == 'queryPrehomoStatistics') {
type = '106'
query.processState = this.proHomoProcessState[this.queryParam.status].join(',')
}else{
type = '106'
}
query.type = type
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: query