第一次更新,完成了初版调整

This commit is contained in:
2026-09-07 22:05:51 +08:00
parent b5a26a8848
commit 4d6a7e7aac
198 changed files with 6142 additions and 3856 deletions
-13
View File
@@ -9,19 +9,6 @@
<div class="tabs-content">
<!-- 基本信息 -->
<div class="tab-pane" v-show="tabKey == 0">
<a-form-item label="分油公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
style="width: 300px"
v-decorator="['company_id', {rules: [{required: true, message: '请选择分油公司'}]}]"
placeholder="请选择商户"
>
<a-select-option
v-for="(item, index) in formData.companyList"
:key="index"
:value="item.company_id"
>{{ item.name }}</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="商户" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
style="width: 300px"
+1 -9
View File
@@ -75,12 +75,10 @@
<a title="会员充值" v-action:recharge @click="handleRecharge(item)">充值</a>
<a title="会员等级" v-action:grade @click="handleGrade(item)">等级</a>
<a v-action:delete @click="handleDelete(item)">删除</a>
<!-- <a title="用户分油" v-action:oil @click="handleOil(item)">分油</a>-->
</span>
</s-table>
<GradeForm ref="GradeForm" :gradeList="gradeList" @handleSubmit="handleRefresh" />
<RechargeForm ref="RechargeForm" @handleSubmit="handleRefresh" />
<OilForm ref="OilForm" @handleSubmit="handleRefresh" />
</a-card>
</template>
@@ -88,7 +86,7 @@
import * as Api from '@/api/user'
import * as GradeApi from '@/api/user/grade'
import { STable } from '@/components'
import { GradeForm, RechargeForm, OilForm } from './modules'
import { GradeForm, RechargeForm } from './modules'
import PlatformIcon from '@/components/PlatformIcon'
export default {
@@ -97,7 +95,6 @@ export default {
STable,
GradeForm,
RechargeForm,
OilForm,
PlatformIcon
},
data () {
@@ -216,11 +213,6 @@ export default {
})
},
// 用户分油
handleOil (item) {
this.$refs.OilForm.handle(item)
},
/**
* 刷新列表
* @param Boolean bool 强制刷新到第一页
-13
View File
@@ -9,19 +9,6 @@
<div class="tabs-content">
<!-- 基本信息 -->
<div class="tab-pane" v-show="tabKey == 0">
<a-form-item label="分油公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
style="width: 300px"
v-decorator="['company_id', {rules: [{required: true, message: '请选择分油公司'}]}]"
placeholder="请选择商户"
>
<a-select-option
v-for="(item, index) in formData.companyList"
:key="index"
:value="item.company_id"
>{{ item.name }}</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="商户" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
style="width: 300px"
@@ -1,230 +0,0 @@
<template>
<a-modal
class="noborder"
:title="title"
:width="520"
:visible="visible"
:confirmLoading="confirmLoading"
:maskClosable="false"
@ok="handleSubmit"
@cancel="handleCancel"
>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-tabs :activeKey="activeKey" @change="onChangeTabs">
<a-tab-pane :key="OIL_TYPE" tab="用户分油">
<template v-if="activeKey === OIL_TYPE">
<a-form-item class="mb-5" label="用户昵称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<span>{{ record.nick_name ? record.nick_name : '无' }}</span>
</a-form-item>
<a-form-item class="mb-5" label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<span>{{ record.mobile }}</span>
</a-form-item>
<a-form-item class="mb-5" label="卡券类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select @change="typeChange" v-decorator="[`oilCardType`, { rules: [{required: true, message: '请选择卡券类型'}], initialValue: 'zsy_ticket' }]">
<a-select-option
v-for="(item, index) in OilCardTypeEnum.data"
:key="index"
:value="item.value"
>{{ item.name }}</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="所属省份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
style="width: 300px"
@change="handleChange"
v-decorator="['province', {rules: [{required: true, message: '请选择所属省份'}]}]"
placeholder="请选择所属省份"
>
<a-select-option
v-for="(item, index) in province"
:key="index"
:value="item"
>{{ item }}</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="油券" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
style="width: 300px"
v-decorator="['goods_id', {rules: []}]"
placeholder="请选择油券"
>
<a-select-option
v-for="(item, index) in goods"
:key="index"
:value="item.goods_id"
>{{ item.goods_name }}</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="分油金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number
placeholder="卡券类型为油卡时填写"
:min="0.01"
v-decorator="[`amount`, { initialValue: '', rules: [] }]"
/>
</a-form-item>
<a-form-item label="管理员备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-textarea
placeholder="请输入管理员备注"
:rows="3"
v-decorator="[`buyer_remark`, { rules: [{ required: true, message: '请输入管理员备注' }] }]"
/>
</a-form-item>
</template>
</a-tab-pane>
</a-tabs>
</a-form>
</a-spin>
</a-modal>
</template>
<script>
// import pick from 'lodash.pick'
import * as Api from '@/api/user'
import * as GoodsApi from '@/api/goods'
import {
OilCardTypeEnum
} from '@/common/enum/order'
import { assignment, inArray } from '@/utils/util'
// 充值类型枚举: 余额
const OIL_TYPE = 'oil'
export default {
components: {
},
data () {
return {
// 对话框标题
title: '用户分油',
// 标签布局属性
labelCol: { span: 7 },
// 输入框布局属性
wrapperCol: { span: 13 },
// modal(对话框)是否可见
visible: false,
// modal(对话框)确定按钮 loading
confirmLoading: false,
// 当前表单元素
form: this.$form.createForm(this),
// 当前tab索引
activeKey: OIL_TYPE,
// 类型
OIL_TYPE,
// 当前记录
record: {},
oilCardType: 'zsy_ticket',
pro: '',
province: [],
goods: []
}
},
beforeCreate () {
// 批量给当前实例赋值
assignment(this, {
inArray,
OilCardTypeEnum
})
},
created () {
this.getProvinceList()
},
methods: {
// 显示对话框
handle (record) {
// 显示窗口
this.visible = true
// 当前记录
this.record = record
},
// 切换tabs事件
onChangeTabs (activeKey) {
this.activeKey = activeKey
},
/**
* 确认按钮
*/
handleSubmit (e) {
e.preventDefault()
// 表单验证
const { form: { validateFields } } = this
validateFields((errors, values) => {
// 提交到后端api
!errors && this.onFormSubmit(values)
})
},
/**
* 关闭对话框事件
*/
handleCancel () {
this.visible = false
this.form.resetFields()
},
/**
* 提交到后端api
*/
onFormSubmit (values) {
const { record, activeKey } = this
this.confirmLoading = true
Api.oil({ userId: record.user_id, target: activeKey, form: values })
.then((result) => {
// 显示成功
this.$message.success(result.message, 1.5)
// 关闭对话框事件
this.handleCancel()
// 通知父端组件提交完成了
this.$emit('handleSubmit', values)
})
.finally(() => {
this.confirmLoading = false
})
},
typeChange (value, option) {
this.oilCardType = value
this.getGoodsList(this.pro, value)
},
handleChange (value, option) {
this.pro = value
this.getGoodsList(value, this.oilCardType)
},
// 获取商品
getGoodsList (province, oilCardType) {
return new Promise((resolve, reject) => {
GoodsApi.all({ province, oilCardType })
.then(result => {
this.goods = result.data.list
resolve()
})
})
},
// 获取省份
getProvinceList () {
return new Promise((resolve, reject) => {
GoodsApi.province()
.then(result => {
this.province = result.data.list
resolve()
})
})
}
}
}
</script>
<style lang="less" scoped>
.ant-modal-body {
padding-top: 0 !important;
}
.ant-form-item {
margin-bottom: 15px;
}
.ant-tabs-nav .ant-tabs-tab {
padding: 10px 16px;
}
</style>
+1 -2
View File
@@ -1,5 +1,4 @@
import GradeForm from './GradeForm'
import RechargeForm from './RechargeForm'
import OilForm from './OilForm'
export { GradeForm, RechargeForm, OilForm }
export { GradeForm, RechargeForm }