From afaaa390b00bee8aea26e5de978fdb19c82aaa8a Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期四, 02 十一月 2023 09:23:07 +0800
Subject: [PATCH] 故障报修单
---
src/views/user/Login.vue | 4 +++-
src/views/eam/RepairOrderList.vue | 6 +++---
src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue | 12 ++++++++----
src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue | 1 +
src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue | 6 +++++-
5 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/views/eam/RepairOrderList.vue b/src/views/eam/RepairOrderList.vue
index 8f8c5d1..764d7a9 100644
--- a/src/views/eam/RepairOrderList.vue
+++ b/src/views/eam/RepairOrderList.vue
@@ -104,11 +104,11 @@
:sm="24"
>
<a-form-item
- label="杞﹂棿"
+ label="宸ュ尯"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨璧勮溅闂�"
+ placeholder="璇烽�夋嫨璧勫伐鍖�"
:triggerChange="true"
dictCode="mom_base_factory_model,name,id,del_flag!='1'"
v-model="queryParam.factoryModelId"
@@ -439,7 +439,7 @@
import EquipmentDocumentList from './RepairOrderEquipmentDocumentList'
import '@/assets/less/TableExpand.less'
import { putAction } from '../../api/manage'
-import RepairOrderAssignTask from './modules/repairorder/RepairOrderAssignTask.vue'
+import RepairOrderAssignTask from './modules/repairorder/RepairOrderAssignTask'
import RepairOrderExcuteDrawer from './modules/repairorder/repairOrderExcuteDrawer'
import FaultDescriptionList from './FaultDescriptionList'
import FaultReportRepair from './modules/repairorder/moudles/select/FaultReportRepair.vue'
diff --git a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
index 0032a54..d98a033 100644
--- a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
+++ b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
@@ -19,7 +19,7 @@
allow-clear
placeholder='璇烽�夋嫨鏁呴殰绫诲瀷'
:triggerChange='true'
- :disabled="isEdit"
+ :disabled="isEdit||repairOrder.status!=='3'"
dictCode="mom_eam_fault_type,name,id,del_flag!='1'"
v-decorator="['faultTypeId', validatorRules.faultTypeId ]"
/>
@@ -34,7 +34,7 @@
<a-textarea
placeholder='璇疯緭鍏ユ晠闅滃垎鏋�'
v-decorator="['faultCause', validatorRules.faultCause]"
- :disabled="isEdit"
+ :disabled="isEdit||repairOrder.status!=='3'"
></a-textarea>
</a-form-item>
</a-col>
@@ -49,7 +49,7 @@
<a-textarea
placeholder='璇疯緭鍏ョ淮淇帾鏂�'
v-decorator="['maintenanceMeasures', validatorRules.maintenanceMeasures]"
- :disabled="isEdit"
+ :disabled="isEdit||repairOrder.status!=='3'"
></a-textarea>
</a-form-item>
</a-col>
@@ -62,7 +62,7 @@
<a-textarea
v-decorator="['suggestion', validatorRules.suggestion]"
placeholder='璇疯緭鍏ョ淮淇濇剰瑙�'
- :disabled="isEdit"
+ :disabled="isEdit||repairOrder.status!=='3'"
></a-textarea>
</a-form-item>
</a-col>
@@ -96,6 +96,10 @@
repairOrderId: {
type: String,
default:'',
+ },
+ repairOrder:{
+ type: Object,
+ default:{},
}
},
watch:{
diff --git a/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue b/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
index bb3e7d0..3566cf3 100644
--- a/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
+++ b/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
@@ -300,6 +300,7 @@
handleOk() {
const that = this;
// 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.confirmLoading=true;
if (that.selectedRowKeys.length === 0) {
that.$message.error("璇烽�夋嫨鏁呴殰鎶ヤ慨鍗曞悗鎻愪氦锛�")
return false;
diff --git a/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue b/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
index b01384d..783a5d1 100644
--- a/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
+++ b/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
@@ -237,7 +237,7 @@
:repairOrderId="repairOrder.id"
:repairOrderStatus="repairOrder.status"
></fault-analysis-edit-table> -->
- <RepairOrderFaultAnalysisList :repairOrderId="repairOrderId" />
+ <RepairOrderFaultAnalysisList :repairOrderId="repairOrderId" :repairOrder="repairOrder"/>
</a-tab-pane>
<a-tab-pane
tab='瀹為檯宸ユ椂'
@@ -309,6 +309,10 @@
repairOrderId: {
type: String,
default:'',
+ },
+ status:{
+ type: String,
+ default:'',
}
},
data() {
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 2d2d620..539640c 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -112,7 +112,7 @@
},
// 鐧诲綍鍚庡彴鎴愬姛
requestSuccess(loginResult){
- this.$router.push({ path: "/dashboard/analysis" }).catch(()=>{
+ this.$router.push({ path: "/isps/userAnnouncement" }).catch(()=>{
console.log('鐧诲綍璺宠浆棣栭〉鍑洪敊,杩欎釜閿欒浠庡摢閲屾潵鐨�')
})
this.$notification.success({
@@ -127,6 +127,8 @@
that.$notification.success({
message: '鏈�鏂版湭璇绘秷鎭��'+res.result[i].msgCategory+'銆�',
description:res.result[i].msgContent,
+ duration:60,
+ icon:<a-icon type="exclamation-circle" style="color:red" />,
});
}
}
--
Gitblit v1.9.3