From 676cda61e239a6787c23bfdae4233b075a658d35 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 10 Dec 2024 12:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=93=81=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                        |  4 +-
 src/views/canteen/canteenCategory/form.vue  | 58 ++++-----------------
 src/views/canteen/canteenCategory/index.vue | 10 ++--
 3 files changed, 17 insertions(+), 55 deletions(-)

diff --git a/.env b/.env
index d78f241..26338c2 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,8 @@
 # 网站主标题
-VITE_GLOBAL_TITLE= 'PIGX ADMIN'
+VITE_GLOBAL_TITLE= '浦江县机关事务智慧后勤一体化平台'
 
 # footer
-VITE_FOOTER_TITLE= '©2024 pig4cloud.com'
+VITE_FOOTER_TITLE= '©2024 bsd.com'
 
 # 是否是微服务架构（重要）
 VITE_IS_MICRO= true
diff --git a/src/views/canteen/canteenCategory/form.vue b/src/views/canteen/canteenCategory/form.vue
index ffc58cf..955063d 100644
--- a/src/views/canteen/canteenCategory/form.vue
+++ b/src/views/canteen/canteenCategory/form.vue
@@ -3,68 +3,32 @@
       :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="父分类编号" prop="parentId">
-        <el-input v-model="form.parentId" placeholder="请输入父分类编号"/>
-      </el-form-item>
-      </el-col>
 
-    <el-col :span="12" class="mb20">
+    <el-col :span="24" class="mb20">
       <el-form-item label="分类名称" prop="name">
         <el-input v-model="form.name" placeholder="请输入分类名称"/>
       </el-form-item>
       </el-col>
 
-    <el-col :span="12" class="mb20">
+    <el-col :span="24" class="mb20">
   <el-form-item label="分类图" prop="picUrl">
     <upload-img v-model="form.picUrl"></upload-img>
   </el-form-item>
   </el-col>
 
-    <el-col :span="12" class="mb20">
+    <el-col :span="24" 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="开启状态" prop="status">
-            <el-radio-group v-model="form.status">
-           <el-radio label="开启状态" border>开启状态</el-radio>
-            </el-radio-group>
-        </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="创建者" prop="creator">
-        <el-input v-model="form.creator" placeholder="请输入创建者"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="更新者" prop="updater">
-        <el-input v-model="form.updater" placeholder="请输入更新者"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="是否删除" prop="deleted">
-        <el-input v-model="form.deleted" placeholder="请输入是否删除"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="系统类型  1商品 2每日 3在线订餐" prop="systemType">
-        <el-input v-model="form.systemType" placeholder="请输入系统类型  1商品 2每日 3在线订餐"/>
-      </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="status">-->
+<!--            <el-radio-group v-model="form.status">-->
+<!--           <el-radio label="开启状态" border>开启状态</el-radio>-->
+<!--            </el-radio-group>-->
+<!--        </el-form-item>-->
+<!--      </el-col>-->
 			</el-row>
       </el-form>
       <template #footer>
@@ -161,4 +125,4 @@ const getcanteenCategoryData = (id: string) => {
 defineExpose({
   openDialog
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/canteen/canteenCategory/index.vue b/src/views/canteen/canteenCategory/index.vue
index 56dd3ca..e23bffc 100644
--- a/src/views/canteen/canteenCategory/index.vue
+++ b/src/views/canteen/canteenCategory/index.vue
@@ -29,18 +29,16 @@
             @queryTable="getDataList"></right-toolbar>
         </div>
       </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border 
+      <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="parentId" label="父分类编号"  show-overflow-tooltip/>
           <el-table-column prop="name" label="分类名称"  show-overflow-tooltip/>
           <el-table-column prop="picUrl" label="分类图"  show-overflow-tooltip/>
-          <el-table-column prop="status" label="开启状态"  show-overflow-tooltip/>
-          <el-table-column prop="creator" label="创建者"  show-overflow-tooltip/>
-          <el-table-column prop="updater" label="更新者"  show-overflow-tooltip/>
+          <el-table-column prop="createBy" label="创建者"  show-overflow-tooltip/>
+          <el-table-column prop="updateBy" label="更新者"  show-overflow-tooltip/>
           <el-table-column prop="createTime" label="创建时间"  show-overflow-tooltip/>
         <el-table-column label="操作" width="150">
           <template #default="scope">
@@ -129,4 +127,4 @@ const handleDelete = async (ids: string[]) => {
     useMessage().error(err.msg);
   }
 };
-</script>
\ No newline at end of file
+</script>