From 4d7d02bbe9e91f4bdd2f45642775c320260129bc Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 13 七月 2023 15:18:20 +0800
Subject: [PATCH] 验质修改
---
pages/login/login.vue | 2
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 67 ++++++++++++++++++++++++++-------
2 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
index fa844c4..c1352fd 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
@@ -68,28 +68,29 @@
v-model="item.num"></u--input>
</view>
</view>
- <view class="notice-num">
- <view class="num-text">
- <u--text text=" 涓嶅悎鏍煎搧鍚�"
+ <view class="unqualifiedBreed">
+ <view class="num-text"
+ style="width: 160rpx;">
+ <u--text text="涓嶅悎鏍煎搧鍚�"
size='32'></u--text>
</view>
<view class="num-input">
- <u--input placeholder="璇疯緭鍏� 涓嶅悎鏍煎搧鍚�"
- border="bottom"
- clearable
- v-model="item.unqualifiedBreed"></u--input>
+ <u-tag :text="item.unqualifiedBreed||'璇烽�夋嫨'"
+ plain
+ @click='selectunqualifiedBreed(i)'></u-tag>
</view>
</view>
<view class="notice-num">
<view class="num-text">
- <u--text text=" 涓嶅悎鏍奸噸閲�"
+ <u--text text="涓嶅悎鏍奸噸閲�"
size='32'></u--text>
</view>
<view class="num-input">
<u--input placeholder="璇疯緭鍏ヤ笉鍚堟牸閲嶉噺"
border="bottom"
clearable
- v-model="item.unqualifiedWeight"></u--input>
+ v-model="item.unqualifiedWeight"
+ @input='v=>unqualifiedWeightInputHandle(v,i,item.clean)'></u--input>
</view>
</view>
<view class="level"
@@ -102,7 +103,7 @@
<u-tag :text="item.breed+item.spec||item.modifygoodsName||'鏆傛棤'"
plain
@click="goodsPopoverShow(i)"
- v-if='item.breed&&item.spec||roleType===4'></u-tag>
+ v-if='roleType===4'></u-tag>
</view>
<view class="level"
v-if='item.modifygoodsName||flag'>
@@ -130,7 +131,7 @@
</u--image>
</view>
</view>
- <view v-else
+ <view v-else-if='!item.isImage&&!flag'
style="margin-top: 8rpx;">
<u-upload :fileList="item.fileList"
deletable
@@ -151,7 +152,7 @@
:closeOnClickOverlay='true'
@close='goodsNameClose'
@select="goodsselectClick"></u-action-sheet>
- <!-- 浜у搧鍒楄〃 -->
+ <!-- 鍝佸悕涓庤鏍� -->
<view class="">
<u-action-sheet :actions="actionsList"
:show="actionShow"
@@ -159,6 +160,15 @@
:closeOnClickOverlay='true'
@close='productNameClose'
@select="selectClick"></u-action-sheet>
+ </view>
+ <!-- 涓嶅悎鏍煎搧鍚� -->
+ <view class="">
+ <u-action-sheet :actions="actionsList"
+ :show="unqualifiedShow"
+ cancelText='鍙栨秷'
+ :closeOnClickOverlay='true'
+ @close='unqualifiedClose'
+ @select="selectUnqualifiedClick"></u-action-sheet>
</view>
</view>
<view class="confirm-button"
@@ -205,7 +215,10 @@
isModify: false,
// 涓婁紶鍥剧墖
fileList1: [],
- BaseUrl
+ BaseUrl,
+ // 涓嶅悎鏍煎搧鍚�
+ unqualifiedShow: false,
+ unqualifiedIndex: null
};
},
@@ -310,7 +323,7 @@
}, 800)
} else {
this.loading = false
- this.$u.toast('鎿嶄綔澶辫触')
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触')
}
})
},
@@ -332,7 +345,7 @@
this.showWeigh[this.goodsIndex].spec = val.spec
this.showWeigh[this.goodsIndex].weightUnit = val.weightUnit
},
- // 浜у搧鍒楄〃
+ // 鍝佸悕涓庤鏍�
productNamePopoverShow(index) {
if (this.roleType === 4 && !this.flag) {
this.actionShow = true
@@ -351,6 +364,24 @@
discountInputHandle(value, index, clean) {
this.showWeigh[index].cinderWeight = Number(value)
this.showWeigh[index].weight = (clean - (Number(value)).toFixed(2));
+ },
+ // 閫夋嫨涓嶅悎鏍煎搧鍚�
+ selectunqualifiedBreed(index) {
+ if (this.roleType === 4 && !this.flag) {
+ this.unqualifiedShow = true
+ this.unqualifiedIndex = index
+ }
+ },
+ // 涓嶅悎鏍奸噸閲忚緭鍏�
+ unqualifiedWeightInputHandle(value, index, clean) {
+ this.showWeigh[index].weight = (clean - (Number(value)) - this.showWeigh[index].cinderWeight).toFixed(2)
+ console.log(this.showWeigh[index].weight);
+ },
+ unqualifiedClose() {
+ this.unqualifiedShow = false
+ },
+ selectUnqualifiedClick(val) {
+ this.showWeigh[this.unqualifiedIndex].unqualifiedBreed = val.secondCategoryName + val.spec
},
// 鍒犻櫎鍥剧墖
deletePic(event) {
@@ -511,6 +542,12 @@
}
}
+ .unqualifiedBreed {
+ width: 64% !important;
+ margin-left: 70rpx !important;
+ @extend .level;
+ }
+
.level {
width: 60%;
margin-top: 30rpx;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index c510333..162aa5f 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -10,7 +10,7 @@
:disabled="btnLoading"
:loading="btnLoading"
type="primary"
- text="寰俊涓�閿櫥褰�"></u-button>
+ text="鎵嬫満鍙蜂竴閿櫥褰�"></u-button>
</view>
<!-- <view class="loginBtn">
<u-button @click.stop="jumpBindBack"
--
Gitblit v1.9.1