Merge remote-tracking branch 'origin/master'

api/order/detail.uts

@@ -26,7 +26,7 @@ export const getRepairOrderInfoById = (id: string): Promise<any> => {
     })
 }
 
-// 接单（支持一次性选择处理人员和检修人员）
+// 接单（支持一次性选择处理人员和工作班成员）
 export const acceptOrder = (gxtWorkOrder: acceptOrderInfo2 | null): Promise<any> => {
 	const plainObject = gxtWorkOrder != null ? JSON.parse(JSON.stringify(gxtWorkOrder)) : null;
 	const data: UTSJSONObject | null = plainObject as UTSJSONObject;

pages.json

@@ -254,6 +254,13 @@
 				"navigationBarTitleText": "结单",
 				"navigationStyle": "#custom"
 			}
+		},
+		{
+			"path": "pages/order/detail/shutdownIndex",
+			"style": {
+				"navigationBarTitleText": "停机",
+				"navigationStyle": "#custom"
+			}
 		}
 	],
 	"globalStyle": {

pages/order/detail/index.uvue

@@ -60,7 +60,10 @@
 					    <text class="info-label">{{getLabel(detailData)}}</text>
 					    <text class="info-value">{{ getDisplayTime(detailData) }}</text>
 					</view>
-					
+					<view class="info-item" v-if="detailData.orderType == 2">
+					    <text class="info-label">维保内容</text>
+					    <text class="info-value">{{ detailData.content ?? '' }}</text>
+					</view>
 					<view class="info-item" v-if="detailData.orderType == 1">
 					    <text class="info-label">故障代码</text>
 					    <text class="info-value">{{ detailData.faultCode ?? '' }}</text>
@@ -167,7 +170,9 @@
 		faultDesc: string | null
 		pauseTime: string | null,
 		restartTime: string | null,
-		attachmentUrls: string | null // 附件URLs（逗号分隔的字符串格式）
+		attachmentUrls: string | null, // 附件URLs（逗号分隔的字符串格式）
+		content: string ｜ null,
+		inspectionType: string | null
 	}
 	
     // 详情数据
@@ -203,7 +208,9 @@
 		faultDesc: null,
 		pauseTime: null,
 		restartTime: null,
-		attachmentUrls: null
+		attachmentUrls: null,
+		content: null,
+		inspectionType: null
     })
 
 	const statusDictList = ref<SysDictData[]>([]) // 工单状态字典列表
@@ -567,7 +574,9 @@
 					faultDesc: data['faultDesc'] as string | null,
 					pauseTime: data['pauseTime'] as string | null,
 					restartTime: data['restartTime'] as string | null,
-					attachmentUrls: data['attachmentUrls'] as string | null
+					attachmentUrls: data['attachmentUrls'] as string | null,
+					content: data['content'] as string | null,
+					inspectionType: data['inspectionType'] as string | null
                 }
                 detailData.value = orderDtail
 				await loadReturnDictList('gxt_return_type')

pages/order/detail/shutdownIndex.uvue

@@ -57,7 +57,7 @@
 			<!-- Start Date Picker -->
 			<l-popup v-model="showshutdownTimePicker" position="bottom">
 				<l-date-time-picker
-					title="选择开始时间"
+					title="选择停机时间"
 					:mode="1 | 2 | 4 | 8 | 16"
 					format="YYYY-MM-DD HH:mm"
 					:modelValue="pauseTime"
@@ -112,7 +112,7 @@
 	const showshutdownTimePicker = ref<boolean>(false)
 	
 	function onStartDateConfirm(value: string) {
-	  // 检查结束时间是否小于新的开始时间
+	  // 检查结束时间是否小于新的停机时间
 	  pauseTime.value = value
 	  showshutdownTimePicker.value = false
 	}

pages/order/detail/wbBackfillFinalize.uvue

@@ -129,16 +129,16 @@
                         </view>
                     </view>
 
-                    <!-- 检修人员选择（当信息录入为2时可编辑） -->
+                    <!-- 工作班成员选择（当信息录入为2时可编辑） -->
                     <view class="info-item">
                         <view class="info-label">
-                            <text class="form-label required">检修人员</text>
+                            <text class="form-label required">工作班成员</text>
                         </view>
                         <view class="info-value">
                             <view class="input-with-clear">
 								<input
 									class="input-field"
-									placeholder="请选择检修人员"
+									placeholder="请选择工作班成员"
 									v-model="workGroupMemberName"
 									@click="showUserSelect = true"
 									:disabled="infoEntry == '1'"
@@ -219,7 +219,7 @@
                 <view class="modal-mask" @click="showUserSelect = false"></view>
                 <view class="modal-content">
                     <view class="modal-header">
-                        <text class="modal-title">选择检修人员</text>
+                        <text class="modal-title">选择工作班成员</text>
                         <text class="modal-close" @click="confirmSelectedUsers">确定</text>
                     </view>
 					<view class="search-bar">
@@ -304,11 +304,11 @@
     const realEndTime = ref<string>('') // 结束时间
     const wwryNum = ref<string>('') // 外委人员数
     const wlryNum = ref<string>('') // 外来人员数
-    const workGroupMemberName = ref<string>('') // 检修人员
+    const workGroupMemberName = ref<string>('') // 工作班成员
     const content = ref<string>('') // 维保内容
     const attachmentUrls = ref<string>('') // 附件URLs（逗号分隔的字符串格式）
     const uploadedFiles = ref<UploadResponse[]>([]) // 上传的文件对象数组
-	const workOrderPersonList = ref<UTSJSONObject[]>([]) // 检修人员数组
+	const workOrderPersonList = ref<UTSJSONObject[]>([]) // 工作班成员数组
 	const selectedUserIds = ref<string[]>([]) // 选中的用户ID数组
 	const selectedUsers = ref<UTSJSONObject[]>([]) // 选中的用户对象数组
 
@@ -490,7 +490,7 @@
         // 清空显示的用户名
         workGroupMemberName.value = '';
         
-        // 清空检修人员列表
+        // 清空工作班成员列表
         workOrderPersonList.value = [];
     };
 
@@ -531,7 +531,7 @@
 		
 		// if (infoEntry.value == '2' && (workGroupMemberName.value == '' || selectedUsers.value.length == 0)) {
 		//     uni.showToast({
-		//         title: '请选择检修人员',
+		//         title: '请选择工作班成员',
 		//         icon: 'none'
 		//     });
 		//     return false;
@@ -664,7 +664,7 @@
 					if(misInfo.length > 0) {
 						realStartTime.value = (misInfo[0]['realStartTime'] as string | null) ?? ''
 						realEndTime.value = (misInfo[0]['realEndTime'] as string | null) ?? ''
-						// 查询相关检修人员
+						// 查询相关工作班成员
 						await listWorkPerson(misNo.value).then(response => {
 							const responseObj = response as UTSJSONObject
 							const rows = responseObj['rows'] as UTSJSONObject[] | null

pages/order/detail/wbFinalize.uvue

@@ -176,16 +176,16 @@
                         </view>
                     </view>
 
-                    <!-- 检修人员选择（当信息录入为2时可编辑） -->
+                    <!-- 工作班成员选择（当信息录入为2时可编辑） -->
                     <view class="info-item">
                         <view class="info-label">
-                            <text class="form-label required">检修人员</text>
+                            <text class="form-label required">工作班成员</text>
                         </view>
                         <view class="info-value">
                             <view class="input-with-clear">
 								<input
 									class="input-field"
-									placeholder="请选择检修人员"
+									placeholder="请选择工作班成员"
 									v-model="workGroupMemberName"
 									@click="showUserSelect = true"
 									:disabled="infoEntry == '1'"
@@ -265,7 +265,7 @@
                 <view class="modal-mask" @click="showUserSelect = false"></view>
                 <view class="modal-content">
                     <view class="modal-header">
-                        <text class="modal-title">选择检修人员</text>
+                        <text class="modal-title">选择工作班成员</text>
                         <text class="modal-close" @click="confirmSelectedUsers">确定</text>
                     </view>
 					<view class="search-bar">
@@ -391,11 +391,11 @@
     const realEndTime = ref<string>('') // 结束时间
     const wwryNum = ref<string>('') // 外委人员数
     const wlryNum = ref<string>('') // 外来人员数
-    const workGroupMemberName = ref<string>('') // 检修人员
+    const workGroupMemberName = ref<string>('') // 工作班成员
     const content = ref<string>('') // 维保内容
     const attachmentUrls = ref<string>('') // 附件URLs（逗号分隔的字符串格式）
     const uploadedFiles = ref<UploadResponse[]>([]) // 上传的文件对象数组
-	const workOrderPersonList = ref<UTSJSONObject[]>([]) // 检修人员数组
+	const workOrderPersonList = ref<UTSJSONObject[]>([]) // 工作班成员数组
 	const selectedUserIds = ref<string[]>([]) // 选中的用户ID数组
 	const selectedUsers = ref<UTSJSONObject[]>([]) // 选中的用户对象数组
 
@@ -678,7 +678,7 @@
 			misNo.value = ''
 			return
 		}
-		// 查询相关检修人员
+		// 查询相关工作班成员
 		await listWorkPerson(misNo.value).then(response => {
 			const responseObj = response as UTSJSONObject
 			const rows = responseObj['rows'] as UTSJSONObject[] | null
@@ -850,7 +850,7 @@
 		// 清空显示的用户名
 		workGroupMemberName.value = '';
 		
-		// 清空检修人员列表
+		// 清空工作班成员列表
 		workOrderPersonList.value = [];
 	};
 
@@ -907,7 +907,7 @@
 		
 		// if (infoEntry.value == '2' && (workGroupMemberName.value == '' || selectedUsers.value.length == 0)) {
 		//     uni.showToast({
-		//         title: '请选择检修人员',
+		//         title: '请选择工作班成员',
 		//         icon: 'none'
 		//     });
 		//     return false;
@@ -1090,7 +1090,7 @@
 									realStartTime.value = (misInfo[0]['realStartTime'] as string | null) ?? ''
 									realEndTime.value = (misInfo[0]['realEndTime'] as string | null) ?? ''
 									workPermitNum.value = (misInfo[0]['workPermitNum'] as string | null) ?? ''
-									// 查询相关检修人员
+									// 查询相关工作班成员
 									await listWorkPerson(misNo.value).then(response => {
 										const responseObj = response as UTSJSONObject
 										const rows = responseObj['rows'] as UTSJSONObject[] | null

pages/order/detail/wxFinalize.uvue

@@ -205,16 +205,16 @@
                         </view>
                     </view>
 
-                    <!-- 检修人员选择（当信息录入为2时可编辑） -->
+                    <!-- 工作班成员选择（当信息录入为2时可编辑） -->
                     <view class="info-item">
                         <view class="info-label">
-                            <text class="form-label required">检修人员</text>
+                            <text class="form-label required">工作班成员</text>
                         </view>
                         <view class="info-value">
                             <view class="input-with-clear">
                                 <input
                                     class="input-field"
-                                    placeholder="请选择检修人员"
+                                    placeholder="请选择工作班成员"
                                     v-model="workGroupMemberName"
                                     @click="showUserSelect = true"
                                     :disabled="infoEntry == '1'"
@@ -293,7 +293,7 @@
                 <view class="modal-mask" @click="showUserSelect = false"></view>
                 <view class="modal-content">
                     <view class="modal-header">
-                        <text class="modal-title">选择检修人员</text>
+                        <text class="modal-title">选择工作班成员</text>
                         <text class="modal-close" @click="confirmSelectedUsers">确定</text>
                     </view>
 					<view class="search-bar">
@@ -444,10 +444,10 @@
     const realEndTime = ref<string>('') // 结束时间
     const wwryNum = ref<string>('') // 外委人员数
     const wlryNum = ref<string>('') // 外来人员数
-    const workGroupMemberName = ref<string>('') // 检修人员
+    const workGroupMemberName = ref<string>('') // 工作班成员
     const attachmentUrls = ref<string>('') // 附件URLs（逗号分隔的字符串格式）
     const uploadedFiles = ref<UploadResponse[]>([]) // 上传的文件对象数组
-	const workOrderPersonList = ref<UTSJSONObject[]>([]) // 检修人员数组
+	const workOrderPersonList = ref<UTSJSONObject[]>([]) // 工作班成员数组
 	const selectedUserIds = ref<string[]>([]) // 选中的用户ID数组
 	const selectedUsers = ref<UTSJSONObject[]>([]) // 选中的用户对象数组
 	const realFailureReason = ref<string>('') //真实故障原因
@@ -775,7 +775,7 @@
 			misNo.value = ''
 			return
 		}
-		// 查询相关检修人员
+		// 查询相关工作班成员
 		await listWorkPerson(misNo.value).then(response => {
 			const responseObj = response as UTSJSONObject
 			const rows = responseObj['rows'] as UTSJSONObject[] | null
@@ -947,7 +947,7 @@
         // 清空显示的用户名
         workGroupMemberName.value = '';
         
-        // 清空检修人员列表
+        // 清空工作班成员列表
         workOrderPersonList.value = [];
     };
 
@@ -1043,7 +1043,7 @@
 		
 		// if (infoEntry.value == '2' && (workGroupMemberName.value == '' || selectedUsers.value.length == 0)) {
 		//     uni.showToast({
-		//         title: '请选择检修人员',
+		//         title: '请选择工作班成员',
 		//         icon: 'none'
 		//     });
 		//     return false;
@@ -1230,7 +1230,7 @@
 									realStartTime.value = (misInfo[0]['realStartTime'] as string | null) ?? ''
 									realEndTime.value = (misInfo[0]['realEndTime'] as string | null) ?? ''
 									workPermitNum.value = (misInfo[0]['workPermitNum'] as string | null) ?? ''
-									// 查询相关检修人员
+									// 查询相关工作班成员
 									await listWorkPerson(misNo.value).then(response => {
 										const responseObj = response as UTSJSONObject
 										const rows = responseObj['rows'] as UTSJSONObject[] | null

pages/order/index.uvue

@@ -115,13 +115,13 @@
 								>
 								<text class="btn-text">退回</text>
 							</view>
-							<!-- <view
+							<view
 								v-if="getOrderStatus(item) == 'to_finish' && canHandleOrder(item, 'return')"
 								class="btn-primary info-value"
 								@click.stop="handleItemClick(item, 'return')"
 								>
 								<text class="btn-text">退回</text>
-							</view> -->
+							</view>
 							<view
 								v-if="getOrderStatus(item) == 'to_finish' && canHandleOrder(item, 'complete')"
 								class="btn-primary info-value"
@@ -636,7 +636,7 @@ const statusConfig: StatusItem[] = [
 			  permit = orderItem.orderType == 2 ? ['gxt:maintenance:order:return'] : ['gxt:repairOrder:return']
 		  } else if(buttonType != '' && buttonType == "finalize" && orderItem.orderType == 1 && (orderItem.teamLeaderId == parseInt(userId.value) || roles.value.includes("管理员"))) {
 			  // 复启
-			  permit = orderItem.orderType == 2 ? ['gxt:maintenance:order:finalize'] : ['gxt:repairOrder:finalize']
+			  permit = orderItem.orderType == 2 ? ['gxt:maintenance:order:complete'] : ['gxt:repairOrder:finalize']
 		  // } else if(buttonType != '' && buttonType == "complete" && (orderItem.teamLeaderId == parseInt(userId.value) || roles.value.includes("管理员"))) {
 			} else if(buttonType != '' && buttonType == "complete") {
 			  // 结单