bug修复

src/styles/view/console/stationMainten/StationMainten.scss

@@ -50,4 +50,8 @@
     max-width: 150px;
     min-width: 145px;
   }
+
+  .text-div{
+    line-height: 35px;
+  }
 }

src/view/bizview/equipmentLedger/Equipment/EquipmentModel.js

@@ -122,6 +122,7 @@ class EquipmentModel extends Component {
     });
     //2.获取消防小室
     getFireStationDataAction().then(data => {
+      debugger
       let filterData = data.filter(item => item.type === '1');
       this.setState({ fireStationData: filterData });
     });

src/view/bizview/equipmentLedger/Equipment/index.js

@@ -142,6 +142,7 @@ class Equipment extends Component {
       param.pageNumber = param.current;
     }
     Object.assign(searchParam, { ...param });
+
     getEquipmentListAction(searchParam, searchParam.pageNumber, searchParam.pageSize).then(data => {
       this.setState({
         dataList: data.content,

src/view/bizview/stationMainten/index.js

@@ -40,19 +40,20 @@ class StationMainten extends Component {
   constructor(props) {
     super(props);
     this.state = {
+      status: 1,
       loadAmap: false,
       BasicMap: null,
       isClick: true,
+      isCanEidt: false,
+      canEdit: true,
       form: {
         name: '',
         status: '0',
-        zero: '0',
         longitude: '', //经度
         latitude: '', //纬度
         elecType: ''
       },
       useTypeData: [],
-      editable: true,
       provinceData: [],
       cityData: [],
       countyData: [],
@@ -100,7 +101,7 @@ class StationMainten extends Component {
   }
 
   componentWillMount = () => {
-    // this.initDict();
+    this.initDict();
     this.loadData();
   }
 
@@ -215,13 +216,22 @@ class StationMainten extends Component {
   // 加载数据
   loadData = async () => {
     let _this = this;
-    await this.initDict();
+    const { isCanEidt } = _this.state;
+    // await this.initDict();
     loadStationMaintenAction().then(data => {
       if (data.id > 0) {
         _this.queryRegionChildrenBySequenceNbr(data);
-        if (data.status === 0) {
-          _this.setState({ editable: false });
-        }
+        _this.setState({
+          status: data.status,
+          canlSHow: true
+        });
+      } else {
+        _this.setState({
+          isCanEidt: !isCanEidt ,
+          canEdit: false,
+          canlSHow: false
+        });
+
       }
     });
   }
@@ -245,7 +255,10 @@ class StationMainten extends Component {
   }
 
   handleMarkerMap = marker => {
-    const { form } = this.state;
+    const { form,isCanEidt } = this.state;
+    if (!isCanEidt){
+      return;
+    }
     form.longitude = marker.longitude;
     form.latitude = marker.latitude;
     this.setState({ form });
@@ -258,7 +271,7 @@ class StationMainten extends Component {
       this.setState({ isClick: false }); //将isClick 变成false，将不会执行处理事件
       this.model.validate((valid, dataValues) => {
         if (valid) {
-          const { allUserList } = this.state;
+          const { allUserList,form } = this.state;
           const stationChargeName = allUserList.filter(item => item.userId === dataValues.stationChargeUserId )[0].realName;
           const safetyChargeName = allUserList.filter(item => item.userId === dataValues.safetyChargeUserId )[0].realName;
           const stationUserPhoneNum = allUserList.filter(item => item.userId === dataValues.stationChargeUserId )[0].mobile;
@@ -267,12 +280,13 @@ class StationMainten extends Component {
           dataValues.safetyChargeUserName = safetyChargeName;
           dataValues.stationUserPhoneNum = stationUserPhoneNum;
           dataValues.safetyUserPhoneNum = safetyUserPhoneNum;
+          dataValues.status = form.status;
           let param = dataValues;
           addStationMaintenAction(param).then(
             data => {
               AmosAlert.success('提示', '保存成功');
-              // this.state.reload();
               this.loadData();
+              this.toEdit();
             },
             error => {
               AmosAlert.error('错误', error || '保存失败');
@@ -334,9 +348,24 @@ class StationMainten extends Component {
       });
     }
   }
+  toEdit = () =>{
+    const { isCanEidt,status } = this.state;
+    this.setState({
+      isCanEidt: !isCanEidt
+    },()=>{
+      if (!this.state.isCanEidt) {
+        this.loadData();
+        this.setState({ canEdit: true });
+      } else {
+        if (status === 1){
+          this.setState({ canEdit: false });
+        }
+      }
+    });
+  }
 
   render() {
-    const { form, rules, editable, useTypeData, provinceData, cityData, countyData, allUserList, BasicMap, zero } = this.state;
+    const { form, rules, useTypeData, provinceData, cityData, countyData, allUserList, BasicMap,isCanEidt,canEdit,canlSHow } = this.state;
     const formItemLayout = {
       labelCol: {
         xs: { span: 24 },
@@ -373,7 +402,6 @@ class StationMainten extends Component {
         className: 'colspan'
       }
     };
-
     return (
       <div className="grid-case p-20">
         <Row className="mb-5" style={{ height: '40px', lineHeight: '40px', backgroundColor: '#f3f3f3' }}>
@@ -387,12 +415,12 @@ class StationMainten extends Component {
               <input type='hidden' name='id' value={form.id} />
               <div className="stationMainten-body-left">
                 <FormItem label={<span>换流站名称</span>} field="name" {...formItemLayout}>
-                  <Input className="left-input" required value={form.name} onChange={e => this.onInputChange('name', e.target.value)} />
+                  <Input className="left-input" required value={form.name} onChange={e => this.onInputChange('name', e.target.value)}  disabled={!isCanEidt} />
                 </FormItem>
                 <FormItem label={<span>用途类型</span>} field="useType" {...formItemLayout}>
                   <Select data={useTypeData}
                     className="left-select"
-                    disabled={!editable}
+                    disabled={canEdit}
                     value={form.useType ? form.useType.toString() : form.useType}
                     renderOption={item => <Option value={item.dictDataKey}>{item.dictDataValue}</Option>}
                     defaultOption={<Option>请选择</Option>}
@@ -402,7 +430,7 @@ class StationMainten extends Component {
                 <FormItem label={<span>位置</span>} field="districtCode" {...formItemLayout}>
                   <Select data={provinceData}
                     className="left-address-select"
-                    disabled={!editable}
+                    disabled={canEdit}
                     required
                     value={form.provinceCode}
                     renderOption={item => <Option value={item.sequenceNbr}>{item.regionName}</Option>}
@@ -412,7 +440,7 @@ class StationMainten extends Component {
                   <span className="left-address-span">省</span>
                   <Select data={cityData}
                     className="left-address-select"
-                    disabled={!editable}
+                    disabled={canEdit}
                     value={form.cityCode}
                     required
                     renderOption={item => <Option value={item.sequenceNbr}>{item.regionName}</Option>}
@@ -422,7 +450,7 @@ class StationMainten extends Component {
                   <span className="left-address-span">市</span>
                   <Select data={countyData}
                     className="left-address-select"
-                    disabled={!editable}
+                    disabled={canEdit}
                     required
                     value={form.districtCode}
                     renderOption={item => <Option value={item.sequenceNbr}>{item.regionName}</Option>}
@@ -434,7 +462,7 @@ class StationMainten extends Component {
                 <FormItem label={<span>详细地址</span>} field="address" {...formItemLayout}>
                   <TextArea rows={5}
                     className="left-textArea"
-                    disabled={!editable}
+                    disabled={!isCanEidt}
                     value={form.address}
                     placeholder="详细地址"
                     onChange={e => this.onInputChange('address', e.target.value)}
@@ -445,7 +473,7 @@ class StationMainten extends Component {
                     <Col span={12}>
                       <FormItem label={<span>经度</span>} field="longitude" {...formItemV2Layout}>
                         <Input className="left-position-input"
-                          disabled={!editable}
+                          disabled={!isCanEidt}
                           readOnly
                           value={form.longitude}
                           onChange={e => this.onInputChange('longitude', e.target.value)}
@@ -455,7 +483,7 @@ class StationMainten extends Component {
                     <Col span={12}>
                       <FormItem label={<span>纬度</span>} field="latitude" {...formItemV2Layout}>
                         <Input className="left-position-input"
-                          disabled={!editable}
+                          disabled={!isCanEidt}
                           value={form.latitude}
                           readOnly
                           onChange={e => this.onInputChange('latitude', e.target.value)}
@@ -465,22 +493,22 @@ class StationMainten extends Component {
                   </Row>
                 </FormItem>
                 <FormItem label={<span>编号</span>} field="code" {...formItemLayout}>
-                  <Input className="left-input" required disabled={!editable} value={form.code} onChange={e => this.onInputChange('code', e.target.value)} />
+                  <Input className="left-input" required disabled={canEdit} value={form.code} onChange={e => this.onInputChange('code', e.target.value)} />
                 </FormItem>
                 <FormItem label={<span>站点类型</span>} field="elecType" {...formItemLayout}>
-                  <Select onChange={this.onSelectChange} value={form.elecType} className="left-select" disabled={!editable}>
+                  <Select onChange={this.onSelectChange} value={form.elecType} className="left-select" disabled={canEdit}>
                     <Option value='' >请选择</Option>
                     <Option value={1}>输电</Option>
                     <Option value={2}>收电</Option>
                   </Select>
                 </FormItem>
                 <FormItem label={<span>状态</span>} field="status" {...formItemLayout}>
-                  {editable && <RadioGroup disabled={!editable} value={form.status}  onChange={this.onRadioChange}>
-                    <Radio value={zero} >启用</Radio>
+                  {isCanEidt && <RadioGroup disabled={!isCanEidt} value={form.status}  onChange={this.onRadioChange}>
+                    <Radio value={0} >启用</Radio>
                     <Radio value={1} >停用</Radio>
                   </RadioGroup>}
-                  {!editable && form.status === 0 && <div><Input className="staus-input" required disabled={!editable} value={'启用'}  /></div>}
-                  {!editable && form.status === 1 && <div><Input className="staus-input" required disabled={!editable} value={'停用'} /></div>}
+                  {!isCanEidt && form.status === 0 && <div className="text-div">{'启用'}</div>}
+                  {!isCanEidt && form.status === 1 && <div className="text-div">{'停用'}</div>}
                 </FormItem>
                 <FormItem label={<span>换流站负责人</span>} field="stationChargeUserName" {...formItemLayout}>
                   <Row style={{ width: '400px' }}>
@@ -488,7 +516,7 @@ class StationMainten extends Component {
                       <Select data={allUserList}
                         field="stationChargeName"
                         className="left-station-select"
-                        disabled={!editable}
+                        disabled={!isCanEidt}
                         value={form.stationChargeUserId}
                         renderOption={item => <Option value={item.userId}>{item.realName}</Option>}
                         defaultOption={<Option>请选择</Option>}
@@ -500,7 +528,7 @@ class StationMainten extends Component {
                         <Select data={allUserList}
                           field="safetyChargeName"
                           className="left-station-select"
-                          disabled={!editable}
+                          disabled={!isCanEidt}
                           value={form.safetyChargeUserId}
                           renderOption={item => <Option value={item.userId}>{item.realName}</Option>}
                           defaultOption={<Option>请选择</Option>}
@@ -511,17 +539,13 @@ class StationMainten extends Component {
                   </Row>
                 </FormItem>
                 <FormItem label={<span>换流站编码</span>} field="stationCode" {...formItemLayout}>
-                  <Input className="left-input"
-                    disabled={!editable}
-                    readOnly
-                    value={form.stationCode}
-                    onChange={e => this.onInputChange('stationCode', e.target.value)}
-                  />
+                  <div className="text-div">{form.stationCode}</div>
                 </FormItem>
                 <Row>
                   <Col span={20}>
-                    <Button className="f-r left-btn" style={{ marginRight: '20%' }} onClick={this.goBack}>取消</Button>
-                    <Button className="f-r left-btn" onClick={this.saveInfo}>保存</Button>
+                    {!isCanEidt && <Button className="f-r left-btn" style={{ marginRight: '20%' }} onClick={this.toEdit}>编辑</Button>}
+                    {isCanEidt && canlSHow && <Button className="f-r left-btn" style={{ marginRight: '20%' }} onClick={this.toEdit}>取消</Button>}
+                    {isCanEidt && <Button className="f-r left-btn" onClick={this.saveInfo}>保存</Button>}
                   </Col>
                 </Row>
               </div>