From f8efcc177dcde3bbeec6a64bf2597a871e2ca64a Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 14 十二月 2023 14:27:58 +0800
Subject: [PATCH] 验质扣渣重量，不合格品类修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 303 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 279 insertions(+), 24 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 ad64fd8..768d7fe 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">
@@ -45,7 +46,7 @@
class="count-input">
<u--input placeholder="璇疯緭鍏ユ墸娓�"
border="bottom"
- type="number"
+ type="digit"
clearable
v-model="item.cinderWeight"
@input='v=>discountInputHandle(v,i,item.clean)'></u--input>
@@ -61,10 +62,11 @@
<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>
@@ -90,7 +92,7 @@
</text>
</view>
</view>
- <view class="unqualifiedBreed">
+ <!-- <view class="unqualifiedBreed">
<view style="width: 180rpx;">
<u--text text="涓嶅悎鏍煎搧鍚�"
size='32'></u--text>
@@ -119,23 +121,29 @@
v-else-if="flag">
{{item.unqualifiedWeight}}
</view>
- </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"
+ <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,14 +155,19 @@
<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>
<!-- 鏂板鎵ｇ綒绉嶇被銆� 鎵ｇ綒閲戦锛屼笉鍚堟牸鍒ゅ畾绉嶇被-->
@@ -201,7 +214,7 @@
<view class="notice-num" v-if="item.penaltyType == '鍏朵粬鎵ｇ綒'" >
<view class="num-text"
style="margin-left: 10rpx;">
- <u--text text="涓嶅悎鏍煎垽瀹氱绫�"
+ <u--text text="涓嶅悎鏍煎垽瀹�"
size='32'></u--text>
</view>
<view class="num-radio"
@@ -217,12 +230,15 @@
</view>
<view class="num-show"
v-else-if="flag">
- {{item.unqualifiedType}}
+ <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">
@@ -252,6 +268,68 @@
:previewFullImage="true">
</u-upload>
</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"
+ :height="0"
+ >
+ <u-cell
+ :title="(index + 1) + '.' + '涓嶅悎鏍煎搧绫�'"
+ style="text-indent: 30RPX;"
+ @click="editItem(i,index)"
+ >
+ <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="涓嶅悎鏍煎搧鍚�"
+ size='32'></u--text>
+ </view>
+ <view class="tag-select">
+ <text>
+ <!-- {{!flag?(globalShowWeigh[i].unqualifiedBreed?globalShowWeigh[i].unqualifiedBreed:item.unqualifiedBreed):(item.unqualifiedBreed||"璇烽�夋嫨")}} -->
+ {{ el.unqualifiedBreed }}
+ </text>
+ </view>
+ </view>
+ </view>
+ <view>
+ <view class="notice-num">
+ <view class="num-text">
+ <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="el.unqualifiedWeight"
+ readonly
+ @input='v=>unqualifiedWeightInputHandle(v,i,item.clean)'></u--input> -->
+ <view class="num-show"
+> {{el.unqualifiedWeight}}
+ </view>
+ </view>
+ <view class="num-show"
+ v-else-if="flag">
+ {{el.unqualifiedWeight}}
+ </view>
+ </view>
+ </view>
+ </u--list-item>
+ </u--list>
+ <!-- 澧炲姞涓嶅悎鏍艰鐭� -->
+
+ <button class="addBtn" type="primary" :plain="false" @click="addUnqualified(i)">娣诲姞涓嶅悎鏍煎搧绫�</button>
<!-- 鐗╄祫鏄庣粏 -->
<u-action-sheet :actions="goodsList"
:show="goodsShow"
@@ -279,6 +357,8 @@
</view>
</view>
<!-- 鏂板 楠岃川澶囨敞銆傞獙璐ㄨ鏄� -->
+ <view v-if=" isYanz()">
+ <view v-if="coalDetailsData.orderType == '澶栬喘'">
<view style="padding: 10rpx;">
<u-row >
<u-col span="24" >
@@ -318,6 +398,7 @@
</u-col>
</u-row>
</view>
+ </view>
<view class="confirm-button"
v-if='roleType===4&&!flag'>
<u-button type="primary"
@@ -327,13 +408,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>
@@ -429,6 +512,7 @@
data() {
return {
qualityInstructions:"",
+ indexFlag:0, // 涓嬫爣鏍囧織浣�
remarks:'',
selectlist:[
{
@@ -519,13 +603,61 @@
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;
+
+ }
+ // 宸茬粡楠岃川
+ }
+ },
+ //璁＄畻涓嶅悎鏍艰鏍兼暟缁�
+ unqualifiedArr(){
+ return function(index){
+ let arr = [];
+ let temp = [];
+ const item = this.globalShowWeigh[index];
+ if(item){
+ if(item.unqualifiedBreed){
+ arr = item.unqualifiedBreed.split(",");
+
+ temp = item.unqualifiedWeights.toString().split(',');
+ let result = arr.length && arr.map((el,index)=>{
+ let obj = {unqualifiedBreed:el,unqualifiedWeight:temp[index]}
+ return obj
+ })
+ console.log(result,temp,'arr')
+ return result;
+
+ }else{
+ return []
+ }
+ }
+
+
+ }
}
+
+ },
+ onShow(){
+ this.numAll(this.globalShowWeigh[this.indexFlag].unqualifiedWeights.split(","),this.indexFlag,this.showWeigh[this.indexFlag].clean)
},
mounted() {
- this.roleType === 1 ? this.GetOrderPlan() : this.getTakeCoal()
+ this.roleType === 1 ? this.GetOrderPlan() : this.getTakeCoal();
+
},
onLoad(params) {
- console.log(params,this.showWeighCopyStorge,'params璺敱')
+ console.log(params,this.showWeighCopyStorge,this.globalShowWeigh,'params璺敱')
this.orderPlanId = params.orderPlanId ? params.orderPlanId : '';
this.flag = params.flag ? params.flag : false;
this.ModifiedOrderIndex = params.index
@@ -536,6 +668,34 @@
},
methods: {
...mapMutations(['changeglobalShowWeigh']),
+ numAll(value, index, clean){
+ console.log(value,'valusess')
+ // 璁＄畻鎵ｆ福鍑�閲�
+ // 鍒ゆ柇鏄笉鏄湁鍑�閲嶆墠杩涜璁＄畻
+ let x = new BigNumber(clean - 0)
+ // 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;
+ }
+ console.log(value,y,'yyyyyyyyy')
+ 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) ;
+ }
+
+
+
+
+ },
getTakeCoal() {
uni.showLoading({
title: '鍔犺浇涓�'
@@ -618,7 +778,7 @@
// 鐐瑰嚮纭
confirmInput() {
this.loading = true;
- let params = {};
+ let params = {},unqualifiedWeightAll;
params.qualityInstructions = this.qualityInstructions;
params.remarks = this.remarks;
this.showWeigh = this.showWeigh.map((v, i) => {
@@ -626,14 +786,21 @@
v.penaltyAmount = '';
v.unqualifiedType = '';
}
+ if(this.globalShowWeigh[i].unqualifiedWeight){
+ unqualifiedWeightAll = this.globalShowWeigh[i].unqualifiedWeight.split(",").reduce((p,n)=>{return (p - 0) + (n - 0)},0) || ''
+ }else{
+ unqualifiedWeightAll =''
+ }
return {
...v,
unqualifiedBreed: this.globalShowWeigh[i].unqualifiedBreed ? this.globalShowWeigh[i]
.unqualifiedBreed : v.unqualifiedBreed,
breed: this.globalShowWeigh[i].modifyProductName ? this.globalShowWeigh[i].breed : v.breed,
spec: this.globalShowWeigh[i].modifyProductName ? this.globalShowWeigh[i].spec : v.spec,
- inspectionJpg: v.fileList.map(v => v.url.replace(BaseUrl, '')).join(',')
-
+ inspectionJpg: v.fileList.map(v => v.url.replace(BaseUrl, '')).join(','),
+ unqualifiedWeights :this.globalShowWeigh[i].unqualifiedWeights,
+ unqualifiedWeight :unqualifiedWeightAll
+
}
})
params.tmTaskCoalItems = this.showWeigh;
@@ -687,6 +854,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) {
@@ -708,12 +876,36 @@
},
// 鎶樻墸鐜囪緭鍏�
discountInputHandle(value, index, clean) {
+ let znums;
+ if(this.globalShowWeigh[index].unqualifiedWeights){
+ znums = this.globalShowWeigh[index].unqualifiedWeights.split(',')
+ }else{
+ znums = []
+ }
console.log('璁＄畻鍑�閲�',value, index, clean)
+ this.indexFlag = index; // 璁板綍鏍囪瘑浣�
+ if (
+ value &&
+ value.indexOf(".") < 0 &&
+ value != ""
+ ) {
+ value = parseFloat(value);
+ value = value + ""; // 鍙樺洖涓哄瓧绗︿覆
+ }else{
+ value = value.replace(/^(-)*(\d+)\.(\d\d).*$/,"$1$2.$3");
+ this.$nextTick(()=>{
+ this.showWeigh[index].cinderWeight = value.replace(/[^\d.]/g, "");
+ });
+ } // 濡傛灉娌℃湁灏忔暟鐐癸紝棣栦綅涓嶈兘涓虹被浼间簬 01銆�02鐨勫��
+
+
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,'鎵ｆ福');
+ let z = new BigNumber(znums.reduce((p,n)=>{
+ return (p - 0) + (n - 0)
+ },0))
+ console.log(clean,value,'鎵ｆ福');
if(x.minus(y).minus(z).toFixed(2) <= 0){
this.showWeigh[index].weight = '0';
this.$u.toast('褰撳墠鍑�閲嶄笉鍚堟牸锛岃妫�鏌ョ毊閲嶏紝姣涢噸鏄惁鍑嗙‘')
@@ -729,7 +921,7 @@
// this.unqualifiedShow = true
// this.unqualifiedIndex = index
uni.navigateTo({
- url: `/pages/public-page/selectSpecifications/selectSpecifications?index=${index}&takeCoalId=${this.orderPlanId}&unqualified=${this.willUnqualified}`
+ url: `/pages/public-page/selectSpecifications/selectSpecifications?index=${index}&takeCoalId=${this.orderPlanId}&unqualified=${this.willUnqualified}&type=edit`
})
}
},
@@ -743,6 +935,7 @@
unqualifiedWeightInputHandle(value, index, clean) {
// 鍒ゆ柇鏄笉鏄湁鍑�閲嶆墠杩涜璁＄畻
let x = new BigNumber(clean - 0)
+ this.indexFlag = index; // 璁板綍鏍囪瘑浣�
let y = new BigNumber(value - 0)
let z = new BigNumber(this.showWeigh[index].cinderWeight - 0);
if(x.minus(y).minus(z).toFixed(2) <= 0){
@@ -809,6 +1002,62 @@
},
closeEvent(){
this.focusSelect = false;
+ },
+ //澧炲姞涓嶅悎鏍艰鐭�
+ addUnqualified(i){
+ if (this.roleType === 4 && !this.flag) {
+ // this.unqualifiedShow = true
+ // this.unqualifiedIndex = index
+ this.indexFlag = i; // 璁板綍鏍囪瘑浣�
+ uni.navigateTo({
+ url: `/pages/public-page/selectSpecifications/selectSpecifications?index=${i}&takeCoalId=${this.orderPlanId}&unqualified=${this.willUnqualified}&type=add`
+ })
+ console.log(this.globalShowWeigh[i],'2222')
+ this.numAll(this.globalShowWeigh[i].unqualifiedWeights.split(","),i,this.showWeigh[i].clean)
+ }
+ },
+ deleteItem(i,index){
+ let {unqualifiedBreed,unqualifiedWeights} = this.globalShowWeigh[i];
+ this.indexFlag = i; // 璁板綍鏍囪瘑浣�
+ console.log(this.globalShowWeigh[i],'index')
+ if (this.roleType === 4 && !this.flag) {
+ if( unqualifiedBreed !== void 0 && unqualifiedWeights!== void 0 ){
+ if(unqualifiedBreed.split(',').length > 1){
+ // unqualifiedBreed = unqualifiedBreed.split(',').splice(index ,1).join(",")
+ let strArr = unqualifiedBreed.split(',');
+ strArr.splice(index ,1)
+ unqualifiedBreed = strArr.join(",")
+ }else{
+ unqualifiedBreed = '';
+ }
+
+ if(unqualifiedWeights.split(',').length > 1){
+ // unqualifiedWeights = unqualifiedWeights.split(',').splice(index,1).join(",")
+ let strArr = unqualifiedWeights.split(',');
+ strArr.splice(index ,1)
+ unqualifiedWeights = strArr.join(",")
+ }else{
+ unqualifiedWeights = '';
+ }
+ this.globalShowWeigh[i].unqualifiedBreed = unqualifiedBreed;
+ this.globalShowWeigh[i].unqualifiedWeights = unqualifiedWeights;
+ this.globalShowWeigh[i].tempArr.splice(index,1)
+
+ }
+ 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; // 璁板綍鏍囪瘑浣�
+ if (this.roleType === 4 && !this.flag) {
+ // this.unqualifiedShow = true
+ // this.unqualifiedIndex = index
+ uni.navigateTo({
+ url: `/pages/public-page/selectSpecifications/selectSpecifications?index=${i}&takeCoalId=${this.orderPlanId}&unqualified=${this.willUnqualified}&type=edit&indexTo=${index}`
+ })
+ }
}
},
}
@@ -824,6 +1073,11 @@
/deep/ .u-picker {
height: 600rpx;
+ }
+ .addBtn{
+ width: 65%;
+ font-size: 26rpx;
+ background-color: #3c9cff;;
}
.main {
@@ -922,6 +1176,7 @@
.num-input {
width: 60%;
border-bottom: 1px solid rgb(218, 219, 222);
+ position: relative;
}
.num-radio{
width: 60%;
--
Gitblit v1.9.1