Merge remote-tracking branch 'origin/master'

pages/order/detail/approveIndex.uvue

@@ -59,6 +59,10 @@
 					    <text class="info-label">挂起原因</text>
 					    <text class="info-value">{{ getSuspendReasonName(detailData.suspendReason) ?? '' }}</text>
 					</view>
+					<view class="info-item" v-if="detailData.suspendReason == '4'">
+					    <text class="info-label">说明</text>
+					    <text class="info-value">{{ suspendExplain ?? '' }}</text>
+					</view>
 					<!-- <view class="info-item">
 					    <text class="info-label">审批意见</text>
 					    <textarea
@@ -143,6 +147,8 @@
 	const statusDictList = ref<SysDictData[]>([]) // 工单状态字典列表
 	// 添加字典加载状态
 	const dictLoaded = ref<boolean>(false)
+	
+	const suspendExplain = ref<string | null>("")
 
 	// 详情数据
 	const detailData = ref<acceptOrderInfo2>({
@@ -477,6 +483,7 @@
                     workEndTime: data['workEndTime'] as string | null  // 新增字段
                 }
                 detailData.value = orderDtail
+				suspendExplain.value = data['suspendExplain'] as string | null
 
 				// 如果工单数据中已有负责人信息，设置到输入框中
 				if (orderDtail.teamLeaderName != null && orderDtail.teamLeaderName.length > 0) {

pages/score/index.uvue

@@ -203,10 +203,12 @@
     <l-popup v-model="showDatePickerPopup" position="bottom">
       <view class="date-picker-popup">
         <view class="popup-header">
-          <text class="popup-title">选择年月</text>
-          <view class="popup-actions">
-            <text class="cancel-btn" @click="closeDatePicker">取消</text>
-          </view>
+			<text class="popup-title">选择年月</text>
+			<view class="popup-actions">
+				<view class="popup-btn">
+					<text class="cancel-btn" @click="closeDatePicker">取消</text>
+				</view>
+			</view>
         </view>
 
         <view class="date-picker-container">
@@ -1297,6 +1299,10 @@
 .popup-actions {
   display: flex;
   flex-direction: row;
+  // white-space: nowrap;
+}
+
+.popup-btn {
   white-space: nowrap;
 }
 

pages/worktime/index.uvue

@@ -142,11 +142,15 @@
     <l-popup v-model="showDatePickerPopup" position="bottom">
       <view class="date-picker-popup">
         <view class="popup-header">
-          <text class="popup-title">选择时间范围</text>
-          <view class="popup-actions">
-            <text class="confirm-btn" @click="confirmCustomDate">确定</text>
-            <text class="cancel-btn" @click="closeDatePicker">取消</text>
-          </view>
+			<text class="popup-title">选择时间范围</text>
+			<view class="popup-actions">
+				<view class="popup-btn">
+					<text class="confirm-btn" @click="confirmCustomDate">确定</text>
+				</view>
+				<view class="popup-btn">
+					<text class="cancel-btn" @click="closeDatePicker">取消</text>
+				</view>
+			</view>
         </view>
 
         <view class="date-picker-container">
@@ -199,7 +203,7 @@
 </template>
 
 <script setup lang="uts">
-import { ref, computed, onLoad, onBeforeUnmount } from 'vue'
+import { ref, computed, onMounted, onBeforeUnmount } from 'vue'
 import { listOrderHours, getOrderHourStatistics } from '@/api/worktime/index'
 import { getDictDataByType } from '@/api/dict/index'
 import type { SysDictData } from '@/types/dict'
@@ -831,7 +835,7 @@ function getWorkOrderTypeInfo(item: any | null): string {
 }
 
 // 生命周期
-onLoad((options) => {
+onMounted(() => {
   loadStatusDictList()
   loadInspectionTypeDictList()
   loadMaintenanceTypeDictList()
@@ -1153,6 +1157,10 @@ onBeforeUnmount(() => {
 .popup-actions {
   display: flex;
   flex-direction: row;
+  // white-space: nowrap;
+}
+
+.popup-btn {
   white-space: nowrap;
 }