APP调整

pages/score/detail/index.uvue

@@ -62,6 +62,18 @@
                 </view>
             </view>
 			
+			<!-- 额外工作总结 -->
+			<view class="info-section" v-if="detailData.orderType == 1 && detailData.extraWork != null && detailData.extraWork != ''">
+			     <view class="section-title">
+			         <text class="section-title-text">额外工作总结</text>
+			     </view>
+			     <view class="info-card">
+			         <view class="summary-content">
+			             <text class="summary-text">{{ detailData.extraWork ?? '' }}</text>
+			         </view>
+			     </view>
+			 </view>
+			
             <!-- 得分明细 -->
             <view class="info-section">
                 <view class="section-title">
@@ -74,6 +86,8 @@
                         <text class="table-cell score-col">自评得分</text>
                         <text class="table-cell score-col">复评得分</text>
                         <text class="table-cell score-col">终评得分</text>
+						<text class="table-cell score-col" v-if="detailData.orderType == 1 && detailData.extraWork != null && detailData.extraWork != ''">额外工分</text>
+						<text class="table-cell score-col" v-if="detailData.orderType == 1 && detailData.extraWork != null && detailData.extraWork != ''">总分</text>
                         <!-- <text class="table-cell score-col">确认状态</text> -->
                     </view>
                     
@@ -86,6 +100,8 @@
                         <text class="table-cell score-col">{{ person.selfScore !== null ? formatNumber(person.selfScore) : '-' }}</text>
                         <text class="table-cell score-col">{{ person.reviewScore !== null ? formatNumber(person.reviewScore) : '-' }}</text>
                         <text class="table-cell score-col">{{ person.finalScore !== null ? formatNumber(person.finalScore) : '-' }}</text>
+						<text class="table-cell score-col" v-if="detailData.orderType == 1 && detailData.extraWork != null && detailData.extraWork != ''">{{ person.extraScore !== null ? formatNumber(person.extraScore) : '-' }}</text>
+						<text class="table-cell score-col" v-if="detailData.orderType == 1 && detailData.extraWork != null && detailData.extraWork != ''">{{ person.totalScore !== null ? formatNumber(person.totalScore) : '-' }}</text>
                         <!-- <text class="table-cell score-col">{{ person.confirmStatus !== null ? getConfirmStatusText(person.confirmStatus) : '-' }}</text> -->
                     </view>
                 </view>
@@ -113,6 +129,8 @@
         finalScore: number | null
         confirmStatus: number | null
         isLeader: number | null
+		extraScore: number | null
+		totalScore: number | null
     }
 
     // 详情数据
@@ -130,7 +148,8 @@
         inspectionType: string | null
         itemCompletionFactor: number | null
         itemCompletionFactorSum: number | null
-        scorePersonList: ScorePersonItem[]
+		extraWork: string | null
+        scorePersonList: ScorePersonItem[] 
     }
     
     const detailData = reactive<DetailDataType>({
@@ -147,6 +166,7 @@
         inspectionType: null,
         itemCompletionFactor: null,
         itemCompletionFactorSum: null,
+		extraWork: null,
         scorePersonList: []
     })
 
@@ -357,6 +377,10 @@
                 detailData.itemCompletionFactorSum = itemCompletionFactorSumValue != null ? 
                     (itemCompletionFactorSumValue as number) : null
                 
+				// 根据工单类型设置总结内容
+				detailData.extraWork = (detailData.orderType == 1 ? 
+				    data.get('extraWork') : 
+				    null) as string | null
                 // 人员得分列表
                 const scorePersonList = (detailData.orderType == 1 ? 
                     data.get('repairOrderPersonList') : 
@@ -371,6 +395,8 @@
                             selfScore: (person.get('selfScore') != null ? person.get('selfScore') as number : null),
                             reviewScore: (person.get('reviewScore') != null ? person.get('reviewScore') as number : null),
                             finalScore: (person.get('finalScore') != null ? person.get('finalScore') as number : null),
+							extraScore: (person.get('extraScore') != null ? person.get('extraScore') as number : null),
+							totalScore: (person.get('totalScore') != null ? person.get('totalScore') as number : null),
                             confirmStatus: (person.get('confirmStatus') != null ? person.get('confirmStatus') as number : null),
                             isLeader: (person.get('isLeader') != null ? person.get('isLeader') as number : null)
                         }

pages/score/index.uvue

@@ -47,6 +47,13 @@
 		>
 		  申诉中
 		</text>
+		<text
+		  class="status-txt"
+		  :class="{ 'stauts-sel': statusFilter === 'returned' }"
+		  @click="filterByStatus('returned')"
+		>
+		  已退回
+		</text>
         <!-- <text
           class="status-txt"
           :class="{ 'stauts-sel': statusFilter === 'to_confirm' }"
@@ -176,7 +183,7 @@
         <view class="list-item">
           <view class="item-container">
             <view class="item-header">
-              <text class="item-title">{{ getPropertyValue(item, 'workOrderProjectNo') }}-风机编号{{ getPropertyValue(item, 'pcsDeviceName') }}的{{ getWorkOrderTypeText(getPropertyValue(item, 'orderType')) }}</text>
+              <text class="item-title">{{ getPropertyValue(item, 'workOrderProjectNo') }}-{{ getPropertyValue(item, 'pcsStationName') }}{{ getPropertyValue(item, 'pcsDeviceName') }}的{{ getWorkOrderTypeText(getPropertyValue(item, 'orderType')) }}</text>
               <!-- <text class="info-value">{{ getScoringStatus(item) }}</text> -->
 			  <text class="status-tag" :class="getStatusClass(item)">{{ getScoringStatus(item) }}</text>
             </view>
@@ -1446,6 +1453,13 @@
   border-color: #ff7446;
 }
 
+/* 已退回 */
+.status-returned {
+  background-color: #ffcfc2;
+  color: #ff0000;
+  border-color: #ff7446;
+}
+
 /* 个人排名模块样式 */
 .ranking-item-wrapper {
   padding: 5rpx 30rpx;

pages/worktime/detail/index.uvue

@@ -256,55 +256,61 @@
 
         // 添加各项工时数据
         if (data.issueHour != null) {
-			if (data.prepareHour != null && data.prepareHour < 0) {
-				const item = {
-					name: '下发时长+准备时长',
-					value: data.issueHour + data.prepareHour
-				} as UTSJSONObject
-				chartItems.push(item)
-				if((data.issueHour + data.prepareHour) > 0){
-					showCombinedLabel.value = true
+			if (data.orderType != null && data.orderType == 1) {
+				if (data.prepareHour != null && data.prepareHour < 0) {
+					const item = {
+						name: '下发时长+准备时长',
+						value: data.issueHour + data.prepareHour
+					} as UTSJSONObject
+					chartItems.push(item)
+					if((data.issueHour + data.prepareHour) > 0){
+						showCombinedLabel.value = true
+					}else{
+						showCombinedLabel.value = false
+					}
 				}else{
+					const item = {
+					    name: '下发时长',
+					    value: data.issueHour
+					} as UTSJSONObject
+					chartItems.push(item)
 					showCombinedLabel.value = false
-				}
-			}else{
-				const item = {
+				} 
+				const color = colorMap.get('下发时长')
+				legendItems.push({
 				    name: '下发时长',
-				    value: data.issueHour
-				} as UTSJSONObject
-				chartItems.push(item)
-				showCombinedLabel.value = false
+				    value: data.issueHour,
+				    color: color != null ? color : '#5B9BF3'
+				} as ChartLegendItem)
 			} 
-            const color = colorMap.get('下发时长')
-            legendItems.push({
-                name: '下发时长',
-                value: data.issueHour,
-                color: color != null ? color : '#5B9BF3'
-            } as ChartLegendItem)
         }
 
-        if (data.acceptHour != null) {
-            const item = {name: '接单时长', value: data.acceptHour} as UTSJSONObject
-            chartItems.push(item)
-            const color = colorMap.get('接单时长')
-            legendItems.push({
-                name: '接单时长',
-                value: data.acceptHour,
-                color: color != null ? color : '#4DD4C0'
-            } as ChartLegendItem)
+        if (data.acceptHour != null) { 
+			if (data.orderType != null && data.orderType == 1) {
+				/* const item = {name: '接单时长', value: data.acceptHour} as UTSJSONObject
+				chartItems.push(item) */
+				const color = colorMap.get('接单时长')
+				legendItems.push({
+				    name: '接单时长',
+				    value: data.acceptHour,
+				    color: color != null ? color : '#4DD4C0'
+				} as ChartLegendItem)
+			} 
         }
 
         if (data.prepareHour != null) {
-			if (data.prepareHour >= 0) {
-				const item = {name: '准备时长', value: data.prepareHour} as UTSJSONObject
-				chartItems.push(item)
-			}
-            const color = colorMap.get('准备时长')
-            legendItems.push({
-                name: '准备时长',
-                value: data.prepareHour,
-                color: color != null ? color : '#FF9966'
-            } as ChartLegendItem)
+			if (data.orderType != null && data.orderType == 1) {
+				if (data.prepareHour >= 0) {
+					const item = {name: '准备时长', value: data.prepareHour} as UTSJSONObject
+					chartItems.push(item)
+				}
+				const color = colorMap.get('准备时长')
+				legendItems.push({
+				    name: '准备时长',
+				    value: data.prepareHour,
+				    color: color != null ? color : '#FF9966'
+				} as ChartLegendItem)
+			} 
         }
 
 		if (data.suspendHour != null) {

pages/worktime/index.uvue

@@ -117,7 +117,7 @@
         <view class="list-item">
           <view class="item-container">
             <view class="item-header">
-              <text class="item-title">{{ getPropertyValue(item, 'workOrderProjectNo') }}-风机编号{{ getPropertyValue(item, 'pcsDeviceName') }}的{{ getWorkOrderTypeText(getPropertyValue(item, 'orderType')) }}</text>
+              <text class="item-title">{{ getPropertyValue(item, 'workOrderProjectNo') }}-{{ getPropertyValue(item, 'pcsStationName') }}{{ getPropertyValue(item, 'pcsDeviceName') }}的{{ getWorkOrderTypeText(getPropertyValue(item, 'orderType')) }}</text>
               <text class="status-tag" :class="getStatusClass(item)">{{ getWorkOrderStatus(item) }}</text>
             </view>
 			<view class="info-row">