From 17427143356e8a410552cb44120a02eb6eb35540 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 17 七月 2023 15:44:22 +0800
Subject: [PATCH] 增加销类型称重判断逻辑

---
 pages/customer-page/fleet-management/fleet-management.vue |   57 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/pages/customer-page/fleet-management/fleet-management.vue b/pages/customer-page/fleet-management/fleet-management.vue
index 9738713..0f0dd0f 100644
--- a/pages/customer-page/fleet-management/fleet-management.vue
+++ b/pages/customer-page/fleet-management/fleet-management.vue
@@ -2,14 +2,21 @@
 	<view class="fleet-management">
 		<view><u-notice-bar mode="closable" fontSize="25" :text="text1"></u-notice-bar></view>
 		<view class="groupCars" v-if="groupCarsShow">
-			<u-collapse @change="change" @close="close" @open="open" accordion :border="false">
+			<u-collapse @change="change" @close="close" @open="open" :border="false" :value="['0']">
 				<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="fleetDriverData.length == 0" width="400" height="400" textSize="18"></u-empty>
-				<u-collapse-item :title="fleetDriverData[0].fleetName" name="杞﹂槦" v-if="fleetDriverData.length != 0">
+				<u-collapse-item :title="fleetDriverData[0].fleetName" v-if="fleetDriverData.length != 0" name="0">
 					<view class="myCarContainer">
 						<u-swipe-action>
 							<u-cell-group>
-								<u-swipe-action-item :options="options1" v-for="(item, index) in fleetDriverData" :key="index" :index="item.id" :name="item.id"  @click="deleteGroupClick">
-									<u-cell icon="car" iconStyle="font-size:20px;" :title="item.carNo" :value="item.realName"></u-cell>
+								<u-swipe-action-item
+									:options="options1"
+									v-for="(item, index) in fleetDriverData"
+									:key="index"
+									:index="item.id"
+									:name="item.userId"
+									@click="deleteGroupClick"
+								>
+									<u-cell icon="car" iconStyle="font-size:20px;" :title="item.carNo" :value="item.name"></u-cell>
 								</u-swipe-action-item>
 							</u-cell-group>
 						</u-swipe-action>
@@ -31,19 +38,28 @@
 				<view class="slot-content"><rich-text :nodes="content"></rich-text></view>
 			</u-modal>
 		</view>
-
 		<view class="updateGroupButton"><u-button text="閭�璇峰徃鏈哄姞鍏�" type="primary" @click="addDrvier"></u-button></view>
 	</view>
 </template>
 
 <script>
+import { mapState } from 'vuex';
 export default {
+	computed: {
+		...mapState(['fleetDriverDataLength'])
+	},
+	watch: {
+		fleetDriverDataLength(v) {
+			if (this.fleetDriverData.length !== v) {
+				this.GetUserFleet();
+			}
+		}
+	},
 	onLoad(params) {
-		this.fleetId = params.id;
+		this.deleteDriveObj.fleetId = params.id;
 	},
 	data() {
 		return {
-			fleetId: null,
 			text1: '鍚戝乏婊戝姩杞﹁締鍙繘琛屽垹闄よ溅闃熸搷浣滐紒锛侊紒',
 			groupCarsShow: true,
 			fleetDriverData: [],
@@ -54,11 +70,15 @@
 					text: '鍒犻櫎'
 				}
 			],
-			deleteGroupId: null, // 鍒犻櫎杞﹁締灏忕粍id
+			deleteDriveObj: {
+				id: null, // 鍒犻櫎杞﹁締灏忕粍id
+				fleetId: null
+			},
 			// 鍒犻櫎灏忕粍妯℃�佹
 			title: '鎻愮ず',
 			content: '',
-			deleteGroupShow: false // 鍒犻櫎灏忕粍妯℃�佹,
+			deleteGroupShow: false, // 鍒犻櫎灏忕粍妯℃�佹,
+			value: ['0']
 		};
 	},
 	onShow() {
@@ -73,7 +93,7 @@
 			uni.showLoading({
 				title: '鍔犺浇涓�...'
 			});
-			this.$reqGet('GetUserFleet', { fleetId: this.fleetId }).then(res => {
+			this.$reqGet('GetUserFleet', { fleetId: this.deleteDriveObj.fleetId }).then(res => {
 				uni.hideLoading();
 				this.fleetDriverData = res.data;
 			});
@@ -82,17 +102,16 @@
 		close() {},
 		open() {},
 		deleteGroupClick(args) {
-			console.log(args);
-			this.deleteGroupId = args.name;
-			this.fleetDriverData.forEach(item=>{
-				if(item.id = this.deleteGroupId){
-					this.content = '纭鍒犻櫎鍙告満锛�' + item.realName;
+			this.deleteDriveObj.id = args.name;
+			this.fleetDriverData.forEach(item => {
+				if (item.userId == this.deleteDriveObj.id) {
+					this.content = '纭鍒犻櫎鍙告満锛�' + item.name;
 				}
-			})
+			});
 			this.deleteGroupShow = true;
 		},
 		deleteConfirm() {
-			this.$reqPost('deleteSiJi', { id: this.deleteGroupId }, 'params').then(res => {
+			this.$reqPost('deleteSiJi', this.deleteDriveObj, 'params').then(res => {
 				console.log('鍒犻櫎鍙告満', res);
 				this.GetUserFleet();
 				if (res.code == 0) {
@@ -102,7 +121,7 @@
 					});
 				} else {
 					uni.showToast({
-						title: '鍒犻櫎澶辫触',
+						title: res.msg ? res.msg : '鍒犻櫎澶辫触',
 						duration: 2000
 					});
 				}
@@ -118,7 +137,7 @@
 		// 閭�璇峰徃鏈哄姞鍏�
 		addDrvier() {
 			uni.navigateTo({
-				url: `/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver?role=2&fleetId=${this.fleetId}` // 2浠h〃鐨勬槸鍙告満
+				url: `/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver?role=2&fleetId=${this.deleteDriveObj.fleetId}` // 2浠h〃鐨勬槸鍙告満
 			});
 		}
 	}

--
Gitblit v1.9.1