From 5eeb8864bebb1dc4f97f2feef32b742d8a9a10d5 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 14 九月 2022 15:43:04 +0800
Subject: [PATCH] 1.新增报表管理菜单
---
src/views/sbgl/djbz.vue | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/src/views/sbgl/djbz.vue b/src/views/sbgl/djbz.vue
index e07d5f2..8dc73b3 100644
--- a/src/views/sbgl/djbz.vue
+++ b/src/views/sbgl/djbz.vue
@@ -58,6 +58,7 @@
<el-table-column
prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
@@ -148,7 +149,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getDeviceCheckStandArdSearch"
/>
@@ -263,6 +264,7 @@
<el-table-column
prop="checkitem_descr"
label="鐐规瑕佹眰"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.checkitem_descr }}</div>
@@ -428,32 +430,14 @@
ViewDeviceCheckStanedSearch
} from '@/api/sbgl'
import $ from 'jquery'
+import { validateCode } from '@/utils/global'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'Zzjg',
components: {
Pagination, ImportPicker
},
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
- const validateTypeCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨涓婄骇'))
- } else {
- callback()
- }
- }
return {
mainHeight: 0,
tableHeight: 0,
@@ -486,7 +470,7 @@
dialogFormRules: {
code: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
name: [
{ required: true, message: '璇疯緭鍏ユ爣鍑嗗悕绉�', trigger: ['blur', 'change'] }
@@ -642,6 +626,9 @@
DeleteDeviceCheckStaned({ checkstand_code: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getDeviceCheckStandArdSearch()
}
})
@@ -828,7 +815,7 @@
this.dialogFormEqp.code = row.code
const { data: res } = await DeviceCheckStanedAssociationEqp({ checkstand_code: row.code })
- this.dialogFormEqp.eqpAll = res
+ this.dialogFormEqp.eqpAll = res.filter(item => item.children.length > 0)
if (this.dialogFormEqp.eqpAll.length > 0) {
this.dialogFormEqp.eqpAll.forEach((item, index) => {
@@ -880,6 +867,9 @@
this.dialogFormEqp.eqpAll[index].name = '鍏ㄩ儴'
this.dialogFormEqp.eqpTree = [this.dialogFormEqp.eqpAll[index]]
}
+ })
+ this.$nextTick(() => { // 鏍戝舰鍥炴樉
+ this.$refs.epqTree.setCheckedKeys(this.dialogFormEqp.eqpCodeSelectedArr)
})
},
// 灏忕洅瀛愮偣鍑�
@@ -960,7 +950,7 @@
})
this.dialogFormEqp.eqpCodeSelectedArr = [...new Set(this.dialogFormEqp.eqpCodeSelectedArr)]
}
-
+ console.log(this.dialogFormEqp.eqpCodeSelectedArr, 666)
// 2.绗簩绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓洪浂 鍏ㄥ彾 涓洪浂
if (halfCheckedKeys.length === 0 && checkedKeys.length === 0) {
console.log('// 2.绗簩绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓洪浂 鍏ㄥ彾 涓洪浂')
--
Gitblit v1.9.3