From 4440ec866c6ef5f9f68f9b6c4248ab3d2c6f3bb9 Mon Sep 17 00:00:00 2001
From: liuhongfeng <291117974@qq.com>
Date: Mon, 20 Nov 2023 23:32:54 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91ureport?=
 =?UTF-8?q?2=20=E9=9B=86=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/ureport/index.ts              |  39 ++++
 src/views/report/ureport/UreportFileForm.vue | 113 ++++++++++
 src/views/report/ureport/index.vue           | 219 +++++++++++++++++++
 3 files changed, 371 insertions(+)
 create mode 100644 src/api/report/ureport/index.ts
 create mode 100644 src/views/report/ureport/UreportFileForm.vue
 create mode 100644 src/views/report/ureport/index.vue

diff --git a/src/api/report/ureport/index.ts b/src/api/report/ureport/index.ts
new file mode 100644
index 00000000..c11ce960
--- /dev/null
+++ b/src/api/report/ureport/index.ts
@@ -0,0 +1,39 @@
+import request from '@/config/axios'
+
+export interface UreportFileVO {
+  id: number
+  fileName: string
+  status: number
+  fileContent: string
+  remark: string
+}
+
+// 查询Ureport2报表分页
+export const getUreportFilePage = async (params) => {
+  return await request.get({ url: `/report/ureport-file/page`, params })
+}
+
+// 查询Ureport2报表详情
+export const getUreportFile = async (id: number) => {
+  return await request.get({ url: `/report/ureport-file/get?id=` + id })
+}
+
+// 新增Ureport2报表
+export const createUreportFile = async (data: UreportFileVO) => {
+  return await request.post({ url: `/report/ureport-file/create`, data })
+}
+
+// 修改Ureport2报表
+export const updateUreportFile = async (data: UreportFileVO) => {
+  return await request.put({ url: `/report/ureport-file/update`, data })
+}
+
+// 删除Ureport2报表
+export const deleteUreportFile = async (id: number) => {
+  return await request.delete({ url: `/report/ureport-file/delete?id=` + id })
+}
+
+// 导出Ureport2报表 Excel
+export const exportUreportFile = async (params) => {
+  return await request.download({ url: `/report/ureport-file/export-excel`, params })
+}
\ No newline at end of file
diff --git a/src/views/report/ureport/UreportFileForm.vue b/src/views/report/ureport/UreportFileForm.vue
new file mode 100644
index 00000000..7d71055c
--- /dev/null
+++ b/src/views/report/ureport/UreportFileForm.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="fileName">
+        <el-input v-model="formData.fileName" 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="fileContent">
+        <Editor v-model="formData.fileContent" 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 UreportFileApi 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,
+  fileName: undefined,
+  status: undefined,
+  fileContent: undefined,
+  remark: undefined,
+})
+const formRules = reactive({
+  fileName: [{ 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 UreportFileApi.getUreportFile(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 UreportFileApi.UreportFileVO
+    if (formType.value === 'create') {
+      await UreportFileApi.createUreportFile(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await UreportFileApi.updateUreportFile(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    fileName: undefined,
+    status: undefined,
+    fileContent: undefined,
+    remark: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>
\ 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..ef4986dc
--- /dev/null
+++ b/src/views/report/ureport/index.vue
@@ -0,0 +1,219 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="文件名称" prop="fileName">
+        <el-input
+          v-model="queryParams.fileName"
+          placeholder="请输入文件名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+          class="!w-240px"
+        >
+          <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="remark">
+        <el-input
+          v-model="queryParams.remark"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['report:ureport-file:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['report:ureport-file:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="文件名称" align="center" prop="fileName" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['report:ureport-file:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['report:ureport-file:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <UreportFileForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as UreportFileApi from '@/api/report/ureport'
+import UreportFileForm from './UreportFileForm.vue'
+
+defineOptions({ name: 'UreportFile' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  fileName: null,
+  status: null,
+  remark: null,
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await UreportFileApi.getUreportFilePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await UreportFileApi.deleteUreportFile(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await UreportFileApi.exportUreportFile(queryParams)
+    download.excel(data, 'Ureport2报表.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file

From aceac6daaea05cb9821e1d210e9e17e4a7e8df0f Mon Sep 17 00:00:00 2001
From: liuhongfeng <291117974@qq.com>
Date: Wed, 22 Nov 2023 22:09:48 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91ureport?=
 =?UTF-8?q?2=20=E9=9B=86=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/ureport/index.vue  | 220 +---------------------------
 src/views/report/ureport/index2.vue | 219 +++++++++++++++++++++++++++
 2 files changed, 226 insertions(+), 213 deletions(-)
 create mode 100644 src/views/report/ureport/index2.vue

diff --git a/src/views/report/ureport/index.vue b/src/views/report/ureport/index.vue
index ef4986dc..8279ae99 100644
--- a/src/views/report/ureport/index.vue
+++ b/src/views/report/ureport/index.vue
@@ -1,219 +1,13 @@
 <template>
   <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="文件名称" prop="fileName">
-        <el-input
-          v-model="queryParams.fileName"
-          placeholder="请输入文件名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择状态"
-          clearable
-          class="!w-240px"
-        >
-          <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="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['report:ureport-file:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['report:ureport-file:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form>
+    <IFrame :src="src" />
   </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="文件名称" align="center" prop="fileName" />
-      <el-table-column label="状态" align="center" prop="status">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="操作" align="center">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['report:ureport-file:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['report:ureport-file:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <UreportFileForm ref="formRef" @success="getList" />
 </template>
+<script lang="ts" setup>
+import { getAccessToken } from '@/utils/auth'
 
-<script setup lang="ts">
-import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
-import download from '@/utils/download'
-import * as UreportFileApi from '@/api/report/ureport'
-import UreportFileForm from './UreportFileForm.vue'
+defineOptions({ name: 'Ureport' })
 
-defineOptions({ name: 'UreportFile' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(true) // 列表的加载中
-const list = ref([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  fileName: null,
-  status: null,
-  remark: null,
-  createTime: [],
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await UreportFileApi.getUreportFilePage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await UreportFileApi.deleteUreportFile(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await UreportFileApi.exportUreportFile(queryParams)
-    download.excel(data, 'Ureport2报表.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>
\ No newline at end of file
+const BASE_URL = import.meta.env.VITE_BASE_URL
+const src = ref(BASE_URL + '/ureport/designer?token=' + getAccessToken())
+</script>
diff --git a/src/views/report/ureport/index2.vue b/src/views/report/ureport/index2.vue
new file mode 100644
index 00000000..ef4986dc
--- /dev/null
+++ b/src/views/report/ureport/index2.vue
@@ -0,0 +1,219 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="文件名称" prop="fileName">
+        <el-input
+          v-model="queryParams.fileName"
+          placeholder="请输入文件名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+          class="!w-240px"
+        >
+          <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="remark">
+        <el-input
+          v-model="queryParams.remark"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['report:ureport-file:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['report:ureport-file:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="文件名称" align="center" prop="fileName" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['report:ureport-file:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['report:ureport-file:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <UreportFileForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as UreportFileApi from '@/api/report/ureport'
+import UreportFileForm from './UreportFileForm.vue'
+
+defineOptions({ name: 'UreportFile' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  fileName: null,
+  status: null,
+  remark: null,
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await UreportFileApi.getUreportFilePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await UreportFileApi.deleteUreportFile(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await UreportFileApi.exportUreportFile(queryParams)
+    download.excel(data, 'Ureport2报表.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file

From 0b9cf35b17e17eb2aa283bd1f8ebfd059497e96d Mon Sep 17 00:00:00 2001
From: liuhongfeng <291117974@qq.com>
Date: Sun, 3 Dec 2023 17:00:00 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91ureport?=
 =?UTF-8?q?2=20=E9=9B=86=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/ureport/index.ts               | 78 +++++++++----------
 ...reportFileForm.vue => UReportDataForm.vue} | 28 +++----
 src/views/report/ureport/index.vue            |  2 +-
 src/views/report/ureport/index2.vue           | 33 ++++----
 4 files changed, 71 insertions(+), 70 deletions(-)
 rename src/views/report/ureport/{UreportFileForm.vue => UReportDataForm.vue} (78%)

diff --git a/src/api/report/ureport/index.ts b/src/api/report/ureport/index.ts
index c11ce960..2a9daea4 100644
--- a/src/api/report/ureport/index.ts
+++ b/src/api/report/ureport/index.ts
@@ -1,39 +1,39 @@
-import request from '@/config/axios'
-
-export interface UreportFileVO {
-  id: number
-  fileName: string
-  status: number
-  fileContent: string
-  remark: string
-}
-
-// 查询Ureport2报表分页
-export const getUreportFilePage = async (params) => {
-  return await request.get({ url: `/report/ureport-file/page`, params })
-}
-
-// 查询Ureport2报表详情
-export const getUreportFile = async (id: number) => {
-  return await request.get({ url: `/report/ureport-file/get?id=` + id })
-}
-
-// 新增Ureport2报表
-export const createUreportFile = async (data: UreportFileVO) => {
-  return await request.post({ url: `/report/ureport-file/create`, data })
-}
-
-// 修改Ureport2报表
-export const updateUreportFile = async (data: UreportFileVO) => {
-  return await request.put({ url: `/report/ureport-file/update`, data })
-}
-
-// 删除Ureport2报表
-export const deleteUreportFile = async (id: number) => {
-  return await request.delete({ url: `/report/ureport-file/delete?id=` + id })
-}
-
-// 导出Ureport2报表 Excel
-export const exportUreportFile = async (params) => {
-  return await request.download({ url: `/report/ureport-file/export-excel`, params })
-}
\ No newline at end of file
+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/report/ureport/UreportFileForm.vue b/src/views/report/ureport/UReportDataForm.vue
similarity index 78%
rename from src/views/report/ureport/UreportFileForm.vue
rename to src/views/report/ureport/UReportDataForm.vue
index 7d71055c..0711f3c5 100644
--- a/src/views/report/ureport/UreportFileForm.vue
+++ b/src/views/report/ureport/UReportDataForm.vue
@@ -7,8 +7,8 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="文件名称" prop="fileName">
-        <el-input v-model="formData.fileName" placeholder="请输入文件名称" />
+      <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="请选择状态">
@@ -20,8 +20,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="文件内容" prop="fileContent">
-        <Editor v-model="formData.fileContent" height="150px" />
+      <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="请输入备注" />
@@ -35,7 +35,7 @@
 </template>
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import * as UreportFileApi from '@/api/report/ureport'
+import * as UReportDataApi from '@/api/report/ureport'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -46,13 +46,13 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
-  fileName: undefined,
+  name: undefined,
   status: undefined,
-  fileContent: undefined,
+  content: undefined,
   remark: undefined,
 })
 const formRules = reactive({
-  fileName: [{ required: true, message: '文件名称不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '文件名称不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
 })
 const formRef = ref() // 表单 Ref
@@ -67,7 +67,7 @@ const open = async (type: string, id?: number) => {
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await UreportFileApi.getUreportFile(id)
+      formData.value = await UReportDataApi.getUReportData(id)
     } finally {
       formLoading.value = false
     }
@@ -83,12 +83,12 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as UreportFileApi.UreportFileVO
+    const data = formData.value as unknown as UReportDataApi.UReportDataVO
     if (formType.value === 'create') {
-      await UreportFileApi.createUreportFile(data)
+      await UReportDataApi.createUReportData(data)
       message.success(t('common.createSuccess'))
     } else {
-      await UreportFileApi.updateUreportFile(data)
+      await UReportDataApi.updateUReportData(data)
       message.success(t('common.updateSuccess'))
     }
     dialogVisible.value = false
@@ -103,9 +103,9 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
-    fileName: undefined,
+    name: undefined,
     status: undefined,
-    fileContent: undefined,
+    content: undefined,
     remark: undefined,
   }
   formRef.value?.resetFields()
diff --git a/src/views/report/ureport/index.vue b/src/views/report/ureport/index.vue
index 8279ae99..e9d6c0e4 100644
--- a/src/views/report/ureport/index.vue
+++ b/src/views/report/ureport/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup>
 import { getAccessToken } from '@/utils/auth'
 
-defineOptions({ name: 'Ureport' })
+defineOptions({ name: 'UReportData' })
 
 const BASE_URL = import.meta.env.VITE_BASE_URL
 const src = ref(BASE_URL + '/ureport/designer?token=' + getAccessToken())
diff --git a/src/views/report/ureport/index2.vue b/src/views/report/ureport/index2.vue
index ef4986dc..17e00d63 100644
--- a/src/views/report/ureport/index2.vue
+++ b/src/views/report/ureport/index2.vue
@@ -8,9 +8,9 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="文件名称" prop="fileName">
+      <el-form-item label="文件名称" prop="name">
         <el-input
-          v-model="queryParams.fileName"
+          v-model="queryParams.name"
           placeholder="请输入文件名称"
           clearable
           @keyup.enter="handleQuery"
@@ -59,7 +59,7 @@
           type="primary"
           plain
           @click="openForm('create')"
-          v-hasPermi="['report:ureport-file:create']"
+          v-hasPermi="['report:ureport-data:create']"
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
@@ -68,7 +68,7 @@
           plain
           @click="handleExport"
           :loading="exportLoading"
-          v-hasPermi="['report:ureport-file:export']"
+          v-hasPermi="['report:ureport-data:export']"
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
@@ -80,12 +80,13 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="文件名称" align="center" prop="fileName" />
+      <el-table-column label="文件名称" align="center" prop="name" />
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
+      <el-table-column label="文件内容" align="center" prop="content" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
         label="创建时间"
@@ -100,7 +101,7 @@
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['report:ureport-file:update']"
+            v-hasPermi="['report:ureport-data:update']"
           >
             编辑
           </el-button>
@@ -108,7 +109,7 @@
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['report:ureport-file:delete']"
+            v-hasPermi="['report:ureport-data:delete']"
           >
             删除
           </el-button>
@@ -125,17 +126,17 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <UreportFileForm ref="formRef" @success="getList" />
+  <UReportDataForm ref="formRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
-import * as UreportFileApi from '@/api/report/ureport'
-import UreportFileForm from './UreportFileForm.vue'
+import * as UReportDataApi from '@/api/report/ureport'
+import UReportDataForm from './UReportDataForm.vue'
 
-defineOptions({ name: 'UreportFile' })
+defineOptions({ name: 'UReportData' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -146,7 +147,7 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  fileName: null,
+  name: null,
   status: null,
   remark: null,
   createTime: [],
@@ -158,7 +159,7 @@ const exportLoading = ref(false) // 导出的加载中
 const getList = async () => {
   loading.value = true
   try {
-    const data = await UreportFileApi.getUreportFilePage(queryParams)
+    const data = await UReportDataApi.getUReportDataPage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {
@@ -190,7 +191,7 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await UreportFileApi.deleteUreportFile(id)
+    await UReportDataApi.deleteUReportData(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
@@ -204,7 +205,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await UreportFileApi.exportUreportFile(queryParams)
+    const data = await UReportDataApi.exportUReportData(queryParams)
     download.excel(data, 'Ureport2报表.xls')
   } catch {
   } finally {
@@ -216,4 +217,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
\ No newline at end of file
+</script>

From dee8215da238e3c7d15be59729b5303c8b72d29e Mon Sep 17 00:00:00 2001
From: ZENGlei11350 <75881401@qq.com>
Date: Mon, 4 Dec 2023 13:42:18 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=95=86=E5=93=81=E6=97=B60=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=8F=AF=E4=BB=A5=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                             | 2 +-
 src/views/mall/product/spu/form/BasicInfoForm.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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