From 6a2eb659b46f279fb87cfc0ee470e661315ffc54 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 22 三月 2024 10:06:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue b/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue
index 2b4b448..e7eb44d 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue
@@ -531,7 +531,8 @@
add: "/eam/dailyMaintenanceOrder/add",
edit: "/eam/dailyMaintenanceOrder/edit",
getCycleByStandardId: "/eam/dailyMaintenanceOrder/getMaintenanceCycleByStandardId",
- getMaintenanceProjectList: "/eam/dailyMaintenanceOrder/getMaintenanceProjectId",
+ // getMaintenanceProjectList: "/eam/dailyMaintenanceOrder/getMaintenanceProjectId",
+ getMaintenanceProjectList: "/eam/calibrationOrder/getTwoMaintenancePlanList",
getSysDeparts: "/eam/dailyMaintenanceOrder/getSysDeparts",
list: "/eam/dailyMaintenanceOrder/getMaintenanceCycleByStandardId",
getNum: '/eam/sysIdentity/getNumNew'
@@ -682,7 +683,8 @@
handle3Change(val) {
let data = this.form.getFieldsValue(['maintenanceStandardId']);
- getAction(this.url.getMaintenanceProjectList, { maintenanceStandardId: data.maintenanceStandardId, maintenanceCycleId: val }).then((res) => {
+ // getAction(this.url.getMaintenanceProjectList, { maintenanceStandardId: data.maintenanceStandardId, maintenanceCycleId: val }).then((res) => {
+ getAction(this.url.getMaintenanceProjectList).then((res) => {
if (res.success) {
this.dataSource = res.result;
if (res.result.length == 0) {
--
Gitblit v1.9.3