Merge branch 'feat-jinfa-0518' into 'jinfa-0518'

src/pages/order/components/DeliveryGoodTableSelect/DeliveryGoodTableSelect.tsx

@@ -45,7 +45,6 @@ function DeliveryGoodTableModal(props: DeliveryGoodTableModalProps) {
   }, [visible, value])
 
   const handleSubmit = useCallback(() => {
-    console.log(selectedRowKeys);
     onChange(selectedRowKeys);
     setVisible(false);
   }, [visible, value])
@@ -86,7 +85,7 @@ function DeliveryGoodTableModal(props: DeliveryGoodTableModalProps) {
         selectedRowKeys={value.get(index)}
         dataSource={combination}
         limitDeliveryType={limitDeliveryType}
-        deliveryType={tableDataSourceContext[0]?.deliveryType}
+        deliverType={tableDataSourceContext[0]?.deliverType}
         onChange={(keys) => {
           selectedRowKeys.set(index, keys);
           onChange(selectedRowKeys);

src/pages/order/components/DeliveryGoodTableSelect/ExpandedRowTableRender.tsx

@@ -14,13 +14,12 @@ interface ExpandedRowTableRenderProps {
   onChange?: (selectedRowKeys, index?: number) => void,
   selectedRowKeys?: any[]
   limitDeliveryType?: boolean // 是否限制配送方式
-  deliveryType?: number // 配送方式
+  deliverType?: number // 配送方式
 }
 
 function ExpandedRowTableRender(props: ExpandedRowTableRenderProps) {
 
-  const { row = 0, onChange, selectedRowKeys: selectedRowKeysProps = [], limitDeliveryType, deliveryType } = props;
-
+  const { row = 0, onChange, selectedRowKeys: selectedRowKeysProps = [], limitDeliveryType, deliverType } = props;
 
   const onSelectChange = (selectedRowKeys: any[]) => {
     let result = props.dataSource.filter(v => selectedRowKeys.includes(v.orderNo));
@@ -33,9 +32,11 @@ function ExpandedRowTableRender(props: ExpandedRowTableRenderProps) {
     hideSelectAll: limitDeliveryType, // 限制配送方式时不可全选
     selectedRowKeys: selectedRowKeysProps.map(v => v.orderNo),
     onChange: onSelectChange,
-    getCheckboxProps: (record: any) => ({
-      disabled: limitDeliveryType && deliveryType && record.deliveryType !== deliveryType
-    })
+    getCheckboxProps: (record: any) => {
+      return ({
+        disabled: limitDeliveryType && deliverType && record.deliverType !== deliverType
+      })
+    }
   };
 
   return (

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

@@ -215,13 +215,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             name="deliveryType"
 
           >
-            <Radio.Group
-              disabled
-            // onChange={(e) => {
-            //   form.setFieldsValue({ 'deliveryType': e.target?.value })
-            //   handleLogisticsShow(e.target.value)
-            // }}
-            >
+            <Radio.Group disabled>
               {RenderLogisticsRadioList()}
             </Radio.Group>
           </FormItem>

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

@@ -223,17 +223,8 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
               required()
             ]}
             label={DeliveryTypeLabel} name="deliveryType">
-            <Radio.Group
-              disabled
-              // onChange={(e) => {
-              //   form.setFieldsValue({ 'deliveryType': e.target?.value })
-              //   handleLogisticsShow(e.target.value)
-              // }}
-            >
+            <Radio.Group disabled>
               {RenderLogisticsRadioList()}
-              {/* <Radio value={0}>物流</Radio>
-              <Radio value={1}>自提</Radio> */}
-              {/* <Radio.Button value={3}>无效配送</Radio.Button> */}
             </Radio.Group>
           </FormItem>