Skip to content

J
jiedao-app-operator-master
Commit 37777b6a authored by 邓春圆's avatar 邓春圆
Browse files
Options

品牌缺少创建人、创建人姓名，更新人姓名 添加

parent 8ee19b5e
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 8 deletions
src/views/ecw/productBrank/Empower/index.vue
View file @ 37777b6a
...@@ -102,6 +102,14 @@ ...@@ -102,6 +102,14 @@
<span >{{row.startTime?(parseTime(row.startTime, '{y}-{m}-{d}') + ' - ' + parseTime(row.endTime, '{y}-{m}-{d}')):'永久'}}</span> <span >{{row.startTime?(parseTime(row.startTime, '{y}-{m}-{d}') + ' - ' + parseTime(row.endTime, '{y}-{m}-{d}')):'永久'}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="startTime"
width="200px"
:label="$t('添加时间')">
<template v-slot="{row}">
<span >{{parseTime(row.createTime)}}</span>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="feeScale" prop="feeScale"
:formatter="(row) => getDictDataLabel(DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL, row.feeScale)" :formatter="(row) => getDictDataLabel(DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL, row.feeScale)"
......
src/views/ecw/productBrank/index.vue
View file @ 37777b6a
...@@ -61,14 +61,14 @@ ...@@ -61,14 +61,14 @@
<dict-tag :type="DICT_TYPE.BRAND_REG_TYPE" :value="scope.row.filing" /> <dict-tag :type="DICT_TYPE.BRAND_REG_TYPE" :value="scope.row.filing" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180"> <el-table-column :label="$t('创建人')" align="center" prop="creator" width="180">
<template slot-scope="scope"> <template v-slot="{row}">
<span>{{ parseTime(scope.row.createTime) }}</span> {{(row.creator && allSimplList.length) && allSimplList.find(i => i.id == row.creator).nickname}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('修改时间')" align="center" prop="createTime" width="180"> <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('修改人')" align="center" prop="updater" width="180"> <el-table-column :label="$t('修改人')" align="center" prop="updater" width="180">
...@@ -76,9 +76,9 @@ ...@@ -76,9 +76,9 @@
{{ (row.updater && allSimplList.length) && allSimplList.find(i => i.id == row.updater).nickname}} {{ (row.updater && allSimplList.length) && allSimplList.find(i => i.id == row.updater).nickname}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('创建人')" align="center" prop="creator" width="180"> <el-table-column :label="$t('修改时间')" align="center" prop="createTime" width="180">
<template v-slot="{row}"> <template slot-scope="scope">
{{(row.creator && allSimplList.length) && allSimplList.find(i => i.id == row.creator).nickname}} <span>{{ parseTime(scope.row.updateTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
......
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