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/zzmx/gylx.vue | 156 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 115 insertions(+), 41 deletions(-)
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 13d52ee..ad8e904 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -72,15 +72,26 @@
prop="description"
label="宸ヨ壓璺嚎鎻忚堪"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.description">{{ row.description }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="enable"
label="浣跨敤鐘舵��"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.enable==='Y'">鏄�</div>
- <div v-if="row.enable==='N'">鍚�</div>
+ <div v-if="row.enable==='Y'">
+ <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+ 鏄�
+ </div>
+ <div v-if="row.enable==='N'">
+ <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ 鍚�
+ </div>
</template>
</el-table-column>
<el-table-column
@@ -102,7 +113,11 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="棰勮" placement="top">
- <i class="el-icon-view" style="margin-right:15px;cursor: pointer;color:#42b983 " @click="edit('edit',row)" />
+ <i
+ class="el-icon-view"
+ style="margin-right:15px;cursor: pointer;color:#42b983 "
+ @click="edit('edit',row)"
+ />
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
<i class="el-icon-delete" @click="del(row)" />
@@ -114,7 +129,6 @@
</div>
<!--鍒嗛〉-->
<pagination
- v-show="total>0"
:total="total"
:page.sync="form.page"
:limit.sync="form.rows"
@@ -162,7 +176,12 @@
</el-select>
</el-form-item>
<el-form-item label="宸ヨ壓鎻忚堪" prop="description">
- <el-input v-model="dialogForm.description" :disabled="operation==='edit'" type="textarea" style="width: 220px" />
+ <el-input
+ v-model="dialogForm.description"
+ :disabled="operation==='edit'"
+ type="textarea"
+ style="width: 220px"
+ />
</el-form-item>
</div>
<el-form-item label="宸ヨ壓璁剧疆" prop="Data" style="margin-top: 30px">
@@ -179,7 +198,7 @@
zIndex:tag.label===selectedName?0:2
}"
>
- {{ index+1 }}
+ {{ index + 1 }}
</div>
<!-- <el-tooltip-->
@@ -266,25 +285,14 @@
<script>
import Pagination from '@/components/Pagination'
import { AddUpdateRoute, DeleteRoute, RouteSearch, StepSelect, ViewRoute } from '@/api/zzmx'
+import { validateCode } from '@/utils/global'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'GYLX',
components: {
Pagination
},
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
return {
isIpad: false,
mainHeight: 0,
@@ -315,7 +323,7 @@
Data: []
},
dynamicTags: [// 宸ヨ壓璁剧疆鏁扮粍
- { editDisabled: true, stepcode: 'Step01', seq: 1, stepname: ' ', effect: 'light' }
+ { editDisabled: true, stepcode: '', seq: 1, stepname: ' ', effect: 'light' }
// { editDisabled: true, stepcode: 'Step02', seq: 2, stepname: '濂�', effect: 'light' },
// { editDisabled: true, stepcode: 'Step03', seq: 3, stepname: '澶�', effect: 'light' }
],
@@ -323,13 +331,14 @@
selectedName: '', // 閫変腑鐨勫悕绉�
autocompleteValue: '', // 鍙悳绱㈣緭鍏ユ涓殑鍊�
routeArr: [], // 宸ヨ壓璁剧疆涓嬫媺鎵�鏈夊��
+ routeSelectedArr: [], // 宸ヨ壓璁剧疆涓嬫媺宸查�夌殑鍊�
addDisabled: true, // 娣诲姞鎸夐挳鏄惁鍙偣鍑�
editDisabled: true, // 淇敼鎸夐挳鏄惁鍙偣鍑�
mouseFocusPosition: 0, // 榧犳爣鑱氱劍鐨勪綅缃�
operation: '',
dialogFormRules: {
code: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
name: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
@@ -369,7 +378,7 @@
}
},
// 宸ヨ壓璁剧疆 涓嬫媺鑾峰彇鎵�鏈�
- async getStepSelectArr() {
+ async getStepSelectArr() {
const { data: res } = await StepSelect()
this.routeArr = res
},
@@ -412,6 +421,18 @@
if (flag2) {
return this.$message.info('姝ゅ伐搴忓凡閫夛紝璇烽�夋嫨鍏跺畠宸ュ簭锛�')
}
+ console.log(this.routeArr, 9)
+ this.routeArr.forEach((item, index) => {
+ if (this.autocompleteValue.trim() === item.stepname) {
+ console.log(tag.stepname === item.stepname, 353535)
+ this.routeSelectedArr.push({
+ stepcode: item.stepcode,
+ stepname: item.stepname,
+ value: item.value
+ })
+ this.routeArr.splice(index, 1)
+ }
+ })
// 灏嗗�兼浛鎹㈠埌鍘焧ag浣嶇疆涓�
this.dynamicTags.forEach((item, index) => {
@@ -434,9 +455,29 @@
item.stepname = item.stepname.trim()
if (item.seq !== tag.seq) {
item.editDisabled = false
+ // item.stepcode = this.routeArr.find(it=>it.stepcode=tag.stepcode).stepcode
// return this.$message.info('璇峰厛濉啓鎴栭�夋嫨宸ヨ壓锛�')
}
})
+
+ // if (tag.stepname === '') {
+ // this.dynamicTags[0].stepcode=
+ // }
+
+ // if (tag.stepname.toString().length > 0 && tag.editDisabled) {
+ if (tag.stepname !== '') {
+ const routeSelectedArr = this.routeSelectedArr.find(item => item.stepname === tag.stepname)
+
+ this.routeArr.push(
+ {
+ stepcode: routeSelectedArr.stepcode,
+ stepname: routeSelectedArr.stepname,
+ value: routeSelectedArr.value
+ }
+ )
+ }
+ // }
+
this.addDisabled = true
this.selectedName = tag.stepname
this.autocompleteValue = tag.stepname
@@ -478,11 +519,27 @@
this.dynamicTags.splice(index, 1)
}
})
+
+ const routeSelectedArr = this.routeSelectedArr.find(item => item.stepname === tag.stepname)
+ if (routeSelectedArr !== undefined) {
+ this.routeArr.push(
+ {
+ stepcode: routeSelectedArr.stepcode,
+ stepname: routeSelectedArr.stepname,
+ value: routeSelectedArr.value
+ }
+ )
+ }
+ this.routeArr = this.routeArr.filter((currentValue, currentIndex, selfArr) => {
+ return selfArr.findIndex(item => item.stepcode === currentValue.stepcode) === currentIndex
+ })
+ console.log(this.dynamicTags, 1)
// 閲嶆柊鎺掑簭
this.dynamicTags.forEach((item, index) => {
item.editDisabled = true
item.seq = index + 1
- item.stepcode = 'Step' + ((index + 1).toString().length === 2 ? (index + 1) : '0' + (index + 1))
+ // item.stepcode = 'Step' + ((index + 1).toString().length === 2 ? (index + 1) : '0' + (index + 1))
+ item.stepcode = ''
})
if (this.clickSelected === '') {
this.selectedName = ''
@@ -499,7 +556,14 @@
if (this.clickSelected === '' || this.clickSelected === this.dynamicTags.length) {
seq = this.dynamicTags.length + 1
this.dynamicTags.push(
- { editDisabled: true, seq: seq, stepname: '', effect: 'light', stepcode: ('Step' + (seq.toString().length === 2 ? seq : '0' + seq)) }
+ {
+ editDisabled: true,
+ seq: seq,
+ stepname: '',
+ effect: 'light',
+ // stepcode: ('Step' + (seq.toString().length === 2 ? seq : '0' + seq))
+ stepcode: ''
+ }
)
} else {
// 2.绗簩绉嶆儏鍐� 褰撻�変腑鏌愪釜tag 灏嗗湪tag鍚庨潰娣诲姞
@@ -507,7 +571,8 @@
this.dynamicTags.splice(this.clickSelected, 0, { editDisabled: true, seq: seq, stepname: '', effect: 'light' })
this.dynamicTags.forEach((item, index) => {
item.seq = index + 1
- item.stepcode = 'Step' + ((index + 1).toString().length === 2 ? (index + 1) : '0' + (index + 1))
+ // item.stepcode = 'Step' + ((index + 1).toString().length === 2 ? (index + 1) : '0' + (index + 1))
+ item.stepcode = ''
})
}
@@ -552,10 +617,10 @@
},
// 閲嶇疆
reset() {
- this.form.OrgCode = ''
- this.form.OrgName = ''
- this.form.OrgType = ''
- this.form.UserName = ''
+ this.form.routecode = ''
+ this.form.routename = ''
+ this.form.description = ''
+ this.form.createuser = ''
this.getRouteSearch()
},
@@ -566,7 +631,7 @@
this.getStepSelectArr()
},
// 宸ヨ壓璺嚎棰勮
- async edit(operation, row) {
+ async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
@@ -596,6 +661,9 @@
DeleteRoute({ routecode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getRouteSearch()
}
})
@@ -610,10 +678,12 @@
this.dialogForm.enable = 'Y'
this.dialogForm.description = ''
this.dialogForm.Data = []
+
this.dynamicTags = [
- { editDisabled: true, stepcode: 'Step01', seq: 1, stepname: ' ', effect: 'light' }
+ { editDisabled: true, stepcode: '', seq: 1, stepname: ' ', effect: 'light' }
]
this.addDisabled = true
+ this.routeSelectedArr = []
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -625,15 +695,16 @@
if (this.dynamicTags[0].stepname.trim() === '') {
return this.$message.info('宸ヨ壓璁剧疆绗竴椤逛笉鑳戒负绌猴紒')
}
+ console.log(this.routeSelectedArr, 3666666)
console.log(this.dynamicTags, 3)
const Data = []
this.dynamicTags.forEach(item => {
- Data.push({ seq: item.seq, stepcode: item.stepcode, stepname: item.stepname })
+ Data.push({ seq: item.seq, stepcode: this.routeSelectedArr.find(it => it.stepname === item.stepname).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
+ if (item.stepname === this.routeSelectedArr.find(it => it.stepname === item.stepname).stepname) {
+ item.stepcode = this.routeSelectedArr.find(it => it.stepname === item.stepname).stepcode
}
})
console.log(Data, 32)
@@ -752,8 +823,9 @@
border-radius: 0;
color: $main_color;
}
+
::v-deep .el-button--success:disabled {
- background-color:#eeeeee;
+ background-color: #eeeeee;
color: $main_color;
}
@@ -787,8 +859,8 @@
white-space: nowrap;
}
-.autocompleteClass{
- .el-autocomplete-suggestion li{
+.autocompleteClass {
+ .el-autocomplete-suggestion li {
//color: red;
}
}
@@ -797,11 +869,12 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
color: $main_color;
cursor: pointer;
}
-.el-icon-edit-outline{
+
+.el-icon-edit-outline {
margin-right: 15px;
}
@@ -862,8 +935,8 @@
background-color: #f8f8fa;
}
-::v-deep .el-table__body .el-table__row.hover-row td{
- background-color: #eaecef ;
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
}
::v-deep .el-form--inline .el-form-item__label {
@@ -879,6 +952,7 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
--
Gitblit v1.9.3