From 8b566e42dce1e29c3a43014838ad341a3f971070 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 14 四月 2026 11:21:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/car_wx_app/components/OdometerPopup/index.vue | 7 ++-
ui/car_wx_app/pages/examine/operate.vue | 16 ++++++--
ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue | 7 ++-
ui/car_wx_app/config.js | 4 +-
ui/car_wx_app/uni_modules/uview-ui/components/u-number-box/u-number-box.vue | 3 +
ui/car_wx_app/App.vue | 58 +++++++++++++++-------------
6 files changed, 56 insertions(+), 39 deletions(-)
diff --git a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
index 7b708bb..60eca15 100644
--- a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
+++ b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
@@ -202,7 +202,7 @@
</el-link>
</el-tooltip>
- <!--
+ <!--
<el-tooltip content="瀹屾垚琛岀▼" placement="top">
<el-link size="small" type="primary" v-if="[2].includes(row.status)" @click="handleOk(row)" class="link-btn"
v-hasPermi="['tms:tmsDispatchOrder:okOrder']" underline="never" icon="el-icon-circle-check">
@@ -679,7 +679,7 @@
importTemplateTmsDispatchOrder, ypdddjSumbit,
tmsTmsDispatchOrderImportLog,
saveTmsFinanceDetail2,
- getLastLicensePlate,
+ getLastLicensePlate,
} from "@/api/tms/tmsDispatchOrder";
import useCurrentInstance from "@/utils/useCurrentInstance";
import { computed, onMounted, onBeforeUnmount, reactive, ref, toRefs, watch, getCurrentInstance, nextTick } from "vue";
@@ -1381,6 +1381,7 @@
if (res.code == 200) {
form.value.licensePlate = res.data.licensePlate;
form.value.vehicleId = res.data.vehicleId
+ form.value.actualVehicleType = res.data.vehicleType;
}
}).finally(() => {
data.isChanging = false;
@@ -1402,7 +1403,7 @@
// mainDriverName: active.driverName,
// });
// console.log(active.driverName,'44');
- // getLastLicensePlate(active.driverName).then(res => {
+ // getLastLicensePlate(active.driverName).then(res => {
// console.log(res);
// })
diff --git a/ui/car_wx_app/App.vue b/ui/car_wx_app/App.vue
index 075a4a9..e3ac68b 100644
--- a/ui/car_wx_app/App.vue
+++ b/ui/car_wx_app/App.vue
@@ -16,36 +16,40 @@
console.log('App Hide')
},
methods:{
- updateApp() {
- const updateManager = uni.getUpdateManager();
- updateManager.onCheckForUpdate(function (res) {
- // 璇锋眰瀹屾柊鐗堟湰淇℃伅鐨勫洖璋�
- });
+ updateApp() {
+ const updateManager = uni.getUpdateManager();
- updateManager.onUpdateReady(function (res) {
- uni.showModal({
- title: '鏇存柊鎻愮ず',
- content: '鏂扮増鏈凡缁忓噯澶囧ソ锛屾槸鍚﹂噸鍚簲鐢紵',
- showCancel: false,
- success(res) {
- if (res.confirm) {
- // 鏂扮殑鐗堟湰宸茬粡涓嬭浇濂斤紝璋冪敤 applyUpdate 搴旂敤鏂扮増鏈苟閲嶅惎
- updateManager.applyUpdate();
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷锛屼笉鏇存柊');
- }
- }
- });
+ updateManager.onCheckForUpdate(function (res) {
+ // 璇锋眰瀹屾柊鐗堟湰淇℃伅鐨勫洖璋�
+ console.log('妫�鏌ユ洿鏂扮粨鏋�:', res.hasUpdate);
+ if (res.hasUpdate) {
+ console.log('鍙戠幇鏂扮増鏈紝姝ｅ湪涓嬭浇...');
+ } else {
+ console.log('褰撳墠宸叉槸鏈�鏂扮増鏈�');
+ }
+ });
- });
+ updateManager.onUpdateReady(function (res) {
+ uni.showModal({
+ title: '鏇存柊鎻愮ず',
+ content: '鏂扮増鏈凡缁忓噯澶囧ソ锛屾槸鍚﹂噸鍚簲鐢紵',
+ success(res) {
+ if (res.confirm) {
+ // 鏂扮殑鐗堟湰宸茬粡涓嬭浇濂斤紝璋冪敤 applyUpdate 搴旂敤鏂扮増鏈苟閲嶅惎
+ updateManager.applyUpdate();
+ }
+ }
+ });
+ });
- updateManager.onUpdateFailed(function (res) {
- // 鏂扮殑鐗堟湰涓嬭浇澶辫触
- uni.showModal({
- title: '宸茬粡鏈夋柊鐗堟湰浜嗗摕~',
- content: '鏂扮増鏈凡缁忎笂绾垮暒~锛岃鎮ㄥ垹闄ゅ綋鍓嶅皬绋嬪簭锛岄噸鏂版悳绱㈡墦寮�鍝焴',
- })
- });
+ updateManager.onUpdateFailed(function (res) {
+ // 鏂扮殑鐗堟湰涓嬭浇澶辫触
+ uni.showModal({
+ title: '鏇存柊澶辫触',
+ content: '鏂扮増鏈笅杞藉け璐ワ紝璇锋鏌ョ綉缁滃悗閲嶈瘯',
+ showCancel: false
+ });
+ });
}
diff --git a/ui/car_wx_app/components/OdometerPopup/index.vue b/ui/car_wx_app/components/OdometerPopup/index.vue
index 183b0c7..146d411 100644
--- a/ui/car_wx_app/components/OdometerPopup/index.vue
+++ b/ui/car_wx_app/components/OdometerPopup/index.vue
@@ -13,7 +13,6 @@
<u-number-box
v-model="localForm.odometer"
class="number-box"
- :min="0"
:step="1"
button-size="28"
inputWidth="90"
@@ -65,7 +64,7 @@
data() {
return {
localForm: {
- odometer: 0,
+ odometer: undefined,
iscc: '1'
}
}
@@ -74,11 +73,13 @@
watch: {
show(val) {
if (val) {
+
// 寮圭獥鎵撳紑鏃讹紝鍚屾鐖剁粍浠剁殑鏁版嵁鍒版湰鍦�
this.localForm = {
- odometer: this.form.odometer || 0,
+ odometer: this.form.odometer || '',
iscc: this.form.iscc || '1'
}
+ console.log(this.form.odometer,this.localForm)
}
}
},
diff --git a/ui/car_wx_app/config.js b/ui/car_wx_app/config.js
index 83dcf25..4e9f179 100644
--- a/ui/car_wx_app/config.js
+++ b/ui/car_wx_app/config.js
@@ -1,6 +1,6 @@
-//const host = 'https://tmsapi.ygalogisticspark.com/api/';
+const host = 'https://tmsapi.ygalogisticspark.com/api/';
//const host = 'http://61.143.42.70:7010/cwgltest-api/';
-const host = 'http://192.168.1.92:8060/';
+//const host = 'http://192.168.1.92:8060/';
// const host = 'https://jyjyapi.ygalogisticspark.com/api2/zhfw/api/third';
const imageUrlYL = 'http://localhost:8080';
const aliOssUrl = 'https://huichang-tms.oss-cn-hongkong.aliyuncs.com';
diff --git a/ui/car_wx_app/pages/examine/operate.vue b/ui/car_wx_app/pages/examine/operate.vue
index 3da0325..efb8e31 100644
--- a/ui/car_wx_app/pages/examine/operate.vue
+++ b/ui/car_wx_app/pages/examine/operate.vue
@@ -20,7 +20,7 @@
<u--form ref="uForm" :rules="rules" :model="form" labelPosition="left">
<u-form-item borderBottom label=" " labelWidth="0" prop="address">
<view class="form-row" @click="getLocation">
- <view class="form-label required">
+ <view class="form-label">
<view class="label-icon">
<u--image :showLoading="true" src="/static/bt.png" width="18" height="18" />
</view>
@@ -47,6 +47,14 @@
<text>鏃堕棿</text>
</view>
<uni-datetime-picker type="datetime" v-model="form.tripTime" class="flex-1" />
+ </view>
+ </u-form-item>
+ <u-form-item borderBottom label=" " v-if="form.odometer" labelWidth="0" prop="odometer">
+ <view class="form-row">
+ <view class="form-label">
+ <text>浠〃閲岀▼</text>
+ </view>
+ <view class="form-label">{{form.odometer || 0}} KM</view>
</view>
</u-form-item>
@@ -223,7 +231,7 @@
const ODOMETER_TYPES = Object.freeze(['3', '5', '7'])
const INITIAL_FORM = Object.freeze({
- address: '', tripTime: '', odometer: 0, tripType: '',
+ address: '', tripTime: '', odometer: undefined, tripType: '',
feeType: '', currency: '', actualFeeAmount: 0,
iscc: '1', longitude: '', latitude: ''
})
@@ -468,10 +476,10 @@
if (type !== '1') {
if (ODOMETER_TYPES.includes(type)) {
- this.form.odometer = this.tmsTripTables[0]?.odometer || 0
+ this.form.odometer = this.tmsTripTables[0]?.odometer || undefined
this.form.iscc = '1'
} else {
- this.form.odometer = 0
+ this.form.odometer = undefined
}
this.$nextTick(() => { this.showPopup = true })
}
diff --git a/ui/car_wx_app/uni_modules/uview-ui/components/u-number-box/u-number-box.vue b/ui/car_wx_app/uni_modules/uview-ui/components/u-number-box/u-number-box.vue
index 69211c5..de17078 100644
--- a/ui/car_wx_app/uni_modules/uview-ui/components/u-number-box/u-number-box.vue
+++ b/ui/car_wx_app/uni_modules/uview-ui/components/u-number-box/u-number-box.vue
@@ -194,6 +194,9 @@
// 鏍煎紡鍖栨暣鐞嗘暟鎹紝闄愬埗鑼冨洿
format(value) {
value = this.filter(value)
+ if (!value){
+ return value
+ }
// 濡傛灉涓虹┖瀛楃涓诧紝閭ｄ箞璁剧疆涓�0锛屽悓鏃跺皢鍊艰浆涓篘umber绫诲瀷
value = value === '' ? 0 : +value
// 瀵规瘮鏈�澶ф渶灏忓�硷紝鍙栧湪min鍜宮ax涔嬮棿鐨勫��
--
Gitblit v1.8.0