From 964faa1077a89713910063c39ebe08fac4e4c56e Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期四, 24 七月 2025 17:44:18 +0800
Subject: [PATCH] 企业维修适配修改
---
pages/maintenanceReport/maintenanceReport.vue | 224 +++++++++++++++++++------------------------------------
1 files changed, 78 insertions(+), 146 deletions(-)
diff --git a/pages/maintenanceReport/maintenanceReport.vue b/pages/maintenanceReport/maintenanceReport.vue
index 6508047..35a438a 100644
--- a/pages/maintenanceReport/maintenanceReport.vue
+++ b/pages/maintenanceReport/maintenanceReport.vue
@@ -1,9 +1,14 @@
<template>
<view class="container">
- <cu-custom :bgColor="NavBarColor" :isBack="true" backRouterName="productionTask">
- <block slot="backText">杩斿洖</block>
- <block slot="content">缁翠慨</block>
- </cu-custom>
+ <cu-custom :bgColor="NavBarColor" :isBack="true">
+ <block slot="backText">杩斿洖</block>
+ <block slot="content">寰呯淮淇�</block>
+ <block slot="right">
+ <view @click="search">
+ <image class="search" src="/static/icon/sear.png" style="width: 25px; height: 25px;" alt="" />
+ </view>
+ </block>
+ </cu-custom>
<view style="width: 100%;">
<uni-popup ref="popup" background-color="#fff" :type="type">
@@ -11,11 +16,8 @@
<!-- 鍩虹琛ㄥ崟鏍￠獙 -->
<uni-forms ref="form" :modelValue="formData" validate-trigger="bind" err-show-type="undertext">
<uni-group title="" top="0">
- <uni-forms-item name="numbers" label="棰嗘枡鐢宠鍗曞彿:">
- <uni-easyinput type="text" v-model="formData.num" placeholder="璇疯緭鍏ラ鏂欑敵璇峰崟鍙锋绱�" />
- </uni-forms-item>
- <uni-forms-item name="name" label="棰嗘枡浜у搧:">
- <uni-easyinput v-model="formData.partNumNameModel" placeholder="璇疯緭鍏ラ鏂欎骇鍝�" />
+ <uni-forms-item name="numbers" label="宸ュ崟缂栧彿:">
+ <uni-easyinput type="text" v-model="formData.num" placeholder="璇疯緭鍏ュ伐鍗曠紪鍙锋绱�" />
</uni-forms-item>
</uni-group>
</uni-forms>
@@ -39,18 +41,36 @@
<view class="content">
<uni-card margin="10px" spacing="1px" v-for="(item,index) in msgList" :key="index"
@click="onClickProductionTask(item)">
-
+
<view class="flex">
<view class="flex-sub text-light bg-white padding-xs margin-xs radius">璁惧缂栧彿:</view>
<view class="flex-sub bg-white padding-xs margin-xs text-bold radius text-right">
- {{item.equipmentId_dictText}}
+ {{item.equipmentCode}}
</view>
</view>
<view class="flex">
- <view class="flex-sub text-light bg-white padding-xs margin-xs radius">鏁呴殰绠�绉�:</view>
- <view class="flex-sub bg-white padding-xs margin-xs radius text-right">
- {{item.faultName}}
+ <view class="flex-sub text-light bg-white padding-xs margin-xs radius">璁惧鍚嶇О:</view>
+ <view class="flex-sub bg-white padding-xs margin-xs text-bold radius text-right">
+ {{item.equipmentName}}
+ </view>
+ </view>
+ <view class="flex">
+ <view class="flex-sub text-light bg-white padding-xs margin-xs radius">瀹夎浣嶇疆:</view>
+ <view class="flex-sub bg-white padding-xs margin-xs text-blue radius text-right">
+ {{item.installationPosition}}
+ </view>
+ </view>
+ <view class="flex">
+ <view class="flex-sub text-light bg-white padding-xs margin-xs radius">缁翠慨鐘舵��:</view>
+ <view class="flex-sub bg-white padding-xs margin-xs text-green radius text-right">
+ {{item.reportStatus_dictText}}
+ </view>
+ </view>
+ <view class="flex">
+ <view class="flex-sub text-light bg-white padding-xs margin-xs radius">鏁呴殰鎻忚堪:</view>
+ <view class="flex-sub bg-white padding-xs margin-xs text-green radius text-right">
+ {{item.faultDescription}}
</view>
</view>
<view class="flex">
@@ -60,12 +80,10 @@
</view>
</view>
-
- <view class="flex">
+ <view v-if="authIncludes('eam:repair:collect')" class="flex">
<view class="flex-sub text-light bg-white padding-xs margin-xs radius">鎿嶄綔:</view>
<view class="flex-sub bg-blue padding-xs margin-xs radius text-sm text-center"
@click.stop="handleStartWork(item)" hover-class="is-hover">棰嗗彇</view>
-
</view>
</uni-card>
</view>
@@ -91,7 +109,7 @@
activeColor: '#5277A6',
url: {
stallList: "/eam/eamReportRepair/list",
- add:'/eam/eamRepairOrder/add'
+ add: '/eam/eamRepairOrder/add'
},
upOption: {
@@ -116,10 +134,17 @@
announcement1: [],
msg1Count: 0,
msg2Count: 0,
- msg1Title: ""
+ msg1Title: "",
+ equipmentId: ''
}
},
+ mounted() {
+ console.log('浠� store 鑾峰彇鐨� auth:', this.$store.getters.getAuth)
+ },
computed: {
+ authList() {
+ return this.$store.getters.getAuth || []
+ },
top() {
return this.CustomBar * 2 + 50
},
@@ -132,57 +157,47 @@
},
+
+
onShow() {
if (this.mescroll) {
this.mescroll.resetUpScroll()
}
},
-
+ onLoad: function(options) {
+ this.equipmentId = options.equipmentId ?
+ decodeURIComponent(options.equipmentId) :
+ '';
+ },
created() {},
methods: {
-
+ /**
+ * @param {Object} code鎸夐挳鏉冮檺
+ */
+ authIncludes(code) {
+ return this.authList.some(auth => auth.action === code)
+ },
/**
* 棰嗗彇
*/
handleStartWork(item) {
-
- this.$tip.loading();
+
+ uni.showLoading({
+ mask: true,
+ title: "鍔犺浇涓�....",
+ })
this.$http.post(this.url.add, {
-
- actualEndTime: item.actualEndTime,
- actualStartTime: item.actualStartTime,
- createBy: item.actualStartTime,
- createTime: item.createTime,
- delFlag: item.delFlag,
- equipmentId:item.equipmentId,
- equipmentName: item.equipmentName,
- faultReason:item.faultReason,
- id: item.faultReason,
- imageFiles:item.imageFiles,
- imageFilesResult:null,
- outsourcedEndTime:item.outsourcedEndTime,
- outsourcedFlag:item.outsourcedFlag,
- outsourcedPerson: item.outsourcedPerson,
- outsourcedRepairDescription:item.outsourcedRepairDescription,
- outsourcedStartTime:item.outsourcedStartTime,
- repairCode:item.repairCode,
- repairDescription:item.repairDescription,
- repairStatus:item.repairStatus,
- repairer:item.repairer,
- reportId:item.id,
- updateBy:item.updateBy,
- updateTime: item.updateTime
-
+ reportId: item.id,
}).then(res => {
console.log(res)
- this.$tip.loaded();
+ uni.hideLoading()
if (res.data.success) {
uni.showToast({
icon: "success",
title: '棰嗗彇鎴愬姛',
duration: 2000
});
- this.mescroll.resetUpScroll()
+ this.mescroll.resetUpScroll();
} else {
uni.showModal({
title: "鎻愮ず",
@@ -205,12 +220,12 @@
* 璇︽儏椤甸潰
*/
onClickProductionTask(item) {
-
- uni.navigateTo({
- url: '/pages/maintenanceReport/maintenanceReportDetils/maintenanceReportDetils?item=' +
- encodeURIComponent(JSON.stringify(item))
-
- })
+
+ // uni.navigateTo({
+ // url: '/pages/maintenanceReport/maintenanceReportDetils/maintenanceReportDetils?item=' +
+ // encodeURIComponent(JSON.stringify(item))
+
+ // })
},
search() {
@@ -225,7 +240,8 @@
pageSize: page.size,
order: 'desc',
column: 'createTime',
- repairStatus: 'WAIT_REPAIR'
+ reportStatus: 'WAIT_REPAIR',
+ equipmentId: this.equipmentId || ''
},
}).then(res => {
@@ -256,7 +272,6 @@
resetTask() {
this.formData.num = ''
- this.formData.partNumNameModel = ''
this.$refs.popup.close();
this.mescroll.resetUpScroll()
@@ -264,19 +279,17 @@
/* 妫�绱� */
getSera() {
this.$refs.popup.close();
- let keyword = this.TabCur
+
this.msgList = [];
-
- if (keyword == 0) {
this.$http.get(this.url.stallList, {
params: {
pageNo: 1,
pageSize: 999,
order: "desc",
column: "createTime",
- num: '*' + this.formData.num + '*',
- partNumNameModel: '*' + this.formData.partNumNameModel + '*',
- status: 'published'
+ repairCode:this.formData.num,
+ reportStatus: 'WAIT_REPAIR',
+ equipmentId: this.equipmentId || ''
}
}).then(res => {
//鑱旂綉鎴愬姛鐨勫洖璋�,闅愯棌涓嬫媺鍒锋柊鍜屼笂鎷夊姞杞界殑鐘舵��;
@@ -302,87 +315,6 @@
//鑱旂綉澶辫触, 缁撴潫鍔犺浇
this.mescroll.endErr();
})
-
- } else if (keyword == 1) {
- this.$http.get(this.url.stallList, {
- params: {
- pageNo: 1,
- pageSize: 999,
- order: "desc",
- column: "createTime",
- status: 'training',
- num: '*' + this.formData.num + '*',
- partNumNameModel: '*' + this.formData.partNumNameModel + '*'
-
- }
- }).then(res => {
- //鑱旂綉鎴愬姛鐨勫洖璋�,闅愯棌涓嬫媺鍒锋柊鍜屼笂鎷夊姞杞界殑鐘舵��;
-
- this.announcement1 = res.data.result.records
- this.mescroll.endSuccess(this.announcement1.length);
- console.log("url", res)
- //璁剧疆鍒楄〃鏁版嵁
- if (res.data.success) {
- console.log("res", res.data)
- this.msg1Count = res.data.result.total
- this.msg2Title = "閫氱煡(" + res.data.result.total + ")";
- for (let annItem of this.announcement1) {
- this.msgList.push(annItem)
- }
- }
- if (page.num == 1) {
- this.msgList = []; //濡傛灉鏄涓�椤甸渶鎵嬪姩鍒剁┖鍒楄〃
- this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
- }
-
- }).catch(() => {
- //鑱旂綉澶辫触, 缁撴潫鍔犺浇
- this.mescroll.endErr();
- })
-
- } else if (keyword == 2) {
- this.$http.get(this.url.stallList, {
- params: {
- pageNo: 1,
- pageSize: 999,
- order: "desc",
- column: "createTime",
- status: 'completed',
- num: '*' + this.formData.num + '*',
- partNumNameModel: '*' + this.formData.partNumNameModel + '*'
-
- }
- }).then(res => {
- //鑱旂綉鎴愬姛鐨勫洖璋�,闅愯棌涓嬫媺鍒锋柊鍜屼笂鎷夊姞杞界殑鐘舵��;
-
- this.announcement1 = res.data.result.records
- this.mescroll.endSuccess(this.announcement1.length);
- console.log("url", res)
- //璁剧疆鍒楄〃鏁版嵁
- if (res.data.success) {
- console.log("res", res.data)
- this.msg3Count = res.data.result.total
- this.msg1Title = "閫氱煡(" + res.data.result.total + ")";
- for (let annItem of this.announcement1) {
- this.msgList.push(annItem)
- }
- }
- if (page.num == 1) {
- this.msgList = []; //濡傛灉鏄涓�椤甸渶鎵嬪姩鍒剁┖鍒楄〃
- this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
- }
-
- }).catch(() => {
- //鑱旂綉澶辫触, 缁撴潫鍔犺浇
- this.mescroll.endErr();
- })
-
- }
-
-
-
-
-
},
@@ -413,7 +345,7 @@
}
.popupView {
- margin-top: 85px;
+ margin-top: 45px;
height: auto;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3