From fb4fa76b4c1a93c833cd97f97f41b6158ab1aef7 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 21 四月 2023 17:24:44 +0800
Subject: [PATCH] 修改bug
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 72 +++++++++++++++++++++++++++++-------
pages/driver-page/appointment/appointment.vue | 2
pages/driver-page/driver-index/driver-index.vue | 1
3 files changed, 59 insertions(+), 16 deletions(-)
diff --git a/pages/driver-page/appointment/appointment.vue b/pages/driver-page/appointment/appointment.vue
index 885ccc9..bb1935a 100644
--- a/pages/driver-page/appointment/appointment.vue
+++ b/pages/driver-page/appointment/appointment.vue
@@ -120,7 +120,7 @@
if (res.code == 0) {
this.$u.toast('鍏ュ満鐢宠鎴愬姛');
} else {
- this.$u.toast('鍏ュ満鐢宠澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.$u.toast(res.msg ? res.msg : '鍏ュ満鐢宠澶辫触锛岃绋嶅悗閲嶈瘯');
}
});
}
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index f3a19fa..077c4e2 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -20,10 +20,13 @@
</view> -->
</view>
</view>
- <view class="bottom" v-if="weighList.orderType == '鍐呰喘' || weighList.orderType == '杞嚭'">
+ <view class="bottom" v-if="weighList.orderType == '澶栭攢' || weighList.orderType == '杞嚭' || weighList.orderType == '澶栬喘'">
<view>
<view style="font-weight: 600;">鍘熷彂淇℃伅</view>
- <text>鐨噸{{ primarySkin || '' }}姣涢噸{{ primaryHair || '' }}鍑�閲峽{ primaryClean || '' }}</text>
+ <text v-if="weighList.orderType == '澶栬喘' && weighList.hair == 0">
+ 姣涢噸:{{ coalContactHair || '' }}鐨噸:{{ coalContactSkin || '' }}鍑�閲�:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) || '' }}
+ </text>
+ <text v-else>姣涢噸:{{ primaryHair || '' }}鐨噸:{{ primarySkin || '' }}鍑�閲�:{{ primaryClean || '' }}</text>
</view>
</view>
<view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝ｅ父鏃跺彲浠ョО閲�</text></view>
@@ -65,11 +68,24 @@
@cancel="evacuationCancel"
></u-modal>
</view>
+ <!-- 澶栬喘绫诲瀷鎵嬪姩杈撳叆寮圭獥 -->
<view class="">
- <u-modal :show="firstHairCustomernameShow" title="濉啓閲嶉噺" @confirm="OutsourcingConfirm">
+ <u-modal :show="firstHairCustomernameShow" title="濉啓鍘熷彂閲嶉噺" @confirm="OutsourcingConfirm">
<view class="">
- <view class=""><u--input placeholder="璇疯緭鍏ユ瘺閲�" border="surround" v-model="CoalContactHair" type="digit"></u--input></view>
- <view class=""><u--input placeholder="璇疯緭鍏ョ毊閲�" border="surround" v-model="CoalContactSkin" type="digit"></u--input></view>
+ <text>姣涢噸:</text>
+ <view class=""><u--input placeholder="璇疯緭鍏ユ瘺閲�" v-model="coalContactHair" type="digit"></u--input></view>
+ <text>鐨噸:</text>
+ <view class=""><u--input placeholder="璇疯緭鍏ョ毊閲�" v-model="coalContactSkin" type="digit"></u--input></view>
+ </view>
+ </u-modal>
+ </view>
+ <!-- 鎵嬪姩杈撳叆涔嬪悗鐨勪簩娆″脊绐� -->
+ <view class="secondary-confirmation">
+ <u-modal :show="secondConfirmShow" title="璇风‘璁ゅ師鍙戦噸閲�" :showCancelButton="true" @confirm="secondConfirm" @cancel="secondCancel">
+ <view class="secondary-confirmation__main">
+ <view class="secondary-child">姣涢噸:{{ coalContactHair }}</view>
+ <view class="secondary-child">鐨噸:{{ coalContactSkin }}</view>
+ <view class="secondary-child">鍑�閲�:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) }}</view>
</view>
</u-modal>
</view>
@@ -105,7 +121,10 @@
equipmentCode: '',
weigh: 0,
tmCode: '',
- sceneInOut: ''
+ sceneInOut: '',
+ coalContactClean: 0,
+ coalContactHair: 0,
+ coalContactSkin: 0
},
takeCoalId: null,
weighHouseCode: '',
@@ -131,8 +150,10 @@
isweigh: false,
// 澶栬喘绫诲瀷绉伴噸鍑虹幇寮圭獥濉啓姣涳紝鐨紝
firstHairCustomernameShow: false,
- CoalContactHair: '',
- CoalContactSkin: ''
+ coalContactHair: '',
+ coalContactSkin: '',
+ // 浜屾纭
+ secondConfirmShow: false
};
},
watch: {
@@ -165,7 +186,6 @@
this.weighData.weigh = this.realTimeWeigh = v;
console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
},
- immediate: true,
deep: true
}
},
@@ -210,17 +230,31 @@
this.weighData.tmId = res.data.id;
this.weighData.carNo = res.data.carNo;
this.weighData.tmCode = res.data.code;
- if (this.weighList.orderType == '澶栭攢' && this.weighList.hair == 0) {
+ if (this.weighList.orderType == '澶栬喘' && this.weighList.hair == 0) {
this.firstHairCustomernameShow = true;
}
}
});
},
+ // 澶栬喘绫诲瀷杈撳叆鐐瑰嚮纭涔嬪悗浜屾纭
OutsourcingConfirm() {
- this.weighData.CoalContactSkin = Number(this.CoalContactSkin);
- this.weighData.CoalContactHair = Number(this.CoalContactHair);
- this.weighData.CoalContactclean = Number(this.CoalContactHair) - Number(this.CoalContactSkin);
- this.saveWeigh();
+ this.weighData.coalContactSkin = Number(this.coalContactSkin);
+ this.weighData.coalContactHair = Number(this.coalContactHair);
+ this.weighData.coalContactClean = Number((Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2));
+ if (Number(this.coalContactSkin) == 0 || Number(this.coalContactHair) == 0) {
+ this.$u.toast('閲嶉噺涓嶈兘涓�0,璇烽噸鏂板～鍐�');
+ } else {
+ this.secondConfirmShow = true;
+ }
+ },
+ // 浜屾纭寮圭獥 鐐瑰嚮纭畾
+ secondConfirm() {
+ this.secondConfirmShow = false;
+ this.firstHairCustomernameShow = false;
+ },
+ // 浜屾寮圭獥鐐瑰嚮鍙栨秷
+ secondCancel() {
+ this.secondConfirmShow = false;
},
/**
* @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
@@ -417,4 +451,14 @@
flex: 0.5;
}
}
+.secondary-confirmation__main {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: center;
+ .secondary-child {
+ display: flex;
+ justify-content: space-between;
+ }
+}
</style>
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 037a609..36c7b7a 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -117,7 +117,6 @@
<view class="haveYuYueCenter">
<view>{{ item.deptName || '' }}</view>
<view>{{ item.coalName || '' }}</view>
- <view>鎺掗槦鏁帮細鏆傛棤{{}}</view>
</view>
<view class="haveYuYueBottom">
<text>{{ item.yuYueSection || '鏃舵' }}</text>
--
Gitblit v1.9.1