From 8ce3c069b4f308052f3458b8a9ad465435bf00f5 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 11:02:17 +0800
Subject: [PATCH] 二级保养标准 三级保养标准 通过类型区分
---
src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue | 58 ++++++++++++++++++----------
src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceStandard3List.vue | 6 +-
src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceStandardList.vue | 6 +-
src/views/eam/DailyMaintenanceStandardList.vue | 31 ++++++++++-----
4 files changed, 64 insertions(+), 37 deletions(-)
diff --git a/src/views/eam/DailyMaintenanceStandardList.vue b/src/views/eam/DailyMaintenanceStandardList.vue
index a200941..98ea2ac 100644
--- a/src/views/eam/DailyMaintenanceStandardList.vue
+++ b/src/views/eam/DailyMaintenanceStandardList.vue
@@ -102,8 +102,18 @@
icon='reload'
style='margin-left: 8px'
>閲嶇疆</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
+ <a-upload
+ name="file"
+ :showUploadList="false"
+ :multiple="false"
+ :headers="tokenHeader"
+ :action="importExcelUrl"
+ @change="handleImportExcel"
+ >
+ <a-button
+ type="primary"
+ icon="import"
+ >瀵煎叆</a-button>
</a-upload>
</div>
@@ -315,6 +325,11 @@
dataIndex: 'num',
},
{
+ title: '鏍囧噯绫诲瀷',
+ align: 'center',
+ dataIndex: 'maintenanceTypeName',
+ },
+ {
title: '绛惧鐘舵��',
align: 'center',
dataIndex: 'approvalStatusName',
@@ -339,11 +354,7 @@
align: 'center',
dataIndex: 'useDepartName',
},
- {
- title: '娲惧伐鏂瑰紡',
- align: 'center',
- dataIndex: 'assignModeName',
- },
+
{
title: '璐ｄ换鐝粍',
align: 'center',
@@ -461,9 +472,9 @@
}
},
computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
- }
+ importExcelUrl: function () {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ }
},
watch: {
selectionRows() {
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceStandard3List.vue b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceStandard3List.vue
index 002ce38..c25ff83 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceStandard3List.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceStandard3List.vue
@@ -151,17 +151,17 @@
},
methods: {
searchQuery() {
- this.queryParam = { type: "daily", delFlag: '0', useId: this.useId };
+ this.queryParam = { type: "daily", delFlag: '0', useId: this.useId, maintenanceType: '3' };
this.loadData(1);
},
searchReset() {
- this.queryParam = { type: "daily", delFlag: '0', useId: this.useId };
+ this.queryParam = { type: "daily", delFlag: '0', useId: this.useId, maintenanceType: '3' };
this.loadData(1)
},
list(useId) {
this.visible = true;
this.useId = useId;
- this.queryParam = { type: "daily", delFlag: '0', useId: useId, versionStatus: '2' };
+ this.queryParam = { type: "daily", delFlag: '0', useId: useId, versionStatus: '2', maintenanceType: '3' };
this.loadData(1);
},
clickThenCheck(record) {
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceStandardList.vue b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceStandardList.vue
index 5667dad..e31598a 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceStandardList.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceStandardList.vue
@@ -151,17 +151,17 @@
},
methods: {
searchQuery() {
- this.queryParam = { type: "daily", delFlag: '0', useId: this.useId };
+ this.queryParam = { type: "daily", delFlag: '0', useId: this.useId, maintenanceType: '2' };
this.loadData(1);
},
searchReset() {
- this.queryParam = { type: "daily", delFlag: '0', useId: this.useId };
+ this.queryParam = { type: "daily", delFlag: '0', useId: this.useId, maintenanceType: '2' };
this.loadData(1)
},
list(useId) {
this.visible = true;
this.useId = useId;
- this.queryParam = { type: "daily", delFlag: '0', useId: useId, versionStatus: '2' };
+ this.queryParam = { type: "daily", delFlag: '0', useId: useId, versionStatus: '2', maintenanceType: '2' };
this.loadData(1);
},
clickThenCheck(record) {
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
index 117a24a..d881f08 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
@@ -160,6 +160,22 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item
+ label="淇濆吇绫诲瀷"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="disableSubmit"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨淇濆吇绫诲瀷'"
+ :triggerChange="true"
+ dictCode="maintenance_type"
+ v-decorator="['maintenanceType', validatorRules.maintenanceType]"
+ />
+ </a-form-item>
+ </a-col>
+ <!-- <a-col :span="12">
+ <a-form-item
label="娲惧伐鏂瑰紡"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -173,7 +189,7 @@
v-decorator="['assignMode', validatorRules.assignMode]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="12">
<a-form-item
label="鐗堟湰"
@@ -281,14 +297,14 @@
>
<div :key="col.dataIndex">
- <a-select
+ <!-- <a-select
v-if="col.dataIndex == 'maintenanceCycleId'"
:value="text"
:options="record.maintenanceCycles"
@change="(e) => handleChange(e, record.key, col, index)"
style="width: 100%"
:disabled="false"
- />
+ /> -->
<a-textarea
:value="text"
v-if="col.dataIndex == 'maintenanceRequire'"
@@ -475,13 +491,13 @@
// scopedSlots: { customRender: 'location' },
// width: 150,
},
- {
- title: '鍛ㄦ湡',
- align: 'center',
- dataIndex: 'maintenanceCycleId',
- scopedSlots: { customRender: 'maintenanceCycleId' },
- width: 150,
- },
+ // {
+ // title: '鍛ㄦ湡',
+ // align: 'center',
+ // dataIndex: 'maintenanceCycleId',
+ // scopedSlots: { customRender: 'maintenanceCycleId' },
+ // width: 150,
+ // },
{
title: '淇濆吇瑙掕壊',
align: 'center',
@@ -539,9 +555,9 @@
{ required: true, message: '璇烽�夋嫨璁惧!' },
]
},
- assignMode: {
+ maintenanceType: {
rules: [
- { required: true, message: '璇烽�夋嫨娲惧伐鏂瑰紡!' },
+ { required: true, message: '璇烽�夋嫨淇濆吇绫诲瀷!' },
]
},
version: {
@@ -590,7 +606,7 @@
maintenanceRequire: data[i].maintenanceRequire,
workingHourQuota: data[i].workingHourQuota,
// upload: this.upload,
- maintenanceCycles: this.maintenanceCycles,
+ // maintenanceCycles: this.maintenanceCycles,
})
// let formData = {};
@@ -650,11 +666,11 @@
that.dataSource = temp;
}
that.$nextTick(() => {
- that.form.setFieldsValue(pick(that.model, 'num', 'departId', 'teamId', 'equipmentId', 'equipmentName', 'useDepartName', 'useId', 'teamName', 'assignMode', 'version', 'remark'));
+ that.form.setFieldsValue(pick(that.model, 'num', 'departId', 'teamId', 'equipmentId', 'equipmentName', 'useDepartName', 'useId', 'maintenanceType', 'teamName', 'version', 'remark'));
});
if (record.id) {
- this.maintenanceCycles = []
- this.getMaintenanceCycle(this.model.equipmentId)
+ // this.maintenanceCycles = []
+ // this.getMaintenanceCycle(this.model.equipmentId)
this.codeDisable = true;
that.$nextTick(() => {
if (that.isRevise) {
@@ -693,17 +709,17 @@
onEquipmentList() {
let data = this.form.getFieldsValue(['departId']);
- if (data.departId == null || data.departId == "") {
- this.$message.warning("璇峰厛閫夋嫨浣跨敤閮ㄩ棬锛�");
- return
- }
+ // if (data.departId == null || data.departId == "") {
+ // this.$message.warning("璇峰厛閫夋嫨浣跨敤閮ㄩ棬锛�");
+ // return
+ // }
this.$refs.EquipmentList.list(data.departId);
this.$refs.EquipmentList.title = "閫夋嫨璁惧淇℃伅";
},
sendEquipmentRecord(data) {
this.dataSource = [];
let record = data.record;
- this.getMaintenanceCycle(record.id)
+ // this.getMaintenanceCycle(record.id)
this.form.setFieldsValue({ equipmentId: record.id, equipmentName: record.num + "/" + record.name + "/" + record.model, teamId: record.teamId, teamName: record.teamId_dictText });
},
--
Gitblit v1.9.3