From 2bd54f454ea035ebc10e4d5bf4e50169c3929c5c Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 15 五月 2025 17:49:58 +0800
Subject: [PATCH] 二保、三保流程审批、数据回显修改
---
src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue | 13 +++++-
src/views/eam/EquipmentMaintenancePlanList.vue | 32 ++++++++--------
src/views/eam/Daily3MaintenanceOrderList.vue | 20 +++++-----
src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue | 2 +
src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue | 10 +++++
5 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index 2c112ee..81f6e4e 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -298,44 +298,44 @@
<!-- 绮惧害妫�楠岃�呮搷浣滅簿搴︽楠屽崟 -->
<a
v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' )"
- @click="handlePrecisionCheckOrder(record)"
+ @click="handlePrecisionCheckOrder(record,'0')"
v-has="'daily3MaintenanceOrder:precisionInspectionUser'"
>绮惧害妫�楠�</a>
<!-- 缁翠慨瀹や富浠绘搷浣滅簿搴︽楠屽崟 -->
<a
v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '1' )"
- @click="handlePrecisionCheckOrder(record)"
+ @click="handlePrecisionCheckOrder(record,'1')"
v-has="'daily3MaintenanceOrder:repairDirectorUser'"
>绮惧害妫�楠�</a>
<!-- 璁惧妫�楠屽憳鎿嶄綔绮惧害妫�楠屽崟 -->
<a
v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '2' )"
- @click="handlePrecisionCheckOrder(record)"
+ @click="handlePrecisionCheckOrder(record,'2')"
v-has="'daily3MaintenanceOrder:equipmentInspectorUser'"
>绮惧害妫�楠�</a>
<!-- 浣跨敤鍗曚綅鎶�鏈富绠℃搷浣滅簿搴︽楠屽崟 -->
<a
v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '3' )"
- @click="handlePrecisionCheckOrder(record)"
+ @click="handlePrecisionCheckOrder(record,'3')"
v-has="'daily3MaintenanceOrder:useUnitDirectorUser'"
>绮惧害妫�楠�</a>
<!-- 璁惧妫�楠屽憳绛惧瓧 鎿嶄綔绮惧害妫�楠屽崟 -->
<a
v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '4')"
- @click="handlePrecisionCheckOrder(record)"
+ @click="handlePrecisionCheckOrder(record,'4')"
v-has="'daily3MaintenanceOrder:equipmentInspectorSignUser'"
>绮惧害妫�楠�</a>
<!-- 绮惧害妫�楠屽崟 鏌ョ湅 -->
<a
- v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '5')"
+ v-if="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus != '0' && record.precisionInspectionStatus != '1' && record.precisionInspectionStatus != '2' && record.precisionInspectionStatus != '3' && record.precisionInspectionStatus != '4' )"
@click="handlePrecisionCheckOrder(record)"
- >绮惧害妫�楠�</a>
+ >绮惧害妫�楠屾煡鐪�</a>
<!--绠＄悊鍛樻搷浣滅簿搴︽楠屽崟 -->
<a
v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' ||record.precisionInspectionStatus == '1' ||record.precisionInspectionStatus == '2' ||record.precisionInspectionStatus == '3' ||record.precisionInspectionStatus == '4' )"
@click="handlePrecisionCheckOrder(record)"
v-has="'daily3MaintenanceOrder:admin'"
- >绮惧害妫�楠�</a>
+ >绮惧害妫�楠屾煡鐪�</a>
<a-divider
v-show="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' "
type="vertical"
@@ -754,8 +754,8 @@
this.$refs.FinishDevolutionModal.disableSubmit = false;
},
- handlePrecisionCheckOrder: function (record) {
- this.$refs.EquipmentPrecisionCheckOrderModal.edit(record);
+ handlePrecisionCheckOrder: function (record, statusFlag) {
+ this.$refs.EquipmentPrecisionCheckOrderModal.edit(record, statusFlag);
this.$refs.EquipmentPrecisionCheckOrderModal.title = "鐢熶骇璁惧绮惧害妫�楠屽崟";
this.$refs.EquipmentPrecisionCheckOrderModal.disableSubmit = false;
},
diff --git a/src/views/eam/EquipmentMaintenancePlanList.vue b/src/views/eam/EquipmentMaintenancePlanList.vue
index 63d907a..456f04d 100644
--- a/src/views/eam/EquipmentMaintenancePlanList.vue
+++ b/src/views/eam/EquipmentMaintenancePlanList.vue
@@ -23,12 +23,13 @@
></j-input>
</a-form-item>
</a-col>
- <!-- 鎸夊垱寤烘椂闂磋寖鍥存绱� -->
+ <!-- 鎸夊垱寤烘椂闂磋寖鍥存绱� -->
<a-col
:xl="6"
:lg="7"
:md="8"
- :sm="24">
+ :sm="24"
+ >
<a-form-item label="鍒涘缓鏃堕棿">
<a-range-picker
v-model="ranges"
@@ -54,7 +55,6 @@
/>
</a-form-item>
</a-col>
-
<a-col
:xl="6"
@@ -172,75 +172,75 @@
>
<a
@click="handleEdit(record)"
- v-if="record.status==='created'||record.status==='rejected'"
+ v-show="record.status==='created'||record.status==='rejected'"
v-has="'MaintenancePlan:add&edit&submit'"
>缂栬緫</a>
<a-divider
type="vertical"
- v-if="record.status==='created'||record.status==='rejected'"
+ v-show="record.status==='created'||record.status==='rejected'"
/>
<a-popconfirm
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
- v-if="record.status==='created'||record.status==='rejected'"
+ v-show="record.status==='created'||record.status==='rejected'"
v-has="'MaintenancePlan:add&edit&submit'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
<a-divider
type="vertical"
- v-if="record.status==='created'||record.status==='rejected'"
+ v-show="record.status==='created'||record.status==='rejected'"
v-has="'MaintenancePlan:add&edit&submit'"
/>
<a-popconfirm
title="鎻愪氦鍚庝笉鍙挙鍥烇紝纭畾鎻愪氦鍚�?"
@confirm="() => handleSubmit(record)"
- v-if="record.status==='created'||record.status==='rejected'"
+ v-show="record.status==='created'||record.status==='rejected'"
v-has="'MaintenancePlan:add&edit&submit'"
>
<a>鎻愪氦</a>
</a-popconfirm>
<a-divider
type="vertical"
- v-if="record.status==='created'||record.status==='rejected'"
+ v-show="record.status==='created'||record.status==='rejected'"
v-has="'MaintenancePlan:add&edit&submit'"
/>
<a-popconfirm
title="閫氳繃鍚庝笉鍙挙閿�锛岀‘瀹氶�氳繃鍚�?"
@confirm="() => handleAudit(record)"
- v-if="record.status==='submitted'"
+ v-show="record.status==='submitted'"
v-has="'MaintenancePlan:audit&reject'"
>
<a>閫氳繃</a>
</a-popconfirm>
<a-divider
type="vertical"
- v-if="record.status==='submitted'"
+ v-show="record.status==='submitted'"
v-has="'MaintenancePlan:audit&reject'"
/>
<a-popconfirm
title="纭畾椹冲洖鍚�?"
@confirm="() => handleReject(record)"
- v-if="record.status==='submitted'"
+ v-show="record.status==='submitted'"
v-has="'MaintenancePlan:audit&reject'"
>
<a>椹冲洖</a>
</a-popconfirm>
<a-divider
type="vertical"
- v-if="record.status==='submitted'"
+ v-show="record.status==='submitted'"
v-has="'MaintenancePlan:audit&reject'"
/>
<a-popconfirm
title="涓嬪彂鍚庝笉鍙挙閿�锛岀‘瀹氫笅鍙戝悧?"
@confirm="() => handleDistrbute(record)"
- v-if="record.status==='passed'"
+ v-show="record.status==='passed'"
v-has="'MaintenancePlan:distribute'"
>
<a>涓嬪彂</a>
</a-popconfirm>
<span
- v-if="record.status==='distributed'"
+ v-show="record.status==='distributed'"
style="font-size: 12px;font-style: italic;"
>宸茬敓鎴愬伐鍗�</span>
</span>
@@ -286,7 +286,7 @@
data() {
return {
description: '淇濆吇璁″垝绠＄悊椤甸潰',
- ranges:[],
+ ranges: [],
// 琛ㄥご
columns: [
{
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
index ce593e7..95918e3 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -305,6 +305,7 @@
<a-tab-pane
tab='鐐夌被鎶ュ憡'
key="7"
+ v-if="this.model.isNotStoveCategoryFlag"
>
<div
class="table-operator"
@@ -512,6 +513,7 @@
methods: {
handleShow(record) {
+ debugger
this.model = Object.assign({}, record);
this.maintenanceStandardId = record.maintenanceStandardId
this.maintenanceOrderId = record.id
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
index 967fa43..2e19c85 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
@@ -343,8 +343,14 @@
@click="handleOk()"
type="primary"
:loading="confirmLoading"
- :disabled="this.model.precisionInspectionStatus == '5'"
+ :disabled="this.model.precisionInspectionStatus == '5' || this.model.statusFlag !== this.model.precisionInspectionStatus"
>纭畾</a-button>
+ <!-- <a-button
+ @click="handleOk()"
+ type="primary"
+ :loading="confirmLoading"
+ :disabled="this.model.precisionInspectionStatus == '5'"
+ >纭畾</a-button> -->
</template>
</a-modal>
@@ -438,7 +444,7 @@
methods: {
- edit(record) {
+ edit(record, statusFlag) {
let that = this;
if (record.receipts2 == "" || record.receipts2 == null) {
this.getSysFileName()
@@ -450,6 +456,9 @@
// record.meetProcessRequire = '0'
// record.judgmentResult = ""
this.model = Object.assign({}, record);
+ // alert("1" + statusFlag)
+ // alert("2" + record.precisionInspectionStatus)
+ this.model.statusFlag = statusFlag;
this.getPrecisionInspection()
// this.getEquipmentPrecision()
this.visible = true;
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
index 3c8955e..f271672 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -134,6 +134,7 @@
allow-clear
placeholder="璇疯緭鍏ヤ繚鍏讳汉"
v-model="model.maintenanceUserId"
+ @change="handleMaintenancePerson"
/>
</a-form-item>
</a-col>
@@ -731,6 +732,15 @@
})
},
+ //淇濆吇浜哄洖鏄総able
+ handleMaintenancePerson() {
+ const that = this;
+ for (let i = 0; i < that.dataSource.length; i++) {
+ let o = this.dataSource[i]
+ o.maintenanceOrderDetailUda1 = this.model.maintenanceUserId
+ }
+ },
+
handleChange(value, key, column, index) {
let that = this;
--
Gitblit v1.9.3