diff --git a/src/App.vue b/src/App.vue index 2f9429400..947dc7879 100644 --- a/src/App.vue +++ b/src/App.vue @@ -238,7 +238,7 @@ 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.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/mechanismTree/index.vue b/src/components/mechanismTree/index.vue index a134dbbdd..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 b5ee61ce1..e5f91a8f5 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -111,27 +111,55 @@ path: '/domesticStandardsAndRegulations', menuId: '3e3657498664beaa0dc1de1ecb3ae0da' }, - // { - // title: '零部件编号申请', - // path: '/partCodeApply', - // menuId: 'ad9db496772c075f78495382b7581fe9' - // }, - { - title: '工作组数据统计', - path: '/dataStatisComments', - menuId: '' - }, { title: '海外法规', path: '/foreignStandardsAndRegulations', menuId: '18c1e5134ea0cf865e8960b26b81fd8c' }, + { + title: '企业标准', + path: '/enterpriseStandardDatabase', + menuId: '01ed8f752748227777b3572d56ee9ab5' + }, + { + title: '企标计划', + path: '/enterpriseStandardPlan', + // menuId: '8a9c87fe06244fb9d55e78fb281f625b' + }, + { + title: '法规清单', + path: '/accessStandardsAndRegulations', + menuId: '08dbd417864b08426034ca56d1fa3d02' + }, + { + title: '未符合项', + path: '/nonConfomity', + menuId: '0119abd677e0204e061eb0f0b8cafda0' + }, + { + title: '工作组', + path: '/workingGroup', + }, { title: '征求意见', path: '/standardForComments', menuId: '2b25c67f10abbbadf37d60daaaec54d3' }, - + { + title: '合规评估', // 把 标准涉及项目 这几个字 改成 标准合规评估结果 + path: '/standInvolveProject', + menuId: '8a9c87fe06244fb9d55e78fb281f625b' + }, + // { + // title: '零部件编号申请', + // path: '/partCodeApply', + // menuId: 'ad9db496772c075f78495382b7581fe9' + // }, + // { + // title: '工作组统计', + // path: '/dataStatisComments', + // menuId: '' + // }, { title: '国内外政策', path: '/foreignRegulationsDatabase', @@ -141,11 +169,6 @@ // // // title: '标准制修订管理', // // // path: '/demo2One' // // // }, - { - title: '法规清单', - path: '/accessStandardsAndRegulations', - menuId: '08dbd417864b08426034ca56d1fa3d02' - }, // // { // // title: '标准法规清单详情', // // path: '/details' @@ -158,11 +181,6 @@ // // // title: '本地产品/项目库', // // // path: '/localProductsOrProjectLibrary' // // // }, - { - title: '企业标准', - path: '/enterpriseStandardDatabase', - menuId: '01ed8f752748227777b3572d56ee9ab5' - }, // { // title: '企标制修订计划', // path: '/enterBSysRevPlanManaLib', @@ -177,30 +195,11 @@ path: '/localProductsOrProjectLibrary', menuId: '42ce39c9f953be65a3e5643a4a2c786f' },*/ - { - title: '未符合项', - path: '/nonConfomity', - menuId: '0119abd677e0204e061eb0f0b8cafda0' - }, - { - title: '工作组', - path: '/workingGroup', - }, // { // title: '备案产品标准库', // path: '/enterpriseStandardFiling', // menuId: 'MQBAGJQMSRZDRX3X5AVR' // }, - { - title: '合规评估', // 把 标准涉及项目 这几个字 改成 标准合规评估结果 - path: '/standInvolveProject', - menuId: '8a9c87fe06244fb9d55e78fb281f625b' - }, - { - title: '企标制修订计划', - path: '/enterpriseStandardPlan', - // menuId: '8a9c87fe06244fb9d55e78fb281f625b' - } // { // title: '动态信息', // path: '/information', diff --git a/src/main.js b/src/main.js index 5b6945484..b0d77af88 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,249 @@ 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) - } - // 返回值为登录状态 - 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) - } - - function extractedVerify() { + function extractedLocalStorage(url,param,param4) { + localStorage.removeItem("routerUrl") + localStorage.setItem('routerUrl', url) + localStorage.removeItem("routerParam") + localStorage.setItem('routerParam', param) + } + // 返回值为登录状态 + if ((token === null || token === '' ) && toName !== 'Login') { + if(webLoginType != null && webLoginType === 'idm' ){ + if(code){ + next() + }else { 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() - } + extractedVerify(token) }else { - next() + if(path === '/standardSearch/All'){ + extractedLocalStorage('standardSearch/All',''); + }else { + extractedLocalStorage('home2',''); + } + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev } + } + }else if(webLoginType != null && webLoginType === 'dev'){ + if (isMobile()) { + extractedVerify(token) + } else { + 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 { + /** 判断是不是在手机端操作 */ + if (isMobile()) { + if (token === null || token === '') { + sessionStorage.setItem('param',JSON.stringify(param4)) + next('/phoneIndex') + } else { + let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + + '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType + if (toName.slice(0,5) !== 'phone') { + let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) + next({path: phoneRouter + '?' + paramPhone}) + } + } + } else { + extracted3() + } + // 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'){ + 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 +319,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/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">
-
+
-
+
-
+
-
+
-
+
- - + +
+ 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 => { }) }, @@ -703,9 +704,9 @@ } else { this.form.fjListId = data.fjListId || data.form.fjListId } - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime this.todoId = res.id diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 24ba96755..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"> { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index 9bbcc251c..6c63ea815 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -191,7 +191,7 @@ sortable="custom" align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index b89f1b7f6..f9354d5d8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -206,20 +206,20 @@ > + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 4d0bb709f..419c16d1a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -206,20 +206,20 @@ > + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index d8ebf13aa..99f2e49b5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -206,20 +206,20 @@ > + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 188fd08a2..e989b043f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -206,20 +206,20 @@ > + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> { }); diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue index 13a80e735..6d988ab50 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue @@ -37,12 +37,19 @@ placeholder="请输入标准编号" clearable> + 手动查找
@@ -81,23 +88,18 @@ clearable> - -
- - - - -
+ + +
@@ -257,6 +259,134 @@ 流程列表加载中
+ + +
+
+
+
+ + + + + + + + + + + + + 查询 + + + + 清空 + + + +
+ + + + + + + + + + + + + + + + + +
+ +
+
+
+ 取消 + 添加 +
+ 1){ + this.$message.warning('您只能选择一条标准进行添加') + }else{ + this.wbbzform.standName = this.standList[0].standName || this.standList[0].standEnName + this.wbbzform.standType = this.standList[0].standSort + this.wbbzform.standNumber = this.standList[0].standSort + '\xa0\xa0 '+ this.standList[0].standNumber + this.standModel = false + } + + }, + //添加标准取消事件 + cancelStand() { + this.standModel = false; + }, + typeChange(type) { + this.standardSearch.standType = type; + }, + clearStandSearch() { + this.standardSearch = { + standType: "", + standNumber: "" + }; + this.getStandData(); + }, + getStandDataBtn(){ + this.pageNo =1; + this.getStandData(); + }, + //查询项目下的标准 + getStandData() { + this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", { + standType: this.standardSearch.standType, + standNumber: this.standardSearch.standNumber, + page: this.pageNo, + pageSize: this.pageSizeNo + }, { + _this: this + }, res => { + this.standardData = res.data.list; + this.standardData.forEach(item => { + this.$set(item, "ZCCSSRQ", item.zccssrq); + this.$set(item, "XCXSSRQ", item.xcxssrq); + }) + this.totalNo = res.data.count; + }, e => { + }); + }, + // 点击查看 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }, + //添加标准select的改变 + selectThree(data) { + this.standList = data; + }, + pageChangeNo(page) { + this.pageNo = page; + this.getStandData(); + }, + pageSizeChangeNo(pageSize) { + this.pageSizeNo = this.$store.getters.userInfo.configContent; + this.getStandData(); + + }, handleSave() { }, //不备案 @@ -520,6 +772,9 @@ export default { background: #E6A23C; } } - + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue index eb2c12a78..edfd581ec 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue @@ -33,37 +33,37 @@
- + + v-for="item in comityOptionsOne" + :key="item.id" + :label="item.name" + :value="item.id"> - + + v-for="item in comityOptionsTwo" + :key="item.id" + :label="item.name" + :value="item.id"> - + + v-for="item in comityOptionsOneThree" + :key="item.id" + :label="item.name" + :value="item.id">
- +
@@ -122,7 +122,7 @@ @@ -350,6 +370,9 @@ components: {}, data() { return { + modalshowflagZRBM: false, + nodeListZRBM: [], + QCDWmodal: false, QCDWValue: [], QCDWList: [], @@ -367,6 +390,7 @@ ids: [], addForm: { unit: '', // 单位 + unitName: '', esName: '', // 企标名称 planStatus: '', // 计划状态 reviseStatus: '', // 制修订状态 @@ -425,6 +449,31 @@ props: {}, watch: {}, methods: { + drawerCheckZRBM (data) { + let list = '' + let listName = '' + for (let a = 0; a < data.length; a++) { + if (list.length > 0) { + list += ',' + list += data[a].id + listName += ',' + listName += data[a].name + } else { + list = data[a].id + listName = data[a].name + } + } + this.addForm.unit = list + this.addForm.unitName = listName + this.modalshowflagZRBM = false + }, + choiceZRBM(id) { + this.nodeListZRBM = [] + if (id) { + this.nodeListZRBM = id.split(',') + } + this.modalshowflagZRBM = true + }, QCDWOK () { let arr1 = [] if (this.addForm.unit) { @@ -592,6 +641,7 @@ this.DrawerType = 'edit' this.addDrawer = true this.addForm = { + unitName:command[0].unitName, id: command[0].id, unit: command[0].unit, // 单位 esName: command[0].esName, // 企标名称 diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 92997a4c2..e6425ad9a 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -465,7 +465,7 @@ @@ -497,7 +497,10 @@ @@ -566,7 +569,10 @@ @@ -575,7 +581,10 @@ @@ -587,7 +596,10 @@ @@ -641,15 +653,15 @@ - + - + @@ -718,10 +730,10 @@ - - - + + + + + 工作组统计