From f59e0c2622ef47db0f684a7024a3ce1103fafe18 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期一, 09 三月 2026 16:48:36 +0800
Subject: [PATCH] 1.递交
---
src/views/deviceManager/deviceList.vue | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 210 insertions(+), 4 deletions(-)
diff --git a/src/views/deviceManager/deviceList.vue b/src/views/deviceManager/deviceList.vue
index 92f6245..501a767 100644
--- a/src/views/deviceManager/deviceList.vue
+++ b/src/views/deviceManager/deviceList.vue
@@ -232,11 +232,20 @@
<el-table-column
label="鎿嶄綔"
- width="120"
+ width="150"
fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="灞ュ巻" placement="top">
+ <i
+ class="el-icon-view"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;margin-right: 15px"
+ @click="view2(row)"
+ />
+ </el-tooltip>
+
<el-tooltip v-del-tab-index class="item" effect="dark" content="SOP棰勮" placement="top">
<i
v-if="mesSetting.device"
@@ -439,13 +448,153 @@
</span>
</el-dialog>
+ <!-- 灞ュ巻-->
+ <el-dialog
+ v-el-drag-dialog
+ title="灞ュ巻鏌ョ湅"
+ :visible.sync="dialogVisibleResume"
+ width="1000px"
+ :close-on-click-modal="false"
+ top="7vh"
+ class="dialogFormClass"
+ @closed="handleCloseResume"
+ >
+ <div style="display: flex;justify-content: center;font-size: 18px;font-weight: bolder">璁惧鍦ㄧ嚎淇℃伅鏌ヨ</div>
+ <el-descriptions class="margin-top" title=" " :column="3" size="size" border>
+ <!-- <template slot="extra">-->
+ <!-- <el-button type="primary" size="small">鎿嶄綔</el-button>-->
+ <!-- </template>-->
+ <el-descriptions-item>
+ <template slot="label">
+ 璁惧缂栫爜
+ </template>
+ {{ formResume.mouldcode }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 璁惧鍚嶇О
+ </template>
+ {{ formResume.mouldname }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 璁惧绫诲瀷
+ </template>
+ {{ formResume.mouldspec||'/' }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 璁惧鐘舵��
+ </template>
+ <el-tag v-if="formResume.status==='Y'" size="small" type="success">姝ｅ父</el-tag>
+ <el-tag v-if="formResume.status==='N'" size="small" type="danger">鍋滅敤</el-tag>
+ </el-descriptions-item>
+ <!-- <el-descriptions-item>-->
+ <!-- <template slot="label">-->
+ <!-- 浣跨敤鐘舵��-->
+ <!-- </template>-->
+ <!-- <!– {{ formResume.usestatus }}–>-->
+ <!-- {{ formResume.usestatus?onstateArr.find(i => parseFloat(i.code) === parseFloat(formResume.usestatus)).name:'/' }}-->
+ <!-- </el-descriptions-item>-->
+ <!-- <el-descriptions-item>-->
+ <!-- <template slot="label">-->
+ <!-- 棰勮瀵垮懡(娆�)-->
+ <!-- </template>-->
+ <!-- {{ formResume.surp_life }}-->
+ <!-- </el-descriptions-item>-->
+ <!-- <el-descriptions-item>-->
+ <!-- <template slot="label">-->
+ <!-- 鍓╀綑瀵垮懡(娆�)-->
+ <!-- </template>-->
+ <!-- {{ formResume.serlife }}-->
+ <!-- </el-descriptions-item>-->
+ <el-descriptions-item>
+ <template slot="label">
+ 鏌ョ湅浜哄憳
+ </template>
+ {{ formResume.username }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 鏌ョ湅鏃堕棿
+ </template>
+ {{ formResume.lm_date }}
+ </el-descriptions-item>
+ </el-descriptions>
+
+ <div style="display: flex;justify-content: center;font-size: 18px;font-weight: bolder;margin: 20px 0">璁惧娴佽浆璁板綍</div>
+
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef2"
+ class="tableFixed"
+ :data="tableResume"
+ height="370px"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:'370px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ >
+ <el-table-column
+ prop="rowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="opertype"
+ label="鎿嶄綔绫诲瀷"
+ />
+
+ <el-table-column
+ prop="operusername"
+ label="鎿嶄綔浜哄憳"
+ />
+
+ <el-table-column
+ prop="operdate"
+ label="鎿嶄綔鏃堕棿"
+ />
+ <el-table-column
+ prop="opertype"
+ label="缁撴灉/瀵硅薄"
+ />
+
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="totalResume"
+ :page.sync="formResume.page"
+ :limit.sync="formResume.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getMoldResumeSearch"
+ />
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button v-waves @click="dialogVisibleResume=false">杩� 鍥�</el-button>
+ <!-- <el-button-->
+ <!-- v-waves -->
+ <!-- type="primary"-->
+ <!-- :loading="$store.state.app.buttonIsDisabled"-->
+ <!-- :disabled="$store.state.app.buttonIsDisabled"-->
+ <!-- @click="dialogVisibleConfirm"-->
+ <!-- >纭� 瀹�</el-button>-->
+ </div>
+ </span>
+ </el-dialog>
+
</div>
</template>
<script>
import waves from '@/directive/waves'
import Pagination from '@/components/Pagination'
-import { validateCode } from '@/utils/global'
+import { handleDatetime2, validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import arrayToTree from 'array-to-tree'
import { PrentOrganization } from '@/api/GeneralBasicData'
@@ -453,7 +602,7 @@
AddUpdateDeviceManger,
AddUpdateDeviceType, DeleteDeviceManger,
DeleteDeviceType,
- DeviceMangerSearch, DeviceSopSearch,
+ DeviceMangerSearch, DeviceResumeSearch, DeviceSopSearch,
DeviceTypeSearch
} from '@/api/DeviceManager'
@@ -555,7 +704,16 @@
sop: '',
v: ''
},
- sopArr: []
+ sopArr: [],
+
+ dialogVisibleResume: false,
+ formResume: {
+ mouldcode: '',
+ page: 1,
+ rows: 20
+ },
+ tableResume: [],
+ totalResume: 10
}
},
@@ -577,6 +735,47 @@
this.getPrentOrganization()
},
methods: {
+ // 灞ュ巻
+ async view2(row) {
+ console.log(JSON.parse(JSON.stringify(row)))
+ this.formResume.mouldcode = row.code
+ this.formResume.mouldname = row.name
+ this.formResume.mouldspec = row.eqptype_name
+ this.formResume.username = localStorage.getItem('username')
+
+ // this.formResume.surp_life = row.surp_life
+ // this.formResume.serlife = row.serlife
+ this.formResume.lm_date = handleDatetime2(new Date())
+ this.formResume.status = row.enable
+ // this.formResume.usestatus = row.usestatus
+
+ await this.getMoldResumeSearch()
+ this.dialogVisibleResume = true
+ this.$nextTick(() => {
+ this.$refs.tableDataRef2.doLayout()
+ })
+ },
+ async getMoldResumeSearch() {
+ const data = {
+ eqpcode: this.formResume.mouldcode,
+ createdate: '',
+ page: this.formResume.page,
+ rows: this.formResume.rows,
+ prop: 'operdate',
+ order: 'desc'
+ }
+ const res = await DeviceResumeSearch(data)
+
+ if (res.code === '200') {
+ this.tableResume = res.data
+ this.totalResume = res.count
+ }
+ },
+
+ handleCloseResume() {
+ this.tableResume = []
+ },
+
// 寮瑰嚭妗嗗叧闂�
handleSopClose() {
this.SopDialogVisible = false
@@ -866,6 +1065,9 @@
this.dialogForm.idUnitBySale = mainUnitCode
this.dialogForm.idunitbymanufacture = mainUnitCode
}
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
}
}
}
@@ -888,4 +1090,8 @@
.el-icon-plus:hover, .el-icon-edit:hover, .el-icon-delete:hover {
color: #000 !important;
}
+
+.dialogFormClass ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
</style>
--
Gitblit v1.9.3