DZ/faw-report-library-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改bug】修改级联显示数据 修改弹窗样式 修改流程已办待办

Browse Source
This commit is contained in:
zhoulingpo
2023-04-27 14:55:37 +08:00
parent fb1bac303b
commit 1b2d472b62
4 changed files with 182 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/Report/ReportManager.vue
+2 -2
View File
@@ -1169,14 +1169,14 @@ export default {
.head { .head {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 20px;
.btn { .btn {
cursor: pointer; cursor: pointer;
} }
} }
.tree { .tree {
margin-top: 30px; margin-top: 10px;
padding: 0px 50px 50px 50px; padding: 0px 50px 50px 50px;
height: 500px; height: 500px;
.custom-tree-node { .custom-tree-node {
src/views/Report/reportManager/labelModal.vue
+174 -171
View File
@@ -1,213 +1,216 @@
<template> <template>
<div> <div>
<el-dialog title="新增/编辑标签" :visible.sync="dialogVisible" width="30%" :before-close="handleClose"> <el-dialog title="新增/编辑标签" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
<div class="form"> <div class="form">
<el-form ref="form" :model="form" label-width="80px" :show-message="false"> <el-form ref="form" :model="form" label-width="80px" :show-message="false">
<el-form-item label="上级标签" required> <el-form-item label="上级标签" required>
<el-cascader v-model="form.nodeLabel" placeholder="请选择上级标签" :options="cascaderOptions" filterable :props="{ checkStrictly: true }" clearable > <el-cascader v-model="form.nodeLabel" placeholder="请选择上级标签" :options="cascaderOptions" filterable
</el-cascader> :props="{ checkStrictly: true }" clearable >
</el-form-item> </el-cascader>
</el-form-item>
<el-form-item label="标签名称" required> <el-form-item label="标签名称" required>
<el-input v-model="form.label" maxlength="100" placeholder="请输入标签名称"></el-input> <el-input v-model="form.label" maxlength="100" placeholder="请输入标签名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="排序" required> <el-form-item label="排序" required>
<el-input v-model="form.orderNum" max="100" placeholder="请输入排序"></el-input> <el-input v-model="form.orderNum" max="100" placeholder="请输入排序"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" maxlength="1000" placeholder="请输入备注"></el-input> <el-input v-model="form.remark" maxlength="1000" placeholder="请输入备注"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="cancel" class="btn">取消</el-button> <el-button @click="cancel" class="btn">取消</el-button>
<el-button type="primary" @click="submitForm" class="btn">确定</el-button> <el-button type="primary" @click="submitForm" class="btn">确定</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<!-- <span slot="footer" class="dialog-footer"> <!-- <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click=" submit">确 定</el-button> <el-button type="primary" @click=" submit">确 定</el-button>
</span> --> </span> -->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'labelModal', name: 'labelModal',
data() { data() {
return { return {
dialogVisible: false, dialogVisible: false,
form: { form: {
label:'', label: '',
name:'', name: '',
sort:'', sort: '',
orderNum:'', orderNum: '',
remark:'' remark: ''
},
cascaderOptions:[
],
// rule: {
// label: [
// { required: true, trigger: '' }
// ],
// nodeLabel: [
// { required: true, trigger: '' }
// ],
// orderNum: [
// { required: true, trigger: '' },
//
// ],
//
// },
};
},
methods: {
// 必填项
checkReportF() {
let test=/^[1-9]\d*$/
if (!this.form.label) {
return this.$message.warning('请检查标签名称') && false;
}
if (!this.form.nodeLabel) {
return this.$message.warning('请检查上级标签') && false;
}
if (!this.form.orderNum) {
return this.$message.warning('请检查排序') && false;
}
if (!this.form.orderNum) {
return this.$message.warning('请检查排序') && false;
}
if(!test.test(this.form.orderNum)){
return this.$message.warning('排序只能输入数字！') && false;
}
return true;
}, },
handleClose(done) { cascaderOptions: [],
// this.$confirm('确认关闭？') };
// .then(_ => { },
// done(); methods: {
// }) //用递归方式去除children
// .catch(_ => {}); getTreeData(data) {
done(); for (var i = 0; i < data.length; i++) {
}, if (data[i].children.length < 1) {
open(node, data) { // children若为空数组，则将children设为undefined
this.$api.report.labelList().then(res => { data[i].children = undefined;
console.log('666',res); } else {
this.cascaderOptions=res.data // children若不为空数组，则继续 递归调用 本方法
if (node && data) { this.getTreeData(data[i].children);
let id =data.id }
this.$api.report.labelNodeList(id).then(res=>{ }
this.form.nodeLabel=res.data return data;
this.$forceUpdate() },
}) // 必填项
this.form.label = data.label checkReportF() {
this.form.orderNum = data.orderNum let test = /^[1-9]\d*$/
this.form.remark = data.remark if (!this.form.label) {
this.form.id=data.id return this.$message.warning('请检查标签名称') && false;
this.form={...this.form} }
// this.$refs.form.clearValidate('name') if (!this.form.nodeLabel) {
this.$forceUpdate() return this.$message.warning('请检查上级标签') && false;
} else { }
this.form = { if (!this.form.orderNum) {
label:'', return this.$message.warning('请检查排序') && false;
name:'', }
sort:'', if (!this.form.orderNum) {
orderNum:'', return this.$message.warning('请检查排序') && false;
remark:'' }
} if (!test.test(this.form.orderNum)) {
// this.$refs.form.clearValidate() return this.$message.warning('排序只能输入数字！') && false;
this.$forceUpdate() }
} return true;
},
this.dialogVisible = true handleClose(done) {
this.$nextTick(()=>{ // this.$confirm('确认关闭？')
this.$refs.form.clearValidate() // .then(_ => {
}) // done();
// })
// .catch(_ => {});
done();
},
open(node, data) {
this.cascaderOptions = []
this.$api.report.labelList().then(res => {
console.log('666', res);
this.cascaderOptions = this.getTreeData(res.data)
if (node && data) {
let id = data.id
this.$api.report.labelNodeList(id).then(res => {
this.form.nodeLabel = res.data
this.$forceUpdate()
}) })
}, this.form.label = data.label
cancel() { this.form.orderNum = data.orderNum
this.dialogVisible = false this.form.remark = data.remark
}, this.form.id = data.id
submitForm() { this.form = {...this.form}
if (this.checkReportF()) { // this.$refs.form.clearValidate('name')
this.form.parentId=this.form.nodeLabel[this.form.nodeLabel.length - 1] this.$forceUpdate()
delete this.form.nodeLabel } else {
if(!this.form.id){ this.form = {
this.$api.report.labelAdd(this.form).then(res => { label: '',
if(res.ok){ name: '',
this.$message({ sort: '',
type:'success', orderNum: '',
message:'添加成功' remark: ''
}) }
this.$emit('updateList') // this.$refs.form.clearValidate()
} this.$forceUpdate()
}) }
}else{
this.$api.report.labelUpdate(this.form).then(res=>{ this.dialogVisible = true
if(res.ok){ this.$nextTick(() => {
this.$message({ this.$refs.form.clearValidate()
type:'success', })
message:'更新成功' })
}) },
this.$emit('updateList') cancel() {
} this.dialogVisible = false
},
submitForm() {
if (this.checkReportF()) {
this.form.parentId = this.form.nodeLabel[this.form.nodeLabel.length - 1]
delete this.form.nodeLabel
if (!this.form.id) {
this.$api.report.labelAdd(this.form).then(res => {
if (res.ok) {
this.$message({
type: 'success',
message: '添加成功'
}) })
this.$emit('updateList')
} }
this.dialogVisible = false })
} } else {
this.$api.report.labelUpdate(this.form).then(res => {
if (res.ok) {
this.$message({
type: 'success',
message: '更新成功'
})
this.$emit('updateList')
}
})
} }
this.dialogVisible = false
}
} }
}
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.form { .form {
padding: 50px; padding: 50px;
.btn { .btn {
margin-left: 40px; margin-left: 40px;
width: 90px; width: 90px;
height: 40px; height: 40px;
border-radius: 30px; border-radius: 30px;
margin-right: 30px; margin-right: 30px;
} }
} }
.form ::v-deep .el-input__inner { .form ::v-deep .el-input__inner {
width: 90% width: 90%
} }
.form ::v-deep .el-select { .form ::v-deep .el-select {
width: 90%; width: 90%;
} }
.form ::v-deep .el-select .el-input__inner { .form ::v-deep .el-select .el-input__inner {
width: 100%; width: 100%;
} }
::v-deep .el-form-item--mini .el-form-item__label { ::v-deep .el-form-item--mini .el-form-item__label {
line-height: 40px !important; line-height: 40px !important;
} }
::v-deep .el-input__inner { ::v-deep .el-input__inner {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
width: 80%; width: 80%;
} }
::v-deep .el-cascader{
height: 40px !important; ::v-deep .el-cascader {
line-height: 40px !important; height: 40px !important;
width: 90%; line-height: 40px !important;
width: 90%;
} }
::v-deep .el-cascader .el-input__inner { ::v-deep .el-cascader .el-input__inner {
height: 40px !important; height: 40px !important;
line-height: 40px !important; line-height: 40px !important;
width: 100%; width: 100%;
} }
::v-deep .el-popper .el-cascader-menu .el-cascader-node__label{
::v-deep .el-popper .el-cascader-menu .el-cascader-node__label {
width: 160px !important; width: 160px !important;
overflow: hidden; overflow: hidden;
} }
src/views/userCenter/processCenter/finishProcess.vue
+2
View File
@@ -124,6 +124,7 @@ export default {
query: { query: {
id: this.$route.query.id, id: this.$route.query.id,
type:'yiban', type:'yiban',
taskDefinitionKey:row.taskDefinitionKey
} }
}) })
}else{ }else{
@@ -132,6 +133,7 @@ export default {
query: { query: {
id: this.$route.query.id, id: this.$route.query.id,
type:'yiban', type:'yiban',
taskDefinitionKey:row.taskDefinitionKey
} }
}) })
} }
src/views/userCenter/processCenter/gencyProcess.vue
+4 -2
View File
@@ -112,14 +112,16 @@ export default {
this.$router.push({ this.$router.push({
path: '/permission/launch', path: '/permission/launch',
query: { query: {
id: this.$route.query.id id: this.$route.query.id,
taskDefinitionKey:row.taskDefinitionKey
} }
}) })
}else{ }else{
this.$router.push({ this.$router.push({
path: '/permission/examine', path: '/permission/examine',
query: { query: {
id: this.$route.query.id id: this.$route.query.id,
taskDefinitionKey:row.taskDefinitionKey
} }
}) })
} }