WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230526_Mobile' into dev_20230526_Mobile

Browse Source
This commit is contained in:
wangzhijiang
2023-06-20 15:46:32 +08:00
parent b4adbd6f8b 050a1eb937
commit 335522766c
9 changed files with 80 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1883,4 +1883,5 @@ module.exports = {
nearlyYear:'Nearly a Year',
browsingTime:'Browsing Time',
pleaseViewOnPc:'Please view on PC',
taskHandling:'Task Handling',
}
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1984,4 +1984,5 @@ module.exports = {
nearlyYear:'近一年',
browsingTime:'浏览时间',
pleaseViewOnPc:'请在pc的查看',
taskHandling:'任务办理',
}
jero-web/src/views/phoneView/documentDetails.vue
+8 -2
View File
@@ -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;
}
</style>
jero-web/src/views/phoneView/preHomoMangement.vue
+9 -4
View File
@@ -51,7 +51,7 @@
</div>
<div class="content-box-type">
<span class="content-box-left">{{$t('typeOfDeliverables')}}</span>
<span class="content-box-text">{{queryForm.typeOfDeliverables || '--'}}</span>
<span class="content-box-text">{{queryForm.deliverableTypeName || '--'}}</span>
</div>
<div class="content-box-type-text">
{{$t('deliverableTemplate')}}
@@ -91,14 +91,19 @@
{{queryForm.deliveryResult}}
</div>
</van-collapse-item>
<van-collapse-item :title="$t('sponsorReview')" v-if="!isDisplay" name="4">
<van-collapse-item :title="$t('taskHandling')" v-if="!isDisplay" name="4">
<van-form @submit="onSubmit" ref="form">
<div class="resultofhandlingClass"
v-if="$route.query.taskDefinitionKey == 'Task Review' ||
$route.query.taskDefinitionKey == 'Task responsibility confirmation'"
$route.query.taskDefinitionKey == 'Task responsibility confirmation' ||
($route.query.taskDefinitionKey == 'Task handling' && (queryForm.valueType == 'file' ||
queryForm.valueType == 'text' || queryForm.valueType == 'select'))"
style="margin-bottom: 0.1rem">
<span>{{$t('resultofhandling')}}</span>
<span class="requiredClass">*</span>
<span class="requiredClass"
v-if="$route.query.taskDefinitionKey == 'Task Review' ||
$route.query.taskDefinitionKey == 'Task responsibility confirmation'">
*</span>
</div>
<van-field name="disposeResult"
class="uploader"
jero-web/src/views/phoneView/problemKnowledgeBase.vue
+28 -7
View File
@@ -83,7 +83,9 @@
<img src="~@/assets/icon_reply.png" alt="">
<span>{{$t('answer')}}</span>
</div>
<div class="commentRight" @click="deleteClick(item)">
<div class="commentRight"
v-if="administrators || item.createBy == userInfoQuery.username"
@click="deleteClick(item)">
<img src="~@/assets/icon_rubbish.png" alt="">
<span>{{$t('delete')}}</span>
</div>
@@ -107,7 +109,9 @@
<div class="commentRight" @click="messageClick(item)">
<img src="~@/assets/icon_reply.png" alt="">
</div>
<div class="commentRight" @click="deleteClick(val)">
<div class="commentRight"
v-if="administrators || val.createBy == userInfoQuery.username"
@click="deleteClick(val)">
<img src="~@/assets/icon_rubbish.png" alt="">
</div>
</div>
@@ -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 = {
jero-web/src/views/phoneView/processManagement.vue
+1 -1
View File
@@ -103,7 +103,7 @@
</van-step>
</van-steps>
</van-collapse-item>
<van-collapse-item :title="examineTitle" name="4" v-if="!queryData.isDisplay">
<van-collapse-item :title="$t('taskHandling')" name="4" v-if="!queryData.isDisplay">
<van-form @submit="onSubmit" ref="form">
<div class="resultofhandlingClass" style="margin-bottom: 0.1rem">
<span>{{$t('resultofhandling')}}</span>
jero-web/src/views/phoneView/search.vue
+2
View File
@@ -5,8 +5,10 @@
<span class="logoTitle">NIO GRP</span>
</div>
<div class="content-box">
<form action="/">
<van-search v-model="value" @search="onSearch" left-icon="none" right-icon="search"
:placeholder="$t('phoneSearch')"/>
</form>
</div>
<div class="content-box-value">
<div class="left-img">
jero-web/src/views/phoneView/searchList.vue
+16 -9
View File
@@ -16,11 +16,13 @@
<!-- @cancel="onClear"-->
<!-- :action-text="$t('reset')"-->
<!-- :placeholder="$t('phoneSearch')"/>-->
<van-search v-model="value"
@search="onSearch"
@clear="onClear"
@cancel="onClear"
:placeholder="$t('phoneSearch')"/>
<form action="/" style="width: 100%;">
<van-search v-model="value"
@search="onSearch"
@clear="onClear"
@cancel="onClear"
:placeholder="$t('phoneSearch')"/>
</form>
</div>
<div class="content">
<van-tabs v-model="activeTab" :ellipsis="false" @change="activeChange">
@@ -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') {
jero-web/src/views/phoneView/toDoCenter.vue
+14 -8
View File
@@ -3,10 +3,12 @@
<div class="fixed">
<div class="header-search">
<!-- <van-icon class="icon" name="arrow-left"/>-->
<van-search v-model="phoneQueryValue"
@search="onSearch"
@clear="onClear"
:placeholder="$t('phoneSearch')"/>
<form action="/">
<van-search v-model="phoneQueryValue"
@search="onSearch"
@clear="onClear"
:placeholder="$t('phoneSearch')"/>
</form>
</div>
<div class="content">
<van-tabs v-model="activeTab" @change="activeChange">
@@ -14,9 +16,9 @@
<van-tab name="processDone" :title="$t('processDone')"></van-tab>
<van-tab name="sentProcess" :title="$t('sentProcess')"></van-tab>
</van-tabs>
<div class="search-right">
<van-icon @click="searchIconClick" class="search-right-icon" name="filter-o"/>
</div>
</div>
<div class="search-right">
<van-icon @click="searchIconClick" class="search-right-icon" name="filter-o"/>
</div>
</div>
@@ -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 {