diff --git a/src/App.vue b/src/App.vue index 5ddb7f29c..610b62e0c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -69,34 +69,6 @@
-
@@ -243,7 +215,7 @@ export default { && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' && this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex' - && this.$route.name !== 'blankPage') { + && this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage' ) { this.isBoolean = true } else { this.isBoolean = false diff --git a/src/api/phone.js b/src/api/phone.js index ae39051e5..f1dbbb271 100644 --- a/src/api/phone.js +++ b/src/api/phone.js @@ -1,5 +1,6 @@ import axios from "@/common/axiosV2"; +// 手机端查询人 export function phoneUser(params) { return axios({ url: "api/sys/user/getUserByPhone", diff --git a/src/api/process.js b/src/api/process.js index 1c260eefc..6bb77e017 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -713,7 +713,7 @@ export function workGroup(data) { params: data }) } -// +// 手机端查询token export function loginMobile(data) { return axios({ url: 'api/lawss/activiti/loginMobile', @@ -721,3 +721,20 @@ export function loginMobile(data) { params: data }) } + +// 日历信息编辑 +export function updateMeet(data) { + return axios({ + url: '/api/sapMeetInfo/updateMeeting', + method: 'post', + params: data + }) +} + +export function upFile(data) { + return axios({ + url: '/api/att/attFile/upload', + method: 'post', + data + }) +} 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/components/phoneRole/index.vue b/src/components/phoneRole/index.vue index 132ce3b5b..1716fd155 100644 --- a/src/components/phoneRole/index.vue +++ b/src/components/phoneRole/index.vue @@ -3,6 +3,7 @@ @@ -57,7 +58,7 @@ @click="toggle(index)" > @@ -125,12 +126,6 @@ export default { }, isShowPhone2(val) { this.$emit('update:isShowPhone', val) - }, - resultList (val) { - this.result = val - }, - result() { - this.$emit('resultList', this.result) } }, mounted() { @@ -140,6 +135,7 @@ export default { /** 查询 */ queryPhone() { this.getPhoneData() + this.finished = false }, /** 获取人员数据 */ async getPhoneData() { @@ -170,22 +166,41 @@ export default { }, roleSumit() { - this.$emit('checkedRole', this.result) - this.isShowPhone2 = false + let ids = '' + this.result.map(item => { + if (ids.length > 0) { + ids += ',' + ids += item + } else { + ids = item + } + }) + this.$http.get('SarInstitution/institution/getNextById', { + ids: ids + }, { + _this: this + }, res => { + this.$emit('checkedRole', res) + this.isShowPhone2 = false + this.phoneForm.name = '' + this.getPhoneData() + }) }, roleClear() { this.result = [] this.isShowPhone2 = false + this.phoneForm.name = '' + this.getPhoneData() }, // 下滑加载数据 onLoad() { + this.phoneForm.page++ phoneUser(this.phoneForm).then(res => { this.roleList = this.roleList.concat(res.data) this.total = this.roleList[0].total this.loading = false if (this.roleList.length < this.total) { - this.phoneForm.page ++ this.loading = false } else { this.finished = true diff --git a/src/main.js b/src/main.js index add9eb6ed..5faa4726c 100644 --- a/src/main.js +++ b/src/main.js @@ -106,26 +106,48 @@ router.beforeEach(function (to, from, next) { } // 返回值为登录状态 /** 判断是不是在手机端操作 */ + debugger if (isMobile()) { - if ((token === null || token === '' ) && toName !== 'Login') { - if(toName !== 'phoneIndex'){ - sessionStorage.setItem('param',JSON.stringify(param4)) - next('/phoneIndex') + if(toName === 'processCenter'){ + const userAgent = navigator.userAgent; + if (userAgent.indexOf("Firefox") != -1 || userAgent.indexOf("Chrome") !=-1) { + window.location.href = "about:blank" }else { - next() + window.opener = null; + window.open("about:blank", "_self"); + window.close(); } - } else { - if (toName.slice(0,5) !== 'phone') { - if (toName === 'processCenter') { - next() + }else { + if ((token === null || token === '' ) && toName !== 'Login') { + if(toName !== 'phoneIndex'){ + sessionStorage.removeItem("param"); + sessionStorage.setItem('param',JSON.stringify(param4)) + next('/phoneIndex') }else { - 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}) + next() + } + } else { + if (toName.slice(0,5) !== 'phone') { + if(toName === 'LoginVerify'){ + next('/blankPage') + }else { + if(toName === 'blankPage' || toName === 'processedPage') { + next() + }else { + extractedVerify() + } + } + }else { + if(toName !== 'blankPage'){ + if(to.matched.length === 0){ + next('/blankPage') + }else { + next() + } + }else { + next() + } } - }else { - extractedVerify(token) } } } else { @@ -147,7 +169,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) @@ -164,48 +191,54 @@ router.beforeEach(function (to, from, next) { let commitStatus = res.commitStatus === undefined ? 0 : res.commitStatus; let isNotFinished = res.isNotFinished === undefined ? 0 : res.isNotFinished; - if (hisCount && hisCount > 0) { // 业务系统 当前节点已完成 - // 根据type判断跳转具体流程页面 - if (prcType === '1') { - // 标准入库流程数据 - extracted("bzrkStep5"); - } else if (prcType === '4') { - //标准清单发布流程数据 - extracted("bzqdfbStep1-4"); - } else if (prcType === '5') { - //标准项目合规评估 标准维度 - if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") { - extracted("xmpgStep1-2"); - } else { - extracted("xmpgStep1-7"); + if ((hisCount && hisCount > 0)) { // 业务系统 当前节点已完成 + if(isMobile()){ + next('/processedPage') + }else { + // 根据type判断跳转具体流程页面 + if (prcType === '1') { + // 标准入库流程数据 + extracted("bzrkStep5"); + } else if (prcType === '4') { + //标准清单发布流程数据 + extracted("bzqdfbStep1-4"); + } else if (prcType === '5') { + //标准项目合规评估 标准维度 + if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") { + extracted("xmpgStep1-2"); + } else { + extracted("xmpgStep1-7"); + } + } else if (prcType === '6') { + //标准项目合规评估 项目维度 + if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") { + extracted("xmpg2Step1-2"); + } else { + extracted("xmpg2Step1-12"); + } + } else if (prcType === '8') { + // 未符合项整改 + extracted("wfhxzgStep5-1"); + } else if (prcType === '9') { + extracted("bzjdStep1-6"); + //标准调研流程 + } else if (prcType === '2') { + extracted("bzdyStep1-9"); + } else if (prcType === '3') { + //标准征求意见 + extracted("bzzqyjStep1-9"); + } else if (prcType === '10') { + //项目清单确认 + extracted("xmqdqrStep1-3"); + } } - } else if (prcType === '6') { - //标准项目合规评估 项目维度 - if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") { - extracted("xmpg2Step1-2"); - } else { - extracted("xmpg2Step1-12"); - } - } else if (prcType === '8') { - // 未符合项整改 - extracted("wfhxzgStep5-1"); - } else if (prcType === '9') { - extracted("bzjdStep1-6"); - //标准调研流程 - } else if (prcType === '2') { - extracted("bzdyStep1-9"); - } else if (prcType === '3') { - //标准征求意见 - extracted("bzzqyjStep1-9"); - } else if (prcType === '10') { - //项目清单确认 - extracted("xmqdqrStep1-3"); - } } else { // 业务系统 当前节点未完成 // commitStatus 大于0 表示当前节点存在未完成干活流程 // isNotFinished OA 系统显示接受任务 已置为已办 if (routerType && routerType === 'oa' &&isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) { - if (prcType === '3') { + if(isMobile()) { + extractedIphone() + }else if (prcType === '3') { //标准征求意见 接受节点 未完成 oa已办 跳转详情页面 if (path === '/bzzqyjStep3') { extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); @@ -236,11 +269,12 @@ router.beforeEach(function (to, from, next) { } } } else { - if (isMobile()){ - next() - } else { - extracted3() - } + if(isMobile()) { + extractedIphone() + }else{ + extracted3() + } + } } function extracted(routerPath) { @@ -262,6 +296,13 @@ router.beforeEach(function (to, from, next) { next() } } + + function extractedIphone() { + 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}) + } function extracted2(routerPath,param2) { if (token === null || token === '') { extractedLocalStorage(routerPath,param2); @@ -284,17 +325,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/blankPage/index.vue b/src/pages/blankPage/index.vue index 4d0fc0db7..dc2576abd 100644 --- a/src/pages/blankPage/index.vue +++ b/src/pages/blankPage/index.vue @@ -2,7 +2,7 @@
当前任务不支持手机端处理
- 返回 + 返回
@@ -16,7 +16,18 @@ export default { data() { return {} }, - methods: {} + methods: { + closeWindow(){ + const userAgent = navigator.userAgent; + if (userAgent.indexOf("Firefox") != -1 || userAgent.indexOf("Chrome") !=-1) { + window.location.href = "about:blank" + }else { + window.opener = null; + window.open("about:blank", "_self"); + window.close(); + } + } + } } 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/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 86d86d981..c8beafe7d 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -963,7 +963,7 @@ export default { _this: this }, res => { this.addSpiltStandList = res.data.list - this.addFileStandtotal = res.data.list.length + this.addFileStandtotal = res.data.count this.loadData = false }, e => { this.loadData = false diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue index f0e0e31f3..108d53c8d 100644 --- a/src/pages/localTool/standCalendar/index.vue +++ b/src/pages/localTool/standCalendar/index.vue @@ -17,8 +17,8 @@
-
- 今天 +
+ 今天
@@ -33,8 +33,8 @@ - + @@ -58,41 +58,231 @@ - 会议 + 会议 会议 + + 编辑会议内容 + {{ item.title }} -
- 会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm') }} -
-
- 参与人 : {{ item.partPeople.join('、') }} -
-
- 会议内容 : {{ item.content }} -
-
+
+
+ 会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm:ss') }} +
+
+ 参与人 : {{ item.partPeople.join('、') }} +
+
+ 会议内容 : {{ item.content }} +
+
+ 会议地点 : {{ item.place }} +
+
会议附件 : {{ '-' }} - + +
+ + + +
+ + + + + +
+ + 新增 + + + 批量删除 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 添加 + 批量删除 +
+ + + + + + + + + + + + + + + 上传文件 + + + + +
+
+ 取消 + 确认 +
+ + + +
+ + + + + + + + + + + + + + + + + + +
+
+ 取消 + 确认 +
+ +
@@ -340,7 +814,7 @@ export default { } /deep/ .el-card__body { - padding: 10px; + padding: 5px 0px 10px 10px; } .card_info_empty { @@ -351,27 +825,33 @@ export default { height: 190px; margin-top: 10px; - .content_text { - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - word-break: break-all; - line-height: normal; - margin-top: 10px; - font-size: 5px; - } + .content_style { + height: 150px; + overflow-y: auto; + width: 100%; - .content_text2 { - text-overflow: ellipsis; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 4; - line-clamp: 4; - -webkit-box-orient: vertical; - line-height: normal; - margin-top: 10px; - font-size: 5px; + .content_text { + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + word-break: break-all; + line-height: normal; + margin-top: 10px; + font-size: 5px; + } + + .content_text2 { + text-overflow: ellipsis; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 4; + line-clamp: 4; + -webkit-box-orient: vertical; + line-height: normal; + margin-top: 10px; + font-size: 5px; + } } } } 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/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index 633899635..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 }} {{ ';' }} @@ -193,12 +193,10 @@ -
+
- - - - - - - - - - - - - - - - - - - - - - - 上传文件 - - - - + + + + + + + + + + + + + + + + + + + + + + + 上传文件 + + + +
取消 @@ -472,6 +470,7 @@ export default { fillPost: '', fillTel: '', fillMail: '', + fillFile: [], }, // 上传文件储存 @@ -626,19 +625,26 @@ export default { this.editFlag = false }, falseDrawer() { - let item = JSON.parse(localStorage.getItem('obj')) - this.editForm = item + 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) { + choiceRole(type, title, id) { this.nodeList = [] this.nodeList.push(id) this.type = type this.roleShowflag = true }, drawerCheck(data) { - if(data.length > 0) { + if (data.length > 0) { this.fileListData.fillPeopleId = data[0].id this.fileListData.fillPeople = data[0].name } @@ -739,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 e32405d1f..1c6c4db0c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -179,7 +179,7 @@ align="center"> @@ -474,7 +474,7 @@ size="800px">
- 查看比对 + 查看比对
相似度:{{ similarityDegree }}
-
-
+
+
@@ -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/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 9c2a0a4c9..fbd5f6cad 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -183,7 +183,7 @@ align="center"> @@ -483,7 +483,7 @@ size="800px">
- 查看比对 + 查看比对
相似度:{{ similarityDegree }}
-
-
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 6670afe1d..87b561ae8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -188,7 +188,7 @@ align="center"> @@ -357,7 +357,7 @@ size="800px">
- 查看比对 + 查看比对 @@ -432,8 +432,8 @@ size="1100px">
相似度:{{ similarityDegree }}
-
-
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index ff0d941b1..f0aed891c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -177,6 +177,7 @@ @@ -258,7 +268,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone' import ProcessHeader from "../../components/ProcessHeader"; import ProcessTitle from "process/components/ProcessTitle"; import ProcessFooter from "process/components/ProcessFooter"; -import { changeAssigneeNew,inboundLiaisonDetail } from "api/process"; +import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js" export default { name: "phoneCywbbzzxdStep5", @@ -270,6 +280,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //切换tab active: "1", foldFormFlag: true, @@ -371,14 +384,9 @@ export default { }, //驳回 beforeBack(){ - if (this.participantsData.length < 1) { - this.$message.warning("项目信息不能为空"); - } else { - this.participantsData.forEach(item => { - if (item.projectNumber === undefined) { - this.$message.warning("请完善项目信息"); - } - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else { this.wbbzform.commentText = this.commentText; let json = { participantsData: this.participantsData, @@ -445,29 +453,30 @@ export default { }, //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' }, //确认转办 - checkedTransferRole (data) { - this.assigneeNewLoading = true + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = 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 + }).then(res =>{ if (res.success) { - this.drawerModal = false + this.turnLoading = false this.$message.success('调整成功') - this.$router.push("/processCenter"); - this.processNum() + this.$router.push("/processCenter") } else { this.$message.warning(res.message) } }) + this.modalshowflag = false }, }, computed: { diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue index ad9f2a823..009955d7f 100644 --- a/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue @@ -10,109 +10,112 @@
审批历史
-
- - - - +
+ + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }} - + + {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}
- +
+
@@ -258,7 +268,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone' import ProcessHeader from "../../components/ProcessHeader"; import ProcessTitle from "process/components/ProcessTitle"; import ProcessFooter from "process/components/ProcessFooter"; -import { changeAssigneeNew,inboundLiaisonDetail } from "api/process"; +import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js" export default { name: "phoneCywbbzzxdStep6", @@ -270,6 +280,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //切换tab active: "1", foldFormFlag: true, @@ -371,14 +384,9 @@ export default { }, //驳回 beforeBack(){ - if (this.participantsData.length < 1) { - this.$message.warning("项目信息不能为空"); - } else { - this.participantsData.forEach(item => { - if (item.projectNumber === undefined) { - this.$message.warning("请完善项目信息"); - } - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ this.wbbzform.commentText = this.commentText; let json = { participantsData: this.participantsData, @@ -445,29 +453,30 @@ export default { }, //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' }, //确认转办 - checkedTransferRole (data) { - this.assigneeNewLoading = true + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = 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 + }).then(res =>{ if (res.success) { - this.drawerModal = false + this.turnLoading = false this.$message.success('调整成功') - this.$router.push("/processCenter"); - this.processNum() + this.$router.push("/processCenter") } else { this.$message.warning(res.message) } }) + this.modalshowflag = false }, }, computed: { diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue index e75d3001a..4730d0904 100644 --- a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue +++ b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue @@ -478,6 +478,21 @@ export default { console.log(item); this.$nextTick(() => { this.wbbzform = JSON.parse(JSON.stringify(item)); + this.wbbzform.comityOptionsOne.forEach(item =>{ + if(this.wbbzform.associationName === item.id){ + this.wbbzform.associationName = item.name + } + }) + this.wbbzform.comityOptionsTwo.forEach(item =>{ + if(this.wbbzform.committee === item.id){ + this.wbbzform.committee = item.name + } + }) + this.wbbzform.comityOptionsOneThree.forEach(item =>{ + if(this.wbbzform.workingGroup === item.id){ + this.wbbzform.workingGroup = item.name + } + }) this.associationData = item.associationData this.participantsData = item.participantsData item.fileName.forEach(itemId => { diff --git a/src/pages/processCenter/pages/phone/wbsm/step3.vue b/src/pages/processCenter/pages/phone/wbsm/step3.vue index 573f9a011..cddc3a78f 100644 --- a/src/pages/processCenter/pages/phone/wbsm/step3.vue +++ b/src/pages/processCenter/pages/phone/wbsm/step3.vue @@ -77,7 +77,7 @@ { @@ -329,12 +329,12 @@ export default { this.roleRow = data[0] // 选取负责人时的操作 if (this.multipleSelection.length === 0) { - this.rowDutyPeople.dutyPeopleInfo = this.roleRow.userName - this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.usId + this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name + this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id }else { this.multipleSelection.forEach(item => { - item.dutyPeopleInfo = this.roleRow.userName - item.dutyPeopleInfoId = this.roleRow.usId + item.dutyPeopleInfo = this.roleRow.name + item.dutyPeopleInfoId = this.roleRow.id }) this.$refs.multipleTable.clearSelection() } diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue index cb3717d5d..4444a262a 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue @@ -356,7 +356,7 @@ export default { this.turnLoading = true changeAssigneeNew({ taskId: this.taskIds, // 任务id - assignee: this.phoneRoleList[0].usId, // 被委托人 + assignee: this.phoneRoleList[0].id, // 被委托人 userId: this.userId, // 委托人 pId: this.pId // 流程实例 }).then(res =>{ diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue index 51ae3d310..38b4ffbb7 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -250,7 +250,7 @@ export default { this.phoneRoleList = data changeAssigneeNew({ taskId: this.taskIds, // 任务id - assignee: data[0].usId, // 被委托人 + assignee: data[0].id, // 被委托人 userId: this.userId, // 委托人 pId: this.pId // 流程实例 }).then(res =>{ diff --git a/src/pages/processedPage/index.vue b/src/pages/processedPage/index.vue new file mode 100644 index 000000000..5acb9331c --- /dev/null +++ b/src/pages/processedPage/index.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 117aa3e11..99cae6987 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -211,26 +211,19 @@ - - - + - + @@ -575,8 +568,8 @@ export default { typeApplicable: '', nylx: '', ssrq: '', - zccssrqgj: '', - xcxssrqgj: '', + zccssrq: '', + xcxssrq: '', zrbm: '', sycpx: '', cycvppsbm: '', @@ -1251,11 +1244,11 @@ export default { if (this.editRowData.ssrq !== null) { this.editRowData.ssrq = this.editRowData.ssrq.split(',') } - if (this.editRowData.zccssrqgj !== null) { - this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',') + if (this.editRowData.zccssrq !== null) { + this.editRowData.zccssrq = this.editRowData.zccssrq.split(',') } - if (this.editRowData.xcxssrqgj !== null) { - this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',') + if (this.editRowData.xcxssrq !== null) { + this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',') } this.drawerEdit = true }, @@ -1263,8 +1256,8 @@ export default { cancelInfo() { let Item = JSON.parse(localStorage.getItem('obj')) this.editRowData.ssrq = Item.ssrq - this.editRowData.xcxssrqgj = Item.xcxssrqgj - this.editRowData.zccssrqgj = Item.zccssrqgj + this.editRowData.xcxssrq = Item.xcxssrq + this.editRowData.zccssrq = Item.zccssrq this.drawerEdit = false }, // 抽屉提交按钮 @@ -1272,11 +1265,11 @@ export default { if (this.editRowData.ssrq !== null) { this.editRowData.ssrq = this.editRowData.ssrq.join(',') } - if (this.editRowData.xcxssrqgj !== null){ - this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',') + if (this.editRowData.xcxssrq !== null){ + this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',') } - if (this.editRowData.zccssrqgj !== null){ - this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',') + if (this.editRowData.zccssrq !== null){ + this.editRowData.zccssrq = this.editRowData.zccssrq.join(',') } this.drawerEdit = false }, @@ -1351,15 +1344,15 @@ export default { } else { rowlist1.push(this.sarAccessInfoList[i].ssrq) } - if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) { - rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-') + if (this.sarAccessInfoList[i].xcxssrq === null || this.sarAccessInfoList[i].xcxssrq === undefined) { + rowlist3.push(this.sarAccessInfoList[i].xcxssrq = '-') } else { - rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj) + rowlist3.push(this.sarAccessInfoList[i].xcxssrq) } - if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) { - rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-') + if (this.sarAccessInfoList[i].zccssrq === null || this.sarAccessInfoList[i].zccssrq === undefined) { + rowlist2.push(this.sarAccessInfoList[i].zccssrq = '-') } else { - rowlist2.push(this.sarAccessInfoList[i].zccssrqgj) + rowlist2.push(this.sarAccessInfoList[i].zccssrq) } } console.log(rowlist1) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index d2aba5df2..67875773a 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -369,7 +369,7 @@ width="210px" label="卡车VPPS中文名称"> --> - + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index b5b1a6e23..b750c661a 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -399,7 +399,7 @@ align="center" label="适用产品线"> - + diff --git a/src/router/index.js b/src/router/index.js index 4d6bc0a6d..d8bdd59cb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -23,6 +23,15 @@ const routes = [ title: '手机提示页面', } }, + { + path: '/processedPage', + name: 'processedPage', + component: resolve => require(['@/pages/processedPage/index.vue'], resolve), + meta: { + requireAuth: true, + title: '手机提示页面', + } + }, { path: '*', redirect: '/loginVerify'