From 4e517dc54e1e3e5e5b543383c321161de351272e Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 11 十一月 2024 16:05:06 +0800
Subject: [PATCH] Merge branch 'feature/jlhg/first' of http://39.96.92.240:10000/r/~fyy/unattended-app into feature/jlhg/first
---
pages/customer-page/fleet-management/fleet-management.vue | 287 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 157 insertions(+), 130 deletions(-)
diff --git a/pages/customer-page/fleet-management/fleet-management.vue b/pages/customer-page/fleet-management/fleet-management.vue
index 9738713..7269c06 100644
--- a/pages/customer-page/fleet-management/fleet-management.vue
+++ b/pages/customer-page/fleet-management/fleet-management.vue
@@ -1,15 +1,37 @@
<template>
<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-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">
+ <view><u-notice-bar mode="closable"
+ fontSize="25"
+ :text="text1"></u-notice-bar></view>
+ <view class="groupCars"
+ v-if="groupCarsShow">
+ <u-collapse @change="change"
+ :border="false"
+ :value="['0']"
+ ref="collapse">
+ <u-empty mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
+ v-if="fleetDriverData.length == 0"
+ width="400"
+ height="400"
+ text="鏆傛棤鏁版嵁"
+ textSize="18"></u-empty>
+ <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>
@@ -19,154 +41,159 @@
</view>
<!-- 鍒犻櫎灏忕粍妯℃�佹 -->
<view class="deleteModal">
- <u-modal
- :show="deleteGroupShow"
+ <u-modal :show="deleteGroupShow"
:title="title"
@close="deleteGroupClose"
@cancel="deleteCancel"
@confirm="deleteConfirm"
:closeOnClickOverlay="true"
- :showCancelButton="true"
- >
+ :showCancelButton="true">
<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 class="updateGroupButton"><u-button text="閭�璇峰徃鏈哄姞鍏�"
+ type="primary"
+ @click="addDrvier"></u-button></view>
</view>
</template>
<script>
-export default {
- onLoad(params) {
- this.fleetId = params.id;
- },
- data() {
- return {
- fleetId: null,
- text1: '鍚戝乏婊戝姩杞﹁締鍙繘琛屽垹闄よ溅闃熸搷浣滐紒锛侊紒',
- groupCarsShow: true,
- fleetDriverData: [],
- myCarShow: true,
- // 鍗曞厓鏍兼粦鍔�
- options1: [
- {
+ export default {
+ onLoad(params) {
+ this.deleteDriveObj.fleetId = params.id;
+ },
+ data() {
+ return {
+ text1: '鍚戝乏婊戝姩杞﹁締鍙繘琛屽垹闄よ溅闃熸搷浣滐紒锛侊紒',
+ groupCarsShow: true,
+ fleetDriverData: [],
+ myCarShow: true,
+ // 鍗曞厓鏍兼粦鍔�
+ options1: [{
text: '鍒犻櫎'
- }
- ],
- deleteGroupId: null, // 鍒犻櫎杞﹁締灏忕粍id
- // 鍒犻櫎灏忕粍妯℃�佹
- title: '鎻愮ず',
- content: '',
- deleteGroupShow: false // 鍒犻櫎灏忕粍妯℃�佹,
- };
- },
- onShow() {
- this.init();
- },
- methods: {
- init() {
- this.GetUserFleet();
+ }],
+ deleteDriveObj: {
+ id: null, // 鍒犻櫎杞﹁締灏忕粍id
+ fleetId: null
+ },
+ // 鍒犻櫎灏忕粍妯℃�佹
+ title: '鎻愮ず',
+ content: '',
+ deleteGroupShow: false, // 鍒犻櫎灏忕粍妯℃�佹,
+ value: ['0']
+ };
},
- // 鑾峰彇鍙告満鍒楄〃
- GetUserFleet() {
- uni.showLoading({
- title: '鍔犺浇涓�...'
- });
- this.$reqGet('GetUserFleet', { fleetId: this.fleetId }).then(res => {
- uni.hideLoading();
- this.fleetDriverData = res.data;
- });
+ onShow() {
+ this.init();
},
- change() {},
- 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.deleteGroupShow = true;
- },
- deleteConfirm() {
- this.$reqPost('deleteSiJi', { id: this.deleteGroupId }, 'params').then(res => {
- console.log('鍒犻櫎鍙告満', res);
+ methods: {
+ init() {
this.GetUserFleet();
- if (res.code == 0) {
- uni.showToast({
- title: '鍒犻櫎鎴愬姛',
- duration: 2000
- });
- } else {
- uni.showToast({
- title: '鍒犻櫎澶辫触',
- duration: 2000
- });
- }
+ },
+ // 鑾峰彇鍙告満鍒楄〃
+ GetUserFleet() {
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ });
+ this.$reqGet('GetUserFleet', { fleetId: this.deleteDriveObj.fleetId }).then(res => {
+ uni.hideLoading();
+ this.fleetDriverData = res.data;
+ this.$nextTick(() => {
+ this.$refs.collapse.init()
+ })
+ });
+ },
+ change() {},
+ deleteGroupClick(args) {
+ 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', this.deleteDriveObj, 'params').then(res => {
+ console.log('鍒犻櫎鍙告満', res);
+ this.GetUserFleet();
+ if (res.code == 0) {
+ uni.showToast({
+ title: '鍒犻櫎鎴愬姛',
+ duration: 2000
+ });
+ } else {
+ uni.showToast({
+ title: res.msg ? res.msg : '鍒犻櫎澶辫触',
+ duration: 2000
+ });
+ }
+ this.deleteGroupShow = false;
+ });
+ },
+ deleteCancel() {
this.deleteGroupShow = false;
- });
- },
- deleteCancel() {
- this.deleteGroupShow = false;
- },
- deleteGroupClose() {
- this.deleteGroupShow = false;
- },
- // 閭�璇峰徃鏈哄姞鍏�
- addDrvier() {
- uni.navigateTo({
- url: `/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver?role=2&fleetId=${this.fleetId}` // 2浠ｈ〃鐨勬槸鍙告満
- });
+ },
+ deleteGroupClose() {
+ this.deleteGroupShow = false;
+ },
+ // 閭�璇峰徃鏈哄姞鍏�
+ addDrvier() {
+ uni.navigateTo({
+ url: `/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver?role=2&fleetId=${this.deleteDriveObj.fleetId}` // 2浠ｈ〃鐨勬槸鍙告満
+ });
+ },
}
- }
-};
+ };
</script>
-<style lang="scss" scoped>
-::v-deep.fleet-management {
- width: 94%;
- margin: 0 auto;
- .myCarContainer {
- max-height: vww(450);
- width: 100%;
- border: 1px solid #dddddd;
- border-radius: 4px;
- overflow: hidden;
- overflow-y: auto;
- .carNum {
- padding: vww(2) 0;
- text-align: center;
- display: inline-block;
- width: 33%;
- // .u-tooltip {
- // display: inline-block;
- // .u-tooltip__wrapper {
- // }
- // }
- }
- }
+<style lang="scss"
+ scoped>
+ ::v-deep.fleet-management {
+ width: 94%;
+ margin: 0 auto;
- .updateGroupButton {
- margin: vww(15) auto 0;
- .u-button {
- width: 30%;
+ .myCarContainer {
+ max-height: vww(450);
+ width: 100%;
+ border: 1px solid #dddddd;
+ border-radius: 4px;
+ overflow: hidden;
+ overflow-y: auto;
+
+ .carNum {
+ padding: vww(2) 0;
+ text-align: center;
+ display: inline-block;
+ width: 33%;
+ // .u-tooltip {
+ // display: inline-block;
+ // .u-tooltip__wrapper {
+ // }
+ // }
+ }
}
- }
- .groupCars {
- .u-swipe-action {
- .u-swipe-action-item {
- .u-swipe-action-item__right {
- .u-swipe-action-item__right__button {
- .u-swipe-action-item__right__button__wrapper {
- background-color: #f56c6c !important;
+
+ .updateGroupButton {
+ margin: vww(15) auto 0;
+
+ .u-button {
+ width: 30%;
+ }
+ }
+
+ .groupCars {
+ .u-swipe-action {
+ .u-swipe-action-item {
+ .u-swipe-action-item__right {
+ .u-swipe-action-item__right__button {
+ .u-swipe-action-item__right__button__wrapper {
+ background-color: #f56c6c !important;
+ }
}
}
}
}
}
}
-}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.1