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

src/components/TableModule/index.jsx

@@ -272,7 +272,7 @@ const TableModule = forwardRef((props, ref) => {
     setFormData({ ...searchForm.getFieldsValue(), plateValue: '' })
     //search({ ...searchForm.getFieldsValue() })
     setTimeGroup({
-      timeType: '',
+      timeType: '1',
       timeRanges: {
         start_time: moment().subtract(1, "day").format('YYYY-MM-DD 00:00:00'),
         end_time: moment().format("YYYY-MM-DD 23:59:59"),

src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx

@@ -473,8 +473,8 @@ function CollectorWorkStat(props) {
         } else {
             fileList.map(res => {
                 imgUrl.push(res.response?.data)
-                getImage.map(item => {
-                    imgUrl.push(item)
+                getImage?.map(item => {
+                    imgUrl?.push(item)
                 })
             })
         }

src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx

@@ -65,11 +65,11 @@ function Fence(props) {
         // }
         let res = [];
         if (options) {
-          let last = options[options.length - 1];
-          if (last.children) {
-            addChild(last, res);
-          }
-          res.push(last.id);
+            let last = options[options.length - 1];
+            if (last.children) {
+                addChild(last, res);
+            }
+            res.push(last.id);
         }
         console.log(res);
         setAreaSelectedList(res);
@@ -157,7 +157,7 @@ function Fence(props) {
         key: 'attendDistance',
         render: (text, record) => {
             return <>
-                <div >{record.attendDistance == '1' ? '无电子围栏' : '指定范围'}</div>
+                <div >{record.attendmin == '' ? '无电子围栏' : record.attendmin + '米'}</div>
             </>
         }
     },
@@ -246,9 +246,9 @@ function Fence(props) {
     }
     //检索数据
     const getSearchData = (data = formData) => {
-        setFormData(Object.assign({}, formData, { pn: 1}))
+        setFormData(Object.assign({}, formData, { pn: 1 }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1 }))
-        getData({...data, pn: 1})
+        getData({ ...data, pn: 1 })
     }
     //批量设置
     const setUp = () => {
@@ -283,7 +283,7 @@ function Fence(props) {
         setGetEditModal({ ...getEditModal, attendDistance: v })
         setGetMap(v)
         if (v === '1') {
-            setGetEditModal({ ...getEditModal, attendDistance: v ,attendmin:''})
+            setGetEditModal({ ...getEditModal, attendDistance: v, attendmin: '' })
         }
     }
     //有效范围输入区间
@@ -317,8 +317,9 @@ function Fence(props) {
         console.log(reg.test(getModalData.attendmin));
         if (getModalData.attendmin === '' && getStatus == '2') {
             message.error('请输入有效范围')
-        } else if (!reg.test(getModalData.attendmin)) {
-            message.error('有效范围输入区间为[100,2000]')
+            if (!reg.test(getModalData.attendmin)) {
+                message.error('有效范围输入区间为[100,2000]')
+            }
         } else if (getScopeValue === '2' && targetKeys.length === 0) {
             message.error('请选择停车场')
         } else {
@@ -487,8 +488,8 @@ function Fence(props) {
                 </div>
                 <div className="timePicker yisa-search">
                     <div className="btnBox">
-                        <Button type="primary" className="yisa-btn colorBtn"  onClick={() => { getSearchData() }}>
-                        查询
+                        <Button type="primary" className="yisa-btn colorBtn" onClick={() => { getSearchData() }}>
+                            查询
                         </Button>
                         <Button type="primary" className="yisa-btn colorBtn" onClick={() => { setUp() }}>
                             批量设置

src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/loadable.jsx

@@ -330,6 +330,8 @@ function ScheduleMgm(props) {
         setDeleteVisible(false);
         message.success("删除成功");
         getData(formData);
+      }else{
+        message.error(res.message)
       }
     });
   };

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

@@ -110,8 +110,11 @@ function SalesStat(props) {
   },
   {
     title: '收费员',
-    dataIndex: 'sf_name',
-    key: 'sf_name',
+    align: "center",
+    width: 300,
+    render: (text, record, index) => (
+      <div style={{ width: "300px", wordBreak: "break-all" }}>{record.sf_name}</div>
+    )
   },
   {
     title: '月份',
@@ -267,9 +270,9 @@ function SalesStat(props) {
   }
   //检索数据
   const getSearchData = (data = formData) => {
-    setFormData(Object.assign({}, formData, { pn: 1}))
+    setFormData(Object.assign({}, formData, { pn: 1 }))
     setLastFormData(Object.assign({}, lastFormData, { pn: 1 }))
-    getData({...data, pn: 1})
+    getData({ ...data, pn: 1 })
   }
 
   const exportModal = () => {

src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx

@@ -263,6 +263,7 @@ const ConfigRoad = (props) => {
         if (info.file.status === "done") {
           if (info.file.response.status === 20000) {
             message.success(`${info.file.name} 上传成功`);
+            formRef.current.getList();
           } else {
             message.error(info.file.response.message);
           }
@@ -476,6 +477,7 @@ const ConfigRoad = (props) => {
         if (info.file.status === "done") {
           if (info.file.response.status === 20000) {
             message.success(`${info.file.name} 上传成功`);
+            formRef.current.getList();
           } else {
             message.error(info.file.response.message);
           }
@@ -649,6 +651,7 @@ const ConfigRoad = (props) => {
         if (info.file.status === "done") {
           if (info.file.response.status === 20000) {
             message.success(`${info.file.name} 上传成功`);
+            formRef.current.getList();
           } else {
             message.error(info.file.response.message);
           }
@@ -1951,8 +1954,7 @@ const ConfigRoad = (props) => {
           </p>
           <p>2.请选择上传文件，并上传。</p>
           <Upload {...currentObj.importProps} beforeUpload={beforeUpload}>
-            <Button type="primaryimport { pages } from '@/pages';
-" icon={<UploadOutlined />}>
+            <Button type="primaryimport { pages } from '@/pages';" icon={<UploadOutlined />}>
               上传
             </Button>
           </Upload>

src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx

@@ -104,7 +104,7 @@ function CategroyConf(props) {
             id: getRecord
         }
         ajax.saveGoodDeleteData(data).then((res) => {
-            if (res.status = 20000) {
+            if (res.status === 20000) {
                 message.success('删除成功')
                 setDeleteVisible(false)
                 getData(formData)

src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx

@@ -468,20 +468,38 @@ function StaggeredMgm(props) {
             ...getCarMsg,
             info: infoArr
         }
-        if (getEditData.operator_id === undefined) {
-            message.error('请选择所属商户')
-        } else if (getEditData.road === undefined) {
-            message.error('请输入车场名称')
-        } else {
-            ajax.getEditStaggered(data).then(res => {
-                if (res.status === 20000) {
-                    message.success(res.message)
-                    setEditVisible(false)
-                } else {
-                    message.error(res.message)
-                }
-            })
+        for (var result = 0; result < infoArr.length; result++) {
+            console.log(infoArr[result]);
+            if (!infoArr[result]?.start_date || !infoArr[result]?.end_date) {
+                message.error('请选择错峰日期')
+                return
+            }
+            if (!infoArr[result]?.start_time || !infoArr[result]?.end_time) {
+                message.error('请选择错峰时间')
+                return
+            }
+            if (!infoArr[result]?.num) {
+                message.error('请输入错峰卡数量')
+                return
+            }
+            if (!infoArr[result]?.price) {
+                message.error('请输入销售价格')
+                return
+            }
+            if (!infoArr[result].week.length) {
+                message.error('请选择星期配置')
+                return
+            }
+            infoArr[result].week = infoArr[result].week.join(',')
         }
+        ajax.getEditStaggered(data).then(res => {
+            if (res.status === 20000) {
+                message.success(res.message)
+                setEditVisible(false)
+            } else {
+                message.error(res.message)
+            }
+        })
     }
     const placeBtn = () => {
         setEditVisible(false)

src/pages/SystemMgm/AdminMgm/loadable.jsx

@@ -136,6 +136,7 @@ function AdminMgm(props) {
                 console.log(res);
                 if (res.status === 20000) {
                     setAddManage(Object.assign({},addManage,{
+                        deptName: v,
                         government_style:res.data.control_type,
                         government_area:res.data.control_area
                     }))

src/pages/SystemMgm/RoleMgm/loadable.jsx

@@ -135,7 +135,7 @@ function RoleMgm(props) {
             console.log(arr);
             setGetCheckVlue(true)
             // getCheckValue
-            setGetAdminId({ ...getAdminId, auth: string })
+            setGetImg({ ...getImg, auth: string })
         } else {
             setCheckedKeys([])
         }
@@ -277,19 +277,15 @@ function RoleMgm(props) {
             }
         }]
     //图片   
-    // const [getAdminId, setGetAdminId] = useState({
-    //     remark: '',
-    //     name: '',
-    //     depart_id: '',
-    //     auth: ''
-    // })
-    const [getAdminId, setGetAdminId] = useState({
+    const [getImg, setGetImg] = useState({
         remark: '',
         name: '',
         depart_id: '',
         auth: ''
     })
+    const [getAdminId, setGetAdminId] = useState({})
     const [getAuthId, setGetAuthId] = useState({})
+    const [getDepart, setGetDepart] = useState([])
     //编辑
     const CheckApplyBtn = (record) => {
         setEditVisible(true)
@@ -303,15 +299,17 @@ function RoleMgm(props) {
             if (res.status === 20000) {
                 setEditVisible(true)
                 setGetAdminId(res.data)
-
+                let str=res.data.depart_arr
+                let arr = str.split(',');
+                setGetDepart(arr)
             }
         })
         let str = record.auth
         let strArr = str.split(",");
         let num = strArr.map(Number)
         setCheckedKeys(num)
-        // let newArr = record.depart_arr.split(',')
-        // setGetAdminId(Object.assign({}, getAdminId, {
+        let newArr = record.depart_arr.split(',')
+        // setGetImg(Object.assign({}, getImg, {
         //     name: record.name,
         //     remark: record.remark,
         //     depart_id: newArr
@@ -321,7 +319,7 @@ function RoleMgm(props) {
         }
 
     }
-    console.log(getAdminId);
+    console.log(getImg);
     //所属类型
     const [getPlateColor, setGetPlateColor] = useState([])
     const plateColor = () => {
@@ -457,20 +455,20 @@ function RoleMgm(props) {
     const placeEditBtn = () => {
         let arr = checkedKeys
         let str = arr.toString()
-        let arrStr = getAdminId.depart_id
+        let arrStr = getImg.depart_id
         let lastElement = arrStr[arrStr.length - 1];
         let data = {
-            ...getAdminId,
+            ...getImg,
             auth: str,
             id: getAdminId.id,
             depart_id: lastElement,
             depart_arr: arrStr.toString()
         }
 
-        if (getAdminId.name == "") {
+        if (getImg.name == "") {
             message.error('角色名称不能为空')
             return
-        } else if (getAdminId.depart_id == "") {
+        } else if (getImg.depart_id == "") {
             message.error('请选择所属部门')
             return
         }
@@ -481,7 +479,7 @@ function RoleMgm(props) {
                 getData(formData)
                 setGetGovernment(0)
                 setGetAuthId({})
-                setGetAdminId({
+                setGetImg({
                     remark: '',
                     name: '',
                     depart_id: '',
@@ -729,8 +727,8 @@ function RoleMgm(props) {
                         value={getAdminId.name}
                         style={{ width: 260, marginLeft: 50 }}
                         onChange={(v) => {
-                            setGetAdminId(
-                                Object.assign({}, getAdminId, { name: v.target.value })
+                            setGetImg(
+                                Object.assign({}, getImg, { name: v.target.value })
                             );
                         }}
                     />
@@ -742,8 +740,8 @@ function RoleMgm(props) {
                         value={getAdminId.remark}
                         style={{ width: 260, marginLeft: 78 }}
                         onChange={(v) => {
-                            setGetAdminId(
-                                Object.assign({}, getAdminId, { remark: v.target.value })
+                            setGetImg(
+                                Object.assign({}, getImg, { remark: v.target.value })
                             );
                         }}
                     />
@@ -754,12 +752,12 @@ function RoleMgm(props) {
                     <Cascader
                         style={{ width: 260, marginLeft: 50 }}
                         placeholder="请选择"
-                        value={getAdminId.depart_arr}
+                        value={getDepart}
                         options={getPlateColor}
                         changeOnSelect
                         onChange={(v) => {
-                            setGetAdminId(
-                                Object.assign({}, getAdminId, { depart_id: v })
+                            setGetImg(
+                                Object.assign({}, getImg, { depart_id: v })
                             );
                             setGetAuthId({})
                             let arrStr = v
@@ -781,8 +779,8 @@ function RoleMgm(props) {
                             style={{ width: 260, marginLeft: 14 }}
                             defaultSelectedKeys={checkedKeys}
                             onCheck={(checkedKeysValue, info) => {
-                                setGetAdminId(
-                                    Object.assign({}, getAdminId, { auth: checkedKeysValue })
+                                setGetImg(
+                                    Object.assign({}, getImg, { auth: checkedKeysValue })
                                 );
                                 setCheckedKeys(checkedKeysValue)
                             }}