feat: 打包问题修复

src/pages/eam/deviceReport/myDeviceReport.vue

@@ -59,7 +59,7 @@
 		ref,
 		getCurrentInstance
 	} from 'vue'
-	import * as deviceApi from "@/api/device.js"
+	import * as deviceApi from "@/api/eam/device.js"
 	const { proxy } = getCurrentInstance()
 	const params = ref({
 		pageNo: 1,

src/pages/eam/repairOrder/addForm.vue

@@ -90,10 +90,10 @@
 		ref,
 		getCurrentInstance
 	} from 'vue'
-	import * as deviceApi from "@/api/device.js"
-	import * as moldApi from "@/api/mold.js"
-	import * as dictApi from "@/api/dict.js"
-	import * as repairOrderApi from "@/api/repairOrder.js"
+	import * as deviceApi from "@/api/eam/device.js"
+	import * as moldApi from "@/api/eam/tool.js"
+	import * as dictApi from "@/api/eam/dict.js"
+	import * as repairOrderApi from "@/api/eam/repairOrder.js"
 	import { useCountStore } from '@/store'
 	
 	const { proxy } = getCurrentInstance()

src/pages/eam/repairOrder/addServiceRecord.vue

@@ -112,8 +112,8 @@
 		ref,
 		getCurrentInstance
 	} from 'vue'
-	import * as repairOrderApi from "@/api/repairOrder.js"
-	import * as sparePartsApi from "@/api/spareParts.js"
+	import * as repairOrderApi from "@/api/eam/repairOrder.js"
+	import * as sparePartsApi from "@/api/eam/spareParts.js"
 	import * as deptApi from "@/api/dept.js"
 
 	const { proxy } = getCurrentInstance()

src/pages/eam/repairOrder/index.vue

@@ -14,31 +14,28 @@
 							<view class="title-txt">
 								{{item.maintenanceDesc}}
 							</view>
-							<u-tag text="待接单" v-if="item.status == 'PENDING'" bg-color='rgba(255,255,255,0)' color='#fe8463' border-color='#fe8463'  type="primary" shape='circle'/>
-							<u-tag text="已撤回" v-else-if="item.status=='REJECTED'" bg-color='rgba(255,255,255,0)' color='#d7d7d7' border-color='#d7d7d7 ' type="warning" shape='circle'/>
-							<u-tag text="已转办" v-else-if="item.status=='TRANSFERRED'" bg-color='rgba(255,255,255,0)' color='#e01f54' border-color='#e01f54' type="success" shape='circle'/>
-							<u-tag text="已接单" v-else-if="item.status=='PECEIVED'" bg-color='rgba(255,255,255,0)' color='#005eaa' border-color='#005eaa ' type="error" shape='circle'/>
-							<u-tag text="已验证" v-else-if="item.status=='VERIFIED'" bg-color='rgba(255,255,255,0)' color='#2EC7C9' border-color='#2EC7C9' type="info" shape='circle'/>
-							<u-tag text="已完成" v-else-if="item.status=='COMPLETED'" bg-color='rgba(255,255,255,0)' color='#2ba471' border-color='#2ba471' type="info" shape='circle'/>
-							<u-tag text="报修人已确认" v-else-if="item.status=='APPLYPASS'" bg-color='rgba(255,255,255,0)' color='#2ba471' border-color='#2ba471' type="info" shape='circle'/>
+							<u-tag text="待派工" v-if="item.status == '0'" bg-color='rgba(255,255,255,0)' color='#fe8463' border-color='#fe8463'  type="primary" shape='circle'/>
+							<u-tag text="已逾期" v-if="item.status == '1'" bg-color='rgba(255,255,255,0)' color='#fe8463' border-color='#fe8463'  type="primary" shape='circle'/>
+							<u-tag text="已退单" v-if="item.status == '2'" bg-color='rgba(255,255,255,0)' color='#fe8463' border-color='#fe8463'  type="primary" shape='circle'/>
+							<u-tag text="待接单" v-if="item.status == '3'" bg-color='rgba(255,255,255,0)' color='#fe8463' border-color='#fe8463'  type="primary" shape='circle'/>
+							<u-tag text="待执行" v-else-if="item.status=='4'" bg-color='rgba(255,255,255,0)' color='#005eaa' border-color='#005eaa ' type="error" shape='circle'/>
+							<u-tag text="执行中" v-else-if="item.status=='5'" bg-color='rgba(255,255,255,0)' color='#005eaa' border-color='#005eaa ' type="error" shape='circle'/>
+							<u-tag text="待维修验证" v-else-if="item.status=='6'" bg-color='rgba(255,255,255,0)' color='#2ba471' border-color='#2ba471' type="info" shape='circle'/>
+							<u-tag text="待报修验证" v-else-if="item.status=='7'" bg-color='rgba(255,255,255,0)' color='#2ba471' border-color='#2ba471' type="info" shape='circle'/>
+							<u-tag text="已完成" v-else-if="item.status=='8'" bg-color='rgba(255,255,255,0)' color='#2EC7C9' border-color='#2EC7C9' type="info" shape='circle'/>
+							<u-tag text="已作废" v-else-if="item.status=='9'" bg-color='rgba(255,255,255,0)' color='#2ba471' border-color='#2ba471' type="info" shape='circle'/>
 						</view>
 						<view class="dec">
 							工单单号:<span>{{item.number}}</span>
 						</view>
 						<view class="dec">
-							类型:<span>{{item.type=='DEVICE'?'设备':item.type=='TECH'?'工艺':'模具'}}</span>
+							类型:<span>设备</span>
 						</view>
 						<view class="dec">
-							{{`${params.type=='DEVICE'?'设备':params.type=='TECH'?'工艺' : '模具'}`}}编号:<span>{{item.deviceNumber}}</span>
+							设备编号:<span>{{item.equipmentCode}}</span>
 						</view>
 						<view class="dec">
-							{{`${params.type=='DEVICE'?'设备':params.type=='TECH'?'工艺' : '模具'}`}}名称:<span>{{item.name}}</span>
-						</view>
-						<view class="dec">
-							所属厂区:<span>{{item.factoryAreaName}}</span>
-						</view>
-						<view class="dec">
-							班次:<span>{{item.classesName}}</span>
+							设备名称:<span>{{item.equipmentName}}</span>
 						</view>
 						<view class="dec">
 							故障类型:<span>{{item.faultTypeName}}</span>
@@ -72,6 +69,7 @@
 	} from 'vue'
 	import * as repairOrderApi from "@/api/eam/repairOrder"
 	import { useCountStore } from '@/store'
+	import * as deviceApi from "@/api/eam/device.js"
 	
 	const { proxy } = getCurrentInstance()
 	// 获取自定义的store
@@ -89,23 +87,37 @@
 	function addForm(item) {
 		proxy.$tab.navigateTo(`/pages/eam/repairOrder/addForm?type=${params.value.type}&data=${encodeURIComponent(JSON.stringify(item))}`)
 	}
-	
 	async function getList() {
-		if (status.value == 'nomore') return;
-		status.value = 'loading';
-		proxy.$modal.loading('加载中')
-		await repairOrderApi.repairOrderPage(params.value,params.value.type).then((res) => {
-			proxy.$modal.closeLoading()
-			if (res.data.list.length > 0) {
-				list.value = list.value.concat(res.data.list);
-				params.value.pageNo++;
-				status.value = 'loadmore'
-			} else {
-				status.value = 'nomore'
-			}
-		}).catch(() => {
-			proxy.$modal.closeLoading()
-		})
+	    if (status.value === 'nomore') return;
+	
+	    status.value = 'loading';
+	    proxy.$modal.loading('加载中');
+	
+	    try {
+	        const res = await repairOrderApi.repairOrderPage(params.value, params.value.type);
+	        const resp = await deviceApi.deviceNoPage();
+	
+	        proxy.$modal.closeLoading();
+	
+	        if (res.data.list.length > 0) {
+	            // 匹配并设置 equipmentName
+	            res.data.list.forEach(element => {
+	                const matchedItem = resp.data.find(item => item.equipmentCode === element.code);
+	                if (matchedItem) {
+	                    element.equipmentName = matchedItem.name;
+	                }
+	            });
+	
+	            list.value = list.value.concat(res.data.list);
+	            params.value.pageNo++;
+	            status.value = 'loadmore';
+	        } else {
+	            status.value = 'nomore';
+	        }
+	    } catch (error) {
+	        proxy.$modal.closeLoading();
+	        console.error('Error fetching data:', error);
+	    }
 	}
 	onLoad((option) => {
 		if (option.type) params.value.type = option.type;

src/pages/eam/repairOrder/myRepairRequest.vue

@@ -30,7 +30,7 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
 	.add-form-container {
 		min-height: calc(100vh - 140rpx);
 		background: white;
@@ -38,15 +38,16 @@
 	}
 	
 	.list {
-		padding: 0rpx 30rpx;
-	
+		padding: 20rpx;
 		.item {
 			display: flex;
 			margin-bottom: 20rpx;
 	
 			.item-box {
-				background: #F5F5F5;
 				border-radius: 12rpx;
+				border: 1px solid #dedede;
+				border-radius: 12rpx;
+	
 				flex: 1;
 				width: 0rpx;
 			}
@@ -54,17 +55,19 @@
 			.spare-title {
 				padding: 20rpx 30rpx;
 				border-bottom: 1px solid #e4e4e4;
+				display: flex;
 	
 				.title-txt {
 					color: #409eff;
 					font-size: 30rpx;
 					font-weight: bold;
+					flex: 1;
 				}
 			}
 	
 			.dec {
 				color: #9c9c9c;
-				padding: 20rpx 30rpx 20rpx;
+				padding: 0rpx 30rpx 20rpx;
 			}
 	
 		}

src/pages/eam/repairOrder/transfer.vue

@@ -97,10 +97,10 @@
 		ref,
 		getCurrentInstance
 	} from 'vue'
-	import * as deviceApi from "@/api/device.js"
-	import * as moldApi from "@/api/mold.js"
-	import * as dictApi from "@/api/dict.js"
-	import * as repairOrderApi from "@/api/repairOrder.js"
+	import * as deviceApi from "@/api/eam/device.js"
+	import * as moldApi from "@/api/eam/tool.js"
+	import * as dictApi from "@/api/eam/dict.js"
+	import * as repairOrderApi from "@/api/eam/repairOrder.js"
 	import * as deptApi from "@/api/dept.js"
 	const { proxy } = getCurrentInstance()
 

src/pages/eam/sparePartsApplication/mySparePartsApplication.vue

@@ -60,7 +60,7 @@
 		ref,
 		getCurrentInstance
 	} from 'vue'
-	import * as sparePartsApplicationApi from "@/api/sparePartsApplication.js"
+	import * as sparePartsApplicationApi from "@/api/eam/sparePartsApplication.js"
 	const { proxy } = getCurrentInstance()
 	const params = ref({
 		pageNo: 1,

src/pages/eam/sparePartsApplicationApprove/mySparePartsApplicationApprove.vue

@@ -60,7 +60,7 @@
 		ref,
 		getCurrentInstance
 	} from 'vue'
-	import * as sparePartsApplicationApproveApi from "@/api/sparePartsApplicationApprove.js"
+	import * as sparePartsApplicationApproveApi from "@/api/eam/sparePartsApplicationApprove.js"
 	
 	const { proxy } = getCurrentInstance()
 	const params = ref({

src/pages/eam/sparePartsServiceWorkOrderList/mySparePartsService.vue

@@ -66,7 +66,7 @@
 		ref,
 		getCurrentInstance
 	} from 'vue'
-	import * as sparePartsServiceWorkOrderListApi from "@/api/sparePartsServiceWorkOrderList.js"
+	import * as sparePartsServiceWorkOrderListApi from "@/api/eam/sparePartsServiceWorkOrderList.js"
 	
 	const { proxy } = getCurrentInstance()
 	const params = ref({

src/pages/overhaulOrder/addForm.vue

@@ -79,10 +79,10 @@
 		getCurrentInstance
 	} from 'vue'
 	import * as overhaulOrderApi from "@/api/overhaulOrder.js"
-	import * as moldApi from "@/api/mold.js"
-	import * as dictApi from "@/api/dict.js"
-	import * as repairOrderApi from "@/api/repairOrder.js"
-	import * as deviceApi from "@/api/device.js"
+	import * as moldApi from "@/api/eam/tool.js"
+	import * as dictApi from "@/api/eam/dict.js"
+	import * as repairOrderApi from "@/api/eam/repairOrder.js"
+	import * as deviceApi from "@/api/eam/device.js"
 	const { proxy } = getCurrentInstance()
 
 	const loading = ref(false)

src/pages/overhaulOrder/addServiceRecord.vue

@@ -148,9 +148,9 @@
 		getCurrentInstance
 	} from 'vue'
 	import * as overhaulOrderApi from "@/api/overhaulOrder.js"
-	import * as sparePartsApi from "@/api/spareParts.js"
+	import * as sparePartsApi from "@/api/eam/spareParts.js"
 	import * as deptApi from "@/api/dept.js"
-	import * as dictApi from "@/api/dict.js"
+	import * as dictApi from "@/api/eam/dict.js"
 	const { proxy} = getCurrentInstance()
 	const loading = ref(false)
 	const type = ref('')

src/pages/overhaulOrder/reqairOrderList.vue

@@ -65,7 +65,7 @@
 		getCurrentInstance
 	} from 'vue'
 	
-	import * as repairOrderApi from "@/api/repairOrder.js"
+	import * as repairOrderApi from "@/api/eam/repairOrder.js"
 	const { proxy } = getCurrentInstance()
 	
 	const repairOrderList = ref([])

src/pages/spotCheckOrder/addForm.vue

@@ -79,9 +79,9 @@
 		getCurrentInstance
 	} from 'vue'
 	
-	import * as deviceApi from "@/api/device.js"
+	import * as deviceApi from "@/api/eam/device.js"
 	import * as spotCheckOrderApi from "@/api/spotCheckOrder.js"
-	import * as dictApi from "@/api/dict.js"
+	import * as dictApi from "@/api/eam/dict.js"
 	import { useCountStore } from '@/store'
 	
 	const { proxy } = getCurrentInstance()

src/pages/upkeepOrder/addServiceRecord.vue

@@ -149,9 +149,9 @@
 		getCurrentInstance
 	} from 'vue'
 	import * as upkeepOrderApi from "@/api/upkeepOrder.js"
-	import * as sparePartsApi from "@/api/spareParts.js"
+	import * as sparePartsApi from "@/api/eam/spareParts.js"
 	import * as deptApi from "@/api/dept.js"
-	import * as dictApi from "@/api/dict.js"
+	import * as dictApi from "@/api/eam/dict.js"
 	const { proxy} = getCurrentInstance()
 	const loading = ref(false)
 	const type = ref('')

src/pages/upkeepOrder/detail.vue

@@ -154,7 +154,7 @@
 		ref,
 		getCurrentInstance
 	} from 'vue'
-	import * as moldApi from "@/api/mold.js"
+	import * as moldApi from "@/api/eam/tool.js"
 	import * as upkeepOrderApi from "@/api/upkeepOrder.js"
 		const { proxy } = getCurrentInstance()
 	const list = ref([{