Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

src/pages/balance/accountsPayable/settlementList/schema/index.tsx

@@ -44,6 +44,9 @@ export const schema: ISchema = {
               'x-component-props': {
                 allowClear: true,
                 placeholder: ["结算时间（开始时间）", "结算时间（结束时间）"],
+                style: {
+                  minWidth: "320px"
+                }
               }
             },
             status: {
@@ -146,7 +149,10 @@ export const detailSchema: ISchema = {
               'x-component-props': {
                 showTime: false,
                 allowClear: true,
-                placeholder: ["单据时间（开始时间）", "单据时间（结束时间）"]
+                placeholder: ["单据时间（开始时间）", "单据时间（结束时间）"],
+                style: {
+                  minWidth: "320px"
+                }
               },
             },
             "[receiveStartTime, receiveEndTime]": {
@@ -155,7 +161,10 @@ export const detailSchema: ISchema = {
               'x-component-props': {
                 showTime: false,
                 allowClear: true,
-                placeholder: ["收货时间（开始时间）", "收货时间（结束时间）"]
+                placeholder: ["收货时间（开始时间）", "收货时间（结束时间）"],
+                style: {
+                  minWidth: "320px"
+                }
               },
             },
 
@@ -229,7 +238,10 @@ export const logisticsDetailSchema: ISchema = {
               'x-component-props': {
                 showTime: false,
                 allowClear: true,
-                placeholder: ["单据时间（开始时间）", "单据时间（结束时间）"]
+                placeholder: ["单据时间（开始时间）", "单据时间（结束时间）"],
+                style: {
+                  minWidth: "320px"
+                }
               },
             },
 

src/pages/balance/accountsReceivable/settlementList/schema/index.tsx

@@ -44,6 +44,9 @@ export const schema: ISchema = {
               'x-component-props': {
                 allowClear: true,
                 placeholder: ["结算时间（开始时间）", "结算时间（结束时间）"],
+                style: {
+                  minWidth: "320px"
+                }
               }
             },
             status: {

src/pages/balance/platformSettlement/accountReceivable/index.tsx

@@ -22,6 +22,7 @@ import EyePreview from '@/components/EyePreview'
 import { fetchOptions } from '../../common';
 
 const formActions = createFormActions();
+const { RangePicker } = DatePicker;
 
 // 平台代收账款结算 - 收款方查看凭证 能力中心
 const PLATFORM_BENEFICIARY = 3;
@@ -138,7 +139,7 @@ const AccountReceivable = () => {
   const handleSearch = (values: any) => {
     const format = 'YYYY-MM-DD'
     const startTime = values.startTime?.format(format);
-    const endTime = values.endTime?.format(format);
+    const endTime = values.endTime ? values.endTime.format(format) + " 23:59:59" : "";;
     ref.current.reload({...values, startTime, endTime});
   }
 
@@ -157,7 +158,7 @@ const AccountReceivable = () => {
             <NiceForm
               actions={formActions}
               expressionScope={{}}
-              components={{DatePicker}}
+              components={{RangePicker}}
               effects={($, actions) => {
                 useStateFilterSearchLinkageEffect($, actions, 'megaLayout.settlementNo', FORM_FILTER_PATH);
                 useAsyncSelect(

src/pages/balance/platformSettlement/accountReceivable/schema/index.tsx

@@ -24,30 +24,43 @@ export const schema: ISchema = {
         },
         [FORM_FILTER_PATH]: {
           type: 'object',
-          'x-component': 'mega-layout',
+          'x-component': 'flex-layout',
           'x-component-props': {
-            grid: true,
-            full: true,
-            autoRow: true,
-            columns: 6,
+            rowStyle: {
+              justifyContent: "flex-start",
+            },
+            colStyle: {
+              marginRight: 20,
+            },
           },
           properties: {
-            startTime: {
-              type: 'string',
-              'x-component': 'DatePicker',
-              'x-component-props': {
-                allowClear: true,
-                placeholder: '结算日期（开始时间）'
-              }
-            },
-            endTime: {
-              type: 'string',
-              'x-component': 'DatePicker',
+            "[startTime, endTime]": {
+              type: 'object',
+              "x-component": 'RangePicker',
               'x-component-props': {
                 allowClear: true,
-                placeholder: '结算日期（结束时间）'
+                placeholder: ["结算时间（开始时间）", "结算时间（结束时间）"],
+                style: {
+                  minWidth: "320px"
+                }
               }
             },
+            // startTime: {
+            //   type: 'string',
+            //   'x-component': 'DatePicker',
+            //   'x-component-props': {
+            //     allowClear: true,
+            //     placeholder: '结算日期（开始时间）'
+            //   }
+            // },
+            // endTime: {
+            //   type: 'string',
+            //   'x-component': 'DatePicker',
+            //   'x-component-props': {
+            //     allowClear: true,
+            //     placeholder: '结算日期（结束时间）'
+            //   }
+            // },
             status: {
               type: 'string',
               enum: [

src/pages/balance/platformSettlement/integral/index.tsx

@@ -21,6 +21,7 @@ import EyePreview  from '@/components/EyePreview';
 import { fetchOptions } from '../../common';
 import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
 
+const { RangePicker } = DatePicker;
 // 平台积分结算-收款方查看凭证， 能力中心
 const SCORE_BENEFINCIARY = 5;
 const formActions = createFormActions();
@@ -140,7 +141,7 @@ const Integral: React.FC = () => {
   const handleSearch = (values: any) => {
     const format = 'YYYY-MM-DD'
     const startTime = values.startTime?.format(format);
-    const endTime = values.endTime?.format(format);
+    const endTime = values.endTime ? values.endTime.format(format) + " 23:59:59" : "";
     ref.current.reload({...values, startTime, endTime});
   }
 

src/pages/balance/platformSettlement/integral/schema/index.tsx

@@ -29,30 +29,43 @@ export const schema: ISchema = {
         },
         [FORM_FILTER_PATH]: {
           type: 'object',
-          'x-component': 'mega-layout',
+          'x-component': 'flex-layout',
           'x-component-props': {
-            grid: true,
-            full: true,
-            autoRow: true,
-            columns: 6,
+            rowStyle: {
+              justifyContent: "flex-start",
+            },
+            colStyle: {
+              marginRight: 20,
+            },
           },
           properties: {
-            startTime: {
-              type: 'string',
-              'x-component': 'DatePicker',
-              'x-component-props': {
-                allowClear: true,
-                placeholder: '结算日期（开始时间）'
-              }
-            },
-            endTime: {
-              type: 'string',
-              'x-component': 'DatePicker',
+            "[startTime, endTime]": {
+              type: 'object',
+              "x-component": 'RangePicker',
               'x-component-props': {
                 allowClear: true,
-                placeholder: '结算日期（结束时间）'
+                placeholder: ["结算时间（开始时间）", "结算时间（结束时间）"],
+                style: {
+                  minWidth: "320px"
+                }
               }
             },
+            // startTime: {
+            //   type: 'string',
+            //   'x-component': 'DatePicker',
+            //   'x-component-props': {
+            //     allowClear: true,
+            //     placeholder: '结算日期（开始时间）'
+            //   }
+            // },
+            // endTime: {
+            //   type: 'string',
+            //   'x-component': 'DatePicker',
+            //   'x-component-props': {
+            //     allowClear: true,
+            //     placeholder: '结算日期（结束时间）'
+            //   }
+            // },
             status: {
               type: 'string',
               enum: [

src/pages/handling/assign/detail/index.tsx

@@ -251,27 +251,26 @@ const Detail: React.FC<{}> = () => {
     const SubmitBtn = <Button loading={loading} icon={<FormOutlined />} onClick={submit} type="primary"> 提交通知单</Button>
     const NextBtn = <Button loading={loading}  icon={<SaveOutlined />} onClick={toNext} type="primary">提交</Button>
     const AllReceiptReceive = (
-      <Space direction={"vertical"}>
-        {
-          !hasProductNoReply
-          ? <Popconfirm
-              title={'确认本单全部发货单是否已全部收到回单'}
-              onConfirm={() => handleAllReceiptReceive(true)}
-            >
-              <Button loading={loading} type="primary" style={{width: '100%'}}>确认本单全部发货单已收到回单</Button>
-            </Popconfirm>
-          : null
-        }
-        <div style={{display: 'flex', justifyContent: 'flex-end'}}>
+      !hasProductNoReply ?
+      (
+        <Space direction={"vertical"}>
           <Popconfirm
-            title={hasProductNoDelievery ? '是否继续发货' : '您商品都已发货，是否确认还需要继续发货'}
-            onConfirm={() => handleAllReceiptReceive(false)}
+            title={'确认本单全部发货单是否已全部收到回单'}
+            onConfirm={() => handleAllReceiptReceive(true)}
           >
-            <Button loading={loading}>继续发货</Button>
+            <Button loading={loading} type="primary" style={{width: '100%'}}>确认本单全部发货单已收到回单</Button>
           </Popconfirm>
-        </div>
-
-      </Space>
+          <div style={{display: 'flex', justifyContent: 'flex-end'}}>
+            <Popconfirm
+              title={hasProductNoDelievery ? '是否继续发货' : '您商品都已发货，是否确认还需要继续发货'}
+              onConfirm={() => handleAllReceiptReceive(false)}
+            >
+              <Button loading={loading}>继续发货</Button>
+            </Popconfirm>
+          </div>
+        </Space>
+      ) :
+      null
     )
 
     const COMPONENT_MAP = {