wjx 1 rok pred
rodič
commit
0119bb3eba

+ 1 - 1
src/components/QueryForm/index.tsx

@@ -1477,7 +1477,7 @@ const QueryForm: React.FC<Props> = (props) => {
                     <Select.Option value={-1}>回传失败</Select.Option>
                     <Select.Option value={0}>未回传</Select.Option>
                     <Select.Option value={1}>回传成功</Select.Option>
-                    <Select.Option value={2}>无回传数据</Select.Option>
+                    <Select.Option value={2}>部分成功</Select.Option>
                 </Select>
             </Form.Item></Col>}
 

+ 21 - 3
src/pages/gameDataStatistics/order/back.tsx

@@ -16,6 +16,8 @@ const Back: React.FC<Props> = ({ data, visible, onClose, onChange }) => {
     const [splitOrder, setSplitOrder] = useState<boolean>(false)
     const [splitNum, setSplitNum] = useState<number>()
     const [splitMoney, setSplitMoney] = useState<number[]>([])
+    const [betweenMinuteMin, setBetweenMinuteMin] = useState<number>()
+    const [betweenMinuteMax, setBetweenMinuteMax] = useState<number>()
     const setBack = useAjax((params) => setBackApi(params))
     /****************************/
 
@@ -29,12 +31,22 @@ const Back: React.FC<Props> = ({ data, visible, onClose, onChange }) => {
                 message.error('请完善拆单金额');
                 return
             }
+            if (!betweenMinuteMax || !betweenMinuteMin) {
+                message.error('请输入回传间隔时间');
+                return
+            } else if (betweenMinuteMin > betweenMinuteMax) {
+                message.error('回传间隔最小时间不能大于回传间隔最大时间');
+                return
+            } else {
+                params['betweenMinuteMin'] = betweenMinuteMin
+                params['betweenMinuteMax'] = betweenMinuteMax
+            }
         } else {
             if (!money) { message.error('请输入金额'); return }
             params['backMoney'] = money
         }
         setBack.run(params).then((res: any) => {
-            if (res.data) {
+            if (res) {
                 message.success('上报成功')
                 onChange?.()
                 setSplitNum(undefined)
@@ -68,7 +80,7 @@ const Back: React.FC<Props> = ({ data, visible, onClose, onChange }) => {
                         }}
                     />
                 </Space>
-                {splitNum && <Space align="center" wrap>
+                {splitMoney.length > 0 && <div style={{ display: 'flex', flexWrap: 'wrap', gap: 8, alignItems: 'center' }}>
                     <strong>拆单金额</strong>
                     {splitMoney.map((money, index) => <InputNumber
                         key={index}
@@ -80,7 +92,13 @@ const Back: React.FC<Props> = ({ data, visible, onClose, onChange }) => {
                             setSplitMoney(oldMonery)
                         }}
                     />)}
-                </Space>}
+                </div>}
+                <Space align="center">
+                    <strong>回传间隔时间</strong>
+                    <InputNumber style={{ width: '100%' }} value={betweenMinuteMin} onChange={(e) => setBetweenMinuteMin(e)} placeholder="最小时间" addonAfter='分钟' />
+                    <span>-</span>
+                    <InputNumber style={{ width: '100%' }} value={betweenMinuteMax} onChange={(e) => setBetweenMinuteMax(e)} placeholder="最大时间" addonAfter='分钟' />
+                </Space>
             </> : <>
                 <Space align="center">
                     <strong>金额</strong>

+ 1 - 1
src/pages/gameDataStatistics/order/tableConfig.tsx

@@ -12,7 +12,7 @@ function columns12(onDetail: (data: any) => void, back: (b: any) => void): { lab
                 {
                     title: '回传状态', dataIndex: 'backStatus', label: '回传信息', width: 100, default: 38,
                     render: (a: any) => {
-                        return a === -1 ? <Badge status="error" text="回传失败" /> : a === 0 ? <Badge status="warning" text="未回传" /> : a === 1 ? <Badge status="success" text="回传成功" /> : a === 2 ? <Badge status="default" text="无回传数据" /> : '--'
+                        return a === -1 ? <Badge status="error" text="回传失败" /> : a === 0 ? <Badge status="warning" text="未回传" /> : a === 1 ? <Badge status="success" text="回传成功" /> : a === 2 ? <Badge status="default" text="部分成功" /> : '--'
                     }
                 },
                 {