From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue b/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue
index 100224c..e7eb44d 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue
@@ -425,17 +425,17 @@
width: 50,
},
{
- title: '閮ㄤ綅',
+ title: '淇濆吇閮ㄤ綅',
align: 'center',
dataIndex: 'location'
},
{
- title: '淇濆吇椤圭洰',
+ title: '淇濆吇鍐呭',
align: 'center',
dataIndex: 'maintenanceProjectName'
},
{
- title: '淇濆吇鏍囧噯',
+ title: '楠屾敹鏍囧噯',
align: 'center',
dataIndex: 'standard'
},
@@ -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'
@@ -646,7 +647,7 @@
send3MaintenanceStandardRecord(data) {
let record = data.record;
this.form.setFieldsValue({ equipmentId: record.equipmentId, maintenanceStandardId: record.id, equipmentNum: record.equipmentNum, maintenanceStandardNum: record.num, maintenanceCycleId: null });
- this.form.setFieldsValue({ assignMode: record.assignMode, teamId: record.teamId, teamName: record.teamName });
+ this.form.setFieldsValue({ assignMode: "1", teamId: record.teamId, teamName: record.teamName });
this.getCycleByStandardId(record.id);
if ("3" == record.assignMode) {
this.isHidden = false
@@ -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