Commit 091d6f32 authored by 罗林杰's avatar 罗林杰

Merge remote-tracking branch 'origin/master'

parents 72621e84 a5950582
......@@ -138,12 +138,18 @@
</el-table-column>
<el-table-column label="发起用户" prop="userNickName" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.userNickName || '' }}{{ scope.row.userCode ? '(' + scope.row.userCode + ')' : '' }}
<span v-if="scope.row.actionType !== '11' && scope.row.actionType !== '12'">
{{ scope.row.userNickName || '' }}{{ scope.row.userCode ? '(' + scope.row.userCode + ')' : '' }}
</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="目标用户" prop="userNickName" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.targetNickName || '' }}{{ scope.row.targetCode ? '(' + scope.row.targetCode + ')' : '' }}
<span v-if="scope.row.actionType !== '10'">
{{ scope.row.targetNickName || '' }}{{ scope.row.targetCode ? '(' + scope.row.targetCode + ')' : '' }}
</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="备注" prop="remarks" :show-overflow-tooltip="true">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment