From 1edf31b91e6d2ff666624ec55c02365c5e4a8af1 Mon Sep 17 00:00:00 2001
From: guoxin <guoxin@yisa.com>
Date: Thu, 11 Jan 2024 19:18:27 +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

---
 .../PersonMgm/Performance/SalesStat/loadable.jsx   |   6 +-
 src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx   | 173 +++++++++++++--------
 src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx    |  36 +++--
 .../CallbackSuggestion/loadable.jsx                |   9 +-
 .../Staggered/StaggeredMgm/loadable.jsx            |  20 +--
 .../BusinessConfig/BusinessConf/loadable.jsx       |   7 +-
 6 files changed, 153 insertions(+), 98 deletions(-)

diff --git a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
index 469cdfa..0cca93f 100644
--- a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
@@ -313,8 +313,9 @@ function SalesStat(props) {
   useEffect(() => {
     getData()
   }, [])
-
+const [getTextValue,setGetTextValue]=useState({})
   const onClickData = (item) => {
+    setGetTextValue(item.text);
     setGetValue(item.value);
     setCheckData(item.children)
     setGetTotal(item.total_records)
@@ -401,7 +402,7 @@ function SalesStat(props) {
       footer={null}
       className="revenueModal"
     >
-      <div className="tab-title">{getTabTitle.date}营收情况</div>
+      <div className="tab-title">{getTabTitle.date}营收情况（{getTextValue}）</div>
       <div className="tab-index">
         <div style={{ display: "flex" }}>
           <div style={{ lineHeight: 4 }} className="curpoint" onClick={() => {
@@ -428,6 +429,7 @@ function SalesStat(props) {
                 setGetValue(getValue + 1)
                 let Arritem = getTabData.filter((item) => item.value == getValue + 1)[0]
                 setTextL(Arritem.text.length)
+                setGetTextValue(Arritem.text)
                 console.log(textL);
                 setCheckData(Arritem.children)
                 setGetTotal(Arritem.total_records)
diff --git a/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx b/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx
index 8e23645..e1b200c 100644
--- a/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx
+++ b/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx
@@ -18,10 +18,10 @@ function ModelConf(props) {
         export_url: '',
         process_url: ""
     })
-    const parameter={
+    const parameter = {
         model_id: '0',//物品类型
         operator_id: '0',//商户名称
-        model_name:'',
+        model_name: '',
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
     }
@@ -32,17 +32,35 @@ function ModelConf(props) {
     const [editVisible, setEditVisible] = useState(false)
     const [addVisible, setAddVisible] = useState(false)
     const [deleteVisible, setDeleteVisible] = useState(false)
+    const [getModal, setGetModal] = useState(true)
+    const [getChange, setGetChange] = useState(true)
     //物品类型
     const handleOperator = (v) => {
         setFormData({ ...formData, model_id: v })
     }
     //商户名称
     const handleDeployType = (value) => {
-        setFormData({ ...formData, operator_id: value })
+        setFormData({ ...formData, operator_id: value, model_id: '' })
+        setGetModal(false)
     }
     const handleLoginName = (v) => {
         setFormData({ ...formData, model_name: v.target.value })
     }
+    const [getOperationName, setGetOperationName] = useState([])
+    const [getNewOperationName, setNewGetOperationName] = useState([])
+    useEffect(() => {
+        if (formData.operator_id) {
+            let data = {
+                operator_id: formData.operator_id
+            }
+            ajax.assetsType(data).then(res => {
+                let arr = res.data
+                let newArr = arr.slice(1)
+                setGetOperationName(res.data)
+                setNewGetOperationName(newArr)
+            })
+        }
+    }, [formData.operator_id])
     //列表
     const handleColumns = (tab) => {
         let result = [...deployListColumns];
@@ -106,9 +124,9 @@ function ModelConf(props) {
     const checkModal = () => {
         setCheckVisible(false)
     }
-    const [getRecord,setGetRecord]=useState({})
-    const deleteModalBtn=()=>{
-        let data ={
+    const [getRecord, setGetRecord] = useState({})
+    const deleteModalBtn = () => {
+        let data = {
             id: getRecord
         }
         ajax.brandDeleteData(data).then((res) => {
@@ -116,7 +134,7 @@ function ModelConf(props) {
                 message.success('删除成功')
                 setDeleteVisible(false)
                 getData(formData)
-            }else{
+            } else {
                 message.error(res.message)
             }
         })
@@ -130,7 +148,7 @@ function ModelConf(props) {
         name: '',
         brand_name: '',
         remarks: '',
-        model_name:''
+        model_name: ''
     })
     const translateBtn = (record) => {
         setGetRecord(record.id)
@@ -150,7 +168,7 @@ function ModelConf(props) {
         setFormData({
             ...parameter
         })
-        getData({...parameter,pn: 1} )
+        getData({ ...parameter, pn: 1 })
     }
     const handleDetail = () => {
         let result = [...handleDeColumns];
@@ -211,16 +229,16 @@ function ModelConf(props) {
     const changePn = (pn, length) => {
         if (formData.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 }))
         }
     }
     //切换每页条数
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn,page_size: length })
+        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn, page_size: length })
         getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
@@ -231,16 +249,15 @@ function ModelConf(props) {
         })
         getData(Object.assign({}, formData, { pn: 1 }))
     }
-    const [getOperationName, setGetOperationName] = useState([])
-    const name = () => {
-        ajax.assetsType().then(res => {
-            setGetOperationName(res.data)
-        })
-    }
+
     const [getMerchantDataName, setGetMerchantDataName] = useState([])
+    const [getNewMerchantDataName, setGetNewMerchantDataName] = useState([])
     const merchantDataName = () => {
         ajax.getOperator().then(res => {
+            let arr = res.data
+            let newArr = arr.slice(1)
             setGetMerchantDataName(res.data)
+            setGetNewMerchantDataName(newArr)
         })
     }
     //添加
@@ -254,13 +271,31 @@ function ModelConf(props) {
         name: '',
         brand_name: '',
         remarks: '',
-        model_name:''
+        model_name: ''
     }
     const [checkData, setCheckData] = useState(param)
     //商户名称
+    const [getOperatorValue, setGetOperatorValue] = useState('')
     const handleAddDeployType = (value) => {
-        setCheckData({ ...checkData, name: value })
+        setGetOperatorValue(value)
+        if (value) {
+            setGetChange(false)
+        }
+        setCheckData({ ...checkData, name: value, brand_name: '' })
     }
+    useEffect(() => {
+        if (getOperatorValue != '') {
+            let data = {
+                operator_id: getOperatorValue
+            }
+            ajax.assetsType(data).then(res => {
+                let arr = res.data
+                let newArr = arr.slice(1)
+                setGetOperationName(res.data)
+                setNewGetOperationName(newArr)
+            })
+        }
+    }, [getOperatorValue])
     //物品编号
     const handleAddLoginName = (v) => {
         setCheckData({ ...checkData, remarks: v.target.value })
@@ -278,9 +313,9 @@ function ModelConf(props) {
         }
         if (checkData.name == '') {
             message.error('请选择商户')
-        } else if (checkData.brand_name =='') {
+        } else if (checkData.brand_name == '') {
             message.error('请选择所属类型')
-        }else if (checkData.model_name == '') {
+        } else if (checkData.model_name == '') {
             message.error('请输入型号名称')
         } else {
             ajax.brandData(data).then((res) => {
@@ -299,9 +334,9 @@ function ModelConf(props) {
         }
         if (getEditData.name == '') {
             message.error('请选择商户')
-        } else if (getEditData.brand_name =='') {
+        } else if (getEditData.brand_name == '') {
             message.error('请选择所属类型')
-        }else if (getEditData.model_name == '') {
+        } else if (getEditData.model_name == '') {
             message.error('请输入型号名称')
         } else {
             ajax.brandEditData(data).then((res) => {
@@ -321,29 +356,28 @@ function ModelConf(props) {
     const deleteModal = () => {
         setDeleteVisible(false)
     }
-    const [sessionTabList, setSessionTabList] = useSessionStorageState('modelConf', {
-        value: {
-        }
-    })
-    useEffect(() => {
-        if (sessionTabList && Object.values(sessionTabList).length > 0) {
-            setFormData({
-                model_id: sessionTabList?.model_id,
-                operator_id: sessionTabList?.operator_id,
-                model_name: sessionTabList?.model_name,
-                pn: sessionTabList?.pn,
-                page_size: sessionTabList?.page_size,
-            })
-        }
-    }, [])
-    useEffect(() => {
-        setSessionTabList({
-            ...formData
-        })
-    }, [formData])
+    // const [sessionTabList, setSessionTabList] = useSessionStorageState('modelConf', {
+    //     value: {
+    //     }
+    // })
+    // useEffect(() => {
+    //     if (sessionTabList && Object.values(sessionTabList).length > 0) {
+    //         setFormData({
+    //             model_id: sessionTabList?.model_id,
+    //             operator_id: sessionTabList?.operator_id,
+    //             model_name: sessionTabList?.model_name,
+    //             pn: sessionTabList?.pn,
+    //             page_size: sessionTabList?.page_size,
+    //         })
+    //     }
+    // }, [])
+    // useEffect(() => {
+    //     setSessionTabList({
+    //         ...formData
+    //     })
+    // }, [formData])
     useEffect(() => {
         getData()
-        name()
         merchantDataName()
     }, [])
     return <>
@@ -364,6 +398,7 @@ function ModelConf(props) {
                     <label>物品类型</label>
                     <Select
                         style={{ width: 220 }}
+                        disabled={getModal}
                         value={formData.model_id}
                         options={getOperationName}
                         onChange={handleOperator}
@@ -380,14 +415,14 @@ function ModelConf(props) {
                 </div>
                 <div className="timePicker yisa-search">
                     <div className="btnBox">
-                        <Button  className="yisa-btn colorReset reset"  onClick={() => { getResetData() }}>
+                        <Button className="yisa-btn colorReset reset" onClick={() => { getResetData() }}>
                             重置
                         </Button>
-                        <Button type="primary" className="yisa-btn colorBtn submit"  onClick={() => { getSearchData() }}>
-                        查询
+                        <Button type="primary" className="yisa-btn colorBtn submit" onClick={() => { getSearchData() }}>
+                            查询
                         </Button>
-                        
-                        
+
+
                     </div>
                 </div>
             </div>
@@ -457,27 +492,28 @@ function ModelConf(props) {
         >
             <div className="add">
                 <div className="yisa-search">
-                <div className="redLogo">*</div>
+                    <div className="redLogo">*</div>
                     <label>所属商户</label>
                     <Select
                         style={{ width: 180, marginLeft: 20 }}
                         value={checkData.name}
-                        options={getMerchantDataName}
+                        options={getNewMerchantDataName}
                         onChange={handleAddDeployType}
                     />
                 </div>
                 <div className="yisa-search">
-                <div className="redLogo">*</div>
+                    <div className="redLogo">*</div>
                     <label>所属类型</label>
                     <Select
-                        value={checkData.model_id}
+                        value={checkData.brand_name}
+                        disabled={getChange}
                         style={{ width: 180, marginLeft: 20 }}
-                        options={getOperationName}
+                        options={getNewOperationName}
                         onChange={handleAddOperator}
                     />
                 </div>
                 <div className="yisa-search">
-                <div className="redLogo">*</div>
+                    <div className="redLogo">*</div>
                     <label>型号名称</label>
                     <Input
                         placeholder="请输入"
@@ -486,7 +522,7 @@ function ModelConf(props) {
                         onChange={handleAssetsTypeName}
                     />
                 </div>
-                <div className="yisa-search" style={{marginLeft:15}}>
+                <div className="yisa-search" style={{ marginLeft: 15 }}>
                     <label>备注</label>
                     <TextArea
                         placeholder="请输入"
@@ -513,26 +549,31 @@ function ModelConf(props) {
         >
             <div className="add">
                 <div className="yisa-search">
-                <div className="redLogo">*</div>
+                    <div className="redLogo">*</div>
                     <label>所属商户</label>
                     <Select
                         style={{ width: 180, marginLeft: 20 }}
                         value={getEditData.name}
-                        options={getMerchantDataName}
+                        options={getNewMerchantDataName}
                         onChange={(value) => {
+                            setGetOperatorValue(value)
+                            if (value) {
+                                setGetChange(false)
+                            }
                             setGetEditData(
-                                Object.assign({}, getEditData, { name: value })
+                                Object.assign({}, getEditData, { name: value, brand_name: '' })
                             );
                         }}
                     />
                 </div>
                 <div className="yisa-search">
-                <div className="redLogo">*</div>
+                    <div className="redLogo">*</div>
                     <label>所属类型</label>
                     <Select
                         value={getEditData.brand_name}
                         style={{ width: 180, marginLeft: 20 }}
-                        options={getOperationName}
+                        options={getNewOperationName}
+                        disabled={getChange}
                         onChange={(v) => {
                             setGetEditData(
                                 Object.assign({}, getEditData, { brand_name: v })
@@ -541,7 +582,7 @@ function ModelConf(props) {
                     />
                 </div>
                 <div className="yisa-search">
-                <div className="redLogo">*</div>
+                    <div className="redLogo">*</div>
                     <label>型号名称</label>
                     <Input
                         placeholder="请输入"
@@ -549,12 +590,12 @@ function ModelConf(props) {
                         style={{ width: 180, marginLeft: 20 }}
                         onChange={(v) => {
                             setGetEditData(
-                                Object.assign({}, getEditData, { model_name: v.target.value  })
+                                Object.assign({}, getEditData, { model_name: v.target.value })
                             );
                         }}
                     />
                 </div>
-                <div className="yisa-search" style={{marginLeft:15}}> 
+                <div className="yisa-search" style={{ marginLeft: 15 }}>
                     <label>备注</label>
                     <TextArea
                         placeholder="请输入"
diff --git a/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx b/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
index 278a703..537149a 100644
--- a/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
@@ -64,16 +64,19 @@ function StuffMgm(props) {
         setFormData({ ...formData, operatorid: value })
     }
     //区域
-    const onChangeList = (value) => {
-        // // console.log(value);
-        // let arr = value
-        // let arrStr = []
-        // let newArr = arr[arr.length - 1]
-        // arrStr.push(newArr)
-        // console.log(arrStr);
+    const [getOption,setGetOption]=useState(['0'])
+    const onChangeList = (value,options) => {
+        let res = [];
+        if (options) {
+          let last = options[options.length - 1];
+          if (last.children) {
+            addChild(last, res);
+          }
+          res.push(last.id);
+        }
+        setGetOption(res)
         setFormData({ ...formData, region_id: value })
     }
-
     //状态
     const handleStatus = (v) => {
         setFormData({ ...formData, status: v })
@@ -348,12 +351,19 @@ function StuffMgm(props) {
             key: 'use_name',
         },
     ]
+    const addChild = (child, res) => {
+        if (child.children) {
+          child.children.forEach((item) => {
+            addChild(item, res);
+          });
+        } else {
+          res.push(child.id);
+        }
+      };
     // 获取列表数据
     const getData = (data = formData) => {
         setAjaxLoading(true)
-        let arr = data.region_id
-        let newArr = arr[arr.length - 1];
-        ajax.assetsList({ ...data}).then(res => {
+        ajax.assetsList({ ...data,region_id:getOption}).then(res => {
             setAjaxLoading(false)
             if (res.status === 20000) {
                 utils.tableScrollTop()
@@ -458,7 +468,9 @@ function StuffMgm(props) {
         if (value) {
             setGetOperatorid(false)
         }
-        setCheckData({ ...checkData, operatorid: value, brand_id: '' })
+        setCheckData({ ...checkData, operatorid: value, brand_id: '',model_id:'' })
+        setNewGetOperationName([])
+        setNewGetAssetsModel([])
     }
     //物品编号
     const handleAddLoginName = (v) => {
diff --git a/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx b/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx
index 0176dcd..24a5e7b 100644
--- a/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx
+++ b/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx
@@ -438,7 +438,8 @@ function CallbackSuggestion(props) {
         change_content: '',
         update_value: '',
         plate_type: '',
-        deal_reason: ''
+        deal_reason: '',
+        adjustTime:1
     })
     //提交审核
     const onChangeReason = (value) => {
@@ -937,7 +938,7 @@ function CallbackSuggestion(props) {
                     <div className="title">处理方式</div>
                     <div className="yisa-search">
                         <div className="redLogo">*</div>
-                        <label>更改项</label>
+                        <label style={{width:56}}> 更改项</label>
                         <Select
                             style={{ width: 200 }}
                             placeholder="请选择"
@@ -969,7 +970,7 @@ function CallbackSuggestion(props) {
                         />
                         {getValueList === 1 ?
                             <>
-                                <label style={{ marginLeft: 30 }}>调整基于：</label>
+                                <label  style={{width:76,marginLeft: 30 }}>调整基于：</label>
                                 <Select
                                     style={{ width: 200 }}
                                     placeholder="请选择"
@@ -988,7 +989,7 @@ function CallbackSuggestion(props) {
                                     onChange={handleAdjust}
                                 />
                                 <div className="redLogo" style={{ marginLeft: 30 }}>*</div>
-                                <label >调整为：</label>
+                                <label  style={{width:60}}>调整为：</label>
                                 {
                                     getAdjustTimeValue === 1 ?
                                         <DatePicker
diff --git a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx
index be7463a..b1859b0 100644
--- a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx
@@ -36,8 +36,8 @@ function StaggeredMgm(props) {
     const [editVisible, setEditVisible] = useState(false)
     const [addVisible, setAddVisible] = useState(false)
     let infoData = {
-        start_date: moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD'),
-        end_date: moment().format('YYYY-MM-DD'),
+        start_date: moment().format('YYYY-MM-DD'),
+        end_date: moment().subtract(-30, 'days').startOf('day').format('YYYY-MM-DD'),
         start_time: '00:00:00',
         end_time: '23:59:59',
         week: '',
@@ -895,9 +895,9 @@ function StaggeredMgm(props) {
                         />
                     </div>
                 </div>
-                <div>
+                {/* <div>
                     <PlusCircleOutlined style={{ fontSize: 34, marginRight: 64, color: "#409eff", cursor: "pointer" }} onClick={getSale} />
-                </div>
+                </div> */}
             </div>
 
             {getSaleMsg && getSaleMsg.length ?
@@ -1005,11 +1005,11 @@ function StaggeredMgm(props) {
                                         </TextArea>
                                     </div>
                                 </div>
-                                <div>
+                                {/* <div>
                                     <CloseCircleOutlined
                                         style={{ fontSize: 34, marginRight: 64, color: "#d9001b", cursor: "pointer" }}
                                         onClick={() => deleteSale(item, index)} />
-                                </div>
+                                </div> */}
                             </div>
                         </>
                     )
@@ -1084,9 +1084,9 @@ function StaggeredMgm(props) {
                         />
                     </div>
                 </div>
-                <div>
+                {/* <div>
                     <PlusCircleOutlined style={{ fontSize: 34, marginRight: 64, color: "#409eff", cursor: "pointer" }} onClick={getSale} />
-                </div>
+                </div> */}
             </div>
 
             {getSaleMsg && getSaleMsg.length ?
@@ -1198,11 +1198,11 @@ function StaggeredMgm(props) {
                                         </TextArea>
                                     </div>
                                 </div>
-                                <div>
+                                {/* <div>
                                     <CloseCircleOutlined
                                         style={{ fontSize: 34, marginRight: 64, color: "#d9001b", cursor: "pointer" }}
                                         onClick={() => deleteSale(item, index)} />
-                                </div>
+                                </div> */}
                             </div>
                         </>
                     )
diff --git a/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx b/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx
index f424190..2540295 100644
--- a/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx
+++ b/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx
@@ -355,8 +355,6 @@ function BusinessConf(props) {
         setGetMessage({})
     }
     const cancelImg = () => {
-
-        setEditVisible(false)
         setPasswordVisible(false)
 
     }
@@ -412,6 +410,7 @@ function BusinessConf(props) {
     //编辑关闭
     const editModal = () => {
         setEditVisible(false)
+        setGetMessage(0)
     }
     //编辑提交
     const placeEditBtn = () => {
@@ -855,7 +854,7 @@ function BusinessConf(props) {
                             </Radio.Group>
                         </div>
                 }
-                <div className="font-size" dangerouslySetInnerHTML={{ __html: showMessage?.message || showMessage }}>
+                <div className="font-size" dangerouslySetInnerHTML={{ __html: getMessage?.parameter_dsc || getMessage?.message  }}>
                     {/* {getMessage.message} */}
                 </div>
             </div>
@@ -863,7 +862,7 @@ function BusinessConf(props) {
                 <button type="primary" className="submit" onClick={() => { placeEditBtn() }}>
                     提交
                 </button>
-                <button type="primary" className="cancel" onClick={() => { cancelImg() }}>
+                <button type="primary" className="cancel" onClick={() => { editModal() }}>
                     取消
                 </button>
             </div>