From fa9d6d873f252894b668aae8525a3d83b7175ca5 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 28 七月 2023 15:56:33 +0800
Subject: [PATCH] 修改验质
---
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 155 +++++++++++++++++++++++++++++----------------------
1 files changed, 87 insertions(+), 68 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 6e48a53..f81c044 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
@@ -56,22 +56,30 @@
<view class="count">{{ item.weight }}</view>
</view>
</view>
- <view class="notice-num">
- <view class="num-text"
- style="margin-left: 10rpx;">
- <u--text text="閫氱煡鏁伴噺"
+ <view class="level">
+ <view style="width: 140rpx;">
+ <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.num"></u--input>
+ <view class="tag-select"
+ @click="goodsPopoverShow(i)"
+ v-if='roleType===4'>
+ <text>
+ {{item.breed+"/"+item.spec||item.modifygoodsName||'鏆傛棤'}}
+ </text>
</view>
- <view class="num-show"
- v-else-if="flag">
- {{item.num}}
+ </view>
+ <view class="level"
+ v-if='item.modifygoodsName||globalShowWeigh[i].modifyProductName'>
+ <view style="width: 180rpx;">
+ <u--text text="鍝佸悕涓庤鏍�"
+ size='32'></u--text>
+ </view>
+ <view class="tag-select"
+ @click="productNamePopoverShow(i)">
+ <text>
+ {{!flag?(globalShowWeigh[i].modifyProductName?globalShowWeigh[i].modifyProductName:item.modifygoodsName):(item.breed+'/'+item.spec)}}
+ </text>
</view>
</view>
<view class="unqualifiedBreed">
@@ -82,14 +90,9 @@
<view class="tag-select"
@click="selectunqualifiedBreed(i)">
<text>
- {{item.unqualifiedBreed||'璇烽�夋嫨'}}
+ {{!flag?(globalShowWeigh[i].unqualifiedBreed?globalShowWeigh[i].unqualifiedBreed:item.unqualifiedBreed):(item.unqualifiedBreed||"璇烽�夋嫨")}}
</text>
</view>
- <!-- <view class="tag-select">
- <u-tag :text="item.unqualifiedBreed||'璇烽�夋嫨'"
- plain
- @click='selectunqualifiedBreed(i)'></u-tag>
- </view> -->
</view>
<view class="notice-num">
<view class="num-text">
@@ -109,38 +112,23 @@
{{item.unqualifiedWeight}}
</view>
</view>
- <view class="level"
- v-if='!flag'>
- <view style="width: 140rpx;">
- <u--text text="鐗╄祫鏄庣粏"
+ <view class="notice-num">
+ <view class="num-text"
+ style="margin-left: 10rpx;">
+ <u--text text="閫氱煡鏁伴噺"
size='32'></u--text>
</view>
- <view class="tag-select"
- @click="goodsPopoverShow(i)"
- v-if='roleType===4'>
- <text>
- {{item.breed+item.spec||item.modifygoodsName||'鏆傛棤'}}
- </text>
+ <view class="num-input"
+ v-if='roleType===4&&!flag'>
+ <u--input placeholder="璇疯緭鍏ラ�氱煡鏁伴噺"
+ border="bottom"
+ clearable
+ v-model="item.num"></u--input>
</view>
- </view>
- <view class="level"
- v-if='item.modifygoodsName||flag'>
- <view style="width: 180rpx;">
- <u--text text="鍝佸悕涓庤鏍�"
- size='32'></u--text>
+ <view class="num-show"
+ v-else-if="flag">
+ {{item.num}}
</view>
- <view class="tag-select"
- @click="productNamePopoverShow(i)"
- v-if="showWeighCopy[i].modifyProductName||item.breed&&item.spec">
- <text>
- {{!flag?showWeighCopy[i].modifyProductName:item.breed+item.spec}}
- </text>
- </view>
- <!-- <view v-if="showWeighCopy[i].modifyProductName||item.breed&&item.spec">
- <u-tag :text="!flag?showWeighCopy[i].modifyProductName:(item.breed?item.breed+item.spec:'璇烽�夋嫨')"
- plain
- @click="productNamePopoverShow(i)"></u-tag>
- </view> -->
</view>
<view style="display: flex;margin-top: 20rpx;margin-left: 20rpx;"
v-if="item.isImage">
@@ -212,7 +200,7 @@
import BigNumber from "bignumber.js"
import { BaseUrl } from '@/api/publicInterface.js';
import { onlineurl } from '@/api/request.js'
- import backtop from '../../../../../uni_modules/uview-ui/libs/config/props/backtop';
+ import { mapState, mapMutations } from "vuex"
export default {
data() {
return {
@@ -244,28 +232,46 @@
BaseUrl,
// 涓嶅悎鏍煎搧鍚�
unqualifiedShow: false,
- unqualifiedIndex: null
-
+ unqualifiedIndex: null,
+ dataForm: {},
+ // // 鍒ゆ柇鏄慨鏀瑰搧鍚嶄笌瑙勬牸杩樻槸涓嶅悎鏍煎搧鍚�
+ ModifiedOrderIndex: null,
+ willProductName: true,
+ willUnqualified: true,
+ alterProductName: false,
+ alterUnqualified: false,
+ // 瀛樺偍涓棿鎬�
+ showWeighCopyStorge: [],
+ havedSubmit: false
};
},
computed: {
+ ...mapState(["globalShowWeigh"]),
roleType() {
return uni.getStorageSync('roleType')
},
+ showWeighCopyStorgeOther() {
+ return uni.getStorageSync('showWeighCopyStorgeOther')
+ }
},
onLoad(params) {
this.orderPlanId = params.orderPlanId ? params.orderPlanId : '';
this.flag = params.flag ? params.flag : false;
this.roleType === 1 ? this.GetOrderPlan() : this.getTakeCoal()
- this.getJcProductList()
+ this.ModifiedOrderIndex = params.index
+ this.alterProductName = params.productName === "true" || false
+ this.alterUnqualified = params.unqualified === "true" || false
+ this.havedSubmit = params.havedSubmit === "true" || false
},
methods: {
+ ...mapMutations(['changeglobalShowWeigh']),
getTakeCoal() {
uni.showLoading({
title: '鍔犺浇涓�'
});
this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
if (res.code == 0) {
+ uni.hideLoading()
this.coalDetailsData = res.data;
this.orderCode = res.data.orderCode
this.showWeigh = this.coalDetailsData.tmTaskCoalItems ? this.coalDetailsData
@@ -281,7 +287,12 @@
}
})
this.showWeighCopy = JSON.parse(JSON.stringify(this.showWeigh))
- uni.hideLoading()
+ uni.setStorageSync("showWeighCopyStorge", this.showWeighCopy)
+ if (this.havedSubmit) {
+ this.changeglobalShowWeigh(uni.getStorageSync('showWeighCopyStorgeOther'))
+ } else {
+ this.changeglobalShowWeigh(uni.getStorageSync('showWeighCopyStorge'))
+ }
} else {
this.$u.toast('鍔犺浇澶辫触')
uni.hideLoading()
@@ -291,7 +302,7 @@
this.goodsList = r.data.map(v => {
return {
...v,
- name: v.breed + v.spec
+ name: v.breed + '/' + v.spec
}
})
uni.hideLoading()
@@ -325,14 +336,16 @@
}
})
},
- // 杈撳叆鎶樻墸鐜囧悗鐐瑰嚮纭
+ // 鐐瑰嚮纭
confirmInput() {
this.loading = true
this.showWeigh = this.showWeigh.map((v, i) => {
return {
...v,
- breed: this.showWeighCopy[i].modifyProductName ? this.showWeighCopy[i].breed : v.breed,
- spec: this.showWeighCopy[i].modifyProductName ? this.showWeighCopy[i].spec : v.spec,
+ 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(',')
}
@@ -359,6 +372,7 @@
this.goodsShow = true
this.goodsIndex = index
}
+
},
goodsNameClose() {
this.goodsShow = false
@@ -376,8 +390,11 @@
// 鍝佸悕涓庤鏍�
productNamePopoverShow(index) {
if (this.roleType === 4 && !this.flag) {
- this.actionShow = true
- this.actionIndex = index
+ // this.actionShow = true
+ // this.actionIndex = index
+ uni.navigateTo({
+ url: `/pages/public-page/selectSpecifications/selectSpecifications?index=${index}&takeCoalId=${this.orderPlanId}&productName=${this.willProductName}`
+ })
}
},
productNameClose() {
@@ -400,17 +417,12 @@
// 閫夋嫨涓嶅悎鏍煎搧鍚�
selectunqualifiedBreed(index) {
if (this.roleType === 4 && !this.flag) {
- this.unqualifiedShow = true
- this.unqualifiedIndex = index
+ // this.unqualifiedShow = true
+ // this.unqualifiedIndex = index
+ uni.navigateTo({
+ url: `/pages/public-page/selectSpecifications/selectSpecifications?index=${index}&takeCoalId=${this.orderPlanId}&unqualified=${this.willUnqualified}`
+ })
}
- },
- // 涓嶅悎鏍奸噸閲忚緭鍏�
- unqualifiedWeightInputHandle(value, index, clean) {
- // this.showWeigh[index].weight = (clean - (Number(value)) - this.showWeigh[index].cinderWeight).toFixed(2)
- let x = new BigNumber(clean)
- let y = new BigNumber(value)
- let z = new BigNumber(this.showWeigh[index].cinderWeight)
- this.showWeigh[index].weight = x.minus(y).minus(z).toFixed(2) || ''
},
unqualifiedClose() {
this.unqualifiedShow = false
@@ -418,6 +430,13 @@
selectUnqualifiedClick(val) {
this.showWeigh[this.unqualifiedIndex].unqualifiedBreed = val.secondCategoryName + val.spec
},
+ // 涓嶅悎鏍奸噸閲忚緭鍏�
+ unqualifiedWeightInputHandle(value, index, clean) {
+ let x = new BigNumber(clean)
+ let y = new BigNumber(value)
+ let z = new BigNumber(this.showWeigh[index].cinderWeight)
+ this.showWeigh[index].weight = x.minus(y).minus(z).toFixed(2) || ''
+ },
// 鍒犻櫎鍥剧墖
deletePic(event) {
this.showWeigh[event.name].fileList.splice(event.index, 1);
--
Gitblit v1.9.1