From 4e37c0a541206717715f5c0b6b8e9f6dd5fb7ee4 Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Mon, 16 Jun 2025 17:17:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/UserInfo.vue       |  13 +++--
 pages/index/countEmployees.vue |  39 ++++++++-----
 pages/index/meetCarOrder.vue   |   4 +-
 pages/staff/staff-my.vue       |   8 ++-
 pages/staff/staff.vue          | 104 +++++++++++++++++++--------------
 pages/xiaoxi/notice.vue        |   3 +-
 6 files changed, 104 insertions(+), 67 deletions(-)

diff --git a/pages/index/UserInfo.vue b/pages/index/UserInfo.vue
index b36b52d..ee1ae00 100644
--- a/pages/index/UserInfo.vue
+++ b/pages/index/UserInfo.vue
@@ -132,12 +132,15 @@
 						}
 					}).then(res => {
 						this.customInfo = res.data
-						if (this.customInfo.avatar) {
-							this.customInfo.avatar = config.baseImageUrl + this.customInfo.avatar
+						if (this.customInfo) {
+							setStorageWithExpiry("userInfo", this.customInfo)
+							this.generateUniCode(this.customInfo.uniqueCode)
+							if (this.customInfo.avatar) {
+								this.customInfo.avatar = config.baseImageUrl + this.customInfo.avatar
+							}
+							this.customInfo.roleNames = roleNames
 						}
-						this.customInfo.roleNames = roleNames
-						setStorageWithExpiry("userInfo", this.customInfo)
-						this.generateUniCode(this.customInfo.uniqueCode)
+
 					})
 				} else {
 					this.customInfo = data
diff --git a/pages/index/countEmployees.vue b/pages/index/countEmployees.vue
index d53505c..9a4ad18 100644
--- a/pages/index/countEmployees.vue
+++ b/pages/index/countEmployees.vue
@@ -4,14 +4,10 @@
 			<u-icon name="arrow-left" color="#fff" size="18"></u-icon>
 		</headersVue>
 		<view class="content">
-      <view style="margin-top: 20rpx">
-        <uni-datetime-picker
-            v-model="queryParams.datetimeRange"
-            type="daterange"
-            rangeSeparator="至"
-            @change ="getStaffCount"
-        />
-      </view>
+			<view style="margin-top: 20rpx">
+				<uni-datetime-picker v-model="queryParams.datetimeRange" type="daterange" rangeSeparator="至"
+					@change="getStaffCount" />
+			</view>
 			<!-- 顶部选择区域 -->
 			<!-- <view class="top_">
 				<view class="select-container" @click="showDropdown">
@@ -93,14 +89,12 @@
 			headersVue,
 		},
 		onLoad() {
-      const now = new Date();
-      this.queryParams.datetimeRange = [
-        new Date(now.getFullYear(), now.getMonth(), 1).getTime(),
-        now.getTime()
-      ];
+			const now = new Date();
+			this.setCurrentMonthRange()
 
 
-      this.getStaffCount();
+
+			this.getStaffCount();
 			this.getInspectionProject();
 		},
 		methods: {
@@ -115,6 +109,23 @@
 						this.List = res.data;
 					});
 				});
+			}, // 补零：1 → 01
+			pad(n) {
+				return n.toString().padStart(2, '0');
+			},
+			// Date → "YYYY-MM-DD"
+			formatDate(d) {
+				return `${d.getFullYear()}-${this.pad(d.getMonth() + 1)}-${this.pad(d.getDate())}`;
+			},
+			// 设置本月起止日期：月初到今天
+			setCurrentMonthRange() {
+				const now = new Date();
+				const firstDay = new Date(now.getFullYear(), now.getMonth(), 1);
+
+				this.queryParams.datetimeRange = [
+					this.formatDate(firstDay),
+					this.formatDate(now)
+				];
 			},
 			// 获取工作内容列表
 			getInspectionProject() {
diff --git a/pages/index/meetCarOrder.vue b/pages/index/meetCarOrder.vue
index 4eed51e..c90c5c4 100644
--- a/pages/index/meetCarOrder.vue
+++ b/pages/index/meetCarOrder.vue
@@ -261,11 +261,11 @@
 				goodsId: '',
 				msg: '3',
 				radiolist1: [{
-						name: '接待',
+						name: '接车拍照',
 						label: 0
 					},
 					{
-						name: '上门取车',
+						name: '上门接车',
 						label: 1
 					},
 					{
diff --git a/pages/staff/staff-my.vue b/pages/staff/staff-my.vue
index c30b363..da41c25 100644
--- a/pages/staff/staff-my.vue
+++ b/pages/staff/staff-my.vue
@@ -212,6 +212,8 @@
 		methods: {
 			dialogToggle() {
 				this.$refs.alertDialog.open()
+				uni.removeStorageSync('userInfo')
+				uni.removeStorageSync('staffinfo')
 			},
 			modifyPassword() {
 				// 跳转到修改密码页面
@@ -295,7 +297,11 @@
 				this.user = ress.data
 				this.generateUniCode(ress.data.uniqueCode)
 				// 判断角色是否只有一个业务经理
-				if (ress.data.userRoles.length == 1 && ress.data.userRoles[0].roleCode == 'jcywjl') {
+				const hasJcywjl = ress.data.userRoles
+					?.flatMap(r => r.roleCode) // 把所有 roleCode 数组合并成一个大数组
+					.includes('jcywjl'); // 判断是否包含目标代码
+
+				if (hasJcywjl) {
 					this.showCheckout = false
 				} else {
 					this.showCheckout = true
diff --git a/pages/staff/staff.vue b/pages/staff/staff.vue
index b24ea7a..7fade84 100644
--- a/pages/staff/staff.vue
+++ b/pages/staff/staff.vue
@@ -160,6 +160,11 @@
 		<u-popup :show="openMeetCar" @close="openMeetCar = false" :round="10">
 			<view class="popup-box">
 				<u--textarea v-model="remark" placeholder="请输入内容" border="bottom"></u--textarea>
+				<u-radio-group v-model="radiovalue1" iconPlacement="left" name="name" placement="row">
+					<u-radio style="margin-right: 10rpx;" :customStyle="{marginBottom: '8px'}"
+						v-for="(item, index) in radiolist1" :key="index" :label="item.name" :name="item.label">
+					</u-radio>
+				</u-radio-group>
 				<view class="on-inputx">
 					<text>施工图片：</text>
 				</view>
@@ -243,7 +248,7 @@
 				openMeetCar: false,
 				isTriggered: false,
 				selectedInfo: undefined,
-        selectType: undefined,
+				selectType: undefined,
 				partnerId: uni.getStorageSync("partnerId"),
 				goodsTitle: '',
 				tapindex: 0,
@@ -321,6 +326,16 @@
 						value: "5",
 					},
 				],
+				radiolist1: [{
+						name: '还车拍照',
+						label: 0
+					},
+					{
+						name: '上门还车',
+						label: 1
+					}
+				],
+				radiovalue1: 0,
 				tapValue: 1,
 				chooseWorkNodes: [],
 				columnsMeetMan: [],
@@ -666,48 +681,49 @@
 					})
 					return
 				}
-        if (this.selectType) {
-          request({
-            url: '/system/info/returnCarPhoto',
-            data: {
-              inspectionInfoId: this.selectedInfo.id,
-              remark: this.remark,
-              dealImages: this.fileList1.map(item => item.url).join(',')
-            },
-            method: 'post'
-          }).then(res => {
-            if (res.code === 200) {
-              uni.showToast({
-                title: '提交成功',
-                icon: 'none',
-                duration: 2000
-              });
-            }
-          })
-        }else {
-          request({
-            url: '/system/info/meetCarPhoto',
-            data: {
-              meetCarId: this.selectedInfo.id,
-              remark: this.remark,
-              sourceType: this.selectedInfo.sourceType,
-              dealImages: this.fileList1.map(item => item.url).join(',')
-            },
-            method: 'post'
-          }).then(res => {
-            if (res.code === 200) {
-              uni.showToast({
-                title: '提交成功',
-                icon: 'none',
-                duration: 2000
-              });
-            }
-          })
-        }
-        this.openMeetCar = false
-        this.remark = ''
-        this.fileList1 = []
-        this.onRefresherrefresh()
+				if (this.selectType) {
+					request({
+						url: '/system/info/returnCarPhoto',
+						data: {
+							inspectionInfoId: this.selectedInfo.id,
+							remark: this.remark,
+							dealImages: this.fileList1.map(item => item.url).join(','),
+							returnType: this.radiovalue1
+						},
+						method: 'post'
+					}).then(res => {
+						if (res.code === 200) {
+							uni.showToast({
+								title: '提交成功',
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+				} else {
+					request({
+						url: '/system/info/meetCarPhoto',
+						data: {
+							meetCarId: this.selectedInfo.id,
+							remark: this.remark,
+							sourceType: this.selectedInfo.sourceType,
+							dealImages: this.fileList1.map(item => item.url).join(',')
+						},
+						method: 'post'
+					}).then(res => {
+						if (res.code === 200) {
+							uni.showToast({
+								title: '提交成功',
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+				}
+				this.openMeetCar = false
+				this.remark = ''
+				this.fileList1 = []
+				this.onRefresherrefresh()
 			},
 			async afterRead(event) {
 				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
@@ -1034,7 +1050,7 @@
 			/**接车拍照 */
 			returnCarPhoto(data) {
 				this.selectedInfo = data
-        this.selectType = 1
+				this.selectType = 1
 			},
 			gogogo() {
 				uni.navigateTo({
diff --git a/pages/xiaoxi/notice.vue b/pages/xiaoxi/notice.vue
index ab1a9e0..54f3c0a 100644
--- a/pages/xiaoxi/notice.vue
+++ b/pages/xiaoxi/notice.vue
@@ -328,7 +328,8 @@
 					method: 'get',
 					data: {
 						pageSize: this.pageSize,
-						pageNo: this.pageNum
+						pageNo: this.pageNum,
+						systemCode: 'jiance'
 					}
 				})
 				// this.arrlist = res.rows