From 57704defda1b3b3155a6ef53644e8b0aa0d87abd Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 06 七月 2023 16:32:53 +0800
Subject: [PATCH] 验质功能修改
---
api/globalApi.js | 4 +
pages.json | 2
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 142 ++++++++++++++++++++++++++++-------------------
store/index.js | 16 +++-
4 files changed, 100 insertions(+), 64 deletions(-)
diff --git a/api/globalApi.js b/api/globalApi.js
index 2191807..384cc47 100644
--- a/api/globalApi.js
+++ b/api/globalApi.js
@@ -152,6 +152,10 @@
url: '/wrzs/userOperation/qualityInspectionHistory',
method: 'GET'
},
+ getMaterialDetailByOrderCode: {
+ url: '/wrzs/materialdetail/getMaterialDetailByOrderCode',
+ method: 'GET'
+ },
// 鐢ㄦ埛
// 鑾峰彇鐢ㄦ埛淇℃伅
getUserEntity: {
diff --git a/pages.json b/pages.json
index 537b2a7..33f8c33 100644
--- a/pages.json
+++ b/pages.json
@@ -278,7 +278,7 @@
"pages": [{
"path": "appointment",
"style": {
- "navigationBarTitleText": "鏃舵",
+ "navigationBarTitleText": "棰勭害鏃舵",
"enablePullDownRefresh": false
}
}]
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 ba0d57b..09c87ff 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
@@ -8,7 +8,7 @@
v-if="showWeigh.length===0"></u-empty>
<view class="main-block"
v-for="(item,i) in showWeigh"
- :key="i">
+ :key="item.id">
<view class="weigh-item">
<view class="item">
<view class="concrete"
@@ -35,11 +35,11 @@
<view class="discount">
<view class="rate">
<view class="label-text">
- 鎶樻墸鐜�
+ 鎵ｆ福
</view>
<view v-if='roleType===4&&!flag'
class="count-input">
- <u--input placeholder="璇疯緭鍏ユ姌鎵ｇ巼"
+ <u--input placeholder="璇疯緭鍏ユ墸娓�"
border="bottom"
clearable
v-model="item.discount"
@@ -51,26 +51,32 @@
</view>
<view class="weigh">
<view class="label-text">
- 鎶樻墸鍚庨噸閲�
+ 鎵ｆ福鍚庡噣閲�
</view>
<view class="count">{{ item.discountWeight }}</view>
</view>
</view>
<view class="level">
- <u-tag :text="item.level||'璇烽�夋嫨'"
- plain
- @click="popoverShow(i)"
- v-if='item.level||roleType===4'></u-tag>
- <u-tag :text="item.productName||'璇烽�夋嫨'"
+ <view class=""
+ style="width: 70rpx;">
+ <u--text text="钃濇湰"
+ size='32'></u--text>
+ </view>
+ <u-tag :text="MaterialList[i].breed+MaterialList[i].spec||'鏆傛棤'"
plain
@click="productNamePopoverShow(i)"
- v-if='item.level||roleType===4'></u-tag>
+ v-if='MaterialList[i].breed&&MaterialList[i].spec||roleType===4'></u-tag>
</view>
- <view v-if='roleType===4'>
- <u-picker :show="show"
- :columns="columns"
- @cancel='cancel'
- @confirm='confirm'></u-picker>
+ <view class="level"
+ v-if='modifyMaterialList[i].modifyProductName'>
+ <view style="width: 70rpx;">
+ <u--text text="淇"
+ size='32'></u--text>
+ </view>
+ <view>
+ <u-tag :text="modifyMaterialList[i].modifyProductName"
+ plain></u-tag>
+ </view>
</view>
<view class="">
<u-action-sheet :actions="actionsList"
@@ -104,10 +110,6 @@
discountrate: "",
loading: false,
show: false,
- columns: [
- ['杞昏川', '涓川', '閲嶈川']
- ],
- level: '璇烽�夋嫨',
selectIndex: null,
// 浜у搧鍒楄〃
actionsList: [],
@@ -115,7 +117,16 @@
actionIndex: null,
onlineurl,
havedInput: false,
- flag: false
+ flag: false,
+ orderCode: null,
+ // 鐗╄祫鏄庣粏list
+ MaterialList: [],
+ // 淇敼涔嬪悗鐨勭墿璧勬槑缁唋ist
+ modifyMaterialList: [],
+ // 淇敼涔嬪悗鐨勪骇鍝佸悕绉�
+ modifyProductName: null,
+ // 鏄惁淇敼
+ isModify: false
};
},
computed: {
@@ -129,6 +140,9 @@
},
onShow() {
this.roleType === 1 ? this.GetOrderPlan() : this.getTakeCoal()
+ if (this.orderCode) {
+ this.getMaterialDetailByOrderCode()
+ }
this.getJcProductList()
},
methods: {
@@ -139,18 +153,20 @@
this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
if (res.code == 0) {
this.coalDetailsData = res.data;
+ this.orderCode = res.data.orderCode
this.showWeigh = this.coalDetailsData.tmTaskCoalItems ? this.coalDetailsData
- .tmTaskCoalItems : [],
- this.showWeigh.forEach(v => {
- if (!v.discount) {
- v.discount = ''
- }
- })
+ .tmTaskCoalItems : [];
uni.hideLoading()
} else {
this.$u.toast('鍔犺浇澶辫触')
uni.hideLoading()
}
+ }).then(() => {
+ this.$reqGet('getMaterialDetailByOrderCode', { orderCode: this.orderCode }).then(r => {
+ this.MaterialList = r.data
+ this.modifyMaterialList = JSON.parse(JSON.stringify(this.MaterialList))
+ uni.hideLoading()
+ })
})
},
GetOrderPlan() {
@@ -158,6 +174,7 @@
this.$reqGet('GetOrderPlan').then(res => {
if (res.data) {
this.coalDetailsData = res.data;
+ this.orderCode = res.data.orderCode
this.showWeigh = this.coalDetailsData[this.index].tmTaskCoals ? this.coalDetailsData[
this.index].tmTaskCoals : [],
uni.hideLoading();
@@ -173,7 +190,7 @@
this.actionsList = res.data.map(v => {
return {
...v,
- name: v.productName
+ name: v.secondCategoryName + v.spec
}
})
}
@@ -182,6 +199,19 @@
// 杈撳叆鎶樻墸鐜囧悗鐐瑰嚮纭
confirmInput() {
this.loading = true
+ this.showWeigh = this.showWeigh.map((v, i) => {
+ return {
+ ...v,
+ itemId: this.MaterialList[i].itemId,
+ Num: this.MaterialList[i].Num,
+ NumUnit: this.MaterialList[i].NumUnit,
+ Remark: this.MaterialList[i].Remark,
+ spec: this.modifyMaterialList[i].modifyProductName ? this.actionsList[i].spec : this
+ .MaterialList[i].spec,
+ breed: this.modifyMaterialList[i].modifyProductName ? this.actionsList[i]
+ .secondCategoryName : this.MaterialList[i].breed
+ }
+ })
this.$reqPost('updateTmTaskCoalItem', this.showWeigh, 'json').then(
res => {
if (res.code == 0) {
@@ -198,38 +228,20 @@
}
})
},
- // 閫夋嫨璐ㄩ噺
- popoverShow(i) {
- console.log();
- if (this.roleType === 4 && !this.flag) {
- this.show = true
- this.selectIndex = i
- }
- },
- // 閫夋嫨浜у搧
- productNamePopoverShow(i) {
- if (this.roleType === 4 && !this.flag) {
- this.actionShow = true
- this.actionIndex = i
- }
- },
- confirm(e) {
- this.show = false
- this.showWeigh[this.selectIndex].level = e.value[0]
- },
- cancel() {
- this.show = false
+ productNamePopoverShow(index) {
+ this.actionShow = true
+ this.actionIndex = index
},
productNameClose() {
this.actionShow = false
},
selectClick(val) {
- this.showWeigh[this.actionIndex].productName = val.productName
- this.showWeigh[this.actionIndex].productId = val.id
+ this.modifyMaterialList[this.actionIndex].modifyProductName = val.name
},
// 鎶樻墸鐜囪緭鍏�
discountInputHandle(value, index, clean) {
- this.showWeigh[index].discountWeight = ((Number(value) * clean) / 100).toFixed(2)
+ this.showWeigh[index].cinderWeight = Number(value)
+ this.showWeigh[index].discountWeight = (clean - (Number(value)).toFixed(2));
}
},
}
@@ -258,7 +270,7 @@
.main-block {
width: 690rpx;
- height: 360rpx;
+ min-height: 360rpx;
margin: vww(20) auto;
padding: vww(5);
background: #ffffff;
@@ -306,6 +318,7 @@
.rate,
.weigh {
width: 50%;
+ height: vww(80);
display: flex;
align-items: center;
justify-content: space-around;
@@ -314,8 +327,11 @@
.count-input {
width: 70%;
border-bottom: 1px solid rgb(218, 219, 222);
-
}
+ }
+
+ .weigh {
+ justify-content: space-between;
}
.count {
@@ -326,11 +342,25 @@
}
.level {
- width: 40%;
+ width: 60%;
margin-top: 30rpx;
margin-left: 80rpx;
display: flex;
justify-content: space-between;
+ }
+
+ .select-button {
+ width: 100%;
+ @include flex;
+ justify-content: flex-end;
+ margin-bottom: 40rpx;
+ position: absolute;
+ right: vww(-120);
+ bottom: vww(-10);
+
+ /deep/ .u-button {
+ width: 180rpx !important;
+ }
}
}
@@ -340,10 +370,6 @@
@include flex;
justify-content: center;
margin-bottom: 40rpx;
-
- /deep/ .u-button {
- width: 180 rpx !important;
- }
}
}
</style>
\ No newline at end of file
diff --git a/store/index.js b/store/index.js
index d5d5ba6..ed0f27b 100644
--- a/store/index.js
+++ b/store/index.js
@@ -169,7 +169,11 @@
},
// 鏀瑰彉閲嶈繛娆℃暟
changereconnectNum(state, payload) {
- state.connectNum = payload
+ if (state.connectNum < 6) {
+ state.connectNum += payload
+ } else {
+ state.connectNum = payload
+ }
},
},
actions: {
@@ -237,15 +241,17 @@
commit('changereconnectState', false)
if (state.connectNum < 6) {
uni.showToast({
- title: `杩炴帴澶辫触锛屾灏濊瘯绗�${state.connectNum}娆¤繛鎺,
+ title: `杩炴帴澶辫触锛屾鍦ㄥ皾璇曠${state.connectNum}娆¤繛鎺,
icon: 'none'
})
- let num = 1;
- num++;
- commit('changereconnectNum', num)
+ commit('changereconnectNum', 1)
dispatch('reconnect')
} else {
commit('changereconnectNum', 1)
+ uni.showToast({
+ title: '缃戠粶寮傚父,璇风◢鍚庨噸璇�',
+ icon: 'none'
+ })
}
},
// 鎺ユ敹鏁版嵁
--
Gitblit v1.9.1