From af436aa050f76584cd5cb88e413e45cd08c15d50 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 17 五月 2023 14:14:04 +0800
Subject: [PATCH] 修改部分错误，增加新功能
---
pages/public-page/forward/forward.vue | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index e3a5c3e..7466107 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -9,14 +9,17 @@
</view>
<view v-if="roleType == 1" class="notice-bar">
<u-notice-bar :text="text" :fontSize="30"></u-notice-bar>
- <view class="notice-icon" style="background: url('../../../static/image/banner/notice.png') no-repeat;background-size: cover; width: 42rpx;height: 42rpx;"></view>
+ <view
+ class="notice-icon"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/notice.png') no-repeat;background-size: cover; width: 42rpx;height: 42rpx;"
+ ></view>
</view>
<view v-else-if="roleType == 2" class="notice-bar"><u-notice-bar :text="text1" :fontSize="30"></u-notice-bar></view>
<view class="card-main">
<view class="card-block">
- <view class="forward-card" v-for="(val, index) in jhOrderPlanForwardList" :key="index">
+ <view class="forward-card" v-for="(val, index) in jhOrderPlanForwardList" :key="val.vid">
<u-swipe-action>
- <u-swipe-action-item :options="options1" @click="deleteGroup(index, val)">
+ <u-swipe-action-item :options="options1" @click="deleteGroup(index, val)" :name="val.vid">
<view class="card-content">
<u--form labelPosition="left" :model="forwardForm" ref="form1">
<u-form-item label="杞彂瀵硅薄" labelWidth="21%" ref="item1" @click="forwardObjectClick(index)">
@@ -108,7 +111,8 @@
carNum: item.carNum,
xsUserId: item.xsUserId === null ? 0 : item.xsUserId,
fleetId: item.fleetId === null ? 0 : item.fleetId,
- checkboxValue1: ''
+ checkboxValue1: '',
+ vid: new Date().getTime()
};
});
} else if (res.data.length !== 0 && this.roleType == 2) {
@@ -120,7 +124,8 @@
carNum: item.carNum,
xsUserId: item.xsUserId === null ? 0 : item.xsUserId,
fleetId: item.fleetId === null ? 0 : item.fleetId,
- checkboxValue1: ''
+ checkboxValue1: '',
+ vid: new Date().getTime()
};
});
} else {
@@ -128,7 +133,8 @@
if (!v.orderPlanId) {
return {
...v,
- orderPlanId: params.orderPlanId
+ orderPlanId: params.orderPlanId,
+ vid: new Date().getTime()
};
}
});
@@ -373,6 +379,16 @@
let time;
let that = this;
that.$set(that.jhOrderPlanForwardList[index], 'carNum', Number(value));
+ if (that.roleType == 1) {
+ if (that.jhOrderPlanForwardList[index].carNum < that.carNumSurplus1) {
+ that.jhOrderPlanForwardList[index].checkboxValue1 = '';
+ }
+ }
+ if (that.roleType == 2) {
+ if (that.jhOrderPlanForwardList[index].carNum < that.carNumSurplusHuodai) {
+ that.jhOrderPlanForwardList[index].checkboxValue1 = '';
+ }
+ }
return (function() {
if (!time) {
time = setTimeout(() => {
@@ -398,7 +414,8 @@
xsUserId: 0,
fleetId: 0,
checkboxValue1: '',
- ischecked: false
+ ischecked: false,
+ vid: new Date().getTime()
});
} else {
this.jhOrderPlanForwardList.push({
@@ -408,7 +425,8 @@
xsUserId: 0,
fleetId: 0,
checkboxValue1: '',
- ischecked: true
+ ischecked: true,
+ vid: new Date().getTime()
});
}
this.calculate(this.jhOrderPlanForwardList);
@@ -547,6 +565,8 @@
justify-content: center;
position: relative;
top: -100rpx;
+ z-index: 1;
+ margin-bottom: vww(40);
.card-block {
width: 690rpx;
@include flex;
@@ -612,9 +632,9 @@
width: 610rpx;
@include flex;
position: fixed;
- bottom: vww(50);
- left: vww(25);
- z-index: 2;
+ bottom: vww(30);
+ left: vww(30);
+ z-index: 3;
.AdddBtn,
.forwardBtn {
width: 290rpx;
--
Gitblit v1.9.1