From 77252da784ffa4036d613054696f73fbfdafb6d9 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期六, 27 七月 2024 17:48:51 +0800
Subject: [PATCH] feature：质检样式调整
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 149 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 123 insertions(+), 26 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 88d9137..40d2fe5 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
@@ -74,7 +74,7 @@
绉伴噸鏃堕棿
</view>
<view class="table-title_item coal-name">
- 鐓ょ鍚嶇О
+ 浜у搧鍚嶇О
</view>
<view class="table-title_item skin">
鐨噸閲嶉噺
@@ -86,7 +86,7 @@
{{item.createTime||"" }}
</view>
<view class="item">
- {{item.coalName||"" }}
+ {{item.productName||"" }}
</view>
<view class="item skin">
<view class="">
@@ -132,25 +132,31 @@
<view class="suffix">{{ weighList.filedName || '' }}</view>
</view>
<view class="main-information">
- <view class="prefix">鐓ょ鍚嶇О:</view>
- <view class="suffix">{{ weighList.coalName || '' }}</view>
+ <view class="prefix">浜у搧:</view>
+ <view class="suffix">{{ weighList.productName || '' }}</view>
</view>
<view class="main-information">
<view class="prefix">鐨噸:</view>
<view class="suffix">
- {{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin||"" }}
+ {{ temporaryWeighObj.skin == 0 ? weightObj.skin : temporaryWeighObj.skin||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">姣涢噸:</view>
<view class="suffix">
- {{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair||"" }}
+ {{ temporaryWeighObj.hair == 0 ? weightObj.hair : temporaryWeighObj.hair||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">鍑�閲�:</view>
<view class="suffix">
- {{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean ||"" }}
+ {{ temporaryWeighObj.clean == 0 ? weightObj.clean : temporaryWeighObj.clean ||"" }}
+ </view>
+ </view>
+ <view class="main-information" v-if=" temporaryWeighObj.discount ||weightObj.discount ">
+ <view class="prefix">鎶樺惃:</view>
+ <view class="suffix">
+ {{ weightObj.discount || '' }}
</view>
</view>
<view class="main-information">
@@ -161,6 +167,42 @@
v-show="orderSurplusLess&&!isSpecial">* 璁㈠崟浣欓噺涓嶈冻</text>
</view>
</view>
+ </view>
+ <!-- 浜у搧淇℃伅 -->
+ <view class="chanpin">
+ <view class="sub-table">
+ <view class="first-line"><combined-title title="浜у搧淇℃伅"></combined-title></view>
+ <view class="table">
+ <uni-table border
+ id="table-box"
+ emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+ <uni-th align="center" >浜у搧</uni-th>
+ <uni-th align="center">鐨噸</uni-th>
+ <uni-th align="center">姣涢噸</uni-th>
+ <uni-th align="center">鍑�閲�</uni-th>
+ <uni-th align="center">鎵ｅ惃</uni-th>
+ </uni-tr>
+ <uni-tr v-for="(subItem, index) in productList" :key="index">
+ <uni-td align="center">
+ <view class="name">{{ subItem.productName }}</view></uni-td>
+ <uni-td align='right'>
+ <view v-if="subItem.skin">{{ Number( subItem.skin).toFixed(2) || ''}}</view>
+ </uni-td>
+ <uni-td align='right'>
+ <view class="name" v-if="subItem.hair">{{ Number(subItem.hair) .toFixed(2) || '' }}</view>
+ </uni-td>
+ <uni-td align='right'>
+ <view class="name" v-if="subItem.clean">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
+ </uni-td>
+ 聽<uni-td align="right">
+ <view>{{ subItem.discount }}</view
+ ></uni-td>
+
+ </uni-tr>
+ </uni-table>
+ </view>
+ </view>
</view>
<view class="three">
<!-- 鏀剧┖ -->
@@ -174,14 +216,14 @@
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning||addAndSubtractCoalDisabled"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"
throttleTime="800"></u-button>
<u-button type="primary"
text="杩斿洖瑁呭嵏"
- :disabled="addAndSubtractCoalDisabled"
+ :disabled="addAndSubtractCoalDisabled||isConfirmWeighLoading"
@click="addAndSubtractCoal"
class="jiajian"
v-if="outBuy&&!isSkinWeigh"
@@ -189,8 +231,8 @@
</view>
<view v-show="isExceedOrigin"
style="color: #ff6363;width: auto;margin: 0 auto;">
- <text v-if="weighList.orderType == '澶栬喘'">瓒呭嚭鍘熷彂姣涢噸,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
- <text v-else>瓒呭嚭鏈�澶ф瘺閲�,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
+ <text v-if="weighList.orderType == '澶栬喘'">瓒呭嚭鍘熷彂{{avgFalse ? '鐨噸' :'姣涢噸'}} ,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
+ <text v-else>瓒呭嚭鏈�澶� {{avgFalse ? '鐨噸' :'姣涢噸'}},纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
</view>
<view v-show="afterEvacuationStatus"
style="color: #ff6363;width: auto;margin: 0 auto;">
@@ -242,6 +284,7 @@
<script>
import { webSocketUrl } from '@/api/request.js';
import { mapState, mapMutations } from 'vuex';
+ import { BaseUrl } from '@/api/publicInterface.js'
import combinedTitle from '@/components/combined-title/combined-title.vue';
import BigNumber from "bignumber.js"
export default {
@@ -254,12 +297,14 @@
this.weighHouseCode = params.weighHouseCode;
this.primarySkin = params.primarySkin;
this.primaryHair = params.primaryHair;
+ this.deptId = params.deptId;
this.primaryClean = params.primaryClean;
if (params.overTmWaixiao !== 'null') {
this.weighData.overTmWaixiao = 1
}
this.changeweighHouseCode(params.weighHouseCode);
this.init();
+ this.getDept();
this.changeWeigh('')
this.realTimeWeigh = 0
},
@@ -288,6 +333,8 @@
},
data() {
return {
+ avgFalse:false, // 鏄惁鐨噸寮傚父
+ productList:[], // 浜у搧鏁扮粍
weighData: {
//纭绉伴噸鎺ュ彛鍙傛暟
deptId: '',
@@ -296,6 +343,7 @@
carNo: '',
gateCameraId: '',
equipmentCode: '',
+ avgSkin:'',
weigh: 0,
tmCode: '',
sceneInOut: '',
@@ -307,15 +355,17 @@
abnormalText: ''
},
takeCoalId: null,
+ deptId:'',
+ weightReal:0, // 绉伴噸娴姩鏁版嵁
weighHouseCode: '',
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
realTimeWeigh: 0,
weighList: {},
// 涓存椂绉伴噸瀵硅薄
temporaryWeighObj: {
- skin: 0,
- hair: 0,
- clean: 0
+ skin: 0, //鐨�
+ hair: 0, //姣�
+ clean: 0 //鍑�閲�
},
infraredStatus: false, // 绾㈠鐘舵�侊紝
// 鏀剧┖鎺у埗
@@ -364,9 +414,10 @@
},
]
},
- mergeState: true, //鍚堝崱鐘舵��
+ mergeState: true, //鍚堝崱鐘舵��
// mergeStateShow: false, //鍚堝崱寮圭獥
checkboxValue1: [],
+
isExceedOrigin: false, //鏄惁瓒呭嚭姣涢噸
refreshLoading: false,
timer: null,
@@ -391,13 +442,13 @@
this.temporaryWeighObj.skin = newV;
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(newV)
- this.errorTipShow = (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) &&
+ this.errorTipShow = (xx.minus(yy).toNumber() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) &&
this.avgSkin !== 0
} else {
this.isSkinWeigh = false;
this.temporaryWeighObj.hair = newV;
let x = new BigNumber(this.temporaryWeighObj.hair)
- let y = new BigNumber(this.weighList.skin)
+ let y = new BigNumber(this.weightObj.skin)
this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
@@ -415,9 +466,9 @@
this.temporaryWeighObj.skin = newV;
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(newV)
- this.errorTipShow = (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) &&
+ this.errorTipShow = (xx.minus(yy).toNumber() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) &&
this.avgSkin !== 0;
- let x = new BigNumber(this.weighList.hair)
+ let x = new BigNumber(this.weightObj.hair)
let y = new BigNumber(this.temporaryWeighObj.skin)
this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
@@ -450,12 +501,26 @@
isEvacuation() {
if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
'杞嚭') {
- return this.weighList.skin == this.temporaryWeighObj.hair;
+ return this.weightObj.skin == this.temporaryWeighObj.hair;
}
if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType ==
'杞叆') {
- return this.weighList.hair == this.temporaryWeighObj.skin;
+ return this.weightObj.hair == this.temporaryWeighObj.skin;
}
+ },
+ weightObj(){
+ const index = this.weighList.tmTaskCoalList.length - 1;//涓嬫爣浣� 锛岃鍙栫鍑犵粍鐨勭毊姣涘噣锛�,榛樿鏈�鍚庝竴缁�;
+ const tempArr = this.weighList.tmTaskCoalList.filter(item=> item.isWeight === 1);
+ const result =tempArr.find(item=>!item.skin || !item.hair || !item.clean);
+ console.log(result,'result')
+ if(result){
+ return result
+ }else{
+ return tempArr[index];
+ }
+
+
+
},
sideline() {
return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
@@ -491,6 +556,9 @@
this.outBuy = !(this.weighList.orderType === '澶栬喘' || this.weighList.orderType ===
'鍐呰喘' ||
this.weighList.orderType === '杞叆')
+ this.productList = res.data.tmTaskCoalList;
+ console.log(this.outBuy);
+
} else {
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
@@ -514,7 +582,7 @@
} else {
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(this.globalweigh)
- if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
+ if (xx.minus(yy).toNumber() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) {
this.abnormalModalShow = true
this.skinAbnormal()
} else {
@@ -545,7 +613,14 @@
this.isConfirmWeighLoading = false;
}, 1000);
} else if (res.code === 3) {
- this.isExceedOrigin = true
+ if(/鐨噸/.test(res.msg)){
+ this.avgFalse = true;
+ this.isExceedOrigin = true;
+ }else{
+ this.avgFalse = false;
+ this.isExceedOrigin = true;
+ }
+
} else {
this.$u.toast(res.msg ? res.msg : '绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
this.isConfirmWeighLoading = false
@@ -638,7 +713,8 @@
this.$reqGet('getAvgSkin', { xsUserId1: this.weighList.xsUserId1 }).then(res => {
if (res.code === 0) {
uni.hideLoading()
- this.avgSkin = res.data.avgSkin
+ this.avgSkin = res.data.avgSkin;
+ this.weighData.avgSkin = res.data.avgSkin;
this.tmTaskCoalList = res.data.tmTaskCoalList
/**
* @description true鐨勮瘽鏄涓�娆＄О, false灏变笉鏄�,娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆′篃鏄甯� */
@@ -675,6 +751,20 @@
delta: 1
})
}, 800)
+ },
+ //鑾峰彇閲嶉噺闃堝��
+ getDept(){
+ uni.request({
+ url: `${BaseUrl}/admin/dept/${this.deptId}`,
+ method: 'GET',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success: (res) => {
+ console.log(res.data.data,'res.datra')
+ res.data.data.skinSafeValue ? this.weightReal = res.data.data.skinSafeValue : this.weightReal = '';
+ }
+ })
}
}
};
@@ -687,7 +777,14 @@
justify-content: space-between;
align-items: center;
}
-
+ .chanpin{
+ width: calc(100% - 60rpx);
+ height: 300rpx;
+ margin: 0 30rpx 30rpx 30rpx;
+ /deep/ .uni-table{
+ min-width: 0!important;
+ }
+ }
::v-deep.weighingDevice {
width: 100%;
height: 100%;
@@ -1049,4 +1146,4 @@
justify-content: space-between;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1