Browse Source

Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0 into develop

tags/PMS_V1.0.0_Alpha5
zhugy 1 year ago
parent
commit
b6cdf84b0d
  1. 14
      src/components/TableModule/index.jsx
  2. 2
      src/config/utils.js
  3. 2
      src/router/index.jsx

14
src/components/TableModule/index.jsx

@ -456,6 +456,16 @@ const TableModule = forwardRef((props, ref) => {
//setPlateValue(e);
setFormData({ ...formData, plateValue: e?.label || '', plate2: newValue })
};
const handleNumInput = (key, val) => {
// console.log(key, val);
const obj = {[key]: val.replace(/[^\d]/g,'').replace(/0*(\d+)/,'$1') };
// console.log(obj);
searchForm.setFieldsValue(obj);
setFormData({ ...formData, ...obj });
if (valueChange) {
valueChange(v);
}
};
// useEffect(() => {
// console.log(deftime.startDateTime);
// if (deftime.startDateTime) {
@ -839,14 +849,14 @@ const TableModule = forwardRef((props, ref) => {
case "stopTime":
children = (
<Form.Item label="停车时长" name={item.name} key={item.name}>
<Input addonBefore="大于等于" type="text" addonAfter="分钟" onkeyup="value=value.replace(/[^\d]/g,'')" />
<Input addonBefore="大于等于" type="text" addonAfter="分钟" autoComplete="off" onChange={(e)=>handleNumInput(item.name, e.target.value)} />
</Form.Item>
);
break;
case "stopMoney":
children = (
<Form.Item label="应收金额" name={item.name} key={item.name}>
<Input addonBefore="大于等于" type="text" addonAfter="元" onkeyup="value=value.replace(/[^\d]/g,'')" />
<Input addonBefore="大于等于" type="text" addonAfter="元" autoComplete="off" onChange={(e)=>handleNumInput(item.name, e.target.value)} />
</Form.Item>
);
break;

2
src/config/utils.js

@ -488,7 +488,7 @@ const utils = {
} else {
scroll = document.querySelector(".yisa-table-scroll .ant-table-container .ant-table-body ");
}
console.log(scroll);
// console.log(scroll);
if(!scroll) return
scroll.scrollTop = 0;
}

2
src/router/index.jsx

@ -23,7 +23,7 @@ function RouterMap(props) {
{!storeRoutes.includes(route.name) ? (
<Navigate to="/nav" />
) : (
<route.component />
route.component?<route.component />:<div>&emsp;页面开发中...</div>
)}
</>
)

Loading…
Cancel
Save