diff --git a/src/App.vue b/src/App.vue index 2f9429400..5ddb7f29c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -238,7 +238,12 @@ export default { }, // 监听路由 控制isBoolean $route() { - if (this.$route.name !== 'Login' && this.$route.name !== 'Home' && !this.$route.meta.isBoolean && this.$route.name !== 'beeEChungLogin' && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' && this.$route.name !== 'StandardSearch') { + if (this.$route.name !== 'Login' && this.$route.name !== 'Home' + && !this.$route.meta.isBoolean && this.$route.name !== 'beeEChungLogin' + && 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.isBoolean = true } else { this.isBoolean = false diff --git a/src/api/process.js b/src/api/process.js index 5052cb051..1c260eefc 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -713,3 +713,11 @@ export function workGroup(data) { params: data }) } +// +export function loginMobile(data) { + return axios({ + url: 'api/lawss/activiti/loginMobile', + method: 'post', + params: data + }) +} diff --git a/src/components/index.js b/src/components/index.js index 4d040a51b..cb817aa18 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -26,6 +26,7 @@ import MechanismTree from './mechanismTree' import SQTree from './SQTree' import OrgTable from './OrgTable' import MySelect from './mySelect' +import PhoneHistortTable from './phoneHistortTable' import phoneRole from './phoneRole' @@ -55,6 +56,7 @@ const install = function (Vue) { Vue.component('MechanismTree', MechanismTree) Vue.component('MySelect', MySelect) Vue.component('phoneRole', phoneRole) + Vue.component('PhoneHistortTable', PhoneHistortTable) } export default { diff --git a/src/components/mechanismTree/index.vue b/src/components/mechanismTree/index.vue index 2c83ad0be..fca2173aa 100644 --- a/src/components/mechanismTree/index.vue +++ b/src/components/mechanismTree/index.vue @@ -2,6 +2,7 @@
{ this.treeData = res.data - console.log(this.treeData); this.nodeKeyId = this.treeData[0].id this.id = res.data[0].id }, e => { diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 81f20e724..e5f91a8f5 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -155,11 +155,11 @@ // path: '/partCodeApply', // menuId: 'ad9db496772c075f78495382b7581fe9' // }, - { - title: '工作组统计', - path: '/dataStatisComments', - menuId: '' - }, + // { + // title: '工作组统计', + // path: '/dataStatisComments', + // menuId: '' + // }, { title: '国内外政策', path: '/foreignRegulationsDatabase', diff --git a/src/components/phoneHistortTable/index.vue b/src/components/phoneHistortTable/index.vue new file mode 100644 index 000000000..977f23dcd --- /dev/null +++ b/src/components/phoneHistortTable/index.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/src/main.js b/src/main.js index 5b6945484..c5055a27d 100644 --- a/src/main.js +++ b/src/main.js @@ -10,6 +10,7 @@ import 'element-ui/lib/theme-chalk/index.css' import $ from 'jquery' // vuex import store from './store' +import Axios from 'axios' // 复制 import VueClipboard from 'vue-clipboard2' // 全局样式文件 @@ -51,210 +52,254 @@ import router from './router' // 路由解析器 import Re from 'path-to-regexp' -import { get_verify_by_instance,loginIdm,getMenu } from 'api/process' +import { get_verify_by_instance,loginIdm,getMenu,loginMobile } from 'api/process' import { ssoLoginUrlDev,ssoLoginUrl,webLoginType,devWebUrl } from '@/sysConfig' import { mapMutations, mapActions } from 'vuex' +import isMobile from "./store/isMobile"; // 路由拦截 router.beforeEach(function (to, from, next) { - let toName = to.name - let token = store.state.token - let path = to.path; - let requireAuth = to.meta.requireAuth; - let taskId = to.query.taskIds; - let prcId = to.query.prcId; - let prcNum = to.query.prcNum; - let prcName = to.query.prcName; - let prcType = to.query.prcType; - let routerType = to.query.routerType; - let param = "taskIds=" + taskId + "&prcId=" + prcId - + "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType; - let url = window.location.search - let code = ""; - if(url){ - url = url.substr(1); - url = url.split('&'); - let info = []; - let obj = {}; - for (let i = 0,len = url.length; i < len; i++) { - info = url[i].split('=') - obj[info[0]] = decodeURI(info[1]); - url[i] = obj; - } - code = url[0].code + let toName = to.name + let token = store.state.token + let path = to.path; + let requireAuth = to.meta.requireAuth; + let taskId = to.query.taskIds; + let prcId = to.query.prcId; + let prcNum = to.query.prcNum; + let prcName = to.query.prcName; + let prcType = to.query.prcType; + let routerType = to.query.routerType; + let param = "taskIds=" + taskId + "&prcId=" + prcId + + "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType; + let param4 = { + path: path, + token: token, + taskId: taskId, + prcId: prcId, + prcNum: prcNum, + prcName: prcName, + prcType: prcType, + toName: toName + } + let url = window.location.search + let code = ""; + if(url){ + url = url.substr(1); + url = url.split('&'); + let info = []; + let obj = {}; + for (let i = 0,len = url.length; i < len; i++) { + info = url[i].split('=') + obj[info[0]] = decodeURI(info[1]); + url[i] = obj; } + code = url[0].code + } - function extractedLocalStorage(url,param) { - localStorage.removeItem("routerUrl") - localStorage.setItem('routerUrl', url) - localStorage.removeItem("routerParam") - localStorage.setItem('routerParam', param) - } - // 返回值为登录状态 + function extractedLocalStorage(url,param,param4) { + localStorage.removeItem("routerUrl") + localStorage.setItem('routerUrl', url) + localStorage.removeItem("routerParam") + localStorage.setItem('routerParam', param) + } + // 返回值为登录状态 + /** 判断是不是在手机端操作 */ + if (isMobile()) { if ((token === null || token === '' ) && toName !== 'Login') { - if(webLoginType != null && webLoginType === 'idm' ){ - if(code){ - next() - }else { - if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { - extractedVerify(token) - }else { - if(path === '/standardSearch/All'){ - extractedLocalStorage('standardSearch/All',''); - }else { - extractedLocalStorage('home2',''); - } - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev - } - } - }else if(webLoginType != null && webLoginType === 'dev'){ - next('/Login') - } - }else { - extractedVerify(token) + if(toName !== 'phoneIndex'){ + sessionStorage.setItem('param',JSON.stringify(param4)) + next('/phoneIndex') + }else { + next() + } + } else { + if (toName.slice(0,5) !== 'phone') { + 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}) + }else { + next() + } } - - function extractedVerify() { - if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { - get_verify_by_instance({ - taskId: taskId, // 任务id - pId: prcId // 流程实例 - }).then(res => { - let hisCount = res.hisCount === undefined ? 0 : res.hisCount; - 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"); - } - } 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') { - //标准征求意见 接受节点 未完成 oa已办 跳转详情页面 - if (path === '/bzzqyjStep3') { - extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); - } - }else if (prcType === '5') { - if (path === '/xmpgStep4') { - extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); - } - }else if (prcType === '2') { - if (path === '/bzdyStep3') { - extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); - } - }else if (prcType === '9') { - if (path === '/bzjdStep3') { - extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); - } - }else if (prcType === '6') { - if (path === '/xmpg2Step6') { - extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); - } - }else if (prcType === '10') { - if (path === '/xmqdqrStep2') { - extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); - } - }else if (prcType === '8') { - if (path === '/wfhxzgStep4') { - extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); - } - } - } else { - // oa 待测 sso - extracted3() - } - } - function extracted(routerPath) { - if (token === null || token === '') { - extractedLocalStorage(routerPath,param); - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev - } else { - next({path: routerPath + '?' +param}) - } - } - - function extracted3() { - if (token === null || token === '') { - extractedLocalStorage(toName,param); - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev - } else { - next() - } - } - function extracted2(routerPath,param2) { - if (token === null || token === '') { - extractedLocalStorage(routerPath,param2); - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev - } else { - next({path: routerPath + '?' + param2}) - } - } - }) - } - if(path === '/loginVerify'){ - if(webLoginType != null && webLoginType === 'dev'){ - next('/Login') - }else { - next() - } + } else { + if ((token === null || token === '' ) && toName !== 'Login') { + if(webLoginType != null && webLoginType === 'idm' ){ + if(code){ + next() }else { - next() + if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { + extractedVerify(token) + }else { + if(path === '/standardSearch/All'){ + extractedLocalStorage('standardSearch/All',''); + }else { + extractedLocalStorage('home2',''); + } + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } } + }else if(webLoginType != null && webLoginType === 'dev'){ + next('/Login') + } + }else { + extractedVerify(token) } + } + + function extractedVerify() { + if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { + get_verify_by_instance({ + taskId: taskId, // 任务id + pId: prcId // 流程实例 + }).then(res => { + let hisCount = res.hisCount === undefined ? 0 : res.hisCount; + 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"); + } + } 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') { + //标准征求意见 接受节点 未完成 oa已办 跳转详情页面 + if (path === '/bzzqyjStep3') { + extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); + } + }else if (prcType === '5') { + if (path === '/xmpgStep4') { + extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); + } + }else if (prcType === '2') { + if (path === '/bzdyStep3') { + extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); + } + }else if (prcType === '9') { + if (path === '/bzjdStep3') { + extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); + } + }else if (prcType === '6') { + if (path === '/xmpg2Step6') { + extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); + } + }else if (prcType === '10') { + if (path === '/xmqdqrStep2') { + extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); + } + }else if (prcType === '8') { + if (path === '/wfhxzgStep4') { + extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); + } + } + } else { + extracted3() + } + } + function extracted(routerPath) { + if (token === null || token === '') { + extractedLocalStorage(routerPath,param); + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } else { + next({path: routerPath + '?' +param}) + } + } + + function extracted3() { + if (token === null || token === '') { + extractedLocalStorage(toName,param); + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } else { + next() + } + } + function extracted2(routerPath,param2) { + if (token === null || token === '') { + extractedLocalStorage(routerPath,param2); + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } else { + next({path: routerPath + '?' + param2}) + } + } + function extracted4(routerPath,param4) { + if (token === null || token === '') { + extractedLocalStorage(routerPath,param4); + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } else { + next({path: routerPath + '?' + param4}) + } + } + }) + } + if(path === '/loginVerify'){ + if(webLoginType != null && webLoginType === 'dev'){ + if(isMobile()) { + next('/blankPage') + } else { + next('/Login') + } + }else { + next() + } + }else { + next() + } + } }) // 设置用户信息 function setUserInfo (userInfo) { - const timeStamp = new Date().getTime().toString() - const _USERINFO = JSON.parse(userInfo) - _USERINFO.userId = _USERINFO.userId || _USERINFO.usId - _USERINFO.userName = _USERINFO.userName || _USERINFO.uName - try { - localStorage.setItem('userInfo', JSON.stringify(_USERINFO)) - localStorage.setItem('userInfoModifyTime', timeStamp) - } catch (e) {} + const timeStamp = new Date().getTime().toString() + const _USERINFO = JSON.parse(userInfo) + _USERINFO.userId = _USERINFO.userId || _USERINFO.usId + _USERINFO.userName = _USERINFO.userName || _USERINFO.uName + try { + localStorage.setItem('userInfo', JSON.stringify(_USERINFO)) + localStorage.setItem('userInfoModifyTime', timeStamp) + } catch (e) {} } @@ -279,16 +324,16 @@ Vue.prototype.simpleUploadPath = simpleUploadPath Vue.prototype.$moment = moment // 国际化 const i18n = new VueI18n({ - locale: store.getters.getLanguage || 'cn', // 定义默认语言为中文 - messages: { - cn: require('@/assets/languages/cn'), - en: require('@/assets/languages/en') - } + locale: store.getters.getLanguage || 'cn', // 定义默认语言为中文 + messages: { + cn: require('@/assets/languages/cn'), + en: require('@/assets/languages/en') + } }) /* eslint-disable no-new */ window.vm = new Vue({ - router, - store, - i18n, - render: h => h(App) + router, + store, + i18n, + render: h => h(App) }).$mount('#app') diff --git a/src/pages/blankPage/index.vue b/src/pages/blankPage/index.vue new file mode 100644 index 000000000..cecd598ee --- /dev/null +++ b/src/pages/blankPage/index.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index a878c6ba2..e5556a532 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -182,6 +182,9 @@ window.sessionStorage.setItem('menuList', menuList); // del if (hasHomeMenu) { this.setMenu(JSON.stringify(menuList)).then(res => { + if (this.showIETips) {//判断是否IE浏览器 + alert('检测到您使用的是IE浏览器,已经和时代脱轨了!建议您更换为谷歌浏览器或火狐浏览器') + } this.$router.push('/home2') }, e => { this.$message.warning('未获取到菜单') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue index 489ce6cf1..959e597f7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue @@ -138,20 +138,20 @@ > + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index cf9ecbb40..1866f0943 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1056,6 +1056,7 @@ export default { } else { this.listForm.commentText = this.commentText this.listForm.fileName = this.fileInfoList + this.listForm.dataList = this.dataList var json = Object.assign(this.listForm, this.roleForm); this.$refs["qdfbForm"].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 7226ebb6a..04670faab 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -811,6 +811,7 @@ export default { //提交事件 handleSubmit() { 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', { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 74796a561..79cdea8a9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -234,7 +234,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail ,changeAssigneeNew} from "api/process"; +import { changeAssigneeNew, inboundLiaisonDetail } from "api/process"; export default { name: "bzqdfbStep4", @@ -489,8 +489,9 @@ export default { }, //提交事件 handleSubmit() { - this.isSubmit = true - this.listForm.commentText = this.commentText; + 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, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 82dc0dcc3..54a4aa84e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -95,8 +95,8 @@
- - + +
+ prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center">
- - + +
+ prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> { this.histortData = res + console.log(res); }, e => { }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 285a5407a..0fc1b12b8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -199,7 +199,7 @@ sortable="custom" align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> 基础信息 -
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 5d4d4594d..6c6776c5b 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -28,7 +28,7 @@ border ref="multipleTable" @selection-change="handleSelectionMore" - height="49%" + height="80%" style="width: 100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 6d13ad4df..3663c097b 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -13,76 +13,10 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue index 09501d5fc..69084efee 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue @@ -13,76 +13,10 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 6c902ccab..3264cfc95 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -16,7 +16,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index ec24a8ff7..c07086c46 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -503,7 +503,7 @@ export default { }, //驳回事件 beforeBack() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { + if (!this.commentText) { this.$message.warning("请填写审批意见"); } else { this.listForm.bzFlag = "2"; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index eceacd7cd..1a973f96c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -503,7 +503,7 @@ export default { }, //驳回事件 beforeBack() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { + if (!this.commentText ) { this.$message.warning("请填写审批意见"); } else { this.listForm.dlFlag = "2"; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index b7086caf7..943cd51c7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -501,7 +501,7 @@ export default { }, //驳回事件 beforeBack() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + if(!this.commentText){ this.$message.warning('请填写审批意见') }else{ this.listForm.jgFlag = "2"; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index 40af6729e..ff6f995eb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -503,7 +503,7 @@ export default { }, //驳回事件 beforeBack() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { + if (!this.commentText) { this.$message.warning("请填写审批意见"); } else { this.listForm.gcFlag = "2"; diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 8503a7890..2a698bdbd 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -5,64 +5,64 @@

标准法规政策相关流程

- -
-
-
- -
-
-
标准入库流程
-
-
+ +
+
+
+ +
+
+
标准入库流程
+
- +
+
- -
-
-
- -
-
-
标准调研流程
-
-
+ +
+
+
+ +
+
+
标准调研流程
+
- +
+
- -
-
-
- -
-
-
标准征求意见流程
-
-
+ +
+
+
+ +
+
+
标准征求意见流程
+
- +
+
- -
-
-
- -
-
-
标准清单发布/更新流程
-
-
+ +
+
+
+ +
+
+
标准清单发布/更新流程
+
- +
+
@@ -125,7 +125,7 @@
- +
@@ -140,7 +140,7 @@
- +
@@ -155,7 +155,7 @@
- +
@@ -190,7 +190,7 @@

企业标准相关流程

- +
@@ -205,7 +205,7 @@
- +
@@ -220,7 +220,7 @@
- +
@@ -235,7 +235,7 @@
- +
@@ -256,7 +256,7 @@

标准化活动相关流程

- +
@@ -271,7 +271,7 @@
- +
@@ -301,7 +301,7 @@
- +
@@ -316,7 +316,7 @@
- +
@@ -331,7 +331,7 @@
- +
@@ -346,14 +346,14 @@
- -
+ +
-
参与外部标准制修订信息提报流程
+
加入标准化协会信息提报流程
@@ -363,118 +363,118 @@
-
+
diff --git a/src/pages/processCenter/pages/phone/bzdy/step7.vue b/src/pages/processCenter/pages/phone/bzdy/step7.vue index 622d08ba1..4c8e29e1b 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step7.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step7.vue @@ -112,68 +112,7 @@
- - - - - - - - - - - - - - - - - - +
- - - - - - - - - - - - - - - - - - +
- - - - - - - - - - - - - - - - - - +
- - - - - - - - - - - - - - - - - - +
- - - - - - - - - - - - - - - - - - +
- - - - - - - - - - - - - - - - - - +
+
+ +
+ + + + + diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue index f6d315702..34ed8f84a 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue @@ -179,8 +179,10 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {changeAssigneeNew, completeTask, inboundLiaisonDetail, saveTaskForPub} from "@/api/process.js"; +import {Base64} from "js-base64"; +import {mapMutations} from "vuex"; export default { - name: "phoneWfhxStep3", + name: "phoneWfhxzgStep3", data() { return { passInfo: 0, @@ -241,6 +243,7 @@ export default { } }, methods: { + ...mapMutations(['setToken', 'setUserInfo', 'resetTime', 'rememberPwd', 'setJESSCookie']), processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue index c2f2fbd80..bb2853221 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -177,7 +177,7 @@ import ProcessTitle from '../../components/ProcessTitle' import {inboundLiaisonDetail, changeAssigneeNew} from "@/api/process"; export default { - name: "phoneWfhxStep5", + name: "phoneWfhxzgStep5", data() { return { drawerTitle: '', diff --git a/src/pages/processCenter/pages/phone/xmpg2/step10.vue b/src/pages/processCenter/pages/phone/xmpg2/step10.vue new file mode 100644 index 000000000..d432ec902 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step10.vue @@ -0,0 +1,595 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg2/step11.vue b/src/pages/processCenter/pages/phone/xmpg2/step11.vue new file mode 100644 index 000000000..44cd9f7d0 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step11.vue @@ -0,0 +1,571 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg2/step12.vue b/src/pages/processCenter/pages/phone/xmpg2/step12.vue new file mode 100644 index 000000000..51ec62dcf --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step12.vue @@ -0,0 +1,595 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg2/step7.vue b/src/pages/processCenter/pages/phone/xmpg2/step7.vue index ed65b1c7b..4b145a6bd 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step7.vue @@ -174,6 +174,7 @@ label="责任人"> + 加载更多...
@@ -282,6 +283,8 @@ export default { }, data() { return { + tableIndex: 0, + itemLists: [], foldFormFlag: false, total: 0, currentPage: 1, @@ -314,6 +317,16 @@ export default { }; }, methods: { + tableLoading () { + this.tableIndex++ + let index = this.tableIndex * 20 + let endIndex = index + 20 + if (this.tableIndex * 20 > this.itemLists.length) { + this.$message.warning('没有更多了') + } + let newData = this.itemLists.slice(index, endIndex) + this.itemList = this.itemList.concat(newData) + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag diff --git a/src/pages/processCenter/pages/phone/xmpg2/step8.vue b/src/pages/processCenter/pages/phone/xmpg2/step8.vue new file mode 100644 index 000000000..23749e457 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step8.vue @@ -0,0 +1,595 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg2/step9.vue b/src/pages/processCenter/pages/phone/xmpg2/step9.vue new file mode 100644 index 000000000..02ce9a886 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step9.vue @@ -0,0 +1,595 @@ + + + + + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 79b6974d5..117aa3e11 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -298,7 +298,7 @@ align="center" label="标准号"> -