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/EquipmentListOfTester.vue | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/views/eam/EquipmentListOfTester.vue b/src/views/eam/EquipmentListOfTester.vue
index 675006b..b4069a9 100644
--- a/src/views/eam/EquipmentListOfTester.vue
+++ b/src/views/eam/EquipmentListOfTester.vue
@@ -230,6 +230,21 @@
></j-date>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,del_flag!='1'"
+ v-model="queryParam.teamId"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form>
</div>
@@ -314,7 +329,14 @@
:customRow="clickThenSelect"
@change="handleTableChange"
>
-
+ <template
+ slot="technologyStatus"
+ slot-scope="text,record"
+ >
+ <a
+ href="javascript:eam/EquipmentCalibrationOrder;"
+ @click="handleTechnologyStatus(record)">{{record.technologyStatus_dictText}}</a>
+ </template>
<template
slot="htmlSlot"
slot-scope="text"
@@ -727,6 +749,7 @@
title: '鎶�鏈姸鎬�',
align: "center",
dataIndex: 'technologyStatus_dictText',
+ scopedSlots: { customRender: 'technologyStatus' },
},
{
title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
@@ -1081,7 +1104,18 @@
},
handleEditSpareParts(record) {
this.$refs.modalFormSpareParts.edit(record);
- }
+ },
+ handleTechnologyStatus(record) {
+ //璺敱鏄痚am/EquipmentCalibrationOrder
+ this.$router.push({
+ path: '/eam/EquipmentCalibrationOrder',
+ query: {
+ equipmentId: record.id,
+ technologyStatus: record.technologyStatus,
+ technologyStatusVerificationType: record.technologyStatusVerificationType,
+ }
+ })
+ },
}
}
--
Gitblit v1.9.3