From fab582b94341913044d17ccd463d97ea20945e3e Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 08 十一月 2023 14:45:15 +0800
Subject: [PATCH] 修改自主配送 修改异常原因提交错误
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
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 548d717..3609e98 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
@@ -237,12 +237,11 @@
:model='abnormalForm'
:rules="rules"
ref="uForm">
- <u-form-item prop="abnormalContent">
+ <u-form-item>
<u-textarea v-model="abnormalForm.abnormalContent"
confirmType="done"
placeholder="璇疯緭鍏ュ紓甯稿師鍥�(瀛楁暟涓嶅皯浜�5涓瓧)"
- height='140'
- count
+ :height='200'
border="surround"
autoHeight></u-textarea>
</u-form-item>
@@ -324,7 +323,8 @@
coalContactHair: 0,
coalContactSkin: 0,
isMerge: '0', //1鏄� 0涓嶆槸 榛樿0 鏄惁鍚堝崱 宸叉棤鐢�
- isBackground: '0'
+ isBackground: '0',
+ abnormalText: ''
},
takeCoalId: null,
weighHouseCode: '',
@@ -368,7 +368,7 @@
errorTipShow: false,
rules: {
abnormalContent: [{
- required: true,
+ required: false,
message: "璇峰～鍐欏紓甯稿師鍥�",
trigger: ['blur', 'change'],
type: 'string'
@@ -424,7 +424,8 @@
this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
.clean < 0) && !this.isSpecial
- this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
+ this.orderSurplusLess = (this.temporaryWeighObj.clean > this.weighList.orderSurplus) && !
+ this.weighList.source
}
} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
.orderType == '杞叆') {
@@ -446,7 +447,8 @@
this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
.clean < 0) && !this.isSpecial
- this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
+ this.orderSurplusLess = (this.temporaryWeighObj.clean > this.weighList.orderSurplus) && !
+ this.weighList.source
}
}
}
@@ -509,7 +511,7 @@
this.weighData.filedId = res.data.filedId;
this.weighData.coalContactHair = res.data.hairTwo ? res.data.hairTwo : 0;
this.weighData.coalContactSkin = res.data.skinTwo ? res.data.skinTwo : 0;
- this.weighList.source = res.data.source
+ this.weighList.source = res.data.source //0鎵嬪姩 1涓嶆槸 鏄�0鍒ゆ柇浣欓噺涓嶈冻
if (this.weighList.orderType == '澶栬喘') {
this.firstHairCustomernameShow = true;
if (this.weighList.hair > 0) {
@@ -691,7 +693,7 @@
},
// 鎻愪氦寮傚父鍘熷洜
abnormalConfirm() {
- this.weighData.abnormalText = this.abnormalContent
+ this.weighData.abnormalText = this.abnormalForm.abnormalContent
this.saveWeigh()
this.abnormalModalShow = false
},
@@ -729,7 +731,8 @@
.slot-content {
width: 96%;
- border: 1rpx solid rgb(220, 223, 230);
+ height: 210rpx;
+ border-bottom: 1rpx solid rgb(220, 223, 230);
}
.table-title {
@@ -984,12 +987,17 @@
}
.three {
- margin: 0 auto vww(30);
- flex: 0.7;
+ width: 60%;
+ height: vww(60);
+ margin: vww(20) auto;
display: flex;
+ justify-content: space-between;
+ align-items: center;
color: #939393;
.u-button {
+ letter-spacing: vww(4);
+
&:nth-of-type(2) {
margin-left: vww(10);
}
--
Gitblit v1.9.1