merge

d61a056a · XieZhiXiong · a0a492ca · 2c8bdd37 · d61a056a · d61a056a
Commit d61a056a authored Dec 23, 2020 by XieZhiXiong
13 changed files
--- a/package.json
+++ b/package.json
-{
-  "name": "lingxi-business-system",
-  "version": "1.0.4",
-  "private": true,
-  "scripts": {
-    "upload:scm": "cross-env local=scm taskName=upload yarn scripts:build",
-    "upload:10": "cross-env local=10 taskName=upload yarn scripts:build",
-    "upload:25": "cross-env local=25 taskName=upload yarn scripts:build",
-    "api": "god-ytt",
-    "start:analyze": "ANALYZE=1 umi dev",
-    "scripts:build": "node scripts/run",
-    "scripts:build-yxc": "node scripts/run http://yxc-web-demo.shushangyun.com/api",
-    "start": "yarn api && yarn scripts:build && umi dev",
-    "start:dev": "umi dev",
-    "build": "yarn api && yarn scripts:build && yarn build:clean",
-    "build:yxc": "yarn api && yarn scripts:build-yxc && umi build",
-    "build:dev": "pm2 start scripts/devServer.js",
-    "build:analyze": "ANALYZE=1 umi build",
-    "build:clean": "umi build",
-    "build:scm": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-scm.wg.shushangyun.com SOCKET_URL=ws://lingxi-scm.wg.shushangyun.com yarn build",
-    "build:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 SOCKET_URL=ws://10.0.0.10:9400 yarn build",
-    "build:25": "cross-env SITE_ID=352 BACK_GATEWAY=http://10.0.0.25:8100 SOCKET_URL=ws://10.0.0.25:9400 yarn build",
-    "postinstall": "umi generate tmp",
-    "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage",
-    "start:cross": "cross-env SITE_ID=352 SOCKET_URL=ws://10.0.0.25:9400 yarn start",
-    "start:cross-dev": "cross-env SITE_ID=352 SOCKET_URL=ws://10.0.0.25:9400 yarn start:dev",
-    "start:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 SOCKET_URL=ws://10.0.0.10:9400 yarn start",
-    "start:scm": "cross-env BACK_GATEWAY=http://lingxi-scm.wg.shushangyun.com SOCKET_URL=ws://lingxi-scm.wg.shushangyun.com SITE_ID=1 yarn start"
-  },
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "license": "MIT",
-  "dependencies": {
-    "@ant-design/icons": "^4.2.1",
-    "@ant-design/pro-layout": "^5.0.12",
-    "@antv/data-set": "^0.11.5",
-    "@formily/antd": "^1.2.11",
-    "@formily/antd-components": "^1.2.11",
-    "@types/crypto-js": "^4.0.1",
-    "@umijs/hooks": "^1.9.3",
-    "@umijs/preset-react": "1.x",
-    "@umijs/test": "^3.2.0",
-    "bizcharts": "^4.0.13",
-    "braft-editor": "^2.3.9",
-    "classnames": "^2.2.6",
-    "core-js": "^3.6.5",
-    "crypto-js": "^4.0.0",
-    "god": "^0.1.29",
-    "lingxi-design": "^1.0.8",
-    "lingxi-design-ui": "^1.1.15",
-    "lingxi-editor-core": "^1.0.6",
-    "lingxi-web": "^1.0.6",
-    "lint-staged": "^10.0.7",
-    "mobx": "^5.15.4",
-    "mobx-react": "^6.2.2",
-    "pinyin": "^2.9.1",
-    "prettier": "^1.19.1",
-    "query-string": "^6.13.1",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
-    "styled-components": "^5.2.1",
-    "umi": "^3.2.0",
-    "yorkie": "^2.0.0"
-  },
-  "devDependencies": {
-    "axios": "^0.19.2",
-    "connect-history-api-fallback": "^1.6.0",
-    "cross-env": "^7.0.2",
-    "express": "^4.17.1",
-    "god-upload-scp": "1.2.0",
-    "god-yapi2ts": "^1.9.0",
-    "gulp": "^4.0.2",
-    "http-proxy-middleware": "^1.0.5",
-    "json2ts": "^0.0.7",
-    "ora": "^4.0.4",
-    "typescript": "^3.9.7"
-  }
-}
+{
+  "name": "lingxi-business-system",
+  "version": "1.0.4",
+  "private": true,
+  "scripts": {
+    "upload:scm": "cross-env local=scm taskName=upload yarn scripts:build",
+    "upload:10": "cross-env local=10 taskName=upload yarn scripts:build",
+    "upload:25": "cross-env local=25 taskName=upload yarn scripts:build",
+    "api": "god-ytt",
+    "start:analyze": "ANALYZE=1 umi dev",
+    "scripts:build": "node scripts/run",
+    "scripts:build-yxc": "node scripts/run http://yxc-web-demo.shushangyun.com/api",
+    "start": "yarn api && yarn scripts:build && umi dev",
+    "start:dev": "umi dev",
+    "build": "yarn api && yarn scripts:build && yarn build:clean",
+    "build:yxc": "yarn api && yarn scripts:build-yxc && umi build",
+    "build:dev": "pm2 start scripts/devServer.js",
+    "build:analyze": "ANALYZE=1 umi build",
+    "build:clean": "umi build",
+    "build:scm": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-scm.wg.shushangyun.com SOCKET_URL=ws://lingxi-scm.wg.shushangyun.com yarn build",
+    "build:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 SOCKET_URL=ws://10.0.0.10:9400 yarn build",
+    "build:25": "cross-env SITE_ID=352 BACK_GATEWAY=http://10.0.0.25:8100 SOCKET_URL=ws://10.0.0.25:9400 yarn build",
+    "postinstall": "umi generate tmp",
+    "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage",
+    "start:cross": "cross-env SITE_ID=352 SOCKET_URL=ws://10.0.0.25:9400 yarn start",
+    "start:cross-dev": "cross-env SITE_ID=352 SOCKET_URL=ws://10.0.0.25:9400 yarn start:dev",
+    "start:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 SOCKET_URL=ws://10.0.0.10:9400 yarn start",
+    "start:scm": "cross-env BACK_GATEWAY=http://lingxi-scm.wg.shushangyun.com SOCKET_URL=ws://lingxi-scm.wg.shushangyun.com SITE_ID=1 yarn start"
+  },
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "license": "MIT",
+  "dependencies": {
+    "@ant-design/icons": "^4.2.1",
+    "@ant-design/pro-layout": "^5.0.12",
+    "@antv/data-set": "^0.11.5",
+    "@formily/antd": "^1.2.11",
+    "@formily/antd-components": "^1.2.11",
+    "@types/crypto-js": "^4.0.1",
+    "@umijs/hooks": "^1.9.3",
+    "@umijs/preset-react": "1.x",
+    "@umijs/test": "^3.2.0",
+    "bizcharts": "^4.0.13",
+    "braft-editor": "^2.3.9",
+    "classnames": "^2.2.6",
+    "core-js": "^3.6.5",
+    "crypto-js": "^4.0.0",
+    "god": "^0.2.4",
+    "lingxi-design": "^1.0.8",
+    "lingxi-design-ui": "^1.1.15",
+    "lingxi-editor-core": "^1.0.6",
+    "lingxi-web": "^1.0.6",
+    "lint-staged": "^10.0.7",
+    "mobx": "^5.15.4",
+    "mobx-react": "^6.2.2",
+    "pinyin": "^2.9.1",
+    "prettier": "^1.19.1",
+    "query-string": "^6.13.1",
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0",
+    "styled-components": "^5.2.1",
+    "umi": "^3.2.0",
+    "yorkie": "^2.0.0"
+  },
+  "devDependencies": {
+    "axios": "^0.19.2",
+    "connect-history-api-fallback": "^1.6.0",
+    "cross-env": "^7.0.2",
+    "express": "^4.17.1",
+    "god-upload-scp": "1.0.1",
+    "god-yapi2ts": "^1.0.0",
+    "gulp": "^4.0.2",
+    "http-proxy-middleware": "^1.0.5",
+    "json2ts": "^0.0.7",
+    "ora": "^4.0.4",
+    "typescript": "^3.9.7"
+  }
+}
--- a/src/pages/home/components/Settlement/index.tsx
+++ b/src/pages/home/components/Settlement/index.tsx
@@ -13,6 +13,7 @@ import feeIcon4 from '@/asserts/home-icon-18.png'
 import feeIcon5 from '@/asserts/home-icon-19.png'
 import feeIcon6 from '@/asserts/home-icon-20.png'
 import {useInViewport} from '@umijs/hooks';
+import { Link } from 'umi';

 const Settlement: React.FC = () => {
   const [settlements, setSettlements] = useState<any>({});
@@ -54,7 +55,7 @@ const Settlement: React.FC = () => {
            <div className={styles.noteGap}></div>
            <div className={styles.noteBody}>
            <span className={styles.value}>{settlements.toBePay?.count}</span>
-              <a>查看 <RightOutlined /></a>
+              <Link to={settlements.toBePay?.link}>查看 <RightOutlined /></Link>
            </div>
          </div>
        </div>
@@ -69,7 +70,7 @@ const Settlement: React.FC = () => {
            <div className={styles.noteGap}></div>
            <div className={styles.noteBody}>
              <span className={styles.value}>{settlements.complete?.count}</span>
-              <a>查看 <RightOutlined /></a>
+              <Link to={settlements.complete?.link}>查看</Link>
            </div>
          </div>
        </div>
@@ -85,7 +86,7 @@ const Settlement: React.FC = () => {
                  <p className={styles.lineDescTip}>待提现申请</p>
                </div>
              </div>
-              <a>查看&nbsp;<RightOutlined /></a>
+              <Link to={settlements.tobeValifyCashout?.link}>查看&nbsp;<RightOutlined /></Link>
            </div>
          </Col>
          <Col span={24} style={{paddingBottom:0, marginTop: '12px'}}>
@@ -97,7 +98,7 @@ const Settlement: React.FC = () => {
                  <p className={styles.lineDescTip}>待支付提现申请</p>
                </div>
              </div>
-              <a>查看&nbsp;<RightOutlined /></a>
+              <Link to={settlements.tobePayCashout?.link}>查看&nbsp;<RightOutlined /></Link>
            </div>
          </Col>
        </Row>
@@ -113,7 +114,7 @@ const Settlement: React.FC = () => {
                  <p className={styles.lineDescTip}>待付款积分结算</p>
                </div>
              </div>
-              <a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a>
+              <Link to={settlements.scoreToBePay?.link}>查看&nbsp;<RightOutlined /></Link>
            </div>
          </Col>
          <Col span={24} style={{paddingBottom:0, marginTop: '12px'}}>
@@ -125,7 +126,7 @@ const Settlement: React.FC = () => {
                  <p className={styles.lineDescTip}>已完成积分结算</p>
                </div>
              </div>
-              <a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a>
+              <Link to={settlements.scoreComplete?.link}>查看&nbsp;<RightOutlined /></Link>
            </div>
          </Col>
        </Row>

--- a/src/pages/home/components/StatisticsColumn/index.tsx
+++ b/src/pages/home/components/StatisticsColumn/index.tsx
@@ -40,7 +40,7 @@ const StatisticsColumn = (props) => {
                              <p className={styles.lineDescTip}>{data.addProduct?.name}</p>
                            </div>
                          </div>
-                          <a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a>
+                          <Link to={data.addProduct?.link}>查看&nbsp;<RightOutlined /></Link>
                        </div>
                      </Col>
                      <Col xxl={12} xl={12} lg={24} md={12} sm={24}  xs={24} className={styles.commodityTotalDesc} >
@@ -52,7 +52,7 @@ const StatisticsColumn = (props) => {
                              <p className={styles.lineDescTip}>{data.toBeProductValify?.name}</p>
                            </div>
                          </div>
-                          <a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a>
+                          <Link to={data.toBeProductValify?.link}>查看&nbsp;<RightOutlined /></Link>
                        </div>
                      </Col>
                    </Row>
@@ -88,7 +88,7 @@ const StatisticsColumn = (props) => {
                              <p className={styles.lineDescTip}>{data.addBrand?.name}</p>
                            </div>
                          </div>
-                          <a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a>
+                          <Link to={data.addBrand?.link}>查看&nbsp;<RightOutlined /></Link>
                        </div>
                      </Col>
                      <Col xxl={12} xl={12} lg={24} md={12} sm={24}  xs={24} className={styles.commodityTotalDesc}>
@@ -100,7 +100,7 @@ const StatisticsColumn = (props) => {
                              <p className={styles.lineDescTip}>{data.toBeBrandValify?.name}</p>
                            </div>
                          </div>
-                          <a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a>
+                          <Link to={data.toBeBrandValify?.link}>查看&nbsp;<RightOutlined /></Link>
                        </div>
                      </Col>
                    </Row>

--- a/src/pages/home/components/TodayAdd/index.tsx
+++ b/src/pages/home/components/TodayAdd/index.tsx
@@ -36,7 +36,7 @@ const TodayAdd: React.FC<Iprops> = (props) => {
      percent: data.commodityGrowthRate
    },
    {
-      title: '今日新增品牌',
+      title: '今日新增店铺',
      number: data.shopCount,
      icon: brandIcon,
      percent: data.shopGrowthRate

--- a/src/pages/home/index.tsx
+++ b/src/pages/home/index.tsx
@@ -13,6 +13,7 @@ import { PublicApi } from '@/services/api'
 import sideIcon from '../../asserts/home-icon-28.png'
 import { ImemberData, IorderData, ItodayAdd } from './common/interface';
 import {useInViewport} from '@umijs/hooks';
+import { Link } from 'umi';

 const PROCESS_STATUS = ["default", "warning", "warning", "processing"];

@@ -176,7 +177,7 @@ const Home: React.FC<{}> = () => {
                                <Badge status={PROCESS_STATUS[key]} text={item.name}></Badge>
                              </div>
                            </div>
-                            <div><a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a></div>
+                            <div><Link to={item.url}>查看&nbsp;<RightOutlined /></Link></div>
                          </div>
                        </Col>
                      )
@@ -229,7 +230,7 @@ const Home: React.FC<{}> = () => {
                                  return (
                                    <List.Item
                                      key={row.name}
-                                      actions={[<a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a>]}
+                                      actions={[<Link to={row.link}>查看&nbsp;<RightOutlined /></Link>]}
                                    >
                                      <List.Item.Meta
                                        title={row.count.toString()}

--- a/src/pages/pageCustomized/settingsPanel/propsSettings/components/GoodsSetting/index.tsx
+++ b/src/pages/pageCustomized/settingsPanel/propsSettings/components/GoodsSetting/index.tsx
@@ -87,7 +87,7 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
      pageSize: 100
    }

-    PublicApi.getTemplatePlatformFindBrandList(param).then((res: any) => {
+    PublicApi.getTemplateAdornWebEnterpriseFindBrandList(param).then((res: any) => {
      if (res.code === 1000) {
        const dataInfo = res.data
        setNoSelectBrands(dataInfo.data || [])

--- a/src/pages/platformSettlement/accountPayable/index.tsx
+++ b/src/pages/platformSettlement/accountPayable/index.tsx
@@ -49,7 +49,7 @@ const SettlementList = () => {
  }
  const columns: ColumnsType<any> = [
    {
-      title: '结算单号', 
+      title: '结算单号',
      dataIndex: 'settlementNo',
      render: (text, record) => {
        const url = `/balanced/accountPayable/detail?id=${record.id}`;
@@ -88,8 +88,8 @@ const SettlementList = () => {
      title: '操作',
      render: (text, record: any) => {
        return (
-          <StatusActions 
-            status={record.status <= 2 ? record.status : 4 } 
+          <StatusActions
+            status={record.status <= 2 ? record.status : 4 }
            id={record.id}
            excludes={[1, 3]}
            settlementId={record.memberId || 1}
@@ -103,7 +103,7 @@ const SettlementList = () => {

    /**
   * 上传凭证
-   * @param params 
+   * @param params
   */
  const handleUploadVoucher = (params: any) => {
    console.log(params);
@@ -136,7 +136,7 @@ const SettlementList = () => {
          currentRef={ref}
          fetchTableData={(params: any) => fetchListData(params)}
          controlRender={
-            <NiceForm 
+            <NiceForm
              components={{DatePicker}}
              actions={formActions}
              expressionScope={{}}
@@ -149,6 +149,10 @@ const SettlementList = () => {
              }}
              schema={schema}
              onSubmit={handleSearch}
+              onReset={() => {
+                formActions.setFieldValue('startTime', null);
+                formActions.setFieldValue('endTime', null);
+              }}
            />
          }
        />

--- a/src/pages/platformSettlement/corporateAccount/index.tsx
+++ b/src/pages/platformSettlement/corporateAccount/index.tsx
@@ -157,7 +157,7 @@ const CorporateAccount = () => {
            cacheValue: data &&  data.bankAccount || '',
            isEdit: false,
            canEdit: true,
-            pattern: /^([1-9]{1})(\d{14}|\d{18})$/,
+            pattern: /^([1-9]{1})(\d{15}|\d{18})$/,
            message: '请输入正确的银行账号'
          },
          {

--- a/src/pages/platformSettlement/score/list/index.tsx
+++ b/src/pages/platformSettlement/score/list/index.tsx
@@ -20,6 +20,7 @@ import { PublicApi } from '@/services/api'
 import { Moment } from 'moment';
 import { ColumnsType } from 'antd/es/table';
 import EyePreview from '@/components/EyePreview';
+import moment from 'moment';

 interface SearchParams {
  settlementName?: string,
@@ -50,7 +51,7 @@ const SettlementList = () => {
  }
  const columns: ColumnsType<any> = [
    {
-      title: '结算单号', 
+      title: '结算单号',
      dataIndex: 'settlementNo',
      render: (text, record) => {
        const url = `/balanced/scorePayable/detail?id=${record.id}`;
@@ -67,10 +68,10 @@ const SettlementList = () => {
    {title: '总单数', dataIndex: 'totalCount'},
    {title: '结算积分', dataIndex: 'score'},
    {
-      title: '兑换比率', 
+      title: '兑换比率',
      dataIndex: 'ratio',
      render: (text, record) => {
-        return (record.ratio * 100) + "%";
+        return (record.ratio) + "%";
      }
    },
    {title: '结算金额', dataIndex: 'amount'},
@@ -95,8 +96,8 @@ const SettlementList = () => {
      title: '操作',
      render: (text, record: any) => {
        return (
-          <StatusActions 
-            status={record.status <= 2 ? record.status : 4 } 
+          <StatusActions
+            status={record.status <= 2 ? record.status : 4 }
            id={record.id}
            excludes={[1, 3]}
            settlementId={record.memberId || 1}
@@ -110,7 +111,7 @@ const SettlementList = () => {

    /**
  * 上传凭证
-  * @param params 
+  * @param params
  */
  const handleUploadVoucher = (params: any) => {
    console.log(params);
@@ -128,8 +129,8 @@ const SettlementList = () => {
  */
  const handleSearch = (values: SearchParams) => {
    const format = 'YYYY-MM-DD'
-    const startTime = values.startTime?.format(format);
-    const endTime = values.endTime?.format(format);
+    const startTime = values.startTime && moment.isMoment(values.startTime) ? values.startTime.format(format) : '';
+    const endTime = values.endTime && moment.isMoment(values.endTime) ? values.endTime.format(format) : '';
    ref.current.reload({...values, startTime, endTime});
  }
  return (
@@ -143,7 +144,7 @@ const SettlementList = () => {
          currentRef={ref}
          fetchTableData={(params: any) => fetchListData(params)}
          controlRender={
-            <NiceForm 
+            <NiceForm
              components={{DatePicker}}
              actions={formActions}
              expressionScope={{}}
@@ -156,6 +157,10 @@ const SettlementList = () => {
              }}
              schema={schema}
              onSubmit={handleSearch}
+              onReset={() => {
+                formActions.setFieldValue('startTime', null);
+                formActions.setFieldValue('endTime', null);
+              }}
            />
          }
        />
@@ -165,5 +170,4 @@ const SettlementList = () => {
 }

 export default SettlementList
- 
- 
\ No newline at end of file
+
--- a/src/pages/productionNotice/detail/columns.tsx
+++ b/src/pages/productionNotice/detail/columns.tsx
@@ -58,16 +58,16 @@ export const columns: ColumnsType<any> = [
    dataIndex: 'action',
    render: (text, record: any) => {
      return (
-        <DrawerProcessDetail 
-          type="view" 
+        <DrawerProcessDetail
+          type="view"
          id={record.productId}
          brand={record.brand}
          category={record.category}
          name={record.productName}
-          productProps={record.property.specs} 
+          productProps={record.property.specs}
          files={record.property.annex}
          unitName={record.unit}
-          quantity={record.processNum} 
+          quantity={record.processNum}
          processUnitPrice={record.processPrice}
        >
          <a>查看加工明细</a>
@@ -146,7 +146,10 @@ export const outerWorkflowRecordsColumn: ColumnsType<any> = [
  },
  {
    title: '操作时间',
-    dataIndex: 'operateTime'
+    dataIndex: 'operateTime',
+    render: (text, record) => {
+      return moment(text).format('YYYY-MM-DD HH:mm:ss')
+    }
  },
  {
    title: '审核意见',
@@ -225,7 +228,7 @@ export const receiveColumns = (type: "order" | 'product'): ColumnsType<any> => {
  ];
  if(type === 'order') {
    return temp
-  } 
+  }
  return temp.slice(1)
 }

@@ -262,4 +265,4 @@ export const pnoReceiveDeliverDetailDOListColumns = [
    title: '发货数量',
    dataIndex: 'deliverNum'
  }
-]
\ No newline at end of file
+]
--- a/src/pages/productionNotice/detail/index.tsx
+++ b/src/pages/productionNotice/detail/index.tsx
@@ -45,7 +45,7 @@ const Detail: React.FC<{}> = () => {
  const [info, setInfo] = useState<any>({})
  const { id } = usePageStatus();
  const [loading, setLoading] = useState<boolean>(false);
-  
+
  useEffect(() => {
    if(id) {
      setLoading(true)
@@ -66,29 +66,28 @@ const Detail: React.FC<{}> = () => {
      <PageHeaderWrapper
        title={
          <>
-            
            <PageHeader
              style={{ padding: '0' }}
              onBack={() => history.goBack()}
              title={
-                <AvatarWrap 
+                <AvatarWrap
                  info={{
                    name: "通知单号："
-                  }} 
+                  }}
                  extra={(
-                    <span style={{ fontSize: 12, fontWeight: 'normal' }}>{info?.noticeNo}</span>
+                    <span style={{ fontSize: 18, fontWeight: 600 }}>{info?.noticeNo}</span>
                  )}
                />
              }
            >
              <Row>
                <Col span={22}>
-                  <Descriptions 
-                    column={3} 
+                  <Descriptions
+                    column={3}
                    style={{padding: '0 32px', fontWeight: 400}}
                    colon={false}
                  >
-                    <Descriptions.Item label="通知单摘要:">{info?.summary}</Descriptions.Item>
+                    <Descriptions.Item span={3} label="通知单摘要:"  style={{overflow: 'hidden'}}>{info?.summary}</Descriptions.Item>
                    <Descriptions.Item label="加工企业：">{info?.processName}</Descriptions.Item>
                    <Descriptions.Item label="单据时间：">{info && info.createTime && moment(info.createTime).format('YYYY-MM-DD') || null   }</Descriptions.Item>
                    <Descriptions.Item label="通知单来源：">{info?.source == '1' ? '订单加工': '商品加工'}</Descriptions.Item>
@@ -96,13 +95,17 @@ const Detail: React.FC<{}> = () => {
                      <StatusTag type={STATUS[info.outerStatus] || ''} title={info.outerStatusName} />
                    </Descriptions.Item>
                    <Descriptions.Item label="内部状态：">
-                      <Badge 
-                        color={COLOR[info.innerStatus] || 'success'} 
+                      <Badge
+                        color={COLOR[info.innerStatus] || 'success'}
                        text={info.innerStatusName}></Badge>
                    </Descriptions.Item>
                  </Descriptions>
                </Col>
-                
+                {
+                  info?.cause
+                  ? <div style={{marginLeft: '32px'}}>不通过原因: <StatusTag type={"danger"} title={info.cause} /></div>
+                  : null
+                }
              </Row>
            </PageHeader>
          </>
@@ -115,31 +118,31 @@ const Detail: React.FC<{}> = () => {
        <div style={{marginTop: '20px'}}>
          <Card>
            <h1 style={{fontSize: '14px', marginBottom: '16px'}}>通知单明细</h1>
-            <Table dataSource={info?.details} columns={info.source === 2 ? orderDetailColumn : columns}/>
-          </Card> 
+            <Table dataSource={info?.details} columns={info.source === 2 ? orderDetailColumn : columns} rowKey={"id"}/>
+          </Card>
        </div>

        <div style={{marginTop: '20px'}}>
        <ReceiptDeliveryDetailsCard>
          <StatisticsTab tab="收发货统计" columns={receiveColumns(info.source === 2 ? 'product' : 'order')} dataSource={info.details}></StatisticsTab>
          {
-            info.pnoReceiveDeliverDetailDOList && 
+            info.pnoReceiveDeliverDetailDOList &&
            info.pnoReceiveDeliverDetailDOList.length > 0
-            ?  <DetailTab 
-                tab="收发货明细" 
-                columns={pnoReceiveDeliverDetailDOListColumns} 
+            ?  <DetailTab
+                tab="收发货明细"
+                columns={pnoReceiveDeliverDetailDOListColumns}
                dataSource={info.pnoReceiveDeliverDetailDOList}
                // handleConfirm={handleConfirm}
              />
            : null
          }
-          
+
        </ReceiptDeliveryDetailsCard>
      </div>
        <div style={{marginTop: '20px'}}>
-          <DeliveryInfomation 
-            deliveryDate={info.deliveryDate} 
-            deliveryType={info.deliveryType} 
+          <DeliveryInfomation
+            deliveryDate={info.deliveryDate}
+            deliveryType={info.deliveryType}
            receiveAddress={info.receiveAddress}
            receiveUserName={info.receiveUserName}
            receiveUserTel={info.receiveUserTel}
@@ -147,7 +150,7 @@ const Detail: React.FC<{}> = () => {
            deliveryUserName={info.deliveryUserName}
            deliveryUserTel={info.deliveryUserTel}
          />
-        
+
        </div>
        <div style={{marginTop: '20px'}}>
          <Row justify="space-between">
@@ -163,21 +166,21 @@ const Detail: React.FC<{}> = () => {
          <Card bodyStyle={{padding: '10px 24px 24px 24px'}}>
            <Tabs>
              <TabPane tab="外部流转记录" key="1">
-                <Table 
-                  rowKey={"id"} 
-                  columns={outerWorkflowRecordsColumn} 
-                  dataSource={info.outerWorkflowRecordsList} 
+                <Table
+                  rowKey={"id"}
+                  columns={outerWorkflowRecordsColumn}
+                  dataSource={info.outerWorkflowRecordsList}
                />
              </TabPane>
              <TabPane tab="内部流转记录" key="2">
-                <Table 
-                  rowKey={"id"} 
-                  columns={innerWorkFlowRecordColumn} 
+                <Table
+                  rowKey={"id"}
+                  columns={innerWorkFlowRecordColumn}
                  dataSource={info.innerWorkflowRecordsList}
                />
              </TabPane>
            </Tabs>
-          </Card> 
+          </Card>
        </div>
        {/* <ProcessDetail /> */}
      </PageHeaderWrapper>
@@ -185,4 +188,4 @@ const Detail: React.FC<{}> = () => {
  )
 }

-export default Detail
\ No newline at end of file
+export default Detail
--- a/src/pages/productionNotice/query/index.tsx
+++ b/src/pages/productionNotice/query/index.tsx
@@ -27,8 +27,8 @@ export const SUPPLIER_OUTER_STATUS_COLOR = [
 ]

 const columns: ColumnsType<any> = [
-  { 
-    title: '通知单号', 
+  {
+    title: '通知单号',
    dataIndex: 'noticeNo',
    render: (text, record) => {
      const url = '/productionNoticeManage/productionNotice/detail';
@@ -40,15 +40,15 @@ const columns: ColumnsType<any> = [
  { title: '通知单摘要', dataIndex: 'summary' },
  { title: '供应会员', dataIndex: 'supplierName' },
  { title: '加工企业名称', dataIndex: 'processName'},
-  { 
+  {
    title: '单据时间',
-    dataIndex: 'createTime', 
+    dataIndex: 'createTime',
    render: (text, record) => {
      return moment(text).format('YYYY-MM-DD HH:mm:ss')
    }
  },
-  { 
-    title: '外部状态', 
+  {
+    title: '外部状态',
    dataIndex: 'outerStatusName',
    render: (text, record) => {
      return <StatusTag type={SUPPLIER_OUTER_STATUS_COLOR[record.outerStatus]} title={text}></StatusTag>
@@ -62,7 +62,7 @@ const Query: React.FC<IProps> = () => {

    /**
    * 查询
-    * @params values 表单字段 
+    * @params values 表单字段
    */
  const handleSearch = useCallback((values: any) => {
    const {docTime, ...rest} = values;
@@ -72,15 +72,21 @@ const Query: React.FC<IProps> = () => {
      startTime: st,
      endTtime: et
    }
-    
+
    ref.current.reload(searchData)
  }, [])

-  
-  // 初始化高级筛选选项
-  const fetchSelectOptions = async () => {
-    return {};
-  };
+
+// 初始化高级筛选选项
+const fetchSelectOptions = useCallback(async () => {
+  const { data, code } = await PublicApi.getEnhanceSupplierAllOuterAndInner()
+  if(code === 1000) {
+    return {
+      outerStatus: data.outerList.map((item: any) => ({label: item.message, value: item.code})),
+    }
+  }
+  return {}
+}, []);

  const fetchData = useCallback(async (params: any) => {
    const service = PublicApi.getEnhancePlatformAllList;
@@ -121,4 +127,4 @@ const Query: React.FC<IProps> = () => {
  )
 }

-export default Query
\ No newline at end of file
+export default Query
--- a/src/pages/ruleSettingManage/platformSettlementStrategy/info/index.tsx
+++ b/src/pages/ruleSettingManage/platformSettlementStrategy/info/index.tsx
@@ -238,11 +238,12 @@ const MemberSettleAdd: React.FC = () => {

  return (
    <PageHeaderWrapper
-        extra={[
-          <Button loading={submitLoading} key="1" type="primary" onClick={handleClick} >
-            保存
-          </Button>,
-        ]}
+      onBack={() => window.history.back()}
+      extra={[
+        <Button loading={submitLoading} key="1" type="primary" onClick={handleClick} >
+          保存
+        </Button>,
+      ]}
    >
      <Card>
        <NiceForm