feature/task1.0.0__0514__ch
向文可 2 years ago
parent 75bb8b8d52
commit b1b9b01eb4

@ -19,7 +19,7 @@ export async function login(data) {
// 获取用户信息
export function getUserInfo() {
return request({
url: '/uc/user/current',
url: '/uc/user/current/employee',
method: 'get',
});
}

@ -2,7 +2,7 @@
<div class="layout-profile">
<el-avatar :src="userInfo?.avatar" />
<el-dropdown :opts="opts">
<span>{{ userInfo?.nickname || userInfo?.username }}</span>
<span>{{ userInfo?.employeeName }}</span>
</el-dropdown>
</div>
</template>

@ -99,7 +99,9 @@
});
// /
const handleCreate = (row) => {
row.time = [row.activityStartTime, row.activityEndTime];
if (row) {
row.time = [row.activityStartTime, row.activityEndTime];
}
Object.assign(
formState.form,
row || {
@ -199,14 +201,10 @@
<ElButton type="text" onClick={() => handleUpdateProduct(row)}>
设置商品
</ElButton>
<ElButton type="text" disabled={row.activityState !== 1} onClick={() => handleCreate(row)}>
<ElButton type="text" onClick={() => handleCreate(row)}>
编辑
</ElButton>
<ElButton
type="text"
disabled={row.activityState === 2}
onClick={() => handleRemove([row])}
>
<ElButton type="text" onClick={() => handleRemove([row])}>
删除
</ElButton>
</div>

@ -157,18 +157,10 @@
slots: {
default: ({ row }) => (
<div>
<ElButton
disabled={row.state === 2 && !row.edit}
type="text"
onClick={() => handleUpdate(row)}
>
<ElButton type="text" onClick={() => handleUpdate(row)}>
{row.edit ? '保存' : '编辑'}
</ElButton>
<ElButton
disabled={row.state === 2 && !row.edit}
type="text"
onClick={() => handleRemove([row])}
>
<ElButton type="text" onClick={() => handleRemove([row])}>
删除
</ElButton>
</div>

@ -68,9 +68,9 @@
<el-form-item label="申请时间">
{{ state.detail.applyTime }}
</el-form-item>
<el-form-item label="用户账号">
<!-- <el-form-item label="用户账号">
{{ state.detail.userId }}
</el-form-item>
</el-form-item> -->
<el-form-item label="联系人">
{{ state.detail.userNickName }}
</el-form-item>
@ -223,13 +223,16 @@
<h3>退货物流</h3>
<el-form label-width="120px">
<el-form-item label="物流信息">
<span>
{{ state.detail.refundLogistics?.companyName }}
</span>
<span style="margin: 0 10px">
{{ state.detail.refundLogistics?.trackingNo }}
</span>
<el-button type="text" @click="handleTrack"></el-button>
<template v-if="state.detail.refundLogistics">
<span>
{{ state.detail.refundLogistics?.companyName }}
</span>
<span style="margin: 0 10px">
{{ state.detail.refundLogistics?.trackingNo }}
</span>
<el-button type="text" @click="handleTrack"></el-button>
</template>
<span v-else></span>
</el-form-item>
<el-form-item label="退款说明">
{{ state.detail.handleReturnLog?.problemDescribe }}

@ -124,26 +124,11 @@
prop: 'source',
width: 160,
},
{
label: '更新时间',
prop: 'updateTime',
width: 180,
},
{
label: '更新人',
prop: 'updateUser',
width: 180,
},
{
label: '注册时间',
prop: 'createTime',
width: 180,
},
{
label: '创建人',
prop: 'createUser',
width: 160,
},
{
label: '是否启用',
width: 100,

Loading…
Cancel
Save