diff --git a/src/App.vue b/src/App.vue index 5ddb7f29c..77b537dbb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -69,34 +69,6 @@
-
diff --git a/src/common/axios/index.js b/src/common/axios/index.js index 9ae28b5be..3df69f477 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -8,6 +8,8 @@ import router from '@/router' import store from '@/store' import {Message} from 'element-ui' import { baseUrl,webLoginType,ssoLoginUrlDev } from '@/sysConfig' +import isMobile from "../../store/isMobile"; + import domMessage from '../messageOnce/messageOnce' const messageOnce = new domMessage() @@ -67,8 +69,12 @@ _axios.interceptors.response.use( } } if(res.data && res.data.respCode && res.data.respCode === 'LE505'){ - window.sessionStorage.clear() - messageOnce.warning({ + if (isMobile()) { + localStorage.removeItem('token') + return router.push('/phoneIndex') + } + window.sessionStorage.clear() + messageOnce.warning({ message: '登录超时,请重新登录', type: 'warning' }) diff --git a/src/common/axiosV2/index.js b/src/common/axiosV2/index.js index 8e4f0790a..e37b74634 100644 --- a/src/common/axiosV2/index.js +++ b/src/common/axiosV2/index.js @@ -3,6 +3,8 @@ import router from '@/router' import store from '@/store' import {Message} from 'element-ui' import { baseUrl,webLoginType,ssoLoginUrlDev } from '@/sysConfig' +import isMobile from "../../store/isMobile"; + import domMessage from '../messageOnce/messageOnce' // import 'element-ui/lib/theme-chalk/index.css' @@ -62,16 +64,21 @@ service.interceptors.response.use( } } if(res.data && res.data.respCode != undefined && res.data.respCode === 'LE505'){ - window.sessionStorage.clear() - messageOnce.warning({ - message: '登录超时,请重新登录', - type: 'warning' - }) - if(webLoginType != null && webLoginType === 'idm' ) { - // idm 统一认证登录页面 - return window.location.href = ssoLoginUrlDev - }else if(webLoginType != null && webLoginType === 'dev'){ - return router.push('/login') + if (isMobile()) { + localStorage.removeItem('token') + return router.push('/phoneIndex') + }else { + window.sessionStorage.clear() + messageOnce.warning({ + message: '登录超时,请重新登录', + type: 'warning' + }) + if(webLoginType != null && webLoginType === 'idm' ) { + // idm 统一认证登录页面 + return window.location.href = ssoLoginUrlDev + }else if(webLoginType != null && webLoginType === 'dev'){ + return router.push('/login') + } } } return res.data diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index e5f91a8f5..37d3d434e 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -617,6 +617,7 @@ color: #fff; } .nav-menu /deep/.el-submenu__title i { + font-size: 16px; color: #fff; } .nav-menu{ @@ -642,6 +643,7 @@ } .el-menu-item { + font-size: 16px; span { margin-left: 5px; font-weight: normal; @@ -678,6 +680,7 @@ background-color: red; } /deep/.el-submenu__title { + font-size: 16px; padding: 0 16px !important; span { font-weight: normal; @@ -712,7 +715,7 @@ } .el-menu-item { padding-left: 29px !important; - font-size: 14px; + font-size: 16px; font-weight: normal; height: 40px; line-height: 40px; diff --git a/src/main.js b/src/main.js index add9eb6ed..dd100ae16 100644 --- a/src/main.js +++ b/src/main.js @@ -109,6 +109,7 @@ router.beforeEach(function (to, from, next) { if (isMobile()) { if ((token === null || token === '' ) && toName !== 'Login') { if(toName !== 'phoneIndex'){ + sessionStorage.removeItem("param"); sessionStorage.setItem('param',JSON.stringify(param4)) next('/phoneIndex') }else { @@ -116,16 +117,20 @@ router.beforeEach(function (to, from, next) { } } else { if (toName.slice(0,5) !== 'phone') { - if (toName === 'processCenter') { - next() - }else { - let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + + let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType - let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) - next({path: phoneRouter + '?' + paramPhone}) - } + let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) + next({path: phoneRouter + '?' + paramPhone}) }else { - extractedVerify(token) + if(toName !== 'blankPage'){ + if(to.matched.length == 0){ + next('/blankPage') + }else { + next() + } + }else { + next() + } } } } else { @@ -147,7 +152,12 @@ router.beforeEach(function (to, from, next) { } } }else if(webLoginType != null && webLoginType === 'dev'){ - next('/Login') + if (isMobile()) { + extractedVerify(token) + } else { + next('/Login') + } + } }else { extractedVerify(token) @@ -236,11 +246,7 @@ router.beforeEach(function (to, from, next) { } } } else { - if (isMobile()){ - next() - } else { - extracted3() - } + extracted3() } } function extracted(routerPath) { @@ -284,17 +290,9 @@ router.beforeEach(function (to, from, next) { } if(path === '/loginVerify'){ if(webLoginType != null && webLoginType === 'dev'){ - if(isMobile()) { - next('/blankPage') - } else { - next('/Login') - } + next('/Login') }else { - if(isMobile()) { - next('/blankPage') - } else { - next('/Login') - } + next() } }else { next() diff --git a/src/pages/home2/components/navMenu/index.vue b/src/pages/home2/components/navMenu/index.vue index cfe0c4c93..862e81518 100644 --- a/src/pages/home2/components/navMenu/index.vue +++ b/src/pages/home2/components/navMenu/index.vue @@ -77,11 +77,11 @@ height: 40px; line-height: 40px; background: #fff; - font-size: 15px; + font-size: 14px; border-radius: 10px; } .menu-wrap { - height: 240px; + height: 200px; display: flex; flex-wrap: wrap; justify-content: space-between; diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index b3b911791..b774e6e8a 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -1310,7 +1310,7 @@ export default { .to-do-list { margin-right: 10px; border-radius: 3px; - height: calc(~'100% - 310px'); + height: calc(~'100% - 269px'); overflow: hidden; background: #FFFFFF; box-shadow: 1px 1px 10px rgba(0,0,0,0.1); diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue index 22a127dcb..bb26a0be7 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -173,7 +173,7 @@ export default { .right_wrapper { display: flex; flex-direction: column; - width: 30vw; + width: 25vw; height: 100%; } .search-condition { diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue index f0e0e31f3..d180f3e1e 100644 --- a/src/pages/localTool/standCalendar/index.vue +++ b/src/pages/localTool/standCalendar/index.vue @@ -33,8 +33,8 @@ - +
@@ -58,7 +58,7 @@ - 会议 + 会议 会议 {{ item.title }} @@ -71,6 +71,9 @@
会议内容 : {{ item.content }}
+
+ 会议地点 : {{ item.place }} +
会议附件 : {{ '-' }} diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 6b0cf9cb0..0e20c6bea 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -562,7 +562,7 @@ this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { + this.$http.post('lawss/activiti/startProcessRollBack', { type: '2' }, {}, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index df4797b8a..bd748eb42 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -559,7 +559,7 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcessRollBack', { + this.$http.post('lawss/activiti/startProcessRollBack', { id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index c7d65f6e4..2b52174d8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -197,7 +197,8 @@ align="center" label="联络人"> +
@@ -517,8 +525,10 @@ export default { }, roleShowflag: false, roleShowflagOne: false, + telShowflag: false, nodeList: [], nodeListOne: [], + nodeListTel: [], isSubmit: false, saveLoading: false, @@ -724,6 +734,21 @@ export default { this.deleteDataList = val }, + // 列表选人 + choiceTel(type, title, val,id) { + this.choiceTelList = val + this.nodeListTel = [] + this.nodeListTel.push(id) + this.type = type + this.telShowflag = true + }, + drawerCheckTel(data) { + if(data.length > 0) { + this.choiceTelList.tel_nameId = data[0].id + this.choiceTelList.tel_name = data[0].name + } + this.telShowflag = false + }, // 流程阶段负责人选择 choiceZRR(type, title, id) { this.nodeList = [] @@ -774,7 +799,7 @@ export default { } else if (this.type === 'engineerUser') { this.roleForm.engineerUser = data[0].name this.roleForm.engineerUserId = data[0].id - } else { + }else { this.roleForm.directorUserName = data[0].name this.roleForm.directorUserId = data[0].id } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index b3d7f0df8..b49d22b79 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -112,10 +112,11 @@ + @@ -380,7 +381,7 @@ export default { }, /** 选择入会人员 */ - choiceRole(id) { + choiceRole(type,title,id) { this.nodeList = [] this.nodeList.push(id) this.roleShowflag = true diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index d47554dbc..c44e9d1f7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -431,7 +431,7 @@ export default { this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName this.rh_pageData.fillTel = this.$store.getters.userInfo.phone - this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName + this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName + '(' + this.$store.getters.userInfo.userId + ')' if (this.rh_pageData.fillFile !== undefined) { this.fillFileList = this.rh_pageData.fillFile } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index e6f16403b..669cbd9d2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -22,7 +22,7 @@ v-for="item in rh_pageData.comityOptionsOne" :key="item.id" v-if="item.id === rh_pageData.comityName"> - {{ item.name || '-'}} + {{ item.name || '-' }} @@ -74,7 +74,7 @@ {{ '-' }}
- {{ item.name.slice(0,30) + '...' }} {{ ';' }} + {{ item.name.slice(0, 30) + '...' }} {{ ';' }} {{ item.name }} {{ ';' }} @@ -138,11 +138,16 @@
+ + 新增 + + @click="del_partForm"> 批量删除
@@ -156,18 +161,51 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '20px'}"> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -256,6 +294,88 @@ 流程列表加载中
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + 上传文件 + + + + +
+
+ 取消 + 确认 +
+ + + + + +
+ +

点击或拖拽上传文件

+
+ + + @@ -333,7 +460,26 @@ export default { deleteDataList: [], infoSourcesLength: '', - commentText: '' + commentText: '', + + editFlag: false, + editForm: { + fillPeople: '', + fillUnit: '', + fillDept: '', + fillPost: '', + fillTel: '', + fillMail: '', + fillFile: [], + }, + + // 上传文件储存 + reData: [], + upDialog: false, + actionPath: 'api/att/attFile/upload', + acceptShow: false, + roleShowflag: false, + nodeList: [], } }, computed: { @@ -382,8 +528,130 @@ export default { // this.rh_pageData.comityFileNum = this.fileTextList }) }, + /** 我司参与人员新增 */ + add_partForm() { + var list = { + fillPeople: this.fillPeople, + fillUnit: this.fillUnit, + fillDept: this.fillDept, + fillPost: this.fillPost, + fillTel: this.fillTel, + fillMail: this.fillMail, + fillFile: this.fillFile = [] + } + this.rh_pageData.myPartRole.push(list) + }, + + fillFile_up(row) { + this.fileListData = row + this.reData = this.fileListData.fillFile + this.upDialog = true + }, + // 文件上传成功 + handleOnsuccess(res, file, fileList) { + if (res.ok) { + if (this.reData !== undefined) { + this.newDataList = this.reData + this.newDataList.push({ + id: res.data.attId, + name: res.data.name + }) + } else { + this.newDataList.push({ + id: res.data.attId, + name: res.data.name + }) + } + + this.fileListData.fillFile = this.newDataList + this.$message({ + showClose: true, + message: res.message, + type: 'success' + }) + this.newDataList = [] + this.fileMadel = false + } + }, + // 文件上传限制条件 + handleBeforeUpload(file) { + var filename = file.name + var index1 = filename.lastIndexOf('.') + var index2 = filename.length + var fileSuffix = filename.substring(index1, index2) + // const fileSuffix = file.name.split('.')[1] // 后缀名 + // 判断上传文件格式 + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { + return true + } else { + this.spinShow = false + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') + return false + } + // 判断文件上传大小 + // eslint-disable-next-line no-unreachable + if (file.size / 1024 / 1024 <= 200) { + return true + } else { + this.$message.error('文件' + file.name + '大小不超过200M') + return false + } + return true + }, + // 移除上传的文件 + handleBeforeRemove(file, fileList) { + this.reData.forEach((item, index) => { + if (item.name === file.name || item.id === file.id) { + this.reData.splice(index, 1) + } + }) + this.fileListData.fillFile = this.reData + }, + + handleClose() { + this.upDialog = false + }, + // 编辑按钮 + edit_partForm(row) { + // 用来储存取消时原来的数据，防止取消时修改 + localStorage.setItem('obj', JSON.stringify(row)) + this.fileListData = row + this.reData = this.fileListData.fillFile + this.editForm = row + this.editFlag = true + }, + // 编辑框确认按钮 + OkDrawer() { + this.editFlag = false + }, + falseDrawer() { + let Item = JSON.parse(localStorage.getItem('obj')) + this.editForm.fillPeopleId = Item.fillPeopleId + this.editForm.fillPeople = Item.fillPeople + this.editForm.fillUnit = Item.fillUnit + this.editForm.fillDept = Item.fillDept + this.editForm.fillPost = Item.fillPost + this.editForm.fillTel = Item.fillTel + this.editForm.fillMail = Item.fillMail + this.editForm.fillFile = Item.fillFile + this.editFlag = false + }, + // 编辑框选人 + choiceRole(type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.roleShowflag = true + }, + drawerCheck(data) { + if (data.length > 0) { + this.fileListData.fillPeopleId = data[0].id + this.fileListData.fillPeople = data[0].name + } + this.roleShowflag = false + }, /** 批量删除 */ - del_paryForm() { + del_partForm() { if (this.deleteDataList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else { @@ -477,16 +745,16 @@ export default { const attId = file.id this.getBusStandFileByAttId(attId) .then(res => { - if(res){ + if (res) { const editFileInfo = res - if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){ - window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl) - }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){ + if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') { + window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl) + } else if (editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF') { window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) - }else { + } else { const nowTime = new Date().getTime() // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); - window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) + window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime + '&filePath=' + editFileInfo.filePath + '&fileName=' + editFileInfo.fileName) } // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 30289bc72..6a7f3f15c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -283,7 +283,7 @@ - +

技术委员会主任

@@ -392,7 +392,9 @@ export default { fillFile: '', associaOptionsOne: [], associaOptionsTwo: [], - associaOptionsTree: [] + associaOptionsTree: [], + meetingInRole: '', + meetingInRoleId: '' }, feeKindOptions: [ @@ -429,6 +431,7 @@ export default { leaderUser: [{required: true, message: "请选择标准法规部主管中心主任", trigger: ['blur', 'change']}], feeUser: [{required: true, message: "请选择管理推荐部", trigger: ['blur', 'change']}], engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}], + directorUserName: [{required: true, message: "请选择技术委员会主任", trigger: ['blur', 'change']}], }, deleteDataList: [], diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index 00c3c0ff3..170ac078a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -107,11 +107,12 @@ - + + @@ -209,6 +210,13 @@ @submit="handleSubmit" > + +
@@ -293,10 +301,31 @@ export default { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData this.uploadFileLength = this.ch_pageData.fileTextList.length - this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList }) }, + + /** 选择入会人员 */ + choiceRole(type,title,id) { + this.nodeList = [] + this.nodeList.push(id) + this.roleShowflag = true + }, + drawerCheck(data) { + var idList = '' + var nameList = '' + data.forEach(item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id; + nameList += item.name; + }) + this.ch_pageData.meetingInRole = nameList + this.ch_pageData.meetingInRoleId = idList + this.roleShowflag = false + }, // 退回按钮 handleSubmitNo() { if (this.commentText === '') { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index b8094a74b..c40384c2c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -372,7 +372,7 @@ export default { this.ch_pageData.fillUnit = this.$store.getters.userInfo.upDeptName this.ch_pageData.fillTel = this.$store.getters.userInfo.phone this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId - this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName + this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName + '(' + this.$store.getters.userInfo.userId + ')' this.roleForm = JSON.parse(JSON.stringify(item)).roleList // this.rh_pageData.comityFileNum = this.fileTextList }) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue index ae37361e7..b1b91c601 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -113,11 +113,15 @@
+ + 新增 + @click="del_partForm"> 批量删除
@@ -132,11 +136,40 @@ fontWeight: 'bold', height: '20px'}"> - - - - - + + + + + + + + + + + + + + + + + + @@ -223,6 +256,42 @@ 流程列表加载中 + +
+ + + + + + + + + + + + + + + + + + +
+
+ 取消 + 确认 +
+ + @@ -269,7 +345,18 @@ export default { pId: this.$route.query.prcId, uploadFileLength: '', - commentText: '' + commentText: '', + roleShowflag: false, + nodeList: [], + // 人员编辑 + editFlag: false, + editForm: { + fillPeople: '', + fillUnit: '', + fillDept: '', + fillTel: '', + fillMail: '', + } } }, computed: { @@ -318,9 +405,55 @@ export default { // this.ch_pageData.comityFileNum = this.fileTextList }) }, - + /** 我司参与人员新增 */ + add_partForm() { + var list = { + fillPeople: this.fillPeople, + fillUnit: this.fillUnit, + fillDept: this.fillDept, + fillTel: this.fillTel, + fillMail: this.fillMail, + } + this.ch_pageData.myPartRole.push(list) + }, + // 编辑框确认按钮 + OkDrawer() { + this.editFlag = false + }, + falseDrawer() { + let Item = JSON.parse(localStorage.getItem('obj')) + this.editForm.fillPeopleId = Item.fillPeopleId + this.editForm.fillPeople = Item.fillPeople + this.editForm.fillUnit = Item.fillUnit + this.editForm.fillDept = Item.fillDept + this.editForm.fillTel = Item.fillTel + this.editForm.fillMail = Item.fillMail + this.editFlag = false + }, + /** 入会人员编辑 */ + edit_partForm(row) { + // 用来储存取消时原来的数据，防止取消时修改 + localStorage.setItem('obj', JSON.stringify(row)) + this.fileListData = row + this.editForm = row + this.editFlag = true + }, + // 编辑框选人 + choiceRole(type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.roleShowflag = true + }, + drawerCheck(data) { + if (data.length > 0) { + this.fileListData.fillPeopleId = data[0].id + this.fileListData.fillPeople = data[0].name + } + this.roleShowflag = false + }, /** 批量删除 */ - del_paryForm() { + del_partForm() { if (this.deleteDataList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index f81695660..7a87e5797 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -1181,7 +1181,7 @@ this.$message.warning('请选择责任人') } else { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { + this.$http.post('lawss/activiti/startProcessRollBack', { type: '9' }, {}, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue index 1ba207ed8..43d5cfd60 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue @@ -37,18 +37,19 @@ clearable > - -
-

{{ listForm.modelName }} + +

+

{{ item.name }} @@ -204,6 +205,15 @@ 流程列表加载中

+ + + @@ -211,7 +221,8 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail } from "api/process"; +import { changeAssigneeNew, inboundLiaisonDetail } from "api/process"; + export default { name: "bzqdfbStep1-4", components: { @@ -221,6 +232,11 @@ export default { }, data() { return { + nodeList:[], + isTransfer: false, + drawerTitle:'', + // 调整处理人抽屉状态 + drawerModal: false, detailData: [], // 当前流程类型(1待办/2已办) processType: 1, @@ -236,10 +252,12 @@ export default { selectList: [], //选择标准的选择框 bringData: [], commentText: "", //填写会签意见 + fileList:[], page: 1, total: 0, pageSize: this.$store.getters.userInfo.configContent, listForm: { + fileIds: '', listType: "", //区分是哪个清单 listName: "", //清单名称 descriptionList: "", //清单说明 @@ -274,6 +292,47 @@ export default { }; }, methods: { + //确认转办 + checkedRole (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res => { + this.isTransfer = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.$router.push("/processCenter"); + this.processNum() + } else { + this.$message.warning(res.message) + } + }) + }, + // 请求转换流程图 + processNum (row) { + axios.request({ + url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(), + responseType: 'blob', + method: 'get', + params: { + prcNum: this.$route.query.prcNum + } + }).then(res => { + // let blob = new Blob([res.data], {type: 'image/jpg'}) + // let url = window.URL.createObjectURL(res.data) + this.processStep = window.URL.createObjectURL(res.data) + }) + }, + //转办事件 + handleTransfer(){ + this.drawerModal = true + this.drawerTitle = '转办处理人' + this.selectPeople = row + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -337,6 +396,15 @@ export default { this.listForm.applyUpdUserId = item.applyUpdUserId; this.listForm.jlUserId = item.jlUserId; this.listForm.zrUserId = item.zrUserId; + let filesId = [] + item.fileName.forEach(itemIds =>{ + filesId.push(itemIds.id) + }) + this.listForm.fileId = filesId.join(',') + item.fileName.forEach(itemId => { + this.fileIds = itemId.id + this.getFileInfo(); + }) }); }, // 请求上传的文件信息 @@ -346,11 +414,15 @@ export default { }, { _this: this }, res => { - console.log(res); this.$nextTick(() => { res.data.map(item => { - this.listForm.modelName = item.oldFileName; - this.listForm.model = item.id; + // 赋值要回显的上传文件内容 + this.fileList.push({ + name: item.oldFileName, + uid: item.uid, + status: item.status, + id: item.id + }); }); }); }, e => { @@ -378,18 +450,13 @@ export default { } } }, - //驳回事件 + // 驳回事件 beforeBack() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { - this.$message.warning("请填写审批意见"); - } else { + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ this.listForm.approvalOpinion = "1"; - this.handleSubmit(); - } - }, - //提交事件 - handleSubmit() { - this.isSubmit = true + this.saveLoading = true this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -403,8 +470,29 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } - this.isSubmit = false + this.saveLoading = false }); + }/**/ + }, + //提交事件 + handleSubmit() { + this.isSubmit = true; + this.listForm.approvalOpinion = "2"; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + 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 + }); }, //选择标准取消事件 closeDrawer() { @@ -465,6 +553,31 @@ export default { padding: 0 20px 0; } } + p { + & > a { + cursor: pointer; + } + + & > i { + display: inline-block; + margin-left: 3px; + width: 18px; + height: 16px; + background-repeat: no-repeat; + background-size: 100% 100%; + background-position: center center; + vertical-align: sub; + cursor: pointer; + } + + .icon-download { + background-image: url("~assets/images/shangqi/img/download.png"); + } + + .icon-download2 { + background-image: url("~assets/images/shangqi/img/download2.png"); + } + } .choiceBtn { .el-button--primary { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index ef95d81fa..0eeb55339 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1159,19 +1159,19 @@ :maxlength="100"> - + - - - + + + + + + + { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { + this.$http.post('lawss/activiti/startProcessRollBack', { type: '3' }, {}, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index a31b13053..0d1532167 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -829,7 +829,7 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { + this.$http.post('lawss/activiti/startProcessRollBack', { id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue index f4031ff2c..e3f943558 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue @@ -159,7 +159,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- -
- + +
+ @@ -110,7 +110,7 @@
@@ -233,7 +233,7 @@ @@ -370,7 +370,7 @@ export default { this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') - this.qbfsForm.unit = this.selectList[0].unit + this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 086e2a1a8..33119c5c4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -104,12 +104,12 @@ placeholder="请选择标准发布时间"> - -
- + +
+ @@ -118,7 +118,7 @@
@@ -249,7 +249,7 @@ @@ -391,7 +391,7 @@ export default { this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') - this.qbfsForm.unit = this.selectList[0].unit + this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 16c197c24..8981da546 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -64,10 +64,10 @@ placeholder="请选择计划标准发布时间"> - - - + + + @@ -133,7 +133,7 @@ export default { qbfsForm: { type: '5', unit: '', // 单位 - unitId: '', + unitName: '', esName: '', // 企标名称 planStatus: '', // 计划状态 reviseStatus: '', // 制修订状态 @@ -222,8 +222,8 @@ export default { idList += item.id nameList += item.name }) - this.$set(this.qbfsForm, 'unitId', idList) - this.$set(this.qbfsForm, 'unit', nameList) + this.$set(this.qbfsForm, 'unit', idList) + this.$set(this.qbfsForm, 'unitName', nameList) if(this.qbfsForm.unit){ this.$refs.qbfsForm.validateField('unit') } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 6da0c9887..23973cf52 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -81,10 +81,10 @@ placeholder="请选择初稿完成时间"> - - - + + + @@ -249,7 +249,7 @@ @@ -330,7 +330,7 @@ export default { esName2: [ {required: true, message: '请选择合并计划企标名称', trigger: 'blur'}, ], - unit: [ + unitName: [ {required: true, message: '请选择起草单位', trigger: 'change'}, ], esName: [ @@ -444,8 +444,8 @@ export default { idList += item.id nameList += item.name }) - this.$set(this.qbfsForm, 'unitId', idList) - this.$set(this.qbfsForm, 'unit', nameList) + this.$set(this.qbfsForm, 'unit', idList) + this.$set(this.qbfsForm, 'unitName', nameList) if(this.qbfsForm.unit){ this.$refs.qbfsForm.validateField('unit') } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index fda02ac8a..97a49d619 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -95,12 +95,12 @@ placeholder="请选择标准发布时间"> - -
- + +
+ @@ -109,7 +109,7 @@
@@ -240,7 +240,7 @@ @@ -379,7 +379,7 @@ export default { this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') - this.qbfsForm.unit = this.selectList[0].unit + this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue index 7ccb9ed36..7ac67bbd9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue @@ -75,10 +75,10 @@ placeholder="请选择计划标准发布时间"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index 9ef124af9..5be9a3a1f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -75,10 +75,10 @@ placeholder="请选择计划标准发布时间"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index c749e3dfa..94cd454fb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -75,10 +75,10 @@ placeholder="请选择计划标准发布时间"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index ebcd79a4d..944f67249 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -75,10 +75,10 @@ placeholder="请选择计划标准发布时间"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 38eb4ec00..6978aa1c0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -75,10 +75,10 @@ placeholder="请选择计划标准发布时间"> - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 07ebb1d69..d381a84b2 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -53,7 +53,7 @@ - +