Bladeren bron

feat & bugfix:优化部门模块的代码、提示等

YunaiV 4 maanden geleden
bovenliggende
commit
da0f6bd183

+ 1 - 21
src/components/FormCreate/src/type/index.ts

@@ -1,5 +1,3 @@
-import { Rule } from '@form-create/element-ui' //左侧拖拽按钮
-
 // 左侧拖拽按钮
 export interface MenuItem {
   label: string
@@ -14,24 +12,6 @@ export interface Menu {
   list: MenuItem[]
 }
 
-export interface MenuList extends Array<Menu> {}
-
-// 拖拽组件的规则
-export interface DragRule {
-  icon: string
-  name: string
-  label: string
-  children?: string
-  inside?: true
-  drag?: true | String
-  dragBtn?: false
-  mask?: false
-
-  rule(): Rule
-
-  props(v: any, v1: any): Rule[]
-}
-
 // 通用下拉组件 Props 类型
 export interface ApiSelectProps {
   name: string // 组件名称
@@ -46,6 +26,6 @@ export interface SelectRuleOption {
   label: string // label 名称
   name: string // 组件名称
   icon: string // 组件图标
-  props?: any[], // 组件规则
+  props?: any[] // 组件规则
   event?: any[] // 事件配置
 }

+ 0 - 1
src/views/bpm/oa/leave/index.vue

@@ -242,7 +242,6 @@ const handleProcessDetail = (row) => {
   })
 }
 
-// fix: 列表不刷新的问题。
 watch(
   () => router.currentRoute.value,
   () => {

+ 0 - 1
src/views/mall/home/components/OperationDataCard.vue

@@ -69,7 +69,6 @@ const getOrderData = async () => {
 
 /** 查询商品数据 */
 const getProductData = async () => {
-  // TODO: @芋艿:这个接口的返回值,是不是用命名字段更好些?
   const productCount = await ProductSpuApi.getTabsCount()
   data.productForSale.value = productCount['0']
   data.productInWarehouse.value = productCount['1']

+ 1 - 1
src/views/mall/home/components/TradeTrendCard.vue

@@ -196,7 +196,7 @@ const getOrderCountTrendComparison = async (
   }
   eChartOptions.xAxis!['data'] = dates
   eChartOptions.series = series
-  // legend在4个切换到2个的时候,还是显示成4个,需要手动配置一下
+  // legend  4 个切换到 2 个的时候,还是显示成 4 个,需要手动配置一下
   eChartOptions.legend['data'] = series.map((item) => item.name)
   loading.value = false
 }

+ 6 - 2
src/views/mall/promotion/diy/template/decorate.vue

@@ -166,11 +166,15 @@ const handleEditorReset = () => storePageIndex()
 //#region 无感刷新
 // 记录标识
 const DIY_PAGE_INDEX_KEY = 'diy_page_index'
+
 // 1. 记录
-const storePageIndex = () =>
-  sessionStorage.setItem(DIY_PAGE_INDEX_KEY, `${selectedTemplateItem.value}`)
+function storePageIndex() {
+  debugger
+  return sessionStorage.setItem(DIY_PAGE_INDEX_KEY, `${selectedTemplateItem.value}`)
+}
 // 2. 恢复
 const recoverPageIndex = () => {
+  debugger
   // 恢复重置前的页面,默认是第一个页面
   const pageIndex = toNumber(sessionStorage.getItem(DIY_PAGE_INDEX_KEY)) || 0
   // 移除标记

+ 0 - 1
src/views/mall/promotion/point/activity/index.vue

@@ -68,7 +68,6 @@
         min-width="100"
         prop="marketPrice"
       />
-      <el-table-column label="原价" min-width="100" prop="marketPrice" />
       <el-table-column align="center" label="活动状态" min-width="100" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />

+ 1 - 1
src/views/mall/promotion/point/activity/pointActivity.data.ts

@@ -20,7 +20,7 @@ const crudSchemas = reactive<CrudSchema[]>([
     }
   },
   {
-    label: '积分商城活动商品',
+    label: '活动商品',
     field: 'spuId',
     isTable: true,
     isSearch: false,

+ 0 - 1
src/views/mall/statistics/member/components/MemberTerminalCard.vue

@@ -29,7 +29,6 @@ const terminalChartOptions = reactive<EChartsOption>({
     orient: 'vertical',
     left: 'right'
   },
-  roseType: 'area',
   series: [
     {
       name: '会员终端',