From 25fee48ceca7a54bc6008eb2e2fb6d8ea801a50e Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 30 五月 2025 09:50:03 +0800
Subject: [PATCH] 前端修改
---
src/views/eam/QuanlityConfirmList.vue | 2
src/views/eam/modules/maintenancePlan/StandardSelect.vue | 63 ++++++++-------
src/views/eam/RepairOrderList.vue | 6 +
src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanModal.vue | 87 +++++++++++----------
src/views/eam/modules/inspectionProject/InspectionProjectRight.vue | 2
src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue | 21 +++--
src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue | 18 ++--
src/views/eam/MaintenanceCycleList.vue | 10 +-
src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue | 2
9 files changed, 114 insertions(+), 97 deletions(-)
diff --git a/src/views/eam/MaintenanceCycleList.vue b/src/views/eam/MaintenanceCycleList.vue
index 02a1e8d..e286883 100644
--- a/src/views/eam/MaintenanceCycleList.vue
+++ b/src/views/eam/MaintenanceCycleList.vue
@@ -197,11 +197,11 @@
align: 'center',
dataIndex: 'code',
},
- // {
- // title: '鍛ㄦ湡鍚嶇О',
- // align: 'center',
- // dataIndex: 'name',
- // },
+ {
+ title: '鍛ㄦ湡绫诲瀷',
+ align: 'center',
+ dataIndex: 'maintenanceTypeName',
+ },
{
title: '鍛ㄦ湡',
align: 'center',
diff --git a/src/views/eam/QuanlityConfirmList.vue b/src/views/eam/QuanlityConfirmList.vue
index fbf88cf..e8d3e56 100644
--- a/src/views/eam/QuanlityConfirmList.vue
+++ b/src/views/eam/QuanlityConfirmList.vue
@@ -297,7 +297,7 @@
{
title: '浜у搧鎹熷け鎯呭喌',
align: "center",
- dataIndex: 'condition',
+ dataIndex: 'condition_dictText',
width: 100
},
{
diff --git a/src/views/eam/RepairOrderList.vue b/src/views/eam/RepairOrderList.vue
index de9322e..ffcae34 100644
--- a/src/views/eam/RepairOrderList.vue
+++ b/src/views/eam/RepairOrderList.vue
@@ -1056,6 +1056,12 @@
this.$refs.repairOrderExcuteDrawer.visible = true
this.$refs.repairOrderExcuteDrawer.title = '缁翠慨宸ュ崟鎵ц'
},
+ handleDetail(record) {
+ this.excuteRepairOrder = record;
+ this.excuteRepairOrder.status = '4';
+ this.$refs.repairOrderExcuteDrawer.visible = true
+ this.$refs.repairOrderExcuteDrawer.title = '缁翠慨璇︽儏'
+ },
searchQuery() {
this.loadData(1)
diff --git a/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue b/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue
index 1c4d6cc..6cf2c99 100644
--- a/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue
+++ b/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue
@@ -264,31 +264,31 @@
{ required: true, message: '璇疯緭鍏ュ懆鏈熷崟浣�!' },
],
firstInspectionTime: [
- { required: true, message: '璇烽�夋嫨棣栨鐐规鏃堕棿!' },
+ { required: false, message: '璇烽�夋嫨棣栨鐐规鏃堕棿!' },
],
leadTime: [
- { required: true, message: '璇疯緭鍏ユ彁鍓嶆椂闂�!' },
+ { required: false, message: '璇疯緭鍏ユ彁鍓嶆椂闂�!' },
],
effectiveTime: [
- { required: true, message: '璇疯緭鍏ユ湁鏁堟椂闂�!' },
+ { required: false, message: '璇疯緭鍏ユ湁鏁堟椂闂�!' },
],
unit: [
- { required: true, message: '璇烽�夋嫨鏃堕棿鍗曚綅!' },
+ { required: false, message: '璇烽�夋嫨鏃堕棿鍗曚綅!' },
],
arrangeWay: [
- { required: true, message: '璇烽�夋嫨璋冩暣鏂瑰紡!' },
+ { required: false, message: '璇烽�夋嫨璋冩暣鏂瑰紡!' },
],
startCondition: [
- { required: true, message: '璇烽�夋嫨寮�宸ユ潯浠�!' },
+ { required: false, message: '璇烽�夋嫨寮�宸ユ潯浠�!' },
],
version: [
- { required: true, message: '璇疯緭鍏ョ増鏈彿!' },
+ { required: false, message: '璇疯緭鍏ョ増鏈彿!' },
],
overdueDisposeMode: [
- { required: true, message: '璇烽�夋嫨閫炬湡澶勭悊鏂瑰紡!' },
+ { required: false, message: '璇烽�夋嫨閫炬湡澶勭悊鏂瑰紡!' },
],
accordingCalendar: [
- { required: true, message: '璇烽�夋嫨渚濇嵁鏃ュ巻!' },
+ { required: false, message: '璇烽�夋嫨渚濇嵁鏃ュ巻!' },
],
},
url: {
diff --git a/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
index c72aba8..3eb4992 100644
--- a/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
+++ b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
@@ -54,8 +54,8 @@
@click="handleAdd"
type="primary"
icon="plus"
- :hidden="disabled"
>鏂板</a-button>
+ <!-- :hidden="disabled" -->
<a-upload
name="file"
:showUploadList="false"
diff --git a/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue b/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
index 60a5860..b50f3ca 100644
--- a/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
+++ b/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
@@ -205,6 +205,7 @@
label="淇濆吇绫诲瀷"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
+ prop="maintenanceType"
>
<j-dict-select-tag
allow-clear
@@ -290,29 +291,33 @@
cycleUnit: [
{ required: true, message: '璇疯緭鍏ュ懆鏈熷崟浣�!' },
],
+ maintenanceType: [
+ { required: true, message: '璇烽�夋嫨淇濆吇绫诲瀷!' },
+ ],
+
firstMaintenanceTime: [
- { required: true, message: '璇烽�夋嫨棣栨淇濆吇鏃堕棿!' },
+ { required: false, message: '璇烽�夋嫨棣栨淇濆吇鏃堕棿!' },
],
leadTime: [
- { required: true, message: '璇疯緭鍏ユ彁鍓嶆椂闂�!' },
+ { required: false, message: '璇疯緭鍏ユ彁鍓嶆椂闂�!' },
],
effectiveTime: [
- { required: true, message: '璇疯緭鍏ユ湁鏁堟椂闂�!' },
+ { required: false, message: '璇疯緭鍏ユ湁鏁堟椂闂�!' },
],
unit: [
- { required: true, message: '璇烽�夋嫨鏃堕棿鍗曚綅!' },
+ { required: false, message: '璇烽�夋嫨鏃堕棿鍗曚綅!' },
],
arrangeWay: [
- { required: true, message: '璇烽�夋嫨璋冩暣鏂瑰紡!' },
+ { required: false, message: '璇烽�夋嫨璋冩暣鏂瑰紡!' },
],
version: [
- { required: true, message: '璇疯緭鍏ョ増鏈彿!' },
+ { required: false, message: '璇疯緭鍏ョ増鏈彿!' },
],
overdueDisposeMode: [
- { required: true, message: '璇烽�夋嫨閫炬湡澶勭悊鏂瑰紡!' },
+ { required: false, message: '璇烽�夋嫨閫炬湡澶勭悊鏂瑰紡!' },
],
accordingCalendar: [
- { required: true, message: '璇烽�夋嫨渚濇嵁鏃ュ巻!' },
+ { required: false, message: '璇烽�夋嫨渚濇嵁鏃ュ巻!' },
],
},
url: {
diff --git a/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanModal.vue b/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanModal.vue
index bb240ac..8c96797 100644
--- a/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanModal.vue
+++ b/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanModal.vue
@@ -7,57 +7,62 @@
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
- @cancel="handleCancel">
- <equipment-maintenance-plan-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
+ @cancel="handleCancel"
+ >
+ <equipment-maintenance-plan-form
+ ref="realForm"
+ @ok="submitCallback"
+ :disabled="disableSubmit"
+ />
</j-modal>
</template>
<script>
- import EquipmentMaintenancePlanForm from './EquipmentMaintenancePlanForm'
+import EquipmentMaintenancePlanForm from './EquipmentMaintenancePlanForm'
- export default {
- name: 'EquipmentMaintenancePlanModal',
- components: {
- EquipmentMaintenancePlanForm
+export default {
+ name: 'EquipmentMaintenancePlanModal',
+ components: {
+ EquipmentMaintenancePlanForm
+ },
+ data() {
+ return {
+ title: '',
+ width: 800,
+ visible: false,
+ disableSubmit: false
+ }
+ },
+ methods: {
+ add() {
+ this.visible = true
+ this.$nextTick(() => {
+ this.$refs.realForm.add();
+ })
},
- data() {
- return {
- title:'',
- width:800,
- visible: false,
- disableSubmit: false
- }
+ edit(record) {
+ this.visible = true
+ this.$nextTick(() => {
+ this.$refs.realForm.edit(record);
+ })
},
- methods:{
- add () {
- this.visible=true
- this.$nextTick(()=>{
- this.$refs.realForm.add();
- })
- },
- edit (record) {
- this.visible=true
- this.$nextTick(()=>{
- this.$refs.realForm.edit(record);
- })
- },
- close () {
- this.$emit('close');
- this.visible = false;
- },
- handleOk () {
- this.$refs.realForm.handleOk();
- },
- submitCallback(){
- this.$emit('ok');
- this.visible = false;
- },
- handleCancel () {
- this.close()
- }
+ close() {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk() {
+ this.$refs.realForm.handleOk();
+ },
+ submitCallback() {
+ this.$emit('ok');
+ this.visible = false;
+ },
+ handleCancel() {
+ this.close()
}
}
+}
</script>
<style scoped>
diff --git a/src/views/eam/modules/maintenancePlan/StandardSelect.vue b/src/views/eam/modules/maintenancePlan/StandardSelect.vue
index 59a841e..f97147c 100644
--- a/src/views/eam/modules/maintenancePlan/StandardSelect.vue
+++ b/src/views/eam/modules/maintenancePlan/StandardSelect.vue
@@ -8,7 +8,7 @@
@cancel="close"
style="top:50px"
cancelText="鍏抽棴"
- :width="2000"
+ :width="1600"
>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
@@ -39,38 +39,39 @@
/>
</a-form-item>
</a-col>
- <!-- 鎸変腑蹇冩煡璇� -->
+ <!-- 鎸変腑蹇冩煡璇� -->
<a-col
:md="6"
- :sm="6" >
+ :sm="6"
+ >
<a-form-item label="涓績">
<j-dict-select-tag
- allow-clear
- placeholder="璇烽�夋嫨涓績"
- :triggerChange="true"
- dictCode="mom_base_area,name,id,del_flag!='1' and type='1'"
- v-model="queryParam.workCenterId"
- />
+ allow-clear
+ placeholder="璇烽�夋嫨涓績"
+ :triggerChange="true"
+ dictCode="mom_base_area,name,id,del_flag!='1' and type='1'"
+ v-model="queryParam.workCenterId"
+ />
</a-form-item>
- </a-col>
+ </a-col>
<a-col
:md="6"
- :sm="6">
- <a-form-model-item
- label="涓嬫涓変繚鏃堕棿"
- prop="ranges"
+ :sm="6"
>
+ <a-form-model-item
+ label="涓嬫涓変繚鏃堕棿"
+ prop="ranges"
+ >
<a-range-picker
- v-model="ranges"
- style="width:100%"
- format="YYYY-MM-DD HH:mm:ss"
- showTime
- :placeholder="[ '寮�濮嬫椂闂�', '缁撴潫鏃堕棿']"
- @change="changeDate"
+ v-model="ranges"
+ style="width:100%"
+ format="YYYY-MM-DD HH:mm:ss"
+ showTime
+ :placeholder="[ '寮�濮嬫椂闂�', '缁撴潫鏃堕棿']"
+ @change="changeDate"
/>
</a-form-model-item>
</a-col>
-
<a-col :md="3">
<span
@@ -147,31 +148,31 @@
title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
- width: 200
+ // width: 200
},
{
title: '璁惧鍚嶇О',
align: 'center',
dataIndex: 'name',
- width: 200
+ // width: 200
},
{
title: '璁惧鍨嬪彿',
align: 'center',
dataIndex: 'model',
- width: 200
+ // width: 200
},
{
title: '璁惧瑙勬牸',
align: 'center',
dataIndex: 'specification',
- width: 200
+ // width: 200
},
{
title: 'ABC鏍囪瘑',
align: "center",
dataIndex: 'equipmentImportanceId',
- width: 100
+ // width: 100
},
{
title: '鍏抽敭璁惧鏍囪瘑',
@@ -182,28 +183,28 @@
{
title: '璁惧鐘舵��',
align: 'center',
- dataIndex: 'equipmentStatus_dictText',
- width: 100
+ // dataIndex: 'equipmentStatus_dictText',
+ // width: 100
},
{
title: '鎶�鏈姸鎬�',
align: 'center',
dataIndex: 'technologyStatus_dictText',
- width: 100
+ // width: 100
},
//涓嬫涓変繚鏃堕棿
{
title: '涓嬫涓変繚鏃堕棿',
align: 'center',
dataIndex: 'nextThirdMaintenanceTime',
- width: 200
+ // width: 200
},
//涓績
{
title: '涓績',
align: 'center',
dataIndex: 'workCenterId_dictText',
- width: 200
+ // width: 200
},
],
selectedRowKeys: [],
diff --git a/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue b/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue
index dfa22b7..0f0be57 100644
--- a/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue
+++ b/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue
@@ -54,8 +54,8 @@
@click="handleAdd"
type="primary"
icon="plus"
- :hidden="disabled"
>鏂板</a-button>
+ <!-- :hidden="disabled" -->
<a-button
type="primary"
icon="download"
--
Gitblit v1.9.3