fix():修改路内bug

src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx

@@ -216,6 +216,7 @@ function AuditCheck() {
   });
 
   function getProgressData(params) {
+    console.log(params);
     setLoading(true);
     ajax
       .getProgressData(params)
@@ -230,14 +231,34 @@ function AuditCheck() {
       });
   }
 
-  function search() {
+  function search(data={}) {
+    console.log(data);
     let result = searchForm.getFieldsValue();
     if (type === "1") {
       result = { ...result, ...reportTime, ...pageData };
     } else {
       result = { ...result, ...reportTime, ...handleTime, ...pageData, status: -1 };
     }
-    getProgressData(result);
+    getProgressData({...result,...data});
+  }
+  const handleReset = () => {
+    setReportTime({
+      insert_begin_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD 00:00:00'),
+      insert_end_time: moment().format('YYYY-MM-DD 23:59:59'),
+    })
+    setHandleTime({
+      deal_begin_time: moment().subtract(1, 'days').startOf('day').format('YYYY-MM-DD 00:00:00'),
+      deal_end_time: moment().format('YYYY-MM-DD 23:59:59')
+    })
+    searchForm.resetFields();
+    let data={
+      insert_begin_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD 00:00:00'),
+      insert_end_time: moment().format('YYYY-MM-DD 23:59:59'),
+      deal_begin_time: moment().subtract(1, 'days').startOf('day').format('YYYY-MM-DD 00:00:00'),
+      deal_end_time: moment().format('YYYY-MM-DD 23:59:59')
+    }
+    search(data)
+
   }
   //获取运营商
   function getAllOperator(params) {
@@ -330,7 +351,7 @@ function AuditCheck() {
             </Form.Item>
           </Col>
           <Col span={24}>
-            <Form.Item label="稽查员" name="deal_user">
+            <Form.Item label="稽查员" name="inspect_person">
               <Input placeholder="请输入稽查员姓名" {...inputParams} />
             </Form.Item>
           </Col>
@@ -375,7 +396,7 @@ function AuditCheck() {
           {type === "2" && (
             <>
               <Col span={24}>
-                <Form.Item label="处理人" name="inspect_person">
+                <Form.Item label="处理人" name="deal_user">
                   <Input placeholder="请输入记录编号" {...inputParams} />
                 </Form.Item>
               </Col>
@@ -440,7 +461,7 @@ function AuditCheck() {
         <div className="searchWrap">
           {renderSearch()}
           <div className="bottomBox">
-            <Button className="reset">清空</Button>
+            <Button className="reset" onClick={handleReset}>清空</Button>
             <Button type="primary" className="submit" onClick={search}>
               查询
             </Button>

src/pages/InRoadMgm/PersonMgm/Performance/CollectorWorkStat/loadable.jsx

@@ -5,14 +5,15 @@ import {
     pageSizeOptions
 } from '@/config/character.config.js'
 import "./index.scss";
-import { SearchOutlined,DeleteOutlined } from '@ant-design/icons';
+import { SearchOutlined, DeleteOutlined } from '@ant-design/icons';
 import ajax from '@/services'
+import moment from "moment";
 
 const { Option } = Select;
 const { RangePicker } = DatePicker;
 function CollectorWorkStat(props) {
     const [ajaxLoading, setAjaxLoading] = useState(false)
-
+    const [typeTime, setTypeTime] = useState('day');
     const [resultData, setResultData] = useState({
         data: [],
         total_records: 0,
@@ -23,11 +24,14 @@ function CollectorWorkStat(props) {
         name: '',//登录名
         operator_id: '0',//所属运营商
         job_status: '0',//在职状态
-        day_time: [],
-        month_time: [],
-        pn: 1,
+        start_time:  moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD') ,
+        end_time: moment().format('YYYY-MM-DD'),
         page_size: Number(pageSizeOptions[0]),  // 每页条数
     }
+    let dataTime={
+        start_time:  moment().subtract(30, 'days').startOf('day').format('YYYY-MM') ,
+        end_time: moment().format('YYYY-MM'),
+    }
     const [formData, setFormData] = useState(parameter)
     const [lastFormData, setLastFormData] = useState(formData)
     const lastFormDataRef = useRef(formData)
@@ -114,9 +118,9 @@ function CollectorWorkStat(props) {
     const changePn = (pn, length) => {
         if (lastFormData.page_size === length) {
             setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
-            setLastFormData(Object.assign({}, lastFormData, { pn: pn , page_size: length }))
-            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn, page_size: length  })
-            getData(Object.assign({}, formData, { pn: pn, page_size: length  }))
+            setLastFormData(Object.assign({}, lastFormData, { pn: pn, page_size: length }))
+            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn, page_size: length })
+            getData(Object.assign({}, formData, { pn: pn, page_size: length }))
         }
     }
     //切换每页条数
@@ -126,19 +130,34 @@ function CollectorWorkStat(props) {
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
         getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
-      //重置数据
-      const getResetData = () => {
+    //重置数据
+    const getResetData = () => {
         setFormData({
             ...parameter
         })
-        getData({...parameter,pn: 1} )
+        getData({ ...parameter, pn: 1 })
     }
     //检索数据
     const getSearchData = (data = formData) => {
         getData(data)
     }
 
-    const [type, setType] = useState('day');
+
+    const setType = (v) => {
+        setTypeTime(v)
+        if (v === 'day') {
+            setFormData(parameter)
+        } else {
+            setFormData({
+                ...parameter,
+                ...dataTime
+            })
+        }
+    }
+    useEffect(()=>{
+        console.log(formData);
+    },[formData])
+    console.log(typeTime);
     const [getOperationName, setGetOperationName] = useState([])
     const operationName = () => {
         ajax.getAllOperator().then(res => {
@@ -198,33 +217,26 @@ function CollectorWorkStat(props) {
                 </div>
                 <div className="timePicker ">
                     <Space>
-                        <Select value={type} onChange={setType}>
+                        <Select value={typeTime} onChange={setType}>
                             <Option value="day">日</Option>
                             <Option value="month">月</Option>
                         </Select>
                         {
-                            type === 'day' ?
-                                <RangePicker onChange={(value, dateString) => {
+                            typeTime === 'day' ?
+                                <RangePicker allowClear={false} value={[moment(formData.start_time), moment(formData.end_time)]} onChange={(value, dateString) => {
                                     setFormData({
                                         ...formData,
                                         start_time: dateString[0],
                                         end_time: dateString[1],
-                                        type: type
+                                        type: typeTime
                                     })
                                 }} /> :
-                                <RangePicker picker="month" onChange={(value, dateString) => {
-                                    // let first =dateString[0].substr(0,7);
-                                    // let timeFirst = new Date(first)
-                                    // let end =dateString[1].substr(0,7);
-                                    // let timeEnd = new Date(end)
-                                    // var day = timeEnd.getTime() - timeFirst.getTime();
-                                    // var time = parseInt(day/(1000*60*60*24));
-                                    // console.log(time);
+                                <RangePicker picker="month" allowClear={false} value={[moment(formData.start_time), moment(formData.end_time)]} onChange={(value, dateString) => {
                                     setFormData({
                                         ...formData,
                                         start_time: dateString[0],
                                         end_time: dateString[1],
-                                        type: type
+                                        type: typeTime
                                     })
                                 }} />
                         }

src/pages/InRoadMgm/PersonMgm/Performance/InspectorWorkStat/loadable.jsx

@@ -13,7 +13,7 @@ const { Option } = Select;
 const { RangePicker } = DatePicker;
 function InspectorWorkStat(props) {
     const [ajaxLoading, setAjaxLoading] = useState(false)
-
+    const [typeTime, setTypeTime] = useState('day');
     const [resultData, setResultData] = useState({
         data: [],
         total_records: 0,
@@ -24,11 +24,15 @@ function InspectorWorkStat(props) {
         name: '',//登录名
         operator_id: '0',//所属运营商
         job_status: '0',//在职状态
-        day_time: [],
-        month_time: [],
+        start_time:  moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD') ,
+        end_time: moment().format('YYYY-MM-DD'),
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
     }
+    let dataTime={
+        start_time:  moment().subtract(30, 'days').startOf('day').format('YYYY-MM') ,
+        end_time: moment().format('YYYY-MM'),
+    }
     const [formData, setFormData] = useState(parameter)
     const [lastFormData, setLastFormData] = useState(formData)
     const lastFormDataRef = useRef(formData)
@@ -131,8 +135,17 @@ function InspectorWorkStat(props) {
     const getSearchData = (data = formData) => {
         getData(data)
     }
-
-    const [type, setType] = useState('day');
+    const setType = (v) => {
+        setTypeTime(v)
+        if (v === 'day') {
+            setFormData(parameter)
+        } else {
+            setFormData({
+                ...parameter,
+                ...dataTime
+            })
+        }
+    }
     const [getOperationName, setGetOperationName] = useState([])
     const operationName = () => {
         ajax.getAllOperator().then(res => {
@@ -192,20 +205,22 @@ function InspectorWorkStat(props) {
                 </div>
                 <div className="timePicker ">
                     <Space>
-                        <Select value={type} onChange={setType}>
+                        <Select value={typeTime} onChange={setType}>
                             <Option value="day">日</Option>
                             <Option value="month">月</Option>
                         </Select>
                         {
-                            type === 'day' ?
+                            typeTime === 'day' ?
                                 <RangePicker onChange={(value, dateString) => {
                                     setFormData({
                                         ...formData,
                                         start_time: dateString[0],
                                         end_time: dateString[1],
-                                        type: type
+                                        type: typeTime
                                     })
-                                }} /> :
+                                }} 
+                                value={[moment(formData.start_time), moment(formData.end_time)]} 
+                                /> :
                                 <RangePicker picker="month" onChange={(value, dateString) => {
                                     // let first =dateString[0].substr(0,7);
                                     // let timeFirst = new Date(first)
@@ -218,9 +233,11 @@ function InspectorWorkStat(props) {
                                         ...formData,
                                         start_time: dateString[0],
                                         end_time: dateString[1],
-                                        type: type
+                                        type: typeTime
                                     })
-                                }} />
+                                }} 
+                                value={[moment(formData.start_time), moment(formData.end_time)]} 
+                                />
                         }
                     </Space>
                     <div className="btnBox">

src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx

@@ -616,8 +616,8 @@ function DisabledCarParkRecordTotal() {
         setLtcData({
           plate: record.plate,
           change_monet: data.change_monet,
-          actual_amount: record.actual_amount,
-          qf: order_amount,
+          actual_amount: data.actual_amount,
+          qf: data.order_mount,
         })
       } else {
         message.error(res.message)

src/pages/SystemMgm/RoleMgm/loadable.jsx

@@ -186,8 +186,10 @@ function RoleMgm(props) {
         }
         let reg = /^\S*$/;
 
-        if (addManage.name === '' || !reg.test(addManage.name)) {
+        if (addManage.name === '') {
             message.error('请输入角色名称')
+        } else if (!reg.test(addManage.name)) {
+            message.error('角色名称不能输入空格！')
         } else if (addManage.depart_id === '') {
             message.error('请选择所属部门')
         } else if (addManage.auth === '') {