suojin
/
transport_integrated_app
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
main
张群 2 years ago
parent ee3e0fb148 70be3fa300
commit a7586eec0f
3 changed files with 17 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      pages/bus/busDataInfo/form.vue
  2. 14
      pages/portShipping/pilotStation/form.vue
  3. 4
      pages/roadTransport/transportData/form.vue

11
pages/bus/busDataInfo/form.vue
Unescape View File

@ -84,7 +84,7 @@
<view class="form_item"> <view class="form_item">
<view class="form_item_label">投入车辆：</view> <view class="form_item_label">投入车辆：</view>
<view class="form_item_input form_input"> <view class="form_item_input form_input">
<uni-easyinput @blur="calcYoyMom(landNameIndex)" type="number" <uni-easyinput @blur="calcYoyMom(landNameIndex)" @clear="calcYoyMom(landNameIndex)" type="number"
v-model="form.bizBusDataDetailVOList[landNameIndex].vehicleInput" v-model="form.bizBusDataDetailVOList[landNameIndex].vehicleInput"
placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20"> placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
</uni-easyinput> </uni-easyinput>
@ -114,7 +114,7 @@
<view class="form_item"> <view class="form_item">
<view class="form_item_label">人数(万人)：</view> <view class="form_item_label">人数(万人)：</view>
<view class="form_item_input form_input"> <view class="form_item_input form_input">
<uni-easyinput @blur="calcYoyMom(landNameIndex)" type="digit" <uni-easyinput @blur="calcYoyMom(landNameIndex)" @clear="calcYoyMom(landNameIndex)" type="digit"
v-model="form.bizBusDataDetailVOList[landNameIndex].passengerCount" v-model="form.bizBusDataDetailVOList[landNameIndex].passengerCount"
placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20"> placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
</uni-easyinput> </uni-easyinput>
@ -144,7 +144,7 @@
<view class="form_item"> <view class="form_item">
<view class="form_item_label">班次：</view> <view class="form_item_label">班次：</view>
<view class="form_item_input form_input"> <view class="form_item_input form_input">
<uni-easyinput @blur="calcYoyMom(landNameIndex)" type="number" <uni-easyinput @blur="calcYoyMom(landNameIndex)" @clear="calcYoyMom(landNameIndex)" type="number"
v-model="form.bizBusDataDetailVOList[landNameIndex].operatingShifts" v-model="form.bizBusDataDetailVOList[landNameIndex].operatingShifts"
placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20"> placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
</uni-easyinput> </uni-easyinput>
@ -363,6 +363,11 @@
.bizBusDataDetailVOList[landNameIndex].landName == '') { .bizBusDataDetailVOList[landNameIndex].landName == '') {
return; return;
} }
this.landList[landNameIndex].isFinish = checkNotEmpty(this.form
.bizBusDataDetailVOList[landNameIndex].vehicleInput) && checkNotEmpty(this.form
.bizBusDataDetailVOList[landNameIndex].passengerCount) && checkNotEmpty(this.form
.bizBusDataDetailVOList[landNameIndex].operatingShifts) ? true : false;
this.form.bizBusDataDetailVOList[landNameIndex].isFinish = checkNotEmpty(this.form this.form.bizBusDataDetailVOList[landNameIndex].isFinish = checkNotEmpty(this.form
.bizBusDataDetailVOList[landNameIndex].vehicleInput) && checkNotEmpty(this.form .bizBusDataDetailVOList[landNameIndex].vehicleInput) && checkNotEmpty(this.form
.bizBusDataDetailVOList[landNameIndex].passengerCount) && checkNotEmpty(this.form .bizBusDataDetailVOList[landNameIndex].passengerCount) && checkNotEmpty(this.form

14
pages/portShipping/pilotStation/form.vue
Unescape View File

@ -36,7 +36,7 @@
<view class="edit_item input"> <view class="edit_item input">
<p class="left">引航站每日引航艘次数:</p> <p class="left">引航站每日引航艘次数:</p>
<view class="right"> <view class="right">
<uni-easyinput @blur="getYoyMom" type="digit" v-model="form.dailyPilotCount" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput> <uni-easyinput @blur="getYoyMom" @clear="getYoyMom" type="digit" v-model="form.dailyPilotCount" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
</view> </view>
</view> </view>
<view class="per_con" :class="form.dailyPilotCount && form.dailyPilotCount == form.yestPilotCount ? 'danger' : ''"> <view class="per_con" :class="form.dailyPilotCount && form.dailyPilotCount == form.yestPilotCount ? 'danger' : ''">
@ -52,7 +52,7 @@
<view class="edit_item input"> <view class="edit_item input">
<p class="left">青岛港区引航量:</p> <p class="left">青岛港区引航量:</p>
<view class="right"> <view class="right">
<uni-easyinput @blur="getYoyMom" type="digit" v-model="form.qdPortPilot" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput> <uni-easyinput @blur="getYoyMom" @clear="getYoyMom" type="digit" v-model="form.qdPortPilot" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
</view> </view>
</view> </view>
<view class="per_con" :class="form.qdPortPilot && form.qdPortPilot == form.yestQdPilot ? 'danger' : ''"> <view class="per_con" :class="form.qdPortPilot && form.qdPortPilot == form.yestQdPilot ? 'danger' : ''">
@ -68,7 +68,7 @@
<view class="edit_item input"> <view class="edit_item input">
<p class="left">董家口港区引航量:</p> <p class="left">董家口港区引航量:</p>
<view class="right"> <view class="right">
<uni-easyinput @blur="getYoyMom" type="digit" v-model="form.djkPortPilot" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput> <uni-easyinput @blur="getYoyMom" @clear="getYoyMom" type="digit" v-model="form.djkPortPilot" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
</view> </view>
</view> </view>
<view class="per_con" :class="form.djkPortPilot && form.djkPortPilot == form.yestDjkPilot ? 'danger' : ''"> <view class="per_con" :class="form.djkPortPilot && form.djkPortPilot == form.yestDjkPilot ? 'danger' : ''">
@ -142,7 +142,7 @@
</template> </template>
<script> <script>
import { calcMom, checkNotEmpty, getDateStr } from '../../../common/util' import { calcMom, calcYoy, checkNotEmpty, getDateStr } from '../../../common/util'
export default { export default {
data() { data() {
return { return {
@ -274,9 +274,9 @@ import { calcMom, checkNotEmpty, getDateStr } from '../../../common/util'
this.form.qdPortPilotMom = calcMom(this.form.qdPortPilot,yesterdayData.qdPortPilot); this.form.qdPortPilotMom = calcMom(this.form.qdPortPilot,yesterdayData.qdPortPilot);
// 环比计算 // 环比计算
this.form.dailyPilotYoy = calcMom(this.form.dailyPilotCount,lastYearData.dailyPilotCount); this.form.dailyPilotYoy = calcYoy(this.form.dailyPilotCount,lastYearData.dailyPilotCount);
this.form.djkPortPilotYoy = calcMom(this.form.djkPortPilot,lastYearData.djkPortPilot); this.form.djkPortPilotYoy = calcYoy(this.form.djkPortPilot,lastYearData.djkPortPilot);
this.form.qdPortPilotYoy = calcMom(this.form.qdPortPilot,lastYearData.qdPortPilot); this.form.qdPortPilotYoy = calcYoy(this.form.qdPortPilot,lastYearData.qdPortPilot);
console.log('form ===>',this.form) console.log('form ===>',this.form)
}) })

4
pages/roadTransport/transportData/form.vue
Unescape View File

@ -106,7 +106,7 @@
<view class="edit_item input"> <view class="edit_item input">
<p class="left">投放运力-总客车数</p> <p class="left">投放运力-总客车数</p>
<view class="right"> <view class="right">
<uni-easyinput @blur="getRatio" v-model="roadData.capacityTotalBus" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput> <uni-easyinput @blur="getRatio" @clear="getRatio" v-model="roadData.capacityTotalBus" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
</view> </view>
</view> </view>
<view class="per_con" <view class="per_con"
@ -192,7 +192,7 @@
<view class="edit_item input"> <view class="edit_item input">
<p class="left">完成客运量(万)</p> <p class="left">完成客运量(万)</p>
<view class="right"> <view class="right">
<uni-easyinput @blur="getRatio" v-model="roadData.totalPassengerVolume" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput> <uni-easyinput @blur="getRatio" @clear="getRatio" v-model="roadData.totalPassengerVolume" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
</view> </view>
</view> </view>
<view class="per_con"> <view class="per_con">

Write Preview
Loading…
Cancel
Save