diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8fd7bc99d..b8f690cc8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1883,4 +1883,5 @@ module.exports = { nearlyYear:'Nearly a Year', browsingTime:'Browsing Time', pleaseViewOnPc:'Please view on PC', + taskHandling:'Task Handling', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 719ef3f71..49ec8d011 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1984,4 +1984,5 @@ module.exports = { nearlyYear:'近一年', browsingTime:'浏览时间', pleaseViewOnPc:'请在pc的查看', + taskHandling:'任务办理', } \ No newline at end of file diff --git a/jero-web/src/views/phoneView/documentDetails.vue b/jero-web/src/views/phoneView/documentDetails.vue index 38bf80073..54f55a5da 100644 --- a/jero-web/src/views/phoneView/documentDetails.vue +++ b/jero-web/src/views/phoneView/documentDetails.vue @@ -148,7 +148,13 @@ }, methods: { iconClick() { - this.$router.go(-1) + if (this.$route.query.goRouter) { + this.$router.push({ + path: this.$route.query.goRouter + }) + } else { + this.$router.go(-1) + } }, getWdkCollectAndSubscribeInfoByUser() { getAction('/phone/search/getWdkCollectAndSubscribeInfoByUser', { id: this.$route.query.id }).then((res) => { @@ -528,6 +534,6 @@ } .header-right-text-color { - color: #01A0AC!important; + color: #01A0AC !important; } \ No newline at end of file diff --git a/jero-web/src/views/phoneView/preHomoMangement.vue b/jero-web/src/views/phoneView/preHomoMangement.vue index d84b7a3ec..1dc26f59f 100644 --- a/jero-web/src/views/phoneView/preHomoMangement.vue +++ b/jero-web/src/views/phoneView/preHomoMangement.vue @@ -51,7 +51,7 @@
{{$t('typeOfDeliverables')}} - {{queryForm.typeOfDeliverables || '--'}} + {{queryForm.deliverableTypeName || '--'}}
{{$t('deliverableTemplate')}} @@ -91,14 +91,19 @@ {{queryForm.deliveryResult}}
- +
{{$t('resultofhandling')}} - * + + *
{{$t('answer')}} -
+
{{$t('delete')}}
@@ -107,7 +109,9 @@
-
+
@@ -152,11 +156,22 @@ isDisplay: false, commentQuery: {}, sendDisplay: true, - num: 1 + num: 1, + userInfoQuery: {}, + administrators: false } }, mounted() { document.title = 'NIO GRP' + this.administrators = false + this.userInfoQuery = this.userInfo() + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } window.addEventListener('scroll', this.scrolling) window.addEventListener('mousedown', this.handleonmousedown) this.getQueryBy() @@ -179,9 +194,9 @@ }, methods: { ...mapGetters(['userInfo']), - scrolling() { - this.isDisplay = false - }, + // scrolling() { + // this.isDisplay = false + // }, handleonmousedown(e) { if (e.srcElement.type == 'textarea' || e.target.type == 'textarea') { @@ -192,7 +207,13 @@ } }, iconClick() { - this.$router.go(-1) + if (this.$route.query.goRouter) { + this.$router.push({ + path: this.$route.query.goRouter + }) + } else { + this.$router.go(-1) + } }, viewAdd() { let query = { diff --git a/jero-web/src/views/phoneView/processManagement.vue b/jero-web/src/views/phoneView/processManagement.vue index 01e726554..e9b20e386 100644 --- a/jero-web/src/views/phoneView/processManagement.vue +++ b/jero-web/src/views/phoneView/processManagement.vue @@ -103,7 +103,7 @@ - +
{{$t('resultofhandling')}} diff --git a/jero-web/src/views/phoneView/search.vue b/jero-web/src/views/phoneView/search.vue index 0cf965ecc..fd76a09c1 100644 --- a/jero-web/src/views/phoneView/search.vue +++ b/jero-web/src/views/phoneView/search.vue @@ -5,8 +5,10 @@ NIO GRP
+
+
diff --git a/jero-web/src/views/phoneView/searchList.vue b/jero-web/src/views/phoneView/searchList.vue index 29a555f81..ed702c677 100644 --- a/jero-web/src/views/phoneView/searchList.vue +++ b/jero-web/src/views/phoneView/searchList.vue @@ -16,11 +16,13 @@ - +
+ +
@@ -275,7 +277,9 @@ }) }, iconClick() { - this.$router.go(-1) + this.$router.push({ + path: '/phoneSearch' + }) }, onSearch() { this.searchValue = this.value @@ -344,15 +348,18 @@ this.$router.push({ path: '/phoneDocumentDetails', query: { - id: item.id.slice(0, 32) + id: item.id.slice(0, 32), + goRouter: '/phoneSearchList' } }) } else if (item.module_type_flag == 'WTZSK' || item.module_type_flag == 'ZSFX') { - this.recentBrowseAdd('Knowledge sharing', item.id) + let id = item.id.replace('base', '') + this.recentBrowseAdd('Knowledge sharing', id) this.$router.push({ path: '/phoneProblemKnowledgeBase', query: { - id: item.id + id: id, + goRouter: '/phoneSearchList' } }) } else if (item.module_type_flag == 'FGYB') { diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue index 1f0d79f4b..0f0106c99 100644 --- a/jero-web/src/views/phoneView/toDoCenter.vue +++ b/jero-web/src/views/phoneView/toDoCenter.vue @@ -3,10 +3,12 @@
@@ -14,9 +16,9 @@ -
- -
+
+
+
@@ -731,6 +733,8 @@ margin-top: 0.38rem; position: relative; background: #fff; + display: flex; + overflow: hidden; } ::v-deep .van-tabs__line { @@ -756,12 +760,14 @@ ::v-deep .van-tabs { padding: 0 0.4rem; width: calc(100% - 1rem); + display: inline-block; } .search-right { position: absolute; + /*margin-right: 0.4rem;*/ + top: 1.55rem; right: 0.4rem; - top: 0; } .search-right-icon {