From 04f3f15c930c2b02187d0ce11d68978b65361d54 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 31 三月 2023 09:26:29 +0800
Subject: [PATCH] 修复多数bug
---
pages/public-page/forward/forward.vue | 202 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 159 insertions(+), 43 deletions(-)
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index c3d81d6..5878218 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -1,21 +1,28 @@
<template>
<!-- 杞彂 -->
<view class="forward">
- <view class="forward-card">
+ <view v-if="roleType == 1"><u-notice-bar :text="text" :fontSize="30" mode="link"></u-notice-bar></view>
+ <view v-else-if="roleType == 2"><u-notice-bar :text="text1" :fontSize="30" mode="link"></u-notice-bar></view>
+ <view class="forward-card" v-for="(val, index) in jhOrderPlanForwardList" :key="index">
<u--form labelPosition="top" :model="forwardForm" ref="form1">
- <u-form-item label="杞彂瀵硅薄" labelWidth="20%" ref="item1" @click="forwardObjectClick"><u--input v-model="name" placeholder="鐐瑰嚮閫夋嫨杞彂瀵硅薄"></u--input></u-form-item>
+ <u-form-item label="杞彂瀵硅薄" labelWidth="20%" ref="item1" @click="forwardObjectClick(index)">
+ <u--input v-model="val.name" placeholder="鐐瑰嚮閫夋嫨杞彂瀵硅薄" :readonly="true"></u--input>
+ </u-form-item>
<u-form-item label="杈撳叆鏁伴噺" labelWidth="20%" ref="item1">
<view class="forward-card-amount">
- <view class="forward-card-amount-input"><u--input v-model="forwardForm.nums" placeholder="璇疯緭鍏ヨ浆鍙戞暟閲�"></u--input></view>
- <u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+ <view class="forward-card-amount-input"><u--input v-model="val.carNum" placeholder="璇疯緭鍏ヨ浆鍙戞暟閲�"></u--input></view>
+ <u-checkbox-group v-model="val.checkboxValue1" placement="column" @change="v => checkboxChange(v, index)">
<u-checkbox :customStyle="{ marginBottom: '8px' }" size="30" labelSize="30" label="鍏ㄩ儴杞彂" name="鍏ㄩ儴杞彂"></u-checkbox>
</u-checkbox-group>
</view>
</u-form-item>
+ <u-form-item><u-button text="鍒犻櫎鏈粍" :hairline="false" type="error" @click="deleteGroup(index, val)"></u-button></u-form-item>
</u--form>
</view>
+ <!-- 澧炲姞鎸夐挳 -->
+ <view class="AdddBtn"><u-button text="娣诲姞" :hairline="false" type="primary" :customStyle="{ marginBottom: '8px' }" @click="addForm"></u-button></view>
<!-- 鎸夐挳 -->
- <view class="forwardBtn"><u-button text="鎻愪氦" :hairline="false" type="primary" @click="submitForm"></u-button></view>
+ <view class="forwardBtn"><u-button text="鎻愪氦" :hairline="false" type="warning" @click="submitForm"></u-button></view>
<!-- 閫夋嫨璐т唬鎴栬溅闃熷脊鍑烘 -->
<view class="selectHuoDaiOrFleet-container">
@@ -47,23 +54,70 @@
export default {
onLoad(params) {
- console.log('杞彂鐨勬彁鐓ゅ崟id', params.orderPlanId, params.carNum);
- this.forwardForm.orderPlanId = params.orderPlanId;
- this.carNumTatal = params.carNum;
+ // 瀹㈡埛
+ this.cars2 = Number(params.cars2);
+ this.carNumSurplus1 = Number(params.carNumSurplus1);
+ // 璐т唬
+ this.carNum = Number(params.carNum);
+ this.carNumSurplusHuodai = this.forwardSurplus = Number(params.carNumSurplusHuodai);
+ this.orderPlanId = params.orderPlanId;
+ this.$reqGet('forwardList', { OrderPlanId: params.orderPlanId }).then(res => {
+ if (res.data.length !== 0 && this.roleType == 1) {
+ this.jhOrderPlanForwardList = res.data.map(item => {
+ return {
+ id: item.id,
+ orderPlanId: item.orderPlanId,
+ name: item.xsUserName === null ? item.fleetName : item.xsUserName,
+ carNum: item.carNum,
+ xsUserId: item.xsUserId === null ? 0 : item.xsUserId,
+ fleetId: item.fleetId === null ? 0 : item.fleetId,
+ checkboxValue1: ''
+ };
+ });
+ } else if (res.data.length !== 0 && this.roleType == 2) {
+ this.jhOrderPlanForwardList = res.data.map(item => {
+ return {
+ id: item.id,
+ orderPlanId: item.orderPlanId,
+ name: item.fleetName,
+ carNum: item.carNum,
+ xsUserId: item.xsUserId === null ? 0 : item.xsUserId,
+ fleetId: item.fleetId === null ? 0 : item.fleetId,
+ checkboxValue1: ''
+ };
+ });
+ } else {
+ this.jhOrderPlanForwardList = this.jhOrderPlanForwardList.map(v => {
+ if (!v.orderPlanId) {
+ return {
+ ...v,
+ orderPlanId: params.orderPlanId
+ };
+ }
+ });
+ }
+ });
},
data() {
return {
+ forwardSurplus: 0,
paramsName: {},
huoDaiData: [],
fleetData: [],
- carNumTatal: null,
- name: '',
- forwardForm: {
- orderPlanId: null,
- nums: null,
- userId: 0,
- fleetId: 0
- },
+ // 鏃ヨ鍒抜d
+ orderPlanId: '',
+ jhOrderPlanForwardList: [
+ {
+ orderPlanId: '',
+ name: '',
+ carNum: null,
+ xsUserId: 0,
+ fleetId: 0,
+ checkboxValue1: ''
+ }
+ ],
+ // 绱㈠紩锛屽埄鐢ㄧ储寮曟纭樉绀�
+ index: '',
checkboxValue1: '',
selectPopupShow: false,
list1: [
@@ -74,7 +128,12 @@
name: '璐т唬'
}
],
- tabHuoDai: false
+ tabHuoDai: false,
+ carNumSurplus1: '',
+ cars2: '',
+ carNum: '',
+ carNumSurplusHuodai: '',
+ formNum: 1
};
},
onShow() {
@@ -87,6 +146,12 @@
computed: {
roleType() {
return uni.getStorageSync('roleType');
+ },
+ text() {
+ return `宸查鍙�${this.cars2}寮犳棩璁″垝鍗�,鍓╀綑${this.carNumSurplus1}寮犳棩璁″垝鍗昤;
+ },
+ text1() {
+ return `宸叉嫢鏈�${this.carNum}寮犳棩璁″垝鍗�,鍓╀綑${this.carNumSurplusHuodai}寮犳棩璁″垝鍗昤;
}
},
methods: {
@@ -104,12 +169,13 @@
break;
}
},
- checkboxChange(value) {
- console.log('澶嶉�夋鍙樺寲', value);
+ checkboxChange(value, index) {
+ console.log('澶嶉�夋鍙樺寲', value, index);
if (value.length != 0) {
- this.forwardForm.nums = this.carNumTatal;
+ console.log(this.forwardSurplus, '璐т唬杞彂鍏ㄩ儴鏁伴噺');
+ this.jhOrderPlanForwardList[index].carNum = this.forwardSurplus;
} else {
- this.forwardForm.nums = null;
+ this.jhOrderPlanForwardList[index].carNum = null;
}
},
// 鑾峰彇璐т唬鍒楄〃
@@ -127,9 +193,9 @@
});
},
// 杞彂
- forwardObjectClick() {
- console.log('hahah');
+ forwardObjectClick(index) {
this.selectPopupShow = true;
+ this.index = index;
console.log(this.huoDaiData, this.fleetData, '杞彂');
},
selectPopupClose() {
@@ -141,31 +207,78 @@
// 杞彂閫夋嫨璐т唬
forwardHuoDaiObjectSelect(item) {
this.selectPopupShow = false;
- this.forwardForm.userId = item.id;
- // this.forwardForm.name = item.huoDaiName;
- this.name = item.huoDaiName;
- this.forwardForm.fleetId = 0;
- console.log('璐т唬閫夋嫨', this.forwardForm);
+ this.jhOrderPlanForwardList[this.index].xsUserId = item.userId;
+ this.jhOrderPlanForwardList[this.index].name = item.name;
+ this.jhOrderPlanForwardList[this.index].fleetId = 0;
+ console.log('璐т唬閫夋嫨', this.jhOrderPlanForwardList[this.index]);
},
// 杞彂閫夋嫨杞﹂槦
forwardFleetObjectSelect(item) {
this.selectPopupShow = false;
- this.forwardForm.fleetId = item.id;
- // this.forwardForm.name = item.name;
- this.name = item.name;
- this.forwardForm.userId = 0;
- console.log('杞﹂槦閫夋嫨', this.forwardForm);
+ this.jhOrderPlanForwardList[this.index].fleetId = item.id;
+ this.jhOrderPlanForwardList[this.index].name = item.name;
+ this.jhOrderPlanForwardList[this.index].xsUserId = 0;
+ console.log('杞﹂槦閫夋嫨', this.jhOrderPlanForwardList[this.index]);
+ },
+ addForm() {
+ this.jhOrderPlanForwardList.push({
+ orderPlanId: this.orderPlanId,
+ name: '',
+ carNum: 0,
+ xsUserId: 0,
+ fleetId: 0,
+ checkboxValue1: ''
+ });
+ },
+ // 鍒犻櫎涓�缁勮〃鍗�
+ deleteGroup(index, v) {
+ let tempcarNum = v.carNum;
+ if (v.id && this.jhOrderPlanForwardList[index].carNum !== tempcarNum) {
+ this.$reqPost('deleteForward', { id: v.id }, 'params').then(res => {
+ if (res.code === 0) {
+ this.jhOrderPlanForwardList.splice(index, 1);
+ this.$u.toast('鍒犻櫎鎴愬姛');
+ } else if (res.code === 1) {
+ this.$u.toast(res.msg);
+ }
+ });
+ } else {
+ this.jhOrderPlanForwardList.splice(index, 1);
+ this.$u.toast('鍒犻櫎鎴愬姛');
+ }
},
// 鎻愪氦
submitForm() {
- this.$reqPost('forward', this.forwardForm, 'params').then(res => {
- if (res.code == 0) {
- this.$u.toast('鎻愪氦鎴愬姛');
- setTimeout(() => {
- uni.navigateBack({ delta: 1 });
- }, 1000);
+ let isPass = false;
+ this.jhOrderPlanForwardList.forEach(v => {
+ if (isNaN(Number(v.carNum)) || Number(v.carNum) <= 0) {
+ this.$u.toast('璇疯緭鍏ュ悎娉曟暟瀛�');
+ isPass = false;
+ return isPass;
+ }
+ // else if (Number(v.carNum) > Number(this.forwardSurplus)) {
+ // this.$u.toast('瓒呰繃鏈�澶ц鍗曞墿浣欓噺');
+ // isPass = false;
+ // return isPass;
+ // }
+ else {
+ isPass = true;
+ return isPass;
}
});
+ if (isPass) {
+ this.$reqPost('forward', this.jhOrderPlanForwardList, 'json').then(res => {
+ console.log(res, 'zh');
+ if (res.code == 0) {
+ this.$u.toast('鎻愪氦鎴愬姛');
+ setTimeout(() => {
+ uni.navigateBack({ delta: 1 });
+ }, 1000);
+ } else {
+ this.$u.toast(res.msg);
+ }
+ });
+ }
},
tabClick(item) {
console.log('tab鐐瑰嚮', item);
@@ -186,8 +299,11 @@
// 鍗＄墖
.forward-card {
- margin-top: vww(24);
-
+ margin-top: vww(10);
+ .notice-bar {
+ width: 100%;
+ height: vww(24);
+ }
.u-form {
.u-form-item {
.u-form-item__body {
@@ -217,8 +333,8 @@
}
.forwardBtn {
- width: 90%;
- position: fixed;
+ width: 100%;
+ // position: fixed;
bottom: vww(50);
}
--
Gitblit v1.9.1