weipengfei
/
ERP-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
weipengfei 2024-05-18 19:52:46 +08:00
parent 40255a6846
commit f67b35dfbe
6 changed files with 60 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/views/data/merchant/audit/detail.vue
View File

@ -13,104 +13,29 @@
:column="3" :column="3"
border border
> >
<el-descriptions-item label="商户头像">
<material-picker v-model="formData.mer_avatar" disabled />
</el-descriptions-item>
<el-descriptions-item label="商户名称"> <el-descriptions-item label="商户名称">
{{ formData.mer_name }} {{ formData.merchant?.mer_name }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="商户分类"> <el-descriptions-item label="联系人">
<dict-value {{ formData.merchant?.service_user }}
:options="dictData.mer_category_type"
:value="formData.category_id"
/>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="店铺类型"> <el-descriptions-item label="联系电话">
<dict-value {{ formData.merchant?.service_phone }}
:options="dictData.merchat_type"
:value="formData.type_id"
/>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="店主姓名"> <el-descriptions-item label="公司名称" :span="2">
<dict-value {{ dataJSON.company_name }}
:options="dictData.service_user"
:value="formData.type_id"
/>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="是否支持先货后款"> <el-descriptions-item label="营业执照">
<dict-value <material-picker v-model="dataJSON.images" disabled />
:options="dictData.show_status"
:value="formData.credit_buy"
/>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="结算周期(天)"> <el-descriptions-item label="公司地址" :span="2">
{{ formData.settle_cycle }} {{ dataJSON.company_address }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="利率"> <el-descriptions-item label="社会代码">
{{ formData.interest_rate }} {{ dataJSON.social_credit_code }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="城市"> <el-descriptions-item label="更新时间">
{{ formData.city_name }} {{ dataJSON.update_time }}
</el-descriptions-item>
<el-descriptions-item label="区县">
{{ formData.area_name }}
</el-descriptions-item>
<el-descriptions-item label="镇街">
{{ formData.street_name }}
</el-descriptions-item>
<el-descriptions-item label="村">
{{ formData.village_name }}
</el-descriptions-item>
<el-descriptions-item label="商户地址">
{{ formData.mer_address }}
</el-descriptions-item>
<el-descriptions-item label="排序">
{{ formData.sort }}
</el-descriptions-item>
<el-descriptions-item label="商户是否禁用">
<dict-value
:options="dictData.show_status"
:value="formData.status"
/>
</el-descriptions-item>
<el-descriptions-item label="提成比例">
{{ formData.commission_rate }}
</el-descriptions-item>
<el-descriptions-item label="商户手续费单独设置">
<dict-value
:options="dictData.show_status"
:value="formData.commission_switch"
/>
</el-descriptions-item>
<el-descriptions-item label="经度">
{{ formData.long }}
</el-descriptions-item>
<el-descriptions-item label="纬度">
{{ formData.lat }}
</el-descriptions-item>
<el-descriptions-item label="店铺电话">
{{ formData.service_phone }}
</el-descriptions-item>
<el-descriptions-item label="商户余额">
{{ formData.mer_money }}
</el-descriptions-item>
<el-descriptions-item label="商户备注">
{{ formData.mark }}
</el-descriptions-item>
<el-descriptions-item label="银行卡转账信息">
{{ formData.financial_bank }}
</el-descriptions-item>
<el-descriptions-item label="微信转账信息">
{{ formData.financial_wechat }}
</el-descriptions-item>
<el-descriptions-item label="支付宝转账信息">
{{ formData.financial_alipay }}
</el-descriptions-item>
<el-descriptions-item label="默认使用类型">
<dict-value
:options="dictData.financial_type"
:value="formData.financial_type"
/>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-form :model="formData"> <el-form :model="formData">
@ -173,6 +98,7 @@ const formData = reactive({
village_name: '', village_name: '',
mer_address: '', mer_address: '',
mer_avatar: '', mer_avatar: '',
merchant: {},
apply_id: '', apply_id: '',
mark: '', mark: '',
sort: '', sort: '',
@ -199,6 +125,7 @@ const formRules = reactive<any>({
}) })
const dataJSON = ref({});
// 获取详情 // 获取详情
const setFormData = async (data: Record<any, any>) => { const setFormData = async (data: Record<any, any>) => {
for (const key in formData) { for (const key in formData) {
@ -207,7 +134,7 @@ const setFormData = async (data: Record<any, any>) => {
formData[key] = data[key] formData[key] = data[key]
} }
} }
dataJSON.value = JSON.parse(data.merchant?.data_json || '{}')
} }

17
src/views/data/merchant/audit/index.vue
View File

@ -111,8 +111,16 @@
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" /> --> <!-- <el-table-column type="selection" width="55" /> -->
<el-table-column label="商户id" prop="mer_id" show-overflow-tooltip /> <el-table-column label="商户id" prop="id" show-overflow-tooltip />
<el-table-column label="商户分类" prop="category_id"> <el-table-column label="商户名称" prop="merchant.mer_name" show-overflow-tooltip />
<el-table-column label="联系人" prop="merchant.service_user" show-overflow-tooltip />
<el-table-column label="联系电话" prop="merchant.service_phone" show-overflow-tooltip />
<el-table-column label="申请时间" prop="create_time" show-overflow-tooltip>
<template #default="{ row }">
{{ timeFormat(row.create_time, 'yyyy-mm-dd hh:MM:ss') }}
</template>
</el-table-column>
<!-- <el-table-column label="商户分类" prop="category_id">
<template #default="{ row }"> <template #default="{ row }">
<dict-value <dict-value
:options="dictData.mer_category_type" :options="dictData.mer_category_type"
@ -233,7 +241,7 @@
prop="financial_alipay" prop="financial_alipay"
width="160" width="160"
show-overflow-tooltip show-overflow-tooltip
/> /> -->
<el-table-column label="操作" width="150" fixed="right"> <el-table-column label="操作" width="150" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button link type="primary" @click="handleDetail(row)"> 审核 </el-button> <el-button link type="primary" @click="handleDetail(row)"> 审核 </el-button>
@ -269,6 +277,7 @@ import { apiMerchantApplyLists, apiMerchantDelete, } from "@/api/merchant";
import feedback from "@/utils/feedback"; import feedback from "@/utils/feedback";
import EditPopup from "./edit.vue"; import EditPopup from "./edit.vue";
import DetailPopup from "./detail.vue"; import DetailPopup from "./detail.vue";
import { timeFormat } from "@/utils/util";
const editRef = shallowRef<InstanceType<typeof EditPopup>>(); const editRef = shallowRef<InstanceType<typeof EditPopup>>();
const detailRef = shallowRef<InstanceType<typeof EditPopup>>(); const detailRef = shallowRef<InstanceType<typeof EditPopup>>();
@ -333,7 +342,7 @@ const handleDelete = async (mer_id: number | any[]) => {
}; };
// 详情 // 详情
const handleDetail = async (data) => { const handleDetail = async (data: any) => {
// let res = await apiMerchantDetail({ mer_id }) // let res = await apiMerchantDetail({ mer_id })
showDetail.value = true; showDetail.value = true;
await nextTick(); await nextTick();

21
src/views/data/supplier/audit/detail.vue
View File

@ -109,7 +109,7 @@
<el-input v-model="auditInfo.mark" type="textarea" /> <el-input v-model="auditInfo.mark" type="textarea" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="width: 100%; display: flex; justify-content: flex-end;"> <div style="width: 100%; display: flex; justify-content: flex-end">
<el-button @click="onAudit" type="primary">确认</el-button> <el-button @click="onAudit" type="primary">确认</el-button>
</div> </div>
</popup> </popup>
@ -170,7 +170,7 @@ const formData = reactive({
financial_wechat: "", financial_wechat: "",
financial_alipay: "", financial_alipay: "",
financial_type: "", financial_type: "",
supplier: {} supplier: {},
}); });
// 表单验证 // 表单验证
@ -192,15 +192,24 @@ const setFormData = async (data: Record<any, any>) => {
formData[key] = data[key]; formData[key] = data[key];
} }
} }
if (formData.supplier) {
for (const key in formData.supplier) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key];
}
}
}
}; };
const auditInfo = reactive({ const auditInfo = reactive({
status: 1, status: 1,
mark: '' mark: "",
}) });
// 审核 // 审核
const onAudit = () => { const onAudit = () => {
if(auditInfo.status == 0 && auditInfo.mark == '') return ElMessage.error('请输入拒绝原因'); if (auditInfo.status == 0 && auditInfo.mark == "")
return ElMessage.error("请输入拒绝原因");
apiSupplierStatus({ apiSupplierStatus({
id: formData.pid, id: formData.pid,
status: auditInfo.status, status: auditInfo.status,
@ -209,7 +218,7 @@ const onAudit = () => {
mark: auditInfo.mark, mark: auditInfo.mark,
}).then((res) => { }).then((res) => {
popupRef.value?.close(); popupRef.value?.close();
emit('success') emit("success");
}); });
}; };

3
src/views/data/supplier/audit/index.vue
View File

@ -51,7 +51,8 @@
</el-table-column> --> </el-table-column> -->
<el-table-column label="id" prop="id" width="100" show-overflow-tooltip /> <el-table-column label="id" prop="id" width="100" show-overflow-tooltip />
<el-table-column label="商户名称" prop="supplier.mer_name" show-overflow-tooltip /> <el-table-column label="商户名称" prop="supplier.mer_name" show-overflow-tooltip />
<el-table-column label="商户电话" prop="supplier.service_phone" show-overflow-tooltip /> <el-table-column label="联系人" prop="supplier.service_user" show-overflow-tooltip />
<el-table-column label="联系电话" prop="supplier.service_phone" show-overflow-tooltip />
<el-table-column label="创建时间" prop="create_time" show-overflow-tooltip /> <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
<!-- <el-table-column label="结算周期(天)" prop="settle_cycle" show-overflow-tooltip /> --> <!-- <el-table-column label="结算周期(天)" prop="settle_cycle" show-overflow-tooltip /> -->
<!-- <el-table-column label="利率" prop="interest_rate" show-overflow-tooltip /> --> <!-- <el-table-column label="利率" prop="interest_rate" show-overflow-tooltip /> -->

3
src/views/translationOrder/component/goodsOffer.vue
View File

@ -131,7 +131,8 @@ const route = useRoute();
const queryParams = reactive({ const queryParams = reactive({
id: route.query.id, id: route.query.id,
is_adopt: "", is_adopt: "",
is_mer: 2 is_mer: 2,
is_push: 1
}); });
// 分页相关 // 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({

12
src/views/translationOrder/component/noPush.vue
View File

@ -1,6 +1,8 @@
<template> <template>
<div> <div>
<el-button type="primary" @click="rePush" style="margin-bottom: 16px;"> 重新推送 </el-button> <el-button type="primary" @click="rePush" style="margin-bottom: 16px">
重新推送
</el-button>
<el-table :data="pager.lists"> <el-table :data="pager.lists">
<el-table-column <el-table-column
label="商品名称" label="商品名称"
@ -11,7 +13,13 @@
label="商品标签" label="商品标签"
prop="sys_labels_arr" prop="sys_labels_arr"
show-overflow-tooltip show-overflow-tooltip
/> >
<template #default="{ row }">
<span>{{
row.sys_labels_arr.map((t: any) => t.name).join(",")
}}</span>
</template>
</el-table-column>
<el-table-column label="单位" prop="unit_name" show-overflow-tooltip /> <el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
<el-table-column label="单价(元)" prop="price" show-overflow-tooltip /> <el-table-column label="单价(元)" prop="price" show-overflow-tooltip />
<el-table-column prop="nums" label="数量" /> <el-table-column prop="nums" label="数量" />