Merge branch 'v2-0418-transferOrder-molei' into 'v2-220418'

config/routes/orderRoute/receivingNote.ts

@@ -30,6 +30,13 @@ const ReceivingNote = [
         component: '@/pages/order/receivingNote/deliveryNoteManage'
       },
       {
+        /** 收货单新增*/
+        path: '/memberCenter/order/receivingNote/deliveryNoteManage/add',
+        name: '新增收货单',
+        component: '@/pages/order/receivingNote/deliveryNoteManage/add',
+        noMargin: true
+      },
+      {
         /** 收货单管理详情*/
         path: '/memberCenter/order/receivingNote/deliveryNoteManage/details',
         name: '收货单管理详情',

src/components/BaseInfo/BaseInfo.tsx

@@ -30,14 +30,14 @@ function BaseInfo({ title, className, children, cols = 2, id }: BaseInfoPorps) {
 
 function BaseInfoItem({ label, children }: {
   label: string
-  children: JSX.Element | string
+  children: JSX.Element | string | React.ReactNode
 }) {
   return (
     <div className='base_info_item flex text-lg'>
-      <div className='label flex-4 flex-grow-0 w-100 text-gray-400'>
+      <div className='label flex-4 flex items-center flex-grow-0 w-100 text-gray-400'>
         {label}
       </div>
-      <div className='value flex-auto'>
+      <div className='value flex items-center flex-auto'>
         {typeof children === 'string' ? <span>{children}</span> : children}
       </div>
     </div>

src/components/FormItem/FormItem.tsx

+import { Form, FormItemProps } from "antd";
+
+function FormItem<values = any>(prosp: FormItemProps<values>) {
+  return (
+    <Form.Item {...prosp} style={{ margin: 0 }} />
+  );
+}
+
+export default FormItem
\ No newline at end of file

src/components/FormItem/index.ts

+export { default as FormItem } from './FormItem'
\ No newline at end of file

src/pages/order/constants/anchors.ts

@@ -12,7 +12,7 @@ const BillsInfo: AnchorsItem = {
 
 const Distribution: AnchorsItem = {
   key: "Distribution",
-  name: "单据信息"
+  name: "送货信息"
 }
 
 const DeliveryInfo: AnchorsItem = {
@@ -21,8 +21,8 @@ const DeliveryInfo: AnchorsItem = {
 }
 
 const LogisticsInfo: AnchorsItem = {
-  key: "DeliveryInfo",
-  name: "物流信息单"
+  key: "LogisticsInfo",
+  name: "物流信息"
 }
 
 const Material: AnchorsItem = {
@@ -30,6 +30,17 @@ const Material: AnchorsItem = {
   name: "送货物料"
 }
 
+const Harvest: AnchorsItem = {
+  key: "Harvest",
+  name: "收货信息"
+}
+
+const HarvestMaterial: AnchorsItem = {
+  key: "HarvestMaterial",
+  name: "收货物料"
+}
+
+
 const Circulation: AnchorsItem = {
   key: 'Circulation',
   name: "流转进度"
@@ -41,9 +52,8 @@ const PlanMaterial: AnchorsItem = {
 }
 
 const DeliveryNoteQuery: AnchorsItem[] = [
-  BaseInfo,
-  Distribution,
   BillsInfo,
+  Distribution,
   DeliveryInfo,
   LogisticsInfo,
   Material
@@ -62,6 +72,8 @@ export {
   LogisticsInfo,
   Material,
   Distribution,
+  Harvest,
+  HarvestMaterial,
   Circulation,
   PlanMaterial,
   DeliveryNoteQuery,

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

+import AnchorPage, { AnchorsItem } from "@/components/AnchorPage"
+import { BaseInfo } from "@/components/BaseInfo"
+import { useState } from "react"
+import { BillsInfo, DeliveryInfo, LogisticsInfo, Harvest, HarvestMaterial } from '../columns'
+import { DatePicker, Form, Input } from 'antd'
+import { FormItem } from '@/components/FormItem'
+
+
+function DeliveryNoteAddForm() {
+
+  const [anchors, setAnchors] = useState<AnchorsItem[]>(() => {
+    return [
+      BillsInfo,
+      Harvest,
+      DeliveryInfo,
+      LogisticsInfo,
+      HarvestMaterial
+    ]
+  })
+
+  return (
+    <AnchorPage title="新增收获单"
+      anchors={anchors}>
+
+      <BaseInfo title={BillsInfo.name} id={BillsInfo.key}>
+        <BaseInfo.BaseInfoItem label="收货单摘要">
+          <FormItem>
+            <Input />
+          </FormItem>
+        </BaseInfo.BaseInfoItem>
+        <BaseInfo.BaseInfoItem label="供应会员">
+          <FormItem>
+            <Input />
+          </FormItem>
+        </BaseInfo.BaseInfoItem>
+        <BaseInfo.BaseInfoItem label="备注">
+          <FormItem>
+            <Input />
+          </FormItem>
+        </BaseInfo.BaseInfoItem>
+      </BaseInfo>
+
+      <BaseInfo title={DeliveryInfo.name} id={DeliveryInfo.key}>
+        <BaseInfo.BaseInfoItem label="发货时间">
+          <FormItem>
+            <DatePicker className="w-full" />
+          </FormItem>
+        </BaseInfo.BaseInfoItem>
+        <BaseInfo.BaseInfoItem label="收货人">
+          <FormItem>
+            <Input />
+          </FormItem>
+        </BaseInfo.BaseInfoItem>
+        <BaseInfo.BaseInfoItem label="收货人电话">
+          <FormItem>
+            <Input />
+          </FormItem>
+        </BaseInfo.BaseInfoItem>
+      </BaseInfo>
+
+      <BaseInfo title={LogisticsInfo.name} id={LogisticsInfo.key}>
+        <BaseInfo.BaseInfoItem label=" 送货订单号">
+          HF200019343344
+        </BaseInfo.BaseInfoItem>
+        <BaseInfo.BaseInfoItem label="送货自提地址">
+          <div className="#LogisticsAddr">
+            <div className="#LogisticsAddrDisc leading-10">
+              广东省广州市海珠区新港东路1068号中洲中心
+            </div>
+            <div className="#LogisticsAddrName">
+              张三/13400001999
+            </div>
+          </div>
+        </BaseInfo.BaseInfoItem>
+        <BaseInfo.BaseInfoItem label="收货人电话">
+          <FormItem>
+            <Input />
+          </FormItem>
+        </BaseInfo.BaseInfoItem>
+      </BaseInfo>
+
+    </AnchorPage>
+  )
+}
+
+export default DeliveryNoteAddForm
\ No newline at end of file

src/pages/order/receivingNote/deliveryNoteQuery/index.tsx

@@ -3,22 +3,36 @@
  * @author: Gavin
  * @description:
  */
- import React, { useRef, useState } from 'react'
- import { PageHeaderWrapper } from '@ant-design/pro-layout'
- import { Card, Space, Tag } from 'antd'
- import StandardTable from '@/components/StandardTable'
- import { ColumnType } from 'antd/lib/table'
- import TableOperation from '@/components/TableOperation'
- import EyePreview from '@/components/EyePreview'
- import NiceForm from '@/components/NiceForm'
- import { createFormActions } from '@formily/antd'
- import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
- import { FORM_FILTER_PATH } from '@/formSchema/const'
- import { deliveryNoteQuerySchema } from './schema'
+import React, { useRef, useState } from 'react'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { Card, Space, Tag } from 'antd'
+import StandardTable from '@/components/StandardTable'
+import { ColumnType } from 'antd/lib/table'
+import TableOperation from '@/components/TableOperation'
+import EyePreview from '@/components/EyePreview'
+import NiceForm from '@/components/NiceForm'
+import { createFormActions } from '@formily/antd'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import { deliveryNoteQuerySchema } from './schema'
 
- const tagStatusColor = {
+
+
+interface IStatusEnum {
+  [key: number]: {
+    color: string,
+    fontColor: string
+  }
+}
+
+enum StatusEnum {
+  ToSbumit = 2
+}
+
+
+const tagStatusColor: IStatusEnum = {
   // 待提交
-  2: { color: '#f4f5f7', fontColor: '#5c626a' },
+  [StatusEnum.ToSbumit]: { color: '#f4f5f7', fontColor: '#5c626a' },
   // 待确认
   3: { color: '#ecf2fe', fontColor: '#4787f0' },
   // 待修订