'处理冲突'

src/components/NiceForm/components/CustomCategorySearch.tsx

+import React, { useState, useEffect } from 'react';
+import { Input, Space, Select, Button, Cascader } from 'antd';
+import { useFieldState, FormPath, FormEffectHooks, useFormEffects } from '@formily/antd';
+
+/**
+ * 筛选项 搜索和远程数据结合的 Cascader
+ * 属性Data数据暂存至schema的props下的dataOption
+ */
+
+const CustomCategorySearch = props => {
+  const justifyAlign = props.props['x-component-props'].align || 'flex-end'
+  const option = props.props['x-component-props'].dataoption
+
+  const [dataOption, setDataOption] = useState<any>([])
+  const [value, setValue] = useState<any>([])
+
+  useEffect(() => {
+    setDataOption(option)
+  }, [option])
+
+  useFormEffects(() => {
+    FormEffectHooks.onFormReset$().subscribe(() => {
+      setValue([])
+    })
+  })
+
+
+  const onChange = (value, selectedOptions) => {
+    props.mutators.change(value[value.length - 1])
+    setValue(value)
+  }
+
+  const displayRender = (label) => {
+    return label[label.length - 1];
+  }
+
+  return (
+    <Space size={20} style={{ justifyContent: justifyAlign, width: '100%' }}>
+      <Cascader
+        options={dataOption}
+        onChange={onChange}
+        value={value}
+        displayRender={displayRender}
+        {...props.props['x-component-props']}
+      />
+    </Space>
+  );
+};
+
+CustomCategorySearch.defaultProps = {};
+
+CustomCategorySearch.isFieldComponent = true;
+
+export default CustomCategorySearch;

src/components/NiceForm/index.tsx

@@ -8,7 +8,8 @@ import CustomStatus from './components/CustomStatus';
 import CustomAddArray from './components/CustomAddArray';
 import CustomSlider from './components/CustomSlider';
 import Search from './components/Search';
-import CustomInputSearch from './components/CustomInputSearch'
+import CustomInputSearch from './components/CustomInputSearch';
+import CustomCategorySearch from './components/CustomCategorySearch';
 import Submit from './components/Submit';
 import Text from './components/Text';
 import CardCheckBox from './components/CardCheckBox';
@@ -86,6 +87,7 @@ export const componentExport = {
   CustomRadio,
   Search,
   CustomInputSearch,
+  CustomCategorySearch,
   Submit,
   Text,
   CardCheckBox,
@@ -104,8 +106,8 @@ export const componentExport = {
   DateSelect,
   DateRangePickerUnix,
   NumberRange,
-  VirtualChildren, 
-  SmilingFace, 
+  VirtualChildren,
+  SmilingFace,
   SliderValidate,
   RadioGroup: Radio.Group,
   AntUpload,
@@ -118,8 +120,8 @@ const NiceForm: React.FC<NiceFormProps> = props => {
   return (
     <div style={{width: '100%', position: 'relative'}}>
       <SchemaForm
-        colon={false} 
-        components={defineComponents} 
+        colon={false}
+        components={defineComponents}
         style={{opacity: loading ? 0 : 1, position: loading ? 'absolute' : 'initial'}}
         effects={($, ctx) => {
           // 自定义联动scope收集器

src/pages/afterService/components/OuterCirculationRecord/index.tsx

-/*
- * @Author: XieZhiXiong
- * @Date: 2020-09-29 15:04:46
- * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-11 16:39:17
- * @Description: 外部流转记录
- */
-import React from 'react';
-import { REPAIR_OUTER_STATUS } from '@/constants';
-import MellowCard from '@/components/MellowCard';
-import PolymericTable from '@/components/PolymericTable';
-import { EditableColumns } from '@/components/PolymericTable/interface';
-import StatusTag from '@/components/StatusTag';
-import { REPAIR_OUTER_STATUS_TAG_MAP } from '../../constants';
-
-interface OuterCirculationRecordProps {
-  dataSource: {
-    roleName: string, 
-    status: number | string, 
-    operate: string, 
-    operateTime: string, 
-    opinion: string, 
-  }[];
-  onPaginationChange?: (page: number, size: number) => void;
-};
-
-const OuterCirculationRecord: React.FC<OuterCirculationRecordProps> = ({
-  dataSource = [], 
-  onPaginationChange, 
-}) => {
-
-  const columns: EditableColumns[] = [
-    {
-      title: '序号',
-      dataIndex: 'order', 
-      align: 'center', 
-      render: (_, record, index) => index + 1, 
-    },
-    {
-      title: '操作角色',
-      dataIndex: 'roleName',
-      align: 'center',
-    },
-    {
-      title: '状态',
-      dataIndex: 'statusName',
-      align: 'center', 
-      render: (text, record) => <StatusTag type={REPAIR_OUTER_STATUS_TAG_MAP[record.status]} title={text} />
-    },
-    {
-      title: '操作',
-      dataIndex: 'operate',
-      align: 'center',
-      ellipsis: true, 
-    },
-    {
-      title: '操作时间',
-      dataIndex: 'operateTime',
-      align: 'center',
-    },
-    {
-      title: '审核意见',
-      dataIndex: 'opinion',
-      align: 'center', 
-      ellipsis: true, 
-    },
-  ];
-
-  const handlePaginationChange = (page, size) => {
-    if (onPaginationChange) {
-      onPaginationChange(page, size);
-    }
-  };
-
-  return (
-    <MellowCard
-      title="外部流转记录"
-    >
-      <PolymericTable
-        rowKey="operateTime"
-        dataSource={dataSource}
-        columns={columns}
-        loading={false}
-        pagination={null}
-      />
-    </MellowCard>
-  );
-};
-
+/*
+ * @Author: XieZhiXiong
+ * @Date: 2020-09-29 15:04:46
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2020-12-24 10:55:51
+ * @Description: 外部流转记录
+ */
+import React from 'react';
+import { REPAIR_OUTER_STATUS } from '@/constants';
+import MellowCard from '@/components/MellowCard';
+import PolymericTable from '@/components/PolymericTable';
+import { EditableColumns } from '@/components/PolymericTable/interface';
+import StatusTag from '@/components/StatusTag';
+import { REPAIR_OUTER_STATUS_TAG_MAP } from '../../constants';
+
+interface OuterCirculationRecordProps {
+  dataSource: {
+    roleName: string, 
+    status: number | string, 
+    operate: string, 
+    operateTime: string, 
+    opinion: string, 
+  }[];
+  onPaginationChange?: (page: number, size: number) => void;
+};
+
+const OuterCirculationRecord: React.FC<OuterCirculationRecordProps> = ({
+  dataSource = [], 
+  onPaginationChange, 
+}) => {
+
+  const columns: EditableColumns[] = [
+    {
+      title: '序号',
+      dataIndex: 'order', 
+      align: 'center', 
+      render: (_, record, index) => index + 1, 
+    },
+    {
+      title: '操作角色',
+      dataIndex: 'roleName',
+      align: 'center',
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      align: 'center', 
+      render: (text, record) => <StatusTag type={REPAIR_OUTER_STATUS_TAG_MAP[record.statusCode]} title={text} />
+    },
+    {
+      title: '操作',
+      dataIndex: 'operate',
+      align: 'center',
+      ellipsis: true, 
+    },
+    {
+      title: '操作时间',
+      dataIndex: 'operateTime',
+      align: 'center',
+    },
+    {
+      title: '审核意见',
+      dataIndex: 'opinion',
+      align: 'center', 
+      ellipsis: true, 
+    },
+  ];
+
+  const handlePaginationChange = (page, size) => {
+    if (onPaginationChange) {
+      onPaginationChange(page, size);
+    }
+  };
+
+  return (
+    <MellowCard
+      title="外部流转记录"
+    >
+      <PolymericTable
+        rowKey="operateTime"
+        dataSource={dataSource}
+        columns={columns}
+        loading={false}
+        pagination={null}
+      />
+    </MellowCard>
+  );
+};
+
 export default OuterCirculationRecord;
\ No newline at end of file

src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/index.tsx

@@ -11,7 +11,7 @@ import { createFormActions, FormEffectHooks } from '@formily/antd';
 import { PublicApi } from '@/services/api';
 import { GetAsReplaceGoodsPageReturnedGoodsResponse } from '@/services/AfterServiceApi';
 import { normalizeFiledata, FileData, isJSONStr } from '@/utils';
-import { PurchaseOrderInsideWorkStateTexts, ORDER_TYPE2 } from '@/constants';
+import { PurchaseOrderOutWorkStateTexts, ORDER_TYPE2 } from '@/constants';
 import ReutrnEle from '@/components/ReturnEle';
 import StatusTag from '@/components/StatusTag';
 import NiceForm from '@/components/NiceForm';
@@ -89,7 +89,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
       title: '订单状态',
       dataIndex: 'externalState',
       align: 'center', 
-      render: text => PurchaseOrderInsideWorkStateTexts[text], 
+      render: text => PurchaseOrderOutWorkStateTexts[text], 
     },
     {
       title: '订单类型',

src/pages/afterService/repairManage/components/FlowRecords/index.tsx

-/*
- * @Author: XieZhiXiong
- * @Date: 2020-11-04 18:22:57
- * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-11 17:15:08
- * @Description: 内、外部流转记录
- */
-import React from 'react';
-import { 
-  Tabs, 
-  Badge, 
-} from 'antd';
-import PolymericTable from '@/components/PolymericTable';
-import { EditableColumns } from '@/components/PolymericTable/interface';
-import MellowCard from '@/components/MellowCard';
-import StatusTag from '@/components/StatusTag';
-import {
-  REPAIR_OUTER_STATUS_TAG_MAP, 
-  REPAIR_INNER_STATUS_BADGE_MAP, 
-} from '../../../constants';
-import styles from './index.less';
-
-export interface InnerHistoryItem {
-  step: number;
-  operator: string;
-  department: string;
-  jobTitle: string;
-  status: string;
-  operate: string;
-  operateTime: string, 
-  opinion: string;
-};
-
-export interface OuterHistoryItem {
-  roleName: string;
-  status: string;
-  operate: string;
-  operateTime: string;
-  opinion: string;
-};
-
-interface FlowRecordsProps {
-  outerHistory?: OuterHistoryItem[]; 
-  innerHistory: InnerHistoryItem[];
-};
-
-const FlowRecords: React.FC<FlowRecordsProps> = ({ outerHistory = [], innerHistory }) => {
-
-  const outerColumns: EditableColumns[] = [
-    {
-      title: '序号',
-      dataIndex: 'index',
-      align: 'center',
-      render: (_, record, index) => index + 1, 
-    },
-    {
-      title: '操作角色',
-      dataIndex: 'roleName',
-      align: 'center',
-    },
-    {
-      title: '状态',
-      dataIndex: 'statusName',
-      align: 'center', 
-      render: (text, record) => (
-        <StatusTag type={REPAIR_OUTER_STATUS_TAG_MAP[record.status]} title={text} />
-      ),
-    },
-    {
-      title: '操作',
-      dataIndex: 'operate',
-      align: 'center',
-    },
-    {
-      title: '操作时间',
-      dataIndex: 'operateTime',
-      align: 'center',
-      ellipsis: true, 
-    },
-    {
-      title: '审核意见',
-      dataIndex: 'opinion',
-      align: 'center',
-      ellipsis: true, 
-    },
-  ];
-
-  const innerColumns: EditableColumns[] = [
-    {
-      title: '序号',
-      dataIndex: 'step',
-      align: 'center',
-    },
-    {
-      title: '操作人',
-      dataIndex: 'operator',
-      align: 'center',
-    },
-    {
-      title: '部门',
-      dataIndex: 'department',
-      align: 'center',
-    },
-    {
-      title: '职位',
-      dataIndex: 'jobTitle',
-      align: 'center',
-    },
-    {
-      title: '状态',
-      dataIndex: 'statusName',
-      align: 'center', 
-      render: (text, record) => (
-        <Badge color={REPAIR_INNER_STATUS_BADGE_MAP[record.status]} text={text} />
-      ),
-    },
-    {
-      title: '操作',
-      dataIndex: 'operate',
-      align: 'center',
-    },
-    {
-      title: '操作时间',
-      dataIndex: 'operateTime',
-      align: 'center',
-      ellipsis: true, 
-    },
-    {
-      title: '审核意见',
-      dataIndex: 'opinion',
-      align: 'center',
-      ellipsis: true, 
-    },
-  ];
-
-  return (
-    <MellowCard>
-      <Tabs onChange={() => {}}>
-        {outerHistory ? (
-          <Tabs.TabPane tab="外部流转记录" key="1">
-            <PolymericTable
-              rowKey="operateTime"
-              dataSource={outerHistory}
-              columns={outerColumns}
-              loading={false}
-              pagination={null}
-            />
-          </Tabs.TabPane>
-        ) : null}
-        <Tabs.TabPane tab="内部流转记录" key="2">
-          <PolymericTable
-            rowKey="operateTime"
-            dataSource={innerHistory}
-            columns={innerColumns}
-            loading={false}
-            pagination={null}
-          />
-        </Tabs.TabPane>
-      </Tabs>
-    </MellowCard>
-  );
-};
-
+/*
+ * @Author: XieZhiXiong
+ * @Date: 2020-11-04 18:22:57
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2020-12-24 10:55:25
+ * @Description: 内、外部流转记录
+ */
+import React from 'react';
+import { 
+  Tabs, 
+  Badge, 
+} from 'antd';
+import PolymericTable from '@/components/PolymericTable';
+import { EditableColumns } from '@/components/PolymericTable/interface';
+import MellowCard from '@/components/MellowCard';
+import StatusTag from '@/components/StatusTag';
+import {
+  REPAIR_OUTER_STATUS_TAG_MAP, 
+  REPAIR_INNER_STATUS_BADGE_MAP, 
+} from '../../../constants';
+import styles from './index.less';
+
+export interface InnerHistoryItem {
+  step: number;
+  operator: string;
+  department: string;
+  jobTitle: string;
+  status: string;
+  operate: string;
+  operateTime: string, 
+  opinion: string;
+};
+
+export interface OuterHistoryItem {
+  roleName: string;
+  status: string;
+  operate: string;
+  operateTime: string;
+  opinion: string;
+};
+
+interface FlowRecordsProps {
+  outerHistory?: OuterHistoryItem[]; 
+  innerHistory: InnerHistoryItem[];
+};
+
+const FlowRecords: React.FC<FlowRecordsProps> = ({ outerHistory = [], innerHistory }) => {
+
+  const outerColumns: EditableColumns[] = [
+    {
+      title: '序号',
+      dataIndex: 'index',
+      align: 'center',
+      render: (_, record, index) => index + 1, 
+    },
+    {
+      title: '操作角色',
+      dataIndex: 'roleName',
+      align: 'center',
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      align: 'center', 
+      render: (text, record) => (
+        <StatusTag type={REPAIR_OUTER_STATUS_TAG_MAP[record.statusCode]} title={text} />
+      ),
+    },
+    {
+      title: '操作',
+      dataIndex: 'operate',
+      align: 'center',
+    },
+    {
+      title: '操作时间',
+      dataIndex: 'operateTime',
+      align: 'center',
+      ellipsis: true, 
+    },
+    {
+      title: '审核意见',
+      dataIndex: 'opinion',
+      align: 'center',
+      ellipsis: true, 
+    },
+  ];
+
+  const innerColumns: EditableColumns[] = [
+    {
+      title: '序号',
+      dataIndex: 'step',
+      align: 'center',
+    },
+    {
+      title: '操作人',
+      dataIndex: 'operator',
+      align: 'center',
+    },
+    {
+      title: '部门',
+      dataIndex: 'department',
+      align: 'center',
+    },
+    {
+      title: '职位',
+      dataIndex: 'jobTitle',
+      align: 'center',
+    },
+    {
+      title: '状态',
+      dataIndex: 'statusName',
+      align: 'center', 
+      render: (text, record) => (
+        <Badge color={REPAIR_INNER_STATUS_BADGE_MAP[record.status]} text={text} />
+      ),
+    },
+    {
+      title: '操作',
+      dataIndex: 'operate',
+      align: 'center',
+    },
+    {
+      title: '操作时间',
+      dataIndex: 'operateTime',
+      align: 'center',
+      ellipsis: true, 
+    },
+    {
+      title: '审核意见',
+      dataIndex: 'opinion',
+      align: 'center',
+      ellipsis: true, 
+    },
+  ];
+
+  return (
+    <MellowCard>
+      <Tabs onChange={() => {}}>
+        {outerHistory ? (
+          <Tabs.TabPane tab="外部流转记录" key="1">
+            <PolymericTable
+              rowKey="operateTime"
+              dataSource={outerHistory}
+              columns={outerColumns}
+              loading={false}
+              pagination={null}
+            />
+          </Tabs.TabPane>
+        ) : null}
+        <Tabs.TabPane tab="内部流转记录" key="2">
+          <PolymericTable
+            rowKey="operateTime"
+            dataSource={innerHistory}
+            columns={innerColumns}
+            loading={false}
+            pagination={null}
+          />
+        </Tabs.TabPane>
+      </Tabs>
+    </MellowCard>
+  );
+};
+
 export default FlowRecords;
\ No newline at end of file

src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx

@@ -11,7 +11,7 @@ import { createFormActions, FormEffectHooks, FormPath } from '@formily/antd';
 import { PublicApi } from '@/services/api';
 import { GetAsReturnGoodsPageReturnedGoodsResponse } from '@/services/AfterServiceApi';
 import { normalizeFiledata, FileData, isJSONStr } from '@/utils';
-import { PurchaseOrderInsideWorkStateTexts, ORDER_TYPE2 } from '@/constants';
+import { PurchaseOrderOutWorkStateTexts, ORDER_TYPE2 } from '@/constants';
 import ReutrnEle from '@/components/ReturnEle';
 import StatusTag from '@/components/StatusTag';
 import NiceForm from '@/components/NiceForm';
@@ -93,7 +93,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
       title: '订单状态',
       dataIndex: 'externalState',
       align: 'center', 
-      render: text => PurchaseOrderInsideWorkStateTexts[text], 
+      render: text => PurchaseOrderOutWorkStateTexts[text], 
     },
     {
       title: '订单类型',

src/pages/commodity/goods/effect/index.tsx

@@ -21,10 +21,15 @@ export const searchBrandOptionEffect = (context: any, fieldName: string) => {
 
 export const searchCustomerCategoryOptionEffect = (context: any, fieldName: string) => {
   context.getFieldState(fieldName, state => {
-    PublicApi.getProductSelectGetSelectCustomerCategory({ name: state.props['x-component-props'].searchValue }).then(res => {
+    // PublicApi.getProductSelectGetSelectCustomerCategory({ name: state.props['x-component-props'].searchValue }).then(res => {
+    //   context.setFieldState(fieldName, state => {
+    //     state.props['x-component-props'].dataoption = res.data
+    //   })
+    // })
+    PublicApi.getProductCustomerGetCustomerCategoryTree().then(res => {
       context.setFieldState(fieldName, state => {
         state.props['x-component-props'].dataoption = res.data
       })
     })
   })
-}
+}
\ No newline at end of file

src/pages/commodity/goods/schema/index.tsx

@@ -66,17 +66,14 @@ export const goodsSchema: ISchema = {
             },
             customerCategoryId: {
               type: 'string',
-              'x-component': 'CustomInputSearch',
+              'x-component': 'CustomCategorySearch',
               'x-component-props': {
                 placeholder: '商品品类',
                 showSearch: true,
-                showArrow: true,
-                defaultActiveFirstOption: false,
-                filterOption: false,
                 notFoundContent: null,
                 style: { width: '174px' },
-                searchValue: null,
-                dataoption: []
+                dataoption: [],
+                fieldNames: { label: 'title', value: 'id', children: 'children' },
               },
             },
             batch: {
@@ -99,4 +96,4 @@ export const goodsSchema: ISchema = {
       },
     },
   },
-};
+};
\ No newline at end of file

src/pages/commodity/products/effect/index.tsx

@@ -21,10 +21,15 @@ export const searchBrandOptionEffect = (context: any, fieldName: string) => {
 
 export const searchCustomerCategoryOptionEffect = (context: any, fieldName: string) => {
   context.getFieldState(fieldName, state => {
-    PublicApi.getProductSelectGetSelectCustomerCategory({ name: state.props['x-component-props'].searchValue }).then(res => {
+    // PublicApi.getProductSelectGetSelectCustomerCategory({ name: state.props['x-component-props'].searchValue }).then(res => {
+    //   context.setFieldState(fieldName, state => {
+    //     state.props['x-component-props'].dataoption = res.data
+    //   })
+    // })
+    PublicApi.getProductCustomerGetCustomerCategoryTree().then(res => {
       context.setFieldState(fieldName, state => {
         state.props['x-component-props'].dataoption = res.data
       })
     })
   })
-}
+}
\ No newline at end of file

src/pages/repositories/effects/index.tsx

@@ -65,7 +65,12 @@ export const searchBrandOptionEffect = (context: any, fieldName: string) => {
 
 export const searchCustomerCategoryOptionEffect = (context: any, fieldName: string) => {
   context.getFieldState(fieldName, state => {
-    PublicApi.getProductSelectGetSelectCustomerCategory({ name: state.props['x-component-props'].searchValue }).then(res => {
+    // PublicApi.getProductSelectGetSelectCustomerCategory({ name: state.props['x-component-props'].searchValue }).then(res => {
+    //   context.setFieldState(fieldName, state => {
+    //     state.props['x-component-props'].dataoption = res.data
+    //   })
+    // })
+    PublicApi.getProductCustomerGetCustomerCategoryTree().then(res => {
       context.setFieldState(fieldName, state => {
         state.props['x-component-props'].dataoption = res.data
       })

src/pages/transaction/components/orderPayModal/index.tsx

@@ -246,7 +246,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
     if(current === 1) {
       const payOrderUrls = formRef.current.urlList
       const checkedId = checked.id
-      if (!payOrderUrls || payOrderUrls.length === 0) {
+      if (!payOrderUrls || payOrderUrls.length === 0 || payOrderUrls.includes('')) {
         message.error('请先上传凭证')
         return;
       }

src/pages/transaction/components/orderSaleRecord/index.tsx

@@ -287,10 +287,9 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
 
   // 确认全部发货单已收到回单
   const handelReciveReturnOrder = async () => {
-    const res = await PublicApi.getOrderIsDeliveryCompleted({id: data.id})
-    const { code } = res
+    const res = await PublicApi.getOrderIsDeliveryCompleted({id: data.id}, {ctlType: "none"})
     let tip = ''
-    if(code === 1000)
+    if(res.data)
       tip = '是否确认本单全部发货单已收到回单？'
     else
       tip = '您还有未发货的商品，是否确认全部发货都已完成？'
@@ -306,10 +305,9 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
 
   // 继续发货
   const handleContinueDeliver = async () => {
-    const res = await PublicApi.getOrderIsDeliveryCompleted({id: data.id})
-    const { code } = res
+    const res = await PublicApi.getOrderIsDeliveryCompleted({id: data.id},  {ctlType: 'none'})
     let tip = ''
-    if(code === 1000)
+    if(res.data)
       tip = '您商品都已发货．是否确认还需要继续发货？'
     else
       tip = '是否继续发货？'

src/pages/transaction/components/saleOrderProductTable/index.tsx

@@ -97,12 +97,12 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
     modelRef.current.setVisible(true)
   }
 
-  const [amountMoney, setAmountMoney] = useState<number>(sumPrice || sum + freePrice)
+  const [amountMoney, setAmountMoney] = useState<number>((sumPrice*1000)/1000 || (sum*1000 + freePrice*1000)/1000)
 
   // 总计金额
   useEffect(() => {
-    console.log(sumPrice || (sum*1000 + freePrice*1000)/1000, 'iiiiii')
-    setAmountMoney(() => sumPrice || (sum*1000 + freePrice*1000)/1000)
+    console.log((sumPrice*1000)/1000 || (sum*1000 + freePrice*1000)/1000, 'iiiiii')
+    setAmountMoney(() => (sumPrice*1000)/1000 || (sum*1000 + freePrice*1000)/1000)
   }, [sum, freePrice, sumPrice])
 
   const handleConfirm = () => {

src/pages/transaction/saleOrder/readyConfirmReturnOrder/detail/index.tsx

-import React, { useState, useCallback, useRef } from 'react';
-import { OrderDetailContext } from '../../../_public/order/context';
-import { PublicApi } from '@/services/api';
-import { Button } from 'antd';
-import OrderDetailHeader from '@/pages/transaction/components/OrderDetailHeader';
-import OrderDetailWrapper from '@/pages/transaction/components/OrderDetailWrapper';
-import PreLoading from '@/components/PreLoading';
-import { useOrderDetail } from '../../../_public/order/effects/useOrderDetail';
-import ApprovedOrderModal from '../../../components/approvedOrderModal';
-import { history } from 'umi'
-import { useHttpRequest } from '@/hooks/useHttpRequest';
-import OrderDetailSection from '../../../components/orderDetailSection';
-
-const ReadyConfirmReturnOrderDetail: React.FC = () => {
-  const { formContext, id, detailList } = useOrderDetail({type: 'saleOrder'})
-  const { run, loading } = useHttpRequest(PublicApi.postOrderReceiptOrderConfirmedAll)
-
-  // 提交表单
-  const handleSubmit = useCallback(async () => {
-    const params = {
-      id: Number(id),
-      state: 1
-    }
-    const result = await run(params)
-
-    if (result.code === 1000) {
-      history.goBack()
-    }
-  }, [])
-
-  return (
-    <div>
-      <OrderDetailContext.Provider value={formContext}>
-        <OrderDetailHeader 
-          detailList={detailList} 
-          detailData={formContext.data} 
-          // extraRight={
-          //   <Button type='primary' onClick={handleSubmit} loading={loading}>
-          //     确认全部已回单
-          //   </Button>
-          // } 
-      />
-
-        <OrderDetailWrapper>
-          <PreLoading loading={!formContext.data} active paragraph={{rows: 6}}>
-            <OrderDetailSection formContext={formContext} type='saleOrder'/>
-          </PreLoading>
-        </OrderDetailWrapper>
-      </OrderDetailContext.Provider>
-    </div>
-  );
-};
-
-export default ReadyConfirmReturnOrderDetail;
+import React, { useState, useCallback, useRef } from 'react';
+import { OrderDetailContext } from '../../../_public/order/context';
+import { PublicApi } from '@/services/api';
+import { Button } from 'antd';
+import OrderDetailHeader from '@/pages/transaction/components/OrderDetailHeader';
+import OrderDetailWrapper from '@/pages/transaction/components/OrderDetailWrapper';
+import PreLoading from '@/components/PreLoading';
+import { useOrderDetail } from '../../../_public/order/effects/useOrderDetail';
+import ApprovedOrderModal from '../../../components/approvedOrderModal';
+import { history } from 'umi'
+import { useHttpRequest } from '@/hooks/useHttpRequest';
+import OrderDetailSection from '../../../components/orderDetailSection';
+
+const ReadyConfirmReturnOrderDetail: React.FC = () => {
+  const { formContext, id, detailList } = useOrderDetail({type: 'saleOrder'})
+  const { run, loading } = useHttpRequest(PublicApi.postOrderReceiptOrderConfirmedAll)
+
+  // 提交表单
+  // const handleSubmit = useCallback(async () => {
+  //   const params = {
+  //     id: Number(id),
+  //     state: 1
+  //   }
+  //   const result = await run(params)
+
+  //   if (result.code === 1000) {
+  //     history.goBack()
+  //   }
+  // }, [])
+
+  const handleSubmit = () => {
+    const deleveBox = document.querySelector('#deleveBox') as any
+    window.scrollTo(0, deleveBox.offsetTop)
+  }
+
+  return (
+    <div>
+      <OrderDetailContext.Provider value={formContext}>
+        <OrderDetailHeader
+          detailList={detailList}
+          detailData={formContext.data}
+          extraRight={
+            <Button type='primary' onClick={handleSubmit} loading={loading}>
+              确认全部已回单
+            </Button>
+          }
+      />
+
+        <OrderDetailWrapper>
+          <PreLoading loading={!formContext.data} active paragraph={{rows: 6}}>
+            <OrderDetailSection formContext={formContext} type='saleOrder'/>
+          </PreLoading>
+        </OrderDetailWrapper>
+      </OrderDetailContext.Provider>
\ No newline at end of file
+    </div>
+  );
+};
+
+export default ReadyConfirmReturnOrderDetail;

src/pages/transaction/stockSellStorage/bills/components/BillsForm/columns.ts

@@ -2,9 +2,10 @@
  * @Author: XieZhiXiong
  * @Date: 2020-12-22 18:01:50
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-22 18:01:51
+ * @LastEditTime: 2020-12-24 11:01:22
  * @Description: 单据列表 弹窗表格列
  */
+import moment from 'moment';
 import { 
   ORDER_TYPE2, 
   PurchaseOrderInsideWorkStateTexts, 
@@ -109,6 +110,7 @@ export const machiningWarehousingColumns = [
     title: '单据时间',
     align: 'center',
     dataIndex: 'createTime',
+    render: text => moment(text).format('YYYY-MM-DD HH:mm:ss'),
   },
   {
     title: '申请单状态',
@@ -140,6 +142,7 @@ export const machiningDeliveryColumns = [
     title: '单据时间',
     align: 'center',
     dataIndex: 'createTime',
+    render: text => moment(text).format('YYYY-MM-DD HH:mm:ss'),
   },
   {
     title: '申请单状态',