From bca2dd2d59de29814f9c260edc497834818267e7 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期二, 30 七月 2024 11:43:58 +0800
Subject: [PATCH] 复磅细节问题
---
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 349 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 240 insertions(+), 109 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 01e8c2a..a309c47 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,32 +52,33 @@
@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 v-if="!unqualifiedArr(i).length">
-
- <view> 鎵ｆ福鍚庡噣閲嶏細<text class="count"> {{ cleanWeight(item) }}</text></view>
+
+ <view> 鎵ｆ福鍚庡噣閲嶏細<text class="count"> {{ cleanWeight(item) ? cleanWeight(item) + '鍚�' : ''}}</text></view>
</view>
- <view v-else class='weigh-qualified-no'>
-
- <view > 鍚堟牸鍑�閲嶏細 <text class="count">{{ item.clean }}</text></view>
-
- <view > 鎵ｆ福鍚庡噣閲嶏細<text class="count">{{ cleanWeight(item) }}</text></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>
-
+
</view>
</view>
<!-- 鍒ゆ柇鏄惁妫�楠岃川閲� -->
@@ -86,17 +87,17 @@
<view style="width: 180rpx;">
<u--text text="渚涘簲鍟�"
size='32'></u--text>
-
+
</view>
<view style="font-size: 35rpx;">{{ coalDetailsData.customerName || '' }}</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,'goods')"
v-if='roleType===4'>
@@ -109,12 +110,12 @@
<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 class="tag-select" @click="productNamePopoverShow(i)">{{ item.breed }}</view>
</view>
-
+
<view class="level"
v-if='item.modifygoodsName ||globalShowWeigh[i].modifyProductName'>
<view style="width: 180rpx;">
@@ -128,7 +129,20 @@
{{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>
+
</view>
<!-- <view class="unqualifiedBreed">
<view style="width: 180rpx;">
@@ -185,7 +199,7 @@
{{item.num + item.numUnit}}
</view>
</view>
- <view class="notice-num">
+ <view class="notice-num">
<view class="num-text"
style="margin-left: 10rpx;">
<u--text text="閫氱煡閲嶉噺"
@@ -211,7 +225,7 @@
</view>
</view>
<!-- 鏂板鎵ｇ綒绉嶇被銆� 鎵ｇ綒閲戦锛屼笉鍚堟牸鍒ゅ畾绉嶇被-->
- <!-- <view class="notice-num">
+ <!-- <view class="notice-num">
<view class="num-text"
style="margin-left: 10rpx;">
<u--text text="鎵ｇ綒绉嶇被"
@@ -231,7 +245,7 @@
</view>
</view> -->
<!-- 鍗曚环 -->
- <view class="notice-num">
+ <view class="notice-num">
<view class="num-text"
style="margin-left: 10rpx;">
<u--text text="鍗曚环"
@@ -257,8 +271,9 @@
<!-- 鎵ｇ綒瀹瑰櫒 -->
<view class="kouFa-box">
<!-- 瓒呭昂鎵ｇ綒閲戦 -->
- <view class="notice-num koufaBox-item">
+ <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>
@@ -266,7 +281,7 @@
<view class="num-input"
v-if='roleType===4&&!flag'
>
- <u-input
+ <u-input
v-model="item.oveForfeit"
placeholder="璇疯緭鍏�"
border="bottom"
@@ -278,13 +293,14 @@
</u-input>
</view>
<view class="num-show"
- v-else-if="flag" >
- {{item.oveForfeit ? item.oveForfeit + '鍏�' :""}}
+ v-else-if="flag && item.oveForfeit" >
+ {{ item.oveForfeit + '鍏�'}}
</view>
</view>
-
- <view class="notice-num koufaBox-item" >
+
+ <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>
@@ -302,13 +318,14 @@
</u-input>
</view>
<view class="num-show"
- v-else-if="flag">
- {{item.thiForfeit ? item.thiForfeit+ '鍏�' :"" }}
+ v-else-if="flag && item.thiForfeit">
+ {{ item.thiForfeit+ '鍏�' }}
</view>
</view>
-
- <view class="notice-num koufaBox-item" >
+
+ <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>
@@ -325,13 +342,14 @@
</template></u-input>
</view>
<view class="num-show"
- v-else-if="flag">
- {{item.obtForfeit ? item.obtForfeit+ '鍏�' :"" }}
+ v-else-if="flag && item.obtForfeit">
+ {{ item.obtForfeit+ '鍏�' }}
</view>
</view>
- <view class="notice-num koufaBox-item">
+ <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>
@@ -348,15 +366,15 @@
</template></u-input>
</view>
<view class="num-show"
- v-else-if="flag">
- {{item.othForfeit ? item.othForfeit+ '鍏�' :"" }}
+ 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="鎵ｇ綒绫诲瀷"
@@ -378,14 +396,14 @@
<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>
+ </u-checkbox-group>
</view>
<view class="num-show"
v-else-if="flag">
<view>
<text> {{item.penaltyType == 1 ? '瓒呭昂鎵ｇ綒' : item.penaltyType == 2 ? '鍘氬害鎵ｇ綒' :item.penaltyType == 3 ? '瀵嗛棴鍣�' : null }} </text>
</view>
-
+
</view>
</view> -->
</view>
@@ -403,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>
@@ -422,13 +442,13 @@
height="150"
:previewFullImage="true">
</u-upload>
- </view>
+ </view>
<u--list
:height="0"
style=" margin-left: 50rpx;margin-top: 30rpx;"
>
<u--list-item
-
+
v-for="(el,index) in unqualifiedArr(i) "
style=" box-shadow: 0px 0 0 0px #ccc;"
:key="index"
@@ -441,17 +461,29 @@
>
<text slot="value" @click.stop="deleteItem(i,index)" style="color: red;">鍒犻櫎</text>
</u-cell>
-
+
<view>
<view class="unqualifiedBreed">
<view style="width: 180rpx;">
- <u--text text="涓嶅悎鏍煎搧鍚�"
+ <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.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>
@@ -478,7 +510,7 @@
v-else-if="flag">
{{el.unqualifiedWeight ? el.unqualifiedWeight + '鍚�': ''}}
</view>
-
+
</view>
<!-- <view class="notice-num">
<view class="num-text">
@@ -495,7 +527,7 @@
v-else-if="flag">
{{selectlist.find(item=>item.value ==el.unqualifiedType ) ? selectlist.find(item=>item.value ==el.unqualifiedType ).name : '' }}
</view>
-
+
</view> -->
<view class="notice-num">
<view class="num-text">
@@ -518,9 +550,9 @@
v-else-if="flag">
{{el.penaltyUnitPrice ? el.penaltyUnitPrice + '鍏�' : ''}}
</view>
-
+
</view>
-
+
</view>
</u--list-item>
</u--list>
@@ -553,6 +585,19 @@
@select="selectUnqualifiedClick"></u-action-sheet>
</view>
</view>
+ <!-- 鍘熷彂鍑哄満鏃堕棿 -->
+ <!-- <view v-if="roleType!==3">
+ <view>
+ <text>璐х墿鍙戣揣鍦板嚭鍦烘椂闂存垨鍙戣揣纾呭崟鏃堕棿锛�</text>
+ </view>
+ <view>
+ <uni-datetime-picker
+ v-model="outDate"
+ type="datetime"
+ @change="datechange"
+ />
+ </view>
+ </view> -->
<!-- 鏂板 楠岃川澶囨敞銆傞獙璐ㄨ鏄� -->
<view v-if=" isYanz()">
<view v-if="coalDetailsData.orderType == '澶栬喘'">
@@ -606,7 +651,7 @@
loading-text="纭"></u-button>
</view></view>
</view>
-
+
<!-- 鐗╂枡鏄庣粏 -->
<view v-if="!current">
<view class="main-block"
@@ -693,22 +738,40 @@
@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>
<script>
import BigNumber from "bignumber.js"
+ import formatDate from '@/utils/date'
import { BaseUrl } from '@/api/publicInterface.js';
import { onlineurl } from '@/api/request.js'
import { mapState, mapMutations } from "vuex"
export default {
data() {
return {
+ dateInpShow:false,
+ outDate:'',
+ dateValue:'',
+ previewImageShow:false,
qualityInstructions:"",
+ previewImageSrc: '',
penaltyType:[],
indexFlag:0, // 涓嬫爣鏍囧織浣�
remarks:'',
@@ -756,10 +819,10 @@
list: [
{
name: '鐗╄祫鏄庣粏'
- },
+ },
{
name: '绉伴噸鏄庣粏'
- },
+ },
],
current: 1,
showWeigh: [],
@@ -822,7 +885,7 @@
//鍒ゆ柇闇�涓嶉渶瑕侀獙璐�
isYanz(){
return function(item){
- // return ( this.coalDetailsData.orderType !=='澶栬喘' || this.coalDetailsData.weighingType !=='鍥炵') ? false : true;
+ // return ( this.coalDetailsData.orderType !=='澶栬喘' || this.coalDetailsData.weighingType !=='鍥炵') ? false : true;
if(this.coalDetailsData.orderType =='澶栬喘'){
if(this.coalDetailsData.weighingType == '鍥炵'){
return true
@@ -860,41 +923,72 @@
// if(item.penaltyType){
// noPin = item.penaltyType.toString().split(',');
// }
-
+
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')
return result;
-
+
}else{
return []
}
}
-
+
}
},
cleanWeight(){
return function(item){
- 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);
}
}
+
},
mounted() {
this.roleType === 1 ? this.GetOrderPlan() : this.getTakeCoal();
-
+
},
onLoad(params) {
console.log(params,this.showWeighCopyStorge,this.globalShowWeigh,'params璺敱')
@@ -916,8 +1010,8 @@
this.showWeigh[res.index].spec = res.data.specifications;
this.showWeigh[res.index].firstClass = res.data.firstClass;
}
-
-
+
+
})
},
onShow(){
@@ -934,23 +1028,23 @@
// 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);
-
- }else{
- y = 0;
- }
+ // if(value.filter(Boolean) .length){
+ // y = value.reduce((p,n)=>{
+ // return (p - 0) + (n - 0);
+ // },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(4);
}
}
-
+
},
checkboxChange(n,item) {
@@ -966,7 +1060,7 @@
if(!n.includes('4')){
item.qita = ''
}
-
+
},
getTakeCoal() {
@@ -978,6 +1072,8 @@
uni.hideLoading()
this.coalDetailsData = res.data;
this.remarks = res.data.remarks;
+ this.dateValue = res.data.startTime;
+ this.outDate = res.data.startTime;
this.qualityInstructions = res.data.qualityInstructions
this.orderCode = res.data.orderCode
this.showWeigh = this.coalDetailsData.tmTaskCoalItems ? this.coalDetailsData
@@ -1013,7 +1109,7 @@
this.changeglobalShowWeigh(uni.getStorageSync('showWeighCopyStorgeOther'))
//绉伴噸鏄庣粏鏃犳暟鎹椂鏄剧ず鐗╄祫鏄庣粏
if(!this.coalDetailsData.tmTaskCoalItems.length){
- this.current = 0;
+ this.current = 0;
}
this.isWeighingType = res.data.weighingType //褰撳墠纾呭崟鏄惁鍥炵
} else {
@@ -1028,9 +1124,22 @@
name: v.breed + '/' + v.spec
}
})
+ //榛樿鍥炴樉绗竴涓�
+ if(r.data.length){
+ this.goodsIndex = 0;
+ this.goodsselectClick(this.goodsList[0])
+ }
+
uni.hideLoading()
})
})
+ },
+ previewImageClose() {
+ this.previewImageShow = false;
+ },
+ previewImageOpen() {
+ this.previewImageShow = true;
+ console.log('preview open');
},
GetOrderPlan() {
uni.showLoading({ title: '鍔犺浇涓�...' });
@@ -1059,19 +1168,30 @@
}
})
},
+ 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;
+ params.startTime = this.dateValue;
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(this.globalShowWeigh[i].unqualifiedWeights){
- unqualifiedWeightAll = this.globalShowWeigh[i].unqualifiedWeights.split(",").reduce((p,n)=>{return (p - 0) + (n - 0)},0).toFixed(2) || ''
+ unqualifiedWeightAll = this.globalShowWeigh[i].unqualifiedWeights.split(",").reduce((p,n)=>{return (p - 0) + (n - 0)},0).toFixed(4) || ''
}else{
unqualifiedWeightAll = 0;
}
@@ -1085,14 +1205,14 @@
unqualifiedWeight :unqualifiedWeightAll ,
tempArr:this.globalShowWeigh[i].tempArr ? JSON.stringify(this.globalShowWeigh[i].tempArr) : '',
penaltyUnitPrice:this.globalShowWeigh[i].penaltyUnitPrice,
-
+
}
});
// if(flag){
this.loading = true;
params.tmTaskCoalItems = this.showWeigh;
console.log(params,'params')
-
+
this.$reqPost('updateTmTaskCoalItem', params, 'json').then(
res => {
if (res.code == 0) {
@@ -1110,11 +1230,11 @@
})
// }else{
// this.$u.toast('璇疯緭鍏ュ崟浠�')
- // return
+ // return
// }
-
+
},
- // 鏍￠獙鏁版嵁鏄惁鍚堟牸
+ // 鏍￠獙鏁版嵁鏄惁鍚堟牸
checkValue(data,target){
if(!data.length){
return
@@ -1122,7 +1242,7 @@
let flag = data.find(item=>item[target] <=0);
console.log(flag,'flag');
if(flag){
- return false
+ return false
}else{
return true;
}
@@ -1187,12 +1307,12 @@
value = parseFloat(value);
value = value + ""; // 鍙樺洖涓哄瓧绗︿覆
}else{
- value = value.replace(/^(-)*(\d+)\.(\d\d).*$/,"$1$2.$3");
+ value = value.replace(/^(-)*(\d+)\.(\d\d\d\d).*$/,"$1$2.$3");
this.$nextTick(()=>{
this.showWeigh[index].cinderWeight = value.replace(/[^\d.]/g, "");
});
} // 濡傛灉娌℃湁灏忔暟鐐癸紝棣栦綅涓嶈兘涓虹被浼间簬 01銆�02鐨勫��
-
+
// 濡傛灉娌℃湁鍑�閲� 锛屽垯涓嶈繘琛岃绠�
if(clean){
this.showWeigh[index].cinderWeight = (value - 0)
@@ -1206,14 +1326,15 @@
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('褰撳墠鏃犲噣閲�')
}
-
-
-
+
+
+
},
// 閫夋嫨涓嶅悎鏍煎搧鍚�
selectunqualifiedBreed(index) {
@@ -1242,10 +1363,10 @@
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(y).minus(z).toFixed(4) ;
}
-
-
+
+
},
// 鍒犻櫎鍥剧墖
deletePic(event) {
@@ -1356,7 +1477,7 @@
}
this.globalShowWeigh[i].unqualifiedBreed = unqualifiedBreed;
this.globalShowWeigh[i].unqualifiedWeights = unqualifiedWeights;
- // this.globalShowWeigh[i].unqualifiedType = unqualifiedType;
+ // this.globalShowWeigh[i].unqualifiedType = unqualifiedType;
this.globalShowWeigh[i].penaltyUnitPrice = penaltyUnitPrice;
this.globalShowWeigh[i].tempArr.splice(index,1)
console.log(this.globalShowWeigh[i].unqualifiedBreed,'unqualifiedBreed')
@@ -1366,7 +1487,7 @@
this.numAll(this.globalShowWeigh[this.indexFlag].unqualifiedWeights.split(","),this.indexFlag,this.showWeigh[this.indexFlag].clean)
console.log(this.globalShowWeigh[i],'deleteItem');
}
-
+
},
editItem(i,index){
this.indexFlag = i; // 璁板綍鏍囪瘑浣�
@@ -1379,7 +1500,7 @@
}
},
amountChange(value,event){
-
+
// //瓒呭昂鎵ｇ綒
// if(event.penaltyAmount){
// console.log("瑙﹀彂1")
@@ -1408,6 +1529,16 @@
// }
console.log(event,'event')
+ },
+ dateInpFoucs(){
+ console.log('鑱氱劍');
+ this.dateInpShow = true;
+ },
+ datechange(value){
+ console.log('dateChange',value,formatDate.formatDate(new Date(value)) );
+ this.dateValue = (formatDate.formatDate(new Date(value)) + ':' + '00');
+
+
}
},
}
@@ -1422,15 +1553,13 @@
}
.weigh-qualified{
display: flex;
- width: 300rpx;
+ width: 340rpx;
flex-direction: row;
- justify-content: space-around;
height:auto;
}
.weight-box{
display: flex;
- height: 160rpx;
margin-bottom: 20rpx;
flex-direction: column;
overflow-y: scroll;
@@ -1446,13 +1575,15 @@
}
.main {
- width: 96%;
+ width: 100%;
height: 100%;
min-height: 400rpx;
background-color: #fff;
- margin: 10rpx auto;
+ padding: 10rpx 0;
+ box-sizing: border-box;
display: flex;
flex-direction: column;
+ overflow-x: hidden;
.main-block {
width: 690rpx;
@@ -1612,17 +1743,17 @@
.tabs{
font-size: 20rpx!important;
}
- .u-card-wrap {
+ .u-card-wrap {
background-color: $u-bg-color;
padding: 1px;
}
-
+
.u-body-item {
font-size: 32rpx;
color: #333;
padding: 20rpx 10rpx;
}
-
+
.u-body-item image {
width: 120rpx;
flex: 0 0 120rpx;
@@ -1643,4 +1774,4 @@
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1