diff --git a/.vscode/settings.json b/.vscode/settings.json
index 34310929..54be7d8c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -83,7 +83,7 @@
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.codeActionsOnSave": {
- "source.fixAll.eslint": true
+ "source.fixAll.eslint": "explicit"
},
"[vue]": {
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
diff --git a/src/api/report/ureport/index.ts b/src/api/report/ureport/index.ts
new file mode 100644
index 00000000..2a9daea4
--- /dev/null
+++ b/src/api/report/ureport/index.ts
@@ -0,0 +1,39 @@
+import request from '@/config/axios'
+
+export interface UReportDataVO {
+ id: number
+ name: string
+ status: number
+ content: string
+ remark: string
+}
+
+// 查询Ureport2报表分页
+export const getUReportDataPage = async (params) => {
+ return await request.get({ url: `/report/ureport-data/page`, params })
+}
+
+// 查询Ureport2报表详情
+export const getUReportData = async (id: number) => {
+ return await request.get({ url: `/report/ureport-data/get?id=` + id })
+}
+
+// 新增Ureport2报表
+export const createUReportData = async (data: UReportDataVO) => {
+ return await request.post({ url: `/report/ureport-data/create`, data })
+}
+
+// 修改Ureport2报表
+export const updateUReportData = async (data: UReportDataVO) => {
+ return await request.put({ url: `/report/ureport-data/update`, data })
+}
+
+// 删除Ureport2报表
+export const deleteUReportData = async (id: number) => {
+ return await request.delete({ url: `/report/ureport-data/delete?id=` + id })
+}
+
+// 导出Ureport2报表 Excel
+export const exportUReportData = async (params) => {
+ return await request.download({ url: `/report/ureport-data/export-excel`, params })
+}
diff --git a/src/views/mall/product/spu/form/BasicInfoForm.vue b/src/views/mall/product/spu/form/BasicInfoForm.vue
index 567205be..f7da536d 100644
--- a/src/views/mall/product/spu/form/BasicInfoForm.vue
+++ b/src/views/mall/product/spu/form/BasicInfoForm.vue
@@ -197,7 +197,7 @@ defineOptions({ name: 'ProductSpuBasicInfoForm' })
const ruleConfig: RuleConfig[] = [
{
name: 'stock',
- rule: (arg) => arg >= 1,
+ rule: (arg) => arg >= 0,
message: '商品库存必须大于等于 1 !!!'
},
{
@@ -213,7 +213,7 @@ const ruleConfig: RuleConfig[] = [
{
name: 'costPrice',
rule: (arg) => arg >= 0.01,
- message: '商品成本价格必须大于等于 0.01 元!!!'
+ message: '商品成本价格必须大于等于 0.00 元!!!'
}
]
diff --git a/src/views/report/ureport/UReportDataForm.vue b/src/views/report/ureport/UReportDataForm.vue
new file mode 100644
index 00000000..0711f3c5
--- /dev/null
+++ b/src/views/report/ureport/UReportDataForm.vue
@@ -0,0 +1,113 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/views/report/ureport/index.vue b/src/views/report/ureport/index.vue
new file mode 100644
index 00000000..e9d6c0e4
--- /dev/null
+++ b/src/views/report/ureport/index.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/src/views/report/ureport/index2.vue b/src/views/report/ureport/index2.vue
new file mode 100644
index 00000000..17e00d63
--- /dev/null
+++ b/src/views/report/ureport/index2.vue
@@ -0,0 +1,220 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+ 新增
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+