Merge branch 'develop' into FOTON
This commit is contained in:
@@ -11,10 +11,10 @@
|
|||||||
<li v-for="item in toDoTaskList" :key="item.id" class="time-title">
|
<li v-for="item in toDoTaskList" :key="item.id" class="time-title">
|
||||||
<div style="height: 30px">
|
<div style="height: 30px">
|
||||||
<span @click="dealWith(item)" v-if="item.prcName.length<24"
|
<span @click="dealWith(item)" v-if="item.prcName.length<24"
|
||||||
style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item.prcName) }}</span>
|
style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item) }}</span>
|
||||||
<el-tooltip class="item" effect="dark" :content="item.prcName" placement="left" v-else>
|
<el-tooltip class="item" effect="dark" :content="item.prcName" placement="left" v-else>
|
||||||
<span @click="dealWith(item)"
|
<span @click="dealWith(item)"
|
||||||
style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item.prcName).substring(0, 24) + '...' }}</span>
|
style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 24) + '...' }}</span>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
@@ -38,6 +38,14 @@ export default {
|
|||||||
watch: {},
|
watch: {},
|
||||||
mounted() {this.queryProcess()},
|
mounted() {this.queryProcess()},
|
||||||
methods: {
|
methods: {
|
||||||
|
getPrcNameFilter(row){
|
||||||
|
if(row && row.prcType === 'buss3'){
|
||||||
|
return row.prcName + '-' + row.taskInfo
|
||||||
|
}else {
|
||||||
|
return row.prcName
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
togo () {
|
togo () {
|
||||||
this.$router.push('/processCenter')
|
this.$router.push('/processCenter')
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user