codeliu
/
merchant-view
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

界面显示修改

This commit is contained in:
1154079537 2024-04-29 18:02:19 +08:00
parent cf787e136e
commit bdc79e3ca0
6 changed files with 96 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/merchant.ts
View File

@ -80,3 +80,8 @@ export function merchantAreaListApi(params: any) {
export function streetListApi(params: any) {
return request.get({ url: '/merchant.merchant/streetList', params })
}
// 每日跟进情况
export function todayMerchantApi(params: any) {
return request.post({ url: '/merchant.merchant/todayMerchant', params })
}

10
src/layout/default/components/header/notice.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<el-popover placement="bottom" trigger="hover" width="200px">
<el-popover placement="bottom" trigger="hover" width="360px">
<template #reference>
<el-badge
:value="newsList.length"
@ -17,11 +17,15 @@
:show-header="false"
>
<el-table-column
width="160"
width="360"
property="type_name"
label="店铺类型"
align="center"
/>
>
<template #default="{ row }">
<span>{{ row.type_name + '分类下商户无交易记录' }}</span>
</template>
</el-table-column>
</el-table>
</el-popover>
</div>

2
src/views/classify_time/index.vue
View File

@ -40,7 +40,7 @@
min-width="200"
show-overflow-tooltip
/>
<el-table-column label="执行时间" prop="time" show-overflow-tooltip />
<el-table-column label="执行时间(当天)" prop="time" ></el-table-column>
<el-table-column label="状态" prop="open" show-overflow-tooltip>
<template #default="{ row }">
<el-tag v-if="row.open == 1" type="success">开启</el-tag>

86
src/views/merchant/index.vue
View File

@ -255,6 +255,7 @@
跟进记录
</router-link>
</el-dropdown-item>
<el-dropdown-item command="mer_today">今日上新</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
@ -389,6 +390,43 @@
</el-form>
</Popup>
<!-- 每日上新情况详解 -->
<Popup
ref="todayRef"
title="每日上新情况"
:async="true"
width="650px"
@confirm="handleSubmit"
@close="onClose"
confirmButtonText=""
>
<el-form ref="formRef" class="ls-form" :model="todayForm" label-width="110px">
<el-form-item label="商品当日更新" prop="goodsToday">
<el-input v-model="todayForm.goodsToday" readonly />
</el-form-item>
<el-form-item label="当日补贴" prop="incomeTodaySubsides">
<el-input v-model="todayForm.incomeTodaySubsides" readonly />
</el-form-item>
<el-form-item label="商品销售金额" prop="payPriceDay">
<el-input v-model="todayForm.payPriceDay" readonly />
</el-form-item>
<el-form-item label="店铺采购金额" prop="procurePriceDay">
<el-input v-model="todayForm.procurePriceDay" readonly />
</el-form-item>
<el-form-item label="日云仓采购对比" prop="yunBuyRateDay">
<el-input v-model="todayForm.yunBuyRateDay" readonly />
</el-form-item>
<el-form-item label="商户扩展量" prop="daySpread">
<el-input v-model="todayForm.daySpread" readonly />
</el-form-item>
</el-form>
</Popup>
<!-- 督导情况 -->
<Popup
ref="monitorRef"
@ -586,7 +624,17 @@
</el-col>
<el-col :span="12">
<el-form-item label="商户总更新">
<el-form-item label="商品今日上架数">
<el-input
v-model="monitorForm.goodsToday"
placeholder=""
readonly
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="商品上架数">
<el-input
v-model="monitorForm.saleGoodsNum"
placeholder=""
@ -919,6 +967,7 @@ import {
saveConditionApi,
recordManApi,
merchantListNoPage,
todayMerchantApi
} from "@/api/merchant";
import { usePaging } from "@/hooks/usePaging";
import { useRoute } from "vue-router";
@ -932,6 +981,7 @@ import mitt from "@/utils/mitt";
const monitorRef: any = ref(null); //监督弹框引用
const formRef: any = ref(null); //监督表单引用
const viewRef: any = ref(null); //查看
const todayRef: any = ref(null); //当日上新
const popupRef = shallowRef<InstanceType<typeof Popup>>(); //商户分配dialog
const tableRef: any = ref(null); //表格引用
const emit = defineEmits(["success", "close"]);
@ -973,6 +1023,9 @@ const onDropdownClick = (type: any, item: any) => {
case "mer_record": //跟进记录
onTraceRecord(item);
break;
case "mer_today":
onTodayRecord(item);
break;
}
};
@ -1045,13 +1098,6 @@ const handleSubmit = async () => {
// 选中的商户行
const selectData = ref<any[]>([]);
const onSelectionChange = (val: any[]) => {
// if (val && val.length > 0) {
// val.forEach((item) => {
// if (item.admin_id > 0) {
// tableRef.value?.toggleRowSelection(item, false);
// }
// });
// }
selectData.value = val;
};
@ -1061,6 +1107,30 @@ const onClose = () => {
tableRef.value?.clearSelection();
};
// 当日上新详情字段
const todayForm = reactive({
incomeTodaySubsides:'',//
payPriceDay:'',
procurePriceDay:'',
yunBuyRateDay:'',
daySpread:'',
goodsToday:''
})
// 当日上新情况
const onTodayRecord = (item:any)=>{
todayMerchantApi({mer_id:item.mer_id}).then(res=>{
todayForm. incomeTodaySubsides = res.incomeTodaySubsides;
todayForm.payPriceDay= res.payPriceDay;
todayForm.procurePriceDay= res.procurePriceDay;
todayForm.yunBuyRateDay= res.yunBuyRateDay;
todayForm.daySpread= res.daySpread;
todayForm.goodsToday= res.goodsToday;
todayRef.value?.open();
})
}
// 关闭督导
const onMonitorClose = () => {};

6
src/views/record/edit.vue
View File

@ -8,7 +8,7 @@
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form ref="formRef" :model="formData" label-width="100px" :rules="formRules">
<el-form-item label="主题" prop="theme">
<el-input v-model="formData.theme" clearable placeholder="请输入主题" />
</el-form-item>
@ -59,11 +59,11 @@
</el-select>
</el-form-item>
<el-form-item label="跟进时间" prop="flow_time">
<el-form-item label="下次跟进时间" prop="flow_time">
<el-date-picker
v-model="formData.flow_time"
type="date"
placeholder="请选择跟进时间"
placeholder="请选择下次跟进时间"
style="width: 100%"
>
</el-date-picker>

4
src/views/record/index.vue
View File

@ -100,13 +100,13 @@
<el-table-column label="记录类型" prop="cate_name" show-overflow-tooltip />
<el-table-column label="记录人" prop="admin_info" show-overflow-tooltip />
<el-table-column
label="跟进时间"
label="下次跟进时间"
prop="flow_time"
min-width="160"
show-overflow-tooltip
/>
<el-table-column
label="创建时间"
label="跟进时间"
prop="create_time"
min-width="160"
show-overflow-tooltip