From c3db9f5a903f7213f14d9eaafc804ecdb3bdf2a0 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期五, 05 七月 2024 17:38:23 +0800
Subject: [PATCH] 无车牌修改的内容
---
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 645 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 490 insertions(+), 155 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 e1904eb..59f5c41 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,15 +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>
- <view class="weigh">
- <view class="label-text">
- 鎵ｆ福鍚庡噣閲�
+ <!-- 鍑�閲峝iv -->
+ <view class="weight-box">
+ <view class="weigh-qualified">
+ <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 ? el.unqualifiedWeight + '鍚�' : ''}}</view>
+ </view>
+ </view>
+
</view>
</view>
<!-- 鍒ゆ柇鏄惁妫�楠岃川閲� -->
@@ -69,45 +87,62 @@
<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 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'>
+ 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>
+
</view>
<!-- <view class="unqualifiedBreed">
<view style="width: 180rpx;">
@@ -151,6 +186,7 @@
<u-input placeholder="璇疯緭鍏ラ�氱煡鏁伴噺"
border="bottom"
clearable
+ disabled
style="width: 70%;"
v-model="item.num">
<template slot="suffix">
@@ -163,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="閫氱煡閲嶉噺"
@@ -175,6 +211,7 @@
<u-input placeholder="璇疯緭鍏ラ�氱煡閲嶉噺"
border="bottom"
clearable
+ disabled
style="width: 70%;"
v-model="item.weight1">
<template slot="suffix">
@@ -188,7 +225,7 @@
</view>
</view>
<!-- 鏂板鎵ｇ綒绉嶇被銆� 鎵ｇ綒閲戦锛屼笉鍚堟牸鍒ゅ畾绉嶇被-->
- <!-- <view class="notice-num">
+ <!-- <view class="notice-num">
<view class="num-text"
style="margin-left: 10rpx;">
<u--text text="鎵ｇ綒绉嶇被"
@@ -207,28 +244,8 @@
{{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"></u--input>
- </view>
- <view class="num-show"
- v-else-if="flag">
- {{item.penaltyAmount}}
- </view>
- </view>
<!-- 鍗曚环 -->
- <view class="notice-num">
+ <view class="notice-num">
<view class="num-text"
style="margin-left: 10rpx;">
<u--text text="鍗曚环"
@@ -237,21 +254,130 @@
<view class="num-input"
v-if='roleType===4&&!flag'
>
- <u--input placeholder="璇疯緭鍏ュ崟浠�"
+ <u-input placeholder="璇疯緭鍏ュ崟浠�"
border="bottom"
clearable
- v-model="item.unitPrice"></u--input>
+ v-model="item.unitPrice">
+ <template slot="suffix">
+ <text class="inp-unit">鍏�</text>
+ </template>
+ </u-input>
</view>
<view class="num-show"
v-else-if="flag">
- {{item.unitPrice}}
+ {{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"
@@ -259,17 +385,27 @@
@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
+ placement="row"
+ size="32"
+ :value="this.penaltyType"
+ ref="checkbox"
+ @change="(event)=>checkboxChange(event,item)"
+ >
+ <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">
- <text> {{item.penaltyType == 1 ? '闀垮害鎵ｇ綒' : item.penaltyType == 2 ? '鍘氬害鎵ｇ綒' :item.penaltyType == 3 ? '瀵嗛棴鍣�' : null }} </text>
+ <view>
+ <text> {{item.penaltyType == 1 ? '瓒呭昂鎵ｇ綒' : item.penaltyType == 2 ? '鍘氬害鎵ｇ綒' :item.penaltyType == 3 ? '瀵嗛棴鍣�' : null }} </text>
+ </view>
+
</view>
- </view>
+ </view> -->
</view>
<u-empty v-if=" isYanz() && !isShow(item) " icon-size="200" text="''" >
<text>鏆傛湭楠岃川</text>
@@ -285,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>
@@ -304,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"
@@ -323,7 +461,7 @@
>
<text slot="value" @click.stop="deleteItem(i,index)" style="color: red;">鍒犻櫎</text>
</u-cell>
-
+
<view>
<view class="unqualifiedBreed">
<view style="width: 180rpx;">
@@ -333,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>
@@ -353,14 +503,14 @@
readonly
@input='v=>unqualifiedWeightInputHandle(v,i,item.clean)'></u--input> -->
<view class="num-show"
-> {{el.unqualifiedWeight || ''}}
+> {{el.unqualifiedWeight ? el.unqualifiedWeight + '鍚�': ''}}
</view>
</view>
<view class="num-show"
v-else-if="flag">
- {{el.unqualifiedWeight || ''}}
+ {{el.unqualifiedWeight ? el.unqualifiedWeight + '鍚�': ''}}
</view>
-
+
</view>
<!-- <view class="notice-num">
<view class="num-text">
@@ -377,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">
@@ -393,22 +543,22 @@
readonly
@input='v=>unqualifiedWeightInputHandle(v,i,item.clean)'></u--input> -->
<view class="num-show"
-> {{el.penaltyUnitPrice || ''}}
+> {{el.penaltyUnitPrice ? el.penaltyUnitPrice + '鍏�' : ''}}
</view>
</view>
<view class="num-show"
v-else-if="flag">
- {{el.penaltyUnitPrice || ''}}
+ {{el.penaltyUnitPrice ? el.penaltyUnitPrice + '鍏�' : ''}}
</view>
-
+
</view>
-
+
</view>
</u--list-item>
</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"
@@ -435,12 +585,25 @@
@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 == '澶栬喘'">
<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;"
@@ -456,7 +619,7 @@
{{ qualityInstructions }}
</view>
</view>
- </u-col>
+ </u-col> -->
</u-row>
</view>
<view style="padding: 10rpx;">
@@ -488,7 +651,7 @@
loading-text="纭"></u-button>
</view></view>
</view>
-
+
<!-- 鐗╂枡鏄庣粏 -->
<view v-if="!current">
<view class="main-block"
@@ -575,24 +738,60 @@
@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:'',
+ checkboxList:[
+ {
+ name: '瓒呭昂鎵ｇ綒',
+ disabled: false,
+ value:'1',
+ },
+ {
+ name: '鍘氬害鎵ｇ綒',
+ disabled: false,
+ value:'2',
+ },
+ {
+ name: '瀵嗛棴鍣�',
+ disabled: false,
+ value:'3',
+ }
+ ],
selectlist:[
{
value: '1',
@@ -620,10 +819,10 @@
list: [
{
name: '鐗╄祫鏄庣粏'
- },
+ },
{
name: '绉伴噸鏄庣粏'
- },
+ },
],
current: 1,
showWeigh: [],
@@ -686,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
@@ -708,7 +907,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(",");
@@ -725,46 +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){
- 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);
}
}
- },
- onShow(params){
- console.log(params,'paramss')
- this.numAll(this.globalShowWeigh[this.indexFlag].unqualifiedWeights.split(","),this.indexFlag,this.showWeigh[this.indexFlag].clean)
+
},
mounted() {
this.roleType === 1 ? this.GetOrderPlan() : this.getTakeCoal();
-
+
},
onLoad(params) {
console.log(params,this.showWeighCopyStorge,this.globalShowWeigh,'params璺敱')
@@ -776,11 +1000,23 @@
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;
+ }
+
+
})
+ },
+ onShow(){
+ this.numAll(this.globalShowWeigh[this.indexFlag].unqualifiedWeights.split(","),this.indexFlag,this.showWeigh[this.indexFlag].clean)
+
},
methods: {
...mapMutations(['changeglobalShowWeigh']),
@@ -792,28 +1028,41 @@
// 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) {
+ 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() {
uni.showLoading({
title: '鍔犺浇涓�'
@@ -823,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
@@ -833,7 +1084,6 @@
}else{
v.tempArr = JSON.parse(v.tempArr)
}
-
return {
...v,
modifyProductName: '',
@@ -859,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 {
@@ -877,6 +1127,13 @@
uni.hideLoading()
})
})
+ },
+ previewImageClose() {
+ this.previewImageShow = false;
+ },
+ previewImageOpen() {
+ this.previewImageShow = true;
+ console.log('preview open');
},
GetOrderPlan() {
uni.showLoading({ title: '鍔犺浇涓�...' });
@@ -905,22 +1162,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(!v.unitPrice){
- flag = false;
- }
-
-
-
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;
}
@@ -932,15 +1197,16 @@
inspectionJpg: v.fileList.map(v => v.url.replace(BaseUrl, '')).join(','),
unqualifiedWeights :this.globalShowWeigh[i].unqualifiedWeights ? this.globalShowWeigh[i].unqualifiedWeights : 0,
unqualifiedWeight :unqualifiedWeightAll ,
- // penaltyType:this.globalShowWeigh[i].unqualifiedType,
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) {
@@ -956,13 +1222,13 @@
this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触')
}
})
- }else{
- this.$u.toast('璇疯緭鍏ュ崟浠�')
- return
- }
-
+ // }else{
+ // this.$u.toast('璇疯緭鍏ュ崟浠�')
+ // return
+ // }
+
},
- // 鏍￠獙鏁版嵁鏄惁鍚堟牸
+ // 鏍￠獙鏁版嵁鏄惁鍚堟牸
checkValue(data,target){
if(!data.length){
return
@@ -970,7 +1236,7 @@
let flag = data.find(item=>item[target] <=0);
console.log(flag,'flag');
if(flag){
- return false
+ return false
}else{
return true;
}
@@ -989,6 +1255,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
@@ -1004,7 +1271,7 @@
// this.actionShow = true
// this.actionIndex = index
uni.navigateTo({
- url: `/pages/public-page/selectSpecifications/selectSpecifications?index=${index}&takeCoalId=${this.orderPlanId}&productName=${this.willProductName}`
+ url: `/pages/public-page/selectSpecifications/selectSpecifications?index=${index}&takeCoalId=${this.orderPlanId}&productName=${this.willProductName}&pageFlag=${false}&actionObj=${ JSON.stringify(this.showWeigh[index])}`
})
}
},
@@ -1019,11 +1286,11 @@
// 鎶樻墸鐜囪緭鍏�
discountInputHandle(value, index, clean) {
let znums;
- // if(this.globalShowWeigh[index].unqualifiedWeights){
- // znums = this.globalShowWeigh[index].unqualifiedWeights.split(',')
- // }else{
- // znums = []
- // }
+ if(this.globalShowWeigh[index].unqualifiedWeights){
+ znums = this.globalShowWeigh[index].unqualifiedWeights.split(',')
+ }else{
+ znums = []
+ }
console.log('璁＄畻鍑�閲�',value, index, clean)
this.indexFlag = index; // 璁板綍鏍囪瘑浣�
if (
@@ -1034,33 +1301,34 @@
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)
let x = new BigNumber(clean - 0)
let y = new BigNumber(value - 0)
- // let z = new BigNumber(znums.reduce((p,n)=>{
- // return (p - 0) + (n - 0)
- // },0))
+ let z = new BigNumber(znums.reduce((p,n)=>{
+ return (p - 0) + (n - 0)
+ },0))
console.log(clean,value,'鎵ｆ福');
if(x.minus(y).toFixed(2) <= 0){
this.showWeigh[index].weight = '0';
this.$u.toast('褰撳墠鍑�閲嶄笉鍚堟牸锛岃妫�鏌ョ毊閲嶏紝姣涢噸鏄惁鍑嗙‘')
}else{
- this.showWeigh[index].weight = x.minus(y);
+ console.log(znums.length)
+ this.showWeigh[index].weight = x.minus(y);
}
}else{
this.$u.toast('褰撳墠鏃犲噣閲�')
}
-
-
-
+
+
+
},
// 閫夋嫨涓嶅悎鏍煎搧鍚�
selectunqualifiedBreed(index) {
@@ -1089,10 +1357,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) {
@@ -1203,7 +1471,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')
@@ -1213,7 +1481,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; // 璁板綍鏍囪瘑浣�
@@ -1224,6 +1492,47 @@
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')
+
+ },
+ 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');
+
+
}
},
}
@@ -1235,6 +1544,19 @@
display: flex;
justify-content: space-between;
align-items: center;
+ }
+ .weigh-qualified{
+ display: flex;
+ width: 340rpx;
+ flex-direction: row;
+ height:auto;
+
+ }
+ .weight-box{
+ display: flex;
+ margin-bottom: 20rpx;
+ flex-direction: column;
+ overflow-y: scroll;
}
/deep/ .u-picker {
@@ -1345,7 +1667,7 @@
position: relative;
}
.num-radio{
- width: 60%;
+ width: 100%;
font-size: 100rpx;
}
@@ -1413,17 +1735,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;
@@ -1431,4 +1753,17 @@
border-radius: 8rpx;
margin-left: 12rpx;
}
-</style>
\ No newline at end of file
+ .kouFa-box{
+ display: flex;
+ flex-wrap: wrap;
+ .koufaBox-item{
+ width: 42%!important;
+ font-size: 26rpx;
+ .num-text{
+ width: 42%!important;
+ }
+
+ }
+
+ }
+</style>
--
Gitblit v1.9.1