Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

Author: YunaiV

.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"

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 })
+}

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 元！！！'
   }
 ]
 

src/views/report/ureport/UReportDataForm.vue

@@ -0,0 +1,113 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="文件名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入文件名称" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="formData.status" placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="文件内容" prop="content">
+        <Editor v-model="formData.content" height="150px" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as UReportDataApi from '@/api/report/ureport'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  status: undefined,
+  content: undefined,
+  remark: undefined,
+})
+const formRules = reactive({
+  name: [{ required: true, message: '文件名称不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await UReportDataApi.getUReportData(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as UReportDataApi.UReportDataVO
+    if (formType.value === 'create') {
+      await UReportDataApi.createUReportData(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await UReportDataApi.updateUReportData(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    status: undefined,
+    content: undefined,
+    remark: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/report/ureport/index.vue

@@ -0,0 +1,13 @@
+<template>
+  <ContentWrap>
+    <IFrame :src="src" />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import { getAccessToken } from '@/utils/auth'
+
+defineOptions({ name: 'UReportData' })
+
+const BASE_URL = import.meta.env.VITE_BASE_URL
+const src = ref(BASE_URL + '/ureport/designer?token=' + getAccessToken())
+</script>