From 5248cfc3ad49d0b5ba3339eb6da29af168b372c1 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 28 二月 2024 14:39:29 +0800
Subject: [PATCH] fix:打印磅禁止点击修复
---
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 493 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 343 insertions(+), 150 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 4a43ec4..a28171e 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
@@ -52,22 +52,30 @@
@input='v=>discountInputHandle(v,i,item.clean)'></u--input>
</view>
<view v-else-if='flag'
- class="count">{{ item.cinderWeight }}
+ class="count">{{ item.cinderWeight ? item.cinderWeight + '鍚�' :"" }}
</view>
</view>
<!-- 鍑�閲峝iv -->
<view class="weight-box">
<view class="weigh-qualified">
- <view>
- 鍚堟牸鍑�閲嶏細
+ <view v-if="!unqualifiedArr(i).length">
+
+ <view> 鎵ｆ福鍚庡噣閲嶏細<text class="count"> {{ cleanWeight(item) ? cleanWeight(item) + '鍚�' : ''}}</text></view>
</view>
- <view class="count"> {{ cleanWeight(item) }}</view>
+ <view v-else-if ='unqualifiedArr(i).length && item.clean' class='weigh-qualified-no'>
+ <view > 鎵ｆ福鍚庡噣閲嶏細<text class="count">{{ cleanWeight(item) ? cleanWeight(item) + '鍚�' : '' }}</text></view>
+ <view > 鍚堟牸鍑�閲嶏細 <text class="count">{{ qualifiedWeight(item,i) ? qualifiedWeight(item,i) + '鍚�' : '' }}</text></view>
+ </view>
+ <view v-else-if ='unqualifiedArr(i).length && !item.clean' class='weigh-qualified-no'>
+
+ </view>
+
</view>
<view class="weigh-qualified" v-for="el,index in unqualifiedArr(i)">
<view>
涓嶅悎鏍煎噣閲嶏細
</view>
- <view class="count"> {{el.unqualifiedWeight || ''}}</view>
+ <view class="count"> {{el.unqualifiedWeight ? el.unqualifiedWeight + '鍚�' : ''}}</view>
</view>
</view>
@@ -83,39 +91,55 @@
</view>
<view style="font-size: 35rpx;">{{ coalDetailsData.customerName || '' }}</view>
</view>
-
- <view class="level">
- <view style="width: 180rpx;">
- <u--text text="鐗╂枡鍚嶇О"
- size='32'></u--text>
-
- </view>
- <view style="font-size: 35rpx;">{{ (coalDetailsData.coalName ? coalDetailsData.coalName: '') }}</view>
- </view>
- <view class="level">
+ <!-- 鐗╄祫鏄庣粏 -->
+ <view class="level" v-if="!flag">
<view style="width: 180rpx;">
<u--text text="鐗╄祫鏄庣粏"
size='32'></u--text>
</view>
<view class="tag-select"
- @click="goodsPopoverShow(i)"
+ @click="goodsPopoverShow(i,'goods')"
v-if='roleType===4'>
<text>
- {{item.breed+"/"+item.spec||item.modifygoodsName||'鏆傛棤'}}
+ {{item.newModifygoodsName || item.breed+"/"+item.spec||item.modifygoodsName||'鏆傛棤'}}
</text>
</view>
</view>
+ <view class="level">
+ <view style="width: 180rpx;">
+ <u--text text="鍝佸悕"
+ size='32'></u--text>
+
+ </view>
+ <!-- (coalDetailsData.coalName ? coalDetailsData.coalName: '') -->
+ <view class="tag-select" @click="productNamePopoverShow(i)">{{ item.breed }}</view>
+ </view>
+
<view class="level"
v-if='item.modifygoodsName ||globalShowWeigh[i].modifyProductName'>
<view style="width: 180rpx;">
- <u--text text="鍝佸悕涓庤鏍�"
+ <u--text text="瑙勬牸"
size='32'></u--text>
</view>
<view class="tag-select"
@click="productNamePopoverShow(i)">
+ <!-- !flag?(globalShowWeigh[i].modifyProductName?globalShowWeigh[i].modifyProductName:item.modifygoodsName):(item.breed+'/'+item.spec) -->
<text>
- {{!flag?(globalShowWeigh[i].modifyProductName?globalShowWeigh[i].modifyProductName:item.modifygoodsName):(item.breed+'/'+item.spec)}}
+ {{item.spec}}
+ </text>
+ </view>
+
+ </view>
+ <view class="level" v-if="flag">
+ <view style="width: 180rpx;">
+ <u--text text="瑙勬牸"
+ size='32'></u--text>
+ </view>
+ <view class="tag-select">
+ <!-- !flag?(globalShowWeigh[i].modifyProductName?globalShowWeigh[i].modifyProductName:item.modifygoodsName):(item.breed+'/'+item.spec) -->
+ <text>
+ {{item.spec}}
</text>
</view>
@@ -162,6 +186,7 @@
<u-input placeholder="璇疯緭鍏ラ�氱煡鏁伴噺"
border="bottom"
clearable
+ disabled
style="width: 70%;"
v-model="item.num">
<template slot="suffix">
@@ -186,6 +211,7 @@
<u-input placeholder="璇疯緭鍏ラ�氱煡閲嶉噺"
border="bottom"
clearable
+ disabled
style="width: 70%;"
v-model="item.weight1">
<template slot="suffix">
@@ -218,70 +244,6 @@
{{item.penaltyType == '0' ? '鏃犳墸缃�' : '鍏朵粬鎵ｇ綒'}}
</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-input"
- v-if='roleType===4&&!flag'
- >
- <u-input placeholder="璇疯緭鍏ユ墸缃氶噾棰�"
- border="bottom"
- clearable
- v-model="item.penaltyAmount">
- <template slot="suffix">
- <text class="inp-unit">鍏�</text>
- </template>
- </u-input>
- </view>
- <view class="num-show"
- v-else-if="flag" >
- {{item.penaltyAmount ? item.penaltyAmount + '鍏�' :""}}
- </view>
- </view>
-
- <!-- <view class="notice-num" v-if="item.penaltyType.includes('2')">
- <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.thickPenaltyAmount"></u--input>
- </view>
- <view class="num-show"
- v-else-if="flag && item.penaltyType.split(',').includes('2')">
- {{item.thickPenaltyAmount}}
- </view>
- </view>
-
- <view class="notice-num" v-if="item.penaltyType.includes('3')">
- <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.obturatorPenaltyAmount"></u--input>
- </view>
- <view class="num-show"
- v-else-if="flag && item.penaltyType.split(',').includes('3')">
- {{item.obturatorPenaltyAmount}}
- </view>
- </view> -->
<!-- 鍗曚环 -->
<view class="notice-num">
<view class="num-text"
@@ -306,11 +268,116 @@
{{item.unitPrice ? item.unitPrice + '鍏�' : ''}}
</view>
</view>
+ <!-- 鎵ｇ綒瀹瑰櫒 -->
+ <view class="kouFa-box">
+ <!-- 瓒呭昂鎵ｇ綒閲戦 -->
+ <view class="notice-num koufaBox-item">
+ <view class="num-text"
+ v-if="(roleType===4&&!flag) || (flag && item.oveForfeit)"
+ style="margin-left: 10rpx;">
+ <u--text text=" 瓒呭昂鎵ｇ綒"
+ size='29'></u--text>
+ </view>
+ <view class="num-input"
+ v-if='roleType===4&&!flag'
+ >
+ <u-input
+ v-model="item.oveForfeit"
+ placeholder="璇疯緭鍏�"
+ border="bottom"
+ clearable
+ >
+ <template slot="suffix">
+ <text class="inp-unit">鍏�</text>
+ </template>
+ </u-input>
+ </view>
+ <view class="num-show"
+ v-else-if="flag && item.oveForfeit" >
+ {{ item.oveForfeit + '鍏�'}}
+ </view>
+ </view>
+
+ <view class="notice-num koufaBox-item" >
+ <view class="num-text"
+ v-if="(roleType===4&&!flag) || (flag && item.thiForfeit)"
+ style="margin-left: 10rpx;">
+ <u--text text="鍘氬害鎵ｇ綒"
+ size='29'></u--text>
+ </view>
+ <view class="num-input"
+ v-if='roleType===4&&!flag'
+ >
+ <u-input placeholder="璇疯緭鍏�"
+ border="bottom"
+ clearable
+ v-model="item.thiForfeit">
+ <template slot="suffix">
+ <text class="inp-unit">鍏�</text>
+ </template>
+ </u-input>
+ </view>
+ <view class="num-show"
+ v-else-if="flag && item.thiForfeit">
+ {{ item.thiForfeit+ '鍏�' }}
+ </view>
+ </view>
+
+ <view class="notice-num koufaBox-item" >
+ <view class="num-text"
+ v-if="(roleType===4&&!flag) || (flag && item.obtForfeit)"
+ style="margin-left: 10rpx;">
+ <u--text text="瀵嗛棴鍣�"
+ size='29'></u--text>
+ </view>
+ <view class="num-input"
+ v-if='roleType===4&&!flag'
+ >
+ <u-input placeholder="璇疯緭鍏�"
+ border="bottom"
+ clearable
+ v-model="item.obtForfeit">
+ <template slot="suffix">
+ <text class="inp-unit">鍏�</text>
+ </template></u-input>
+ </view>
+ <view class="num-show"
+ v-else-if="flag && item.obtForfeit">
+ {{ item.obtForfeit+ '鍏�' }}
+ </view>
+ </view>
+
+ <view class="notice-num koufaBox-item">
+ <view class="num-text"
+ v-if="(roleType===4&&!flag) || (flag && item.othForfeit)"
+ style="margin-left: 10rpx;">
+ <u--text text="鍏朵粬鎵ｇ綒"
+ size='29'></u--text>
+ </view>
+ <view class="num-input"
+ v-if='roleType===4&&!flag'
+ >
+ <u-input placeholder="璇疯緭鍏�"
+ border="bottom"
+ clearable
+ v-model="item.othForfeit">
+ <template slot="suffix">
+ <text class="inp-unit">鍏�</text>
+ </template></u-input>
+ </view>
+ <view class="num-show"
+ v-else-if="flag && item.othForfeit">
+ {{ item.othForfeit+ '鍏�'}}
+ </view>
+ </view>
+ </view>
+
+
<!--涓嶅悎鏍煎垽瀹氱绫� -->
- <view class="notice-num">
+ <!-- <view class="notice-num">
<view class="num-text"
style="margin-left: 10rpx;">
- <u--text text="涓嶅悎鏍煎垽瀹�"
+ <u--text text="鎵ｇ綒绫诲瀷"
size='32'></u--text>
</view>
<view class="num-radio"
@@ -318,21 +385,18 @@
@click.stop="onFoucus"
style="height: 50rpx;"
>
- <u-radio-group size='32' v-model="item.penaltyType">
- <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>
- <!-- <u-checkbox-group
+ <u-checkbox-group
placement="row"
size="32"
- v-model="item.penaltyType"
+ :value="this.penaltyType"
+ ref="checkbox"
@change="(event)=>checkboxChange(event,item)"
>
- <u-checkbox :label-size="25" :name="'1'" :label="'瓒呭昂鎵ｇ綒'" :disabled="disabled">瓒呭昂鎵ｇ綒</u-checkbox>
- <u-checkbox :label-size="25" :name="'2'" :label="'鍘氬害鎵ｇ綒'" :disabled="disabled">鍘氬害鎵ｇ綒</u-checkbox>
- <u-checkbox :label-size="25" :name="'3'" :label="'瀵嗛棴鍣�'" :disabled="disabled">瀵嗛棴鍣�</u-checkbox>
- </u-checkbox-group> -->
+ <u-checkbox :label-size="25" :name="'1'" :label="'瓒呭昂鎵ｇ綒'" :value="item.penaltyAmount" :checked="item.penaltyAmount" :disabled="disabled">瓒呭昂鎵ｇ綒</u-checkbox>
+ <u-checkbox :label-size="25" :name="'2'" :label="'鍘氬害鎵ｇ綒'" :value="item.thickPenaltyAmount" :checked="item.thickPenaltyAmount" :disabled="disabled">鍘氬害鎵ｇ綒</u-checkbox>
+ <u-checkbox :label-size="25" :name="'3'" :label="'瀵嗛棴鍣�'" :value="item.obturatorPenaltyAmount" :checked="item.obturatorPenaltyAmount" :disabled="disabled">瀵嗛棴鍣�</u-checkbox>
+ <u-checkbox :label-size="25" :name="'4'" :label="'鍏朵粬鎵ｇ綒'" :value="item.qita" :checked="item.qita" :disabled="disabled">鍏朵粬鎵ｇ綒</u-checkbox>
+ </u-checkbox-group>
</view>
<view class="num-show"
v-else-if="flag">
@@ -341,7 +405,7 @@
</view>
</view>
- </view>
+ </view> -->
</view>
<u-empty v-if=" isYanz() && !isShow(item) " icon-size="200" text="''" >
<text>鏆傛湭楠岃川</text>
@@ -357,7 +421,9 @@
<u--image :showLoading="true"
:src="`${BaseUrl}${val}`"
width="80px"
- height="80px">
+ height="80px"
+ @click="imageClick(val)"
+ >
<view slot="error"
style="font-size: 24rpx;">鍔犺浇澶辫触</view>
</u--image>
@@ -376,7 +442,7 @@
height="150"
:previewFullImage="true">
</u-upload>
- </view>
+ </view>
<u--list
:height="0"
style=" margin-left: 50rpx;margin-top: 30rpx;"
@@ -405,7 +471,19 @@
<view class="tag-select">
<text>
<!-- {{!flag?(globalShowWeigh[i].unqualifiedBreed?globalShowWeigh[i].unqualifiedBreed:item.unqualifiedBreed):(item.unqualifiedBreed||"璇烽�夋嫨")}} -->
- {{ el.unqualifiedBreed }}
+ {{ el.unsecondClass }}
+ </text>
+ </view>
+ </view>
+ <view class="unqualifiedBreed">
+ <view style="width: 180rpx;">
+ <u--text text="涓嶅悎鏍艰鏍�"
+ size='32'></u--text>
+ </view>
+ <view class="tag-select">
+ <text>
+ <!-- {{!flag?(globalShowWeigh[i].unqualifiedBreed?globalShowWeigh[i].unqualifiedBreed:item.unqualifiedBreed):(item.unqualifiedBreed||"璇烽�夋嫨")}} -->
+ {{ el.unSpecifications }}
</text>
</view>
</view>
@@ -480,7 +558,7 @@
</u--list>
<!-- 澧炲姞涓嶅悎鏍艰鐭� -->
- <button class="addBtn" v-if="isShow(item) && isYanz()" type="primary" :plain="false" @click="addUnqualified(i)">娣诲姞涓嶅悎鏍煎搧绫�</button>
+ <button class="addBtn" v-if="isShow(item) && isYanz()" type="primary" :plain="false" @click="addUnqualified(i)">涓嶅悎鏍煎垽瀹�</button>
<!-- 鐗╄祫鏄庣粏 -->
<u-action-sheet :actions="goodsList"
:show="goodsShow"
@@ -512,7 +590,7 @@
<view v-if="coalDetailsData.orderType == '澶栬喘'">
<view style="padding: 10rpx;">
<u-row >
- <u-col span="24" >
+ <!-- <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;"
@@ -528,7 +606,7 @@
{{ qualityInstructions }}
</view>
</view>
- </u-col>
+ </u-col> -->
</u-row>
</view>
<view style="padding: 10rpx;">
@@ -647,9 +725,20 @@
@close='unqualifiedClose'
@select="selectUnqualifiedClick"></u-action-sheet>
</view>
+
</view>
</view>
-
+ <!-- 鍥剧墖棰勮寮瑰嚭妗� -->
+ <view class="previewImage-container">
+ <u-popup :show="previewImageShow"
+ mode="center"
+ @close="previewImageClose"
+ @open="previewImageOpen">
+ <u--image :src="previewImageSrc != null ? BaseUrl + previewImageSrc : ''"
+ width="400px"
+ height="400px"></u--image>
+ </u-popup>
+ </view>
</view>
</template>
@@ -662,7 +751,10 @@
export default {
data() {
return {
+ previewImageShow:false,
qualityInstructions:"",
+ previewImageSrc: '',
+ penaltyType:[],
indexFlag:0, // 涓嬫爣鏍囧織浣�
remarks:'',
checkboxList:[
@@ -797,7 +889,6 @@
let noPin = [];
let noPrice = [];
const item = this.globalShowWeigh[index];
- console.log(this.globalShowWeigh[index],'index')
if(item){
if(item.unqualifiedBreed){
arr = item.unqualifiedBreed.split(",");
@@ -816,7 +907,11 @@
// }
let result = arr.length && arr.map((el,index)=>{
- let obj = {unqualifiedBreed:el,unqualifiedWeight:temp[index],unqualifiedType:noPin[index],penaltyUnitPrice:noPrice[index]}
+ const pinming = el.split("/")[0];
+ const guige = el.split("/")[1];
+ let obj = {unqualifiedBreed:el,unqualifiedWeight:temp[index],unqualifiedType:noPin[index],penaltyUnitPrice:noPrice[index],
+ unsecondClass:pinming,unSpecifications:guige
+ }
return obj
})
console.log(result,temp,'arr')
@@ -832,18 +927,44 @@
},
cleanWeight(){
return function(item){
- console.log(item,'itemsssss')
- if(!item.weight){
- return ''
- }else if(item.weight && !item.unqualifiedWeight){
+ // if(!item.weight){
+ // return ''
+ // }else if(item.weight && !item.unqualifiedWeight){
+ // return item.weight
+ // }else if(item.weight && item.unqualifiedWeight){
+ // return item.weight
+ // }
+ if(item.weight){
return item.weight
- }else if(item.weight && item.unqualifiedWeight){
- return (item.weight - (item.unqualifiedWeight - 0)).toFixed(2)
- }else{
+ }else if(!item.clean){
return ''
+
+ } else if(item.clean && !item.unqualifiedWeight){
+ return item.clean
+ }else if(item.clean && item.cinderWeight){
+ return new BigNumber(item.clean - 0).minus(item.cinderWeight - 0);
}
+ console.log(item,'clearnWeight')
+ }
+ },
+ //鍚堟牸鍑�閲�
+ qualifiedWeight(){
+ return function(item,i){
+ console.log(item,'itemnsssajdakdj');
+ let znums;
+ if(this.globalShowWeigh[i].unqualifiedWeights){
+ znums = this.globalShowWeigh[i].unqualifiedWeights.split(',')
+ }else{
+ znums = []
+ }
+ let z = new BigNumber(znums.reduce((p,n)=>{
+ return (p - 0) + (n - 0)
+ },0))
+ let y = new BigNumber(item.cinderWeight)
+ return new BigNumber(item.clean - 0).minus(z).minus(y);
}
}
+
},
@@ -861,9 +982,17 @@
this.havedSubmit = params.havedSubmit === "true" || false;
console.log(this.havedSubmit,'this.havedSubmit')
uni.$on("handClick", res => {
- console.log(res.tempArr);
- this.showWeigh[res.index].tempArr = res.tempArr;
- // 娓呴櫎鐩戝惉
+ console.log(res,'22222222222');
+ if(res.pageFlag){
+ //涓嶅悎鏍肩殑
+ this.showWeigh[res.index].tempArr = res.tempArr;
+ }else{
+ //鍚堟牸
+ this.showWeigh[res.index].breed = res.data.secondClass;
+ this.showWeigh[res.index].spec = res.data.specifications;
+ this.showWeigh[res.index].firstClass = res.data.firstClass;
+ }
+
})
},
@@ -881,26 +1010,39 @@
// let y = new BigNumber(value - 0) // 鍥犱负value 鏄� 0 鎵�浠ラ渶瑕佸惊鐜� 鍙栧噺
let z = new BigNumber(this.showWeigh[index].cinderWeight - 0);
let y;
- if(value.filter(Boolean) .length){
- y = value.reduce((p,n)=>{
- return (p - 0) + (n - 0);
- },0);
+ // if(value.filter(Boolean) .length){
+ // y = value.reduce((p,n)=>{
+ // return (p - 0) + (n - 0);
+ // },0);
- }else{
- y = 0;
- }
+ // }else{
+ // y = 0;
+ // }
if(clean){
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) ;
+ this.showWeigh[index].weight = x.minus(z).toFixed(2) ;
}
}
},
checkboxChange(n,item) {
+ if(!n.includes('1')){
+ item.penaltyAmount = ''
+ }
+ if(!n.includes('2')){
+ n.thickPenaltyAmount = ''
+ }
+ if(!n.includes('3')){
+ item.obturatorPenaltyAmount = ''
+ }
+ if(!n.includes('4')){
+ item.qita = ''
+ }
+
},
getTakeCoal() {
@@ -922,7 +1064,6 @@
}else{
v.tempArr = JSON.parse(v.tempArr)
}
-
return {
...v,
modifyProductName: '',
@@ -967,6 +1108,13 @@
})
})
},
+ previewImageClose() {
+ this.previewImageShow = false;
+ },
+ previewImageOpen() {
+ this.previewImageShow = true;
+ console.log('preview open');
+ },
GetOrderPlan() {
uni.showLoading({ title: '鍔犺浇涓�...' });
this.$reqGet('GetOrderPlan').then(res => {
@@ -994,28 +1142,27 @@
}
})
},
+ imageClick(imgStr){
+ console.log(imgStr,'瑙﹀彂')
+ this.previewImageSrc = imgStr;
+
+ this.$nextTick(() => {
+ this.previewImageShow = true;
+ });
+
+
+ },
// 鐐瑰嚮纭
confirmInput() {
let flag = true;
let params = {},unqualifiedWeightAll;
params.qualityInstructions = this.qualityInstructions;
params.remarks = this.remarks;
+ console.log( this.showWeigh,' this.showWeigh')
this.showWeigh = this.showWeigh.map((v, i) => {
+ console.log(this.penaltyType,this.$refs.checkbox,'123')
// let tempArr = v.penaltyType.split(',');
v.unqualifiedType = '';
- if(!v.unitPrice){
- flag = false;
- }
- // if(!v.penaltyType.includes('1')){
- // v.penaltyAmount = ''
- // }
- // if(!v.penaltyType.includes('2')){
- // v.thickPenaltyAmount = ''
- // }
- // if(!v.penaltyType.includes('3')){
- // v. obturatorPenaltyAmount = ''
- // }
-
if(this.globalShowWeigh[i].unqualifiedWeights){
unqualifiedWeightAll = this.globalShowWeigh[i].unqualifiedWeights.split(",").reduce((p,n)=>{return (p - 0) + (n - 0)},0).toFixed(2) || ''
}else{
@@ -1029,15 +1176,16 @@
inspectionJpg: v.fileList.map(v => v.url.replace(BaseUrl, '')).join(','),
unqualifiedWeights :this.globalShowWeigh[i].unqualifiedWeights ? this.globalShowWeigh[i].unqualifiedWeights : 0,
unqualifiedWeight :unqualifiedWeightAll ,
- penaltyType:v.penaltyType,
tempArr:this.globalShowWeigh[i].tempArr ? JSON.stringify(this.globalShowWeigh[i].tempArr) : '',
penaltyUnitPrice:this.globalShowWeigh[i].penaltyUnitPrice,
}
});
- if(flag){
+ // if(flag){
this.loading = true;
params.tmTaskCoalItems = this.showWeigh;
+ console.log(params,'params')
+
this.$reqPost('updateTmTaskCoalItem', params, 'json').then(
res => {
if (res.code == 0) {
@@ -1053,10 +1201,10 @@
this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触')
}
})
- }else{
- this.$u.toast('璇疯緭鍏ュ崟浠�')
- return
- }
+ // }else{
+ // this.$u.toast('璇疯緭鍏ュ崟浠�')
+ // return
+ // }
},
// 鏍￠獙鏁版嵁鏄惁鍚堟牸
@@ -1086,6 +1234,7 @@
},
goodsselectClick(val) {
this.showWeigh[this.goodsIndex].modifygoodsName = val.name
+ this.showWeigh[this.goodsIndex].newModifygoodsName = val.breed + '/' + val.breed//鏂板鍖哄垎鐗╄祫鏄庣粏 涓� 淇敼鍚庣殑鍝佸悕 瑙勬牸
this.showWeigh[this.goodsIndex].itemId = val.itemId
this.showWeigh[this.goodsIndex].num = val.num
this.showWeigh[this.goodsIndex].numUnit = val.numUnit
@@ -1101,7 +1250,7 @@
// this.actionShow = true
// this.actionIndex = index
uni.navigateTo({
- url: `/pages/public-page/selectSpecifications/selectSpecifications?index=${index}&takeCoalId=${this.orderPlanId}&productName=${this.willProductName}&pageFlag=${false}`
+ url: `/pages/public-page/selectSpecifications/selectSpecifications?index=${index}&takeCoalId=${this.orderPlanId}&productName=${this.willProductName}&pageFlag=${false}&actionObj=${ JSON.stringify(this.showWeigh[index])}`
})
}
},
@@ -1150,7 +1299,8 @@
this.showWeigh[index].weight = '0';
this.$u.toast('褰撳墠鍑�閲嶄笉鍚堟牸锛岃妫�鏌ョ毊閲嶏紝姣涢噸鏄惁鍑嗙‘')
}else{
- this.showWeigh[index].weight = x.minus(y).minus(z);
+ console.log(znums.length)
+ this.showWeigh[index].weight = x.minus(y);
}
}else{
this.$u.toast('褰撳墠鏃犲噣閲�')
@@ -1321,6 +1471,37 @@
url: `/pages/public-page/selectSpecifications/selectSpecifications?index=${i}&takeCoalId=${this.orderPlanId}&unqualified=${this.willUnqualified}&type=edit&indexTo=${index}`
})
}
+ },
+ amountChange(value,event){
+
+ // //瓒呭昂鎵ｇ綒
+ // if(event.penaltyAmount){
+ // console.log("瑙﹀彂1")
+ // if(!event.penaltyType.includes('1')){
+ // event.penaltyType.push('1')
+ // console.log("瑙﹀彂PUsh1")
+ // }
+ // }
+ // //鍘氬害
+ // if(event.thickPenaltyAmount){
+ // if(!event.penaltyType.includes('2')){
+ // event.penaltyType.push('2')
+ // }
+ // }
+ // //瀵嗛棴鍣�
+ // if(event.obturatorPenaltyAmount){
+ // if(!event.penaltyType.includes('3')){
+ // event.penaltyType.push('3')
+ // }
+ // }
+ // //鍏朵粬
+ // if(event.qita){
+ // if(!event.penaltyType.includes('4')){
+ // event.penaltyType.push('4')
+ // }
+ // }
+ console.log(event,'event')
+
}
},
}
@@ -1335,14 +1516,13 @@
}
.weigh-qualified{
display: flex;
+ width: 340rpx;
flex-direction: row;
- justify-content: space-around;
- height: 160rpx;
+ height:auto;
}
.weight-box{
display: flex;
- height: 160rpx;
margin-bottom: 20rpx;
flex-direction: column;
overflow-y: scroll;
@@ -1456,7 +1636,7 @@
position: relative;
}
.num-radio{
- width: 60%;
+ width: 100%;
font-size: 100rpx;
}
@@ -1542,4 +1722,17 @@
border-radius: 8rpx;
margin-left: 12rpx;
}
+ .kouFa-box{
+ display: flex;
+ flex-wrap: wrap;
+ .koufaBox-item{
+ width: 42%!important;
+ font-size: 26rpx;
+ .num-text{
+ width: 42%!important;
+ }
+
+ }
+
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.1