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

Merge branch 'main' of https://gitea.lihaink.cn/weipengfei/ERP-admin

This commit is contained in:
weipengfei 2024-05-21 10:29:09 +08:00
parent f742459dd6 3340863e91
commit 48ea169e7c
5 changed files with 3337 additions and 3335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,29 +1,18 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<popup <popup ref="popupRef" :async="true" width="60vw" @close="handleClose" :bottom-btn="false">
ref="popupRef" <el-descriptions class="margin-top" :title="popupTitle" :column="3" border>
:async="true" <!-- <el-descriptions-item label="供应商图片">
width="60vw"
@close="handleClose"
:bottom-btn="false"
>
<el-descriptions
class="margin-top"
:title="popupTitle"
:column="3"
border
>
<el-descriptions-item label="商户图片">
<material-picker v-model="formData.supplier.mer_avatar" disabled /> <material-picker v-model="formData.supplier.mer_avatar" disabled />
</el-descriptions-item> </el-descriptions-item> -->
<el-descriptions-item label="商户名称"> <el-descriptions-item label="供应商名称">
{{ formData.supplier.mer_name }} {{ formData.supplier.mer_name }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="商户电话"> <el-descriptions-item label="供应商电话">
{{ formData.supplier.service_phone }} {{ formData.supplier.service_phone }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="商户地址"> <el-descriptions-item label="供应商地址">
{{ formData.supplier.mer_address }} {{ formData.supplier?.storeAddress }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="公司名称" :span="2"> <el-descriptions-item label="公司名称" :span="2">
{{ dataJSON.company_name }} {{ dataJSON.company_name }}
@ -48,7 +37,7 @@
<el-radio :label="0">拒绝</el-radio> <el-radio :label="0">拒绝</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="审核备注" prop="mark"> <el-form-item label="审核备注" prop="mark" v-if="auditInfo.status == 0">
<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>

11
src/views/data/supplier/audit/edit.vue
View File

@ -111,14 +111,21 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="经度" prop="long"> <el-form-item label="经度" prop="long">
<el-input v-model="formData.long" clearable placeholder="请输入经度" :readonly="false" /> <el-input v-model="formData.long" clearable placeholder="示例经度：116.5173" :readonly="false" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="纬度" prop="lat"> <el-form-item label="纬度" prop="lat">
<el-input v-model="formData.lat" clearable placeholder="请输入纬度" :readonly="false" /> <el-input v-model="formData.lat" clearable placeholder="示例纬度：39.891232" :readonly="false" />
<a href="https://lbs.amap.com/tools/picker"></a>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="店铺电话" prop="service_phone"> <el-form-item label="店铺电话" prop="service_phone">
<el-input v-model="formData.service_phone" clearable placeholder="请输入店铺电话" :readonly="false" /> <el-input v-model="formData.service_phone" clearable placeholder="请输入店铺电话" :readonly="false" />

11
src/views/data/supplier/supplier/edit.vue
View File

@ -111,12 +111,19 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="经度" prop="long"> <el-form-item label="经度" prop="long">
<el-input v-model="formData.long" clearable placeholder="请输入经度" :readonly="false" /> <!-- <el-input v-model="formData.long" clearable placeholder="请输入经度" :readonly="false" /> -->
<el-input v-model="formData.long" clearable placeholder="示例经度：116.5173" :readonly="false" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="纬度" prop="lat"> <el-form-item label="纬度" prop="lat">
<el-input v-model="formData.lat" clearable placeholder="请输入纬度" :readonly="false" /> <!-- <el-input v-model="formData.lat" clearable placeholder="请输入纬度" :readonly="false" /> -->
<el-input v-model="formData.lat" clearable placeholder="示例纬度：39.891232" :readonly="false" />
<!-- <el-tooltip class="box-item" effect="dark" content="Top Left prompts info"
placement="top-start"> -->
<a href="https://lbs.amap.com/tools/picker" target="_blank" style="color: #4A5DFF;">点击查询经纬度</a>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">

13
src/views/merchant_withdraw/edit.vue
View File

@ -1,7 +1,6 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
@close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules"> <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="提现商户"> <el-form-item label="提现商户">
<el-input v-model="formData.mer_name" clearable placeholder="请输入用户类型 1-商户 2-供应商" :readonly="true" /> <el-input v-model="formData.mer_name" clearable placeholder="请输入用户类型 1-商户 2-供应商" :readonly="true" />
@ -22,8 +21,7 @@
:readonly="true" /> :readonly="true" />
</el-form-item> </el-form-item>
<el-form-item label="账户名称"> <el-form-item label="账户名称">
<el-input v-model="formData.merchant_bank_info.name" clearable placeholder="账户类型" <el-input v-model="formData.merchant_bank_info.name" clearable placeholder="账户类型" :readonly="true" />
:readonly="true" />
</el-form-item> </el-form-item>
<el-form-item label="账户类型"> <el-form-item label="账户类型">
<el-select v-model="formData.merchant_bank_info.is_own"> <el-select v-model="formData.merchant_bank_info.is_own">
@ -54,8 +52,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="拒绝原因" v-if="form.is_check == 2" prop="fail_msg"> <el-form-item label="拒绝原因" v-if="form.is_check == 2" prop="fail_msg">
<el-input type="textarea" v-model="form.fail_msg" clearable placeholder="请输入拒绝原因" <el-input type="textarea" v-model="form.fail_msg" clearable placeholder="请输入拒绝原因" :readonly="false" />
:readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="上传凭证" prop="is_check" v-if="formData.is_check == 1"> <el-form-item label="上传凭证" prop="is_check" v-if="formData.is_check == 1">
@ -172,10 +169,12 @@ const setFormData = async (data: Record<any, any>) => {
formData[key] = data[key] formData[key] = data[key]
} }
} }
if (data.arrival_proof.length) { if (data.arrival_proof?.length) {
form.arrival_proof = JSON.parse(data.arrival_proof) form.arrival_proof = JSON.parse(data.arrival_proof)
} }
form.id = data.id form.id = data.id
} }
const getDetail = async (row: Record<string, any>) => { const getDetail = async (row: Record<string, any>) => {

6608
yarn.lock
View File

File diff suppressed because it is too large Load Diff