Skip to content

A
amos-convertor-view
Commit 106f3ecf authored by KeYong's avatar KeYong
Browse files
Options

解决冲突

parent 19a3ccc8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/view/bizview/stationMainten/index.js
View file @ 106f3ecf
...@@ -261,12 +261,12 @@ class StationMainten extends Component { ...@@ -261,12 +261,12 @@ class StationMainten extends Component {
const { allUserList } = this.state; const { allUserList } = this.state;
const stationChargeName = allUserList.filter(item => item.userId === dataValues.stationChargeUserId )[0].realName; const stationChargeName = allUserList.filter(item => item.userId === dataValues.stationChargeUserId )[0].realName;
const safetyChargeName = allUserList.filter(item => item.userId === dataValues.safetyChargeUserId )[0].realName; const safetyChargeName = allUserList.filter(item => item.userId === dataValues.safetyChargeUserId )[0].realName;
const stationChargeUserPhoneNum = allUserList.filter(item => item.userId === dataValues.stationChargeUserId )[0].mobile; const stationUserPhoneNum = allUserList.filter(item => item.userId === dataValues.stationChargeUserId )[0].mobile;
const safetyChargeUserPhoneNum = allUserList.filter(item => item.userId === dataValues.safetyChargeUserId )[0].mobile; const safetyUserPhoneNum = allUserList.filter(item => item.userId === dataValues.safetyChargeUserId )[0].mobile;
dataValues.stationChargeUserName = stationChargeName; dataValues.stationChargeUserName = stationChargeName;
dataValues.safetyChargeUserName = safetyChargeName; dataValues.safetyChargeUserName = safetyChargeName;
dataValues.stationChargeUserPhoneNum = stationChargeUserPhoneNum; dataValues.stationUserPhoneNum = stationUserPhoneNum;
dataValues.safetyChargeUserPhoneNum = safetyChargeUserPhoneNum; dataValues.safetyUserPhoneNum = safetyUserPhoneNum;
let param = dataValues; let param = dataValues;
addStationMaintenAction(param).then( addStationMaintenAction(param).then(
data => { data => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment