Merge branch 'dev' into test

package.json

@@ -47,7 +47,7 @@
     "god": "^0.2.1",
     "immutability-helper": "^3.1.1",
     "lingxi-design": "^1.0.8",
-    "lingxi-design-ui": "^1.1.10",
+    "lingxi-design-ui": "^1.1.14",
     "lingxi-editor-core": "^1.0.6",
     "lingxi-web": "^1.0.6",
     "lint-staged": "^10.0.7",

src/pages/editor/settingsPanel/propsSettings/components/BrandSetting/index.tsx

@@ -42,7 +42,7 @@ const BrandSetting: React.FC<ShopSettingPropsType> = (props) => {
 
   useEffect(() => {
     fetchBrandsList()
-  }, [filterParam])
+  }, [filterParam, current])
 
   const fetchBrandsList = () => {
     let param = {
@@ -84,7 +84,6 @@ const BrandSetting: React.FC<ShopSettingPropsType> = (props) => {
   const handlePageChange = (page: number, pageSize?: number | undefined) => {
     setCurrent(page)
     setPageSize(pageSize || 10)
-    fetchBrandsList()
   }
 
   const handleSearch = () => {

src/pages/editor/settingsPanel/propsSettings/components/GoodsSetting/GoodsItem.tsx

@@ -9,6 +9,26 @@ const GoodsItem: React.FC<GoodsItemPropsType> = (props) => {
 
   const { dataInfo = {} } = props
 
+  const renderPriceByType = (info: any) => {
+    switch (info.priceType) {
+      case 1:
+        return (
+          <div className={styles.goods_item_info_price}>
+            <i>￥</i>
+            <span>{dataInfo.priceRange || dataInfo.goodsPrice}</span>
+          </div>
+        )
+      case 2:
+        return (
+          <div className={styles.inquiry_price}>
+            <label>在线询价</label>
+          </div>
+        )
+      default:
+        break
+    }
+  }
+
   return (
     <div className={styles.goods_item}>
       <div className={styles.goods_item_imgbox}>
@@ -16,10 +36,7 @@ const GoodsItem: React.FC<GoodsItemPropsType> = (props) => {
       </div>
       <div className={styles.goods_item_info}>
         <div className={styles.goods_item_info_name}>{dataInfo.goodsName}</div>
-        <div className={styles.goods_item_info_price}>
-          <i>￥</i>
-          <span>{dataInfo.priceRange || dataInfo.goodsPrice}</span>
-        </div>
+        { renderPriceByType(dataInfo) }
         <div className={styles.goods_item_info_brief}>
           <span>品类：</span>
           <span>{dataInfo.categoryName}</span>

src/pages/editor/settingsPanel/propsSettings/components/GoodsSetting/index.less

@@ -14,6 +14,17 @@
     }
   }
 
+  .inquiry_price {
+    color: #FFF;
+    background-color: #D32F2F;
+    font-size: 12px;
+    height: 18px;
+    line-height: 14px;
+    padding: 2px 8px;
+    display: inline-block;
+    margin-top: 2px;
+  }
+
   &_info {
     flex-grow: 1;
     width: 0;

src/pages/editor/settingsPanel/propsSettings/components/GoodsSetting/index.tsx

@@ -95,7 +95,7 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
 
   useEffect(() => {
     fetchGoodsList()
-  }, [filterParam])
+  }, [filterParam, current])
 
   const fetchGoodsList = () => {
     let param = {
@@ -150,7 +150,6 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
   const handlePageChange = (page: number, pageSize?: number | undefined) => {
     setCurrent(page)
     setPageSize(pageSize || 10)
-    fetchGoodsList()
   }
 
   const handleSearch = () => {

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

@@ -63,15 +63,17 @@ const Add: React.FC<{}> = () => {
           return (
             <Space>
               <ProcessDetail 
-                id={record.goodsId} 
+                id={record.commodityId} 
                 type={"view"}
                 quantity={record.processNum}
+                primaryKey={record.id}
                 processUnitPrice={record.processUnitPrice}
               >
                 <a>查看</a>
               </ProcessDetail>
               <ProcessDetail 
-                id={record.goodsId} 
+                id={record.commodityId} 
+                primaryKey={record.id}
                 type={"edit"} 
                 submit={handleChangeSomeList}
                 quantity={record.processNum}
@@ -261,7 +263,7 @@ const Add: React.FC<{}> = () => {
           specs: item.productProps && item.productProps.map((item) => {
             return {
               name: item.customerAttribute.name,
-              value: item.customerAttribute.name
+              value: item.customerAttributeValue.value
             }
           }) || [],
           annex: item.files.map((item) => ({name: item.name, value: item.url}))
@@ -303,7 +305,7 @@ const Add: React.FC<{}> = () => {
 
   const handleChangeSomeList = (values: any) => {
     let someList = formActions.getFieldValue('Tabs.tab-2.layout.someLists');
-    const index = someList.findIndex((item) => item.goodsId == values.id);
+    const index = someList.findIndex((item) => item.id == values.primaryKey);
     if(index > -1) {
       someList[index] = {
         ...someList[index],

src/pages/handling/assign/add/schema.tsx

@@ -90,7 +90,7 @@ const basicTab = {
                 value: 2
               }
             ],
-            default: 2
+            default: 1
           },
          
           deliveryDate: {

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

+import React from 'react';
+import moment from 'moment';
+import DrawerProcessDetail from '../../components/ProcessDetail/DrawerProcessDetail';
+import { ColumnsType } from 'antd/es/table';
+/**
+ * 通知单明细
+ */
+export const columns = [
+  {
+    title: '订单号',
+    dataIndex: 'orderNo',
+  },
+  {
+    title: 'ID',
+    dataIndex: 'id',
+  },
+  {
+    title: '商品名称',
+    dataIndex: 'goodsName',
+  },
+  {
+    title: '品类',
+    dataIndex: 'category',
+  },
+  {
+    title: '品牌',
+    dataIndex: 'brand',
+  },
+  {
+    title: '单位',
+    dataIndex: 'unit',
+  },
+  {
+    title: '加工数量',
+    dataIndex: 'processNum',
+  },
+  {
+    title: '加工单价',
+    dataIndex: 'processPrice',
+  },
+  {
+    title: '加工费',
+    dataIndex: 'processTotalPrice',
+  },
+  {
+    title: '交期',
+    dataIndex: 'deliveryDate',
+    render: (text, record) => {
+      return moment(text).format('YYYY-MM-DD');
+    }
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    render: (text, record) => {
+      return (
+        <DrawerProcessDetail 
+          type="view" 
+          id={record.goodsId}
+          brand={record.brand}
+          category={record.category}
+          name={record.goodsName}
+          productProps={record.property.specs} 
+          files={record.property.annex}
+          unitName={record.unit}
+          quantity={record.processNum} 
+          processUnitPrice={record.processPrice}
+        >
+          <a>查看加工明细</a>
+        </DrawerProcessDetail>
+      )
+    }
+  },
+];
+
+/**
+ * 外部工作流记录
+ */
+export const innerWorkFlowRecordColumn: ColumnsType = [
+  {
+    title: '流转记录',
+    dataIndex: 'id'
+  },
+  {
+    title: '操作人',
+    dataIndex: 'userId',
+  },
+  {
+    title: '部门',
+    dataIndex: 'department'
+  },
+  {
+    title: '职位',
+    dataIndex: 'jobTitle'
+  },
+  {
+    title: '状态',
+    dataIndex: 'status'
+  },
+  {
+    title: '操作',
+    dataIndex: 'operate'
+  },
+  {
+    title: '操作时间',
+    dataIndex: 'operateTime'
+  },
+  {
+    title: '审核意见',
+    dataIndex: 'opinion'
+  }
+]
+
+/**
+ * 内部流转
+ */
+
+export const outerWorkflowRecordsColumn:  ColumnsType = [
+  {
+    title: '流转顺序号',
+    dataIndex: 'id'
+  },
+  {
+    title: '操作角色',
+    dataIndex: 'roleId',
+  },
+  {
+    title: '状态',
+    dataIndex: 'roleName'
+  },
+  {
+    title: '操作',
+    dataIndex: 'operate'
+  },
+  {
+    title: '操作时间',
+    dataIndex: 'operateTime'
+  },
+  {
+    title: '审核意见',
+    dataIndex: 'opinion'
+  }
+]
+

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

@@ -7,12 +7,12 @@ import Circulation from '../../components/Circulation';
 import WrapTable from '../../components/WrapTable';
 import OtherRequirement from '../../components/OtherRequirement';
 import Appendix from '../../components/Appendix';
-import ProcessDetail from '../../components/ProcessDetail';
 import { usePageStatus } from '@/hooks/usePageStatus'
 import { PublicApi } from '@/services/api';
 import StatusTag from '@/components/StatusTag';
 import DeliveryInfomation from '../../components/DeliveryInformation';
 import moment from 'moment';
+import { columns, innerWorkFlowRecordColumn,  outerWorkflowRecordsColumn } from './columns';
 
 const { TabPane } = Tabs;
 const Detail: React.FC<{}> = () => {
@@ -73,7 +73,7 @@ const Detail: React.FC<{}> = () => {
       <div style={{marginTop: '20px'}}>
         <Card>
           <h1 style={{fontSize: '16px', marginBottom: '16px'}}><strong>通知单明细</strong></h1>
-          <WrapTable dataSource={info?.details}/>
+          <WrapTable dataSource={info?.details} columns={columns}/>
         </Card> 
       </div>
 
@@ -81,7 +81,7 @@ const Detail: React.FC<{}> = () => {
         <Card bodyStyle={{padding: '10px 24px 24px 24px'}}>
           <Tabs>
             <TabPane tab="收发货统计" key="1">
-              <WrapTable dataSource={[]} />
+              <WrapTable columns={columns} dataSource={[]} />
             </TabPane>
             <TabPane tab="收发货明细" key="2">
               <WrapTable dataSource={[]} />
@@ -101,10 +101,10 @@ const Detail: React.FC<{}> = () => {
       <div style={{marginTop: '20px'}}>
         <Row justify="space-between">
           <Col flex={4}>
-            <OtherRequirement />
+            <OtherRequirement explain={info.otherAsk?.explain} />
           </Col>
           <Col flex={2} style={{marginLeft: '20px'}} >
-            <Appendix />
+            <Appendix files={info.otherAsk?.annex}/>
           </Col>
         </Row>
       </div>
@@ -112,10 +112,16 @@ const Detail: React.FC<{}> = () => {
         <Card bodyStyle={{padding: '10px 24px 24px 24px'}}>
           <Tabs>
             <TabPane tab="外部流转记录" key="1">
-              <WrapTable dataSource={info.outerWorkflowRecordsList} />
+              <WrapTable 
+                columns={outerWorkflowRecordsColumn} 
+                dataSource={info.outerWorkflowRecordsList} 
+              />
             </TabPane>
             <TabPane tab="内部流转记录" key="2">
-              <WrapTable dataSource={info.innerWorkflowRecordsList}/>
+              <WrapTable 
+                columns={innerWorkFlowRecordColumn} 
+                dataSource={info.innerWorkflowRecordsList}
+              />
             </TabPane>
           </Tabs>
         </Card> 

src/pages/handling/components/Appendix/index.tsx

@@ -5,10 +5,10 @@
  * @Description: 附件
  */
 
- import React from 'react';
- import { Card } from 'antd';
+import React from 'react';
+import { Card } from 'antd';
 
- const styles = {
+const styles = {
   display: 'flex',
   flexDirection: 'row',
   alignItem: 'center',
@@ -17,21 +17,35 @@
   padding: '10px 15px',
   cursor: 'pointer',
   height: '100%'
- }
- const AppendixItem = () => {
+}
+
+
+const AppendixItem = (props) => {
   return (
-     <div style={styles}>工程技术资料.pdf</div>
+    <div style={styles}>{props.name}</div>
   )
- }
+}
+
+interface Iprops {
+  files: any[]
+}
 
- const Appendix = () => {
+const Appendix: React.FC<Iprops> = (props) => {
+  const { files = [] } = props;
   return (
     <>
       <Card title={"附件"} style={{height: '100%'}}>
-        <AppendixItem />
+        {
+          files.map((item, key) => {
+            return (
+              <AppendixItem key={key} name={item.name} value={item.value}/>
+            )
+          })
+        }
+      
       </Card>
     </>
   )
- }
+}
 
  export default Appendix;
\ No newline at end of file

src/pages/handling/components/DeliveryInformation/index.tsx

@@ -22,7 +22,7 @@ const DeliveryInfomation: React.FC<Iprops> = (props) => {
           {/* <OtherRequirement /> */}
           <Row style={{marginBottom: '20px'}}>
             <Col span={6}>配送方式</Col>
-            <Col>{props.deliveryType}</Col>
+            <Col>{props.deliveryType == 1 ? '物流' : '自提'}</Col>
           </Row>
           <Row>
             <Col span={6}>交期</Col>

src/pages/handling/components/ModalForTable/SearchForm.tsx

@@ -38,6 +38,7 @@ const SearchForm = (props) => {
       state.props["x-component-props"]["loading"] = true;
     })
     props.request(values).then((res) => {
+      console.log(res);
       if(res.code === 1000) {
         setTableStatus({dataSource:res.data.data, totalCount: res.data.totalCount})
       } else {

src/pages/handling/components/OtherRequirement/index.tsx

 import React from 'react';
 import { Card, Row, Col } from 'antd';
 
-const OtherRequirement = () => {
+
+interface Iexpain {
+  [key: string]: string
+}
+
+interface Iprops {
+  explain: Iexpain[]
+}
+
+const OtherRequirement: React.FC<Iprops> = (props) => {
+  const { explain = [] } = props;
+ 
   return (
     <Card title="其他要求">
-      <Row>
-        <Col span={3}>交付说明</Col>
-        <Col span={8}>东莞市石龙镇西葫芦53号交付说明</Col>
-        <Col span={3}>物流说明</Col>
-        <Col span={8}>东莞市石龙镇西葫芦53号交付说明</Col>
-      </Row>
-      <Row style={{margin: '20px 0'}}>
-        <Col span={3}>付款说明</Col>
-        <Col span={8}>首付 30%， 收货后70%</Col>
-        <Col span={3}>包装说明</Col>
-        <Col span={8}>纸箱</Col>
-      </Row>
-      <Row>
-        <Col span={3}>税收说明</Col>
-        <Col span={8}>含税</Col>
-        <Col span={3}>其他说明</Col>
-        <Col span={8}>无</Col>
+      {
+        [0,1,2].map((item) => {
+          return (
+            <Row style={{marginBottom: '15px'}} key={item}>
+              {
+                explain.slice(item * 2, item * 2 + 2).map((i) => {
+                  return (
+                    <React.Fragment key={i.name} >
+                      <Col span={3}>{i.name}</Col>
+                      <Col span={8}>{i.value}</Col>
+                    </React.Fragment>
+                  )
+                })
+              }
             </Row>
+          )
+        })
+      }
+     
+      
     </Card>
   )
 }

src/pages/handling/components/ProcessDetail/DrawerProcessDetail.tsx

+import React, { useState, useEffect } from 'react';
+import { Button, Drawer } from 'antd';
+import Content from './content';
+import { PublicApi } from '@/services/api'
+import { createFormActions } from '@formily/antd'
+
+const actions = createFormActions();
+
+interface Iprops {
+  type: string, // veiw | edit,
+  id: string,
+  brand: string,
+  category: string,
+  name: string,
+  productProps: any[],
+  files: IfileProps[],
+  unitName: string,
+  quantity?: string,
+  processUnitPrice?: string
+}
+
+interface IfileProps {
+  name: string,
+  url: string
+}
+
+const DrawerProcessDetail: React.FC<Iprops> = (props) => {
+  const { id, brand, category, name, productProps, files, unitName, quantity,  processUnitPrice} = props;
+  const [visible, setVisible] = useState<boolean>(false);
+
+  const onClose = () => {
+    setVisible(false)
+  }
+
+  const onOpen = () => {
+    setVisible(true)
+  }
+  
+  return (
+    <>
+      <div onClick={onOpen}>
+          {props.children}
+      </div>
+      <Drawer
+          title="查看加工明细"
+          width={720}
+          onClose={onClose}
+          visible={visible}
+          bodyStyle={{ padding: '0'}}
+          footer={
+            <div
+              style={{
+                textAlign: 'right',
+              }}
+            >
+              <Button onClick={onClose} style={{ marginRight: 8 }}>
+                取消
+              </Button>
+              <Button onClick={onClose} type="primary">
+                确认
+              </Button>
+            </div>
+          }
+        >
+          <Content 
+            name={name} 
+            id={id} 
+            brand={brand}
+            category={category}  
+            unitName={unitName}
+            productProps={productProps}
+            quantity={quantity}
+            processUnitPrice={processUnitPrice}
+            type={"detail"}
+            files={files}
+            actions={actions}
+          />
+        </Drawer>
+    </>
+  )
+}
+
+export default DrawerProcessDetail;
\ No newline at end of file

src/pages/handling/components/ProcessDetail/content.tsx

-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useEffect } from 'react';
 import styles from './content.less';
-import { Row, Col } from 'antd';
+import { Row, Col, Anchor } from 'antd';
 import classnames from 'classnames';
 import {FileList, UploadFile} from '../../components/UploadFile';
 import NiceForm from '@/components/NiceForm';
 
-const menuList = ["基本信息", "产地", "外观尺寸", "工艺", "特殊说明/其他", "附件", "加工要求"];
-const HEIGHT_MAP = {
-  '基本信息': 0,
-  '产地': 238,
-  '外观尺寸': 476,
-  '工艺': 238 * 3,
-  '特殊说明/其他': 238 * 4,
-  '附件': 238 * 4 + 60,
-  '加工要求': 238 * 4 + 60
-}
 
 const schema = {
   type: 'object',
@@ -56,8 +46,9 @@ const schema = {
 }
 
 const Content = (props) => {
-  const { id, name, category, brand, unitName, files, productProps = [], quantity, processUnitPrice } = props;
+  const { id, name, category, brand, unitName, files, productProps, quantity, processUnitPrice } = props;
   const [active, setActive] = useState<string>("基本信息");
+  const [menu, setMenu] = useState([])
   const ref = useRef(null);
 
   const getMenuItemCs = (name: string) => {
@@ -68,24 +59,38 @@ const Content = (props) => {
   }
 
   const activeAndScroll = (item) => {
-    const scrollHeight = HEIGHT_MAP[item];
-    console.log(scrollHeight);
-    setActive(item);
-    // window.scrollTo = scrollHeight; 
-    console.log(ref.current);
-    ref.current.scrollTop = scrollHeight;
+    setActive(item.name);
+    ref.current.scrollTop = item.value;
+  }
+
+  useEffect(() => {
+    const basic = [{name: '基本信息', value: 0}]; // 238
+    let height = 238;
+    let flag = false;
+    const attributes = productProps && productProps.map((item) => {
+      const prevHeight = height;
+      height = height + 112;
+      flag = true;
+      return {
+        name: item.customerAttribute?.name || item.name, 
+        value: prevHeight
       }
+    }) || [];
+    const files = [{name: '附件', value: flag ? height : height - 112}];
+    height += 130;
+    const progress = [{name: '加工要求', value: height}];
+    setMenu(basic.concat(attributes, files, progress));
+  }, [productProps])
 
   return (
     <div className={styles.container}>
       <div className={styles.menu}>
         {
-          menuList.map((item:string) => {
+          menu.map((item,key) => {
             return (
-              <div 
-                key={item} className={getMenuItemCs(item)} 
-                onClick={() => activeAndScroll(item)
-              }>{item}</div>
+              <div key={item.name} className={getMenuItemCs(item.name)} onClick={() => activeAndScroll(item)}>
+                {item.name}
+              </div>
             )
           })
         }
@@ -114,17 +119,14 @@ const Content = (props) => {
           </div>
         </div>
         {
-          productProps.map((item) => {
-            const value = item.customerAttributeValueList.reduce((prev, current) => {
-              return prev += current.value + "，"
-            }, "")
+          productProps && productProps.map((item, key) => {
             return (
-              <div className={styles.common} key={item.id}>
-                <div className={styles.header}>{item.customerAttribute.name}</div>
+              <div className={styles.common} key={key}>
+                <div className={styles.header}>{item.customerAttribute?.name || item.name}</div>
                 <div className={styles.info}>
                   <Row className={styles.infoRow}>
-                    <Col className={styles.label} span={4}>{item.customerAttribute.name}</Col>
-                    <Col span={12}>{value}</Col>
+                    <Col className={styles.label} span={4}>{item.customerAttribute?.name || item.name}</Col>
+                    <Col span={12}>{item.customerAttributeValue?.value || item.value}</Col>
                   </Row>
                 </div>
               </div>
@@ -132,7 +134,7 @@ const Content = (props) => {
           })
         }
       
-        <div className={styles.common} >
+        <div className={styles.common} id="附件" >
           <div className={styles.header}>{"附件"}</div>
           <div className={styles.info}>
             {

src/pages/handling/components/ProcessDetail/index.tsx

@@ -12,6 +12,7 @@ interface Iprops {
   id: string,
   quantity?: string,
   processUnitPrice?: string
+  primaryKey: string
 }
 
 interface IfileProps {
@@ -38,8 +39,15 @@ const ProcessDetail: React.FC<Iprops> = (props) => {
       PublicApi.getProductCommodityGetCommodity({id: props.id})
       .then((data) => {
         if(data.code == 1000) {
-          console.log(quantity)
-          setInfo({...data.data, quantity: quantity, processUnitPrice: processUnitPrice});
+          const target = data.data.unitPriceAndPicList.filter((item) => item.id.toString() == props.primaryKey.toString());
+          console.log(props.primaryKey, target)
+          console.log(data.data.unitPriceAndPicList);
+          setInfo({
+            ...data.data, 
+            quantity: quantity,
+            processUnitPrice: processUnitPrice,
+            attributes: target[0].attributeAndValueList
+          });
         }
       })
     }
@@ -54,11 +62,12 @@ const ProcessDetail: React.FC<Iprops> = (props) => {
   }
 
   const formSubmit = (values) => {
+    
     !!props.submit && props.submit({
       files: files,
-      id: props.id,
+      primaryKey: props.primaryKey,
       process: values,
-      productProps: info?.commodityAttributeList
+      productProps: info?.attributes
     })
     setVisible(false)
   }
@@ -99,14 +108,14 @@ const ProcessDetail: React.FC<Iprops> = (props) => {
             brand={info?.brand?.name}
             category={info?.customerCategory?.fullName}  
             unitName={info?.unitName}
-            actions={actions}
-            formSubmit={formSubmit}
-            fileOnChange={fileOnChange}
-            files={files}
-            productProps={info?.commodityAttributeList}
-            type={props.type}
+            productProps={info?.attributes}
             quantity={info?.quantity}
             processUnitPrice={info?.processUnitPrice}
+            type={props.type}
+            files={files}
+            fileOnChange={fileOnChange}
+            formSubmit={formSubmit}
+            actions={actions}
           />
         </Drawer>
     </>

src/pages/handling/components/ProcessOrder/index.tsx

-import React, { useState } from 'react';
+import React, { useState, useCallback } from 'react';
 import { Button, Table, Drawer } from 'antd';
 import { PublicApi } from '@/services/api';
 import EyePreview from '@/components/EyePreview';
@@ -11,23 +11,27 @@ const actions = createFormActions();
 const columns = [
   {
     title: '订单号',
-    dataIndex: 'id'
+    dataIndex: 'orderNo'
   },
   {
     title: '订单摘要',
-    dataIndex: 'desc'
+    dataIndex: 'orderThe'
   },
   {
     title: '采购会员',
-    dataIndex: 'orderPeople'
+    dataIndex: 'supplyMembersName'
+  },
+  {
+    title: '下单时间',
+    dataIndex: 'createTime'
   },
   {
     title: '订单状态',
-    dataIndex: 'orderStatus'
+    dataIndex: 'externalState'
   },
   {
     title: '订单类型',
-    dataIndex: 'orderType'
+    dataIndex: 'type'
   }
 ] 
 
@@ -76,10 +80,12 @@ const schema = processProductSchema(tableSchema);
 const ProcessProducts = ({visible, cancel, ...restProps}) => {
   // const [selectRow, setSelectRow] = useState({});
   const [selectRow, memberRowCtl] = useRowSelectionTable({ customKey: 'id' });
-  const fetchData = async (params: any) => {
-    let res = await PublicApi.getMemberAbilityInfoPage(params);
-    return res.data;
-  };
+  const [orderData, setOrderData] = useState<any>([])
+
+  const fetchData = useCallback(async (params: any) => {
+    let res = await PublicApi.getOrderProcessingOrderList(params);
+    return res;
+  }, []) 
  
   const expandable = {
     expandedRowRender: record => (
@@ -87,7 +93,7 @@ const ProcessProducts = ({visible, cancel, ...restProps}) => {
         columns={expandRowColumn} 
         rowKey={"id"} 
         // rowSelection={rowSelection} 
-        dataSource={data} 
+        dataSource={record.productDateilss} 
         pagination={false} 
       />
     ),

src/pages/handling/components/ProcessProducts/index.tsx

@@ -23,6 +23,7 @@ const ProcessProducts = ({visible, cancel, ...restProps}) => {
       environment: 1,
       ...params,
     }
+    console.log(postData);
     let res = await PublicApi.getProductCommodityCommonGetCommodityListByBuyer(postData);
     return res;
   };

src/pages/handling/components/Query/index.tsx

@@ -36,6 +36,7 @@ import { timeRange } from '@/utils';
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
 import moment from 'moment';
 import { Link } from 'umi'
+import StatusTag from '@/components/StatusTag';
 
 const formActions = createFormActions();
  // 根据 lastTypeParams, 获取相对应的schema
@@ -109,7 +110,13 @@ const Query: React.FC<{}> = (props) => {
         return moment(text).format('YYYY-MM-DD');
       }
     },
-    { title: '外部状态', dataIndex: 'outerStatusName',},
+    { 
+      title: '外部状态',
+      dataIndex: 'outerStatusName',
+      render: (text) => {
+        return <StatusTag title={text} type="success"></StatusTag>
+      }
+    },
     {
       title: '内部状态',
       dataIndex: 'innerStatusName',
@@ -265,7 +272,6 @@ const Query: React.FC<{}> = (props) => {
       })
     }
   }
-  console.log(FILTER_NAMES[lastTypeParams], SCHEMAS[lastTypeParams]);
   /**
   * 查询
   * @params values 表单字段 

src/pages/handling/components/Query/schema.tsx

@@ -7,7 +7,6 @@ import { docTime } from '../../common';
  * @author: Bill
  * @description: 指派生产通知单查询页 schema - 生产通知单查询
  */
-console.log(QUERY_SEARCH_NAME);
 export const querySchema: ISchema = {
   type: 'object',
   properties: {

src/pages/handling/components/WrapTable/index.tsx

 import React from 'react'
 import { Table } from 'antd'
 import moment from 'moment';
-import ProcessDetail from '../ProcessDetail';
+import DrawerProcessDetail from '../ProcessDetail/DrawerProcessDetail';
 
 interface Iprops {
-  dataSource: any[]
+  dataSource: any[],
+  columns?: any[]
 }
 
 const WrapTable: React.FC<Iprops> = (props) => {
   const dataSource = props.dataSource || []
-  const columns = [
-    {
-      title: '订单号',
-      dataIndex: 'orderNo',
-    },
-    {
-      title: 'ID',
-      dataIndex: 'id',
-    },
-    {
-      title: '商品名称',
-      dataIndex: 'goodsName',
-    },
-    {
-      title: '品类',
-      dataIndex: 'category',
-    },
-    {
-      title: '品牌',
-      dataIndex: 'brand',
-    },
-    {
-      title: '单位',
-      dataIndex: 'unit',
-    },
-    {
-      title: '加工数量',
-      dataIndex: 'processNum',
-    },
-    {
-      title: '加工单价',
-      dataIndex: 'processPrice',
-    },
-    {
-      title: '加工费',
-      dataIndex: 'processTotalPrice',
-    },
-    {
-      title: '交期',
-      dataIndex: 'deliveryDate',
-      render: (text, record) => {
-        return moment(text).format('YYYY-MM-DD');
-      }
-    },
-    {
-      title: '操作',
-      dataIndex: 'action',
-      render: (text, record) => {
-        return (
-          <ProcessDetail type="view" id={record.goodsId} quantity={record.processNum} processUnitPrice={record.processPrice}>
-            <a>查看加工明细</a>
-          </ProcessDetail>
-        )
-      }
-    },
-  ];
   return (
     <Table 
-      columns={columns}
+      columns={props.columns || []}
       rowKey={"id"}
       dataSource={dataSource}
     />

src/pages/home/components/Centers/FundCenter.tsx

+import React, { useEffect, useState } from 'react';
+import AbilityContainer from './Container';
+import styles from './center.less'
+import logistics from '@/assets/imgs/logistics.png';
+import logistics_form from '@/assets/imgs/logistics_form.png';
+import logistics_address from '@/assets/imgs/logistics_address.png';
+import logistics_cost from '@/assets/imgs/logistics_cost.png';
+import { Row, Col, Skeleton } from 'antd';
+import {useInViewport} from '@umijs/hooks';
+import { PublicApi } from '@/services/api';
+import { Link } from 'umi'
+
+interface Iprops {};
+
+const KEY_TO_TITLE = {
+  creditList: '授信处理',
+  accountList: '资金账户管理'
+}
+
+const FundCenter: React.FC<Iprops> = () => {
+  const [inViewPort, ref] = useInViewport<HTMLDivElement>();
+  const [data, setData] = useState<any>({});
+  const [flag, setFlag] = useState<boolean>(false);
+  const [loading, setLoading] = useState<boolean>(false);
+ 
+  const tagsList = [
+    {
+      icon: logistics,
+      text: '物流派单'
+    },
+    {
+      icon: logistics_form,
+      text: '接单报价'
+    },
+    {
+      icon: logistics_address,
+      text: '收货地址管理'
+    },
+    {
+      icon: logistics_address,
+      text: '发货地址管理'
+    },
+    {
+      icon: logistics_cost,
+      text: '运费模板'
+    }
+  ]
+
+  useEffect(() => {
+    if(inViewPort && !flag) {
+      setLoading(true);
+      PublicApi.getReportMemberHomeGetAccount()
+      .then(({code, data}) => {
+        if(code === 1000) {
+          console.log(data);
+          setData(data)
+          setFlag(true)
+          setLoading(false)
+        }
+      })
+    }
+  }, [inViewPort])
+  return (
+    <AbilityContainer 
+      title="资金账户管理" 
+      tips={"提供资金账户管理、授信额度管理等功能。"}
+
+    >
+      <div ref={ref}>
+        {
+          loading
+          ? <Skeleton active />
+          : (
+              <>
+              {/* <div className={styles.tags}>
+                  {
+                    tagsList.map((item) => {
+                      return (
+                        <div className={styles.tagsItem} key={item.text}>
+                          <div className={styles.icon}>
+                            <img src={item.icon} />
+                          </div>
+                          <div className={styles.text}>{item.text}</div>
+                        </div>
+                      )
+                    })
+                  }
+                </div> */}
+                <div>
+                  {
+                    Object.keys(data).map((item) => {
+                      return (
+                        <Row key={item} className={styles.row}>
+                          <Col span={4} className={styles.rowTitle}>{KEY_TO_TITLE[item]}</Col>
+                          <Col span={20} className={styles.colRow}>
+                            {
+                              data[item].map((record) => {
+                                return (
+                                  <Col span={4} key={record.name} className={styles.col}>
+                                    <div className={styles.colTitle}>{record.name}</div>
+                                    {
+                                      record.link 
+                                      ? <Link to={record.Link} className={styles.colValue}>{record.count}</Link>
+                                      : <div className={styles.colValue}>{record.count}</div>
+                                    }
+                                    
+                                  </Col>    
+                                )
+                              })
+                            }
+                          </Col>
+                        </Row>
+                      )
+                    })
+                  }
+                </div>
+              </>
+            )
+        }
+       
+      </div>
+    </AbilityContainer>
+  )
+}
+
+export default FundCenter;
\ No newline at end of file

src/pages/home/components/Centers/center.less

@@ -17,7 +17,8 @@
     .colTitle {
       font-size: 12px;
       font-weight: 400;
-      color: #909399;;
+      color: #909399;
+      min-height: 36px;
     }
   
     .colValue {

src/pages/home/components/Centers/index.tsx

@@ -5,6 +5,7 @@ import SettlementCenter from './SettlementCenter';
 import AfterSoldCenter from './AfterSoldCenter'
 import LogisticsCenter from './LogisticsCenter'
 import ProcessCenter from './ProcessCenter';
+import FundCenter from './FundCenter';
 
 export {
   TradeCenter,
@@ -13,5 +14,6 @@ export {
   SettlementCenter,
   AfterSoldCenter,
   LogisticsCenter,
-  ProcessCenter
+  ProcessCenter,
+  FundCenter
 }
\ No newline at end of file

src/pages/home/index.tsx

@@ -8,7 +8,7 @@ import LatestAnnounce from './components/LatestAnnounces';
 import RecentVisit from './components/RecentVisit';
 import AnyQuestion from './components/AnyQuestion';
 import AdvertisementContainer from './components/AdvertisementSpace';
-import { TradeCenter, ShopCenter, ProductCenter, SettlementCenter, AfterSoldCenter, LogisticsCenter, ProcessCenter } from './components/Centers';
+import { TradeCenter,FundCenter,  ShopCenter, ProductCenter, SettlementCenter, AfterSoldCenter, LogisticsCenter, ProcessCenter } from './components/Centers';
 import styles from './index.less'
 import { CompassFilled } from '@ant-design/icons';
 
@@ -53,6 +53,9 @@ const Home: React.FC<{}> = () => {
             <div className={styles.ability} style={{order: centerOrder["product"]}}>
               <ProductCenter />
             </div>
+            <div className={styles.ability} style={{order: centerOrder["product"]}}>
+              <FundCenter />
+            </div>
             <div className={styles.ability} style={{order: centerOrder["settlement"]}}>
               <SettlementCenter />
             </div>

src/pages/lxMall/channel/index.tsx

@@ -109,7 +109,9 @@ const ChannelIndex: React.FC<ChannelIndexPropsType> = (props) => {
 
       // @ts-ignore
       PublicApi.getTemplateChannelFindFirstCategoryDetail(param).then(res => {
+        if(res.code === 1000) {
           resolve(res.data)
+        }
       })
     })
   }

src/pages/lxMall/commodityDetail/index.tsx

@@ -14,7 +14,7 @@ import { store } from '@/store'
 import ProductDescription from './components/ProductDescription'
 import InputNumber from '@/components/InputNumber'
 import { PublicApi } from '@/services/api'
-import { GetSearchShopStoreGetCommodityDetailResponse } from '@/services/SearchApi'
+import { GetSearchShopStoreGetCommodityDetailResponse, GetSearchShopChannelGetCommodityDetailResponse } from '@/services/SearchApi'
 import { getAuth } from '@/utils/auth'
 import { numFormat, priceFormat } from '@/utils/numberFomat'
 import jinhuodanIcon from '@/assets/imgs/jinhuodan.png'
@@ -62,7 +62,7 @@ const CommodityDetail = (props) => {
   const { updateOrderInfo } = OrderStore
   const [addSuccessVisible, setAddSuccessVisible] = useState<boolean>(false)
   const [attributeList, setAttributeList] = useState([])
-  const [commodityDetail, setCommodityDetail] = useState<GetSearchShopStoreGetCommodityDetailResponse>()
+  const [commodityDetail, setCommodityDetail] = useState<GetSearchShopStoreGetCommodityDetailResponse & GetSearchShopChannelGetCommodityDetailResponse>()
   const [attrAndValList, setAttrAndValList] = useState<any>({})
   const [selectAttrVal, setSelectAttrVal] = useState<selectAttrValType[]>([])
   const [stockCount, setStockCount] = useState<number>(0)
@@ -70,6 +70,7 @@ const CommodityDetail = (props) => {
   const [commodityPriceInfo, setCommodityPriceInfo] = useState([])
   const [parameter, setParameter] = useState<number>() // 权益参数
   const [selectCommodityId, setSelectCommodityId] = useState<number>()
+  const [selectCommodityUnitPriceId, setSelectCommodityUnitPriceId] = useState<number>()
   const [buyCount, setBuyCount] = useState<number>(1)
   const [purchaseCount, setPurchaseCount] = useState<number>(0)
   const [payWayList, setPayWayList] = useState([])
@@ -284,6 +285,7 @@ const CommodityDetail = (props) => {
     } else {
       if (selectCommodityId) {
         setSelectCommodityId(null)
+        setSelectCommodityUnitPriceId(null)
       }
     }
 
@@ -301,7 +303,7 @@ const CommodityDetail = (props) => {
         })
         if (judgeArrisCommon(temp, selectAttrVal)) {
           setSelectCommodityId(item.id)
-
+          setSelectCommodityUnitPriceId(item.commodityUnitPriceAndPicId)
           setCurrentPriceRange(sortUnitPrice(item.unitPrice))
           setAttrAndValList(item)
           setStockCount(item.stockCount)
@@ -346,6 +348,8 @@ const CommodityDetail = (props) => {
         case LAYOUT_TYPE.channel:
         case LAYOUT_TYPE.ichannel:
           param.commodityType = 2
+          param.channelCommodityUnitPriceId = selectCommodityId
+          param.commodityUnitPriceId = selectCommodityUnitPriceId
           postFn = PublicApi.postSearchShopPurchaseChannelSaveOrUpdatePurchase
           break;
         default:

src/pages/lxMall/shop/index.tsx

@@ -96,7 +96,9 @@ const ShopIndex: React.FC<ChannelIndexPropsType> = (props) => {
 
       // @ts-ignore
       PublicApi.getTemplateShopFindFirstCategoryDetail(param).then(res => {
+        if(res.code === 1000) {
           resolve(res.data)
+        }
       })
     })
   }