diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 958c1cd4b..9afac44ff 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -4,13 +4,13 @@
-
+
- - - + + +
@@ -36,81 +36,113 @@ - - - - - - - - - - + + + + + + - + + v-model="dynamic.startIssueTime" + type="date" + size="mini" + :picker-options="pickerBeginDateBefore" + format="yyyy-MM-dd" + placeholder="选择开始时间"> + + + + + v-model="dynamic.startXCXSSRQ" + type="date" + size="mini" + :picker-options="XCXSSRQDateBefore" + format="yyyy-MM-dd" + placeholder="选择开始时间"> + + + + + + + + + + + + + + + + + v-model="dynamic.startZCCSSRQ" + type="date" + size="mini" + :picker-options="ZCCSSRQDateBefore" + format="yyyy-MM-dd" + placeholder="选择开始时间"> + + + + + style="margin: 6px 8px 0 0" + type="primary" + size="mini" + @click="searchBtnClick" + class="common-button-primary"> 查询 + style="margin: 6px 0 0 0" + size="mini" + @click="clearBtnClick" + class="common-button-primary"> 清空 @@ -121,21 +153,21 @@ 导出Excel
- + + type="selection" + width="55" + align="center"> diff --git a/src/router/index.js b/src/router/index.js index 2be48c1b8..1aa31497d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2146,6 +2146,26 @@ const routes = [ title: '企标制修订计划管控流程' } }, + // 企标制修订立项计划流程 + { + path: '/qbzxdlxStep1', + name: 'qbzxdlxStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue'), + meta: { + requireAuth: true, + title: '企标制修订立项计划流程(流程发起)' + } + }, + { + path: '/qbzxdlxStep2', + name: 'qbzxdlxStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue'), + meta: { + requireAuth: true, + title: '企标制修订立项计划流程(责任人确认)' + } + }, + // 外部标准化协会入会流程 { path: '/bzrhStep1', @@ -3753,7 +3773,7 @@ const routes = [ // 详情页 // ************************** 其他详情页 ******************************* // { - path: '/consultationDetails/:id/:pageType', + path: '/consultationDetails/:id?/:pageType?', name: 'consultationDetails', component: () => import('@/pages/regulatoryRepository/standardForComments/pags/consultationDetails'), diff --git a/src/store/getters/index.js b/src/store/getters/index.js index 1d90d8ad3..fbf6e9278 100644 --- a/src/store/getters/index.js +++ b/src/store/getters/index.js @@ -179,5 +179,8 @@ export default { } else { return JSON.parse(state.accessStandRegRows) } + }, + refreshFlag: state => { + return state.refreshFlag } } diff --git a/src/store/mutations/index.js b/src/store/mutations/index.js index e326e7cee..3503672c8 100644 --- a/src/store/mutations/index.js +++ b/src/store/mutations/index.js @@ -296,5 +296,11 @@ export default { state.accessStandRegTabName = '' sessionStorage.removeItem('accessStandRegTabName') } + }, + SET_REFRESH_FLAG(state, flag) { + state.refreshFlag = flag + try { + localStorage.setItem('refreshFlag', flag) + } catch (e) {} } } diff --git a/src/store/state/index.js b/src/store/state/index.js index 3b3f7571f..b4ee9092f 100644 --- a/src/store/state/index.js +++ b/src/store/state/index.js @@ -33,6 +33,7 @@ let proLastDetail = '' // 流程结果详情 let rukuBaseInfo = '' // 入库流程基础表单信息(后几步展示用) let accessStandRegRows = '' // 标准法规清单编辑 let accessStandRegTabName = '' // 标准法规清单页面当前页签 +let refreshFlag = '' // 监听其他页面刷新 try { if (localStorage.theme) { defaultTheme = localStorage.theme } if (localStorage.token) { defaultToken = localStorage.token } @@ -65,6 +66,7 @@ try { if (sessionStorage.rukuBaseInfo) { rukuBaseInfo = sessionStorage.rukuBaseInfo } if (sessionStorage.accessStandRegRows) { accessStandRegRows = sessionStorage.accessStandRegRows } if (sessionStorage.accessStandRegTabName) { accessStandRegTabName = sessionStorage.accessStandRegTabName } + if (sessionStorage.refreshFlag) { refreshFlag = localStorage.refreshFlag } } catch (e) {} export default { theme: defaultTheme, // 主题 @@ -99,5 +101,6 @@ export default { proLastDetail, rukuBaseInfo, accessStandRegRows, - accessStandRegTabName + accessStandRegTabName, + refreshFlag } diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 23276ef5e..16614fc66 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,9 +6,9 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -const devIp = '192.168.10.6' -// const devIp = '62.234.136.153' -const devInterfacePORT = '9999' +// const devIp = '192.168.10.6' +const devIp = '62.234.136.153' +const devInterfacePORT = '8033' // const devIp = '10.19.11.243' // const devInterfacePORT = '4304' // 配置 idm 认证