diff --git a/src/views/documentTool/modules/ImportResult.vue b/src/views/documentTool/modules/ImportResult.vue deleted file mode 100644 index 237ae941..00000000 --- a/src/views/documentTool/modules/ImportResult.vue +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - {{$t('templateDownload')}} - - - - - - {{$t('cancel')}} - {{$t('submit')}} - - - - - - - - - - - - - - - - - diff --git a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue index bfa4c341..38cb3883 100644 --- a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue +++ b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue @@ -90,7 +90,6 @@ v-decorator="['standardTextFileName', validatorRules.standardText]" readonly disabled - :placeholder="$t('pleaseSelect') + $t('workCenter.standardConsultationProcess.standardText')" /> {{ this.$t('workCenter.standardConsultationProcess.selectText') }} @@ -743,7 +742,7 @@ export default { }, columns () { // 设计工程师填写征求意见表头 - if (this.currentNode.indexOf(ConsultationProcess.designEngineerFillIn.value)) { + if (this.currentNode.indexOf(ConsultationProcess.designEngineerFillIn.value) === 0) { return this.designEngineerFillInColumns } // 模块负责人汇总填写意见表头 @@ -843,8 +842,8 @@ export default { * 征求意见列表-新增 */ handleAdd () { - const pdfId = '1723899113057075201' - this.$refs.consultationModal.add(pdfId, '1716698213217865729') + const pdfId = this.basicServiceInfo.standardTextFileId + this.$refs.consultationModal.add(pdfId, this.basicServiceInfo.standardText) }, /** * 表单填写完成,新增数据 @@ -1045,6 +1044,8 @@ export default { * 同意 */ handleAgree () { + this.validatorRules.handleText.rules[0].required = false + this.approvalInfoForm.setFieldsValue({ handleText: '同意' }) const formData = this.dealFormData() if (!formData) { return diff --git a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue index dd2ecb67..bad4f72b 100644 --- a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue +++ b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue @@ -437,6 +437,8 @@ export default { * 同意 */ handleAgree () { + this.validatorRules.handleText.rules[0].required = false + this.approvalInfoForm.setFieldsValue({ handleText: '同意' }) const formData = this.dealFormData() if (!formData) { return @@ -457,6 +459,7 @@ export default { * 驳回 */ handleReject () { + this.validatorRules.handleText.rules[0].required = true const formData = this.dealFormData() if (!formData) { return