Browse Source

列表标题修改、已挂起工单添加自动挂起

HD_wangm 3 months ago
parent
commit
c09f0f79e2

+ 1 - 1
pages/index/index.uvue

@@ -298,7 +298,7 @@
 	// 获取已挂起工单数量
 	const loadSuspendedCount = async (): Promise<void> => {
 	    try {
-	        const result = await getOrderList(1, 1, '', "suspended") // 只需要获取总数,不需要具体数据
+	        const result = await getOrderList(1, 1, '', "suspended,auto_suspend") // 只需要获取总数,不需要具体数据
 	        const resultObj = result as UTSJSONObject
 
 	        if (resultObj['code'] == 200) {

+ 1 - 1
pages/order/almostOverdue.uvue

@@ -24,7 +24,7 @@
                 <view class="list-item">
                     <view class="item-container">
                         <view class="item-header">
-							<text class="item-title">{{ getWorkOrderProjectNo(item) }}-{{ getPcsDeviceName(item) }}{{ getOrderType(item) }}</text>
+							<text class="item-title">{{ (item as acceptOrderInfo).pcsStationName }}{{ getPcsDeviceName(item) }}{{ getOrderType(item) }}</text>
 							<text class="status-tag" :class="getStatusClass(item)">{{ getWorkOrderStatus(item) }}</text>
                         </view>
 						<view class="info-row">

+ 1 - 1
pages/order/approveOrder.uvue

@@ -24,7 +24,7 @@
                 <view class="list-item">
                     <view class="item-container">
                         <view class="item-header">
-							<text class="item-title">{{ getWorkOrderProjectNo(item) }}-{{ getPcsDeviceName(item) }}{{ getOrderType(item) }}</text>
+        <text class="item-title">{{ (item as acceptOrderInfo).pcsStationName }}{{ getPcsDeviceName(item) }}{{ getOrderType(item) }}</text>
 							<text class="status-tag" :class="getStatusClass(item)">{{ getWorkOrderStatus(item) }}</text>
                         </view>
 						<view class="info-row">

+ 1 - 1
pages/order/index.uvue

@@ -55,7 +55,7 @@
                 <view class="list-item">
                     <view class="item-container">
                         <view class="item-header">
-							<text class="item-title">{{ getWorkOrderProjectNo(item) }}-{{ getPcsDeviceName(item) }}{{ getOrderType(item) }}</text>
+							<text class="item-title">{{ getPcsStationName(item) }}{{ getPcsDeviceName(item) }}{{ getOrderType(item) }}</text>
 							<text class="status-tag" :class="getStatusClass(item)" >{{ getWorkOrderStatus(item) }}</text>
 							<!-- <view class="status-view" :class="getStatusClass(item)"><text class="status-tag" :class="getStatusClass(item)" >{{ getWorkOrderStatus(item) }}</text></view> -->
                         </view>

+ 1 - 1
pages/order/overdue.uvue

@@ -24,7 +24,7 @@
                 <view class="list-item">
                     <view class="item-container">
                         <view class="item-header">
-							<text class="item-title">{{ getWorkOrderProjectNo(item) }}-{{ getPcsDeviceName(item) }}{{ getOrderType(item) }}</text>
+							<text class="item-title">{{ (item as acceptOrderInfo).pcsStationName }}{{ getPcsDeviceName(item) }}{{ getOrderType(item) }}</text>
 							<text class="status-tag" :class="getStatusClass(item)">{{ getWorkOrderStatus(item) }}</text>
                         </view>
 						<view class="info-row">

+ 3 - 3
pages/order/pendingOrder.uvue

@@ -23,10 +23,10 @@
             <template #default="{ item, index }">
                 <view class="list-item">
                     <view class="item-container">
-                        <view class="item-header">
-							<text class="item-title">{{ getWorkOrderProjectNo(item) }}-{{ getPcsDeviceName(item) }}{{ getOrderType(item) }}</text>
+						<view class="item-header">
+							<text class="item-title">{{ (item as acceptOrderInfo).pcsStationName }}{{ getPcsDeviceName(item) }}{{ getOrderType(item) }}</text>
 							<text class="status-tag" :class="getStatusClass(item)">{{ getWorkOrderStatus(item) }}</text>
-                        </view>
+						</view>
 						<view class="info-row">
 							<view class="info-label">
 								<text class="text-gray">{{ getDisplayTime(item) }}</text>

+ 9 - 2
pages/order/suspendedOrder.uvue

@@ -24,7 +24,7 @@
                 <view class="list-item">
                     <view class="item-container">
                         <view class="item-header">
-							<text class="item-title">{{ getWorkOrderProjectNo(item) }}-{{ getPcsDeviceName(item) }}{{ getOrderType(item) }}</text>
+							<text class="item-title">{{ (item as acceptOrderInfo).pcsStationName }}{{ getPcsDeviceName(item) }}{{ getOrderType(item) }}</text>
 							<text class="status-tag" :class="getStatusClass(item)">{{ getWorkOrderStatus(item) }}</text>
                         </view>
 						<view class="info-row">
@@ -186,7 +186,7 @@ import {checkPermi, getUserInfo} from '../../utils/storage'
             // 处理默认值
             const searchKeyword = keyword.value.length > 0 ? keyword.value : null
 
-            const result = await getOrderList(page.value, pageSize, searchKeyword, "suspended")
+            const result = await getOrderList(page.value, pageSize, searchKeyword, "suspended,auto_suspend")
 
             // 提取响应数据
             const resultObj = result as UTSJSONObject
@@ -615,6 +615,13 @@ import {checkPermi, getUserInfo} from '../../utils/storage'
 	border-color: #ffccc7;
 }
 
+/* 自动挂起 */
+.status-auto_suspend {
+	background-color: #fff2f0;
+	color: #ff4d4f;
+	border-color: #ffccc7;
+}
+
 /* 已完成 */
 .status-completed {
 	background-color: #f0f9eb;

+ 1 - 1
pages/score/index.uvue

@@ -176,7 +176,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, '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>

+ 1 - 1
pages/score/pending.uvue

@@ -31,7 +31,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, '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>

+ 1 - 1
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, 'pcsStationName') }}{{ getPropertyValue(item, 'pcsDeviceName') }}{{ getWorkOrderTypeText(getPropertyValue(item, 'orderType')) }}</text>
               <text class="status-tag" :class="getStatusClass(item)">{{ getWorkOrderStatus(item) }}</text>
             </view>
 			<view class="info-row">