From 10f3a04b8651c1a6c160331d09869121417b9d3b Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期四, 16 十一月 2023 16:42:05 +0800
Subject: [PATCH] 故障报修
---
src/views/eam/MalfunctionRepair.vue | 209 +++++++++++++++++++++++++++++++++++------
src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue | 77 +++++++++-----
2 files changed, 228 insertions(+), 58 deletions(-)
diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue
index e0b6cef..12934f5 100644
--- a/src/views/eam/MalfunctionRepair.vue
+++ b/src/views/eam/MalfunctionRepair.vue
@@ -8,11 +8,24 @@
<a-form
layout="inline"
@keyup.enter.native="searchQuery"
- >
+ > <a-row :gutter="24" style="margin-bottom: 1%;">
+ <a-col
+ :md="24"
+ :sm="6"
+ >
+ <a-form-item label="缁熶竴缂栧彿缇�">
+ <a-textarea
+ placeholder="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,椤荤敤鈥�,鈥濋殧寮�,鍚﹀垯鍙兘鏌ヨ鍑洪敊璇俊鎭�"
+ v-model="queryParam.nums"
+ :auto-size="{ minRows: 2, maxRows:2 }"
+ ></a-textarea>
+ </a-form-item>
+ </a-col>
+ </a-row>
<a-row :gutter="24">
<a-col
:md="6"
- :sm="8"
+ :sm="6"
>
<a-form-item label="鍗曟嵁鍙�">
<a-input
@@ -23,23 +36,148 @@
</a-col>
<a-col
:md="6"
- :sm="8"
+ :sm="6"
>
- <a-form-item label="缁熶竴缂栫爜">
+ <a-form-item label="缁熶竴缂栧彿">
<a-input
- placeholder="璇疯緭鍏ョ粺涓�缂栫爜"
+ placeholder="璇疯緭鍏ョ粺涓�缂栧彿"
v-model="queryParam.equipmentNum"
></a-input>
</a-form-item>
</a-col>
<a-col
:md="6"
- :sm="8"
+ :sm="6"
>
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
+ <a-form-item label="璁惧鍚嶇О">
+ <a-input
+ placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ v-model="queryParam.equipmentName"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="璁惧鍨嬪彿">
+ <a-input
+ placeholder="璇疯緭鍏ヨ澶囧瀷鍙�"
+ v-model="queryParam.model"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="璁惧瑙勬牸">
+ <a-input
+ placeholder="璇疯緭鍏ヨ澶囪鏍�"
+ v-model="queryParam.specification"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="浣跨敤閮ㄩ棬">
+ <a-tree-select
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
+ tree-default-expand-all
+ v-model="queryParam.useId"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="鏁呴殰鏃堕棿">
+ <a-range-picker
+ style="width: 100%;"
+ format="YYYY-MM-DD HH:mm:ss"
+ v-model="faultTime"
+ @change="timeChange"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="鎶ヤ慨浜�">
+ <a-input
+ placeholder="璇疯緭鍏ユ姤淇汉"
+ v-model="queryParam.errUda2"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="鍗曟嵁鐘舵��">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨鍗曟嵁鐘舵��"
+ :triggerChange="true"
+ dictCode="equipment_report_repair_status"
+ v-model="queryParam.status"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="鏄惁鍋滄満缁翠慨">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨鏄惁鍋滄満缁翠慨"
+ :triggerChange="true"
+ dictCode="is_stop"
+ v-model="queryParam.isStop"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="鏄惁鍔犲伐闆朵欢">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨鏄惁鍦ㄥ姞宸ラ浂浠�"
+ :triggerChange="true"
+ dictCode="is_product"
+ v-model="queryParam.errUda1"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="鍒跺崟浜�">
+ <a-input
+ placeholder="璇疯緭鍏ュ埗鍗曚汉"
+ v-model="queryParam.createBy"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <div class="table-operator">
<a-button
type="primary"
@click="searchQuery"
@@ -51,12 +189,6 @@
icon="reload"
style="margin-left: 8px"
>閲嶇疆</a-button>
- </span>
- </a-col>
- </a-row>
- </a-form>
- </div>
- <div class="table-operator">
<a-button
@click="handleAdd"
type="primary"
@@ -188,6 +320,7 @@
import FaultDescriptionList from './modules/malfunctionRepair/FaultDescriptionList'
import ApprovelModal from './modules/malfunctionRepair/ApprovelModal'
import JEllipsis from '@/components/jeecg/JEllipsis'
+import moment from 'moment'
export default {
name: 'MalfunctionRepairList',
@@ -200,6 +333,8 @@
},
data() {
return {
+ treeData:[],
+ faultTime:[],
description: '鏁呴殰鎶ヤ慨',
queryParam: { delflag: 0 },
selectedRowKeys: [],
@@ -226,7 +361,7 @@
dataIndex: 'num'
},
{
- title: '缁熶竴缂栫爜',
+ title: '缁熶竴缂栧彿',
align: "center",
dataIndex: 'equipmentNum'
},
@@ -270,11 +405,11 @@
// dataIndex: 'photo',
// scopedSlots: { customRender: 'imgSlot' }
// },
- // {
- // title: '鏁呴殰鍘熷洜',
- // align: "center",
- // dataIndex: 'faultReason'
- // },
+ {
+ title: '鎶ヤ慨浜�',
+ align: "center",
+ dataIndex: 'errUda2'
+ },
{
title: '鏁呴殰鏃堕棿',
align: "center",
@@ -291,15 +426,15 @@
dataIndex: 'errUda1_dictText',
},
{
- title: '鍒涘缓浜�',
+ title: '鍒跺崟浜�',
align: "center",
dataIndex: 'createBy'
},
- {
- title: '鍒涘缓鏃堕棿',
- align: "center",
- dataIndex: 'createTime',
- },
+ // {
+ // title: '鍒涘缓鏃堕棿',
+ // align: "center",
+ // dataIndex: 'createTime',
+ // },
{
title: '澶囨敞',
align: "center",
@@ -321,6 +456,7 @@
exportXlsUrl: "/eam/equipmentReportRepair/exportXls",
importExcelUrl: "eam/equipmentReportRepair/importExcel",
edit: "/eam/equipmentReportRepair/edit",
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
},
/* 鍒嗛〉鍙傛暟 */
ipagination: {
@@ -337,7 +473,7 @@
}
},
created() {
-
+ this.initOptions();
},
computed: {
importExcelUrl: function () {
@@ -481,9 +617,22 @@
this.queryParam = {}
this.loadData(1)
this.onClearSelected()
+ this.faultTime = []
this.$refs.FaultDescriptionList.faultId = '-1'
},
-
+ initOptions() {
+ getAction(this.url.loadOptions).then(res => {
+ if (res.success) {
+ this.treeData = res.result
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
+ timeChange(){
+ this.queryParam.faultStartTime = moment(this.faultTime[0]).format("YYYY-MM-DD HH:mm:ss")
+ this.queryParam.faultEndTime = moment(this.faultTime[1]).format("YYYY-MM-DD HH:mm:ss")
+ }
}
}
</script>
diff --git a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
index 47f9db1..99252ff 100644
--- a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
+++ b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
@@ -42,21 +42,18 @@
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="24/2">
- <a-form-item
- label="缁熶竴缂栫爜"
+ <a-col :span="12">
+ <a-form-model-item
+ label="鎶ヤ慨浜�"
+ prop="name"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <a-input-search
- :disabled="disableSubmit"
- placeholder="璇烽�夋嫨璁惧锛�"
- enter-button
- @search="onSearchEquipmentList()"
- :read-only="true"
- v-decorator="['equipmentNum', validatorRules.equipmentNum]"
- />
- </a-form-item>
+ <a-input
+ v-decorator="['errUda2', validatorRules.errUda2]"
+ placeholder="璇疯緭鍏ユ姤淇汉"
+ ></a-input>
+ </a-form-model-item>
</a-col>
<a-col :span="24/2">
<a-form-item
@@ -78,6 +75,22 @@
<a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
+ label="缁熶竴缂栧彿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input-search
+ :disabled="disableSubmit"
+ placeholder="璇烽�夋嫨璁惧锛�"
+ enter-button
+ @search="onSearchEquipmentList()"
+ :read-only="true"
+ v-decorator="['equipmentNum', validatorRules.equipmentNum]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24/2">
+ <a-form-item
label="璁惧鍚嶇О"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -90,6 +103,8 @@
/>
</a-form-item>
</a-col>
+ </a-row>
+ <a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
label="璁惧瑙勬牸"
@@ -104,6 +119,21 @@
/>
</a-form-item>
</a-col>
+ <a-col :span="24/2">
+ <a-form-item
+ label="璁惧鍨嬪彿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ :disabled="true"
+ enter-button
+ :read-only="true"
+ v-decorator="['equipmentModel', validatorRules.equipmentModel]"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
<a-row
hidden
:gutter="24"
@@ -116,7 +146,7 @@
>
<a-input
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栧彿/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
@@ -134,23 +164,8 @@
/>
</a-form-item>
</a-col>
- </a-row>
</a-row>
<a-row :gutter="24">
- <a-col :span="24/2">
- <a-form-item
- label="璁惧鍨嬪彿"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- :disabled="true"
- enter-button
- :read-only="true"
- v-decorator="['equipmentModel', validatorRules.equipmentModel]"
- />
- </a-form-item>
- </a-col>
<a-col :span="24/2">
<a-form-item
label="浣跨敤閮ㄩ棬"
@@ -364,6 +379,12 @@
{ required: true, message: '璇烽�夋嫨鏄惁鍦ㄥ姞宸ラ浂浠�!' },
]
},
+ errUda2: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ユ姤淇汉!' },
+ { min:1,max:10, message: '闀垮害涓嶈兘澶т簬10涓瓧绗�!' },
+ ]
+ },
partNumber:{
rules: [
{ required: true, message: '璇疯緭鍏ラ浂浠跺浘鍙�!' },
--
Gitblit v1.9.3