diff --git a/src/common/onlineEdit/index.js b/src/common/onlineEdit/index.js index 7b1eff3d1..b8866bd2c 100644 --- a/src/common/onlineEdit/index.js +++ b/src/common/onlineEdit/index.js @@ -20,7 +20,7 @@ export default (id,nodeName,userId,userName) => { editFileInfo.pId = editFileInfo.pid } const nowTime = new Date().getTime() - window.open(onlyOfficeUrl+'/editor?pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName) + window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName) } }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue index 406c19d4b..b36091c4b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue @@ -424,27 +424,38 @@ export default { }, //提交 handleSubmit(){ + let comFlag = false this.dataList.map(item => { delete item.termsConditions }) - this.listForm.commentText = this.commentText - this.listForm.dataList = this.dataList - const json = JSON.stringify(this.listForm); - this.isSubmit = true - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.taskIds, - userId: this.userId, - json: json, - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') + this.dataList.forEach(item => { + if(item.implementer){ + comFlag = true + return } - this.isSubmit = false - }, e => { - }); + }) + if(!comFlag){ + this.$message.warning('请选择落实人') + }else{ + this.listForm.commentText = this.commentText + this.listForm.dataList = this.dataList + const json = JSON.stringify(this.listForm); + this.isSubmit = true + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId: this.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); + } }, //确认转办 checkedRole (data) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue index 540042375..127b8576a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue @@ -192,14 +192,8 @@ - - - - - - + + + @@ -297,6 +294,67 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -452,10 +510,10 @@ export default { ProcessTitle, }, props: { - form: { + formSub: { type: Object, required: true - }, + }, FBGBUSSFileList: { type: Array, required: true @@ -488,6 +546,10 @@ export default { type: Boolean, default: false }, + opinionsShow2: { + type: Boolean, + default: false + }, opinionsShow: { type: Boolean, default: false @@ -513,6 +575,12 @@ export default { {value: '2',label: '部分采纳'}, {value: '3',label: '不采纳'}, ], + opinionsReviewResultsOptions:[ + {value: '1',label: '修订'}, + {value: '2',label: '废止'}, + {value: '3',label: '继续有效'}, + ], + form:{}, countryOptions:[],//国家地区 standSortOptions: [], // 标准类别 standNatureOptions: [], // 标准性质 @@ -551,6 +619,16 @@ export default { ...mapGetters(['userInfo']) }, methods: { + verifySort(){ + if(this.form.reviewResults && this.form.reviewResults === '1'){ + return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1); + }else { + return "" + } + }, + choiceZRRList (type, title, id) { + this.$emit('formChoiceZRRListCancel',type,title,id) + }, filterOp(data){ if(!data){ return "" @@ -607,8 +685,7 @@ export default { }, }, mounted () { - console.log(this.form.infoList) - console.log(this.form) + this.form = this.formSub this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { @@ -642,7 +719,17 @@ export default { }) this.busVsFunc() this.modelFunc() - } + }, + watch: { + form: { + handler: function (val) { + if(val){ + this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList); + } + }, + deep: true //对象的深度验证 + }, +} } diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue index 9aa911de4..f06686b77 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue @@ -133,6 +133,7 @@ > { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index 6f3e00e23..cf06b6b50 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -19,14 +19,19 @@ >
+ :opinionsShow2 = "false" + :verifySarStandard = "verifySarStandard" + @formCancel="formCancel" + @formChoiceZRRListCancel = "formChoiceZRRListCancel" + >
@@ -113,9 +118,13 @@
@@ -133,6 +142,12 @@ @checkedRole="checkedRole" :nodeList="nodeList2" > +
@@ -140,7 +155,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process"; +import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst,taskDel,queryTaskFirst } from "api/process"; import formList from './common/formList.vue' export default { @@ -153,7 +168,10 @@ export default { }, data() { return { + bpnId: '', + formKey:1, active: '1', + modalShowRoleFlag:false, disabledState:true, verifySarStandard:true, FBGBUSSFileList: [], @@ -203,10 +221,65 @@ export default { } }, mounted() { + this.bpnId = this.$route.query.bpnId + if (this.bpnId !== undefined) { + this.getDataS() + } this.processTable() this.getData() }, methods:{ + checkedRole2 (data) { + let idList = '' + let nameList = '' + data.forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + if(this.userType === 'QCRBUSS'){ + this.qbfsForm.QCRBUSSID=idList; + this.qbfsForm.QCRBUSS=nameList; + this.formKey++ + } + if(data !== undefined && data && data.length > 0){ + const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") + const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + this.qbfsForm.QCDWID = institutionIdList + this.qbfsForm.QCDW = institutionNameList + } + + this.modalShowRoleFlag = false + }, + unique(newArr) { + const res = new Map(); + return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1)); + }, + choiceZRRList (type, title, id) { + this.nodeList2 = [] + if(type === 'QCRBUSS'){ + if ( this.qbfsForm.QCRBUSSID != undefined && this.qbfsForm.QCRBUSSID.length > 0) { + this.nodeList2 = this.qbfsForm.QCRBUSSID.split(',') + } + } + this.userType = type + this.drawerTitle = title + this.modalShowRoleFlag = true + }, + formChoiceZRRListCancel(type, title, id){ + this.choiceZRRList(type, title, id) + }, + formCancel (form, list1,list2,list3,list4,list5) { + this.qbfsForm = form + this.FBGBUSSFileList = list1 + this.LSBBBUSSFileList = list2 + this.BZSMBUSSFileList = list3 + this.QTWJBUSSFileList = list4 + this.GLWJBUSSFileList = list5 + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -243,6 +316,27 @@ export default { }) }) }, + getDataS(){ + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes) + this.qbfsForm = mes.qbfsForm + this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId + this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName + this.qbfsForm['id'] = bringData.id + this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName); + this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName); + this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName); + this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName); + this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName); + this.standardDrawer = false + this.verifySarStandard = true + this.commentText = mes.commentText + this.formKey++ + this.$forceUpdate() + }); + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -264,7 +358,12 @@ export default { let standObj = await this.getStandInfoUpdateById(item.standId) this.$nextTick(() => { const bringData = standObj.data - const json = Object.assign(bringData, bringData.attrInfoMap,item); + const obj = { + reviewResultsContent:"", + draftTime:"", + releaseTime:"", + } + const json = Object.assign(bringData, bringData.attrInfoMap,item,obj); this.qbfsForm = JSON.parse(JSON.stringify(json)) this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName @@ -276,12 +375,33 @@ export default { this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName); this.standardDrawer = false this.verifySarStandard = true + this.formKey++ this.$forceUpdate() }) }, handleTabs(name) { this.active = name; }, + //流程保存 + handleSave(){ + this.saveLoading = true + let _formData = new FormData() + _formData.append('id', this.bpnId || '') + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', 'buss3') + _formData.append('json', JSON.stringify({ + qbfsForm: this.qbfsForm, + commentText: this.commentText + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, //流程提交 handleSubmit(){ this.$refs['qbfsForm'].validate((valid) => { @@ -299,6 +419,13 @@ export default { if (res.success) { this.$message.success(res.message) this.$router.push('/processCenter') + if (this.bpnId !== undefined && this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + }) + } } this.isSubmit = false }, e => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 9fe9c268a..217bdb1e8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1380,6 +1380,10 @@ this.form.QCDW = institutionNameList } }, + unique(newArr) { + const res = new Map(); + return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1)); + }, checkedRole (data) { if (this.type === 0) { this.roleForm.deptUserId = data[0].id diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index d5d21c68e..6931e578f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1472,6 +1472,10 @@ this.form.QCDW = institutionNameList } }, + unique(newArr) { + const res = new Map(); + return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1)); + }, checkedRole (data) { if (this.type === 0) { this.roleForm.deptUserId = data[0].id diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 258e725dd..14c79c17f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1381,6 +1381,10 @@ this.form.QCDW = institutionNameList } }, + unique(newArr) { + const res = new Map(); + return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1)); + }, checkedRole (data) { if (this.type === 0) { this.roleForm.deptUserId = data[0].id diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index dc92c7d41..20eadf631 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1472,6 +1472,10 @@ this.form.QCDW = institutionNameList } }, + unique(newArr) { + const res = new Map(); + return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1)); + }, checkedRole (data) { if (this.type === 0) { this.roleForm.deptUserId = data[0].id diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 686758f8f..9b7ccb127 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -1349,6 +1349,10 @@ this.modalShowRoleFlag = false }, + unique(newArr) { + const res = new Map(); + return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1)); + }, checkedRole (data) { if (this.type === 0) { this.roleForm.deptUserId = data[0].id diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index b83fd0990..c4c5eba51 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -1692,6 +1692,10 @@ this.modalShowRoleFlag = false }, + unique(newArr) { + const res = new Map(); + return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1)); + }, checkedRole (data) { if (this.type === 0) { this.roleForm.deptUserId = data[0].id diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index dd12635bb..6981af921 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -1349,6 +1349,10 @@ this.modalShowRoleFlag = false }, + unique(newArr) { + const res = new Map(); + return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1)); + }, checkedRole (data) { if (this.type === 0) { this.roleForm.deptUserId = data[0].id diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 09b1ced95..53ff41365 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -1692,6 +1692,10 @@ this.modalShowRoleFlag = false }, + unique(newArr) { + const res = new Map(); + return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1)); + }, checkedRole (data) { if (this.type === 0) { this.roleForm.deptUserId = data[0].id diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 4770f5fb6..47d288c5e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -564,7 +564,9 @@ export default { this.qcdwOptions = res.data.QCDW // 起草单位 }) if(this.$route.query.bpnId === undefined && this.$route.query.taskIds === undefined){ - this.$http.get('/lawss/activiti/saveEditFile', '',{ + this.$http.get('/lawss/activiti/saveEditFile', { + model: 'model_lx' + },{ _this: this }, res => { console.log(res)