diff --git a/app/views/asset-manifest.json b/app/views/asset-manifest.json index 42107af..cd279bf 100644 --- a/app/views/asset-manifest.json +++ b/app/views/asset-manifest.json @@ -1,16 +1,16 @@ { "files": { - "main.css": "/static/css/main.38d76725.css", - "main.js": "/static/js/main.6292bf56.js", + "main.css": "/static/css/main.184a423c.css", + "main.js": "/static/js/main.6094576b.js", "static/js/787.c4e7f8f9.chunk.js": "/static/js/787.c4e7f8f9.chunk.js", "static/media/landing.png": "/static/media/landing.d4c6072db7a67dff6a78.png", "index.html": "/index.html", - "main.38d76725.css.map": "/static/css/main.38d76725.css.map", - "main.6292bf56.js.map": "/static/js/main.6292bf56.js.map", + "main.184a423c.css.map": "/static/css/main.184a423c.css.map", + "main.6094576b.js.map": "/static/js/main.6094576b.js.map", "787.c4e7f8f9.chunk.js.map": "/static/js/787.c4e7f8f9.chunk.js.map" }, "entrypoints": [ - "static/css/main.38d76725.css", - "static/js/main.6292bf56.js" + "static/css/main.184a423c.css", + "static/js/main.6094576b.js" ] } \ No newline at end of file diff --git a/app/views/index.html b/app/views/index.html index 9a0a559..fd23ba4 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -1 +1 @@ -Worldshine Transportation
\ No newline at end of file +Worldshine Transportation
\ No newline at end of file diff --git a/client/build/asset-manifest.json b/client/build/asset-manifest.json index 42107af..cd279bf 100644 --- a/client/build/asset-manifest.json +++ b/client/build/asset-manifest.json @@ -1,16 +1,16 @@ { "files": { - "main.css": "/static/css/main.38d76725.css", - "main.js": "/static/js/main.6292bf56.js", + "main.css": "/static/css/main.184a423c.css", + "main.js": "/static/js/main.6094576b.js", "static/js/787.c4e7f8f9.chunk.js": "/static/js/787.c4e7f8f9.chunk.js", "static/media/landing.png": "/static/media/landing.d4c6072db7a67dff6a78.png", "index.html": "/index.html", - "main.38d76725.css.map": "/static/css/main.38d76725.css.map", - "main.6292bf56.js.map": "/static/js/main.6292bf56.js.map", + "main.184a423c.css.map": "/static/css/main.184a423c.css.map", + "main.6094576b.js.map": "/static/js/main.6094576b.js.map", "787.c4e7f8f9.chunk.js.map": "/static/js/787.c4e7f8f9.chunk.js.map" }, "entrypoints": [ - "static/css/main.38d76725.css", - "static/js/main.6292bf56.js" + "static/css/main.184a423c.css", + "static/js/main.6094576b.js" ] } \ No newline at end of file diff --git a/client/build/index.html b/client/build/index.html index 9a0a559..fd23ba4 100644 --- a/client/build/index.html +++ b/client/build/index.html @@ -1 +1 @@ -Worldshine Transportation
\ No newline at end of file +Worldshine Transportation
\ No newline at end of file diff --git a/client/src/App.css b/client/src/App.css index 1d70de5..6a6ae9f 100644 --- a/client/src/App.css +++ b/client/src/App.css @@ -228,6 +228,7 @@ input { position: absolute; right: 0; top: 4px; + display: flex; } @@ -394,6 +395,12 @@ table .group td { font-style: italic; } +.list-func-panel .dropdown-menu { + padding: 20px; + width: 250px; + transform: translate(0px, 37px)!important; +} + .app-main-content-fields-section { display: flex; align-items: baseline; @@ -401,10 +408,27 @@ table .group td { margin-bottom: 40px; } +.app-main-content-fields-section.flex-end { + display: flex; + align-items: flex-end; + margin-top: 24px; + margin-bottom: 40px; +} + .app-main-content-fields-section.column { flex-direction: column; } +.no-margin-v { + margin-top: 0 !important; + margin-bottom: 0 !important; +} + +.margin-sm { + margin-top: 20px !important; + margin-bottom: 20px !important; +} + .app-main-content-fields-section li { list-style: decimal; margin-top: 4px; @@ -431,11 +455,20 @@ table .group td { margin-right: 100px; } +.app-main-content-fields-section .react-datepicker-wrapper { + width: 120px !important; +} + .app-main-content-fields-section input[type=text] { width: 350px; height: 45px; } +.app-main-content-fields-section.with-function .react-datepicker-wrapper input[type=text] { + height: 35px; + width: 120px; +} + .app-main-content-fields-section input[type=text].shorter { width: 50px; height: 45px; diff --git a/client/src/components/event-request/CreateEventRequest.js b/client/src/components/event-request/CreateEventRequest.js index 9d5b25f..3336b90 100644 --- a/client/src/components/event-request/CreateEventRequest.js +++ b/client/src/components/event-request/CreateEventRequest.js @@ -4,7 +4,7 @@ import { useNavigate, useParams } from "react-router-dom"; // import { customerSlice } from "./../../store"; import { AuthService, CustomerService, EventRequestsService, EventsService, ResourceService } from "../../services"; import Select from 'react-select'; -import { Button, Modal } from "react-bootstrap"; +import { Spinner, Breadcrumb, BreadcrumbItem, Tabs, Tab, Button, Modal } from "react-bootstrap"; const CreateEvent = () => { const navigate = useNavigate(); @@ -110,117 +110,161 @@ const CreateEvent = () => { return ( <> -
-
-
-
-
Create Event Request
-
-
-
-
-
Source*:
- -
-
-
Type*:
- -
-
-
Patient*:
- - -
-
-
Doctor:
- {currentResource ? (<>{currentResource?.name} ) : ()} - {/* */} -
-
-
Symptom 和特殊要求: