Merge branch 'dev_upgrade' of http://172.16.10.76/station/amos-convertor-view into dev_upgrade

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

@@ -113,11 +113,14 @@ class Equipment extends Component {
     } else {
       this.setState({ equipClassify: val });
     }
-    if (val) {
-      let searchParam = [{ name: type, value: val, type: 'LIKE' }];
-      searchParam.current = 0;
-      this.getEquipmentListData(searchParam);
-    }
+    // if (val) {
+    //   let searchParam = [{ name: type, value: val, type: 'LIKE' }];
+    //   searchParam.current = 0;
+    //   this.getEquipmentListData(searchParam);
+    // }
+    let searchParam = [{ name: type, value: val, type: 'LIKE' }];
+    searchParam.current = 0;
+    this.getEquipmentListData(searchParam);
   }
 
   onRowClick = record => {
@@ -214,6 +217,11 @@ class Equipment extends Component {
       return;
     }
 
+    if (selectedRowKeys.length !== 1) {
+      AmosAlert.warning('提示', '请选择一条数据');
+      return;
+    }
+
     let equipId = selectedRowKeys;
     if (selectedRowKeys.length > 1) {
       equipId = selectedRowKeys[selectedRowKeys.length - 1];

src/view/bizview/stationMainten/index.js

@@ -276,20 +276,19 @@ class StationMainten extends Component {
       this.model.validate((valid, dataValues) => {
         if (valid) {
           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 fireCaptainName = allUserList.filter(item => item.userId === dataValues.fireCaptainUserId )[0].realName;
-
-          const stationUserPhoneNum = allUserList.filter(item => item.userId === dataValues.stationChargeUserId )[0].mobile;
-          const safetyUserPhoneNum = allUserList.filter(item => item.userId === dataValues.safetyChargeUserId )[0].mobile;
-          const fireCaptainPhoneNum = allUserList.filter(item => item.userId === dataValues.fireCaptainUserId )[0].mobile;
-
-          dataValues.stationChargeUserName = stationChargeName;
-          dataValues.safetyChargeUserName = safetyChargeName;
-          dataValues.fireCaptainName = fireCaptainName;
-          dataValues.stationUserPhoneNum = stationUserPhoneNum;
-          dataValues.safetyUserPhoneNum = safetyUserPhoneNum;
-          dataValues.fireCaptainPhoneNum = fireCaptainPhoneNum;
+          if ( dataValues.stationChargeUserId ){
+            dataValues.stationChargeUserName = allUserList.filter(item => item.userId === dataValues.stationChargeUserId )[0].realName;
+            dataValues.stationUserPhoneNum = allUserList.filter(item => item.userId === dataValues.stationChargeUserId )[0].mobile;
+
+          }
+          if ( dataValues.safetyChargeUserId ){
+            dataValues.safetyChargeUserName = allUserList.filter(item => item.userId === dataValues.safetyChargeUserId )[0].realName;
+            dataValues.safetyUserPhoneNum = allUserList.filter(item => item.userId === dataValues.safetyChargeUserId )[0].mobile;
+          }
+          if ( dataValues.fireCaptainUserId ){
+            dataValues.fireCaptainName = allUserList.filter(item => item.userId === dataValues.fireCaptainUserId )[0].realName;
+            dataValues.fireCaptainPhoneNum = allUserList.filter(item => item.userId === dataValues.fireCaptainUserId )[0].mobile;
+          }
 
           dataValues.status = form.status;
           let param = dataValues;