lxr пре 2 месеци
родитељ
комит
9b6cef5c36

+ 6 - 0
src/api/modules/performance.ts

@@ -103,6 +103,10 @@ export interface PerformanceListQuery {
   performanceType?: number;
   submitTimeStart?: string;
   submitTimeEnd?: string;
+  /** 演出开始时间(起止时间筛选) 格式 YYYY-MM-DD HH:mm:ss */
+  startCreatedTime?: string;
+  /** 演出结束时间(起止时间筛选) 格式 YYYY-MM-DD HH:mm:ss */
+  endCreatedTime?: string;
 }
 
 function transformListItem(item: any): PerformanceRow {
@@ -142,6 +146,8 @@ export const getPerformancePage = (params: PerformanceListQuery) => {
   if (params.performanceType !== undefined && params.performanceType !== null) query.performanceType = params.performanceType;
   if (params.submitTimeStart) query.submitTimeStart = params.submitTimeStart;
   if (params.submitTimeEnd) query.submitTimeEnd = params.submitTimeEnd;
+  if (params.startCreatedTime) query.startCreatedTime = params.startCreatedTime;
+  if (params.endCreatedTime) query.endCreatedTime = params.endCreatedTime;
 
   return performanceAxios.get<any>(PORT_NONE + "/store/bar/performance/listByStoreId", { params: query });
 };

+ 1 - 1
src/assets/json/authMenuList.json

@@ -1054,7 +1054,7 @@
           "component": "/storeDecoration/decorationCompany",
           "meta": {
             "icon": "OfficeBuilding",
-            "title": "装修公司",
+            "title": "门店装修",
             "isLink": "",
             "isHide": false,
             "isFull": false,

+ 4 - 4
src/stores/modules/auth.ts

@@ -86,7 +86,7 @@ export const useAuthStore = defineStore({
                 break;
               case "人员配置":
                 // 美食(1)和KTV(3)不显示人员配置,其他业务类型都显示
-                menu.meta.isHide = [1, 3].includes(businessSection) || !storeId;
+                menu.meta.isHide = !storeId;
                 break;
               case "食品经营许可证":
                 // 特色美食(1) 和 酒吧(2):正常显示
@@ -113,7 +113,7 @@ export const useAuthStore = defineStore({
                 break;
               case "演出":
                 // 有店铺且为休闲娱乐(businessSection=2) 时显示演出
-                menu.meta.isHide = !storeId || businessSection !== 2;
+                menu.meta.isHide = !storeId || businessSection == 2;
                 break;
               case "门店装修":
                 menu.meta.isHide = !storeId;
@@ -124,9 +124,9 @@ export const useAuthStore = defineStore({
           // 门店装修:根据 storeTickets 只显示其一,0=只显示「门店装修」,1=只显示「装修公司」
           if (menu.name === "storeDecorationManagement" && menu.children?.length) {
             menu.children.forEach((child: any) => {
-              if (child.meta?.title === "门店装修") {
+              if (child.name === "decorationManagement") {
                 child.meta.isHide = storeTickets !== 0;
-              } else if (child.meta?.title === "装修公司") {
+              } else if (child.name === "decorationCompany") {
                 child.meta.isHide = storeTickets !== 1;
               }
             });

+ 29 - 1
src/views/performance/index.vue

@@ -155,6 +155,32 @@ const columns: ColumnProps<PerformanceRow>[] = [
     fieldNames: { label: "label", value: "value" }
   },
   {
+    prop: "startCreatedTime",
+    label: "演出开始时间",
+    isShow: false,
+    search: {
+      el: "date-picker",
+      props: {
+        type: "datetime",
+        valueFormat: "YYYY-MM-DD HH:mm:ss",
+        placeholder: "请选择开始时间"
+      }
+    }
+  },
+  {
+    prop: "endCreatedTime",
+    label: "演出结束时间",
+    isShow: false,
+    search: {
+      el: "date-picker",
+      props: {
+        type: "datetime",
+        valueFormat: "YYYY-MM-DD HH:mm:ss",
+        placeholder: "请选择结束时间"
+      }
+    }
+  },
+  {
     prop: "submitTime",
     label: "提交时间"
   },
@@ -171,7 +197,9 @@ const getTableList = (params: any) => {
     performanceName: params.name ?? undefined,
     reviewStatus: params.auditStatus,
     performanceType: params.performanceType,
-    onlineStatus: params.shelfStatus
+    onlineStatus: params.shelfStatus,
+    startCreatedTime: params.startCreatedTime ?? undefined,
+    endCreatedTime: params.endCreatedTime ?? undefined
   };
   return getPerformancePage(query);
 };