From 53fefd601f9d752e394663db963a6df230e7d686 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 6 May 2023 15:22:47 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../systemMenus/components/menusFrom.vue      | 44 +------------------
 .../src/pages/setting/systemMenus/index.vue   | 13 ++++--
 2 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue b/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue
index 153b0dc08..53b76fc1f 100644
--- a/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue
+++ b/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue
@@ -39,36 +39,6 @@
               <Cascader :data="menuList" change-on-select v-model="formValidate.path" filterable></Cascader>
             </FormItem>
           </Col>
-          <!-- <Col v-bind="grid" v-if="!authType">
-            <FormItem label="请求方式：" prop="methods">
-              <Select v-model="formValidate.methods">
-                <Option value="">请求</Option>
-                <Option value="GET">GET</Option>
-                <Option value="POST">POST</Option>
-                <Option value="PUT">PUT</Option>
-                <Option value="DELETE">DELETE</Option>
-              </Select>
-            </FormItem>
-          </Col> -->
-          <!-- <Col v-bind="grid" v-if="!authType">
-            <FormItem label="接口地址：">
-              <Input v-model="formValidate.api_url" placeholder="请输入接口地址" prop="api_url"></Input>
-            </FormItem>
-          </Col> -->
-          <Col v-bind="grid" v-show="authType">
-            <FormItem label="路由地址：" prop="menu_path">
-              <Input v-model="formValidate.menu_path" placeholder="请输入路由地址" @on-change="changeUnique">
-                <template #prepend>
-                  <span>{{ $routeProStr }}</span>
-                </template>
-              </Input>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="权限标识：" prop="unique_auth">
-              <Input v-model="formValidate.unique_auth" placeholder="请输入权限标识"></Input>
-            </FormItem>
-          </Col>
           <Col v-bind="grid" v-if="authType">
             <FormItem label="图标：">
               <Input
@@ -85,8 +55,8 @@
               <Input type="number" v-model="formValidate.sort" placeholder="请输入排序" number></Input>
             </FormItem>
           </Col>
-          <!-- <Col v-bind="grid" v-show="authType">
-            <FormItem label="隐藏菜单：">
+          <Col v-bind="grid">
+            <FormItem label="是否显示：">
               <RadioGroup v-model="formValidate.is_show_path">
                 <Radio :label="item.value" v-for="(item, i) in isShowPathRadio" :key="i">
                   <Icon type="social-apple"></Icon>
@@ -94,16 +64,6 @@
                 </Radio>
               </RadioGroup>
             </FormItem>
-          </Col> -->
-          <Col v-bind="grid">
-            <FormItem label="状态：">
-              <RadioGroup v-model="formValidate.is_show">
-                <Radio :label="item.value" v-for="(item, i) in isShowRadio" :key="i">
-                  <Icon type="social-apple"></Icon>
-                  <span>{{ item.label }}</span>
-                </Radio>
-              </RadioGroup>
-            </FormItem>
           </Col>
         </Row>
       </Form>
diff --git a/template/admin/src/pages/setting/systemMenus/index.vue b/template/admin/src/pages/setting/systemMenus/index.vue
index fdf1d4332..ed75b3afc 100644
--- a/template/admin/src/pages/setting/systemMenus/index.vue
+++ b/template/admin/src/pages/setting/systemMenus/index.vue
@@ -42,14 +42,14 @@
         row-id="id"
       >
         <vxe-table-column field="menu_name" tree-node title="按钮名称" min-width="100"></vxe-table-column>
-        <vxe-table-column field="unique_auth" title="前端权限" min-width="200"></vxe-table-column>
-        <vxe-table-column field="menu_path" title="路由" min-width="240" tooltip="true">
+        <vxe-table-column field="menu_path" title="路径" min-width="240" tooltip="true">
           <template v-slot="{ row }">
             <span v-if="row.auth_type == 1">页面：{{ row.menu_path }}</span>
             <span v-if="row.auth_type == 2">按钮：[{{ row.methods }}]{{ row.api_url }}</span>
           </template>
         </vxe-table-column>
-        <vxe-table-column field="flag" title="是否显示" min-width="120">
+        <vxe-table-column field="sort" title="排序" width="150"></vxe-table-column>
+        <vxe-table-column field="flag" title="是否显示" width="150">
           <template v-slot="{ row }">
             <i-switch
               v-model="row.is_show_path"
@@ -64,6 +64,11 @@
             </i-switch>
           </template>
         </vxe-table-column>
+        <vxe-table-column field="date" title="操作" align="center" width="150" fixed="right">
+          <template v-slot="{ row }">
+            <a @click="edit(row, '编辑')">编辑</a>
+          </template>
+        </vxe-table-column>
       </vxe-table>
     </Card>
     <menus-from
@@ -171,6 +176,7 @@ export default {
       roleData: {
         is_show: 1,
         keyword: '',
+        auth_type: 1,
       },
       defaultProps: {
         children: 'children',
@@ -423,7 +429,6 @@ export default {
     // 列表
     getData() {
       this.loading = true;
-      this.roleData.is_show = this.roleData.is_show || '';
       getTable(this.roleData)
         .then(async (res) => {
           this.tableData = res.data;