From 0e49ce320d1a81f6da93c8600009a11c9619853f Mon Sep 17 00:00:00 2001
From: zhangyx <1254353766@qq.com>
Date: Tue, 15 Nov 2022 15:54:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E4=BA=BA=E5=91=98=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=B2=BE=E7=A1=AE=E5=88=B0=E5=88=86=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SiteUser/components/AuthorizeModal.tsx           |  8 ++++----
 .../SiteUser/components/SiteUserModal.tsx            | 12 +++++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/AuthorizeModal.tsx b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/AuthorizeModal.tsx
index b832b3a..0b52ba2 100644
--- a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/AuthorizeModal.tsx
+++ b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/AuthorizeModal.tsx
@@ -314,9 +314,9 @@ const AuthorizeModal: React.FC<AuthorizeModalProps> = (props) => {
               rules={rule('权限开始时间')}
             >
               <DatePicker
-                format="YYYY-MM-DD"
+                format="yyyy-MM-DD HH:mm"
                 disabledDate={disabledDate}
-                showTime={{ defaultValue: moment('00:00:00', 'HH:mm:ss') }}
+                showTime={{ defaultValue: moment('00', 'ss') }}
                 showNow={false}
                 style={{ width: "90%" }}
               />
@@ -327,9 +327,9 @@ const AuthorizeModal: React.FC<AuthorizeModalProps> = (props) => {
               rules={rule('权限结束时间')}
             >
               <DatePicker
-                format="YYYY-MM-DD"
+                format="yyyy-MM-DD HH:mm"
                 disabledDate={disabledDate}
-                showTime={{ defaultValue: moment('23:59:59', 'HH:mm:ss') }}
+                showTime={{ defaultValue: moment('00', 'ss') }}
                 showNow={false}
                 style={{ width: "90%" }}
               />
diff --git a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/SiteUserModal.tsx b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/SiteUserModal.tsx
index 8a9cb88..afc2b2f 100644
--- a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/SiteUserModal.tsx
+++ b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/SiteUserModal.tsx
@@ -42,6 +42,7 @@ const SitePersonModal: React.FC<SitePersonModalProps> = (props) => {
 
 
   useEffect(() => {
+    console.log(type)
     if (JSON.stringify(values) !== "{}") {
       setGroupValue(values.groupStatus);
       form.setFieldsValue({
@@ -75,13 +76,15 @@ const SitePersonModal: React.FC<SitePersonModalProps> = (props) => {
 
 
   const renderFooter = () => {
+    console.log(type == "edit")
+    console.log(type == "insert")
     if (type == "read") {
       return (
         <>
           <Button onClick={onCancel}>关闭</Button>
         </>
       );
-    } else {
+    } else if (type == "edit") {
       return (
         <>
           <Popconfirm
@@ -95,6 +98,13 @@ const SitePersonModal: React.FC<SitePersonModalProps> = (props) => {
           <Button onClick={onCancel}>取消</Button>
         </>
       );
+    } else {
+      return (
+        <>
+            <Button type="primary" loading={loading} onClick={onOk}>确认</Button>
+          <Button onClick={onCancel}>取消</Button>
+        </>
+      );
     }
   }