修改表单输入

src/styles/view/biz/equipmentLedger/equipment.scss

@@ -241,6 +241,9 @@
     float: left;
     width: 50%;
     padding-top: 30px;
+    .upload-img .amos-upload-list-item-error {
+      border: 1px solid #d8d8d8;
+    }
 
     .risk_factor_input {
       width: 20rem;

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

@@ -8,7 +8,7 @@ import { Form, Upload, Input, Select, Radio, Modal, AmosAlert, Icon } from 'amos
 import { TreeSelect } from 'amos-antd';
 import PropTypes from 'amos-react-router/lib/PropTypes';
 import { getEquipmentDataAction, getFireStationDataAction, getPrePlanPictureAction } from '../../../../services/ledgerService';
-import { queryDeptByOrgCodeAction, getUsersByDepartmentIdAction, queryRegionTreeAction , queryLoadPackagesAction ,buildingTreeAction} from '../../../../services/preControlService';
+import { queryDeptByOrgCodeAction, getUsersByDepartmentIdAction, queryRegionTreeAction , queryLoadPackagesAction ,buildingTreeAction } from '../../../../services/preControlService';
 import { convertImgUrlToFile, getBase64 } from './../../../../utils/FileUtils';
 import { baseURI, FscSerUrl } from '../../../../consts/urlConsts';
 import { recursive } from './../../../../utils/request';
@@ -109,14 +109,14 @@ class EquipmentModel extends Component {
 
   onInputChange = (key, value) => {
     const { form } = this.state;
-    form[key] = value;
+    form[key] = value.trim();
     this.setState({ form });
   };
 
   onPeservePlanChange = (key, item) => {
     const { form, prefix } = this.state;
     //let value = item.project ? item.project.substring(0) + '/' + item.packageId : '' ;
-    let value = prefix ? prefix + '/' + item.id : '' ;
+    let value = prefix ? `${prefix}/${item.id}` : '' ;
     form[key] = value;
     this.setState({ form });
   };
@@ -154,7 +154,7 @@ class EquipmentModel extends Component {
         getUsersByDepartmentIdAction(deptId).then(data => {
           this.setState({ chargeUserData: data });
         });
-      this.setState({ form: {...form, ...data} });
+      this.setState({ form: { ...form, ...data } });
     });
     this.getPrePlanPictureData(equipmentId);
   };
@@ -183,7 +183,7 @@ class EquipmentModel extends Component {
   };
 
   validPositon3d = (rule, value, callback) => {
-    if(value != undefined){
+    if (value != undefined){
       let tempArry = value.split(',') || [];
       if ( tempArry && tempArry.length === 3 ){
         const patt = /(^([-]?)[1-9]([0-9]+)?(\.[0-9]+)?$)|(^([-]?)(0){1}$)|(^([-]?)[0-9]\.[0-9]+?$)/;
@@ -309,7 +309,7 @@ class EquipmentModel extends Component {
 
   queryLoadPackages =(project)=> {
     queryLoadPackagesAction(project).then(data => {
-      debugger
+      debugger;
       if (data){
         let prefix = data[0].project.replace('/', '');
         this.setState({ prefix, project: data });
@@ -361,7 +361,7 @@ class EquipmentModel extends Component {
 
     return (
       <div>
-        <Form model={form} rules={rules} ref={component => (this.form = component)}>
+        <Form model={form} rules={rules} ref={component => this.form = component}>
           <div className="important-equipment-edit-left">
             <FormItem label={<span>设备编号</span>} field="code" {...formItemLayout}>
               <Input className="risk_factor_input" required value={form.code} onChange={e => this.onInputChange('code', e.target.value)} />
@@ -415,6 +415,7 @@ class EquipmentModel extends Component {
             <FormItem label={<span>电源负荷图</span>} field={form.imageUrl1} {...formItemLayout}>
               <div>
                 <Upload
+                  className="upload-img"
                   fileList={form.imageUrl1}
                   listType="picture-card"
                   beforeUpload={file => {
@@ -427,7 +428,7 @@ class EquipmentModel extends Component {
                     this.fileRemove(file);
                   }}
                 >
-                  {form.imageUrl1 ? (form.imageUrl1.length >= 1 ? null : uploadButton) : uploadButton}
+                  {form.imageUrl1 ? form.imageUrl1.length >= 1 ? null : uploadButton : uploadButton}
                 </Upload>
 
               </div>
@@ -435,6 +436,7 @@ class EquipmentModel extends Component {
             <FormItem label={<span>电缆沟封堵图</span>} field="picture2" {...formItemLayout}>
               <div>
                 <Upload
+                  className="upload-img"
                   fileList={form.imageUrl2}
                   listType="picture-card"
                   beforeUpload={file => {
@@ -447,7 +449,7 @@ class EquipmentModel extends Component {
                     this.fileRemove(file);
                   }}
                 >
-                  {form.imageUrl2 ? (form.imageUrl2.length >= 1 ? null : uploadButton) : uploadButton}
+                  {form.imageUrl2 ? form.imageUrl2.length >= 1 ? null : uploadButton : uploadButton}
                 </Upload>
 
               </div>
@@ -455,6 +457,7 @@ class EquipmentModel extends Component {
             <FormItem label={<span>消防车进站行车路线图</span>} field="picture3" {...formItemLayout}>
               <div>
                 <Upload
+                  className="upload-img"
                   fileList={form.imageUrl3}
                   listType="picture-card"
                   beforeUpload={file => {
@@ -467,7 +470,7 @@ class EquipmentModel extends Component {
                     this.fileRemove(file);
                   }}
                 >
-                  {form.imageUrl3 ? (form.imageUrl3.length >= 1 ? null : uploadButton) : uploadButton}
+                  {form.imageUrl3 ? form.imageUrl3.length >= 1 ? null : uploadButton : uploadButton}
                 </Upload>
 
               </div>
@@ -475,6 +478,7 @@ class EquipmentModel extends Component {
             <FormItem label={<span>消防取水图</span>} field="picture4" {...formItemLayout}>
               <div>
                 <Upload
+                  className="upload-img"
                   fileList={form.imageUrl4}
                   listType="picture-card"
                   beforeUpload={file => {
@@ -487,7 +491,7 @@ class EquipmentModel extends Component {
                     this.fileRemove(file);
                   }}
                 >
-                  {form.imageUrl4 ? (form.imageUrl4.length >= 1 ? null : uploadButton) : uploadButton}
+                  {form.imageUrl4 ? form.imageUrl4.length >= 1 ? null : uploadButton : uploadButton}
                 </Upload>
                 <Modal className='preview-photo-modal' content={<div style={{ width: '560px', maxHeight: '500px',overflowY: 'scroll' }}><img style={{ width: '520px' }} src={previewImage} /></div>} visible={previewVisible} noDefaultFooter onCancel={this.handleCancel} />
               </div>
@@ -518,7 +522,7 @@ class EquipmentModel extends Component {
             <FormItem label={<span>是否室内</span>} field="isIndoor" {...formItemLayout}>
               <RadioGroup defaultValue={form.isIndoor} value={form.isIndoor} onChange={e => this.onInputChange('isIndoor', e)}>
                 <Radio value={false}>否</Radio>
-                <Radio value={true}>是</Radio>
+                <Radio value>是</Radio>
               </RadioGroup>
             </FormItem>
             <FormItem label={<span>预案配置</span>} field="reservePlan" {...formItemLayout}>