fix: 解决订单模块一些bug

src/components/AddressDrawer/AddressDrawer.tsx

@@ -43,12 +43,13 @@ interface AddressDrawerProps {
   },
   className?: string
   renderText?: React.ReactNode
+  hiddenBtn?: boolean
 }
 
 function AddressDrawer(props: AddressDrawerProps) {
 
   const { onChange, formInstance, renderForm, sumbitRequest,
-    addressListRequest, value: addr, disabled = false, rows = 1,
+    addressListRequest, value: addr, disabled = false, rows = 1, hiddenBtn=false,
     showDefault = false,
     formatValue = (addr) => {
       return FormatValue(addr)
@@ -179,16 +180,20 @@ function AddressDrawer(props: AddressDrawerProps) {
           :
           (
             <Row className={className} gutter={10}>
-              <Col span={20}>
+              <Col span={hiddenBtn?24:20}>
                 <Input.TextArea rows={rows} disabled={disabled}
                   value={value}
                   onChange={handleInputChange}
                 />
               </Col>
-
-              <Col span={4}>
-                <Button disabled={disabled} className='w-full' onClick={() => setVisible(true)}>管理</Button>
-              </Col>
+              {
+                !hiddenBtn && (
+                  <Col span={4}>
+                    <Button disabled={disabled} className='w-full' onClick={() => setVisible(true)}>管理</Button>
+                  </Col>
+                )
+              }
+              
             </Row>
           )
       }

src/pages/order/assets/handles/HandleFormSubmit.ts

@@ -168,7 +168,7 @@ export class ReceivingNoteAddService extends HandleFormSubmit {
   handleBeforeFields(): boolean {
     let b = this.getTableData().some((v) => Number(v.ConsigneeNum) < v.DeliveryNum)
     if (b) {
-      message.error('收货数量不能少于送货数量')
+      message.error('送货数量不能大于待送货数量')
     }
     return b;
   }
@@ -207,7 +207,7 @@ export class DeliveryNoteAddService extends HandleFormSubmit {
       return Number(v.deliveryCount) > Number(v.purchaseCount)
     })
     if (b) {
-      message.error('收货数量不能少于送货数量')
+      message.error('送货数量不能大于待送货数量')
     }
     return b;
   }
@@ -338,6 +338,7 @@ export class ReceiveOrderCreate extends DeliveryNoteAddService {
       },
       "executorVO.phone": data.executorVO.phone,
       sendTime: moment(data.sendTime),
+      receiveTime: moment(data.receiveTime),
       "executorVO.carNumbers": data.executorVO.carNumbers,
       "receiverBO.phone": data.receiverBO.phone,
       logisticsNo: data.logisticsNo,

src/pages/order/deliveryNotice/manageSRM/add.tsx

@@ -181,6 +181,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             label={ReceivingAddress} name="receiveVO">
             <ReceiverAddress
               disabled={true}
+              hiddenBtn={true}
             />
           </FormItem>
 
@@ -195,7 +196,6 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             />
 
           </FormItem>
-
         </ContentBox>
 
         <ContentBox title={LogisticsInfo.name} id={LogisticsInfo.key}>

src/pages/order/deliveryNotice/receivingNoteQuery/schema/index.tsx

@@ -19,13 +19,13 @@ export const receivingNoteQuerySchema: ISchema = {
             className: 'useMegaStart'
           },
           properties: {
-            ctl: {
-              type: 'object',
-              'x-component': 'Children',
-              'x-component-props': {
-                children: '{{controllerBtns}}',
-              },
-            },
+            // ctl: {
+            //   type: 'object',
+            //   'x-component': 'Children',
+            //   'x-component-props': {
+            //     children: '{{controllerBtns}}',
+            //   },
+            // },
             receiveNo: {
               type: 'string',
               'x-component': 'Search',

src/pages/order/receivingNote/deliveryNoteManage/edit.tsx

@@ -70,6 +70,7 @@ function DeliveryNoteAddForm() {
           value: res?.logisticsCompanyId
         },
       }
+      console.log(target, 'targettargettargettarget')
       form.setFieldsValue({
         id: id,
         ...target
@@ -164,12 +165,15 @@ function DeliveryNoteAddForm() {
               required()
             ]}
             label={ReceivingTime} name="receiveTime">
-            <DatePickerSelect disabled={true} className='w-full' />
+            <DatePickerSelect disabled={true} className="w-full" />
           </FormItem>
 
           <FormItem
             rules={[
-              required()
+              {
+                required: false,
+                message: '',
+              }
             ]}
             label={ConsigneeLabel} name="receiveVO.consignee">
             <Input />
@@ -186,7 +190,10 @@ function DeliveryNoteAddForm() {
 
           <FormItem
             rules={[
-              required()
+              {
+                required: false,
+                message: '',
+              }
             ]}
             label={ConsigneePhoneLabel} name="receiveVO.phone">
             <Input />