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

src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx

@@ -273,10 +273,11 @@ function CallbackSuggestion(props) {
     const [repairData, setRepairData] = useState({})
     const handleCancel = () => setPreviewOpen(false);
     const [fileList, setFileList] = useState([])
+    console.log(fileList);
     const imgData = () => {
         let imgUrl = []
         fileList.map(res => {
-            imgUrl.push(res.name)
+            imgUrl.push(res.response?.data)
         })
         setRepairData(
             Object.assign({}, repairData, { image: imgUrl })
@@ -345,7 +346,7 @@ function CallbackSuggestion(props) {
     const handleDeal = () => {
         setOrderVisible(true)
         let data = {
-            iparkRecordId: getImg.parkRecordId
+            id: getImg.parkRecordId
         }
         ajax.dealData(data).then(res => {
             if (res.status === 20000) {
@@ -484,6 +485,7 @@ function CallbackSuggestion(props) {
                     <label>最后信息时间</label>
                     <Space direction="vertical" size={12}>
                         <RangePicker
+                           value={[moment(formData.start_time), moment(formData.end_time)]}
                             showTime={{
                                 format: 'HH:mm:ss',
                             }}

src/pages/OperationCenter/CustomerServieMgm/ComplaintMgm/loadable.jsx

@@ -229,15 +229,8 @@ function ComplaintMgm(props) {
         getData({ ...parameter })
     }
 
-    const [getPlateColor, setGetPlateColor] = useState([])
-    const plateColor = () => {
-        ajax.colorList().then(res => {
-            setGetPlateColor(res.data)
-        })
-    }
     useEffect(() => {
         getData()
-        plateColor()
     }, [])
     return <>
         <div className="paid-ComplaintMgm">
@@ -276,7 +269,7 @@ function ComplaintMgm(props) {
                         style={{ width: 270 }}
                         placeholder="请选择"
                         value={formData.plateColor}
-                        options={getPlateColor}
+                        options={sysConfig.plateColor}
                         onChange={handlePlateColor}
                     />
                 </div>
@@ -310,6 +303,7 @@ function ComplaintMgm(props) {
                     <label>申诉时间</label>
                     <Space direction="vertical" size={12}>
                         <RangePicker
+                           value={[moment(formData.start_time), moment(formData.end_time)]}
                             showTime={{
                                 format: 'HH:mm:ss',
                             }}

src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx

@@ -193,6 +193,7 @@ function ErrorCorrection(props) {
                 <div className="yisa-search">
                     <label>区域</label>
                     <Cascader
+                       value={formData.areId}
                         options={getCanCaDer}
                         onChange={onChangeList}
                         changeOnSelect

src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx

@@ -764,7 +764,7 @@ function BusinessConf(props) {
                     <Select
                         style={{ width: 260, marginLeft: 50 }}
                         placeholder="请选择"
-                        defaultValue={geteditData.area_id}
+                        value={geteditData.area_id}
                         options={getRoleData}
                         onChange={(v) => {
                             setGetCheckData(
@@ -778,7 +778,7 @@ function BusinessConf(props) {
                     <Select
                         style={{ width: 260, marginLeft: 22 }}
                         placeholder="请选择"
-                        defaultValue={geteditData.operator_id}
+                        value={geteditData.operator_id}
                         options={getMerchantDataName}
                         onChange={(v) => {
                             setGetCheckData(
@@ -792,7 +792,7 @@ function BusinessConf(props) {
                     <Select
                         style={{ width: 260, marginLeft: 35 }}
                         placeholder="请选择"
-                        defaultValue={geteditData.item_id}
+                        value={geteditData.item_id}
                         options={getPlateColor}
                         onChange={(v, option) => {
                             setGetMessage(option);
@@ -817,7 +817,7 @@ function BusinessConf(props) {
                                 <label>参数</label>
                                 <Input
                                     placeholder="请输入"
-                                    defaultValue={geteditData.parameter}
+                                    value={geteditData.parameter}
                                     style={{ width: 260, marginLeft: 50 }}
                                     onChange={(v) => {
                                         setGetCheckData(
@@ -850,7 +850,7 @@ function BusinessConf(props) {
                                         Object.assign({}, geteditData, { parameterValue: v.target.value })
                                     );
                                 }}
-                                defaultValue={geteditData.parameterValue}>
+                                value={geteditData.parameterValue}>
                                 <Radio value={1}>取信地磁</Radio>
                                 <Radio value={2}>PDA审核</Radio>
                             </Radio.Group>
@@ -864,7 +864,7 @@ function BusinessConf(props) {
                                     Object.assign({}, geteditData, { parameterValue: v.target.value })
                                 );
                             }}
-                                defaultValue={geteditData.parameterValue}>
+                            value={geteditData.parameterValue}>
                                 <Radio value={1}>否</Radio>
                                 <Radio value={2}>是</Radio>
                             </Radio.Group>
@@ -879,7 +879,7 @@ function BusinessConf(props) {
                                         Object.assign({}, geteditData, { parameterValue: v.target.value })
                                     );
                                 }}
-                                defaultValue={geteditData.parameterValue}>
+                                value={geteditData.parameterValue}>
                                 <Radio value={1}>取信地磁</Radio>
                                 <Radio value={2}>PDA审核</Radio>
                                 <Radio value={3}>自动出场</Radio>
@@ -896,7 +896,7 @@ function BusinessConf(props) {
                                         Object.assign({}, geteditData, { parameterValue: v.target.value })
                                     );
                                 }}
-                                defaultValue={geteditData.parameterValue}>
+                                value={geteditData.parameterValue}>
                                 <Radio value={1}>自动补单</Radio>
                                 <Radio value={2}>人工补单</Radio>
                             </Radio.Group>
@@ -911,7 +911,7 @@ function BusinessConf(props) {
                                         Object.assign({}, geteditData, { parameterValue: v.target.value })
                                     );
                                 }}
-                                defaultValue={geteditData.parameterValue}>
+                                value={geteditData.parameterValue}>
                                 <Radio value={1}>自动退款</Radio>
                                 <Radio value={2}>人工退款</Radio>
                             </Radio.Group>

src/pages/SystemMgm/RoleMgm/loadable.jsx

@@ -444,7 +444,7 @@ function RoleMgm(props) {
                         changeOnSelect
                         onChange={handleDeptName}
                         fieldNames={{
-                            label: 'dapart_name',
+                            label: 'depart_name',
                             value: 'id',
                             children: 'children'
                         }}
@@ -529,7 +529,7 @@ function RoleMgm(props) {
                             );
                         }}
                         fieldNames={{
-                            label: 'dapart_name',
+                            label: 'depart_name',
                             value: 'id',
                             children: 'children'
                         }}