diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue index 3a9c0b7a6..2b63cb138 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue @@ -22,37 +22,42 @@ placeholder="请输入章节编号" clearable> - - + - - + - - + - - + + + + -
-
+
{{ item.name }} @@ -67,7 +72,7 @@
点击上传 @@ -75,16 +80,16 @@ - + - - @@ -128,7 +133,7 @@ trigger: "blur" } ], - chapterEntry: [ + chapterEntries: [ { type: "string", max: 200, @@ -136,7 +141,7 @@ trigger: "blur" } ], - beforeRevision: [ + updateBefore: [ { type: "string", max: 200, @@ -144,7 +149,7 @@ trigger: "blur" } ], - afterRevision: [ + updateAfter: [ { type: "string", max: 200, @@ -152,7 +157,7 @@ trigger: "blur" } ], - revisionModification: [ + updateReason: [ { type: "string", max: 200, @@ -160,7 +165,7 @@ trigger: "blur" } ], - handlingSuggestion: [ + handlingOpinions: [ { type: "string", max: 200, @@ -168,7 +173,15 @@ trigger: "blur" } ], - reason: [ + handlingCause: [ + { + type: "string", + max: 200, + message: "处理原因不能超过100个字符", + trigger: "blur" + } + ], + cause: [ { type: "string", max: 200, @@ -240,9 +253,11 @@ saveOrUpdateStands() { this.$refs['sarStandardsInfoForm'].validate((valid) => { if (valid) { - if (!this.sarStandardsInfoEO.chapterNumber && !this.sarStandardsInfoEO.chapterEntry - && !this.sarStandardsInfoEO.beforeRevision && !this.sarStandardsInfoEO.afterRevision - && !this.sarStandardsInfoEO.revisionModification && !this.sarStandardsInfoEO.templateFileId) { + if (!this.sarStandardsInfoEO.chapterNumber && !this.sarStandardsInfoEO.chapterEntries + && !this.sarStandardsInfoEO.updateBefore && !this.sarStandardsInfoEO.updateAfter + && !this.sarStandardsInfoEO.updateReason && !this.sarStandardsInfoEO.annexFileId + && !this.sarStandardsInfoEO.cause && !this.sarStandardsInfoEO.handlingOpinions + && !this.sarStandardsInfoEO.handlingCause) { this.$message.warning('请至少填写一条数据，不能都为空') return } diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue index 273698c56..0f3564408 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue @@ -314,6 +314,9 @@ prcCreateUser: row.prcCreateUser, prcCreateUserName: row.prcCreateUserName, + + csrUserIds:row.csrUserIds, + csrUserNames:row.csrUserNames } this.roleForm = {...this.roleForm} }, diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue index 3b18cffcb..2cafc7345 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue @@ -70,35 +70,42 @@ > + + @@ -126,14 +133,14 @@ @@ -246,6 +253,9 @@ mounted() { }, methods: { + getData() { + + }, generateSummary() { }, @@ -334,6 +344,16 @@ this.$message.warning('没有可查看的文件') } }, + submit(callback) { + if (this.histortData && this.histortData.length > 0) { + callback && callback(this.histortData) + } else { + this.$message.warning('请至少添加一条数据') + } + }, + save(callback) { + callback && callback(this.histortData,this.deleteList.join(',')) + }, }, } diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue index 8e5e3bec4..009d82c28 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue @@ -272,7 +272,7 @@ import solicitationList from "./components/solicitationList";//征求意见列表 import policySolicitingOpinions from "./components/policySolicitingOpinions"; import processFile from "../../components/processFile"; - import {queryTaskFirst, saveTaskFirst, taskDel, changeAssigneeNew, inboundLiaisonDetail} from "api/process"; + import {queryTaskFirst, saveTaskFirst, taskDel, changeAssigneeNew, inboundLiaisonDetail,saveTaskForPub} from "api/process"; import axios from "axios"; export default { @@ -499,8 +499,25 @@ this.openButtonLoading() if (!this.taskKey || this.taskKey == 'PolicySolicitOpinionProcessKey1') { this.draftSaving() - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey6') { - + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey8') { + let _formData = new FormData(); + this.$refs.solicitationListRef.save((row,ids)=>{ + _formData.append("taskIds", this.$route.query.taskIds); + _formData.append("json", JSON.stringify({ + form: this.dataForm, + commentText: this.commentText, + policySolicitOpinionEOList: row, + deleteIds: ids, + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.isSubmit = false; + this.$message.success("保存成功"); + }).catch(e => { + this.saveLoading = false; + this.isSubmit = false; + }); + }) } }, //草稿保存 @@ -539,7 +556,7 @@ } else if (this.taskKey == 'PolicySolicitOpinionProcessKey2' || this.taskKey == 'PolicySolicitOpinionProcessKey4' || this.taskKey == 'PolicySolicitOpinionProcessKey5' || - this.taskKey == 'PolicySolicitOpinionProcessKey6') { //审核、审定、批准、责任人分配任务 + this.taskKey == 'PolicySolicitOpinionProcessKey7') { //审核、审定、批准、责任人分配任务 const json = Object.assign(this.dataForm); json.commentText = this.commentText json.approvalFlag = 0 @@ -561,6 +578,21 @@ this.openButtonLoading() this.completeTask(this.$route.query.taskIds, query) }) + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey8') {//责任人任务处理 + this.closeButtonLoading() + this.$refs.solicitationListRef.submit((row, ids) => { + const json = Object.assign(this.dataForm); + json.commentText = this.commentText + json.approvalFlag = 0 + let query = { + form: json, + policySolicitOpinionEOList: row, + deleteIds: ids, + commentText: this.commentText + } + this.openButtonLoading() + this.completeTask(this.$route.query.taskIds, query) + }) } } else { return this.$message.warning('请完善基础信息')