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

对接任务确认流程

Browse Source
This commit is contained in:
qq787203167
2022-05-19 20:32:38 +08:00
parent ca8b5f55ee
commit 7c64025f9f
6 changed files with 163 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+6 -5
View File
@@ -7,19 +7,19 @@
</div> </div>
<div class="header-content"> <div class="header-content">
<div class="operator-text" <div class="operator-text"
v-if="$route.query.TaskKey == 'zrrclrw'" v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"
@click="distributionEngineerClick($t('distributionEngineer'),1)"> @click="distributionEngineerClick($t('distributionEngineer'),1)">
<a-icon type="audit"/> <a-icon type="audit"/>
{{ $t('distributionEngineer') }} {{ $t('distributionEngineer') }}
</div> </div>
<div class="operator-text" <div class="operator-text"
v-if="$route.query.TaskKey == 'zrrclrw'" v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"
@click="reminderHandling()"> @click="reminderHandling()">
<a-icon type="sound"/> <a-icon type="sound"/>
{{ $t('reminderHandling') }} {{ $t('reminderHandling') }}
</div> </div>
<div class="operator-text" <div class="operator-text"
v-if="$route.query.TaskKey == 'zrrclrw'" v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"
@click="distributionEngineerClick($t('addFeedback'),2)"> @click="distributionEngineerClick($t('addFeedback'),2)">
<a-icon type="plus-circle"/> <a-icon type="plus-circle"/>
{{ $t('addFeedback') }} {{ $t('addFeedback') }}
@@ -448,12 +448,13 @@
} }
}, },
mounted() { mounted() {
this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay)
this.getList() this.getList()
}, },
computed: { computed: {
columns() { columns() {
let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
if (this.$route.query.TaskKey != 'zrrclrw') { if (this.$route.query.TaskKey != 'zrrclrw' || !this.$route.query.isDisplay) {
for (var i = 0; i < columnResult.length; i++) { for (var i = 0; i < columnResult.length; i++) {
if (columnResult[i].title === this.$t('operation')) { if (columnResult[i].title === this.$t('operation')) {
columnResult.splice(i, 1) columnResult.splice(i, 1)
@@ -467,7 +468,7 @@
methods: { methods: {
pageOnChange(page, pageSize) { pageOnChange(page, pageSize) {
this.pageNo = page this.pageNo = page
this.getList() this.getDetails()
}, },
handleOk() { handleOk() {
this.$refs.ruleForm.validate(valid => { this.$refs.ruleForm.validate(valid => {
jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+16 -12
View File
@@ -10,12 +10,12 @@
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="$route.query.TaskKey == 'zrrclrw'">*</span> <span class="Required" v-if="$route.query.TaskKey == 'zrrclrw' && $route.query.isDisplay">*</span>
<span class="title-text-text" :title="$t('reviewResults')">{{$t('reviewResults')}}</span> <span class="title-text-text" :title="$t('reviewResults')">{{$t('reviewResults')}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="$route.query.TaskKey == 'fqrsh'?'':'reviewResult'"> <a-form-model-item class="itemModel" :prop="!$route.query.isDisplay?'':'reviewResult'">
<a-radio-group style="margin-top: 2px" <a-radio-group style="margin-top: 2px"
:disabled="$route.query.TaskKey == 'fqrsh'?true:false" :disabled="!$route.query.isDisplay?true:false"
class="box-input" class="box-input"
v-model="formInline.reviewResult"> v-model="formInline.reviewResult">
<a-radio value="Compliance"> <a-radio value="Compliance">
@@ -42,7 +42,9 @@
<span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span> <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="approvalOpinion"> <a-form-model-item class="itemModel" prop="approvalOpinion">
<a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')" v-model="formInline.approvalOpinion" <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')"
:disabled="!$route.query.isDisplay?true:false"
v-model="formInline.approvalOpinion"
:rows="4"/> :rows="4"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -67,14 +69,14 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text-fq"> <div class="title-text-fq">
<span class="Required" v-if="this.queryPersonInCharge.status != 'haveDone'">*</span> <span class="Required" v-if="$route.query.isDisplay">*</span>
<span class="title-text-text" <span class="title-text-text"
:title="$t('feedbackFromTheEngineer')">{{$t('feedbackFromTheEngineer')}}</span> :title="$t('feedbackFromTheEngineer')">{{$t('feedbackFromTheEngineer')}}</span>
</div> </div>
<a-form-model-item class="itemModel" <a-form-model-item class="itemModel"
:prop="this.queryPersonInCharge.status == 'haveDone'?'':'engineerFeedbackContent'"> :prop="!$route.query.isDisplay?'':'engineerFeedbackContent'">
<a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackFromTheEngineer')" <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackFromTheEngineer')"
:disabled="this.queryPersonInCharge.status == 'haveDone'?true:false" :disabled="!$route.query.isDisplay?true:false"
v-model="formInline.engineerFeedbackContent" v-model="formInline.engineerFeedbackContent"
:rows="4"/> :rows="4"/>
</a-form-model-item> </a-form-model-item>
@@ -85,11 +87,11 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text-fq"> <div class="title-text-fq">
<span class="Required" v-if="this.queryPersonInCharge.status != 'haveDone'">*</span> <span class="Required" v-if="this.$route.query.isDisplay">*</span>
<span class="title-text-text" <span class="title-text-text"
:title="$t('Deliverables')">{{$t('Deliverables')}}</span> :title="$t('Deliverables')">{{$t('Deliverables')}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="this.queryPersonInCharge.status == 'haveDone'?'':'fileId'"> <a-form-model-item class="itemModel" :prop="!this.$route.query.isDisplay?'':'fileId'">
<a-button type="primary" class="button-text" <a-button type="primary" class="button-text"
@click="clickButtonToUpload('fileId')"> @click="clickButtonToUpload('fileId')">
{{ (formInline.fileId === 'null' || formInline.fileId === '' || {{ (formInline.fileId === 'null' || formInline.fileId === '' ||
@@ -140,7 +142,9 @@
<span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span> <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="approvalOpinion"> <a-form-model-item class="itemModel" prop="approvalOpinion">
<a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')" v-model="formInline.approvalOpinion" <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')"
:disabled="!$route.query.isDisplay?true:false"
v-model="formInline.approvalOpinion"
:rows="4"/> :rows="4"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -148,7 +152,7 @@
</a-row> </a-row>
</a-form-model> </a-form-model>
<uploadFile ref="uploadFile" <uploadFile ref="uploadFile"
:disabled="this.queryPersonInCharge.status == 'haveDone'?true:false" :disabled="!$route.query.isDisplay?true:false"
@uploadSuccess="uploadSuccess"/> @uploadSuccess="uploadSuccess"/>
</div> </div>
</template> </template>
@@ -205,6 +209,7 @@
} }
}, },
mounted() { mounted() {
this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay)
if (this.queryBy) { if (this.queryBy) {
this.formInline.reviewResult = this.queryBy.reviewResult || undefined this.formInline.reviewResult = this.queryBy.reviewResult || undefined
this.formInline.approvalOpinion = '' this.formInline.approvalOpinion = ''
@@ -214,7 +219,6 @@
this.formInline.deliveryRequirements = this.queryPersonInCharge.deliveryRequirements this.formInline.deliveryRequirements = this.queryPersonInCharge.deliveryRequirements
this.formInline.engineerFeedbackContent = this.queryPersonInCharge.engineerFeedbackContent this.formInline.engineerFeedbackContent = this.queryPersonInCharge.engineerFeedbackContent
this.formInline.fileId = this.queryPersonInCharge.fileId this.formInline.fileId = this.queryPersonInCharge.fileId
console.log(this.formInline)
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
} }
}, },
jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+8 -7
View File
@@ -147,19 +147,19 @@
}, },
computed: { computed: {
isSendBack() { isSendBack() {
if (this.$route.query.TaskKey == 'fqrsh') { if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) {
return true return true
} }
return false return false
}, },
isTerminationProcess() { isTerminationProcess() {
if (this.$route.query.TaskKey == 'fqrsh') { if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) {
return true return true
} }
return false return false
}, },
isAdopt() { isAdopt() {
if (this.$route.query.TaskKey == 'fqrsh') { if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) {
if (this.queryBy.reviewResult == 'Compliance' || this.queryBy.reviewResult == 'NA') { if (this.queryBy.reviewResult == 'Compliance' || this.queryBy.reviewResult == 'NA') {
return true return true
} }
@@ -167,9 +167,9 @@
return false return false
}, },
isSubmit() { isSubmit() {
if (this.$route.query.TaskKey == 'zrrclrw') { if (this.$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay) {
return true return true
} else if (this.$route.query.TaskKey == 'dreDispose') { } else if (this.$route.query.TaskKey == 'dreDispose' && this.$route.query.isDisplay) {
if (!this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') { if (!this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') {
return true return true
} }
@@ -177,7 +177,7 @@
return false return false
}, },
isResubmit() { isResubmit() {
if (this.$route.query.TaskKey == 'dreDispose') { if (this.$route.query.TaskKey == 'dreDispose' && this.$route.query.isDisplay) {
if (this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') { if (this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') {
return true return true
} }
@@ -187,6 +187,7 @@
}, },
mounted() { mounted() {
let _this = this let _this = this
this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay)
let query = { let query = {
actiProcInstId: this.$route.query.actiProcInstId, actiProcInstId: this.$route.query.actiProcInstId,
createBy: this.userInfo().username createBy: this.userInfo().username
@@ -272,7 +273,7 @@
projectTaskInventoryId: this.$route.query.projectTaskInventoryId, projectTaskInventoryId: this.$route.query.projectTaskInventoryId,
deliveryRequirements: val.deliveryRequirements deliveryRequirements: val.deliveryRequirements
} }
postAction(this.url.dreSubmit, query).then((res) => { putAction(this.url.dreSubmit, query).then((res) => {
}) })
}, },
jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue
+126 -126
View File
@@ -1,6 +1,6 @@
<template> <template>
<div class="doc-detail"> <div class="doc-detail">
<!-- 认证参数收集——清单信息--> <!-- 认证参数收集——清单信息-->
<div class="Virtual-detail-header" style="position: fixed;top: 0"> <div class="Virtual-detail-header" style="position: fixed;top: 0">
<div class="Virtual-detail-title"> <div class="Virtual-detail-title">
<span style="line-height: 74px;display: inline-block;float: left"> <span style="line-height: 74px;display: inline-block;float: left">
@@ -65,144 +65,144 @@
</template> </template>
<script> <script>
import TaskList from '@/views/projectManagement/components/TaskList' import TaskList from '@/views/projectManagement/components/TaskList'
import listOfRegulations from '@/views/projectManagement/components/listOfRegulations' import listOfRegulations from '@/views/projectManagement/components/listOfRegulations'
import ProjectDetailsName from '@/views/projectManagement/components/ProjectDetails' import ProjectDetailsName from '@/views/projectManagement/components/ProjectDetails'
import ParameterItemCollectionList from '../../components/ParameterItemCollectionList' import ParameterItemCollectionList from '../../components/ParameterItemCollectionList'
import nonConformance from '@/views/projectManagement/components/nonConformance' import nonConformance from '@/views/projectManagement/components/nonConformance'
import updateLog from '@/components/UpdateLog/index' import updateLog from '@/components/UpdateLog/index'
import historicalVersionList from '@/views/projectManagement/components/historicalVersionList' import historicalVersionList from '@/views/projectManagement/components/historicalVersionList'
import commentList from '@/views/projectManagement/components/commentList' import commentList from '@/views/projectManagement/components/commentList'
export default { export default {
name: 'ProjectDetails', name: 'ProjectDetails',
components: { components: {
TaskList, TaskList,
listOfRegulations, listOfRegulations,
ProjectDetailsName, ProjectDetailsName,
ParameterItemCollectionList, ParameterItemCollectionList,
nonConformance, nonConformance,
updateLog, updateLog,
historicalVersionList, historicalVersionList,
commentList commentList
}, },
data() { data() {
return { return {
title: this.$t('projectDetails'), title: this.$t('projectDetails'),
textTitle: '认证参数收集', textTitle: '认证参数收集',
url: { url: {
logList: '', logList: '/project/projectLawsInventoryLogEO/page',
historicalVersionUrl: '' historicalVersionUrl: ''
},
paramsManifest: {}
}
},
mounted() {
this.textColor()
// 清单信息
this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
},
methods: {
textColor() {
let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
if (textColor && textColor.length > 0) {
textColor[0].classList.remove('Virtual-detail-left-text-color')
}
let text = document.getElementsByClassName('Virtual-detail-left-text')
if (text && text.length > 0) {
text[4].classList.add('Virtual-detail-left-text-color')
}
}, },
paramsManifest: {}, textClick(num, name) {
} this.textTitle = name
}, let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
mounted() { if (textColor && textColor.length > 0) {
this.textColor() textColor[0].classList.remove('Virtual-detail-left-text-color')
// 清单信息 }
this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest')) let text = document.getElementsByClassName('Virtual-detail-left-text')
}, text[num].classList.add('Virtual-detail-left-text-color')
methods: { },
textColor() { UpdateLogClick() {
let textColor = document.getElementsByClassName('Virtual-detail-left-text-color') this.$refs.updateLogRef.getList({ projectLibraryId: this.$route.query.id })
if (textColor && textColor.length > 0) { },
textColor[0].classList.remove('Virtual-detail-left-text-color') historicalVersionClick() {
this.$refs.historicalVersionListRef.getList()
},
commentClick() {
this.$refs.commentListRef.getData()
} }
let text = document.getElementsByClassName('Virtual-detail-left-text')
if (text && text.length > 0) {
text[4].classList.add('Virtual-detail-left-text-color')
}
},
textClick(num, name) {
this.textTitle = name
let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
if (textColor && textColor.length > 0) {
textColor[0].classList.remove('Virtual-detail-left-text-color')
}
let text = document.getElementsByClassName('Virtual-detail-left-text')
text[num].classList.add('Virtual-detail-left-text-color')
},
UpdateLogClick() {
this.$refs.updateLogRef.getList()
},
historicalVersionClick() {
this.$refs.historicalVersionListRef.getList()
},
commentClick() {
this.$refs.commentListRef.getData()
} }
} }
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
.doc-detail { .doc-detail {
background: #fff;
height: 100%;
.Virtual-detail-header {
width: 100%;
height: 68px;
line-height: 68px;
padding: 0 32px 0 32px;
box-sizing: border-box;
display: flex;
justify-content: space-between;
border-bottom: 2px #eff1f3 solid;
background: #fff; background: #fff;
.Virtual-detail-title {
display: inline-block;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
font-size: 20px;
font-weight: 400;
color: #040B29;
line-height: 68px;
}
.doc-detail-right {
width: 800px;
line-height: 68px;
display: flex;
}
}
.Virtual-detail-left {
width: 240px;
padding: 16px 24px;
box-sizing: border-box;
font-size: 16px;
line-height: 3;
float: left;
.Virtual-detail-left-text {
padding: 2px 12px;
cursor: pointer;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.Virtual-detail-right {
border-left: 2px #eff1f3 solid;
width: calc(100% - 240px);
height: 100%; height: 100%;
float: left;
overflow: auto; .Virtual-detail-header {
width: 100%;
height: 68px;
line-height: 68px;
padding: 0 32px 0 32px;
box-sizing: border-box;
display: flex;
justify-content: space-between;
border-bottom: 2px #eff1f3 solid;
background: #fff;
.Virtual-detail-title {
display: inline-block;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
font-size: 20px;
font-weight: 400;
color: #040B29;
line-height: 68px;
}
.doc-detail-right {
width: 800px;
line-height: 68px;
display: flex;
}
}
.Virtual-detail-left {
width: 240px;
padding: 16px 24px;
box-sizing: border-box;
font-size: 16px;
line-height: 3;
float: left;
.Virtual-detail-left-text {
padding: 2px 12px;
cursor: pointer;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.Virtual-detail-right {
border-left: 2px #eff1f3 solid;
width: calc(100% - 240px);
height: 100%;
float: left;
overflow: auto;
}
} }
}
.Virtual-detail-left-text-color { .Virtual-detail-left-text-color {
background: #eff1f3; background: #eff1f3;
border-radius: 4px; border-radius: 4px;
} }
.Virtual-detail-text-right { .Virtual-detail-text-right {
} }
</style> </style>
jero-web/src/views/projectManagement/ProjectDetails/index.vue
+2 -2
View File
@@ -90,7 +90,7 @@
title: this.$t('projectDetails'), title: this.$t('projectDetails'),
textTitle: '项目详情', textTitle: '项目详情',
url: { url: {
logList: '', logList: '/project/projectLawsInventoryLogEO/page',
historicalVersionUrl: '' historicalVersionUrl: ''
} }
} }
@@ -119,7 +119,7 @@
text[num].classList.add('Virtual-detail-left-text-color') text[num].classList.add('Virtual-detail-left-text-color')
}, },
UpdateLogClick() { UpdateLogClick() {
this.$refs.updateLogRef.getList() this.$refs.updateLogRef.getList({projectLibraryId: this.$route.query.id})
}, },
historicalVersionClick() { historicalVersionClick() {
this.$refs.historicalVersionListRef.getList() this.$refs.historicalVersionListRef.getList()
jero-web/src/views/projectManagement/components/TaskList.vue
+5
View File
@@ -273,6 +273,8 @@
}, },
verifyTaskClick(val, num, isTrue) { verifyTaskClick(val, num, isTrue) {
let query = {} let query = {}
console.log(typeof isTrue)
return
switch (num) { switch (num) {
case 1: case 1:
query = { query = {
@@ -284,6 +286,7 @@
studioEngineer: this.$route.query.studioEngineer, studioEngineer: this.$route.query.studioEngineer,
serialNumber: val.serialNumber, serialNumber: val.serialNumber,
TaskKey: val.designTaskDefinitionKey, TaskKey: val.designTaskDefinitionKey,
isDisplay: isTrue,
flowType: 2, flowType: 2,
Sponsor: 'designInitiatorName', Sponsor: 'designInitiatorName',
personLiable: 'designDutyName', personLiable: 'designDutyName',
@@ -306,6 +309,7 @@
serialNumber: val.serialNumber, serialNumber: val.serialNumber,
TaskKey: val.prehomoTaskDefinitionKey, TaskKey: val.prehomoTaskDefinitionKey,
flowType: 3, flowType: 3,
isDisplay: isTrue,
id: this.$route.query.id, id: this.$route.query.id,
Sponsor: 'prehomoInitiatorName', Sponsor: 'prehomoInitiatorName',
personLiable: 'prehomoDutyName', personLiable: 'prehomoDutyName',
@@ -329,6 +333,7 @@
projectTaskInventoryId: val.projectLawsInventoryId, projectTaskInventoryId: val.projectLawsInventoryId,
TaskKey: val.verifyTaskDefinitionKey, TaskKey: val.verifyTaskDefinitionKey,
flowType: 4, flowType: 4,
isDisplay: isTrue,
Sponsor: 'verifyInitiatorName', Sponsor: 'verifyInitiatorName',
personLiable: 'verifyDutyName', personLiable: 'verifyDutyName',
typeOfDeliverables: 'verifyDeliverableType_dictText', typeOfDeliverables: 'verifyDeliverableType_dictText',