diff --git a/src/components/index.js b/src/components/index.js index cb817aa18..099c29b90 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -27,6 +27,7 @@ import SQTree from './SQTree' import OrgTable from './OrgTable' import MySelect from './mySelect' import PhoneHistortTable from './phoneHistortTable' +import processNodeInformation from './processNodeInformation' import phoneRole from './phoneRole' @@ -57,6 +58,7 @@ const install = function (Vue) { Vue.component('MySelect', MySelect) Vue.component('phoneRole', phoneRole) Vue.component('PhoneHistortTable', PhoneHistortTable) + Vue.component('processNodeInformation', processNodeInformation) } export default { diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 5a1bf6d34..082a29876 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -40,7 +40,7 @@ v-for="(children, childrenIndex) in item.children" :key="childrenIndex" :index="children.path" - style="text-align: center;" + style="padding-right: 15px; padding-left: 30px;font-size: 14px" v-if="!children.menuId || $hasPermission(children.menuId)"itemSplitInfo > @@ -52,6 +52,9 @@ {{ children.title }} + +
{{children.title}}
+
{{ children.title }}
@@ -81,6 +84,7 @@ name: 'NavMenu', data () { return { + standardTranslation: 0, defaultActive: null, // 当前激活菜单的 index navMenuList: [ // { @@ -161,6 +165,11 @@ path: '/standQA', menuId: '2621269642ea4c6c8c42905863b2dc09' }, + { + title: '标准/译文获取申请管理', + path: '/standardTranslationAcquisitionRequest', + menuId: 'd7ad73e98162894d020aa993c08a4532' + }, // { // title: '零部件编号申请', // path: '/partCodeApply', @@ -550,6 +559,11 @@ } }, mounted () { + this.$http.get('/lawss/standardApplyFor/queryPendingApprovalCount', '', { _this: this }, res => { + if (res.ok) { + this.$store.commit('SET_STANDARD_TRANSLATION_TODO', res.data.pendingApprovalCount) + } + }) }, methods: { handleSelect (key, keyPath) { @@ -573,7 +587,7 @@ // return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo5.png') return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png') }, - ...mapGetters(['getDynamicTotal', 'isCollapse']) + ...mapGetters(['getDynamicTotal', 'isCollapse', 'getStandardTranslationTodo']) }, watch: { // 监听路由 重新渲染面包屑 @@ -606,6 +620,7 @@ width: 58px; height: 100%; overflow-y: auto; + overflow-x: hidden; user-select: none; box-sizing: border-box; position: absolute; @@ -785,7 +800,7 @@ } } .el-menu-item { - padding-left: 0 !important; + //padding-left: 0 !important; font-size: 16px; font-weight: normal; height: 40px; @@ -812,5 +827,10 @@ } } } - + .miniBadge{ + /deep/ .is-dot{ + left: -18px; + top: 14px; + } + } diff --git a/src/components/processNodeInformation/index.vue b/src/components/processNodeInformation/index.vue new file mode 100644 index 000000000..9ae507fb3 --- /dev/null +++ b/src/components/processNodeInformation/index.vue @@ -0,0 +1,608 @@ + + + + + diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index bfa696419..46894effb 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -917,6 +917,7 @@ export default { res.data.forEach(item => { if (item.id && item.id == 'asdfadf') { item.disabled = true; + this.nodeList.push(item.id) // if (item.childNodes && item.childNodes.length !== 0) { // this.addAttr(item.childNodes); // } diff --git a/src/pages/config/pages/standLawsAttrManage/index.vue b/src/pages/config/pages/standLawsAttrManage/index.vue index c6fdf27a4..d39f74488 100644 --- a/src/pages/config/pages/standLawsAttrManage/index.vue +++ b/src/pages/config/pages/standLawsAttrManage/index.vue @@ -390,12 +390,13 @@ export default { }, goNuwPage (item) { this.$store.commit('setDetailMap', this.$route.path) + console.log(item); const params = { id: item.id, dictionaryName: item.dictionaryName, dictionType: item.dictionType, isRelate: item.isRelate, - relateDicId: item.relateDicId + relateDicId: item.relateDicId || '1' } if(item.dictionType && item.dictionType === 'TREE'){ this.$router.push({ @@ -408,7 +409,6 @@ export default { params: params }) } - }, handleSelectone (data) { this.selectedList = [] diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 31dfe68d3..593c2a88f 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -188,6 +188,16 @@ export default { } break case 'buss1': + let oldAndNewBuss = '' + const currentDateBuss = new Date('2024-04-01 00:00:00').getTime(); + const dateBuss = new Date(row.creatTime); + const timestampBuss = dateBuss.getTime(); + if (currentDateBuss > timestampBuss){ + oldAndNewBuss = 'old' + }else{ + oldAndNewBuss = 'new' + } + query.oldAndNew = oldAndNewBuss if (row.taskInfo === '企标编写') { name = 'bussLibrary2' }else if (row.taskInfo === '企标编写汇总'){ @@ -219,6 +229,7 @@ export default { }else if (row.taskInfo === '发布'){ name = 'bussLibrary13' } + break case 'buss2': name = 'bussLibraryProduct' @@ -317,6 +328,16 @@ export default { } break; case '3': + let oldAndNewBuss1 = '' + const currentDateBuss1 = new Date('2024-04-01 00:00:00').getTime(); + const dateBuss1 = new Date(row.creatTime); + const timestampBuss1 = dateBuss1.getTime(); + if (currentDateBuss1 > timestampBuss1){ + oldAndNewBuss1 = 'old' + }else{ + oldAndNewBuss1 = 'new' + } + query.oldAndNew = oldAndNewBuss1 if (row.taskInfo === '任务分发') { name = 'bzzqyjStep2' } else if (row.taskInfo === '意见反馈'){ diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 7a474897d..ef5438a2e 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -1692,6 +1692,7 @@ export default { this.isSubmit = false if (res.ok) { this.modalItemaddShowflag = false + this.selectMenu() // this.showItemRequestDetails() // let content = res.data.itermsConditions // $('#itemContentHtml').html(content) diff --git a/src/pages/localTool/standContrast/pages/seeDatalis.vue b/src/pages/localTool/standContrast/pages/seeDatalis.vue index 7c78db14e..b0bee096b 100644 --- a/src/pages/localTool/standContrast/pages/seeDatalis.vue +++ b/src/pages/localTool/standContrast/pages/seeDatalis.vue @@ -60,12 +60,15 @@ :label="$t('m.action')" width="280px" align="center"> + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index eea930efe..d4c51d96e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -170,61 +170,67 @@ -
- - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ this.histortData = res + this.loading = false }, e => {}) }, upload(row, title) { @@ -380,7 +389,7 @@ export default { } }, mounted () { - this.getHistoryData() + // this.getHistoryData() this.getData() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 29595f68f..f872f08d0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -115,67 +115,73 @@
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ this.histortData = res; + this.loading = false }, e => { }); }, @@ -428,7 +437,7 @@ export default { } }, mounted() { - this.getHistoryData(); + // this.getHistoryData(); this.getData(); } }; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index ddda7b3b8..fa0d445ba 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -195,67 +195,72 @@
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-->
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-->
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-->
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ if(ev.key === 'freshClueNum'){ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue index 520704048..146dad5cf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue @@ -216,68 +216,74 @@
-
- - - +
+ + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ this.histortData = res; + this.loading = false }, e => { }); }, @@ -758,7 +767,7 @@ export default { } }, mounted() { - this.getHistoryData(); + // this.getHistoryData(); this.getData(); } }; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 354d2fab1..6da501993 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -211,67 +211,72 @@
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-->
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-->
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-->
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-->
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
-
- {{ item.name }} - - - +
+
+ {{ item.name }} + + + + + + +
-
+ +
+
+ {{ item.name }} + + + +
+
+
import { mapGetters } from 'vuex' import ProcessTitle from '../../../components/ProcessTitle' +import { onlyOfficeUrl } from '@/sysConfig' export default { name: 'FormEditList', @@ -1023,6 +1042,20 @@ export default { } }, methods: { + viewOnlyOffice (item) { + const key = new Date().getTime() + let oldFileName = item.name + let index1 = oldFileName.lastIndexOf('.') + let fileSuffix = oldFileName.substring(index1+1, oldFileName.length) + fileSuffix = fileSuffix.toLowerCase() + oldFileName = oldFileName.substring(0, index1) + if (fileSuffix == 'pdf' || fileSuffix == 'doc' || fileSuffix == 'docx'){ + window.open(onlyOfficeUrl + '/viewHistoryOnlyOffice?oldFileName=' + oldFileName + '&fileType=' + fileSuffix + + '&attId=' + item.id + '&key=' + key + '&userName=' + this.$store.getters.userInfo.uName) + }else{ + this.$message.warning('此文件不支持onlyoffice预览') + } + }, filterOp (data) { if (!data) { return '' diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index 3b0979e14..cda58121f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -229,14 +229,25 @@ clearable />
-
+
{{ item.name }} + + +
+
+
+ {{ item.name }} + + + +
+
import { mapGetters } from 'vuex' +import { onlyOfficeUrl } from '@/sysConfig' import ProcessTitle from '../../../components/ProcessTitle' import CurrentOrder from '@/pages/processCenter/pages/components/CurrentOrder'; @@ -999,6 +1011,20 @@ export default { } }, methods: { + viewOnlyOffice (item) { + const key = new Date().getTime() + let oldFileName = item.name + let index1 = oldFileName.lastIndexOf('.') + let fileSuffix = oldFileName.substring(index1+1, oldFileName.length) + fileSuffix = fileSuffix.toLowerCase() + oldFileName = oldFileName.substring(0, index1) + if (fileSuffix == 'pdf' || fileSuffix == 'doc' || fileSuffix == 'docx'){ + window.open(onlyOfficeUrl + '/viewHistoryOnlyOffice?oldFileName=' + oldFileName + '&fileType=' + fileSuffix + + '&attId=' + item.id + '&key=' + key + '&userName=' + this.$store.getters.userInfo.uName) + }else{ + this.$message.warning('此文件不支持onlyoffice预览') + } + }, queryOrder () { this.$refs.CurrentOrderRef.open(this.form.standSort, this.form.standNum) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index 788441b95..63461c99a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -173,17 +173,36 @@ -
- {{ item.name }} - - - +
+
+ {{ item.name }} + + + + + + +
+
+
+
+ {{ item.name }} + + + +
@@ -597,6 +616,7 @@ diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index a7adeaa6c..51fe0c51b 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -239,11 +239,23 @@ export default { this.queryProcess() }, dealWith (row) { // 查看 + let oldAndNew = '' + const currentDate = new Date('2024-04-01 00:00:00').getTime(); + const date = new Date(row.creatTime); + const timestamp = date.getTime(); + if (currentDate > timestamp){ + oldAndNew = 'old' + }else{ + oldAndNew = 'new' + } const routeUrl = this.$router.resolve({ name: 'ProcessDetail', query: { prcNum: row.prcNum, - tabsName: 'AlreadyProcess' + tabsName: 'AlreadyProcess', + actiProcInstId: row.prcId, + flowType: row.prcType, + oldAndNew:oldAndNew, } }) window.open(routeUrl.href, '_blank'); diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index 7d79ec453..d8e0f7794 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -269,11 +269,23 @@ export default { this.queryProcess() }, dealWith (row) { // 查看 + let oldAndNew = '' + const currentDate = new Date('2024-04-01 00:00:00').getTime(); + const date = new Date(row.creatTime); + const timestamp = date.getTime(); + if (currentDate > timestamp){ + oldAndNew = 'old' + }else{ + oldAndNew = 'new' + } const routeUrl = this.$router.resolve({ name: 'ProcessDetail', query: { prcNum: row.prcNum, - tabsName: 'AlreadySend' + tabsName: 'AlreadySend', + actiProcInstId: row.prcId, + flowType: row.prcType, + oldAndNew:oldAndNew, } }) window.open(routeUrl.href, '_blank'); diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue index aabdfe5a8..9c4a2b95f 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue @@ -242,12 +242,24 @@ export default { this.queryProcess() }, dealWith (row) { // 查看 + let oldAndNew = '' + const currentDate = new Date('2024-04-01 00:00:00').getTime(); + const date = new Date(row.creatTime); + const timestamp = date.getTime(); + if (currentDate > timestamp){ + oldAndNew = 'old' + }else{ + oldAndNew = 'new' + } const routeUrl = this.$router.resolve({ name: 'ProcessDetail', query: { bpnId: row.id, prcNum: row.prcNum, - tabsName: 'MonitorProcess' + tabsName: 'MonitorProcess', + actiProcInstId: row.prcId, + flowType: row.prcType, + oldAndNew:oldAndNew, } }) window.open(routeUrl.href, '_blank'); diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 836fb7452..b0063bd9f 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -156,7 +156,7 @@ 办理 - 转办 + 转办
@@ -348,6 +348,15 @@ export default { } break case 'buss1': + let oldAndNewBuss = '' + const currentDateBuss = new Date('2024-04-01 00:00:00').getTime(); + const dateBuss = new Date(row.creatTime); + const timestampBuss = dateBuss.getTime(); + if (currentDateBuss > timestampBuss){ + oldAndNewBuss = 'old' + }else{ + oldAndNewBuss = 'new' + } if (row.taskInfo === '企标编写') { routeUrl = this.$router.resolve({ name: 'bussLibrary2', @@ -356,7 +365,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '企标编写汇总') { @@ -367,7 +377,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '重新起草') { @@ -378,7 +389,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '标准化初审') { @@ -389,7 +401,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '重新企标编写汇总') { @@ -400,7 +413,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '征求意见') { @@ -411,7 +425,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '技术委员会评审、评审意见修改') { @@ -422,7 +437,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '标准化复审') { @@ -433,7 +449,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '重新技术委员会评审、评审意见修改') { @@ -444,7 +461,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '起草单位高级经理审核') { @@ -455,7 +473,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '标准法规部高级经理审核') { @@ -466,7 +485,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '审定') { @@ -477,7 +497,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '批准') { @@ -488,7 +509,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '主起草人培训') { @@ -499,7 +521,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '发布') { @@ -510,7 +533,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) } @@ -937,6 +961,15 @@ export default { } break; case '3': + let oldAndNew = '' + const currentDate = new Date('2024-04-01 00:00:00').getTime(); + const date = new Date(row.creatTime); + const timestamp = date.getTime(); + if (currentDate > timestamp){ + oldAndNew = 'old' + }else{ + oldAndNew = 'new' + } if (row.taskInfo === '任务分发') { routeUrl = this.$router.resolve({ name: 'bzzqyjStep2', @@ -945,7 +978,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '意见反馈') { @@ -956,7 +990,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '意见汇总报批') { @@ -967,7 +1002,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '意见审批') { @@ -978,7 +1014,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '管理员') { @@ -989,7 +1026,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '意见处理') { @@ -1000,7 +1038,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '会签') { @@ -1011,7 +1050,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '审核') { @@ -1022,7 +1062,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '审定' ) { @@ -1033,7 +1074,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '批准') { @@ -1044,7 +1086,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue new file mode 100644 index 000000000..f2a274dc4 --- /dev/null +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue @@ -0,0 +1,269 @@ + + + + + diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue new file mode 100644 index 000000000..06d4257ea --- /dev/null +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/exportDialog.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/exportDialog.vue new file mode 100644 index 000000000..c96204a9a --- /dev/null +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/exportDialog.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue new file mode 100644 index 000000000..1740c9f4e --- /dev/null +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue new file mode 100644 index 000000000..26a6b2abc --- /dev/null +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -0,0 +1,642 @@ + + + + + diff --git a/src/pages/searchCenter/pages/standardSearch/index.vue b/src/pages/searchCenter/pages/standardSearch/index.vue index 8015bb824..5b3136625 100644 --- a/src/pages/searchCenter/pages/standardSearch/index.vue +++ b/src/pages/searchCenter/pages/standardSearch/index.vue @@ -81,6 +81,7 @@
首页
+ 标准/译文获取申请
数据获取中 @@ -236,6 +237,15 @@ export default { this.getData() }, methods: { + toStandardTranslationAcquisitionRequest () { + let url = this.$router.resolve({ + name: 'standardTranslationAcquisitionRequest', + query: { + tag: 'fromSearchCenter' + } + }) + window.open(url.href, '_blank') + }, onSearch () { this.searchForm.page = 1 this.getData() diff --git a/src/router/index.js b/src/router/index.js index aa3b41ed3..1b93375e5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4112,6 +4112,16 @@ const routes = [ menuId: '' } }, + { + path: '/standardTranslationAcquisitionRequest', + name: 'standardTranslationAcquisitionRequest', + component: () => import('@/pages/regulatoryRepository/standardTranslationAcquisitionRequest'), + meta: { + requireAuth: true, + title: '标准/译文获取申请管理', + menuId: 'd7ad73e98162894d020aa993c08a4532' + } + }, // 本地产品/项目库详情页 { path: '/localProductDetail', diff --git a/src/store/getters/index.js b/src/store/getters/index.js index fbf6e9278..4c15374ea 100644 --- a/src/store/getters/index.js +++ b/src/store/getters/index.js @@ -182,5 +182,8 @@ export default { }, refreshFlag: state => { return state.refreshFlag + }, + getStandardTranslationTodo: state => { + return state.standardTranslationTodo } } diff --git a/src/store/mutations/index.js b/src/store/mutations/index.js index 3503672c8..1c3201b96 100644 --- a/src/store/mutations/index.js +++ b/src/store/mutations/index.js @@ -302,5 +302,8 @@ export default { try { localStorage.setItem('refreshFlag', flag) } catch (e) {} + }, + SET_STANDARD_TRANSLATION_TODO (state, value) { + state.standardTranslationTodo = value } } diff --git a/src/store/state/index.js b/src/store/state/index.js index b4ee9092f..e27c9dfdf 100644 --- a/src/store/state/index.js +++ b/src/store/state/index.js @@ -34,6 +34,7 @@ let rukuBaseInfo = '' // 入库流程基础表单信息(后几步展示用) let accessStandRegRows = '' // 标准法规清单编辑 let accessStandRegTabName = '' // 标准法规清单页面当前页签 let refreshFlag = '' // 监听其他页面刷新 +let standardTranslationTodo = 0 // 标准/译文获取申请管理待办标记 try { if (localStorage.theme) { defaultTheme = localStorage.theme } if (localStorage.token) { defaultToken = localStorage.token } @@ -102,5 +103,6 @@ export default { rukuBaseInfo, accessStandRegRows, accessStandRegTabName, - refreshFlag + refreshFlag, + standardTranslationTodo }