From 0937a09b807ae3d615e2e13d7b254a952b9f99ce Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 21 十一月 2023 16:00:50 +0800
Subject: [PATCH] 称重明细页面样式修改，更改入场增加跳转返回
---
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 275 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 243 insertions(+), 32 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 57e5a2a..6d05657 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
@@ -36,6 +36,7 @@
<view class="num">{{ item.clean }}</view>
</view>
</view>
+ <view v-if="isShow(item) && isYanz()">
<view class="discount">
<view class="rate">
<view class="label-text">
@@ -58,13 +59,14 @@
<view class="label-text">
鎵ｆ福鍚庡噣閲�
</view>
- <view class="count">{{ item.weight }}</view>
+ <view class="count">{{ item.weight || item.clean}}</view>
</view>
</view>
+ </view>
<!-- 鍒ゆ柇鏄惁妫�楠岃川閲� -->
- <view v-if="isShow(item)">
+ <view v-if="isShow(item) && isYanz()">
<view class="level">
- <view style="width: 140rpx;">
+ <view style="width: 180rpx;">
<u--text text="鐗╄祫鏄庣粏"
size='32'></u--text>
</view>
@@ -126,16 +128,21 @@
<u--text text="閫氱煡鏁伴噺"
size='32'></u--text>
</view>
- <view class="num-input"
+ <view class="num-input "
v-if='roleType===4&&!flag'>
- <u--input placeholder="璇疯緭鍏ラ�氱煡鏁伴噺"
+ <u-input placeholder="璇疯緭鍏ラ�氱煡鏁伴噺"
border="bottom"
clearable
- v-model="item.num"></u--input>
+ style="width: 70%;"
+ v-model="item.num">
+ <template slot="suffix">
+ <text class="inp-unit">{{ item.numUnit}}</text>
+ </template>
+ </u-input>
</view>
<view class="num-show"
v-else-if="flag">
- {{item.num}}
+ {{item.num + item.numUnit}}
</view>
</view>
<view class="notice-num">
@@ -147,19 +154,90 @@
<view class="num-input"
v-if='roleType===4&&!flag'
>
- <u--input placeholder="璇疯緭鍏ラ�氱煡閲嶉噺"
+ <u-input placeholder="璇疯緭鍏ラ�氱煡閲嶉噺"
border="bottom"
clearable
- v-model="item.weight1"></u--input>
+ style="width: 70%;"
+ v-model="item.weight1">
+ <template slot="suffix">
+ <text class="inp-unit">{{ item.weightUnit }}</text>
+ </template>
+ </u-input>
</view>
<view class="num-show"
v-else-if="flag">
- {{item.weight1}}
+ {{item.weight1 + item.weightUnit }}
+ </view>
+ </view>
+ <!-- 鏂板鎵ｇ綒绉嶇被銆� 鎵ｇ綒閲戦锛屼笉鍚堟牸鍒ゅ畾绉嶇被-->
+ <view class="notice-num">
+ <view class="num-text"
+ style="margin-left: 10rpx;">
+ <u--text text="鎵ｇ綒绉嶇被"
+ size='32'></u--text>
+ </view>
+ <view class="num-radio"
+ v-if='roleType===4&&!flag'
+ >
+ <u-radio-group size='34' v-model="item.penaltyType">
+ <u-radio :label-size="32" :name="'0'" :label="'鏃犳墸缃�'" :disabled="disabled">鏃犳墸缃�</u-radio>
+ <u-radio :label-size="32" :name="'鍏朵粬鎵ｇ綒'" :label="'鍏朵粬鎵ｇ綒'" :disabled="disabled">鍏朵粬鎵ｇ綒</u-radio>
+ </u-radio-group>
+ </view>
+ <view class="num-show"
+ v-else-if="flag">
+ {{item.penaltyType}}
+ </view>
+ </view>
+ <!-- 鎵ｇ綒閲戦 -->
+ <view class="notice-num" v-if="item.penaltyType == '鍏朵粬鎵ｇ綒'">
+ <view class="num-text"
+ style="margin-left: 10rpx;">
+ <u--text text="鎵ｇ綒閲戦"
+ size='32'></u--text>
+ </view>
+ <view class="num-input"
+ v-if='roleType===4&&!flag'
+ >
+ <u--input placeholder="璇疯緭鍏ユ墸缃氶噾棰�"
+ border="bottom"
+ clearable
+ v-model="item.penaltyAmount"></u--input>
+ </view>
+ <view class="num-show"
+ v-else-if="flag">
+ {{item.penaltyAmount}}
+ </view>
+ </view>
+ <!--涓嶅悎鏍煎垽瀹氱绫� -->
+ <view class="notice-num" v-if="item.penaltyType == '鍏朵粬鎵ｇ綒'" >
+ <view class="num-text"
+ style="margin-left: 10rpx;">
+ <u--text text="涓嶅悎鏍煎垽瀹�"
+ size='32'></u--text>
+ </view>
+ <view class="num-radio"
+ v-if='roleType===4&&!flag'
+ @click.stop="onFoucus"
+ style="height: 50rpx;"
+ >
+ <u-radio-group size='32' v-model="item.unqualifiedType">
+ <u-radio :label-size="25" :name="1" :label="'闀垮害鎵ｇ綒'" :disabled="disabled">闀垮害鎵ｇ綒</u-radio>
+ <u-radio :label-size="25" :name="'2'" :label="'鍘氬害鎵ｇ綒'" :disabled="disabled">鍘氬害鎵ｇ綒</u-radio>
+ <u-radio :label-size="25" :name="'3'" :label="'瀵嗛棴鍣�'" :disabled="disabled">瀵嗛棴鍣�</u-radio>
+ </u-radio-group>
+ </view>
+ <view class="num-show"
+ v-else-if="flag">
+ <text> {{item.unqualifiedType == 1 ? '闀垮害鎵ｇ綒' : item.unqualifiedType == 2 ? '鍘氬害鎵ｇ綒' :item.unqualifiedType == 3 ? '瀵嗛棴鍣�' : null }} </text>
</view>
</view>
</view>
- <u-empty v-else icon-size="200" text="''" >
+ <u-empty v-if=" isYanz() && !isShow(item) " icon-size="200" text="''" >
<text>鏆傛湭楠岃川</text>
+ </u-empty>
+ <u-empty v-if="!isYanz()" icon-size="200" text="''" >
+ <text>鏆傛棤鏁版嵁</text>
</u-empty>
<view style="display: flex;margin-top: 20rpx;margin-left: 20rpx;"
v-if="item.isImage">
@@ -215,6 +293,49 @@
@select="selectUnqualifiedClick"></u-action-sheet>
</view>
</view>
+ <!-- 鏂板 楠岃川澶囨敞銆傞獙璐ㄨ鏄� -->
+ <view v-if=" isYanz()">
+ <view v-if="coalDetailsData.orderType == '澶栬喘'">
+ <view style="padding: 10rpx;">
+ <u-row >
+ <u-col span="24" >
+ <view class="demo-layout bg-purple-light" style="display: flex;">
+ <text style="font-size: 32rpx;">楠岃川璇存槑锛�</text>
+ <view style="display: inline-block;"
+ v-if='roleType===4&&!flag'
+ >
+ <u--input placeholder="璇疯緭鍏ラ獙璐ㄨ鏄�"
+ border="bottom"
+ clearable
+ v-model="qualityInstructions"></u--input>
+ </view>
+ <view class="num-show"
+ v-else-if="flag">
+ {{ qualityInstructions }}
+ </view>
+ </view>
+ </u-col>
+ </u-row>
+ </view>
+ <view style="padding: 10rpx;">
+ <u-row >
+ <u-col span="24">
+ <view class="demo-layout bg-purple-light" >
+ <text style="font-size: 32rpx;">楠岃川澶囨敞锛�</text>
+ <view style="width: 50%;"
+ v-if='roleType===4&&!flag'
+ >
+ <u-textarea border="surround" v-model="remarks" ref="textarea" placeholder="璇疯緭鍏ラ獙璐ㄥ娉�"></u-textarea>
+ </view>
+ <view class="num-show"
+ v-else-if="flag">
+ {{ remarks }}
+ </view>
+ </view>
+ </u-col>
+ </u-row>
+ </view>
+ </view>
<view class="confirm-button"
v-if='roleType===4&&!flag'>
<u-button type="primary"
@@ -224,13 +345,15 @@
:loading="loading"
loading-text="纭"></u-button>
</view></view>
+ </view>
+
<!-- 鐗╂枡鏄庣粏 -->
<view v-if="!current">
<view class="main-block"
v-for="(item,i) in goodsList"
:key="item.id">
<view class="level">
- <view style="width: 140rpx;">
+ <view style="width: 180rpx;">
<u--text text="鐗╄祫鍚嶇О"
size='32'></u--text>
</view>
@@ -325,8 +448,29 @@
export default {
data() {
return {
+ qualityInstructions:"",
+ remarks:'',
+ selectlist:[
+ {
+ value: '1',
+ name:'闀垮害鎵ｇ綒',
+ fontSize:'40'
+ },
+ {
+ value: '2',
+ name:'鍘氬害鎵ｇ綒',
+ fontSize:'40'
+
+ },
+ {
+ value: '3',
+ name:'瀵嗛棴鍣�',
+ fontSize:'40'
+ }
+ ],
orderPlanId: "",
title: '绱犺儦鍕惧嫆鍑洪潚鑺憋紝绗旈攱娴撹浆娣�',
+ isWeighingType:'',
subTitle: '2020-05-15',
thumb: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg',
coalDetailsData: {},
@@ -395,6 +539,23 @@
return uni.getStorageSync('roleType')!== 4 && item.iszj == 1 ? true : uni.getStorageSync('roleType')== 4 ? true : false;
// 宸茬粡楠岃川
}
+ },
+ //鍒ゆ柇闇�涓嶉渶瑕侀獙璐�
+ isYanz(){
+ return function(item){
+ // return ( this.coalDetailsData.orderType !=='澶栬喘' || this.coalDetailsData.weighingType !=='鍥炵') ? false : true;
+ if(this.coalDetailsData.orderType =='澶栬喘'){
+ if(this.coalDetailsData.weighingType == '鍥炵'){
+ return true
+ }else{
+ return false
+ }
+ }else if(this.coalDetailsData.orderType =='澶栭攢'){
+ return false;
+
+ }
+ // 宸茬粡楠岃川
+ }
}
},
mounted() {
@@ -420,10 +581,13 @@
if (res.code == 0) {
uni.hideLoading()
this.coalDetailsData = res.data;
+ this.remarks = res.data.remarks;
+ this.qualityInstructions = res.data.qualityInstructions
this.orderCode = res.data.orderCode
this.showWeigh = this.coalDetailsData.tmTaskCoalItems ? this.coalDetailsData
.tmTaskCoalItems : [];
this.showWeigh = this.showWeigh.map(v => {
+ if(!v.penaltyType) v.penaltyType = '0'
return {
...v,
modifyProductName: '',
@@ -440,6 +604,11 @@
} else {
this.changeglobalShowWeigh(uni.getStorageSync('showWeighCopyStorge'))
}
+ //绉伴噸鏄庣粏鏃犳暟鎹椂鏄剧ず鐗╄祫鏄庣粏
+ if(!this.coalDetailsData.tmTaskCoalItems.length){
+ this.current = 0;
+ }
+ this.isWeighingType = res.data.weighingType //褰撳墠纾呭崟鏄惁鍥炵
} else {
this.$u.toast('鍔犺浇澶辫触')
uni.hideLoading()
@@ -485,8 +654,15 @@
},
// 鐐瑰嚮纭
confirmInput() {
- this.loading = true
+ this.loading = true;
+ let params = {};
+ params.qualityInstructions = this.qualityInstructions;
+ params.remarks = this.remarks;
this.showWeigh = this.showWeigh.map((v, i) => {
+ if(!v.penaltyType) {
+ v.penaltyAmount = '';
+ v.unqualifiedType = '';
+ }
return {
...v,
unqualifiedBreed: this.globalShowWeigh[i].unqualifiedBreed ? this.globalShowWeigh[i]
@@ -497,7 +673,8 @@
}
})
- this.$reqPost('updateTmTaskCoalItem', this.showWeigh, 'json').then(
+ params.tmTaskCoalItems = this.showWeigh;
+ this.$reqPost('updateTmTaskCoalItem', params, 'json').then(
res => {
if (res.code == 0) {
this.loading = false
@@ -512,6 +689,20 @@
this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触')
}
})
+ },
+ // 鏍￠獙鏁版嵁鏄惁鍚堟牸
+ checkValue(data,target){
+ if(!data.length){
+ return
+ }
+ let flag = data.find(item=>item[target] <=0);
+ console.log(flag,'flag');
+ if(flag){
+ return false
+ }else{
+ return true;
+ }
+
},
// 鐗╄祫鏄庣粏
goodsPopoverShow(index) {
@@ -533,6 +724,7 @@
this.showWeigh[this.goodsIndex].breed = val.breed
this.showWeigh[this.goodsIndex].spec = val.spec
this.showWeigh[this.goodsIndex].weightUnit = val.weightUnit
+ this.showWeigh[this.goodsIndex].weight1 = val.weight;
},
// 鍝佸悕涓庤鏍�
productNamePopoverShow(index) {
@@ -555,13 +747,18 @@
// 鎶樻墸鐜囪緭鍏�
discountInputHandle(value, index, clean) {
console.log('璁＄畻鍑�閲�',value, index, clean)
- value = Number(value)
- this.showWeigh[index].cinderWeight = Number(value)
- if (clean) {
- let x = new BigNumber(clean)
- let y = new BigNumber(value)
- this.showWeigh[index].weight = x.minus(y).toFixed(2)
- }
+ this.showWeigh[index].cinderWeight = (value - 0)
+ let x = new BigNumber(clean - 0)
+ let y = new BigNumber(value - 0)
+ let z = new BigNumber(this.showWeigh[index].unqualifiedWeight - 0)
+ console.log(clean,value,this.showWeigh[index].unqualifiedWeight - 0,'鎵ｆ福');
+ if(x.minus(y).minus(z).toFixed(2) <= 0){
+ this.showWeigh[index].weight = '0';
+ this.$u.toast('褰撳墠鍑�閲嶄笉鍚堟牸锛岃妫�鏌ョ毊閲嶏紝姣涢噸鏄惁鍑嗙‘')
+ }else{
+ this.showWeigh[index].weight = x.minus(y).minus(z).toFixed(2)
+ }
+
},
// 閫夋嫨涓嶅悎鏍煎搧鍚�
@@ -582,17 +779,18 @@
},
// 涓嶅悎鏍奸噸閲忚緭鍏�
unqualifiedWeightInputHandle(value, index, clean) {
- value = value + 0;
- let x = new BigNumber(clean)
- let y = new BigNumber(value)
- let z;
- if(!this.showWeigh[index].cinderWeight){
- z = 0;
- }else{
- z = new BigNumber(this.showWeigh[index].cinderWeight);
- }
- console.log(value, index, clean,'涓嶅悎鏍奸噸閲忚緭鍏�')
- this.showWeigh[index].weight = x.minus(y).minus(z).toFixed(2) || ''
+ // 鍒ゆ柇鏄笉鏄湁鍑�閲嶆墠杩涜璁＄畻
+ let x = new BigNumber(clean - 0)
+ let y = new BigNumber(value - 0)
+ let z = new BigNumber(this.showWeigh[index].cinderWeight - 0);
+ if(x.minus(y).minus(z).toFixed(2) <= 0){
+ this.showWeigh[index].weight = '0';
+ this.$u.toast('褰撳墠鍑�閲嶄笉鍚堟牸锛岃妫�鏌ョ毊閲嶏紝姣涢噸鏄惁鍑嗙‘')
+ }else{
+ this.showWeigh[index].weight = x.minus(y).minus(z).toFixed(2) ;
+ }
+
+
},
// 鍒犻櫎鍥剧墖
deletePic(event) {
@@ -641,6 +839,14 @@
//鐐瑰嚮tab 鍒囨崲灞曠ず鏄庣粏
tabChange(val){
this.current = val;
+ },
+ //涓嬫媺妗嗚仛鐒︽椂闂�
+ onFoucus(val){
+ this.focusSelect = true;
+
+ },
+ closeEvent(){
+ this.focusSelect = false;
}
},
}
@@ -754,6 +960,11 @@
.num-input {
width: 60%;
border-bottom: 1px solid rgb(218, 219, 222);
+ position: relative;
+ }
+ .num-radio{
+ width: 60%;
+ font-size: 100rpx;
}
.num-show {
--
Gitblit v1.9.1