From 7fe7cb1eb40e3e169d821540b24590f76aa374d4 Mon Sep 17 00:00:00 2001
From: guoxin <guoxin@yisa.com>
Date: Fri, 5 Jan 2024 10:27:04 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=86=85bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CallbackSuggestion/index.scss                  |  6 ++
 .../CallbackSuggestion/loadable.jsx                | 38 ++++++----
 .../Staggered/StaggeredMgm/loadable.jsx            | 83 +++++++++++++---------
 src/pages/SystemMgm/RoleMgm/loadable.jsx           |  2 +-
 4 files changed, 78 insertions(+), 51 deletions(-)

diff --git a/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/index.scss b/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/index.scss
index e3d321d..5a9327e 100644
--- a/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/index.scss
+++ b/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/index.scss
@@ -385,6 +385,12 @@ $color-primary: var(--color-primary);
       }
     }
     .deal-reason {
+      .logpTip{
+        display: flex;
+        .redLogo{
+          line-height: 44px;
+        }
+      }
       .title {
         font-family:
           PingFangSC-Medium,
diff --git a/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx b/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx
index 36d152f..4c1bdcb 100644
--- a/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx
+++ b/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx
@@ -424,7 +424,7 @@ function CallbackSuggestion(props) {
                     item.key = item.id
                     return item
                 })
-        setOrderVisible(true)
+                setOrderVisible(true)
                 setGetDealData({
                     ...getDealData,
                     data: resDataArr
@@ -448,19 +448,19 @@ function CallbackSuggestion(props) {
     const handleChoose = (value) => {
         setGetValueList(value)
         // setSubmitDeploy({ ...submitDeploy, change_content: value })
-        if(value){
+        if (value) {
             setSubmitDeploy({
                 ...submitDeploy,
                 update_value: '',
                 plate_type: '',
                 change_content: value
-            }) 
+            })
         }
     }
     const [getAdjustTimeValue, setGetAdjustTimeValue] = useState(1)
     const handleAdjust = (value) => {
         setGetAdjustTimeValue(value)
-        submitDeploy.update_value=''
+        submitDeploy.update_value = ''
     }
     const handleAdjustTime = (v, dateString) => {
         setSubmitDeploy({ ...submitDeploy, update_value: dateString })
@@ -497,8 +497,9 @@ function CallbackSuggestion(props) {
             message.error('请输入处理理由')
         } else if (submitDeploy.change_content === '') {
             message.error('请选择对应的更改项')
-        }
-        else {
+        }else if (submitDeploy.update_value === '') {
+            message.error('请输入对应的更改项')
+        }else {
             ajax.submitData(data).then(res => {
                 if (res.status === 20000) {
                     setOrderVisible(false)
@@ -627,10 +628,10 @@ function CallbackSuggestion(props) {
                 </div>
                 <div className="timePicker ">
                     <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 colorReset"  onClick={() => { getResetData() }}>
+                        <Button type="primary" className="yisa-btn colorReset" onClick={() => { getResetData() }}>
                             重置
                         </Button>
                         <Button type="primary" className="yisa-btn colorBtn" onClick={() => { exportData() }}>
@@ -922,7 +923,10 @@ function CallbackSuggestion(props) {
                     <span className="font">异常停车处理信息</span>
                 </div>
                 <div className="deal-reason">
-                    <div className="title">处理理由</div>
+                    <div className="logpTip">
+                        <div className="redLogo">*</div>
+                        <div className="title">处理理由</div>
+                    </div>
                     <TextArea showCount maxLength={30} value={submitDeploy.deal_reason} className="text" onChange={onChangeReason} />
                 </div>
                 <div className="deal-style">
@@ -979,13 +983,14 @@ function CallbackSuggestion(props) {
                                     ]}
                                     onChange={handleAdjust}
                                 />
-                                <label style={{ marginLeft: 30 }}>调整为：</label>
+                                <div className="redLogo" style={{ marginLeft: 30 }}>*</div>
+                                <label >调整为：</label>
                                 {
                                     getAdjustTimeValue === 1 ?
                                         <DatePicker
                                             format="YYYY-MM-DD HH:mm:ss"
                                             placement='topRight'
-                                            value={parseDate(submitDeploy?.update_value,'YYYY-MM-DD HH:mm:ss')}
+                                            value={parseDate(submitDeploy?.update_value, 'YYYY-MM-DD HH:mm:ss')}
                                             style={{ width: 300 }}
                                             showTime
                                             onChange={handleAdjustTime}
@@ -1009,7 +1014,8 @@ function CallbackSuggestion(props) {
                         {
                             getValueList === 2 ?
                                 <>
-                                    <label style={{ marginLeft: 30 }}>车牌号:</label>
+                                    <div className="redLogo" style={{ marginLeft: 30 }}>*</div>
+                                    <label >车牌号:</label>
                                     <Select
                                         style={{ width: 100 }}
                                         placeholder="请选择"
@@ -1028,7 +1034,8 @@ function CallbackSuggestion(props) {
                         }
                         {
                             getValueList === 3 ? <>
-                                <label style={{ marginLeft: 30 }}>增/减:</label>
+                                <div className="redLogo" style={{ marginLeft: 30 }}>*</div>
+                                <label >增/减:</label>
                                 <Select
                                     style={{ width: 100 }}
                                     placeholder="请选择"
@@ -1046,7 +1053,8 @@ function CallbackSuggestion(props) {
                                     ]}
                                     onChange={handleAdd}
                                 />
-                                <label style={{ marginLeft: 30 }}>金额-</label>
+                                <div className="redLogo" style={{ marginLeft: 30 }}>*</div>
+                                <label>金额-</label>
                                 <Input
                                     placeholder="请输入内容"
                                     value={submitDeploy.update_value}
diff --git a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx
index b20eece..a945af4 100644
--- a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx
@@ -99,7 +99,7 @@ function StaggeredMgm(props) {
     }
     //商户名称
     const handleDeployType = (value) => {
-        setFormData({ ...formData, operator_id: value, road:''})
+        setFormData({ ...formData, operator_id: value, road: '' })
         setGetOperatorId(value)
         setGetRoadName([])
     }
@@ -297,7 +297,8 @@ function StaggeredMgm(props) {
     const handleAddDeployType = (value) => {
         setGetCarMsg({
             ...getCarMsg,
-            operator_id: value
+            operator_id: value,
+            road: ''
         })
         setGetOperatorId(value)
         setData([])
@@ -400,45 +401,57 @@ function StaggeredMgm(props) {
     }
     const placeSaveBtn = () => {
         let infoArr = [...getSaleMsg]
-        infoArr.map((item, index) => {
-            let data = {
-                ...getCarMsg,
-                info: infoArr
-            }
-            if (getCarMsg.operator_id === '') {
-                message.error('请选择所属商户')
-            } else if (getCarMsg.road === '') {
-                message.error('请输入车场名称')
-            } else if (item?.start_date === '' || item?.end_date === '') {
+        if (!getCarMsg.operator_id) {
+            message.error('请选择所属商户')
+            return
+        }
+        if (!getCarMsg.road) {
+            message.error('请输入车场名称')
+            return
+        }
+        for (var result = 0; result < infoArr.length; result++) {
+            console.log(infoArr[result]);
+            if (!infoArr[result]?.start_date || !infoArr[result]?.end_date) {
                 message.error('请选择错峰日期')
-            } else if (item?.start_time === '' || item?.end_time === '') {
+                return
+            }
+            if (!infoArr[result]?.start_time || !infoArr[result]?.end_time) {
                 message.error('请选择错峰时间')
-            } else if (item?.num === '') {
+                return
+            }
+            if (!infoArr[result]?.num) {
                 message.error('请输入错峰卡数量')
-            } else if (item?.price === '') {
+                return
+            }
+            if (!infoArr[result]?.price) {
                 message.error('请输入销售价格')
-            } else {
-                if (item.week.length != []) {
-                    item.week = item.week.join(',')
-                }
-                ajax.getAddStaggered(data).then(res => {
-                    if (res.status === 20000) {
-                        message.success(res.message)
-                        setAddVisible(false)
-                        setGetCarMsg({
-                            operator_id: ''
-                        })
-                        setValue({})
-                        getData(formData)
-                        setGetOperatorId('')
-                        setGetSaleMsg([infoData])
-                    } else {
-                        message.error(res.message)
-                    }
+                return
+            }
+            if (!infoArr[result].week.length) {
+                message.error('请选择星期配置')
+                return
+            }
+            infoArr[result].week = infoArr[result].week.join(',')
+        }
+        let data = {
+            ...getCarMsg,
+            info: infoArr
+        }
+        ajax.getAddStaggered(data).then(res => {
+            if (res.status === 20000) {
+                message.success(res.message)
+                setAddVisible(false)
+                setGetCarMsg({
+                    operator_id: ''
                 })
+                setValue({})
+                getData(formData)
+                setGetOperatorId('')
+                setGetSaleMsg([infoData])
+            } else {
+                message.error(res.message)
             }
         })
-
     }
     const checkStaggeredBtn = () => {
         setCheckVisible(false)
@@ -615,7 +628,7 @@ function StaggeredMgm(props) {
         </div>
         <Modal
             visible={checkVisible}
-            onCancel={checkModal}
+            onCancel={checkStaggeredBtn}
             footer={null}
             className="roadModal"
         >
diff --git a/src/pages/SystemMgm/RoleMgm/loadable.jsx b/src/pages/SystemMgm/RoleMgm/loadable.jsx
index 0d19bd0..b761cbd 100644
--- a/src/pages/SystemMgm/RoleMgm/loadable.jsx
+++ b/src/pages/SystemMgm/RoleMgm/loadable.jsx
@@ -754,7 +754,7 @@ function RoleMgm(props) {
                     <Cascader
                         style={{ width: 260, marginLeft: 50 }}
                         placeholder="请选择"
-                        value={getAdminId.depart_id}
+                        value={getAdminId.depart_arr}
                         options={getPlateColor}
                         changeOnSelect
                         onChange={(v) => {