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 18:42:10 +08:00
parent cb7174189b
commit ca8b5f55ee
3 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+29 -8
View File
@@ -52,6 +52,7 @@
<a-col :span="24">
<div class="box-title-text">
<div class="title-text-fq">
<span class="Required" style="margin-right: 13px"></span>
<span class="title-text-text" :title="$t('projectDeliveryDescription')">{{$t('projectDeliveryDescription')}}</span>
</div>
<a-form-model-item class="itemModel">
@@ -66,11 +67,14 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text-fq">
<span class="Required" v-if="this.queryPersonInCharge.status != 'haveDone'">*</span>
<span class="title-text-text"
:title="$t('feedbackFromTheEngineer')">{{$t('feedbackFromTheEngineer')}}</span>
</div>
<a-form-model-item class="itemModel" prop="engineerFeedbackContent">
<a-form-model-item class="itemModel"
:prop="this.queryPersonInCharge.status == 'haveDone'?'':'engineerFeedbackContent'">
<a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackFromTheEngineer')"
:disabled="this.queryPersonInCharge.status == 'haveDone'?true:false"
v-model="formInline.engineerFeedbackContent"
:rows="4"/>
</a-form-model-item>
@@ -81,10 +85,11 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text-fq">
<span class="title-text-text"
:title="$t('Deliverables')">{{$t('Deliverables')}}</span>
<span class="Required" v-if="this.queryPersonInCharge.status != 'haveDone'">*</span>
<span class="title-text-text"
:title="$t('Deliverables')">{{$t('Deliverables')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel" :prop="this.queryPersonInCharge.status == 'haveDone'?'':'fileId'">
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('fileId')">
{{ (formInline.fileId === 'null' || formInline.fileId === '' ||
@@ -142,7 +147,9 @@
</a-col>
</a-row>
</a-form-model>
<uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
<uploadFile ref="uploadFile"
:disabled="this.queryPersonInCharge.status == 'haveDone'?true:false"
@uploadSuccess="uploadSuccess"/>
</div>
</template>
@@ -155,7 +162,7 @@
components: {
uploadFile
},
props: ['queryBy','queryPersonInCharge'],
props: ['queryBy', 'queryPersonInCharge'],
data() {
return {
formInline: {},
@@ -176,11 +183,23 @@
}
],
engineerFeedbackContent: [
{
required: true,
message: this.$t('feedbackFromTheEngineer') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{
max: 300,
message: this.$t('feedbackFromTheEngineer') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
],
fileId: [
{
required: true,
message: this.$t('Deliverables') + this.$t('cannotEmpty'),
trigger: 'change'
}
]
}
}
@@ -191,10 +210,12 @@
this.formInline.approvalOpinion = ''
this.formInline = { ...this.formInline }
}
if (this.queryPersonInCharge){
if (this.queryPersonInCharge) {
this.formInline.deliveryRequirements = this.queryPersonInCharge.deliveryRequirements
this.formInline.engineerFeedbackContent = this.queryPersonInCharge.engineerFeedbackContent
this.formInline.fileId = this.queryPersonInCharge.fileId
console.log(this.formInline)
this.formInline = { ...this.formInline }
}
},
methods: {
@@ -278,7 +299,7 @@
}
.title-text-fq {
width: 124px;
width: 130px;
text-align: left;
display: inline-block;
font-weight: 500;
jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+11 -2
View File
@@ -22,11 +22,13 @@
v-if="isDisplay"
/>
<reviewedByThePersonInCharge
v-if="isDisplay"
ref="reviewedByThePersonInChargeRef"
:queryBy="queryBy"
:queryPersonInCharge="queryPersonInCharge"
/>
<footerProcess
v-if="isDisplay"
:is-termination-process="isTerminationProcess"
:is-adopt="isAdopt"
:isSendBack="isSendBack"
@@ -168,11 +170,18 @@
if (this.$route.query.TaskKey == 'zrrclrw') {
return true
} else if (this.$route.query.TaskKey == 'dreDispose') {
return true
if (!this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') {
return true
}
}
return false
},
isResubmit() {
if (this.$route.query.TaskKey == 'dreDispose') {
if (this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') {
return true
}
}
return false
}
},
@@ -185,7 +194,7 @@
this.loading = true
getAction(this.url.list, query).then((res) => {
if (res.success) {
this.queryPersonInCharge = res.result[0] || {}
this.queryPersonInCharge = res.result[1] || {}
if (this.$route.query.taskIds) {
this.isDisplay = false
this.queryTaskDetailByTask(function() {
jero-web/src/views/projectManagement/components/TaskList.vue
+3 -3
View File
@@ -283,7 +283,7 @@
id: this.$route.query.id,
studioEngineer: this.$route.query.studioEngineer,
serialNumber: val.serialNumber,
TaskKey: isTrue ? val.designTaskDefinitionKey : 'hhhhh',
TaskKey: val.designTaskDefinitionKey,
flowType: 2,
Sponsor: 'designInitiatorName',
personLiable: 'designDutyName',
@@ -304,7 +304,7 @@
studioEngineer: this.$route.query.studioEngineer,
projectLibraryId: this.$route.query.id,
serialNumber: val.serialNumber,
TaskKey: isTrue ? val.prehomoTaskDefinitionKey : 'hhhh',
TaskKey: val.prehomoTaskDefinitionKey,
flowType: 3,
id: this.$route.query.id,
Sponsor: 'prehomoInitiatorName',
@@ -327,7 +327,7 @@
studioEngineer: this.$route.query.studioEngineer,
serialNumber: val.serialNumber,
projectTaskInventoryId: val.projectLawsInventoryId,
TaskKey: isTrue ? val.verifyTaskDefinitionKey : 'hhhhh',
TaskKey: val.verifyTaskDefinitionKey,
flowType: 4,
Sponsor: 'verifyInitiatorName',
personLiable: 'verifyDutyName',