diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 7ef8546d6..d40476924 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -21,6 +21,7 @@
class="box-input"
mode="multiple"
allowClear
+ @change="ProcessStatusChange"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam.flowStatus">
- {{$t('reset')}}
- {{$t('query')}}
+ {{$t('reset')}}
+ {{$t('query')}}
@@ -130,9 +133,9 @@
-
-
-
+
+
+
{{ $t('CertificationDirectory') }}
@@ -603,7 +606,7 @@
export default {
name: 'index',
- props: ['isDisplayNum','areaOfResponsibility'],
+ props: ['isDisplayNum', 'areaOfResponsibility'],
mixins: [ResizeColumnProvide, ResizeHeader],
components: {
globalAdvancedQuery,
@@ -633,7 +636,7 @@
total: 0,
JTextLoading: false,
visibleoperationFailed: false,
- visibleoperation:'',
+ visibleoperation: '',
CertificationColor: {
'Test passed': 'accordColor',
'Test failed': 'nonConformityColor',
@@ -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) {
@@ -1215,9 +1221,9 @@
if (this.selectedRowKeysList[i].flowStatus == 'List to be released' ||
this.selectedRowKeysList[i].flowStatus == 'Review and pass') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -1284,7 +1290,7 @@
ids: idList.join(','),
projectLibraryId: _this.$route.query.id,
operatorType: 'certificationInventoryStudioReset',
- currRole:_this.roleSwitchingCode
+ currRole: _this.roleSwitchingCode
}).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
@@ -1310,9 +1316,9 @@
}
},
// 关联平台件
- associatedplatformClick(type){
+ associatedplatformClick(type) {
let flag = ''
- if(this.selectedRowKeys && this.selectedRowKeys.length > 0){
+ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.detailedWarningList = []
let dataSource = []
let status = ''
@@ -1331,31 +1337,31 @@
status = '2'
}
}
- if(status == '1'){
- this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
- }else{
+ if (status == '1') {
+ this.$refs.associatedplatRef.transferModel(flag, type, this.selectedRowKeys.join(','))
+ } else {
this.$message.warning(this.$t('unpublishedregulationsselected'))
}
- }else{
+ } else {
flag = '2'
this.$message.warning(this.$t('selectLeastOne'))
}
},
- associatedplatForm(id,flag,type,ids){
- console.log(id,flag,type,ids)
- let query ={
- ids:ids,
- projectLibraryIds:id
+ associatedplatForm(id, flag, type, ids) {
+ console.log(id, flag, type, ids)
+ let query = {
+ ids: ids,
+ projectLibraryIds: id
}
- if(type == '认证'){
+ if (type == '认证') {
postAction('/project/projectCertificationInventoryEO/listPlatform', query).then((res) => {
if (res.success) {
- if(res.result == ''){
+ if (res.result == '') {
this.$refs.associatedplatRef.visible = false
this.$message.success(this.$t('OperationSuccessful'))
this.selectedRowKeys = []
this.getList()
- }else{
+ } else {
this.visibleoperation = res.result
this.visibleoperationFailed = true
}
@@ -1368,16 +1374,16 @@
// this.$refs.associatedplattwoRef.transferModel(id,type,ids)
// }
},
- cancleoperationFailed(){
+ cancleoperationFailed() {
this.visibleoperationFailed = false
this.$refs.associatedplatRef.handleCancel()
this.selectedRowKeys = []
this.getList()
},
- associatedplattwoForm(id,type,ids){
+ associatedplattwoForm(id, type, ids) {
// this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
},
- associatedplatthreeForm(id){
+ associatedplatthreeForm(id) {
console.log(id)
},
//添加
@@ -1425,7 +1431,7 @@
dutyDueDate: 'inventoryVerifyEndTime',
title: this.$t('release')
}
- this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)),this.$t('inventoryVerifyEndTime'))
+ this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)), this.$t('inventoryVerifyEndTime'))
} else {
this.failedMessage(data)
}
@@ -1542,9 +1548,9 @@
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].flowStatus == 'List to be checked') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -1606,9 +1612,9 @@
this.selectedRowKeysList[i].flowStatus == 'Results to be reviewed' ||
this.selectedRowKeysList[i].flowStatus == 'Review and return') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -1629,9 +1635,9 @@
this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
this.selectedRowKeysList[i].flowStatus == 'Review and return') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -1652,9 +1658,9 @@
this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
this.selectedRowKeysList[i].flowStatus == 'Review and return') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -1721,13 +1727,16 @@
let _this = this
if (val.flowStatus == 'List to be released' || val.flowStatus == 'Review and pass') {
console.log(val)
- if(val.projectCertificationInventoryEOS && (val.projectCertificationInventoryEOS.length > 0 || val.projectCertificationInventoryEOS !== null)){
+ if (val.projectCertificationInventoryEOS && (val.projectCertificationInventoryEOS.length > 0 || val.projectCertificationInventoryEOS !== null)) {
this.$message.warning(val.serialNumber + this.$t('platformitemhasbeenassociated'))
- }else{
+ } else {
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()
@@ -1857,9 +1866,9 @@
if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -1873,9 +1882,9 @@
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -1914,9 +1923,9 @@
this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
this.selectedRowKeysList[i].flowStatus == 'Review and return') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
this.toDoIds.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2036,17 +2045,17 @@
this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') {
if (this.selectedRowKeysList[i].deliverableType == '1635545748968783874') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
NAId.push(this.selectedRowKeysList[i].id)
}
} else if (this.selectedRowKeysList[i].dutyPerson && this.selectedRowKeysList[i].deliverableType &&
this.selectedRowKeysList[i].sdt && this.selectedRowKeysList[i].endTime) {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2071,7 +2080,7 @@
title: this.$t('initiateTask'),
NAId: NAId
}
- this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)),this.$t('taskConfirmEndTime'))
+ this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)), this.$t('taskConfirmEndTime'))
// this.submitTask(value, prompt, ids, notConditions, data, NAId)
} else {
this.failedMessage(data)
@@ -2089,9 +2098,9 @@
if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' ||
this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2124,9 +2133,9 @@
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2158,9 +2167,9 @@
if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' &&
this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2205,9 +2214,9 @@
if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
this.selectedRowKeysList[i].flowStatus == 'Review and return') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2237,9 +2246,9 @@
this.selectedRowKeysList[i].flowStatus == 'Review and return') &&
this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2268,16 +2277,16 @@
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].flowStatus == 'Results to be reviewed') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else if (this.selectedRowKeysList[i].flowStatus == 'Review and pass' && value == 'rzgcssc_th') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
isTrue = true
}
@@ -2445,16 +2454,16 @@
if (this.selectedRowKeysList[i].flowStatus == 'Review and pass') {
if (this.roleSwitchingCode == 20 && this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else if (this.roleSwitchingCode == 21) {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
- this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+ this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
- }else{
+ } else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2502,31 +2511,31 @@
this.$message.warning(this.$t('selectLeastOne'))
}
},
- bringInRelevantPersonnelClick(){
+ bringInRelevantPersonnelClick() {
let _this = this
// if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
- this.$confirm({
- content: _this.$t('confirmBringInRelevantPersonnel'),
- onOk() {
- // let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
- postAction('/project/projectCertificationInventoryEO/matchRelevantPeople', {
- // ids: selectedRowKeys.join(','),
- projectLibraryId: _this.$route.query.id
- }).then((res) => {
- if (res.success) {
- _this.$message.success(_this.$t('OperationSuccessful'))
- _this.selectedRowKeys = []
- _this.getList()
- } else {
- _this.$message.warning(_this.$t('operationFailed'))
- }
- })
- }
- })
+ this.$confirm({
+ content: _this.$t('confirmBringInRelevantPersonnel'),
+ onOk() {
+ // let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+ postAction('/project/projectCertificationInventoryEO/matchRelevantPeople', {
+ // ids: selectedRowKeys.join(','),
+ projectLibraryId: _this.$route.query.id
+ }).then((res) => {
+ if (res.success) {
+ _this.$message.success(_this.$t('OperationSuccessful'))
+ _this.selectedRowKeys = []
+ _this.getList()
+ } else {
+ _this.$message.warning(_this.$t('operationFailed'))
+ }
+ })
+ }
+ })
// } else {
// this.$message.warning(this.$t('selectLeastOne'))
// }
- },
+ }
}
}
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 44cdf94e3..4995c32d8 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -58,6 +58,7 @@
style="width: calc(100% - 80px);"
mode="multiple"
optionFilterProp="label"
+ @change="listOptionsChange"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam[selectModel]">
-
{{$t('reset')}}
-
{{$t('query')}}
+
{{$t('reset')}}
+
{{$t('query')}}
@@ -166,11 +169,11 @@
{{ $t('processReset') }}
-
-
-
-
-
+
+
+
+
+