From 40ce9965257472d715d072647796ac91c3932d73 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 18 九月 2023 17:49:00 +0800
Subject: [PATCH] 修改合卡
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 84 ++++++++++++++++++++++++++++++------------
api/globalApi.js | 2
pages.json | 20 ++++-----
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 2
4 files changed, 71 insertions(+), 37 deletions(-)
diff --git a/api/globalApi.js b/api/globalApi.js
index 087918d..18f1c8d 100644
--- a/api/globalApi.js
+++ b/api/globalApi.js
@@ -275,7 +275,7 @@
},
// 鑾峰彇鎵�鍦ㄧ鎴�
getWeighHouse: {
- url: '/wrzs/jccoalweighhouse/getWeighHouse',
+ url: '/wrzs/jccoalweighhouse/getUpperPound',
method: 'GET'
},
diff --git a/pages.json b/pages.json
index 9dbbba4..b69e563 100644
--- a/pages.json
+++ b/pages.json
@@ -239,17 +239,15 @@
"enablePullDownRefresh": false
}
+ }, {
+ "path": "pages/loadUnload-page/selectTarget/selectTarget",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
}
- ,{
- "path" : "pages/loadUnload-page/selectTarget/selectTarget",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ],
+ ],
"subPackages": [{
"root": "pages/register",
"pages": [{
@@ -399,7 +397,7 @@
},
"globalStyle": {
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "uni-app",
+ "navigationBarTitleText": "",
"navigationBarBackgroundColor": "#f5f5f5",
"backgroundColor": "#f5f5f5"
},
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index 3444a6c..0661bfa 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -506,7 +506,7 @@
}&primaryHair=${this.primaryHair}&psrimaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}`
});
} 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 82a486f..d1fad8a 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
@@ -211,6 +211,25 @@
</view>
</view>
</view>
+ <view class="mergeState"
+ v-show="mergeStateShow">
+ <view class="merge-wrap">
+ <view>鏄惁纭鍚堝苟</view>
+ <view class="merge-checkbox">
+ <u-checkbox-group v-model="checkboxValue1"
+ placement="column"
+ @change="mergeStateChange">
+ <u-checkbox :customStyle="{marginBottom: '8px'}"
+ :label="mergeState?'纭':'鍙栨秷'"
+ name="confirm"
+ label-size="30"
+ size="30"
+ activeColor="#48a2ff">
+ </u-checkbox>
+ </u-checkbox-group>
+ </view>
+ </view>
+ </view>
<view class="three">
<!-- 鏀剧┖ -->
<u-button type="primary"
@@ -269,14 +288,6 @@
</u--form>
</view>
</u-modal>
- </view>
- <view class="mergeState">
- <u-modal :show="mergeStateShow"
- title="鍚堝崱纭"
- content="鏄惁纭鍚堝崱"
- :showCancelButton="true"
- @confirm="mergeConfirm"
- @cancel="mergeCancel"></u-modal>
</view>
</view>
</template>
@@ -396,6 +407,7 @@
},
mergeState: true, //鍚堝崱鐘舵��
mergeStateShow: false, //鍚堝崱寮圭獥
+ checkboxValue1: []
};
},
watch: {
@@ -412,7 +424,8 @@
this.temporaryWeighObj.skin = newV;
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(newV)
- this.errorTipShow = xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2
+ this.errorTipShow = (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) &&
+ this.avgSkin !== 0
} else {
this.isSkinWeigh = false;
this.temporaryWeighObj.hair = newV;
@@ -434,7 +447,8 @@
this.temporaryWeighObj.skin = newV;
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(newV)
- this.errorTipShow = xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2
+ this.errorTipShow = (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) &&
+ this.avgSkin !== 0;
this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
2);
this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
@@ -675,19 +689,18 @@
this.abnormalModalShow = false
})
},
- mergeConfirm() {
- this.mergeStateShow = false
- this.weighData.isMerge = 1
- this.MergeState = true
- this.isweigh = false
- this.orderSurplusLess = false
- },
- mergeCancel() {
- this.mergeStateShow = false
- this.weighData.isMerge = 0
- this.MergeState = false
- this.isweigh = true
- this.orderSurplusLess = true
+ mergeStateChange(e) {
+ if (e.length !== 0) {
+ this.weighData.isMerge = 1
+ this.MergeState = true
+ this.isweigh = false
+ this.orderSurplusLess = false
+ } else {
+ this.weighData.isMerge = 0
+ this.MergeState = false
+ this.isweigh = true
+ this.orderSurplusLess = true
+ }
},
}
};
@@ -893,7 +906,7 @@
width: calc(100% - 60rpx);
box-sizing: border-box;
height: 630rpx;
- margin: 0 vww(15) vww(45) vww(15);
+ margin: 0 vww(15) vww(15) vww(15);
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
border-radius: 20rpx;
@@ -940,6 +953,29 @@
}
}
+ .mergeState {
+ width: 100%;
+ margin: vww(4) 0;
+ margin-bottom: vww(10);
+ display: flex;
+ justify-content: center;
+ font-size: vww(16);
+ overflow: hidden;
+
+ .merge-wrap {
+ width: vww(200);
+ height: vww(30);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ .merge-checkbox {
+ margin-top: vww(10);
+ }
+ }
+
+ }
+
.three {
margin: 0 auto vww(30);
flex: 0.7;
--
Gitblit v1.9.1