Selaa lähdekoodia

fix(公用样式):无分页表格高度函数调整,菜单管理页面调整

wanglj 2 vuotta sitten
vanhempi
commit
7d7297a07f
3 muutettua tiedostoa jossa 112 lisäystä ja 114 poistoa
  1. 1 1
      src/vab/plugins/vab.js
  2. 8 3
      src/views/customer/detail.vue
  3. 103 110
      src/views/system/menu/index.vue

+ 1 - 1
src/vab/plugins/vab.js

@@ -156,7 +156,7 @@ Vue.prototype.$baseTableHeight = (formType) => {
 
 Vue.prototype.$noPagingTableHeight = (formType) => {
   let height
-  const paddingHeight = 190
+  const paddingHeight = 145
   const formHeight = 50
 
   if ('number' === typeof formType) {

+ 8 - 3
src/views/customer/detail.vue

@@ -2,7 +2,7 @@
  * @Author: wanglj 471442253@qq.com
  * @Date: 2022-12-26 09:30:47
  * @LastEditors: wanglj
- * @LastEditTime: 2023-01-11 18:33:13
+ * @LastEditTime: 2023-01-12 09:39:55
  * @Description: file content
  * @FilePath: \opms_frontend\src\views\customer\detail.vue
 -->
@@ -18,7 +18,7 @@
               <template v-if="privateCus == 1">
                 <el-button v-permissions="['customer:shift']" @click="handleShift">转移客户</el-button>
                 <el-button v-permissions="['customer:open']" @click="handleToOpen">移入公海</el-button>
-                <el-button @click="handleBusiness">创建项目</el-button>
+                <el-button v-permissions="['customer:business']" @click="handleBusiness">创建项目</el-button>
               </template>
               <template v-else>
                 <el-button v-permissions="['customer:receive']" @click="handleReceive">领取客户</el-button>
@@ -313,7 +313,7 @@
     <!-- 跟进详情 -->
     <FollowDetail ref="followDetail" />
     <!-- 添加项目 -->
-    <Businessedit ref="businessedit" :cust-info="custInfo" />
+    <Businessedit ref="businessedit" :cust-info="custInfo" @fetch-data="getBusiness" />
   </div>
 </template>
 
@@ -591,6 +591,11 @@
         }
         this.$refs.businessedit.dialogFormVisible = true
       },
+      getBusiness() {
+        if (this.activeName == 'item') {
+          this.handleClick({ name: 'item' })
+        }
+      },
     },
   }
 </script>

+ 103 - 110
src/views/system/menu/index.vue

@@ -1,113 +1,108 @@
 <template>
   <div class="menu-management-container">
-    <el-row :gutter="20">
-      <!--      <el-col :lg="4" :md="8" :sm="24" :xl="4" :xs="24">-->
-      <!--        <el-card class="menu-left" shadow="hover">-->
-      <!--          <el-tree-->
-      <!--            :data="data"-->
-      <!--            :default-expanded-keys="['root']"-->
-      <!--            node-key="id"-->
-      <!--            :props="defaultProps"-->
-      <!--            @node-click="handleNodeClick" />-->
-      <!--        </el-card>-->
-      <!--      </el-col>-->
-      <!--      <el-col :lg="20" :md="16" :sm="24" :xl="20" :xs="24">-->
-      <el-col>
-        <el-card shadow="hover">
-          <vab-query-form>
-            <vab-query-form-top-panel :span="12">
-              <el-button icon="el-icon-plus" type="primary" @click="handleEdit('')">添加</el-button>
-            </vab-query-form-top-panel>
-          </vab-query-form>
-          <el-table
-            v-loading="listLoading"
-            border
-            :data="list"
-            default-expand-all
-            :height="$noPagingTableHeight(1)"
-            row-key="id"
-            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
-            <el-table-column label="菜单名称" prop="menuName" show-overflow-tooltip />
-            <!--            <el-table-column label="路径" prop="path" show-overflow-tooltip />-->
-            <el-table-column label="组件路径" prop="component" show-overflow-tooltip />
-            <el-table-column label="权限标识" prop="perms" show-overflow-tooltip />
-            <el-table-column label="排序" prop="sort" width="60" />
-            <el-table-column label="图标" prop="icon" show-overflow-tooltip width="60">
-              <template #default="{ row }">
-                <vab-icon v-if="row.icon" :icon="row.icon" />
-              </template>
-            </el-table-column>
-            <el-table-column label="菜单状态" prop="status" width="80">
-              <template #default="{ row }">
-                {{ row.status === '10' ? '正常' : '停用' }}
-              </template>
-            </el-table-column>
-            <el-table-column label="显示状态" prop="visible" width="80">
-              <template #default="{ row }">
-                {{ row.status === '10' ? '显示' : '隐藏' }}
-              </template>
-            </el-table-column>
-            <el-table-column label="缓存" show-overflow-tooltip width="60">
-              <template #default="{ row }">
-                {{ row.isCache ? '是' : '否' }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="创建时间" prop="createdTime">
-              <template #default="scope">
-                <span>{{ parseTime(scope.row.createdTime) }}</span>
-              </template>
-            </el-table-column>
-            <!--            <el-table-column label="重定向" show-overflow-tooltip>-->
-            <!--              <template #default="{ row }">-->
-            <!--                {{ row.redirect ? row.redirect : '无' }}-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column label="是否隐藏" show-overflow-tooltip>-->
-            <!--              <template #default="{ row }">-->
-            <!--                {{ row.meta.hidden ? '是' : '否' }}-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column-->
-            <!--              label="是否隐藏当前节点"-->
-            <!--              show-overflow-tooltip-->
-            <!--              width="100">-->
-            <!--              <template #default="{ row }">-->
-            <!--                {{ row.meta.levelHidden ? '是' : '否' }}-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column label="是否固定" show-overflow-tooltip>-->
-            <!--              <template #default="{ row }">-->
-            <!--                {{ row.meta && row.meta.noClosable ? '是' : '否' }}-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column label="badge" show-overflow-tooltip>-->
-            <!--              <template #default="{ row }">-->
-            <!--                <el-tag-->
-            <!--                  v-if="row.meta && row.meta.badge"-->
-            <!--                  effect="dark"-->
-            <!--                  type="danger">-->
-            <!--                  {{ row.meta.badge }}-->
-            <!--                </el-tag>-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column label="dot" show-overflow-tooltip>-->
-            <!--              <template #default="{ row }">-->
-            <!--                {{ row.meta && row.meta.dot ? '是' : '否' }}-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
-            <el-table-column fixed="right" label="操作" show-overflow-tooltip width="85">
-              <template #default="{ row }">
-                <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-                <el-button type="text" @click="handleDelete(row)">删除</el-button>
-              </template>
-            </el-table-column>
-            <template #empty>
-              <el-image class="vab-data-empty" :src="require('@/assets/empty_images/data_empty.png')" />
-            </template>
-          </el-table>
-        </el-card>
-      </el-col>
-    </el-row>
+    <!--      <el-col :lg="4" :md="8" :sm="24" :xl="4" :xs="24">-->
+    <!--        <el-card class="menu-left" shadow="hover">-->
+    <!--          <el-tree-->
+    <!--            :data="data"-->
+    <!--            :default-expanded-keys="['root']"-->
+    <!--            node-key="id"-->
+    <!--            :props="defaultProps"-->
+    <!--            @node-click="handleNodeClick" />-->
+    <!--        </el-card>-->
+    <!--      </el-col>-->
+    <!--      <el-col :lg="20" :md="16" :sm="24" :xl="20" :xs="24">-->
+
+    <vab-query-form>
+      <vab-query-form-top-panel :span="12">
+        <el-button icon="el-icon-plus" type="primary" @click="handleEdit('')">添加</el-button>
+      </vab-query-form-top-panel>
+    </vab-query-form>
+    <el-table
+      v-loading="listLoading"
+      border
+      :data="list"
+      default-expand-all
+      :height="$noPagingTableHeight(1)"
+      row-key="id"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+      <el-table-column label="菜单名称" prop="menuName" show-overflow-tooltip />
+      <!--            <el-table-column label="路径" prop="path" show-overflow-tooltip />-->
+      <el-table-column label="组件路径" prop="component" show-overflow-tooltip />
+      <el-table-column label="权限标识" prop="perms" show-overflow-tooltip />
+      <el-table-column label="排序" prop="sort" width="60" />
+      <el-table-column label="图标" prop="icon" show-overflow-tooltip width="60">
+        <template #default="{ row }">
+          <vab-icon v-if="row.icon" :icon="row.icon" />
+        </template>
+      </el-table-column>
+      <el-table-column label="菜单状态" prop="status" width="80">
+        <template #default="{ row }">
+          {{ row.status === '10' ? '正常' : '停用' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="显示状态" prop="visible" width="80">
+        <template #default="{ row }">
+          {{ row.status === '10' ? '显示' : '隐藏' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="缓存" show-overflow-tooltip width="60">
+        <template #default="{ row }">
+          {{ row.isCache ? '是' : '否' }}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="创建时间" prop="createdTime">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createdTime) }}</span>
+        </template>
+      </el-table-column>
+      <!--            <el-table-column label="重定向" show-overflow-tooltip>-->
+      <!--              <template #default="{ row }">-->
+      <!--                {{ row.redirect ? row.redirect : '无' }}-->
+      <!--              </template>-->
+      <!--            </el-table-column>-->
+      <!--            <el-table-column label="是否隐藏" show-overflow-tooltip>-->
+      <!--              <template #default="{ row }">-->
+      <!--                {{ row.meta.hidden ? '是' : '否' }}-->
+      <!--              </template>-->
+      <!--            </el-table-column>-->
+      <!--            <el-table-column-->
+      <!--              label="是否隐藏当前节点"-->
+      <!--              show-overflow-tooltip-->
+      <!--              width="100">-->
+      <!--              <template #default="{ row }">-->
+      <!--                {{ row.meta.levelHidden ? '是' : '否' }}-->
+      <!--              </template>-->
+      <!--            </el-table-column>-->
+      <!--            <el-table-column label="是否固定" show-overflow-tooltip>-->
+      <!--              <template #default="{ row }">-->
+      <!--                {{ row.meta && row.meta.noClosable ? '是' : '否' }}-->
+      <!--              </template>-->
+      <!--            </el-table-column>-->
+      <!--            <el-table-column label="badge" show-overflow-tooltip>-->
+      <!--              <template #default="{ row }">-->
+      <!--                <el-tag-->
+      <!--                  v-if="row.meta && row.meta.badge"-->
+      <!--                  effect="dark"-->
+      <!--                  type="danger">-->
+      <!--                  {{ row.meta.badge }}-->
+      <!--                </el-tag>-->
+      <!--              </template>-->
+      <!--            </el-table-column>-->
+      <!--            <el-table-column label="dot" show-overflow-tooltip>-->
+      <!--              <template #default="{ row }">-->
+      <!--                {{ row.meta && row.meta.dot ? '是' : '否' }}-->
+      <!--              </template>-->
+      <!--            </el-table-column>-->
+      <el-table-column fixed="right" label="操作" show-overflow-tooltip width="85">
+        <template #default="{ row }">
+          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+        </template>
+      </el-table-column>
+      <template #empty>
+        <el-image class="vab-data-empty" :src="require('@/assets/empty_images/data_empty.png')" />
+      </template>
+    </el-table>
     <edit ref="edit" @fetch-data="fetchData" />
   </div>
 </template>
@@ -168,8 +163,6 @@
 <style lang="scss" scoped>
   $base: '.menu-management';
   #{$base}-container {
-    padding: 0 !important;
-    background: $base-color-background !important;
   }
 
   .menu-left {