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-05-09 18:18:11 +08:00
parent 745996c226
commit 6e78516c64
5 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/Report/ReportList.vue
+4 -4
View File
@@ -109,7 +109,7 @@
<div class="table">
<el-row>
<el-col :span="4" class="treeList ">
<el-col :span="3" class="treeList ">
<el-input placeholder="输入关键字进行过滤" v-model="filterText">
</el-input>
<div class="lef-tree scroll-myself">
@@ -136,7 +136,7 @@
</div>
</el-col>
<el-col :span="19">
<el-col :span="21" style="padding-left: 15px">
<vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe
v-table-min-height="'calc(100vh - 320px)'"
@checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
@@ -150,7 +150,7 @@
<template #default="{ row, rowIndex }">
<!-- <label class="row-title" >-->
<!-- <el-tooltip :content="row.name" placement="top-start">-->
<span class="report-name blurcolor" @click="goReportDetail(row)"> {{ row.name }}</span>
<span class="report-name"> {{ row.name }}</span>
<!-- </el-tooltip>-->
<!-- </label>-->
<!-- <div class="row-info">-->
@@ -512,7 +512,7 @@ export default {
.treeList {
padding: 20px 20px 0;
box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
margin-right: 20px;
//margin-right: 20px;
.filter-tree {
margin-top: 20px;
src/views/Report/ReportManager.vue
+2 -3
View File
@@ -42,7 +42,7 @@
</el-row>
</div>
<el-row>
<el-col :span="4" class="treeList">
<el-col :span="3" class="treeList">
<el-input placeholder="输入关键字进行过滤" v-model="filterText">
</el-input>
<div class="lef-tree scroll-myself" >
@@ -68,7 +68,7 @@
</el-tree>
</div>
</el-col>
<el-col :span="19 ">
<el-col :span="21" style="padding-left: 15px">
<div class="table">
<vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 320px)'">
<vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
@@ -1003,7 +1003,6 @@ export default {
padding: 20px;
margin-left: 13px;
box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
margin-right: 20px;
.filter-tree{
margin-top: 20px;
height: calc(100vh - 320px);
src/views/reportProcess/components/reportForm.vue
+8 -8
View File
@@ -3,13 +3,13 @@
<el-form ref="processFormRef" :model="form" label-width="150px"
:rules="processFormRule" class="label-input-form" size="medium">
<el-row>
<el-col :span="9">
<el-col :span="10">
<el-form-item label="报告名称:" prop="name">
<el-input :disabled="formControl" v-model="form.name"
placeholder="请输入报告名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="6">
<el-col :span="10" :offset="4">
<el-form-item label="报告年份:" prop="year">
<el-date-picker :disabled="formControl" v-model="form.year" type="year" value-format="yyyy"
placeholder="请选择报告年份"
@@ -18,13 +18,13 @@
</el-col>
</el-row>
<el-row>
<el-col :span="9">
<el-col :span="10">
<el-form-item label="报告所属部门:" prop="department">
<el-input readonly :disabled="formControl" v-model="form.departmentName" @click.na.native="handleClick" placeholder="请选择报告所属部门"
></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="6">
<el-col :span="10" :offset="4">
<el-form-item label="标签:" prop="department">
<el-cascader :disabled="formControl" width="100%" v-model="form.labelList" :options="cascaderOptions"
filterable collapse-tags
@@ -37,7 +37,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="9" >
<el-col :span="10" >
<el-form-item label="报告涉密等级:" prop="confidentialLevel">
<el-select :disabled="formControl" v-model="form.confidentialLevel" placeholder="请选择报告涉密等级" @change="reportLevel">
<el-option v-for="item in privacyLevelOptions " :key="item.value" :label="item.value"
@@ -46,7 +46,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="9" :offset="6" v-if="isShowTime">
<el-col :span="10" :offset="4" v-if="isShowTime">
<el-form-item label="保密到期日期:" prop="secrecyLast">
<el-date-picker :disabled="formControl" v-model="form.secrecyLast" type="date" value-format="yyyy-mm-dd"
placeholder="请选择保密到期日期"
@@ -56,7 +56,7 @@
</el-row>
<el-row>
<el-col :span="9" >
<el-col :span="10" >
<el-form-item label="报告隐私等级:" prop="privacyLevel">
<el-select :disabled="formControl" v-model="form.privacyLevel" placeholder="请选择报告隐私等级">
<el-option v-for="item in confidentialLevelOptions" :key="item.value" :label="item.value"
@@ -65,7 +65,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="9" :offset="6">
<el-col :span="10" :offset="4">
<el-form-item label="关键词:" prop="tags">
<vue-tags-input :disabled="formControl" :class="{'is-diable':formControl}" placeholder="请输入关键词"
v-model="form.tags" :tags="tags"
src/views/reportProcess/launch.vue
+5 -4
View File
@@ -31,7 +31,7 @@
</el-form-item>
</el-col>
<el-col :span="9" style="margin-left: 5px">
<el-button size="medium" type="primary" @click="handleCheck('spr1')">选取</el-button>
<el-button size="medium" type="primary" class="checkBtn" @click="handleCheck('spr1')">选取</el-button>
</el-col>
</el-row>
@@ -138,7 +138,6 @@ export default {
this.$set(this.assignForm,'oneApproveName',submitJson.oneApproveName)
}
this.$nextTick(()=>{
this.$refs.processFormRef.clearValidate()
this.$refs.assignFormRef.clearValidate()
})
})
@@ -345,6 +344,8 @@ export default {
}
</script>
<style scoped>
<style lang="scss" scoped>
.checkBtn {
padding: 11px 20px !important;
}
</style>
src/views/userCenter/processCenter/gencyProcess.vue
+22 -2
View File
@@ -2,7 +2,9 @@
<div>
<div class="table">
<vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 380px)'">
<vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center"
border stripe v-table-min-height="'calc(100vh - 380px)'"
@checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
<vxe-column type="checkbox" width="60"></vxe-column>
<vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
<template #default="{ row, rowIndex }">
@@ -56,7 +58,9 @@ export default {
size:10
},
total: 0,
tableData: []
tableData: [],
checkList:[],
checkIds:[]
};
},
props:{
@@ -79,6 +83,22 @@ export default {
this.loadData()
},
methods: {
selectAllEvent({checked}) {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkList = records
this.checkIds = records.map(item => {
return item.id
})
this.$bus.$emit('handleClick', this.checkList);
},
selectChangeEvent({checked}) {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkList = records
this.checkIds = records.map(item => {
return item.id
})
this.$bus.$emit('handleClick', this.checkList);
},
loadData() {
let userId=this.$store.getters.userInfo.usid
this.$api.processCenter.gencyProcessPage({...this.q,...this.form,userId:userId}).then(res=>{