diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index c531d6c0f..22836fdde 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -18,6 +18,7 @@ :showRMenu="jurisdictionCheckForTree" :isHideRNode="jurisdictionCheckForTree" :editable="jurisdictionCheckForTree" + expandFirst showCopyBtn deptSelect autoSelect diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index b5bc7ca67..32977c38e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1528,10 +1528,16 @@ this.zrUserIds = nameList }, checkedRole (data) { - if (this.userType === 'jlUserId') { - this.roleForm.jlUserId = data.id - this.roleForm.jlUserName = data.name - } + if (this.userType === 'jlUserId') { + this.roleForm.jlUserId = data[0].id + this.roleForm.jlUserName = data[0].name + }else if(this.userType === 'zrUserId'){ + this.roleForm.zrUserId=data[0].id; + this.roleForm.zrUserName=data[0].name; + + } + + }, // z责任人会签姓名搜索 filterNode(value, data) { @@ -1834,6 +1840,7 @@ }, getTree () { this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { + this.treeData = res.data }) }, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 8b3878ffb..34d9c9a60 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -234,7 +234,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import { roleTreeData } from "@/api/unqualProcess.js" -import {completeTask, inboundLiaisonDetail, saveinboundTask} from "@/api/process.js" +import {completeTask, inboundLiaisonDetail, saveinboundTask, saveTaskForPub} from "@/api/process.js" export default { name: "wfhxzgStep2", @@ -373,10 +373,10 @@ export default { _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ // roleForm: this.roleForm, - itemsList: this.dataList, + standardInfoList: this.dataList, commentText: this.commentText })) - saveinboundTask(_formData).then(res => { + saveTaskForPub(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result @@ -388,7 +388,7 @@ export default { handleSubmit() { this.isSubmit = true let zqa = new Map(); - for (let lastDataListElement of this.lastDataList) { + for (let lastDataListElement of this.dataList) { let a = zqa.get(lastDataListElement.dutyPeopleInfoId) if( a == null){ a = { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index afdc672db..e8a67fc9b 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -241,7 +241,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {completeTask, inboundLiaisonDetail} from "@/api/process.js"; +import {completeTask, inboundLiaisonDetail, saveTaskForPub} from "@/api/process.js"; export default { name: "wfhxzgStep3", @@ -405,7 +405,41 @@ export default { window.open(routeUrl.href, '_blank') }, // 保存按钮 - handleSave() {}, + handleSave() { + this.isSubmit = true + let zqa = new Map(); + for (let lastDataListElement of this.dataList) { + let a = zqa.get(lastDataListElement.dutyPeopleInfoId) + if( a == null){ + a = { + id: lastDataListElement.dutyPeopleInfoId, + name: lastDataListElement.dutyPeopleInfo, + standardInfoList: [] + } + } + a.standardInfoList.push(lastDataListElement); + zqa.set(a.id, a); + } + let list = []; + for(let item of zqa) { + list.push(item[1]) + } + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + // roleForm: this.roleForm, + dockUserList: list, + commentText: this.commentText + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, // 提交按钮 handleSubmit() { this.isSubmit = true @@ -418,7 +452,7 @@ export default { }) if(flag)return this.$message.warning('请选择负责人填入') let zqa = new Map(); - for (let lastDataListElement of this.lastDataList) { + for (let lastDataListElement of this.dataList) { let a = zqa.get(lastDataListElement.dutyPeopleId) if( a == null){ a = { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index df0c6c866..627b58150 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -230,7 +230,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {uploadFile} from '@/api/unqualProcess.js'; -import {inboundLiaisonDetail, completeTask} from "@/api/process" +import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process" export default { name: "wfhxzgStep4", @@ -306,10 +306,13 @@ export default { }, getFormFieldList (item) { this.$nextTick(() => { - - this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))] + let listJSON = JSON.parse(JSON.stringify(item.responUserInfo.info)) + if (listJSON.length !== undefined) { + this.dataList = listJSON + } else { + this.dataList = [listJSON] + } this.newDataList = [] - console.log(this.dataList) this.dataList.forEach(item => { if (item.fileText.length !== 0) { item.fileText.forEach(item1 => { @@ -402,7 +405,40 @@ export default { window.open(routeUrl.href, '_blank') }, // 保存按钮 - handleSave() {}, + handleSave() { + let zqa = new Map(); + for (let lastDataListElement of this.dataList) { + let a = zqa.get(lastDataListElement.dutyPeopleId) + if( a == null){ + a = { + standardInfoList: [] + } + } + a.standardInfoList.push(lastDataListElement); + zqa.set(a.id, a); + } + let list = [] + for(let item of zqa) { + list.push(item[1].standardInfoList) + } + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + // roleForm: this.roleForm, + responUserInfo: { + info: this.dataList.splice(-1, 1) + }, + commentText: this.commentText + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, // 提交按钮 handleSubmit() { this.isSubmit = true diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 74b4b3417..ad751c081 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -30,6 +30,7 @@ @@ -37,6 +38,7 @@ @@ -232,12 +234,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 7864191ff..725892839 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -30,6 +30,7 @@ @@ -37,6 +38,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 4891306dc..5d7b5b78f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index ecd157571..08c35a775 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 5cb4a140c..775521076 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue index d00f00f00..6bdf02a5e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index 0c2e6b9b9..13c6cd453 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -24,12 +24,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index b536d78b2..95cf42fe0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 8d4cf8c13..c920a368e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 632d439fa..571089bfc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index 1043c1f48..6e2987607 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index 06afbaec8..76691bd6c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index a88631f58..97e7b0ffa 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue index a520ab673..db8ee5016 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue @@ -201,7 +201,7 @@ style="width: 100%;" :model="historySeeForm" > - +
{{historySeeForm.standSerialNumber}}
 @@ -232,7 +232,7 @@
{{historySeeForm.qaEngineer}}
 -
{{historySeeForm.actualCloseTime}}
+
{{historySeeForm.actualCloseTime ? historySeeForm.actualCloseTime.substring(0, 11) : '-'}}
 @@ -566,6 +566,7 @@ export default { this.$nextTick(() => { const arr = [] let questionType = [] + if (this.historySeeForm.quesType){ questionType = this.historySeeForm.quesType.split(',') questionType.map((item) => { this.optionList.map((opr) => { @@ -576,6 +577,7 @@ export default { }) }) this.historySeeForm.quesType = arr.toString() + } }) }, // 分页事件