From 6caecd26f75979777956dc96e14d6f3b39ce6688 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 15 七月 2022 17:23:42 +0800
Subject: [PATCH] 1.修改bug
---
src/views/zzmx/gylx.vue | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 8535de9..e31a9b6 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -32,7 +32,7 @@
<el-divider />
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
@@ -96,7 +96,7 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <!-- <el-button type="text" @click="edit('edit',row)">淇敼</el-button>-->
+ <!-- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
<el-button type="text" @click="edit('edit',row)">棰勮</el-button>
<el-button type="text" @click="del(row)">鍒犻櫎</el-button>
</div>
@@ -120,9 +120,10 @@
<el-dialog
:title="operation==='add'?'鏂板':'棰勮'"
:visible.sync="dialogVisible"
- width="70%"
+ width="1200px"
:close-on-click-modal="false"
top="15vh"
+ :fullscreen="isFullscreen"
@closed="handleClose"
@close="handleClose"
>
@@ -139,6 +140,7 @@
<el-form-item prop="enable" label="浣跨敤鐘舵��" style="margin-right: 20px">
<el-select
v-model="dialogForm.enable"
+ filterable
:disabled="operation==='edit'"
:popper-append-to-body="false"
style="width: 220px"
@@ -260,7 +262,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'GYLX',
components: {
Pagination
},
@@ -277,6 +279,7 @@
}
}
return {
+ isFullscreen: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -387,6 +390,17 @@
})
if (!flag) {
return this.$message.info('杈撳叆妗嗗唴瀹逛笌涓嬫媺閫夐」鍐呭涓嶅尮閰嶏紒')
+ }
+
+ // 3.杈撳叆妗嗗唴瀹逛笌宸查�夊唴瀹圭浉鍚屾椂涓嶈兘淇濆瓨
+ let flag2 = false
+ this.dynamicTags.forEach(item => {
+ if (item.stepname === this.autocompleteValue.trim()) {
+ flag2 = true
+ }
+ })
+ if (flag2) {
+ return this.$message.info('姝ゅ伐搴忓凡閫夛紝璇烽�夋嫨鍏跺畠宸ュ簭锛�')
}
// 灏嗗�兼浛鎹㈠埌鍘焧ag浣嶇疆涓�
@@ -605,6 +619,13 @@
this.dynamicTags.forEach(item => {
Data.push({ seq: item.seq, stepcode: item.stepcode, stepname: item.stepname })
})
+
+ Data.forEach(item => {
+ if (item.stepname === this.routeArr.find(it => it.stepname === item.stepname).stepname) {
+ item.stepcode = this.routeArr.find(it => it.stepname === item.stepname).stepcode
+ }
+ })
+ console.log(Data, 32)
this.$refs.dialogForm.validate(valid => {
if (valid) {
const data = {
@@ -632,6 +653,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
+ // this.isFullscreen = window.innerHeight < 800
})
}
}
--
Gitblit v1.9.3