From e5ea7094423b4d48c080c9f5d135e0e29a8a8a68 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 29 十二月 2023 14:59:02 +0800
Subject: [PATCH] 修改提交
---
src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue | 68 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
index ec52559..be1208e 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,8 +194,9 @@
<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"
/>
</div>
</template>
@@ -285,6 +286,17 @@
></actual-work-hours-edit-table>
</div>
</a-tab-pane>
+ <a-tab-pane
+ tab='鐐夌被鎶ュ憡'
+ key="7"
+ >
+ <div
+ class="table-operator"
+ style="margin:-16px"
+ >
+ <stove-category-report-list :maintenanceStandardId='this.model.id' />
+ </div>
+ </a-tab-pane>
</a-tabs>
</a-card>
</template>
@@ -332,6 +344,7 @@
import MaintenanceStandardWorkInstruction from '../dailyMaintenanceOrder/MaintenanceStandardWorkInstruction'
import ActualMaterialEditTable from '../dailyMaintenanceOrder/ActualMaterialEditTable.vue'
import ActualWorkHoursEditTable from '../dailyMaintenanceOrder/ActualWorkHoursEditTable.vue'
+import StoveCategoryReportList from './StoveCategoryReportList.vue'
export default {
name: 'DailyMaintenanceOrderExeDrawer',
@@ -344,7 +357,8 @@
MaintenanceStandardSafetyRequirement,
MaintenanceStandardWorkInstruction,
ActualMaterialEditTable,
- ActualWorkHoursEditTable
+ ActualWorkHoursEditTable,
+ StoveCategoryReportList
},
data() {
return {
@@ -358,6 +372,7 @@
revocationDistable: false,
currentNodeSelect: '',
maintenanceStandardId: '-1',
+ maintenanceOrderId: '-1',
loading: false,
dataSource: [],
model: {},
@@ -369,6 +384,18 @@
wrapperCol: {
xs: { span: 24 },
sm: { span: 18 },
+ },
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination: {
+ current: 1,
+ pageSize: 99,
+ pageSizeOptions: ['99'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
},
validatorRules: {
// description: {
@@ -395,12 +422,12 @@
dataIndex: 'location',
},
// class: "notshow"
- {
- title: '绀烘剰鍥�',
- align: 'center',
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' },
- },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: 'center',
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' },
+ // },
// class: "notshow"
{
title: '淇濆吇椤圭洰',
@@ -472,6 +499,7 @@
handleShow(record) {
this.model = Object.assign({}, record);
this.maintenanceStandardId = record.maintenanceStandardId
+ this.maintenanceOrderId = record.id
this.dataSource = []
this.visible = true;
this.queryParam.dailyMaintenanceOrderId = record.id
@@ -497,11 +525,11 @@
// }
//update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
this.dataSource = res.result.records || res.result;
- if (res.result.total) {
- this.ipagination.total = res.result.total;
- } else {
- this.ipagination.total = 0;
- }
+ // if (res.result.total) {
+ // this.ipagination.total = res.result.total;
+ // } else {
+ // this.ipagination.total = 0;
+ // }
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
} else {
this.$message.warning(res.message)
@@ -521,6 +549,8 @@
return "background-color:rgba(127, 127, 127,0.08)";
},
handleCancel() {
+ debugger
+ this.maintenanceOrderId = '-1'
this.$emit('ok');
this.alterFlag = new Date();
this.close()
@@ -544,6 +574,7 @@
onOk() {
requestPut(that.url.editStatus, { id: that.model.id, status: '4' }).then((res) => {
if (res.success) {
+ that.loadData1(1)
that.model.status = '4'
that.$message.success("宸ュ崟寮�宸ユ垚鍔燂紒")
that.buttonDistable = false
@@ -606,6 +637,7 @@
that.buttonDistable = false
that.revocationDistable = true
that.SWbuttonDistable = true
+ that.loadData1(1)
} else {
that.$message.warning(res.message)
}
--
Gitblit v1.9.3