Merge remote-tracking branch 'origin/main' into dev/chat

src/main.jsx

@@ -53,7 +53,7 @@ const router = createBrowserRouter([
 ReactDOM.createRoot(document.getElementById('root')).render(
   // <React.StrictMode>
   <ThemeContext.Provider value={{ colorPrimary: '#1ba784', borderRadius: 4 }}>
-    <AuthContext.Provider value={{ loginUser: { userId: 354, username: '廖一军', accountList: ['LYJ', 'LYJAH', 'LYJGH'] } }}>
+    <AuthContext.Provider value={{ loginUser: { userId: 354, username: '廖一军', accountList: [{OPI_Code:'LYJ'}, {OPI_Code:'LYJAH'}, {OPI_Code:'LYJGH'}] } }}>
       <ConversationProvider>
         <RouterProvider router={router} fallbackElement={() => <div>Loading...</div>} />
       </ConversationProvider>

src/views/AccountProfile.jsx

@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
 import {
-  Row, Col, Space, Descriptions, Avatar, Radio, Tag
+  Row, Col, Space, Descriptions, Avatar, Tag
 } from 'antd'
 import {
   UserOutlined
@@ -22,7 +22,7 @@ function AccountProfile() {
           <Descriptions.Item label='名字'><Space size='middle'><Avatar src={loginUser.avatarUrl}>{loginUser.username.substring(1)}</Avatar>{loginUser.username}​</Space></Descriptions.Item>
           <Descriptions.Item label='HT 账号'>
           {loginUser.accountList?.map(a => { return (
-            <Tag icon={<UserOutlined />} bordered={false}>{a}</Tag>
+            <Tag key={a.OPI_Code} icon={<UserOutlined />} bordered={false}>{a.OPI_Code}</Tag>
           )})}
           </Descriptions.Item>
           <Descriptions.Item label='手机'>{loginUser.mobile}</Descriptions.Item>

src/views/DingdingQRCode.jsx

@@ -46,7 +46,7 @@ function DingdingQRCode() {
                 loginUser.mobile = '+' + json.result.stateCode + '-' + json.result.mobile
                 loginUser.email = json.result.email
                 loginUser.openId = json.result.openId
-                console.info(JSON.stringify(loginUser))
+                loginUser.accountList = json.result.accountlist
                 navigate('/account/profile')
               } else {
                 setLoginStatus(403)

src/views/OrderFollow.jsx

@@ -7,13 +7,13 @@ import { NavLink } from 'react-router-dom'
 import dayjs from 'dayjs'
 import { Conditional } from '@/components/Conditional'
 import { useAuthContext } from '@/stores/AuthContext'
-import { prepareUrl } from '@/utils/commons'
+import { prepareUrl, isNotEmpty } from '@/utils/commons'
 
 const { RangePicker } = DatePicker
 
 const AdvanceSearchForm = memo(function ({ onSubmit }) {
 
-  const DATE_PRESETS = [
+  const DATE_RANGE_PRESETS = [
     {
       label: '本周',
       value: [dayjs().startOf('w'), dayjs().endOf('w')],
@@ -60,23 +60,22 @@ const AdvanceSearchForm = memo(function ({ onSubmit }) {
           </Form.Item>
         </Col>
         <Col span={4}>
-          <Form.Item label='FirstName' name='firstName'>
+          <Form.Item label='邮件地址/客人电话' name='emailOrPhone'>
-            <Input placeholder='FirstName' allowClear />
+            <Input placeholder='邮件地址/客人电话' allowClear />
           </Form.Item>
         </Col>
         <Col span={4}>
-          <Form.Item label='LastName' name='lastName'>
+          <Form.Item label='First name' name='firstName'>
-            <Input placeholder='LastName' allowClear />
+            <Input placeholder='First name' allowClear />
           </Form.Item>
         </Col>
         <Col span={4}>
-          <Form.Item label='邮件地址/客人电话/传真' name='email'>
+          <Form.Item label='Last name' name='lastName'>
-            <Input placeholder='邮件地址/客人电话/传真' allowClear />
+            <Input placeholder='Last name' allowClear />
           </Form.Item>
         </Col>
-
       </Row>
-      <Row justify='start' gutter={16}>
+      <Row justify='start' align='middle' gutter={16}>
         <Col span={2}>
           <Form.Item label='标签' name='orderLabel'>
             <Select
@@ -122,20 +121,20 @@ const AdvanceSearchForm = memo(function ({ onSubmit }) {
             <RangePicker
               allowClear={false}
               inputReadOnly={true}
-              presets={DATE_PRESETS}
+              presets={DATE_RANGE_PRESETS}
             />
           </Form.Item>
         </Col>
         <Col span={4}>
           <Form.Item label='确认日期' name='confirmDateRange'>
             <RangePicker
-              allowClear={false}
+              allowClear={true}
               inputReadOnly={true}
-              presets={DATE_PRESETS}
+              presets={DATE_RANGE_PRESETS}
             />
           </Form.Item>
         </Col>
-        <Col span={2}>
+        <Col span={1} offset={1}>
           <Button type='primary' htmlType='submit'>搜索</Button>
         </Col>
       </Row>
@@ -211,6 +210,13 @@ function OrderList({ formValues }) {
   if (formValues.type === 'advance') {
     const fromDate = formValues.startDateRange[0].format('YYYY-MM-DD')
     const thruDate = formValues.startDateRange[1].format('YYYY-MM-DD')
+    let confirmFromDate = null
+    let confirmThruDate = null
+
+    if (isNotEmpty(formValues.confirmDateRange)) {
+      confirmFromDate = formValues.confirmDateRange[0].format('YYYY-MM-DD')
+      confirmThruDate = formValues.confirmDateRange[1].format('YYYY-MM-DD')
+    }
     fetchOrderUrl = prepareUrl('https://p9axztuwd7x8a7.mycht.cn/whatsapp_callback/getdvancedwlorder')
       .append('opisn', loginUser.userId)
       .append('startdate', fromDate)
@@ -218,7 +224,12 @@ function OrderList({ formValues }) {
       .append('tag', formValues.orderLabel)
       .append('orderstate', formValues.orderStatus)
       .append('remindstate', formValues.remindState)
-      .append('coli_id', formValues.orderNumber)
+      .append('coli_id', formValues.orderNumber)      
+      .append('firstName', formValues.firstName)
+      .append('lastName', formValues.lastName)
+      .append('emailphone', formValues.emailOrPhone)
+      .append('ConfirmDateStart', confirmFromDate)
+      .append('ConfirmDateEnd', confirmThruDate)
       .build()
   }