From 78ffdd4736308d1a5ed5f428e7f0442ab456f8de Mon Sep 17 00:00:00 2001 From: gwbvipvip Date: Fri, 1 Mar 2024 18:57:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/global_data.js | 6 + .../storeAuthorization/index.jsx | 104 ++++++++++++++---- .../storeAuthorization/services.js | 8 ++ 3 files changed, 94 insertions(+), 24 deletions(-) diff --git a/src/global_data.js b/src/global_data.js index 1769b44..b14735f 100644 --- a/src/global_data.js +++ b/src/global_data.js @@ -8,3 +8,9 @@ export function getApiUrl() { export function getDataBaseUrl() { return '/kitchbase'; } + +export function GetkitchbaseUrl() { + return '/kitchbase'; +} + + diff --git a/src/pages/authorization/storeAuthorization/index.jsx b/src/pages/authorization/storeAuthorization/index.jsx index 595202d..8f35abb 100644 --- a/src/pages/authorization/storeAuthorization/index.jsx +++ b/src/pages/authorization/storeAuthorization/index.jsx @@ -4,9 +4,15 @@ import { PageContainer, FooterToolbar } from '@ant-design/pro-layout'; import { PlusOutlined } from '@ant-design/icons'; import ProTable from '@ant-design/pro-table'; import { QuestionCircleOutlined } from '@ant-design/icons'; +import dayjs from 'dayjs'; +import weekday from "dayjs/plugin/weekday"; +import localeData from "dayjs/plugin/localeData"; +dayjs.extend(weekday); +dayjs.extend(localeData); +const dateFormat = 'YYYY/MM/DD'; const { Paragraph, Text } = Typography; -import { PageStoreAuthorization, AddStoreAuthorization, UpdateStoreAuthorization, GetStoreList } from "./services" +import { PageStoreAuthorization, AddStoreAuthorization, UpdateStoreAuthorization, UpdateStoreAuthTime, GetStoreList } from "./services" const App = () => { const actionRef = useRef(); @@ -57,6 +63,22 @@ const App = () => { valueType: 'textarea', search: false, }, + { + title: '有效日期', + dataIndex: 'periodValidity', + valueType: 'textarea', + search: false, + render: (_, record) => { + return {record.periodValidity == null ? "长期有效" : record.periodValidity} + } + }, + { + title: '修改时间', + dataIndex: 'updateAt', + valueType: 'textarea', + width: 200, + search: false + }, { title: '操作', dataIndex: 'option', @@ -109,7 +131,7 @@ const App = () => { request={async (params) => { var data = []; var total = 0; - await PageStoreAuthorization(params).then((r) => { + await PageStoreAuthorization(params).then((r) => { total = r.data.total; data = r.data.data; }); @@ -122,35 +144,69 @@ const App = () => { columns={columns} /> - { - if (!currentRow) { - message.error("请选择店铺"); - return; - } - AddStoreAuthorization(currentRow).then((r) => { - if (r.statusCode == 200 && r.data) { - message.success("添加成功"); - actionRef.current.reload(); - handleModalVisible(false); - } else { - message.error(r.errors || "添加失败"); - } - }); + form.submit(); }} onCancel={() => { handleModalVisible(false); }}> - + +