add
This commit is contained in:
parent
86ce6ea2ef
commit
afca312830
|
@ -1,10 +1,5 @@
|
||||||
NODE_ENV = 'development'
|
NODE_ENV = 'development'
|
||||||
VITE_NOW_TYPE = 'dist'
|
VITE_NOW_TYPE = 'dist'
|
||||||
# Base API
|
# Base API
|
||||||
<<<<<<< HEAD
|
|
||||||
VITE_APP_BASE_URL='http://192.168.1.13:8546'
|
VITE_APP_BASE_URL='http://192.168.1.13:8546'
|
||||||
# VITE_APP_BASE_URL='https://erp.lihaink.cn'
|
# VITE_APP_BASE_URL='https://erp.lihaink.cn'
|
||||||
=======
|
|
||||||
# VITE_APP_BASE_URL='http://192.168.1.22:8546'
|
|
||||||
VITE_APP_BASE_URL='https://erp.lihaink.cn'
|
|
||||||
>>>>>>> 6aebc6e263b88ef40931c5e19a0a6a833a75e1e8
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
{{ formData.supplier.service_phone }}
|
{{ formData.supplier.service_phone }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="供应商地址">
|
<el-descriptions-item label="供应商地址">
|
||||||
{{ formData.supplier?.storeAddress }}
|
{{ formData.supplier?.mer_address }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="公司名称" :span="2">
|
<el-descriptions-item label="公司名称" :span="2">
|
||||||
{{ dataJSON.company_name }}
|
{{ dataJSON.company_name }}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="edit-popup">
|
<div class="edit-popup">
|
||||||
<popup ref="popupRef" :async="true" width="60vw" @close="handleClose" :bottom-btn="false">
|
<popup ref="popupRef" :async="true" width="60vw" @close="handleClose" :bottom-btn="false">
|
||||||
|
|
||||||
<el-descriptions class="margin-top" :title="popupTitle" :column="3" border>
|
<el-descriptions class="margin-top" :title="popupTitle" :column="3" border>
|
||||||
<el-descriptions-item label="供应商头像">
|
<el-descriptions-item label="供应商头像">
|
||||||
<material-picker v-model="formData.mer_avatar" disabled />
|
<material-picker v-model="formData.mer_avatar" disabled />
|
||||||
|
@ -72,12 +73,30 @@
|
||||||
<dict-value :options="dictData.financial_type" :value="formData.financial_type" />
|
<dict-value :options="dictData.financial_type" :value="formData.financial_type" />
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
|
<el-card class="mt-5">
|
||||||
|
<template #header>
|
||||||
|
<span>供应商银行账户</span>
|
||||||
|
</template>
|
||||||
|
<el-table :data="formData.supplier_banks">
|
||||||
|
<el-table-column label="id" prop="id" show-overflow-tooltip />
|
||||||
|
<el-table-column label="账户名称" prop="name" show-overflow-tooltip />
|
||||||
|
<el-table-column label="电话" prop="phone" show-overflow-tooltip />
|
||||||
|
<el-table-column label="开户网点" prop="bank_branch" show-overflow-tooltip />
|
||||||
|
<el-table-column label="银行账户" prop="bank_code" show-overflow-tooltip />
|
||||||
|
<el-table-column label="身份证号" prop="id_card" show-overflow-tooltip />
|
||||||
|
<el-table-column label="账户类型" prop="is_own_text" show-overflow-tooltip />
|
||||||
|
<el-table-column label="审核状态" prop="is_check_text" show-overflow-tooltip />
|
||||||
|
<el-table-column label="拒绝原因" prop="fail_msg" show-overflow-tooltip />
|
||||||
|
</el-table>
|
||||||
|
</el-card>
|
||||||
|
|
||||||
</popup>
|
</popup>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup name="brandEdit">
|
<script lang="ts" setup name="brandEdit">
|
||||||
import Popup from '@/components/popup/index.vue'
|
import Popup from '@/components/popup/index.vue'
|
||||||
|
|
||||||
import type { PropType } from 'vue'
|
import type { PropType } from 'vue'
|
||||||
defineProps({
|
defineProps({
|
||||||
dictData: {
|
dictData: {
|
||||||
|
@ -128,9 +147,9 @@ const formData = reactive({
|
||||||
financial_wechat: '',
|
financial_wechat: '',
|
||||||
financial_alipay: '',
|
financial_alipay: '',
|
||||||
financial_type: '',
|
financial_type: '',
|
||||||
|
supplier_banks: []
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
// 表单验证
|
// 表单验证
|
||||||
const formRules = reactive<any>({
|
const formRules = reactive<any>({
|
||||||
name: [{
|
name: [{
|
||||||
|
|
|
@ -5,43 +5,23 @@
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="供应商分类" prop="category_id">
|
<el-form-item label="供应商分类" prop="category_id">
|
||||||
<el-select
|
<el-select v-model="queryParams.category_id" clearable placeholder="请选择供应商类型">
|
||||||
v-model="queryParams.category_id"
|
<el-option v-for="(item, index) in dictData.mer_category_type" :key="index" :label="item.name"
|
||||||
clearable
|
:value="parseInt(item.value)" />
|
||||||
placeholder="请选择供应商类型"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="(item, index) in dictData.mer_category_type"
|
|
||||||
:key="index"
|
|
||||||
:label="item.name"
|
|
||||||
:value="parseInt(item.value)"
|
|
||||||
/>
|
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="供应商类型" prop="type_id">
|
<el-form-item label="供应商类型" prop="type_id">
|
||||||
<el-select
|
<el-select v-model="queryParams.type_id" clearable placeholder="请选择供应商类型">
|
||||||
v-model="queryParams.type_id"
|
<el-option v-for="(item, index) in dictData.merchat_type" :key="index" :label="item.name"
|
||||||
clearable
|
:value="parseInt(item.value)" />
|
||||||
placeholder="请选择供应商类型"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="(item, index) in dictData.merchat_type"
|
|
||||||
:key="index"
|
|
||||||
:label="item.name"
|
|
||||||
:value="parseInt(item.value)"
|
|
||||||
/>
|
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="供应商名称" prop="mer_name">
|
<el-form-item label="供应商名称" prop="mer_name">
|
||||||
<el-input
|
<el-input v-model="queryParams.mer_name" clearable placeholder="请输入供应商名称" />
|
||||||
v-model="queryParams.mer_name"
|
|
||||||
clearable
|
|
||||||
placeholder="请输入供应商名称"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
|
@ -54,21 +34,13 @@
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</el-card>
|
||||||
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
|
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
|
||||||
<el-button
|
<el-button v-perms="['supplier.supplier/add']" type="primary" @click="handleAdd">
|
||||||
v-perms="['supplier.supplier/add']"
|
|
||||||
type="primary"
|
|
||||||
@click="handleAdd"
|
|
||||||
>
|
|
||||||
<template #icon>
|
<template #icon>
|
||||||
<icon name="el-icon-Plus" />
|
<icon name="el-icon-Plus" />
|
||||||
</template>
|
</template>
|
||||||
新增
|
新增
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button v-perms="['supplier.supplier/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
|
||||||
v-perms="['supplier.supplier/delete']"
|
|
||||||
:disabled="!selectData.length"
|
|
||||||
@click="handleDelete(selectData)"
|
|
||||||
>
|
|
||||||
删除
|
删除
|
||||||
</el-button>
|
</el-button>
|
||||||
<div class="mt-4">
|
<div class="mt-4">
|
||||||
|
@ -87,33 +59,14 @@
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column> -->
|
</el-table-column> -->
|
||||||
<el-table-column
|
<el-table-column label="供应商类型" prop="type_id" show-overflow-tooltip>
|
||||||
label="供应商类型"
|
|
||||||
prop="type_id"
|
|
||||||
show-overflow-tooltip
|
|
||||||
>
|
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<dict-value
|
<dict-value :options="dictData.merchat_type" :value="row.type_id" />
|
||||||
:options="dictData.merchat_type"
|
|
||||||
:value="row.type_id"
|
|
||||||
/>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column label="供应商名称" prop="mer_name" show-overflow-tooltip />
|
||||||
label="供应商名称"
|
<el-table-column label="结算周期(天)" prop="settle_cycle" show-overflow-tooltip />
|
||||||
prop="mer_name"
|
<el-table-column label="利率" prop="interest_rate" show-overflow-tooltip />
|
||||||
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
|
<!-- <el-table-column
|
||||||
label="标签"
|
label="标签"
|
||||||
prop="sys_labels_arr"
|
prop="sys_labels_arr"
|
||||||
|
@ -125,63 +78,35 @@
|
||||||
}}</span>
|
}}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column> -->
|
</el-table-column> -->
|
||||||
<el-table-column
|
<el-table-column label="供应商地址" prop="mer_address" show-overflow-tooltip />
|
||||||
label="供应商地址"
|
|
||||||
prop="mer_address"
|
|
||||||
show-overflow-tooltip
|
|
||||||
/>
|
|
||||||
<el-table-column label="供应商是否禁用" prop="status">
|
<el-table-column label="供应商是否禁用" prop="status">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<dict-value :options="dictData.show_status" :value="row.status" />
|
<dict-value :options="dictData.show_status" :value="row.status" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column label="提成比例" prop="commission_rate" show-overflow-tooltip />
|
||||||
label="提成比例"
|
<el-table-column label="供应商手续费单独设置" width="200" prop="commission_switch">
|
||||||
prop="commission_rate"
|
|
||||||
show-overflow-tooltip
|
|
||||||
/>
|
|
||||||
<el-table-column
|
|
||||||
label="供应商手续费单独设置"
|
|
||||||
width="200"
|
|
||||||
prop="commission_switch"
|
|
||||||
>
|
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<!-- <dict-value :options="dictData.show_status" :value="row.commission_switch" /> -->
|
<!-- <dict-value :options="dictData.show_status" :value="row.commission_switch" /> -->
|
||||||
{{ row.commission_switch ? "开启" : "关闭" }}
|
{{ row.commission_switch ? "开启" : "关闭" }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column label="供应商余额" prop="mer_money" show-overflow-tooltip />
|
||||||
label="供应商余额"
|
|
||||||
prop="mer_money"
|
|
||||||
show-overflow-tooltip
|
|
||||||
/>
|
|
||||||
<el-table-column label="操作" width="170" fixed="right">
|
<el-table-column label="操作" width="170" fixed="right">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<el-button
|
<el-button v-perms="['supplier.supplier/edit']" type="primary" link @click="handleEdit(row)">
|
||||||
v-perms="['supplier.supplier/edit']"
|
|
||||||
type="primary"
|
|
||||||
link
|
|
||||||
@click="handleEdit(row)"
|
|
||||||
>
|
|
||||||
编辑
|
编辑
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button v-perms="['supplier.supplier/delete']" type="danger" link @click="handleDelete(row.id)">
|
||||||
v-perms="['supplier.supplier/delete']"
|
|
||||||
type="danger"
|
|
||||||
link
|
|
||||||
@click="handleDelete(row.id)"
|
|
||||||
>
|
|
||||||
删除
|
删除
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button link @click="handleDetail(row.id)"> 详情 </el-button>
|
<el-button link @click="handleDetail(row.id)"> 详情 </el-button>
|
||||||
<router-link
|
<router-link :to="{
|
||||||
:to="{
|
path: 'bindGoods',
|
||||||
path: 'bindGoods',
|
query: {
|
||||||
query: {
|
id: row.id,
|
||||||
id: row.id,
|
},
|
||||||
},
|
}">
|
||||||
}"
|
|
||||||
>
|
|
||||||
<el-button link type="primary"> 商品绑定 </el-button>
|
<el-button link type="primary"> 商品绑定 </el-button>
|
||||||
</router-link>
|
</router-link>
|
||||||
</template>
|
</template>
|
||||||
|
@ -192,20 +117,9 @@
|
||||||
<pagination v-model="pager" @change="getLists" />
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
<edit-popup
|
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
|
||||||
v-if="showEdit"
|
<DetailPopup v-if="showDetail" ref="detailRef" :dict-data="dictData" @success="getLists"
|
||||||
ref="editRef"
|
@close="showDetail = false" />
|
||||||
:dict-data="dictData"
|
|
||||||
@success="getLists"
|
|
||||||
@close="showEdit = false"
|
|
||||||
/>
|
|
||||||
<DetailPopup
|
|
||||||
v-if="showDetail"
|
|
||||||
ref="detailRef"
|
|
||||||
:dict-data="dictData"
|
|
||||||
@success="getLists"
|
|
||||||
@close="showDetail = false"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue