From 5bebf53d62c3519cf7be3e2217c5249e540173ec Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 07 九月 2023 17:09:08 +0800
Subject: [PATCH] 操作指引修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 201 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 139 insertions(+), 62 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 c1352fd..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,28 +56,42 @@
<view class="count">{{ item.weight }}</view>
</view>
</view>
- <view class="notice-num">
- <view class="num-text">
- <u--text text="閫氱煡鏁伴噺"
+ <view class="level">
+ <view style="width: 140rpx;">
+ <u--text text="鐗╄祫鏄庣粏"
size='32'></u--text>
</view>
- <view class="num-input">
- <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>
+ <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">
- <view class="num-text"
- style="width: 160rpx;">
+ <view style="width: 180rpx;">
<u--text text="涓嶅悎鏍煎搧鍚�"
size='32'></u--text>
</view>
- <view class="num-input">
- <u-tag :text="item.unqualifiedBreed||'璇烽�夋嫨'"
- plain
- @click='selectunqualifiedBreed(i)'></u-tag>
+ <view class="tag-select"
+ @click="selectunqualifiedBreed(i)">
+ <text>
+ {{!flag?(globalShowWeigh[i].unqualifiedBreed?globalShowWeigh[i].unqualifiedBreed:item.unqualifiedBreed):(item.unqualifiedBreed||"璇烽�夋嫨")}}
+ </text>
</view>
</view>
<view class="notice-num">
@@ -85,36 +99,35 @@
<u--text text="涓嶅悎鏍奸噸閲�"
size='32'></u--text>
</view>
- <view class="num-input">
+ <view class="num-input"
+ v-if='roleType===4&&!flag'>
<u--input placeholder="璇疯緭鍏ヤ笉鍚堟牸閲嶉噺"
border="bottom"
clearable
v-model="item.unqualifiedWeight"
@input='v=>unqualifiedWeightInputHandle(v,i,item.clean)'></u--input>
</view>
+ <view class="num-show"
+ v-else-if="flag">
+ {{item.unqualifiedWeight}}
+ </view>
</view>
- <view class="level"
- v-if='!flag'>
- <view class=""
- 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>
- <u-tag :text="item.breed+item.spec||item.modifygoodsName||'鏆傛棤'"
- plain
- @click="goodsPopoverShow(i)"
- v-if='roleType===4'></u-tag>
- </view>
- <view class="level"
- v-if='item.modifygoodsName||flag'>
- <view style="width: 200rpx;">
- <u--text text="鍝佸悕涓庤鏍�"
- size='32'></u--text>
+ <view class="num-input"
+ v-if='roleType===4&&!flag'>
+ <u--input placeholder="璇疯緭鍏ラ�氱煡鏁伴噺"
+ border="bottom"
+ clearable
+ v-model="item.num"></u--input>
</view>
- <view v-if="showWeighCopy[i].modifyProductName||item.breed&&item.spec">
- <u-tag :text="!flag?showWeighCopy[i].modifyProductName:item.breed+item.spec"
- plain
- @click="productNamePopoverShow(i)"></u-tag>
+ <view class="num-show"
+ v-else-if="flag">
+ {{item.num}}
</view>
</view>
<view style="display: flex;margin-top: 20rpx;margin-left: 20rpx;"
@@ -132,7 +145,7 @@
</view>
</view>
<view v-else-if='!item.isImage&&!flag'
- style="margin-top: 8rpx;">
+ style="margin: 30rpx 80rpx;">
<u-upload :fileList="item.fileList"
deletable
@afterRead="afterRead"
@@ -184,9 +197,10 @@
</template>
<script>
+ 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 {
@@ -218,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
@@ -255,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()
@@ -265,7 +302,7 @@
this.goodsList = r.data.map(v => {
return {
...v,
- name: v.breed + v.spec
+ name: v.breed + '/' + v.spec
}
})
uni.hideLoading()
@@ -299,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(',')
}
@@ -329,8 +368,11 @@
},
// 鐗╄祫鏄庣粏
goodsPopoverShow(index) {
- this.goodsShow = true
- this.goodsIndex = index
+ if (this.roleType === 4 && !this.flag) {
+ this.goodsShow = true
+ this.goodsIndex = index
+ }
+
},
goodsNameClose() {
this.goodsShow = false
@@ -348,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() {
@@ -363,25 +408,34 @@
// 鎶樻墸鐜囪緭鍏�
discountInputHandle(value, index, clean) {
this.showWeigh[index].cinderWeight = Number(value)
- this.showWeigh[index].weight = (clean - (Number(value)).toFixed(2));
+ if (clean) {
+ let x = new BigNumber(clean)
+ let y = new BigNumber(value)
+ this.showWeigh[index].weight = x.minus(y).toFixed(2)
+ }
},
// 閫夋嫨涓嶅悎鏍煎搧鍚�
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)
- console.log(this.showWeigh[index].weight);
},
unqualifiedClose() {
this.unqualifiedShow = false
},
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) {
@@ -540,20 +594,43 @@
width: 60%;
border-bottom: 1px solid rgb(218, 219, 222);
}
+
+ .num-show {
+ width: 60%;
+ color: #303030
+ }
}
.unqualifiedBreed {
- width: 64% !important;
- margin-left: 70rpx !important;
@extend .level;
}
.level {
- width: 60%;
- margin-top: 30rpx;
- margin-left: 80rpx;
+ width: 89%;
+ margin: 30rpx 80rpx;
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
+
+ .tag-select {
+ flex: 1;
+ margin-left: 14rpx;
+ text-align: center;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ border: 1rpx solid rgb(60, 156, 255);
+ padding: 8rpx 14rpx;
+ color: rgb(60, 156, 255);
+ font-size: 26rpx;
+
+ .tag-select_text {
+ // width: vww(180);
+ // border: 1rpx solid rgb(60, 156, 255);
+ // padding: 8rpx 14rpx;
+ // color: rgb(60, 156, 255);
+ // font-size: 26rpx;
+ }
+ }
}
.select-button {
--
Gitblit v1.9.1