From cc0a3cdf75256a2fc0b7f0a0bd99015cd9f8d714 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Wed, 20 Sep 2023 17:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AC=E6=8D=A2=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/bus/busDataInfo/form.vue             | 4 +++-
 pages/roadTransport/transportData/form.vue | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pages/bus/busDataInfo/form.vue b/pages/bus/busDataInfo/form.vue
index 5894375..c6bd145 100644
--- a/pages/bus/busDataInfo/form.vue
+++ b/pages/bus/busDataInfo/form.vue
@@ -304,7 +304,8 @@
 								yestPassengerCount:'',
 								lyVehicleInput:'',
 								lyPassengerCount:'',
-								lyOperatingShifts:''
+								lyOperatingShifts:'',
+								isPassengerCountConvert:0,
 							})
 						})
 					} else {
@@ -337,6 +338,7 @@
 									"yestPassengerCount": '',
 									"yesterdayvehicleInput": '',
 									"yestOperatingShifts":'',
+									"isPassengerCountConvert":0,
 								})
 							}
 						})
diff --git a/pages/roadTransport/transportData/form.vue b/pages/roadTransport/transportData/form.vue
index 20ea653..e0646d5 100644
--- a/pages/roadTransport/transportData/form.vue
+++ b/pages/roadTransport/transportData/form.vue
@@ -226,9 +226,9 @@
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">营运收入(元)</p>
+						<p class="left">营运收入(万)</p>
 						<view class="right">
-							<uni-easyinput maxlength="20" type="number" v-model="roadData.operatingRevenue" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput maxlength="20" type="digit" v-model="roadData.operatingRevenue" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
@@ -467,6 +467,7 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
 					passengerVolumeYesterdayRatio:'',
 					totalBusIncreaseYesterdayRatio:'',
 					remarks:'', //	备注
+					isPassengerCountConvert:0,
 				},
 				lastyearDay:'',
 				beforeDay:'',