zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

Browse Source
This commit is contained in:
dzc committed 2025-01-22 10:12:13 +08:00
2 parents 84a864159c f8fbd94cfc
commit 4919f9a5cf
6 files changed
+430 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.env.prod
+4 -2
View File
@@ -9,11 +9,13 @@ ENV = 'prod'
# ADMIN 服务地址
#VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089
VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81
#VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81
VITE_ADMIN_PROXY_PATH = https://stgl.pj.gov.cn
# 图片访问基础地址
#VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api
#VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api
VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api
# 代码生成服务地址
VITE_GEN_PROXY_PATH = http://123.156.230.15:5003
dist.zip
BIN
View File
Binary file not shown.
src/api/supermarket/smSpu.ts
+41
View File
@@ -0,0 +1,41 @@
import request from "/@/utils/request"
export function fetchList(query?: Object) {
return request({
url: '/supermarket/smSpu/page',
method: 'get',
params: query
})
}
export function addObj(obj?: Object) {
return request({
url: '/supermarket/smSpu',
method: 'post',
data: obj
})
}
export function getObj(id?: string) {
return request({
url: '/supermarket/smSpu/' + id,
method: 'get'
})
}
export function delObjs(ids?: Object) {
return request({
url: '/supermarket/smSpu',
method: 'delete',
data: ids
})
}
export function putObj(obj?: Object) {
return request({
url: '/supermarket/smSpu',
method: 'put',
data: obj
})
}
src/views/hard/hard-order/index.vue
+88 -3
View File
@@ -44,8 +44,10 @@
:header-cell-style="tableStyle.headerCellStyle"
@selection-change="selectionChangHandle"
@sort-change="sortChangeHandle"
show-summary
:summary-method="getSummaries"
>
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="selection" width="60" align="center" />
<el-table-column type="index" label="#" width="50" />
<el-table-column width="200" label="用户">
<template #default="{ row }">
@@ -118,7 +120,7 @@
</div>
</template>
</el-table-column>
<el-table-column width="200px" label="付款信息">
<el-table-column width="200px" prop="paymentInformation" label="付款信息">
<template #default="{ row }">
<div class="status">
<span>商品总价</span>
@@ -236,7 +238,8 @@ import { getDicts } from "/@/api/admin/dict"
import { useMessage, useMessageBox } from "/@/hooks/message"
import { useDict } from "/@/hooks/dict"
import { displayPrice } from "/@/utils/formatMoney"
import { ElLoading } from "element-plus"
import { ElLoading, TableColumnCtx } from "element-plus"
import { VNode } from "vue"
const { push } = useRouter()
@@ -342,6 +345,88 @@ const handleDelete = async (ids: string[]) => {
useMessage().error(err.msg)
}
}
interface SummaryMethodProps<T = any> {
columns: TableColumnCtx<T>[]
data: T[]
}
// 表格行尾合计
const getSummaries = (param: SummaryMethodProps) => {
const { columns, data } = param
const sums: (string | VNode | number)[] = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = "合计"
return
}
if (column.property === "paymentInformation") {
const totalPriceValues = data.map((item) => Number(item.totalPrice))
const extraPriceValues = data.map((item) => Number(item.extraPrice))
const payPriceValues = data.map((item) => Number(item.payPrice))
if (
!totalPriceValues.every((value) => Number.isNaN(value)) &&
!extraPriceValues.every((value) => Number.isNaN(value)) &&
!payPriceValues.every((value) => Number.isNaN(value))
) {
// h("div", { style: { textDecoration: "underline" } }, ["Total Cost"])
sums[index] = h("div", { style: {} }, [
h("div", {}, [
h("span", { style: { marginRight: "40px", fontWeight: "bold" } }, ["商品总价"]),
h("span", { style: { color: "#67C260" } }, [
`${displayPrice(
totalPriceValues.reduce((prev, curr) => {
const value = Number(curr)
if (!Number.isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0),
)}`,
]),
]),
h("div", { style: {} }, [
h("span", { style: { marginRight: "40px", fontWeight: "bold" } }, ["额外支付"]),
h("span", { style: { color: "#F56E9B" } }, [
`${displayPrice(
extraPriceValues.reduce((prev, curr) => {
const value = Number(curr)
if (!Number.isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0),
)}`,
]),
]),
h("div", { style: {} }, [
h("span", { style: { marginRight: "40px", fontWeight: "bold" } }, ["实际支付"]),
h("span", { style: { color: "#355CF6" } }, [
`${displayPrice(
payPriceValues.reduce((prev, curr) => {
const value = Number(curr)
if (!Number.isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0),
)}`,
]),
]),
])
} else {
sums[index] = "N/A"
}
} else {
sums[index] = ""
}
})
return sums
}
</script>
<style scoped lang="scss">
src/views/supermarket/smSpu/form.vue
+155
View File
@@ -0,0 +1,155 @@
<template>
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
:close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
<el-row :gutter="24">
<el-col :span="12" class="mb20">
<el-form-item label="库存商品id" prop="erpSpuId">
<el-select v-model="form.erpSpuId" placeholder="请选择库存商品id">
<el-option label="请选择">0</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品详情" prop="description">
<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品轮播图地址
数组，以逗号分隔
最多上传15张" prop="sliderPicUrls">
<upload-img v-model="form.sliderPicUrls"></upload-img>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="排序字段" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序字段"/>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品状态: 1 上架（开启） 0 下架（禁用） -1 回收" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index">{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="赠送积分" prop="giveIntegral">
<el-input-number :min="1" :max="1000" v-model="form.giveIntegral" placeholder="请输入赠送积分"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="部门id" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门id"/>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="销量" prop="salesCount">
<el-input v-model="form.salesCount" placeholder="请输入销量"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script setup lang="ts" name="SmSpuDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/supermarket/smSpu'
import { rule } from '/@/utils/validate';
const emit = defineEmits(['refresh']);
// 定义变量内容
const dataFormRef = ref();
const visible = ref(false)
const loading = ref(false)
// 定义字典
const { spu_status } = useDict('spu_status')
// 提交表单数据
const form = reactive({
id:'',
erpSpuId: '',
description: '',
sliderPicUrls: '',
sort: '',
status: '',
giveIntegral: 0,
deptId: '',
salesCount: '',
});
// 定义校验规则
const dataRules = ref({
sliderPicUrls: [{required: true, message: '商品轮播图地址', trigger: 'blur'}],
})
// 打开弹窗
const openDialog = (id: string) => {
visible.value = true
form.id = ''
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields();
});
// 获取smSpu信息
if (id) {
form.id = id
getsmSpuData(id)
}
};
// 提交
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => {});
if (!valid) return false;
try {
loading.value = true;
form.id ? await putObj(form) : await addObj(form);
useMessage().success(form.id ? '修改成功' : '添加成功');
visible.value = false;
emit('refresh');
} catch (err: any) {
useMessage().error(err.msg);
} finally {
loading.value = false;
}
};
// 初始化表单数据
const getsmSpuData = (id: string) => {
// 获取数据
loading.value = true
getObj(id).then((res: any) => {
Object.assign(form, res.data)
}).finally(() => {
loading.value = false
})
};
// 暴露变量
defineExpose({
openDialog
});
</script>
src/views/supermarket/smSpu/index.vue
+142
View File
@@ -0,0 +1,142 @@
<template>
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<el-row v-show="showSearch">
<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
<el-form-item label="库存商品id" prop="erpSpuId">
<el-select v-model="state.queryForm.erpSpuId" placeholder="请选择库存商品id">
<el-option label="请选择">0</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button icon="search" type="primary" @click="getDataList">
查询
</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-row>
<el-row>
<div class="mb8" style="width: 100%">
<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
v-auth="'supermarket_smSpu_add'">
新 增
</el-button>
<el-button plain :disabled="multiple" icon="Delete" type="primary"
v-auth="'supermarket_smSpu_del'" @click="handleDelete(selectObjs)">
删除
</el-button>
<right-toolbar v-model:showSearch="showSearch" :export="'supermarket_smSpu_export'"
@exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
@queryTable="getDataList"></right-toolbar>
</div>
</el-row>
<el-table :data="state.dataList" v-loading="state.loading" border
:cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
@selection-change="selectionChangHandle"
@sort-change="sortChangeHandle">
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="40" />
<el-table-column prop="erpSpuId" label="库存商品id" show-overflow-tooltip/>
<el-table-column prop="description" label="商品详情" show-overflow-tooltip/>
<el-table-column prop="sliderPicUrls" label="商品轮播图地址
数组，以逗号分隔
最多上传15张" show-overflow-tooltip/>
<el-table-column prop="sort" label="排序字段" sortable="custom" show-overflow-tooltip/>
<el-table-column prop="status" label="商品状态: 1 上架（开启） 0 下架（禁用） -1 回收" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="spu_status" :value="scope.row.status"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip/>
<el-table-column prop="deptId" label="部门id" show-overflow-tooltip/>
<el-table-column prop="salesCount" label="销量" show-overflow-tooltip/>
<el-table-column label="操作" width="150">
<template #default="scope">
<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_smSpu_edit'"
@click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
<el-button icon="delete" text type="primary" v-auth="'supermarket_smSpu_del'" @click="handleDelete([scope.row.id])">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</div>
<!-- 编辑、新增 -->
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
</div>
</template>
<script setup lang="ts" name="systemSmSpu">
import { BasicTableProps, useTable } from "/@/hooks/table";
import { fetchList, delObjs } from "/@/api/supermarket/smSpu";
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
const { spu_status } = useDict('spu_status')
// 定义变量内容
const formDialogRef = ref()
// 搜索变量
const queryRef = ref()
const showSearch = ref(true)
// 多选变量
const selectObjs = ref([]) as any
const multiple = ref(true)
const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: {},
pageList: fetchList
})
// table hook
const {
getDataList,
currentChangeHandle,
sizeChangeHandle,
sortChangeHandle,
downBlobFile,
tableStyle
} = useTable(state)
// 清空搜索条件
const resetQuery = () => {
// 清空搜索条件
queryRef.value?.resetFields()
// 清空多选
selectObjs.value = []
getDataList()
}
// 导出excel
const exportExcel = () => {
downBlobFile('/supermarket/smSpu/export', Object.assign(state.queryForm, { ids: selectObjs }), 'smSpu.xlsx')
}
// 多选事件
const selectionChangHandle = (objs: { id: string }[]) => {
selectObjs.value = objs.map(({ id }) => id);
multiple.value = !objs.length;
};
// 删除操作
const handleDelete = async (ids: string[]) => {
try {
await useMessageBox().confirm('此操作将永久删除');
} catch {
return;
}
try {
await delObjs(ids);
getDataList();
useMessage().success('删除成功');
} catch (err: any) {
useMessage().error(err.msg);
}
};
</script>