fix 80109(处理了抄送人员保存草稿)
This commit is contained in:
@@ -262,6 +262,7 @@ export default {
|
|||||||
dataIndex: 'standardName',
|
dataIndex: 'standardName',
|
||||||
title: this.$t('standardName'),
|
title: this.$t('standardName'),
|
||||||
width: 150,
|
width: 150,
|
||||||
|
align: 'center',
|
||||||
scopedSlots: { customRender: 'detail' }
|
scopedSlots: { customRender: 'detail' }
|
||||||
},
|
},
|
||||||
// 条款号
|
// 条款号
|
||||||
@@ -296,14 +297,6 @@ export default {
|
|||||||
align: 'center',
|
align: 'center',
|
||||||
scopedSlots: { customRender: 'text' }
|
scopedSlots: { customRender: 'text' }
|
||||||
},
|
},
|
||||||
// 责任部门
|
|
||||||
{
|
|
||||||
dataIndex: 'departmentId_dictText',
|
|
||||||
title: this.$t('projectLibrary.vehicleItemLibrary.responsibleDepartment'),
|
|
||||||
width: 120,
|
|
||||||
align: 'center',
|
|
||||||
scopedSlots: { customRender: 'text' }
|
|
||||||
},
|
|
||||||
// 设计工程师
|
// 设计工程师
|
||||||
{
|
{
|
||||||
dataIndex: 'engineerId_dictText',
|
dataIndex: 'engineerId_dictText',
|
||||||
|
|||||||
+18
-3
@@ -244,7 +244,9 @@
|
|||||||
:label="$t('workCenter.projectComplianceEvaluationProcess.ccPerson')">
|
:label="$t('workCenter.projectComplianceEvaluationProcess.ccPerson')">
|
||||||
<user-selection :placeholder="$t('pleaseSelect') + $t('workCenter.projectComplianceEvaluationProcess.ccPerson')"
|
<user-selection :placeholder="$t('pleaseSelect') + $t('workCenter.projectComplianceEvaluationProcess.ccPerson')"
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
v-decorator="['carbonCopyPersonnels', validatorRules.carbonCopyPersonnels]" />
|
:name-str="dispatchInfo.carbonCopyPersonnels_dictText"
|
||||||
|
v-decorator="['carbonCopyPersonnels', validatorRules.carbonCopyPersonnels]"
|
||||||
|
@nameChange="handleCarbonCopyNameChange" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
@@ -894,6 +896,7 @@ export default {
|
|||||||
// 如果是草稿,会从json里取数据
|
// 如果是草稿,会从json里取数据
|
||||||
if (this.$route.query.draftId) {
|
if (this.$route.query.draftId) {
|
||||||
const draftResult = JSON.parse(result.infoJsonStr)
|
const draftResult = JSON.parse(result.infoJsonStr)
|
||||||
|
// 发起节点数据处理
|
||||||
if (this.currentNode === ProjectComplianceEvaluationProcessNode.initiate.value) {
|
if (this.currentNode === ProjectComplianceEvaluationProcessNode.initiate.value) {
|
||||||
// 步骤条回显
|
// 步骤条回显
|
||||||
this.currentStep = draftResult.currentStep
|
this.currentStep = draftResult.currentStep
|
||||||
@@ -902,9 +905,11 @@ export default {
|
|||||||
this.projectId = this.projectDataSource[0].id
|
this.projectId = this.projectDataSource[0].id
|
||||||
// 标准信息
|
// 标准信息
|
||||||
this.standardDataSource = draftResult.standardList
|
this.standardDataSource = draftResult.standardList
|
||||||
// 业务分派信息
|
|
||||||
this.dataSource = draftResult.dispatchList
|
|
||||||
}
|
}
|
||||||
|
// 业务分派信息
|
||||||
|
this.dataSource = draftResult.dispatchList
|
||||||
|
// 抄送人员
|
||||||
|
this.dispatchInfo = Object.assign({}, draftResult.carbonCopyPersonnels)
|
||||||
// 流程审批信息
|
// 流程审批信息
|
||||||
this.approvalInfo = Object.assign({}, draftResult.approvalInfo)
|
this.approvalInfo = Object.assign({}, draftResult.approvalInfo)
|
||||||
} else {
|
} else {
|
||||||
@@ -927,6 +932,10 @@ export default {
|
|||||||
if (this.approvalInfoForm) {
|
if (this.approvalInfoForm) {
|
||||||
this.approvalInfoForm.setFieldsValue(this.approvalInfo)
|
this.approvalInfoForm.setFieldsValue(this.approvalInfo)
|
||||||
}
|
}
|
||||||
|
// 抄送信息回显
|
||||||
|
if (this.dispatchInfoForm) {
|
||||||
|
this.dispatchInfoForm.setFieldsValue(this.dispatchInfo)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}).finally(() => {
|
}).finally(() => {
|
||||||
@@ -1250,6 +1259,7 @@ export default {
|
|||||||
const formData = {}
|
const formData = {}
|
||||||
// 流程信息
|
// 流程信息
|
||||||
const processInfo = Object.assign(this.processInfo, this.processInfoForm.getFieldsValue())
|
const processInfo = Object.assign(this.processInfo, this.processInfoForm.getFieldsValue())
|
||||||
|
// 发起节点数据处理
|
||||||
if (this.currentNode === ProjectComplianceEvaluationProcessNode.initiate.value) {
|
if (this.currentNode === ProjectComplianceEvaluationProcessNode.initiate.value) {
|
||||||
// 记录当前在哪一步
|
// 记录当前在哪一步
|
||||||
formData.currentStep = this.currentStep
|
formData.currentStep = this.currentStep
|
||||||
@@ -1270,6 +1280,8 @@ export default {
|
|||||||
formData.dispatchList = this.dataSource
|
formData.dispatchList = this.dataSource
|
||||||
// 流程审批信息
|
// 流程审批信息
|
||||||
formData.approvalInfo = Object.assign(this.approvalInfo, this.approvalInfoForm.getFieldsValue())
|
formData.approvalInfo = Object.assign(this.approvalInfo, this.approvalInfoForm.getFieldsValue())
|
||||||
|
// 抄送人员
|
||||||
|
formData.carbonCopyPersonnels = Object.assign(this.dispatchInfo, this.dispatchInfoForm.getFieldsValue())
|
||||||
const params = {
|
const params = {
|
||||||
infoJsonStr: JSON.stringify(formData),
|
infoJsonStr: JSON.stringify(formData),
|
||||||
basicProcessInfoDTO: processInfo,
|
basicProcessInfoDTO: processInfo,
|
||||||
@@ -1395,6 +1407,9 @@ export default {
|
|||||||
},
|
},
|
||||||
showContent (text) {
|
showContent (text) {
|
||||||
this.$refs.clauseDetail.open(text)
|
this.$refs.clauseDetail.open(text)
|
||||||
|
},
|
||||||
|
handleCarbonCopyNameChange (name) {
|
||||||
|
this.dispatchInfo.carbonCopyPersonnels_dictText = name
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeRouteLeave (to, form, next) {
|
beforeRouteLeave (to, form, next) {
|
||||||
|
|||||||
Reference in New Issue
Block a user