From b9b0777972f6563075a886cbfc58991e51c1a097 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 三月 2024 15:41:46 +0800
Subject: [PATCH] xg
---
src/views/eam/QuanlityConfirmList.vue | 8 ++
src/views/eam/modules/malfunctionRepair/EquipmentList.vue | 4
src/views/eam/modules/malfunctionRepair/MalfunctionRepaireForm.vue | 2
src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue | 2
src/views/eam/FaultInfoList.vue | 9 ++
src/views/eam/MalfunctionRepair.vue | 65 ++++++++++++++++++++-
src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue | 34 +++++-----
7 files changed, 94 insertions(+), 30 deletions(-)
diff --git a/src/views/eam/FaultInfoList.vue b/src/views/eam/FaultInfoList.vue
index 71d38ce..ef332c6 100644
--- a/src/views/eam/FaultInfoList.vue
+++ b/src/views/eam/FaultInfoList.vue
@@ -147,7 +147,7 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import FaultInfoModal from './modules/FaultInfoModal'
-import { putAction } from '../../api/manage'
+ import { putAction } from '../../api/manage'
export default {
name: 'FaultInfoList',
@@ -158,6 +158,7 @@
data () {
return {
description: '璁惧浜嬫晠鐧昏绠＄悊椤甸潰',
+ disableMixinCreated: true,
// 琛ㄥご
columns: [
{
@@ -396,7 +397,11 @@
}
},
created() {
- this.getSuperFieldList();
+ if (this.$route.query) {
+ this.queryParam.id = this.$route.query.id;
+ }
+ this.loadData()
+ this.initDictConfig();
},
computed: {
importExcelUrl: function(){
diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue
index d2077f6..ebd2bbc 100644
--- a/src/views/eam/MalfunctionRepair.vue
+++ b/src/views/eam/MalfunctionRepair.vue
@@ -142,10 +142,10 @@
:md="6"
:sm="6"
>
- <a-form-item label="鏄惁鍋滄満缁翠慨">
+ <a-form-item label="鏄惁鍋滄満">
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨鏄惁鍋滄満缁翠慨"
+ placeholder="璇烽�夋嫨鏄惁鍋滄満"
:triggerChange="true"
dictCode="is_stop"
v-model="queryParam.isStop"
@@ -234,6 +234,26 @@
@change="handleTableChange"
:customRow="clickThenSelect"
>
+ <!-- 鐐瑰嚮鍒楄烦杞埌浜嬫晠鐧昏椤� -->
+ <template
+ slot="accidentRegistrationProgress"
+ slot-scope="text, record">
+ <a
+ v-if="text!==''&&text!==null"
+ @click="handleAccidentRegistration(record)">
+ {{text=='yes'? '宸茬‘璁�':'鏈‘璁�'}}
+ </a>
+ </template>
+ <!-- 鐐瑰嚮鍒楄烦杞埌璐ㄩ噺闅愭偅椤� -->
+ <template
+ slot="qualityHiddenDangerProgress"
+ slot-scope="text, record">
+ <a
+ v-if="text!==''&&text!==null"
+ @click="handleQualityHiddenDanger(record)">
+ {{text=='yes'? '宸茬‘璁�':'鏈‘璁�'}}
+ </a>
+ </template>
<span
slot="specificEquipment"
slot-scope="text"
@@ -507,7 +527,7 @@
width: 200
},
{
- title: '鏄惁鍋滄満寰呬慨',
+ title: '鏄惁鍋滄満',
align: "center",
dataIndex: 'isStopName',
},
@@ -534,6 +554,20 @@
align: "center",
dataIndex: 'remark'
},
+ //璐ㄩ噺闅愭偅纭杩涘害
+ {
+ title: '璐ㄩ噺闅愭偅',
+ align: "center",
+ dataIndex: 'isConfirm1',
+ scopedSlots: { customRender: 'qualityHiddenDangerProgress' }
+ },
+ //浜嬫晠鐧昏纭杩涘害
+ {
+ title: '浜嬫晠鐧昏',
+ align: "center",
+ dataIndex: 'isConfirm2',
+ scopedSlots: { customRender: 'accidentRegistrationProgress' }
+ },
{
title: '鎿嶄綔',
dataIndex: 'action',
@@ -541,7 +575,8 @@
fixed: "right",
width: 100,
scopedSlots: { customRender: 'action' }
- }
+ },
+
],
url: {
list: "/eam/equipmentReportRepair/getReportRepairList",
@@ -730,7 +765,27 @@
handleAccept(record) {
this.$refs.acceptModel.title = "楠屾敹"
this.$refs.acceptModel.edit(record)
- }
+ },
+ //鐐瑰嚮璺宠浆鍒颁簨鏁呯櫥璁伴〉
+ handleAccidentRegistration(record) {
+ this.$router.push({
+ path: '/eam/FaultInfoList',
+ query: {
+ id: record.faultInfoId,
+ num: record.num
+ }
+ })
+ },
+ //鐐瑰嚮璺宠浆鍒拌川閲忛殣鎮ｉ〉
+ handleQualityHiddenDanger(record) {
+ this.$router.push({
+ path: '/eam/QuanlityConfirmList',
+ query: {
+ id: record.quanlityId,
+ num: record.num
+ }
+ })
+ },
}
}
</script>
diff --git a/src/views/eam/QuanlityConfirmList.vue b/src/views/eam/QuanlityConfirmList.vue
index ca5688f..c58fd2d 100644
--- a/src/views/eam/QuanlityConfirmList.vue
+++ b/src/views/eam/QuanlityConfirmList.vue
@@ -205,7 +205,7 @@
data() {
return {
description: '浜у搧璐ㄩ噺闅愭偅纭绠＄悊椤甸潰',
- // 琛ㄥご
+ disableMixinCreated: true,
columns: [
{
title: '#',
@@ -328,7 +328,11 @@
}
},
created() {
- this.getSuperFieldList();
+ if (this.$route.query) {
+ this.queryParam.id = this.$route.query.id;
+ }
+ this.loadData()
+ this.initDictConfig();
},
computed: {
importExcelUrl: function () {
diff --git a/src/views/eam/modules/malfunctionRepair/EquipmentList.vue b/src/views/eam/modules/malfunctionRepair/EquipmentList.vue
index 9cec28a..e488ada 100644
--- a/src/views/eam/modules/malfunctionRepair/EquipmentList.vue
+++ b/src/views/eam/modules/malfunctionRepair/EquipmentList.vue
@@ -21,9 +21,9 @@
:md="6"
:sm="8"
>
- <a-form-item label="鍗曟嵁鍙�">
+ <a-form-item label="缁熶竴缂栧彿">
<a-input
- placeholder="璇疯緭鍏ュ崟鎹彿妫�绱�"
+ placeholder="璇疯緭鍏ョ粺涓�缂栧彿"
v-model="queryParam.num"
></a-input>
</a-form-item>
diff --git a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireForm.vue b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireForm.vue
index 48dcb34..e302297 100644
--- a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireForm.vue
+++ b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireForm.vue
@@ -23,7 +23,7 @@
</a-col>
<a-col :span="12">
<a-form-model-item
- label="鏄惁鍋滄満缁翠慨"
+ label="鏄惁鍋滄満"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="isStop"
diff --git a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
index d5b36ae..55d6708 100644
--- a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
+++ b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
@@ -27,13 +27,13 @@
</a-col>
<a-col :span="24/2">
<a-form-item
- label="鏄惁鍋滄満缁翠慨"
+ label="鏄惁鍋滄満"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- :placeholder="disableSubmit?'':'璇烽�夋嫨鏄惁鍋滄満缁翠慨'"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨鏄惁鍋滄満'"
:triggerChange="true"
dictCode="is_stop"
v-decorator="['isStop', validatorRules.isStop]"
@@ -409,21 +409,21 @@
{ min: 1, max: 10, message: '闀垮害涓嶈兘澶т簬10涓瓧绗�!' },
]
},
- partNumber: {
- rules: [
- { required: true, message: '璇疯緭鍏ラ浂浠跺浘鍙�!' },
- ]
- },
- batchNo: {
- rules: [
- { required: true, message: '璇疯緭鍏ユ壒娆″彿!' },
- ]
- },
- quantity: {
- rules: [
- { required: true, message: '璇疯緭鍏ヤ欢鏁�!' },
- ]
- },
+ // partNumber: {
+ // rules: [
+ // { required: true, message: '璇疯緭鍏ラ浂浠跺浘鍙�!' },
+ // ]
+ // },
+ // batchNo: {
+ // rules: [
+ // { required: true, message: '璇疯緭鍏ユ壒娆″彿!' },
+ // ]
+ // },
+ // quantity: {
+ // rules: [
+ // { required: true, message: '璇疯緭鍏ヤ欢鏁�!' },
+ // ]
+ // },
type: {
rules: [
{ required: true, message: '璇烽�夋嫨鎶ヤ慨绫诲瀷!' },
diff --git a/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue b/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
index c42fb4e..8c7fa97 100644
--- a/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
+++ b/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
@@ -208,7 +208,7 @@
dataIndex: 'faultTime'
},
{
- title: '鏄惁鍋滄満寰呬慨',
+ title: '鏄惁鍋滄満',
align: "center",
dataIndex: 'isStopName',
},
--
Gitblit v1.9.3