Commit 0bd0bbd5365017b28f07032e4ad7b3dc48af5c4c
1 parent
2ea90270
fix: slot-scope 已过期 ==》 v-slot
Showing
29 changed files
with
118 additions
and
118 deletions
yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
| @@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
| 21 | <el-table-column label="字段类型" prop="type" min-width="80px" :formatter="row => fieldType[row.type] || row.type" show-overflow-tooltip /> | 21 | <el-table-column label="字段类型" prop="type" min-width="80px" :formatter="row => fieldType[row.type] || row.type" show-overflow-tooltip /> |
| 22 | <el-table-column label="默认值" prop="defaultValue" min-width="80px" show-overflow-tooltip /> | 22 | <el-table-column label="默认值" prop="defaultValue" min-width="80px" show-overflow-tooltip /> |
| 23 | <el-table-column label="操作" width="90px"> | 23 | <el-table-column label="操作" width="90px"> |
| 24 | - <template slot-scope="{ row, $index }"> | 24 | + <template v-slot="{ row, $index }"> |
| 25 | <el-button size="mini" type="text" @click="openFieldForm(row, $index)">编辑</el-button> | 25 | <el-button size="mini" type="text" @click="openFieldForm(row, $index)">编辑</el-button> |
| 26 | <el-divider direction="vertical" /> | 26 | <el-divider direction="vertical" /> |
| 27 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeField(row, $index)">移除</el-button> | 27 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeField(row, $index)">移除</el-button> |
| @@ -70,7 +70,7 @@ | @@ -70,7 +70,7 @@ | ||
| 70 | <el-table-column label="枚举值编号" prop="id" min-width="100px" show-overflow-tooltip /> | 70 | <el-table-column label="枚举值编号" prop="id" min-width="100px" show-overflow-tooltip /> |
| 71 | <el-table-column label="枚举值名称" prop="name" min-width="100px" show-overflow-tooltip /> | 71 | <el-table-column label="枚举值名称" prop="name" min-width="100px" show-overflow-tooltip /> |
| 72 | <el-table-column label="操作" width="90px"> | 72 | <el-table-column label="操作" width="90px"> |
| 73 | - <template slot-scope="{ row, $index }"> | 73 | + <template v-slot="{ row, $index }"> |
| 74 | <el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'enum')">编辑</el-button> | 74 | <el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'enum')">编辑</el-button> |
| 75 | <el-divider direction="vertical" /> | 75 | <el-divider direction="vertical" /> |
| 76 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'enum')">移除</el-button> | 76 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'enum')">移除</el-button> |
| @@ -90,7 +90,7 @@ | @@ -90,7 +90,7 @@ | ||
| 90 | <el-table-column label="约束名称" prop="name" min-width="100px" show-overflow-tooltip /> | 90 | <el-table-column label="约束名称" prop="name" min-width="100px" show-overflow-tooltip /> |
| 91 | <el-table-column label="约束配置" prop="config" min-width="100px" show-overflow-tooltip /> | 91 | <el-table-column label="约束配置" prop="config" min-width="100px" show-overflow-tooltip /> |
| 92 | <el-table-column label="操作" width="90px"> | 92 | <el-table-column label="操作" width="90px"> |
| 93 | - <template slot-scope="{ row, $index }"> | 93 | + <template v-slot="{ row, $index }"> |
| 94 | <el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'constraint')">编辑</el-button> | 94 | <el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'constraint')">编辑</el-button> |
| 95 | <el-divider direction="vertical" /> | 95 | <el-divider direction="vertical" /> |
| 96 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'constraint')">移除</el-button> | 96 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'constraint')">移除</el-button> |
| @@ -109,7 +109,7 @@ | @@ -109,7 +109,7 @@ | ||
| 109 | <el-table-column label="属性编号" prop="id" min-width="100px" show-overflow-tooltip /> | 109 | <el-table-column label="属性编号" prop="id" min-width="100px" show-overflow-tooltip /> |
| 110 | <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip /> | 110 | <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip /> |
| 111 | <el-table-column label="操作" width="90px"> | 111 | <el-table-column label="操作" width="90px"> |
| 112 | - <template slot-scope="{ row, $index }"> | 112 | + <template v-slot="{ row, $index }"> |
| 113 | <el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'property')">编辑</el-button> | 113 | <el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'property')">编辑</el-button> |
| 114 | <el-divider direction="vertical" /> | 114 | <el-divider direction="vertical" /> |
| 115 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'property')">移除</el-button> | 115 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'property')">移除</el-button> |
yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | <el-table-column label="事件类型" min-width="100px" prop="event" /> | 5 | <el-table-column label="事件类型" min-width="100px" prop="event" /> |
| 6 | <el-table-column label="监听器类型" min-width="100px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" /> | 6 | <el-table-column label="监听器类型" min-width="100px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" /> |
| 7 | <el-table-column label="操作" width="90px"> | 7 | <el-table-column label="操作" width="90px"> |
| 8 | - <template slot-scope="{ row, $index }"> | 8 | + <template v-slot="{ row, $index }"> |
| 9 | <el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button> | 9 | <el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button> |
| 10 | <el-divider direction="vertical" /> | 10 | <el-divider direction="vertical" /> |
| 11 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button> | 11 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button> |
| @@ -108,7 +108,7 @@ | @@ -108,7 +108,7 @@ | ||
| 108 | <el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" /> | 108 | <el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" /> |
| 109 | <el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" /> | 109 | <el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" /> |
| 110 | <el-table-column label="操作" width="100px"> | 110 | <el-table-column label="操作" width="100px"> |
| 111 | - <template slot-scope="{ row, $index }"> | 111 | + <template v-slot="{ row, $index }"> |
| 112 | <el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button> | 112 | <el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button> |
| 113 | <el-divider direction="vertical" /> | 113 | <el-divider direction="vertical" /> |
| 114 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button> | 114 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button> |
yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | <el-table-column label="事件id" min-width="80px" prop="id" show-overflow-tooltip /> | 6 | <el-table-column label="事件id" min-width="80px" prop="id" show-overflow-tooltip /> |
| 7 | <el-table-column label="监听器类型" min-width="80px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" /> | 7 | <el-table-column label="监听器类型" min-width="80px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" /> |
| 8 | <el-table-column label="操作" width="90px"> | 8 | <el-table-column label="操作" width="90px"> |
| 9 | - <template slot-scope="{ row, $index }"> | 9 | + <template v-slot="{ row, $index }"> |
| 10 | <el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button> | 10 | <el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button> |
| 11 | <el-divider direction="vertical" /> | 11 | <el-divider direction="vertical" /> |
| 12 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button> | 12 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button> |
| @@ -132,7 +132,7 @@ | @@ -132,7 +132,7 @@ | ||
| 132 | <el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" /> | 132 | <el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" /> |
| 133 | <el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" /> | 133 | <el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" /> |
| 134 | <el-table-column label="操作" width="100px"> | 134 | <el-table-column label="操作" width="100px"> |
| 135 | - <template slot-scope="{ row, $index }"> | 135 | + <template v-slot="{ row, $index }"> |
| 136 | <el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button> | 136 | <el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button> |
| 137 | <el-divider direction="vertical" /> | 137 | <el-divider direction="vertical" /> |
| 138 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button> | 138 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button> |
yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/template.js
| @@ -6,7 +6,7 @@ export const template = isTaskListener => { | @@ -6,7 +6,7 @@ export const template = isTaskListener => { | ||
| 6 | <el-table-column label="事件类型" min-width="100px" prop="event" /> | 6 | <el-table-column label="事件类型" min-width="100px" prop="event" /> |
| 7 | <el-table-column label="监听器类型" min-width="100px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" /> | 7 | <el-table-column label="监听器类型" min-width="100px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" /> |
| 8 | <el-table-column label="操作" width="90px"> | 8 | <el-table-column label="操作" width="90px"> |
| 9 | - <template slot-scope="{ row, $index }"> | 9 | + <template v-slot="{ row, $index }"> |
| 10 | <el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button> | 10 | <el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button> |
| 11 | <el-divider direction="vertical" /> | 11 | <el-divider direction="vertical" /> |
| 12 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button> | 12 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button> |
| @@ -124,7 +124,7 @@ export const template = isTaskListener => { | @@ -124,7 +124,7 @@ export const template = isTaskListener => { | ||
| 124 | <el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" /> | 124 | <el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" /> |
| 125 | <el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" /> | 125 | <el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" /> |
| 126 | <el-table-column label="操作" width="100px"> | 126 | <el-table-column label="操作" width="100px"> |
| 127 | - <template slot-scope="{ row, $index }"> | 127 | + <template v-slot="{ row, $index }"> |
| 128 | <el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button> | 128 | <el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button> |
| 129 | <el-divider direction="vertical" /> | 129 | <el-divider direction="vertical" /> |
| 130 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button> | 130 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button> |
yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | <el-table-column label="属性名" prop="name" min-width="100px" show-overflow-tooltip /> | 5 | <el-table-column label="属性名" prop="name" min-width="100px" show-overflow-tooltip /> |
| 6 | <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip /> | 6 | <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip /> |
| 7 | <el-table-column label="操作" width="90px"> | 7 | <el-table-column label="操作" width="90px"> |
| 8 | - <template slot-scope="{ row, $index }"> | 8 | + <template v-slot="{ row, $index }"> |
| 9 | <el-button size="mini" type="text" @click="openAttributesForm(row, $index)">编辑</el-button> | 9 | <el-button size="mini" type="text" @click="openAttributesForm(row, $index)">编辑</el-button> |
| 10 | <el-divider direction="vertical" /> | 10 | <el-divider direction="vertical" /> |
| 11 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeAttributes(row, $index)">移除</el-button> | 11 | <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeAttributes(row, $index)">移除</el-button> |
yudao-ui-admin/src/layout/components/Message/index.vue
| @@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
| 10 | <el-table v-loading="loading" :data="list"> | 10 | <el-table v-loading="loading" :data="list"> |
| 11 | <el-table-column width="120" property="templateNickname" label="发送人" /> | 11 | <el-table-column width="120" property="templateNickname" label="发送人" /> |
| 12 | <el-table-column width="180" property="createTime" label="发送时间"> | 12 | <el-table-column width="180" property="createTime" label="发送时间"> |
| 13 | - <template slot-scope="scope"> | 13 | + <template v-slot="scope"> |
| 14 | <span>{{ parseTime(scope.row.createTime) }}</span> | 14 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 15 | </template> | 15 | </template> |
| 16 | </el-table-column> | 16 | </el-table-column> |
yudao-ui-admin/src/views/infra/build/RightPanel.vue
| @@ -554,7 +554,7 @@ | @@ -554,7 +554,7 @@ | ||
| 554 | default-expand-all | 554 | default-expand-all |
| 555 | draggable | 555 | draggable |
| 556 | > | 556 | > |
| 557 | - <span slot-scope="{ node, data }"> | 557 | + <span v-slot="{ node, data }"> |
| 558 | <span class="node-label"> | 558 | <span class="node-label"> |
| 559 | <svg-icon class="node-icon" :icon-class="data.__config__?data.__config__.tagIcon:data.tagIcon" /> | 559 | <svg-icon class="node-icon" :icon-class="data.__config__?data.__config__.tagIcon:data.tagIcon" /> |
| 560 | {{ node.label }} | 560 | {{ node.label }} |
yudao-ui-admin/src/views/mall/product/property/index.vue
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | <el-table v-loading="loading" :data="list"> | 29 | <el-table v-loading="loading" :data="list"> |
| 30 | <el-table-column label="编号" align="center" prop="id" /> | 30 | <el-table-column label="编号" align="center" prop="id" /> |
| 31 | <el-table-column label="名称" align="center" :show-overflow-tooltip="true"> | 31 | <el-table-column label="名称" align="center" :show-overflow-tooltip="true"> |
| 32 | - <template slot-scope="scope"> | 32 | + <template v-slot="scope"> |
| 33 | <router-link :to="'/property/value/' + scope.row.id" class="link-type"> | 33 | <router-link :to="'/property/value/' + scope.row.id" class="link-type"> |
| 34 | <span>{{ scope.row.name }}</span> | 34 | <span>{{ scope.row.name }}</span> |
| 35 | </router-link> | 35 | </router-link> |
| @@ -37,12 +37,12 @@ | @@ -37,12 +37,12 @@ | ||
| 37 | </el-table-column> | 37 | </el-table-column> |
| 38 | <el-table-column label="备注" align="center" prop="remark" /> | 38 | <el-table-column label="备注" align="center" prop="remark" /> |
| 39 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 39 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 40 | - <template slot-scope="scope"> | 40 | + <template v-slot="scope"> |
| 41 | <span>{{ parseTime(scope.row.createTime) }}</span> | 41 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 42 | </template> | 42 | </template> |
| 43 | </el-table-column> | 43 | </el-table-column> |
| 44 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 44 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 45 | - <template slot-scope="scope"> | 45 | + <template v-slot="scope"> |
| 46 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 46 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 47 | v-hasPermi="['product:property:update']">修改</el-button> | 47 | v-hasPermi="['product:property:update']">修改</el-button> |
| 48 | <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" | 48 | <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" |
yudao-ui-admin/src/views/mall/product/property/value.vue
| @@ -29,12 +29,12 @@ | @@ -29,12 +29,12 @@ | ||
| 29 | <el-table-column label="名称" align="center" prop="name"/> | 29 | <el-table-column label="名称" align="center" prop="name"/> |
| 30 | <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/> | 30 | <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/> |
| 31 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 31 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 32 | - <template slot-scope="scope"> | 32 | + <template v-slot="scope"> |
| 33 | <span>{{ parseTime(scope.row.createTime) }}</span> | 33 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 34 | </template> | 34 | </template> |
| 35 | </el-table-column> | 35 | </el-table-column> |
| 36 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 36 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 37 | - <template slot-scope="scope"> | 37 | + <template v-slot="scope"> |
| 38 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 38 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 39 | v-hasPermi="['system:dict:update']">修改 | 39 | v-hasPermi="['system:dict:update']">修改 |
| 40 | </el-button> | 40 | </el-button> |
yudao-ui-admin/src/views/mall/product/spu/index.vue
| @@ -67,7 +67,7 @@ | @@ -67,7 +67,7 @@ | ||
| 67 | <!-- 列表 --> | 67 | <!-- 列表 --> |
| 68 | <el-table v-loading="loading" :data="list"> | 68 | <el-table v-loading="loading" :data="list"> |
| 69 | <el-table-column label="商品信息" align="center" width="260"> | 69 | <el-table-column label="商品信息" align="center" width="260"> |
| 70 | - <template slot-scope="scope"> | 70 | + <template v-slot="scope"> |
| 71 | <div class="product-info"> | 71 | <div class="product-info"> |
| 72 | <img v-if="scope.row.picUrls" :src="scope.row.picUrls[0]" alt="分类图片" class="img-height" /> | 72 | <img v-if="scope.row.picUrls" :src="scope.row.picUrls[0]" alt="分类图片" class="img-height" /> |
| 73 | <div class="message">{{ scope.row.name }}</div> | 73 | <div class="message">{{ scope.row.name }}</div> |
| @@ -80,17 +80,17 @@ | @@ -80,17 +80,17 @@ | ||
| 80 | <el-table-column label="销量" align="center" prop="salesCount"/> | 80 | <el-table-column label="销量" align="center" prop="salesCount"/> |
| 81 | <el-table-column label="排序" align="center" prop="sort"/> | 81 | <el-table-column label="排序" align="center" prop="sort"/> |
| 82 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 82 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 83 | - <template slot-scope="scope"> | 83 | + <template v-slot="scope"> |
| 84 | <span>{{ parseTime(scope.row.createTime) }}</span> | 84 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 85 | </template> | 85 | </template> |
| 86 | </el-table-column> | 86 | </el-table-column> |
| 87 | <el-table-column label="状态" align="center" prop="status"> | 87 | <el-table-column label="状态" align="center" prop="status"> |
| 88 | - <template slot-scope="scope"> | 88 | + <template v-slot="scope"> |
| 89 | <dict-tag :type="DICT_TYPE.PRODUCT_SPU_STATUS" :value="scope.row.status"/> | 89 | <dict-tag :type="DICT_TYPE.PRODUCT_SPU_STATUS" :value="scope.row.status"/> |
| 90 | </template> | 90 | </template> |
| 91 | </el-table-column> | 91 | </el-table-column> |
| 92 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 92 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 93 | - <template slot-scope="scope"> | 93 | + <template v-slot="scope"> |
| 94 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 94 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 95 | v-hasPermi="['product:spu:update']">修改</el-button> | 95 | v-hasPermi="['product:spu:update']">修改</el-button> |
| 96 | <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" | 96 | <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" |
| @@ -105,7 +105,7 @@ | @@ -105,7 +105,7 @@ | ||
| 105 | <!-- 列表 --> | 105 | <!-- 列表 --> |
| 106 | <el-table v-loading="loading" :data="list"> | 106 | <el-table v-loading="loading" :data="list"> |
| 107 | <el-table-column label="商品信息" align="center" width="260"> | 107 | <el-table-column label="商品信息" align="center" width="260"> |
| 108 | - <template slot-scope="scope"> | 108 | + <template v-slot="scope"> |
| 109 | <div class="product-info"> | 109 | <div class="product-info"> |
| 110 | <img v-if="scope.row.picUrls" :src="scope.row.picUrls[0]" alt="分类图片" class="img-height"/> | 110 | <img v-if="scope.row.picUrls" :src="scope.row.picUrls[0]" alt="分类图片" class="img-height"/> |
| 111 | <div class="message">{{ scope.row.name }}</div> | 111 | <div class="message">{{ scope.row.name }}</div> |
| @@ -117,17 +117,17 @@ | @@ -117,17 +117,17 @@ | ||
| 117 | <el-table-column label="销量" align="center" prop="salesCount"/> | 117 | <el-table-column label="销量" align="center" prop="salesCount"/> |
| 118 | <el-table-column label="排序" align="center" prop="sort"/> | 118 | <el-table-column label="排序" align="center" prop="sort"/> |
| 119 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 119 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 120 | - <template slot-scope="scope"> | 120 | + <template v-slot="scope"> |
| 121 | <span>{{ parseTime(scope.row.createTime) }}</span> | 121 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 122 | </template> | 122 | </template> |
| 123 | </el-table-column> | 123 | </el-table-column> |
| 124 | <el-table-column label="状态" align="center" prop="status"> | 124 | <el-table-column label="状态" align="center" prop="status"> |
| 125 | - <template slot-scope="scope"> | 125 | + <template v-slot="scope"> |
| 126 | <dict-tag :type="DICT_TYPE.PRODUCT_SPU_STATUS" :value="scope.row.status"/> | 126 | <dict-tag :type="DICT_TYPE.PRODUCT_SPU_STATUS" :value="scope.row.status"/> |
| 127 | </template> | 127 | </template> |
| 128 | </el-table-column> | 128 | </el-table-column> |
| 129 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 129 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 130 | - <template slot-scope="scope"> | 130 | + <template v-slot="scope"> |
| 131 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 131 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 132 | v-hasPermi="['product:spu:update']">修改</el-button> | 132 | v-hasPermi="['product:spu:update']">修改</el-button> |
| 133 | <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" | 133 | <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" |
| @@ -142,7 +142,7 @@ | @@ -142,7 +142,7 @@ | ||
| 142 | <!-- 列表 --> | 142 | <!-- 列表 --> |
| 143 | <el-table v-loading="loading" :data="list"> | 143 | <el-table v-loading="loading" :data="list"> |
| 144 | <el-table-column label="商品信息" align="center" width="260"> | 144 | <el-table-column label="商品信息" align="center" width="260"> |
| 145 | - <template slot-scope="scope"> | 145 | + <template v-slot="scope"> |
| 146 | <div class="product-info"> | 146 | <div class="product-info"> |
| 147 | <img v-if="scope.row.picUrls" :src="scope.row.picUrls[0]" alt="分类图片" class="img-height"/> | 147 | <img v-if="scope.row.picUrls" :src="scope.row.picUrls[0]" alt="分类图片" class="img-height"/> |
| 148 | <div class="message">{{ scope.row.name }}</div> | 148 | <div class="message">{{ scope.row.name }}</div> |
| @@ -154,17 +154,17 @@ | @@ -154,17 +154,17 @@ | ||
| 154 | <el-table-column label="销量" align="center" prop="salesCount"/> | 154 | <el-table-column label="销量" align="center" prop="salesCount"/> |
| 155 | <el-table-column label="排序" align="center" prop="sort"/> | 155 | <el-table-column label="排序" align="center" prop="sort"/> |
| 156 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 156 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 157 | - <template slot-scope="scope"> | 157 | + <template v-slot="scope"> |
| 158 | <span>{{ parseTime(scope.row.createTime) }}</span> | 158 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 159 | </template> | 159 | </template> |
| 160 | </el-table-column> | 160 | </el-table-column> |
| 161 | <el-table-column label="状态" align="center" prop="status"> | 161 | <el-table-column label="状态" align="center" prop="status"> |
| 162 | - <template slot-scope="scope"> | 162 | + <template v-slot="scope"> |
| 163 | <dict-tag :type="DICT_TYPE.PRODUCT_SPU_STATUS" :value="scope.row.status"/> | 163 | <dict-tag :type="DICT_TYPE.PRODUCT_SPU_STATUS" :value="scope.row.status"/> |
| 164 | </template> | 164 | </template> |
| 165 | </el-table-column> | 165 | </el-table-column> |
| 166 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 166 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 167 | - <template slot-scope="scope"> | 167 | + <template v-slot="scope"> |
| 168 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 168 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 169 | v-hasPermi="['product:spu:update']">修改</el-button> | 169 | v-hasPermi="['product:spu:update']">修改</el-button> |
| 170 | <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" | 170 | <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" |
| @@ -179,7 +179,7 @@ | @@ -179,7 +179,7 @@ | ||
| 179 | <!-- 列表 --> | 179 | <!-- 列表 --> |
| 180 | <el-table v-loading="loading" :data="list"> | 180 | <el-table v-loading="loading" :data="list"> |
| 181 | <el-table-column label="商品信息" align="center" width="260"> | 181 | <el-table-column label="商品信息" align="center" width="260"> |
| 182 | - <template slot-scope="scope"> | 182 | + <template v-slot="scope"> |
| 183 | <div class="product-info"> | 183 | <div class="product-info"> |
| 184 | <img v-if="scope.row.picUrls" :src="scope.row.picUrls[0]" alt="分类图片" class="img-height"/> | 184 | <img v-if="scope.row.picUrls" :src="scope.row.picUrls[0]" alt="分类图片" class="img-height"/> |
| 185 | <div class="message">{{ scope.row.name }}</div> | 185 | <div class="message">{{ scope.row.name }}</div> |
| @@ -191,17 +191,17 @@ | @@ -191,17 +191,17 @@ | ||
| 191 | <el-table-column label="销量" align="center" prop="salesCount"/> | 191 | <el-table-column label="销量" align="center" prop="salesCount"/> |
| 192 | <el-table-column label="排序" align="center" prop="sort"/> | 192 | <el-table-column label="排序" align="center" prop="sort"/> |
| 193 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 193 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 194 | - <template slot-scope="scope"> | 194 | + <template v-slot="scope"> |
| 195 | <span>{{ parseTime(scope.row.createTime) }}</span> | 195 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 196 | </template> | 196 | </template> |
| 197 | </el-table-column> | 197 | </el-table-column> |
| 198 | <el-table-column label="状态" align="center" prop="status"> | 198 | <el-table-column label="状态" align="center" prop="status"> |
| 199 | - <template slot-scope="scope"> | 199 | + <template v-slot="scope"> |
| 200 | <dict-tag :type="DICT_TYPE.PRODUCT_SPU_STATUS" :value="scope.row.status"/> | 200 | <dict-tag :type="DICT_TYPE.PRODUCT_SPU_STATUS" :value="scope.row.status"/> |
| 201 | </template> | 201 | </template> |
| 202 | </el-table-column> | 202 | </el-table-column> |
| 203 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 203 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 204 | - <template slot-scope="scope"> | 204 | + <template v-slot="scope"> |
| 205 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 205 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 206 | v-hasPermi="['product:spu:update']">修改</el-button> | 206 | v-hasPermi="['product:spu:update']">修改</el-button> |
| 207 | <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" | 207 | <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" |
yudao-ui-admin/src/views/mall/product/spu/save.vue
| @@ -69,18 +69,18 @@ | @@ -69,18 +69,18 @@ | ||
| 69 | <template v-if="this.specSwitch"> | 69 | <template v-if="this.specSwitch"> |
| 70 | <el-table-column :key="index" v-for="(item, index) in dynamicSpec.filter(v => v.specName !== undefined)" | 70 | <el-table-column :key="index" v-for="(item, index) in dynamicSpec.filter(v => v.specName !== undefined)" |
| 71 | :label="item.specName"> | 71 | :label="item.specName"> |
| 72 | - <template slot-scope="scope"> | 72 | + <template v-slot="scope"> |
| 73 | <el-input v-if="scope.row.spec" v-model="scope.row.spec[index]" disabled/> | 73 | <el-input v-if="scope.row.spec" v-model="scope.row.spec[index]" disabled/> |
| 74 | </template> | 74 | </template> |
| 75 | </el-table-column> | 75 | </el-table-column> |
| 76 | </template> | 76 | </template> |
| 77 | <el-table-column label="规格图片" width="120px" :render-header="addRedStar" key="90"> | 77 | <el-table-column label="规格图片" width="120px" :render-header="addRedStar" key="90"> |
| 78 | - <template slot-scope="scope"> | 78 | + <template v-slot="scope"> |
| 79 | <ImageUpload v-model="scope.row.picUrl" :limit="1" :isShowTip="false" style="width: 100px; height: 50px"/> | 79 | <ImageUpload v-model="scope.row.picUrl" :limit="1" :isShowTip="false" style="width: 100px; height: 50px"/> |
| 80 | </template> | 80 | </template> |
| 81 | </el-table-column> | 81 | </el-table-column> |
| 82 | <el-table-column label="市场价(元)" :render-header="addRedStar" key="92"> | 82 | <el-table-column label="市场价(元)" :render-header="addRedStar" key="92"> |
| 83 | - <template slot-scope="scope"> | 83 | + <template v-slot="scope"> |
| 84 | <el-form-item :prop="'rates.'+ scope.$index + '.marketPrice'" :rules="[{required: true, trigger: 'change'}]"> | 84 | <el-form-item :prop="'rates.'+ scope.$index + '.marketPrice'" :rules="[{required: true, trigger: 'change'}]"> |
| 85 | <el-input v-model="scope.row.marketPrice" | 85 | <el-input v-model="scope.row.marketPrice" |
| 86 | oninput="value= value.match(/\d+(\.\d{0,2})?/) ? value.match(/\d+(\.\d{0,2})?/)[0] : ''"/> | 86 | oninput="value= value.match(/\d+(\.\d{0,2})?/) ? value.match(/\d+(\.\d{0,2})?/)[0] : ''"/> |
| @@ -88,7 +88,7 @@ | @@ -88,7 +88,7 @@ | ||
| 88 | </template> | 88 | </template> |
| 89 | </el-table-column> | 89 | </el-table-column> |
| 90 | <el-table-column label="销售价(元)" :render-header="addRedStar" key="93"> | 90 | <el-table-column label="销售价(元)" :render-header="addRedStar" key="93"> |
| 91 | - <template slot-scope="scope"> | 91 | + <template v-slot="scope"> |
| 92 | <el-form-item :prop="'rates.'+ scope.$index + '.price'" | 92 | <el-form-item :prop="'rates.'+ scope.$index + '.price'" |
| 93 | :rules="[{required: true, trigger: 'change'}]"> | 93 | :rules="[{required: true, trigger: 'change'}]"> |
| 94 | <el-input v-model="scope.row.price" | 94 | <el-input v-model="scope.row.price" |
| @@ -97,7 +97,7 @@ | @@ -97,7 +97,7 @@ | ||
| 97 | </template> | 97 | </template> |
| 98 | </el-table-column> | 98 | </el-table-column> |
| 99 | <el-table-column label="成本价" :render-header="addRedStar" key="94"> | 99 | <el-table-column label="成本价" :render-header="addRedStar" key="94"> |
| 100 | - <template slot-scope="scope"> | 100 | + <template v-slot="scope"> |
| 101 | <el-form-item :prop="'rates.'+ scope.$index + '.costPrice'" | 101 | <el-form-item :prop="'rates.'+ scope.$index + '.costPrice'" |
| 102 | :rules="[{required: true, trigger: 'change'}]"> | 102 | :rules="[{required: true, trigger: 'change'}]"> |
| 103 | <el-input v-model="scope.row.costPrice" | 103 | <el-input v-model="scope.row.costPrice" |
| @@ -106,35 +106,35 @@ | @@ -106,35 +106,35 @@ | ||
| 106 | </template> | 106 | </template> |
| 107 | </el-table-column> | 107 | </el-table-column> |
| 108 | <el-table-column label="库存" :render-header="addRedStar" key="95"> | 108 | <el-table-column label="库存" :render-header="addRedStar" key="95"> |
| 109 | - <template slot-scope="scope"> | 109 | + <template v-slot="scope"> |
| 110 | <el-form-item :prop="'rates.'+ scope.$index + '.stock'" :rules="[{required: true, trigger: 'change'}]"> | 110 | <el-form-item :prop="'rates.'+ scope.$index + '.stock'" :rules="[{required: true, trigger: 'change'}]"> |
| 111 | <el-input v-model="scope.row.stock" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input> | 111 | <el-input v-model="scope.row.stock" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input> |
| 112 | </el-form-item> | 112 | </el-form-item> |
| 113 | </template> | 113 | </template> |
| 114 | </el-table-column> | 114 | </el-table-column> |
| 115 | <el-table-column label="预警库存" key="96"> | 115 | <el-table-column label="预警库存" key="96"> |
| 116 | - <template slot-scope="scope"> | 116 | + <template v-slot="scope"> |
| 117 | <el-input v-model="scope.row.warnStock" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input> | 117 | <el-input v-model="scope.row.warnStock" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input> |
| 118 | </template> | 118 | </template> |
| 119 | </el-table-column> | 119 | </el-table-column> |
| 120 | <el-table-column label="体积" key="97"> | 120 | <el-table-column label="体积" key="97"> |
| 121 | - <template slot-scope="scope"> | 121 | + <template v-slot="scope"> |
| 122 | <el-input v-model="scope.row.volume" /> | 122 | <el-input v-model="scope.row.volume" /> |
| 123 | </template> | 123 | </template> |
| 124 | </el-table-column> | 124 | </el-table-column> |
| 125 | <el-table-column label="重量" key="98"> | 125 | <el-table-column label="重量" key="98"> |
| 126 | - <template slot-scope="scope"> | 126 | + <template v-slot="scope"> |
| 127 | <el-input v-model="scope.row.weight" /> | 127 | <el-input v-model="scope.row.weight" /> |
| 128 | </template> | 128 | </template> |
| 129 | </el-table-column> | 129 | </el-table-column> |
| 130 | <el-table-column label="条码" key="99"> | 130 | <el-table-column label="条码" key="99"> |
| 131 | - <template slot-scope="scope"> | 131 | + <template v-slot="scope"> |
| 132 | <el-input v-model="scope.row.barCode" /> | 132 | <el-input v-model="scope.row.barCode" /> |
| 133 | </template> | 133 | </template> |
| 134 | </el-table-column> | 134 | </el-table-column> |
| 135 | <template v-if="this.specSwitch"> | 135 | <template v-if="this.specSwitch"> |
| 136 | <el-table-column fixed="right" label="操作" width="50" key="100"> | 136 | <el-table-column fixed="right" label="操作" width="50" key="100"> |
| 137 | - <template slot-scope="scope"> | 137 | + <template v-slot="scope"> |
| 138 | <el-button @click="scope.row.status = 1" type="text" size="small" | 138 | <el-button @click="scope.row.status = 1" type="text" size="small" |
| 139 | v-show="scope.row.status === undefined || scope.row.status === 0 ">禁用 | 139 | v-show="scope.row.status === undefined || scope.row.status === 0 ">禁用 |
| 140 | </el-button> | 140 | </el-button> |
yudao-ui-admin/src/views/mall/promotion/coupon/index.vue
| @@ -30,32 +30,32 @@ | @@ -30,32 +30,32 @@ | ||
| 30 | <el-table-column label="会员信息" align="center" prop="nickname" /> <!-- TODO 芋艿:以后支持头像,支持跳转 --> | 30 | <el-table-column label="会员信息" align="center" prop="nickname" /> <!-- TODO 芋艿:以后支持头像,支持跳转 --> |
| 31 | <el-table-column label="优惠劵" align="center" prop="name" /> | 31 | <el-table-column label="优惠劵" align="center" prop="name" /> |
| 32 | <el-table-column label="优惠券类型" align="center" prop="discountType"> | 32 | <el-table-column label="优惠券类型" align="center" prop="discountType"> |
| 33 | - <template slot-scope="scope"> | 33 | + <template v-slot="scope"> |
| 34 | <dict-tag :type="DICT_TYPE.PROMOTION_DISCOUNT_TYPE" :value="scope.row.discountType" /> | 34 | <dict-tag :type="DICT_TYPE.PROMOTION_DISCOUNT_TYPE" :value="scope.row.discountType" /> |
| 35 | </template> | 35 | </template> |
| 36 | </el-table-column> | 36 | </el-table-column> |
| 37 | <el-table-column label="领取方式" align="center" prop="takeType"> | 37 | <el-table-column label="领取方式" align="center" prop="takeType"> |
| 38 | - <template slot-scope="scope"> | 38 | + <template v-slot="scope"> |
| 39 | <dict-tag :type="DICT_TYPE.PROMOTION_COUPON_TAKE_TYPE" :value="scope.row.takeType" /> | 39 | <dict-tag :type="DICT_TYPE.PROMOTION_COUPON_TAKE_TYPE" :value="scope.row.takeType" /> |
| 40 | </template> | 40 | </template> |
| 41 | </el-table-column> | 41 | </el-table-column> |
| 42 | <el-table-column label="状态" align="center" prop="status"> | 42 | <el-table-column label="状态" align="center" prop="status"> |
| 43 | - <template slot-scope="scope"> | 43 | + <template v-slot="scope"> |
| 44 | <dict-tag :type="DICT_TYPE.PROMOTION_COUPON_STATUS" :value="scope.row.status" /> | 44 | <dict-tag :type="DICT_TYPE.PROMOTION_COUPON_STATUS" :value="scope.row.status" /> |
| 45 | </template> | 45 | </template> |
| 46 | </el-table-column> | 46 | </el-table-column> |
| 47 | <el-table-column label="领取时间" align="center" prop="createTime" width="180"> | 47 | <el-table-column label="领取时间" align="center" prop="createTime" width="180"> |
| 48 | - <template slot-scope="scope"> | 48 | + <template v-slot="scope"> |
| 49 | <span>{{ parseTime(scope.row.createTime) }}</span> | 49 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 50 | </template> | 50 | </template> |
| 51 | </el-table-column> | 51 | </el-table-column> |
| 52 | <el-table-column label="使用时间" align="center" prop="useTime" width="180"> | 52 | <el-table-column label="使用时间" align="center" prop="useTime" width="180"> |
| 53 | - <template slot-scope="scope"> | 53 | + <template v-slot="scope"> |
| 54 | <span>{{ parseTime(scope.row.useTime) }}</span> | 54 | <span>{{ parseTime(scope.row.useTime) }}</span> |
| 55 | </template> | 55 | </template> |
| 56 | </el-table-column> | 56 | </el-table-column> |
| 57 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 57 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 58 | - <template slot-scope="scope"> | 58 | + <template v-slot="scope"> |
| 59 | <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" | 59 | <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" |
| 60 | v-hasPermi="['promotion:coupon:delete']">回收</el-button> | 60 | v-hasPermi="['promotion:coupon:delete']">回收</el-button> |
| 61 | </template> | 61 | </template> |
yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue
| @@ -44,7 +44,7 @@ | @@ -44,7 +44,7 @@ | ||
| 44 | <el-table v-loading="loading" :data="list"> | 44 | <el-table v-loading="loading" :data="list"> |
| 45 | <el-table-column label="优惠券名称" align="center" prop="name" /> | 45 | <el-table-column label="优惠券名称" align="center" prop="name" /> |
| 46 | <el-table-column label="优惠券类型" align="center" prop="discountType"> | 46 | <el-table-column label="优惠券类型" align="center" prop="discountType"> |
| 47 | - <template slot-scope="scope"> | 47 | + <template v-slot="scope"> |
| 48 | <dict-tag :type="DICT_TYPE.PROMOTION_DISCOUNT_TYPE" :value="scope.row.discountType" /> | 48 | <dict-tag :type="DICT_TYPE.PROMOTION_DISCOUNT_TYPE" :value="scope.row.discountType" /> |
| 49 | </template> | 49 | </template> |
| 50 | </el-table-column> | 50 | </el-table-column> |
| @@ -54,17 +54,17 @@ | @@ -54,17 +54,17 @@ | ||
| 54 | <el-table-column label="领取上限" align="center" prop="takeLimitCount" :formatter="takeLimitCountFormat" /> | 54 | <el-table-column label="领取上限" align="center" prop="takeLimitCount" :formatter="takeLimitCountFormat" /> |
| 55 | <el-table-column label="有效期限" align="center" prop="validityType" width="180" :formatter="validityTypeFormat" /> | 55 | <el-table-column label="有效期限" align="center" prop="validityType" width="180" :formatter="validityTypeFormat" /> |
| 56 | <el-table-column label="状态" align="center" prop="status"> | 56 | <el-table-column label="状态" align="center" prop="status"> |
| 57 | - <template slot-scope="scope"> | 57 | + <template v-slot="scope"> |
| 58 | <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)"/> | 58 | <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)"/> |
| 59 | </template> | 59 | </template> |
| 60 | </el-table-column> | 60 | </el-table-column> |
| 61 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 61 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 62 | - <template slot-scope="scope"> | 62 | + <template v-slot="scope"> |
| 63 | <span>{{ parseTime(scope.row.createTime) }}</span> | 63 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 64 | </template> | 64 | </template> |
| 65 | </el-table-column> | 65 | </el-table-column> |
| 66 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 66 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 67 | - <template slot-scope="scope"> | 67 | + <template v-slot="scope"> |
| 68 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 68 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 69 | v-hasPermi="['promotion:coupon-template:update']">修改</el-button> | 69 | v-hasPermi="['promotion:coupon-template:update']">修改</el-button> |
| 70 | <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" | 70 | <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" |
yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue
| @@ -35,23 +35,23 @@ | @@ -35,23 +35,23 @@ | ||
| 35 | <el-table v-loading="loading" :data="list"> | 35 | <el-table v-loading="loading" :data="list"> |
| 36 | <el-table-column label="活动名称" align="center" prop="name" /> | 36 | <el-table-column label="活动名称" align="center" prop="name" /> |
| 37 | <el-table-column label="活动时间" align="center" prop="startTime" width="240"> | 37 | <el-table-column label="活动时间" align="center" prop="startTime" width="240"> |
| 38 | - <template slot-scope="scope"> | 38 | + <template v-slot="scope"> |
| 39 | <div>开始:{{ parseTime(scope.row.startTime) }}</div> | 39 | <div>开始:{{ parseTime(scope.row.startTime) }}</div> |
| 40 | <div>结束:{{ parseTime(scope.row.endTime) }}</div> | 40 | <div>结束:{{ parseTime(scope.row.endTime) }}</div> |
| 41 | </template> | 41 | </template> |
| 42 | </el-table-column> | 42 | </el-table-column> |
| 43 | <el-table-column label="状态" align="center" prop="status"> | 43 | <el-table-column label="状态" align="center" prop="status"> |
| 44 | - <template slot-scope="scope"> | 44 | + <template v-slot="scope"> |
| 45 | <dict-tag :type="DICT_TYPE.PROMOTION_ACTIVITY_STATUS" :value="scope.row.status" /> | 45 | <dict-tag :type="DICT_TYPE.PROMOTION_ACTIVITY_STATUS" :value="scope.row.status" /> |
| 46 | </template> | 46 | </template> |
| 47 | </el-table-column> | 47 | </el-table-column> |
| 48 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 48 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 49 | - <template slot-scope="scope"> | 49 | + <template v-slot="scope"> |
| 50 | <span>{{ parseTime(scope.row.createTime) }}</span> | 50 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 51 | </template> | 51 | </template> |
| 52 | </el-table-column> | 52 | </el-table-column> |
| 53 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 53 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 54 | - <template slot-scope="scope"> | 54 | + <template v-slot="scope"> |
| 55 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 55 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 56 | v-if="scope.row.status !== PromotionActivityStatusEnum.CLOSE.type" | 56 | v-if="scope.row.status !== PromotionActivityStatusEnum.CLOSE.type" |
| 57 | v-hasPermi="['promotion:discount-activity:update']">修改</el-button> | 57 | v-hasPermi="['promotion:discount-activity:update']">修改</el-button> |
| @@ -92,18 +92,18 @@ | @@ -92,18 +92,18 @@ | ||
| 92 | </el-select> | 92 | </el-select> |
| 93 | <el-table v-loading="loading" :data="form.products"> | 93 | <el-table v-loading="loading" :data="form.products"> |
| 94 | <el-table-column label="商品名称" align="center" width="200"> | 94 | <el-table-column label="商品名称" align="center" width="200"> |
| 95 | - <template slot-scope="scope"> | 95 | + <template v-slot="scope"> |
| 96 | {{ scope.row.spuName }} {{ scope.row.name}} | 96 | {{ scope.row.spuName }} {{ scope.row.name}} |
| 97 | </template> | 97 | </template> |
| 98 | </el-table-column> | 98 | </el-table-column> |
| 99 | <el-table-column label="商品价格" align="center" prop="price"> | 99 | <el-table-column label="商品价格" align="center" prop="price"> |
| 100 | - <template slot-scope="scope"> | 100 | + <template v-slot="scope"> |
| 101 | ¥{{ (scope.row.price / 100.0).toFixed(2) }} | 101 | ¥{{ (scope.row.price / 100.0).toFixed(2) }} |
| 102 | </template> | 102 | </template> |
| 103 | </el-table-column> | 103 | </el-table-column> |
| 104 | <el-table-column label="库存" align="center" prop="stock" /> | 104 | <el-table-column label="库存" align="center" prop="stock" /> |
| 105 | <el-table-column label="优惠类型" align="center" property="discountType"> | 105 | <el-table-column label="优惠类型" align="center" property="discountType"> |
| 106 | - <template slot-scope="scope"> | 106 | + <template v-slot="scope"> |
| 107 | <el-select v-model="scope.row.discountType" placeholder="请选择优惠类型"> | 107 | <el-select v-model="scope.row.discountType" placeholder="请选择优惠类型"> |
| 108 | <el-option v-for="dict in getDictDatas(DICT_TYPE.PROMOTION_DISCOUNT_TYPE)" | 108 | <el-option v-for="dict in getDictDatas(DICT_TYPE.PROMOTION_DISCOUNT_TYPE)" |
| 109 | :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"/> | 109 | :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"/> |
| @@ -111,7 +111,7 @@ | @@ -111,7 +111,7 @@ | ||
| 111 | </template> | 111 | </template> |
| 112 | </el-table-column> | 112 | </el-table-column> |
| 113 | <el-table-column label="优惠" align="center" prop="startTime" width="250"> | 113 | <el-table-column label="优惠" align="center" prop="startTime" width="250"> |
| 114 | - <template slot-scope="scope"> | 114 | + <template v-slot="scope"> |
| 115 | <el-form-item v-if="scope.row.discountType === PromotionDiscountTypeEnum.PRICE.type" prop="discountPrice"> | 115 | <el-form-item v-if="scope.row.discountType === PromotionDiscountTypeEnum.PRICE.type" prop="discountPrice"> |
| 116 | 减 <el-input-number v-model="scope.row.discountPrice" placeholder="请输入优惠金额" | 116 | 减 <el-input-number v-model="scope.row.discountPrice" placeholder="请输入优惠金额" |
| 117 | style="width: 190px" :precision="2" :min="0" :max="scope.row.price / 100.0 - 0.01" /> 元 | 117 | style="width: 190px" :precision="2" :min="0" :max="scope.row.price / 100.0 - 0.01" /> 元 |
| @@ -123,7 +123,7 @@ | @@ -123,7 +123,7 @@ | ||
| 123 | </template> | 123 | </template> |
| 124 | </el-table-column> | 124 | </el-table-column> |
| 125 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 125 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 126 | - <template slot-scope="scope"> | 126 | + <template v-slot="scope"> |
| 127 | <el-button size="mini" type="text" icon="el-icon-delete" @click="removeFormSku(scope.row.skuId)">删除</el-button> | 127 | <el-button size="mini" type="text" icon="el-icon-delete" @click="removeFormSku(scope.row.skuId)">删除</el-button> |
| 128 | </template> | 128 | </template> |
| 129 | </el-table-column> | 129 | </el-table-column> |
yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue
| @@ -31,23 +31,23 @@ | @@ -31,23 +31,23 @@ | ||
| 31 | <el-table v-loading="loading" :data="list"> | 31 | <el-table v-loading="loading" :data="list"> |
| 32 | <el-table-column label="活动名称" align="center" prop="name" /> | 32 | <el-table-column label="活动名称" align="center" prop="name" /> |
| 33 | <el-table-column label="活动时间" align="center" prop="startTime" width="240"> | 33 | <el-table-column label="活动时间" align="center" prop="startTime" width="240"> |
| 34 | - <template slot-scope="scope"> | 34 | + <template v-slot="scope"> |
| 35 | <div>开始:{{ parseTime(scope.row.startTime) }}</div> | 35 | <div>开始:{{ parseTime(scope.row.startTime) }}</div> |
| 36 | <div>结束:{{ parseTime(scope.row.endTime) }}</div> | 36 | <div>结束:{{ parseTime(scope.row.endTime) }}</div> |
| 37 | </template> | 37 | </template> |
| 38 | </el-table-column> | 38 | </el-table-column> |
| 39 | <el-table-column label="状态" align="center" prop="status"> | 39 | <el-table-column label="状态" align="center" prop="status"> |
| 40 | - <template slot-scope="scope"> | 40 | + <template v-slot="scope"> |
| 41 | <dict-tag :type="DICT_TYPE.PROMOTION_ACTIVITY_STATUS" :value="scope.row.status" /> | 41 | <dict-tag :type="DICT_TYPE.PROMOTION_ACTIVITY_STATUS" :value="scope.row.status" /> |
| 42 | </template> | 42 | </template> |
| 43 | </el-table-column> | 43 | </el-table-column> |
| 44 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 44 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 45 | - <template slot-scope="scope"> | 45 | + <template v-slot="scope"> |
| 46 | <span>{{ parseTime(scope.row.createTime) }}</span> | 46 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 47 | </template> | 47 | </template> |
| 48 | </el-table-column> | 48 | </el-table-column> |
| 49 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 49 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 50 | - <template slot-scope="scope"> | 50 | + <template v-slot="scope"> |
| 51 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 51 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 52 | v-if="scope.row.status !== PromotionActivityStatusEnum.CLOSE.type" | 52 | v-if="scope.row.status !== PromotionActivityStatusEnum.CLOSE.type" |
| 53 | v-hasPermi="['promotion:reward-activity:update']">修改</el-button> | 53 | v-hasPermi="['promotion:reward-activity:update']">修改</el-button> |
yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue
| @@ -47,12 +47,12 @@ | @@ -47,12 +47,12 @@ | ||
| 47 | <el-table v-loading="loading" :data="list"> | 47 | <el-table v-loading="loading" :data="list"> |
| 48 | <el-table-column label="活动名称" align="center" prop="name" /> | 48 | <el-table-column label="活动名称" align="center" prop="name" /> |
| 49 | <el-table-column label="活动状态" align="center" prop="status"> | 49 | <el-table-column label="活动状态" align="center" prop="status"> |
| 50 | - <template slot-scope="scope"> | 50 | + <template v-slot="scope"> |
| 51 | <dict-tag :type="DICT_TYPE.PROMOTION_ACTIVITY_STATUS" :value="scope.row.status" /> | 51 | <dict-tag :type="DICT_TYPE.PROMOTION_ACTIVITY_STATUS" :value="scope.row.status" /> |
| 52 | </template> | 52 | </template> |
| 53 | </el-table-column> | 53 | </el-table-column> |
| 54 | <el-table-column label="参与场次" prop="timeIds" width="250"> | 54 | <el-table-column label="参与场次" prop="timeIds" width="250"> |
| 55 | - <template slot-scope="scope"> | 55 | + <template v-slot="scope"> |
| 56 | <span v-for="item in seckillTimeList" :key="item.id" | 56 | <span v-for="item in seckillTimeList" :key="item.id" |
| 57 | v-if="scope.row.timeIds.includes(item.id)"> | 57 | v-if="scope.row.timeIds.includes(item.id)"> |
| 58 | <el-tag style="margin:4px;" size="small">{{ item.name }}</el-tag> | 58 | <el-tag style="margin:4px;" size="small">{{ item.name }}</el-tag> |
| @@ -60,7 +60,7 @@ | @@ -60,7 +60,7 @@ | ||
| 60 | </template> | 60 | </template> |
| 61 | </el-table-column> | 61 | </el-table-column> |
| 62 | <el-table-column label="活动开始时间" align="center" prop="startTime" width="190"> | 62 | <el-table-column label="活动开始时间" align="center" prop="startTime" width="190"> |
| 63 | - <template slot-scope="scope"> | 63 | + <template v-slot="scope"> |
| 64 | <span>{{ "开始: " + parseTime(scope.row.startTime) }}</span> | 64 | <span>{{ "开始: " + parseTime(scope.row.startTime) }}</span> |
| 65 | <span>{{ "结束: " + parseTime(scope.row.endTime) }}</span> | 65 | <span>{{ "结束: " + parseTime(scope.row.endTime) }}</span> |
| 66 | </template> | 66 | </template> |
| @@ -69,12 +69,12 @@ | @@ -69,12 +69,12 @@ | ||
| 69 | <el-table-column label="付款订单数" align="center" prop="orderCount" /> | 69 | <el-table-column label="付款订单数" align="center" prop="orderCount" /> |
| 70 | <el-table-column label="付款人数" align="center" prop="userCount" /> | 70 | <el-table-column label="付款人数" align="center" prop="userCount" /> |
| 71 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 71 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 72 | - <template slot-scope="scope"> | 72 | + <template v-slot="scope"> |
| 73 | <span>{{ parseTime(scope.row.createTime) }}</span> | 73 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 74 | </template> | 74 | </template> |
| 75 | </el-table-column> | 75 | </el-table-column> |
| 76 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 76 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 77 | - <template slot-scope="scope"> | 77 | + <template v-slot="scope"> |
| 78 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 78 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 79 | v-hasPermi="['promotion:seckill-activity:update']">修改</el-button> | 79 | v-hasPermi="['promotion:seckill-activity:update']">修改</el-button> |
| 80 | <el-button size="mini" type="text" icon="el-icon-close" @click="handleClose(scope.row)" | 80 | <el-button size="mini" type="text" icon="el-icon-close" @click="handleClose(scope.row)" |
| @@ -137,37 +137,37 @@ | @@ -137,37 +137,37 @@ | ||
| 137 | <el-table-column type="selection" width="55"> | 137 | <el-table-column type="selection" width="55"> |
| 138 | </el-table-column> | 138 | </el-table-column> |
| 139 | <el-table-column label="商品名称" align="center" width="200"> | 139 | <el-table-column label="商品名称" align="center" width="200"> |
| 140 | - <template slot-scope="scope"> | 140 | + <template v-slot="scope"> |
| 141 | {{ scope.row.spuName }} {{ scope.row.name }} | 141 | {{ scope.row.spuName }} {{ scope.row.name }} |
| 142 | </template> | 142 | </template> |
| 143 | </el-table-column> | 143 | </el-table-column> |
| 144 | <el-table-column label="商品价格" align="center" prop="price"> | 144 | <el-table-column label="商品价格" align="center" prop="price"> |
| 145 | - <template slot-scope="scope"> | 145 | + <template v-slot="scope"> |
| 146 | ¥{{ (scope.row.price / 100.0).toFixed(2) }} | 146 | ¥{{ (scope.row.price / 100.0).toFixed(2) }} |
| 147 | </template> | 147 | </template> |
| 148 | </el-table-column> | 148 | </el-table-column> |
| 149 | <el-table-column label="库存" align="center" prop="productStock" /> | 149 | <el-table-column label="库存" align="center" prop="productStock" /> |
| 150 | <el-table-column label="限购(0为不限购)" align="center" width="150"> | 150 | <el-table-column label="限购(0为不限购)" align="center" width="150"> |
| 151 | - <template slot-scope="scope"> | 151 | + <template v-slot="scope"> |
| 152 | <el-input-number v-model="scope.row.limitBuyCount" size="mini" :min="0" :max="10000"> | 152 | <el-input-number v-model="scope.row.limitBuyCount" size="mini" :min="0" :max="10000"> |
| 153 | </el-input-number> | 153 | </el-input-number> |
| 154 | </template> | 154 | </template> |
| 155 | </el-table-column> | 155 | </el-table-column> |
| 156 | <el-table-column label="秒杀价(元)" align="center" width="150"> | 156 | <el-table-column label="秒杀价(元)" align="center" width="150"> |
| 157 | - <template slot-scope="scope"> | 157 | + <template v-slot="scope"> |
| 158 | <el-input-number v-model="scope.row.seckillPrice" size="mini" :precision="2" :min="0" | 158 | <el-input-number v-model="scope.row.seckillPrice" size="mini" :precision="2" :min="0" |
| 159 | :max="10000"> | 159 | :max="10000"> |
| 160 | </el-input-number> | 160 | </el-input-number> |
| 161 | </template> | 161 | </template> |
| 162 | </el-table-column> | 162 | </el-table-column> |
| 163 | <el-table-column label="秒杀库存" align="center" width="150" prop="seckillStock"> | 163 | <el-table-column label="秒杀库存" align="center" width="150" prop="seckillStock"> |
| 164 | - <template slot-scope="scope"> | 164 | + <template v-slot="scope"> |
| 165 | <el-input-number v-model="scope.row.seckillStock" size="mini" :min="0" :max="10000"> | 165 | <el-input-number v-model="scope.row.seckillStock" size="mini" :min="0" :max="10000"> |
| 166 | </el-input-number> | 166 | </el-input-number> |
| 167 | </template> | 167 | </template> |
| 168 | </el-table-column> | 168 | </el-table-column> |
| 169 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 169 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 170 | - <template slot-scope="scope"> | 170 | + <template v-slot="scope"> |
| 171 | <el-button size="mini" type="text" icon="el-icon-delete" | 171 | <el-button size="mini" type="text" icon="el-icon-delete" |
| 172 | @click="removeFormSku(scope.row.skuId)">删除 | 172 | @click="removeFormSku(scope.row.skuId)">删除 |
| 173 | </el-button> | 173 | </el-button> |
yudao-ui-admin/src/views/mall/promotion/seckill/seckillTime/index.vue
| @@ -14,23 +14,23 @@ | @@ -14,23 +14,23 @@ | ||
| 14 | <el-table v-loading="loading" :data="list"> | 14 | <el-table v-loading="loading" :data="list"> |
| 15 | <el-table-column label="秒杀时段名称" align="center" prop="name" /> | 15 | <el-table-column label="秒杀时段名称" align="center" prop="name" /> |
| 16 | <el-table-column label="开始时间点" align="center" prop="startTime" width="180"> | 16 | <el-table-column label="开始时间点" align="center" prop="startTime" width="180"> |
| 17 | - <template slot-scope="scope"> | 17 | + <template v-slot="scope"> |
| 18 | <span>{{ scope.row.startTime }}</span> | 18 | <span>{{ scope.row.startTime }}</span> |
| 19 | </template> | 19 | </template> |
| 20 | </el-table-column> | 20 | </el-table-column> |
| 21 | <el-table-column label="结束时间点" align="center" prop="endTime" width="180"> | 21 | <el-table-column label="结束时间点" align="center" prop="endTime" width="180"> |
| 22 | - <template slot-scope="scope"> | 22 | + <template v-slot="scope"> |
| 23 | <span>{{ scope.row.endTime }}</span> | 23 | <span>{{ scope.row.endTime }}</span> |
| 24 | </template> | 24 | </template> |
| 25 | </el-table-column> | 25 | </el-table-column> |
| 26 | <el-table-column label="秒杀活动数量" align="center" prop="seckillActivityCount" /> | 26 | <el-table-column label="秒杀活动数量" align="center" prop="seckillActivityCount" /> |
| 27 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 27 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 28 | - <template slot-scope="scope"> | 28 | + <template v-slot="scope"> |
| 29 | <span>{{ parseTime(scope.row.createTime) }}</span> | 29 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 30 | </template> | 30 | </template> |
| 31 | </el-table-column> | 31 | </el-table-column> |
| 32 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 32 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 33 | - <template slot-scope="scope"> | 33 | + <template v-slot="scope"> |
| 34 | <el-button size="mini" type="text" icon="el-icon-view" @click="handleOpenSeckillActivity(scope.row)"> | 34 | <el-button size="mini" type="text" icon="el-icon-view" @click="handleOpenSeckillActivity(scope.row)"> |
| 35 | 查看秒杀活动</el-button> | 35 | 查看秒杀活动</el-button> |
| 36 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 36 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
| @@ -57,7 +57,7 @@ | @@ -57,7 +57,7 @@ | ||
| 57 | <el-table-column label="订单编号" align="center" prop="orderNo" /> <!-- TODO 芋艿:未来要加个订单链接 --> | 57 | <el-table-column label="订单编号" align="center" prop="orderNo" /> <!-- TODO 芋艿:未来要加个订单链接 --> |
| 58 | <el-table-column label="商品信息" align="center" prop="spuName" width="auto" min-width="300"> | 58 | <el-table-column label="商品信息" align="center" prop="spuName" width="auto" min-width="300"> |
| 59 | <!-- TODO @小红:样式不太对,辛苦改改 --> | 59 | <!-- TODO @小红:样式不太对,辛苦改改 --> |
| 60 | -<!-- <div slot-scope="{ row }" class="goods-info">--> | 60 | +<!-- <div v-slot="{ row }" class="goods-info">--> |
| 61 | <!-- <img :src="row.picUrl"/>--> | 61 | <!-- <img :src="row.picUrl"/>--> |
| 62 | <!-- <span class="ellipsis-2" :title="row.name">{{row.name}}</span>--> | 62 | <!-- <span class="ellipsis-2" :title="row.name">{{row.name}}</span>--> |
| 63 | <!-- </div>--> | 63 | <!-- </div>--> |
yudao-ui-admin/src/views/mall/trade/order/detail.vue
| @@ -56,25 +56,25 @@ | @@ -56,25 +56,25 @@ | ||
| 56 | <el-descriptions-item labelClassName="no-colon"> | 56 | <el-descriptions-item labelClassName="no-colon"> |
| 57 | <el-table :data="order.items" border> | 57 | <el-table :data="order.items" border> |
| 58 | <el-table-column prop="spuName" label="商品" width="700"> | 58 | <el-table-column prop="spuName" label="商品" width="700"> |
| 59 | - <template slot-scope="{ row }"> | 59 | + <template v-slot="{ row }"> |
| 60 | {{row.spuName}} | 60 | {{row.spuName}} |
| 61 | <el-tag size="medium" v-for="property in row.properties" :key="property.propertyId"> | 61 | <el-tag size="medium" v-for="property in row.properties" :key="property.propertyId"> |
| 62 | {{property.propertyName}}:{{property.valueName}}</el-tag> | 62 | {{property.propertyName}}:{{property.valueName}}</el-tag> |
| 63 | </template> | 63 | </template> |
| 64 | </el-table-column> | 64 | </el-table-column> |
| 65 | <el-table-column prop="originalUnitPrice" label="单价(元)" width="180"> | 65 | <el-table-column prop="originalUnitPrice" label="单价(元)" width="180"> |
| 66 | - <template slot-scope="{ row }"> | 66 | + <template v-slot="{ row }"> |
| 67 | ¥{{ (row.originalUnitPrice / 100.0).toFixed(2) }} | 67 | ¥{{ (row.originalUnitPrice / 100.0).toFixed(2) }} |
| 68 | </template> | 68 | </template> |
| 69 | </el-table-column> | 69 | </el-table-column> |
| 70 | <el-table-column prop="count" label="数量" width="180"/> | 70 | <el-table-column prop="count" label="数量" width="180"/> |
| 71 | <el-table-column prop="originalPrice" label="小计(元)" width="180"> | 71 | <el-table-column prop="originalPrice" label="小计(元)" width="180"> |
| 72 | - <template slot-scope="{ row }"> | 72 | + <template v-slot="{ row }"> |
| 73 | ¥{{ (row.originalPrice / 100.0).toFixed(2) }} | 73 | ¥{{ (row.originalPrice / 100.0).toFixed(2) }} |
| 74 | </template> | 74 | </template> |
| 75 | </el-table-column> | 75 | </el-table-column> |
| 76 | <el-table-column prop="afterSaleStatus" label="退款状态"> | 76 | <el-table-column prop="afterSaleStatus" label="退款状态"> |
| 77 | - <template slot-scope="{ row }"> | 77 | + <template v-slot="{ row }"> |
| 78 | <dict-tag :type="DICT_TYPE.TRADE_ORDER_ITEM_AFTER_SALE_STATUS" :value="row.afterSaleStatus" /> | 78 | <dict-tag :type="DICT_TYPE.TRADE_ORDER_ITEM_AFTER_SALE_STATUS" :value="row.afterSaleStatus" /> |
| 79 | </template> | 79 | </template> |
| 80 | </el-table-column> | 80 | </el-table-column> |
yudao-ui-admin/src/views/mall/trade/order/index.vue
| @@ -71,7 +71,7 @@ | @@ -71,7 +71,7 @@ | ||
| 71 | <!-- 列表 --> | 71 | <!-- 列表 --> |
| 72 | <el-table v-loading="loading" :data="list" :show-header="false" class="order-table"> | 72 | <el-table v-loading="loading" :data="list" :show-header="false" class="order-table"> |
| 73 | <el-table-column> | 73 | <el-table-column> |
| 74 | - <template slot-scope="{ row }"> | 74 | + <template v-slot="{ row }"> |
| 75 | <el-row type="flex" align="middle"> | 75 | <el-row type="flex" align="middle"> |
| 76 | <el-col :span="5"> | 76 | <el-col :span="5"> |
| 77 | 订单号:{{row.no}} | 77 | 订单号:{{row.no}} |
| @@ -94,7 +94,7 @@ | @@ -94,7 +94,7 @@ | ||
| 94 | <!-- 订单下的商品 --> | 94 | <!-- 订单下的商品 --> |
| 95 | <el-table :data="row.items" border :show-header="true"> | 95 | <el-table :data="row.items" border :show-header="true"> |
| 96 | <el-table-column label="商品" prop="goods" header-align="center" width="auto" min-width="300"> | 96 | <el-table-column label="商品" prop="goods" header-align="center" width="auto" min-width="300"> |
| 97 | - <template slot-scope="{ row, $index }"> | 97 | + <template v-slot="{ row, $index }"> |
| 98 | <div class="goods-info"> | 98 | <div class="goods-info"> |
| 99 | <img :src="row.picUrl"/> | 99 | <img :src="row.picUrl"/> |
| 100 | <span class="ellipsis-2" :title="row.spuName">{{row.spuName}}</span> | 100 | <span class="ellipsis-2" :title="row.spuName">{{row.spuName}}</span> |
| @@ -105,7 +105,7 @@ | @@ -105,7 +105,7 @@ | ||
| 105 | </template> | 105 | </template> |
| 106 | </el-table-column> | 106 | </el-table-column> |
| 107 | <el-table-column label="单价(元)/数量" prop="fee" align="center" width="115"> | 107 | <el-table-column label="单价(元)/数量" prop="fee" align="center" width="115"> |
| 108 | - <template slot-scope="{ row }"> | 108 | + <template v-slot="{ row }"> |
| 109 | <div>¥{{ (row.originalUnitPrice / 100.0).toFixed(2) }}</div> | 109 | <div>¥{{ (row.originalUnitPrice / 100.0).toFixed(2) }}</div> |
| 110 | <div>{{row.count}} 件</div> | 110 | <div>{{row.count}} 件</div> |
| 111 | </template> | 111 | </template> |
| @@ -114,7 +114,7 @@ | @@ -114,7 +114,7 @@ | ||
| 114 | <el-table-column label="实付金额(元)" prop="amount" align="center" width="100"/> | 114 | <el-table-column label="实付金额(元)" prop="amount" align="center" width="100"/> |
| 115 | <!-- TODO @小程:这里应该是一个订单下,多个商品,只展示订单上的收件信息;使用 order.receiverXXX 开头的字段 --> | 115 | <!-- TODO @小程:这里应该是一个订单下,多个商品,只展示订单上的收件信息;使用 order.receiverXXX 开头的字段 --> |
| 116 | <el-table-column label="买家/收货人" prop="buyer" header-align="center" width="auto" min-width="300"> | 116 | <el-table-column label="买家/收货人" prop="buyer" header-align="center" width="auto" min-width="300"> |
| 117 | - <template slot-scope="{ row }"> | 117 | + <template v-slot="{ row }"> |
| 118 | <!-- TODO @芋艿:以后增加一个会员详情界面 --> | 118 | <!-- TODO @芋艿:以后增加一个会员详情界面 --> |
| 119 | <div>{{row.buyer}}</div> | 119 | <div>{{row.buyer}}</div> |
| 120 | <div>{{row.receiver}}{{row.tel}}</div> | 120 | <div>{{row.receiver}}{{row.tel}}</div> |
yudao-ui-admin/src/views/mp/account/index.vue
| @@ -44,12 +44,12 @@ | @@ -44,12 +44,12 @@ | ||
| 44 | </el-table-column> | 44 | </el-table-column> |
| 45 | <el-table-column label="备注" align="center" prop="remark"/> | 45 | <el-table-column label="备注" align="center" prop="remark"/> |
| 46 | <!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180">--> | 46 | <!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180">--> |
| 47 | -<!-- <template slot-scope="scope">--> | 47 | +<!-- <template v-slot="scope">--> |
| 48 | <!-- <span>{{ parseTime(scope.row.createTime) }}</span>--> | 48 | <!-- <span>{{ parseTime(scope.row.createTime) }}</span>--> |
| 49 | <!-- </template>--> | 49 | <!-- </template>--> |
| 50 | <!-- </el-table-column>--> | 50 | <!-- </el-table-column>--> |
| 51 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 51 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 52 | - <template slot-scope="scope"> | 52 | + <template v-slot="scope"> |
| 53 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 53 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 54 | v-hasPermi="['mp:account:update']">修改 | 54 | v-hasPermi="['mp:account:update']">修改 |
| 55 | </el-button> | 55 | </el-button> |
yudao-ui-admin/src/views/mp/autoReply/index.vue
| @@ -79,7 +79,7 @@ SOFTWARE. | @@ -79,7 +79,7 @@ SOFTWARE. | ||
| 79 | </template> | 79 | </template> |
| 80 | </el-table-column> | 80 | </el-table-column> |
| 81 | <el-table-column label="回复内容" align="center"> | 81 | <el-table-column label="回复内容" align="center"> |
| 82 | - <template slot-scope="scope"> | 82 | + <template v-slot="scope"> |
| 83 | <div v-if="scope.row.responseMessageType === 'text'">{{ scope.row.responseContent }}</div> | 83 | <div v-if="scope.row.responseMessageType === 'text'">{{ scope.row.responseContent }}</div> |
| 84 | <div v-else-if="scope.row.responseMessageType === 'voice'"> | 84 | <div v-else-if="scope.row.responseMessageType === 'voice'"> |
| 85 | <wx-voice-player :url="scope.row.responseMediaUrl" /> | 85 | <wx-voice-player :url="scope.row.responseMediaUrl" /> |
| @@ -103,12 +103,12 @@ SOFTWARE. | @@ -103,12 +103,12 @@ SOFTWARE. | ||
| 103 | </template> | 103 | </template> |
| 104 | </el-table-column> | 104 | </el-table-column> |
| 105 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 105 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 106 | - <template slot-scope="scope"> | 106 | + <template v-slot="scope"> |
| 107 | <span>{{ parseTime(scope.row.createTime) }}</span> | 107 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 108 | </template> | 108 | </template> |
| 109 | </el-table-column> | 109 | </el-table-column> |
| 110 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 110 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 111 | - <template slot-scope="scope"> | 111 | + <template v-slot="scope"> |
| 112 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 112 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 113 | v-hasPermi="['mp:auto-reply:update']">修改 | 113 | v-hasPermi="['mp:auto-reply:update']">修改 |
| 114 | </el-button> | 114 | </el-button> |
yudao-ui-admin/src/views/mp/material/index.vue
| @@ -94,7 +94,7 @@ SOFTWARE. | @@ -94,7 +94,7 @@ SOFTWARE. | ||
| 94 | </template> | 94 | </template> |
| 95 | </el-table-column> | 95 | </el-table-column> |
| 96 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 96 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 97 | - <template slot-scope="scope"> | 97 | + <template v-slot="scope"> |
| 98 | <el-button type="text" icon="el-icon-download" size="small" plain @click="handleDownload(scope.row)">下载</el-button> | 98 | <el-button type="text" icon="el-icon-download" size="small" plain @click="handleDownload(scope.row)">下载</el-button> |
| 99 | <el-button type="text" icon="el-icon-delete" size="small" plain @click="handleDelete(scope.row)" | 99 | <el-button type="text" icon="el-icon-delete" size="small" plain @click="handleDelete(scope.row)" |
| 100 | v-hasPermi="['mp:material:delete']">删除</el-button> | 100 | v-hasPermi="['mp:material:delete']">删除</el-button> |
yudao-ui-admin/src/views/mp/message/index.vue
| @@ -37,20 +37,20 @@ | @@ -37,20 +37,20 @@ | ||
| 37 | <!-- 列表 --> | 37 | <!-- 列表 --> |
| 38 | <el-table v-loading="loading" :data="list"> | 38 | <el-table v-loading="loading" :data="list"> |
| 39 | <el-table-column label="发送时间" align="center" prop="createTime" width="180"> | 39 | <el-table-column label="发送时间" align="center" prop="createTime" width="180"> |
| 40 | - <template slot-scope="scope"> | 40 | + <template v-slot="scope"> |
| 41 | <span>{{ parseTime(scope.row.createTime) }}</span> | 41 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 42 | </template> | 42 | </template> |
| 43 | </el-table-column> | 43 | </el-table-column> |
| 44 | <el-table-column label="消息类型" align="center" prop="type" width="80"/> | 44 | <el-table-column label="消息类型" align="center" prop="type" width="80"/> |
| 45 | <el-table-column label="发送方" align="center" prop="sendFrom" width="80"> | 45 | <el-table-column label="发送方" align="center" prop="sendFrom" width="80"> |
| 46 | - <template slot-scope="scope"> | 46 | + <template v-slot="scope"> |
| 47 | <el-tag v-if="scope.row.sendFrom === 1" type="success">粉丝</el-tag> | 47 | <el-tag v-if="scope.row.sendFrom === 1" type="success">粉丝</el-tag> |
| 48 | <el-tag v-else type="info">公众号</el-tag> | 48 | <el-tag v-else type="info">公众号</el-tag> |
| 49 | </template> | 49 | </template> |
| 50 | </el-table-column> | 50 | </el-table-column> |
| 51 | <el-table-column label="用户标识" align="center" prop="openid" width="300" /> | 51 | <el-table-column label="用户标识" align="center" prop="openid" width="300" /> |
| 52 | <el-table-column label="内容" prop="content"> | 52 | <el-table-column label="内容" prop="content"> |
| 53 | - <template slot-scope="scope"> | 53 | + <template v-slot="scope"> |
| 54 | <!-- 【事件】区域 --> | 54 | <!-- 【事件】区域 --> |
| 55 | <div v-if="scope.row.type === 'event' && scope.row.event === 'subscribe'"> | 55 | <div v-if="scope.row.type === 'event' && scope.row.event === 'subscribe'"> |
| 56 | <el-tag type="success" size="mini">关注</el-tag> | 56 | <el-tag type="success" size="mini">关注</el-tag> |
| @@ -118,7 +118,7 @@ | @@ -118,7 +118,7 @@ | ||
| 118 | </template> | 118 | </template> |
| 119 | </el-table-column> | 119 | </el-table-column> |
| 120 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 120 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 121 | - <template slot-scope="scope"> | 121 | + <template v-slot="scope"> |
| 122 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleSend(scope.row)" | 122 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleSend(scope.row)" |
| 123 | v-hasPermi="['mp:message:send']">消息 | 123 | v-hasPermi="['mp:message:send']">消息 |
| 124 | </el-button> | 124 | </el-button> |
yudao-ui-admin/src/views/mp/mpuser/index.vue
| @@ -38,25 +38,25 @@ | @@ -38,25 +38,25 @@ | ||
| 38 | <el-table-column label="昵称" align="center" prop="nickname" /> | 38 | <el-table-column label="昵称" align="center" prop="nickname" /> |
| 39 | <el-table-column label="备注" align="center" prop="remark" /> | 39 | <el-table-column label="备注" align="center" prop="remark" /> |
| 40 | <el-table-column label="标签" align="center" prop="tagIds" width="200"> | 40 | <el-table-column label="标签" align="center" prop="tagIds" width="200"> |
| 41 | - <template slot-scope="scope"> | 41 | + <template v-slot="scope"> |
| 42 | <span v-for="(tagId, index) in scope.row.tagIds" :key="index"> | 42 | <span v-for="(tagId, index) in scope.row.tagIds" :key="index"> |
| 43 | <el-tag>{{ tags.find(tag => tag.tagId === tagId)?.name }} </el-tag> | 43 | <el-tag>{{ tags.find(tag => tag.tagId === tagId)?.name }} </el-tag> |
| 44 | </span> | 44 | </span> |
| 45 | </template> | 45 | </template> |
| 46 | </el-table-column> | 46 | </el-table-column> |
| 47 | <el-table-column label="订阅状态" align="center" prop="subscribeStatus"> | 47 | <el-table-column label="订阅状态" align="center" prop="subscribeStatus"> |
| 48 | - <template slot-scope="scope"> | 48 | + <template v-slot="scope"> |
| 49 | <el-tag v-if="scope.row.subscribeStatus === 0" type="success">已订阅</el-tag> | 49 | <el-tag v-if="scope.row.subscribeStatus === 0" type="success">已订阅</el-tag> |
| 50 | <el-tag v-else type="danger">未订阅</el-tag> | 50 | <el-tag v-else type="danger">未订阅</el-tag> |
| 51 | </template> | 51 | </template> |
| 52 | </el-table-column> | 52 | </el-table-column> |
| 53 | <el-table-column label="订阅时间" align="center" prop="subscribeTime" width="180"> | 53 | <el-table-column label="订阅时间" align="center" prop="subscribeTime" width="180"> |
| 54 | - <template slot-scope="scope"> | 54 | + <template v-slot="scope"> |
| 55 | <span>{{ parseTime(scope.row.subscribeTime) }}</span> | 55 | <span>{{ parseTime(scope.row.subscribeTime) }}</span> |
| 56 | </template> | 56 | </template> |
| 57 | </el-table-column> | 57 | </el-table-column> |
| 58 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 58 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 59 | - <template slot-scope="scope"> | 59 | + <template v-slot="scope"> |
| 60 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 60 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 61 | v-hasPermi="['mp:user:update']">修改</el-button> | 61 | v-hasPermi="['mp:user:update']">修改</el-button> |
| 62 | </template> | 62 | </template> |
yudao-ui-admin/src/views/mp/tag/index.vue
| @@ -39,12 +39,12 @@ | @@ -39,12 +39,12 @@ | ||
| 39 | <el-table-column label="标签名称" align="center" prop="name"/> | 39 | <el-table-column label="标签名称" align="center" prop="name"/> |
| 40 | <el-table-column label="粉丝数" align="center" prop="count"/> | 40 | <el-table-column label="粉丝数" align="center" prop="count"/> |
| 41 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 41 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 42 | - <template slot-scope="scope"> | 42 | + <template v-slot="scope"> |
| 43 | <span>{{ parseTime(scope.row.createTime) }}</span> | 43 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 44 | </template> | 44 | </template> |
| 45 | </el-table-column> | 45 | </el-table-column> |
| 46 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 46 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 47 | - <template slot-scope="scope"> | 47 | + <template v-slot="scope"> |
| 48 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 48 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 49 | v-hasPermi="['mp:tag:update']">修改 | 49 | v-hasPermi="['mp:tag:update']">修改 |
| 50 | </el-button> | 50 | </el-button> |
yudao-ui-admin/src/views/system/notify/my/index.vue
| @@ -36,7 +36,7 @@ | @@ -36,7 +36,7 @@ | ||
| 36 | <el-table-column type="selection" width="55" /> | 36 | <el-table-column type="selection" width="55" /> |
| 37 | <el-table-column label="发送人" align="center" prop="templateNickname" width="120" /> | 37 | <el-table-column label="发送人" align="center" prop="templateNickname" width="120" /> |
| 38 | <el-table-column label="发送时间" align="center" prop="createTime" width="180"> | 38 | <el-table-column label="发送时间" align="center" prop="createTime" width="180"> |
| 39 | - <template slot-scope="scope"> | 39 | + <template v-slot="scope"> |
| 40 | <span>{{ parseTime(scope.row.createTime) }}</span> | 40 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 41 | </template> | 41 | </template> |
| 42 | </el-table-column> | 42 | </el-table-column> |
| @@ -47,12 +47,12 @@ | @@ -47,12 +47,12 @@ | ||
| 47 | </el-table-column> | 47 | </el-table-column> |
| 48 | <el-table-column label="内容" align="center" prop="templateContent" /> | 48 | <el-table-column label="内容" align="center" prop="templateContent" /> |
| 49 | <el-table-column label="是否已读" align="center" prop="readStatus" width="80"> | 49 | <el-table-column label="是否已读" align="center" prop="readStatus" width="80"> |
| 50 | - <template slot-scope="scope"> | 50 | + <template v-slot="scope"> |
| 51 | <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.readStatus"/> | 51 | <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.readStatus"/> |
| 52 | </template> | 52 | </template> |
| 53 | </el-table-column> | 53 | </el-table-column> |
| 54 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150"> | 54 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150"> |
| 55 | - <template slot-scope="scope"> | 55 | + <template v-slot="scope"> |
| 56 | <el-button v-show="!scope.row.readStatus" size="mini" type="text" icon="el-icon-check" @click="handleUpdateSingle(scope.row)">已读</el-button> | 56 | <el-button v-show="!scope.row.readStatus" size="mini" type="text" icon="el-icon-check" @click="handleUpdateSingle(scope.row)">已读</el-button> |
| 57 | </template> | 57 | </template> |
| 58 | </el-table-column> | 58 | </el-table-column> |
yudao-ui-admin/src/views/system/notify/template/index.vue
| @@ -47,18 +47,18 @@ | @@ -47,18 +47,18 @@ | ||
| 47 | <el-table-column label="发送人名称" align="center" prop="nickname" /> | 47 | <el-table-column label="发送人名称" align="center" prop="nickname" /> |
| 48 | <el-table-column label="模板内容" align="center" prop="content" width="300" /> | 48 | <el-table-column label="模板内容" align="center" prop="content" width="300" /> |
| 49 | <el-table-column label="开启状态" align="center" prop="status"> | 49 | <el-table-column label="开启状态" align="center" prop="status"> |
| 50 | - <template slot-scope="scope"> | 50 | + <template v-slot="scope"> |
| 51 | <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/> | 51 | <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/> |
| 52 | </template> | 52 | </template> |
| 53 | </el-table-column> | 53 | </el-table-column> |
| 54 | <el-table-column label="备注" align="center" prop="remark" /> | 54 | <el-table-column label="备注" align="center" prop="remark" /> |
| 55 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 55 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 56 | - <template slot-scope="scope"> | 56 | + <template v-slot="scope"> |
| 57 | <span>{{ parseTime(scope.row.createTime) }}</span> | 57 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 58 | </template> | 58 | </template> |
| 59 | </el-table-column> | 59 | </el-table-column> |
| 60 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150"> | 60 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150"> |
| 61 | - <template slot-scope="scope"> | 61 | + <template v-slot="scope"> |
| 62 | <el-button size="mini" type="text" icon="el-icon-share" @click="handleSendNotify(scope.row)" | 62 | <el-button size="mini" type="text" icon="el-icon-share" @click="handleSendNotify(scope.row)" |
| 63 | v-hasPermi="['system:notify-template:send-notify']">测试</el-button> | 63 | v-hasPermi="['system:notify-template:send-notify']">测试</el-button> |
| 64 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 64 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
yudao-ui-admin/src/views/system/role/index.vue
| @@ -43,23 +43,23 @@ | @@ -43,23 +43,23 @@ | ||
| 43 | <el-table-column label="角色名称" prop="name" :show-overflow-tooltip="true" width="150" /> | 43 | <el-table-column label="角色名称" prop="name" :show-overflow-tooltip="true" width="150" /> |
| 44 | <el-table-column label="角色标识" prop="code" :show-overflow-tooltip="true" width="150" /> | 44 | <el-table-column label="角色标识" prop="code" :show-overflow-tooltip="true" width="150" /> |
| 45 | <el-table-column label="角色类型" prop="type" width="80"> | 45 | <el-table-column label="角色类型" prop="type" width="80"> |
| 46 | - <template slot-scope="scope"> | 46 | + <template v-slot="scope"> |
| 47 | <dict-tag :type="DICT_TYPE.SYSTEM_ROLE_TYPE" :value="scope.row.type"/> | 47 | <dict-tag :type="DICT_TYPE.SYSTEM_ROLE_TYPE" :value="scope.row.type"/> |
| 48 | </template> | 48 | </template> |
| 49 | </el-table-column> | 49 | </el-table-column> |
| 50 | <el-table-column label="显示顺序" prop="sort" width="100" /> | 50 | <el-table-column label="显示顺序" prop="sort" width="100" /> |
| 51 | <el-table-column label="状态" align="center" width="100"> | 51 | <el-table-column label="状态" align="center" width="100"> |
| 52 | - <template slot-scope="scope"> | 52 | + <template v-slot="scope"> |
| 53 | <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)"/> | 53 | <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)"/> |
| 54 | </template> | 54 | </template> |
| 55 | </el-table-column> | 55 | </el-table-column> |
| 56 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | 56 | <el-table-column label="创建时间" align="center" prop="createTime" width="180"> |
| 57 | - <template slot-scope="scope"> | 57 | + <template v-slot="scope"> |
| 58 | <span>{{ parseTime(scope.row.createTime) }}</span> | 58 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 59 | </template> | 59 | </template> |
| 60 | </el-table-column> | 60 | </el-table-column> |
| 61 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | 61 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |
| 62 | - <template slot-scope="scope"> | 62 | + <template v-slot="scope"> |
| 63 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | 63 | <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" |
| 64 | v-hasPermi="['system:role:update']">修改</el-button> | 64 | v-hasPermi="['system:role:update']">修改</el-button> |
| 65 | <el-button size="mini" type="text" icon="el-icon-circle-check" @click="handleMenu(scope.row)" | 65 | <el-button size="mini" type="text" icon="el-icon-circle-check" @click="handleMenu(scope.row)" |