From 8aa1e035125b5ec9717e6e363a479a6532416507 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 09:05:53 +0800
Subject: [PATCH] 消息提醒
---
src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue | 35 +++++++++--
src/views/eam/Daily3MaintenanceOrderList.vue | 96 ++++++++++++++++++++++---------
src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue | 12 ++--
3 files changed, 103 insertions(+), 40 deletions(-)
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index 8e2d5d9..81fa62f 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -53,24 +53,24 @@
@click="handleAdd"
type="primary"
icon="plus"
- v-has="'dailyMaintenanceOrder:add'"
+ v-has="'daily3MaintenanceOrder:add'"
>鏂板</a-button>
<a-button
- v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintPrecision(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>绮惧害妫�楠屽崟鎵撳嵃
</a-button>
<a-button
- v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintCheck(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>楠屾敹鍗曟墦鍗�
</a-button>
<a-button
- v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintInfo(selectionRows[0])"
type="primary"
style="margin-left: 8px"
@@ -147,12 +147,12 @@
<a-popconfirm
title="纭畾鎺ユ敹宸ュ崟鍚�?"
@confirm="() => handleOrderIssue(record)"
- v-has="'dailyMaintenanceOrder:issue'"
+ v-has="'daily3MaintenanceOrder:issue'"
>
- <a v-if="record.status == '1'">鎺ユ敹</a>
+ <a v-show="record.status == '1'">鎺ユ敹</a>
</a-popconfirm>
<a-divider
- v-if="record.status == '1'"
+ v-show="record.status == '1'"
type="vertical"
/>
<!-- <a
@@ -166,12 +166,12 @@
<a-popconfirm
title="纭畾鎾ゅ洖宸ュ崟鍚�?"
@confirm="() => handleOrderReset(record)"
- v-has="'dailyMaintenanceOrder:issue'"
+ v-has="'daily3MaintenanceOrder:issue'"
>
- <a v-if="record.status == '2'">鎾ゅ洖</a>
+ <a v-show="record.status == '2'">鎾ゅ洖</a>
</a-popconfirm>
<a-divider
- v-if="record.status == '2'"
+ v-show="record.status == '2'"
type="vertical"
/>
<!-- <a-popconfirm
@@ -199,9 +199,9 @@
<a-popconfirm
title="纭畾棰嗗彇宸ュ崟鍚�?"
@confirm="() => handleOrderGet(record)"
- v-has="'dailyMaintenanceOrder:get'"
+ v-has="'daily3MaintenanceOrder:get'"
>
- <a v-if="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
+ <a v-show="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
</a-popconfirm>
<!-- <a
v-if="record.status == '2' && record.assignMode == '2' "
@@ -222,25 +222,25 @@
type="vertical"
/>-->
<a-divider
- v-if="record.status === '2'"
+ v-show="record.status === '2'"
type="vertical"
/>
<a
- v-if="record.status === '3' || record.status === '4' "
+ v-show="record.status === '3' || record.status === '4' "
@click="handleOrderExe(record)"
- v-has="'dailyMaintenanceOrder:exe'"
+ v-has="'daily3MaintenanceOrder:exe'"
>鎵ц</a>
<a-divider
v-if="record.status === '3' || record.status === '4' "
type="vertical"
/>
<a
- v-if="record.status === '1'"
+ v-show="record.status === '1'"
@click="handleEdit(record)"
- v-has="'dailyMaintenanceOrder:edit'"
+ v-has="'daily3MaintenanceOrder:edit'"
>缂栬緫</a>
<a-divider
- v-if="record.status === '1'"
+ v-show="record.status === '1'"
type="vertical"
/>
<!-- <a
@@ -251,36 +251,76 @@
v-if="record.status === '5'"
type="vertical"
/> -->
+ <!-- 绮惧害妫�楠岃�呮搷浣滅簿搴︽楠屽崟 -->
<a
- 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')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:precisionInspectionUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 缁翠慨瀹や富浠绘搷浣滅簿搴︽楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '1' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:repairDirectorUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 璁惧妫�楠屽憳鎿嶄綔绮惧害妫�楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '2' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:equipmentInspectorUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 浣跨敤鍗曚綅鎶�鏈富绠℃搷浣滅簿搴︽楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '3' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:useUnitDirectorUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 璁惧妫�楠屽憳绛惧瓧 鎿嶄綔绮惧害妫�楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '4')"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:equipmentInspectorSignUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 绮惧害妫�楠屽崟 鏌ョ湅 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '5')"
@click="handlePrecisionCheckOrder(record)"
>绮惧害妫�楠�</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-divider
- 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')"
+ v-show="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' "
type="vertical"
/>
<a
- v-if="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
@click="handleStoveDetection(record)"
+ v-has="'daily3MaintenanceOrder:StoveCategory'"
>鐐夌被妫�娴�</a>
<a-divider
- v-if="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
type="vertical"
/>
<a
- v-if="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '0'"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '0'"
@click="handleTechnologyStatus(record)"
+ v-has="'daily3MaintenanceOrder:TechnologyStatus'"
>鎶�鏈姸鎬侀壌瀹�</a>
<a-divider
- v-if="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '0' "
+ v-show="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '0' "
type="vertical"
/>
<a
- v-if="record.status === '5' "
+ v-show="record.status === '5' "
@click="handleMaintenance3Receipt(record)"
+ v-has="'daily3MaintenanceOrder:Receipt'"
>楠屾敹鍗�</a>
<a-divider
- v-if="record.status === '5' "
+ v-show="record.status === '5' "
type="vertical"
/>
<a-dropdown>
@@ -293,9 +333,9 @@
<a-popconfirm
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
- v-has="'dailyMaintenanceOrder:delete'"
+ v-has="'daily3MaintenanceOrder:delete'"
>
- <a v-if="record.status === '1'">鍒犻櫎</a>
+ <a v-show="record.status === '1'">鍒犻櫎</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
index 3636a4b..b08f403 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -17,21 +17,21 @@
@click="handleSW"
:disabled=SWbuttonDistable
type="primary"
- v-has="'dailyMaintenanceOrder:SW'"
+ v-has="'daily3MaintenanceOrder:SW'"
>寮�宸�</a-button>
<a-button
:style="{marginRight: '8px'}"
@click="handleReport"
:disabled="buttonDistable"
type="primary"
- v-has="'dailyMaintenanceOrder:report'"
+ v-has="'daily3MaintenanceOrder:report'"
>鎶ュ伐</a-button>
<a-button
:style="{marginRight: '8px'}"
@click="handleReset"
:disabled="revocationDistable"
type="primary"
- v-has="'dailyMaintenanceOrder:reset'"
+ v-has="'daily3MaintenanceOrder:reset'"
>鎾ら攢</a-button>
</a-row>
</div>
@@ -156,11 +156,11 @@
>
<div :key="col.dataIndex">
<span
- v-if=" col.dataIndex == 'photo' && !text"
+ v-show=" col.dataIndex == 'photo' && !text"
style="font-size: 12px;font-style: italic;"
>鏃犲浘鐗�</span>
<img
- v-if="col.dataIndex == 'photo' && text"
+ v-show="col.dataIndex == 'photo' && text"
:src="getImgView(text)"
:preview="record.maintenanceStandardDetailId"
height="25px"
@@ -194,7 +194,7 @@
<a-input
:value="text"
- v-if="col.dataIndex == 'maintenanceOrderDetailUda1'"
+ v-show="col.dataIndex == 'maintenanceOrderDetailUda1'"
@change="(e)=>handleChange(e, record.key, col, index)"
:disabled="record.disabled"
/>
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
index 9c2cf43..627783b 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
@@ -180,19 +180,30 @@
</a-col>
</a-row>
</div>
- <div :style="{height: '115px',float: 'left',width: '10%',border: '1px solid #e9e9e9',padding: '50px 20px',background: '#fff',}">
+ <div :style="{height: '175px',float: 'left',width: '10%',border: '1px solid #e9e9e9',padding: '50px 20px',background: '#fff',}">
<span
class="ant-descriptions-title"
style="font-size: large;font-style: normal;font-size: 15px;"
>闆朵欢鐘舵��</span>
</div>
- <div :style="{height: '115px',float: 'right',width: '90%',border: '1px solid #e9e9e9',padding: '10px 10px',background: '#fff',}">
+ <div :style="{height: '175px',float: 'right',width: '90%',border: '1px solid #e9e9e9',padding: '10px 10px',background: '#fff',}">
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item
+ :labelCol="{ span: 8 }"
+ :wrapperCol="{ span: 12 }"
+ label="妫�娴嬭皟璇曞悗璇曞姞宸ラ浂浠跺彿锛�"
+ >
+ <a-input v-model="model.sparePart" />
+ </a-form-item>
+ </a-col>
+ </a-row>
<a-row :gutter="24">
<a-col :span="12">
<a-form-item
:labelCol="{ span: 8 }"
:wrapperCol="{ span: 4 }"
- label="妫�娴嬭皟璇曞悗璇曞姞宸ラ浂浠跺彿锛�"
+ label="闆朵欢鍔犲伐锛�"
>
<a-switch
checked-children="鍚堟牸"
@@ -301,8 +312,9 @@
@click="handleOk()"
type="primary"
:loading="confirmLoading"
- :disabled="disableSubmit || confirmLoading"
+ :disabled="this.model.precisionInspectionStatus == '5'"
>纭畾</a-button>
+
</template>
</a-modal>
@@ -426,9 +438,19 @@
},
handleOk() {
-
+ // if (this.model.precisionInspectionStatus === '2') {
+ // if ((this.model.eachTolerance === "0" || this.model.eachTolerance === 0) && (this.model.partTolerance === "0" || this.model.partTolerance === 0)) {
+ // this.$message.warning("璇峰绮惧害鐘舵�佺粨鏋滃嬀閫夛紒");
+ // return
+ // }
+ // }
+ // if (this.model.precisionInspectionStatus === '3') {
+ // if ((this.model.processPass === "0" || this.model.processPass === 0) && (this.model.meetProcessRequire === "0" || this.model.meetProcessRequire === 0)) {
+ // this.$message.warning("璇峰闆朵欢鐘舵�佺粨鏋滃嬀閫夛紒");
+ // return
+ // }
+ // }
const that = this;
- // 瑙﹀彂琛ㄥ崟楠岃瘉
that.form.validateFields((err, values) => {
if (!err) {
this.$confirm({
@@ -508,6 +530,7 @@
onChangeJudgmentResult(e) {
this.model.judgmentResult = e.target.value
+ this.model = Object.assign({}, this.model);
},
handleChange(value, key, column, index) {
--
Gitblit v1.9.3