dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
cun-nan 2024-07-29 16:51:02 +08:00
parent eb9abc6777
commit f4b2131c82
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fuintAdmin_zt/src/views/Site/add.vue
View File

@ -31,6 +31,9 @@ export default {
roleCode: [
{required: true, message: '请选择登录权限', trigger: 'change'}
],
menuIds: [
{required: true, message: '请选择菜单信息', trigger: 'change'}
],
},
dutyId:'',
tableData: [],
@ -305,8 +308,9 @@ export default {
<template>
<div class="container">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<div class="top-box">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<!-- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">-->
<div>
<el-form-item label="角色名称" prop="roleName">
<el-input v-model="ruleForm.roleName"></el-input>
@ -339,11 +343,11 @@ export default {
</el-form-item>
</div>
</el-form>
<!-- </el-form>-->
</div>
<div class="center-box">
<div>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm">
<!-- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm">-->
<!-- <el-form-item label="角色登录权限" prop="roleCode">-->
<!-- <el-radio-group v-model="ruleForm.roleCode">-->
<!-- <el-radio :label="0">都无</el-radio>-->
@ -352,11 +356,11 @@ export default {
<!-- <el-radio :label="3">全部</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label="菜单功能权限" prop="checkedKeys">
<el-form-item label="菜单功能权限" prop="menuIds">
<el-checkbox v-model="checked" @change="chooseAllOrNo">全选</el-checkbox>
<el-checkbox v-model="isOpen" @change="openTable">展开</el-checkbox>
</el-form-item>
</el-form>
<!-- </el-form>-->
<!-- <el-button size="mini" @click.native="openTable('open')">一键展开</el-button>-->
<!-- <el-button size="mini" @click.native="openTable('fold')">折叠</el-button>-->
</div>
@ -400,6 +404,7 @@ export default {
</div>
</div>
</el-form>
</div>
</template>

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/mapper/xml/LjStoreMapper.xml
View File

@ -3,9 +3,14 @@
<mapper namespace="com.fuint.business.storeInformation.mapper.LJStoreMapper">
<select id="selectListDepts" resultType="com.fuint.business.storeInformation.vo.LjStoreVo">
SELECT ms.*,sd.dept_name,sd.leader_name,sd.leader_phone,sd.turnover_type,sd.turnover_limit,
sd.turnover_start_time,sd.turnover_end_time,sd.rates,sd.prepaid_amount,sd.create_time deptCreateTime,sd.store_num
sd.turnover_start_time,sd.turnover_end_time,sd.rates,sd.prepaid_amount,sd.deptCreateTime,sd.store_num
FROM mt_store ms
LEFT JOIN sys_dept sd ON ms.contract_dept_id = sd.dept_id
LEFT JOIN (
SELECT sd1.dept_name,sd1.leader_name,sd1.leader_phone,sd2.turnover_type,sd2.turnover_limit,
sd2.turnover_start_time,sd2.turnover_end_time,sd2.rates,sd2.prepaid_amount,sd1.create_time deptCreateTime,
sd2.store_num,sd1.if_delete,sd1.dept_id,sd1.ancestors
FROM sys_dept sd1 LEFT JOIN sys_dept sd2 on sd1.parent_id = sd2.dept_id
) sd ON ms.contract_dept_id = sd.dept_id
<where>
sd.if_delete = 0 and ms.if_delete = 0
<if test="ownDeptStr !=null and ownDeptStr !=''">