fix:快递收费标准优化

谢忠泽
1 parent 0bc2e94e
Showing 3 changed files with 11 additions and 12 deletions
src/pages/contract/ExpressChargingStandardSetting/components/AddModel/index.tsx
src/pages/contract/ExpressChargingStandardSetting/components/Filter/index.tsx
src/pages/contract/ExpressChargingStandardSetting/index.tsx
@@ -142,14 +142,14 @@ function AddModel({visible, row, compList, cityList, onCancel, onRefresh}:Props)
               name="firstWeight"
               rules={[{required: true, message: '请填写首重'}]}
             >
-              <InputNumber placeholder="请填写" addonAfter="kg" max={100000000} min={0} precision={2} /> 
+              <InputNumber placeholder="请填写" addonAfter="元/kg" max={100000000} min={0} precision={2} /> 
             </Form.Item>
             <Form.Item
               label="续重"
               name="continuedWeight"
               rules={[{required: true, message: '请填写续重'}]}
             >
-              <InputNumber placeholder="请填写" addonAfter="kg" max={100000000} min={0} precision={2} /> 
+              <InputNumber placeholder="请填写" addonAfter="元/kg" max={100000000} min={0} precision={2} /> 
             </Form.Item>
             <Form.Item
               label="到达地区"
@@ -19,13 +19,13 @@ function Filter({ compList, cityList, setParams, innerParams }:Props) {
     const [searchData, setSearchData] = useState<SearchData>({});
     return (
       <Row style={{flex: 1}}>
-        <Col span={6}>
+        <Col span={8} style={{marginRight: 10}}>
           <Select
             placeholder="请选择往来单位"
             showSearch
             optionFilterProp="children"
             allowClear
-            style={{ width: 280 }}
+            style={{ minWidth: 260, maxWidth: 280 }}
             onChange={(tradeCompId) => {
               setSearchData({...searchData, tradeCompId});
               setParams({...innerParams, ...searchData, tradeCompId}, true);
@@ -40,7 +40,7 @@ function Filter({ compList, cityList, setParams, innerParams }:Props) {
             }
           </Select>
         </Col>
-        <Col span={4}>
+        <Col span={6} style={{marginRight: 10}}>
           <Select
             placeholder="请选择寄件地区"
             showSearch
@@ -61,7 +61,7 @@ function Filter({ compList, cityList, setParams, innerParams }:Props) {
             }
           </Select>
         </Col>
-        <Col span={4}>
+        <Col span={6} style={{marginRight: 10}}>
           <Select
             placeholder="请选择到达地区"
             showSearch
-import React, { useCallback, useState } from "react";
-import { Button, Card, ConfigProvider, Divider, Input, message, Popconfirm, Select, Table } from "antd";
+import React, { useState } from "react";
+import { Button, Card, ConfigProvider, Divider, message, Popconfirm, Table } from "antd";
 import { PageHeaderWrapper } from "@ant-design/pro-layout";
 import zhCN from "antd/lib/locale-provider/zh_CN";
 import usePagination from "@/hooks/usePagination";
@@ -9,7 +9,6 @@ import AddModel from &#39;./components/AddModel&#39;;
 import Filter from './components/Filter';
 import * as API from './api';
 import _ from "lodash";
-import moment from 'moment';
 import st from "./style.less";
  
 interface Props {
@@ -28,7 +27,7 @@ function expressChargingStandard(props:Props) {
     setLoading
   } = usePagination<API.Item>(API.getStandardPage, {current: 1, pageSize: 10});
   const { data: cityList, loading: cityLoading } = useInitial(API.getCityLsit, [], {});
-  const { data: compList, loading: compLoading } = useInitial(API.fetchComps, [], {});
+  const { data: compList, loading: compLoading } = useInitial(API.fetchComps, [], {type: '88,138'});
   const [row, setRow] = useState<API.Item>();
   /**
    * @description: 编辑
@@ -96,8 +95,8 @@ function expressChargingStandard(props:Props) {
             <Column title="往来单位" width={200} dataIndex="tradeCompName" render={(t:any) => t || "-"} /> 
             <Column title="寄件地区" width={200} dataIndex="sendAreaName" render={(t:any) => t || '-'} />
             <Column title="到达地区" width={200} dataIndex="arriveAreaName" render={(t:any) => t || '-'} />
-            <Column title="首重(kg)" width={200} dataIndex="firstWeight" render={(t:any) => t || '-'} />
-            <Column title="续重(kg)" width={200} dataIndex="continuedWeight" render={(t:any) => t || '-'} />
+            <Column title="首重(kg)" width={200} dataIndex="firstWeight" render={(t:any) => `${(t || t === 0) ? t+'元':'-'}`} />
+            <Column title="续重(kg)" width={200} dataIndex="continuedWeight" render={(t:any) => `${(t || t === 0) ? t+'元':'-'}`} />
             <Column 
               title="操作"
               width={100}