From 49e738e16d6ae36a7b051e17e5bc83a2a01edd85 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Tue, 23 Apr 2024 15:09:35 +0800 Subject: [PATCH] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E7=B3=BB=E7=BB=9F=20Logo?= =?UTF-8?q?=20*=20=E6=98=BE=E7=A4=BA=E7=89=88=E6=9C=AC=E5=8F=B7=E5=92=8C?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=97=B6=E9=97=B4=E5=9C=A8=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=BA=95=E9=83=A8=20*=20=E8=AE=A2=E5=8D=95=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=86=E7=BB=84=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/界面原型.bmpr | Bin 466944 -> 466944 bytes doc/运维语句.sql | 1 + src/assets/App.css | 4 +- src/assets/highlights_travel_300_300.png | Bin 0 -> 16122 bytes src/maintenance/index.jsx | 4 +- src/views/DesktopApp.jsx | 7 +- src/views/MobileApp.jsx | 2 +- src/views/orders/Follow.jsx | 86 +++++++++++++++++++---- vite.config.js | 8 ++- 9 files changed, 88 insertions(+), 24 deletions(-) create mode 100644 src/assets/highlights_travel_300_300.png diff --git a/doc/界面原型.bmpr b/doc/界面原型.bmpr index 2f1c53e279d94520300614d4a38f2359f58fb403..7c42fc4d4dbcf59ffbf804765632f71535e2efbc 100644 GIT binary patch delta 1007 zcmb```EN{76bJBg-@UWcQl&J-v>Hp4yr$EtE~3$?>1K(ci#A0jB_WoYApE3en2shw zj9acCmZG*IG>fS1 zfrveVheT8oPR(Hrm%N!)mUUcOS&5UTP$m^qE)`M+g$RL&x4y3C*pV2$8aZZdqy0miJ1nJ4Ckguz)+Pls; z#H7E~sd_%M!=VjE#|CbRv#HOd#{(^XfH$H|`N!t@fF zk13;DA+5qaxv1vf@h04nkE*EhPsK$Z+3Aa)GzGnLv99P(-Hml?$%9T0)uFzgHqs)h zr?s-vjF(-e_}^U1X*Mmz6!nO|=U+xE@D@t(_ZZqpu`&k>D{mjqRFQse>N$1k7|FC%_MjQ$q;;Tqh82M~c9Fc{)s2;5Vv6K!L*+(vpI z?!aAKq7S~ocld!C0>h5kVJHlPco+^NAOWHi6@eROV!;tO42R$#9DoyW5?bLDoQ5+* V33L|8IcS3p&~R0!jI_PA{sfR|2VDRF delta 1164 zcmX|=e{54#6vxkf@AY(3(Pa?Av}mJfFkrT>(5+;eb+XMlGP}yyG`KL>T!Ce_FmSkp zwPTdJkl6CTgUXbM22G6F80(cEj-sLj6aMi(5)iE1 zu!R28YN?(!!nP5+VOVRhu7h6~b3Fy;Zh6jJ9L5m3Go7%I`w)U66j-O2csNLmMy9Aa>)_LqpVoaSy!=k0#nduVXZyr3qPL z&|-)%8Cx)JhF7fQ*NNzM+C_VD(hy?Ir+Sf+<1lw3v>|j;I5r;^LS`u@{2ugY2d^;FCbPyCFeXdr&|SO^r}BZY2t-Mp;2L)en8y zb_8$1#|cpS%?)LoUOAB;ki?|jAa^G1i@XUpLLX$Zb|&i-vK}X;kIwSXN`)kOiI+-m ztMj0op5tvYvBp{@(Q?}-x8CLZC3c=W?0Q-+hp&0o$j$S-U@qy9&b`73%L&q>q@5Yg zmaZ-%#Y%gR{_7pKEUB613OP8>Q8_)$m3sdvUS4uKBL4UI34LywJ1p6Mfp3)d<@QJX znaP~hM?dBf%T3*MBv;^ra_4uuQcixtzj;ju{nYJV-L>?r?=o95HOs>~yTD`WtnFtX zVsr0vLTO~3vUmXQDkqIUsAo#8XteUV%>iT1Yo6gno5N;t%$Npi0B_6C3hyK1$Dp17UxBZ|H{crh7MSOM z6%@f0umHXUm%$})4txr-;36<_Cf?*R`Ak{!pa3-Z0uRMJl?cXm{IP@d+H!gp62jsD SURgWzLA= '2024-4-15' AND last_send_time <= '2024-4-21') GROUP by opi_sn ) session_count diff --git a/src/assets/App.css b/src/assets/App.css index 516e170..9d80c28 100644 --- a/src/assets/App.css +++ b/src/assets/App.css @@ -1,6 +1,6 @@ .logo { float: left; - height: 36px; - margin: 16px 24px 16px 0; + height: 68px; + margin: 0 6px 0 0; background: rgba(255, 255, 255, 0.3); } \ No newline at end of file diff --git a/src/assets/highlights_travel_300_300.png b/src/assets/highlights_travel_300_300.png new file mode 100644 index 0000000000000000000000000000000000000000..8c7890119c96172a69a5736ae993d9da206d4bb1 GIT binary patch literal 16122 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 { 打开系统

Version: {__BUILD_VERSION__}

-

- Build Date: {__BUILD_DATE__}  GMT+00:00 -

+

Build Date: {__BUILD_DATE__}

); diff --git a/src/views/DesktopApp.jsx b/src/views/DesktopApp.jsx index 0888b41..10bd7d9 100644 --- a/src/views/DesktopApp.jsx +++ b/src/views/DesktopApp.jsx @@ -8,7 +8,7 @@ import { useEffect, useState } from 'react' import { Link, NavLink, Outlet, useHref } from 'react-router-dom' import '@/assets/App.css' -import AppLogo from '@/assets/logo-gh.png' +import AppLogo from '@/assets/highlights_travel_300_300.png' import 'react-chat-elements/dist/main.css' import ReloadPrompt from './ReloadPrompt'; import ClearCache from './ClearCache'; @@ -61,6 +61,9 @@ function DesktopApp() { return () => clearInterval(interval); }, [totalNotify, isTitleVisible]); + const __BUILD_DATE__ = `__BUILD_DATE__`; + const __BUILD_VERSION__ = `__BUILD_VERSION__`; + return (
@@ -138,7 +141,7 @@ function DesktopApp() { -
桂林海纳国际旅行社有限公司
+
桂林海纳国际旅行社有限公司 Version: {__BUILD_VERSION__}({__BUILD_DATE__})
); } diff --git a/src/views/MobileApp.jsx b/src/views/MobileApp.jsx index 2c1762e..544af6a 100644 --- a/src/views/MobileApp.jsx +++ b/src/views/MobileApp.jsx @@ -1,6 +1,6 @@ import { useEffect } from 'react'; import '@/assets/App.css'; -import AppLogo from '@/assets/logo-gh.png'; +import AppLogo from '@/assets/highlights_travel_300_300.png'; import { useThemeContext } from '@/stores/ThemeContext'; import useAuthStore from '@/stores/AuthStore'; import { Col, Layout, Row, Typography, theme, Space, Avatar, Dropdown, Flex } from 'antd'; diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx index 3c6385a..3f8faec 100644 --- a/src/views/orders/Follow.jsx +++ b/src/views/orders/Follow.jsx @@ -10,9 +10,9 @@ import { DatePicker, Empty, Flex, Form, Input, - Radio, Row, + Radio, Row, Typography, Select, Space, Switch, Table, - Tabs, + Tabs, Divider, Tag, Tooltip } from 'antd' import dayjs from 'dayjs' @@ -21,6 +21,7 @@ import { Link } from 'react-router-dom' import { useShallow } from 'zustand/react/shallow' const { RangePicker } = DatePicker +const { Title } = Typography const AdvanceSearchForm = memo(function noName({ initialValues, onSubmit }) { @@ -195,19 +196,16 @@ function OrderGroupTable({ formValues }) { { title: '订单状态', dataIndex: 'COLI_State', - width: 120, + width: 140, render: (text, record) => { - // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件 - const needTo = '要催信' + (record.coli_ordertype - 2) - let statusIcon = '' - if (record.coli_ordertype === 1) statusIcon = - else if (record.coli_ordertype === 2) statusIcon = - else if (record.coli_ordertype === 3 || record.coli_ordertype === 4 || record.coli_ordertype === 5) statusIcon = - else if (record.coli_ordertype === 6) statusIcon = + let extra = '' + if (record.coli_ordertype === 3 || record.coli_ordertype === 4 || record.coli_ordertype === 5) { + extra = '(' + (record.coli_ordertype - 2) + '催)' + } return ( - {statusIcon} + {extra} {text} ) @@ -347,13 +345,73 @@ function OrderGroupTable({ formValues }) { deptKeys.forEach((deptNo, index) => { const deptOrderList = groupOrderData[deptNo] + // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件 + const newOrderList = deptOrderList.filter((o) => { + return o.coli_ordertype === 1 + }) + const newMsgList = deptOrderList.filter((o) => { + return o.coli_ordertype === 2 + }) + const followUpList = deptOrderList.filter((o) => { + return o.coli_ordertype === 3 || o.coli_ordertype === 4 || o.coli_ordertype === 5 + }) + const paymentList = deptOrderList.filter((o) => { + return o.coli_ordertype === 1000 + }) + const entryList = deptOrderList.filter((o) => { + return o.coli_ordertype === 20000 + }) deptItems.push( { key: index, label: deptMap.get(deptNo), - children: + children: <> + 新订单 + 0} + whenTrue={
} + whenFalse={} + /> + + 新消息/老邮件 + 0} + whenTrue={
} + whenFalse={} + /> + + 催信 + 0} + whenTrue={
} + whenFalse={} + /> + + 余款收付 + 0} + whenTrue={
} + whenFalse={} + /> + + 入境提醒 + 0} + whenTrue={
} + whenFalse={} + /> + + } ) }) diff --git a/vite.config.js b/vite.config.js index 37dff43..11563f7 100644 --- a/vite.config.js +++ b/vite.config.js @@ -3,12 +3,15 @@ import react from '@vitejs/plugin-react'; import WindiCSS from 'vite-plugin-windicss'; import { VitePWA } from 'vite-plugin-pwa'; import packageJson from './package.json'; +import dayjs from 'dayjs' + +const today = new dayjs().format('YYYY-MM-DD HH:mm:ss') const buildDatePlugin = () => { return { transformIndexHtml(html) { const dataString = new Date().toISOString(); - return html.replace(/%BUILD_VERSION%/, `${packageJson.version}(${dataString})`); + return html.replace(/%BUILD_VERSION%/, `${packageJson.version}(${today})`); }, }; }; @@ -106,10 +109,11 @@ const manifestForPlugIn = { orientation: 'portrait', }, }; + // https://vitejs.dev/config/ export default defineConfig({ define: { - __BUILD_DATE__: JSON.stringify(`${new Date().toISOString()}`), + __BUILD_DATE__: JSON.stringify(`${today}`), __BUILD_VERSION__: JSON.stringify(`${packageJson.version}`), }, plugins: [react(), WindiCSS(), buildDatePlugin(), VitePWA(manifestForPlugIn)],