|
|
@@ -36,7 +36,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="add-btn-container uni-row">
|
|
|
- <button v-if="showCarrierList" type="primary" class="btnScan" @click="handleFinishReporting">扫码确认载具</button>
|
|
|
+ <button v-if="showCarrierList" type="primary" class="btnScan" @click="handleScanCode">扫码确认载具</button>
|
|
|
<button type="default" class="btn" @click="handleFinishReporting">结束报工</button>
|
|
|
</view>
|
|
|
</dialog-base>
|
|
|
@@ -135,6 +135,17 @@
|
|
|
wasteInfo.value[i].rejectNum = wasteInfo.value[i].rejectNum.replace(/^0+|^-|[^\d]/g, '');
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ function handleScanCode() {
|
|
|
+ uni.scanCode({
|
|
|
+ scanType: ['qrCode'], // 条形码扫描
|
|
|
+ onlyFromCamera: true, // 只允许相机扫码
|
|
|
+ autoZoom: false,
|
|
|
+ success: function(res) {
|
|
|
+ let vehicleObj = JSON.parse(res.result);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
|
|
|
function handleFinishReporting() {
|
|
|
if (!workInfo.value.qualifiedNum) {
|
|
|
@@ -214,6 +225,7 @@
|
|
|
margin-top: 16rpx;
|
|
|
height: 64rpx;
|
|
|
line-height: 64rpx;
|
|
|
+ align-items: center;
|
|
|
|
|
|
.label {
|
|
|
flex: 1;
|
|
|
@@ -241,7 +253,10 @@
|
|
|
}
|
|
|
|
|
|
.confirmCarrier {
|
|
|
-
|
|
|
+ .label {
|
|
|
+ padding-top: 20rpx;
|
|
|
+ font-size: 32rpx;
|
|
|
+ }
|
|
|
.vehicleList {
|
|
|
justify-content: baseline;
|
|
|
align-content: flex-start;
|
