upp

src/pages/A2Blogistics/data.tsx

@@ -13,6 +13,8 @@ export type A2BFromDataType = {
 
   pageSize: number
   pageNum: number
+
+  dateType: A2BFromTypeType
 }
 
 export const A2BFromTypeArr: { value: A2BFromTypeType | ''; label: string }[] = [

src/pages/A2Blogistics/index.tsx

@@ -13,6 +13,7 @@ import history from '@/utils/history'
 import MyPopconfirm from '@/components/MyPopconfirm'
 import { A2AtopTypeArr } from '../A2Abusiness/data'
 import AddLogistics from './AddLogistics'
+const { RangePicker } = DatePicker
 
 const tableSelectBase: A2BFromDataType = {
   num: '',
@@ -22,7 +23,8 @@ const tableSelectBase: A2BFromDataType = {
   dateStart: '',
   dateEnd: '',
   pageSize: 10,
-  pageNum: 1
+  pageNum: 1,
+  dateType: 'CK'
 }
 
 function A2Blogistics() {
@@ -79,24 +81,16 @@ function A2Blogistics() {
     }, 50)
   }, [])
 
-  // 2个日期选择框的改变
-  const timeChange1 = useCallback(
-    (_: any, dateString: string) => {
-      let dateStart = ''
-      if (dateString) dateStart = dateString + ' 00:00:00'
-      setTableSelect({ ...tableSelect, dateStart })
-    },
-    [tableSelect]
-  )
-
-  const timeChange2 = useCallback(
-    (_: any, dateString: string) => {
-      let dateEnd = ''
-      if (dateString) dateEnd = dateString + ' 23:59:59'
-      setTableSelect({ ...tableSelect, dateEnd })
-    },
-    [tableSelect]
-  )
+  // 时间选择器改变
+  const timeChange = (date: any, dateString: any) => {
+    let dateStart = ''
+    let dateEnd = ''
+    if (dateString[0] && dateString[1]) {
+      dateStart = dateString[0] + ' 00:00:00'
+      dateEnd = dateString[1] + ' 23:59:59'
+    }
+    setTableSelect({ ...tableSelect, dateStart, dateEnd })
+  }
 
   // 从仓库获取列表
   const A2BTableList = useSelector((state: RootState) => state.A2Blogistics.A2BTableList)
@@ -300,7 +294,12 @@ function A2Blogistics() {
             <Select
               style={{ width: 190 }}
               value={tableSelect.type}
-              onChange={e => setTableSelect({ ...tableSelect, type: e })}
+              onChange={e =>
+                setTableSelect({
+                  ...tableSelect,
+                  type: e
+                })
+              }
               options={A2BFromTypeArr}
             />
           </div>
@@ -334,13 +333,18 @@ function A2Blogistics() {
         <div className='A2BtopSon A2BtopSon2'>
           <div>
             <div className='A2BtopRow'>
-              <span>发货日期：</span>
-              <DatePicker style={{ width: 190 }} key={inputKey} onChange={timeChange1} />
-            </div>
-
-            <div className='A2BtopRow'>
-              <span>收货日期：</span>
-              <DatePicker style={{ width: 190 }} key={inputKey} onChange={timeChange2} />
+              <span>
+                <Select
+                  style={{ width: 120 }}
+                  value={tableSelect.dateType}
+                  onChange={e => setTableSelect({ ...tableSelect, dateType: e })}
+                  options={[
+                    { value: 'CK', label: '发货日期：' },
+                    { value: 'RK', label: '收货日期：' }
+                  ]}
+                />
+              </span>
+              <RangePicker key={inputKey} onChange={timeChange} />
             </div>
           </div>
 

src/store/action/A2Blogistics.ts

@@ -48,5 +48,5 @@ export const A2B_APIgetInfo = (id: number) => {
  * 物流订单 从业务订单中添加
  */
 export const A2B_APIgetCamera = (orderNum: string) => {
-  return http.get(`cms/logistics/order/getCamera${orderNum}`)
+  return http.get(`cms/logistics/order/getCamera/${orderNum}`)
 }