运费目标设置fix

jiangwei
1 parent 796981fb
Showing 3 changed files with 61 additions and 29 deletions
src/pages/pms/setting/FreightTarget/api.ts
src/pages/pms/setting/FreightTarget/index.tsx
src/pages/pms/setting/PerTarget/components/AddModal.tsx
@@ -4,6 +4,7 @@ import { PMS_HOST } from &#39;@/utils/host&#39;;
  
 export interface Item {
   id?: number,
+  index?:number
   amount?: any, // 
   startDays?: any
   endDays?: any// 
@@ -8,10 +8,10 @@ import { DeleteOutlined } from &#39;@ant-design/icons&#39;;
  
 const Index = () => {
   const [disable, setDisable] = useState(false);
-  const {data, setData, loading, setLoading} = useInitial<Item[], object>(getDetail, [], {});
+  const { data, setData, loading, setLoading } = useInitial<Item[], object>(getDetail, [{ startDays: 1, endDays: '', amount: '' }, { startDays: '', endDays: '', amount: '' }], {});
  
   const handleAdd = () => {
-    setData([...data, { startDays: '', endDays: '', amount: '' }]);
+    setData([...data, { startDays: null, endDays: null, amount: null }]);
   };
  
   const handleInputChange = (index: number, p: any) => {
@@ -28,6 +28,7 @@ const Index = () =&gt; {
   const handleDel = (event: any, index: number) => {
     let arr = data;
     arr.splice(index, 1);
+    arr[arr.length -1].startDays = arr[arr.length-2].endDays+1;
     setData(arr);
   };
  
@@ -43,28 +44,68 @@ const Index = () =&gt; {
     <PageHeaderWrapper title="运费目标设置">
       <Card loading={loading}>
         {!!data?.length && data.map((it, index) => (
-          <div key={index} style={{ display: 'flex', alignItems: 'center', marginBottom: 10 }}>
-            <span style={{ marginRight: 10 }}>{index + 1}、</span>
-            <>
-              缺件起始天数
-              <InputNumber disabled={!disable} min={0} value={it.startDays} onChange={value => handleInputChange(index, { startDays: value })} style={{ width: 100, marginLeft: 10, marginRight: 20 }} />
-            </>
-            <>
-              缺件结束天数
-              <InputNumber disabled={!disable} min={0} value={it.endDays} onChange={value => handleInputChange(index, { endDays: value })} style={{ width: 100, marginLeft: 10, marginRight: 20 }} />
-            </>
-            <>
-              运费统计增加
-              <InputNumber disabled={!disable} value={it.amount} min={0} onChange={value => handleInputChange(index, { amount: value })} style={{ width: 100, marginLeft: 10, marginRight: 20 }} />
-            </>
-            {(index == data.length - 1 && disable) ? <Button onClick={(event: any) => handleDel(event, index)} shape="circle" icon={<DeleteOutlined />} /> : ''}
-          </div>
+          index < data.length-1 ? (
+            <div key={index} style={{ display: 'flex', alignItems: 'center', marginBottom: 10 }}>
+              <span style={{ marginRight: 10 }}>{index + 1}、</span>
+              <>
+                缺件起始天数
+                <InputNumber 
+                  disabled 
+                  min={index > 0 ? data[index - 1].endDays : 1} 
+                  value={index > 0 ? data[index - 1].endDays+1 : 1} 
+                  style={{ width: 100, marginLeft: 10, marginRight: 20 }} 
+                />
+              </>
+              <>
+                缺件结束天数
+                <InputNumber 
+                  disabled={!disable} 
+                  min={0} 
+                  value={it.endDays} 
+                  onChange={value => handleInputChange(index, { startDays: index > 0 ? data[index - 1].endDays + 1 : it.startDays, endDays: value })} 
+                  style={{ width: 100, marginLeft: 10, marginRight: 20 }} 
+                />
+              </>
+              <>
+                运费统计增加
+                <InputNumber 
+                  disabled={!disable}
+                  addonAfter="元"
+                  value={it.amount} 
+                  min={0} 
+                  onChange={value => handleInputChange(index, { amount: value })} 
+                  style={{ width: 100, marginLeft: 10, marginRight: 20 }} 
+                />
+              </>
+              {(index == data.length - 2 && disable && index != 0) ? <Button onClick={(event: any) => handleDel(event, index)} shape="circle" icon={<DeleteOutlined />} /> : ''}
+            </div>
+        ) : 
+            (
+              <div style={{ display: 'flex', alignItems: 'center', marginBottom: 10 }}>
+                <span style={{ marginRight: 10 }}>{data.length}、</span>
+                <div style={{ marginRight: 20 }}>
+                  <InputNumber disabled min={0} value={data[data.length - 2].endDays + 1} style={{ width: 100, marginRight: 10 }} />
+                  天及以上
+                </div>
+                <>
+                  运费统计增加
+                  <InputNumber 
+                    disabled={!disable} 
+                    addonAfter="元"
+                    value={it.amount} 
+                    min={0} 
+                    onChange={value => handleInputChange(data.length - 1, { startDays: index > 0 ? data[index - 1].endDays + 1 : it.startDays, endDays: null, amount: value })} 
+                    style={{ width: 100, marginLeft: 10, marginRight: 20 }} 
+                  />
+                </>
+              </div>
+            )
         ))}
         <Button type="default" disabled={!disable} onClick={() => handleAdd()}>添加梯度</Button>
         <ConfirmBnt
           disable={disable}
           onOk={() => svae()}
-          onCancel={() => { setDisable(false); setData(data); }}
+          onCancel={() => { setDisable(false); setLoading(true); }}
           onEdit={() => {
             setDisable(true);
             setData(data);
@@ -3,9 +3,7 @@ import {Modal, Form, InputNumber, message} from &#39;antd&#39;;
 import PmsSelsct from '@/pages/pms/comonents/PmsSelect';
 import { getStoragePage } from '@/pages/pms/storage/StorageManage/api';
 import usePagination from '@/hooks/usePagination';
-import useInitial from '@/hooks/useInitail';
 import { saveApi } from '../api';
-import { getShopApi } from '@/common/api';
  
 const {Item} = Form;
  
@@ -20,14 +18,12 @@ export default function Index(props: Props) {
   const { item, onCancel, visible, refesh } = props;
   const [form] = Form.useForm();
   const { list: storages } = usePagination<PartStorageSpace.PageVO>(getStoragePage, { pageSize: 1000 });
-  const { data: shops } = useInitial<CommonApi.OptionVO[], object>(getShopApi, [], {});
  
   const OK = () => {
     form.validateFields().then(fileds => {
       const params = {
         id: item?.id,
         storageId: fileds.storageId,
-        shopId: fileds.shopId,
         days: fileds.days,
         amount: fileds.amount
       };
@@ -67,12 +63,6 @@ export default function Index(props: Props) {
             options={storages.map((item: PartStorageSpace.PageVO) => ({ value: item.id, label: item.storageName }))}
           />
         </Item>
-        <Item name="shopId" label="门店" required rules={[{ required: true, message: '请选择门店' }]}>
-          <PmsSelsct 
-            style={{width: 300}}
-            options={shops.map((item: CommonApi.OptionVO) => ({ value: item.id, label: item.name }))}
-          />
-        </Item>
         <Item name="days" label="订件时长目标" required rules={[{ required: true, message: '请输入' }]}>
           <InputNumber style={{ width: 300 }} addonAfter="天" />
         </Item>