问题清单修复
This commit is contained in:
BianLzhaoMin
parent
9b37f1a3fd
commit
bd1b55d4db
|
|
@ -173,6 +173,22 @@
|
|||
</template>
|
||||
<el-input v-model="addOrEditForm.phonenumber" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="权限模板：" prop="dept">
|
||||
<el-select
|
||||
filterable
|
||||
clearable
|
||||
placeholder="请选择权限模板"
|
||||
v-model="addOrEditForm.dept"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
v-for="item in templateList"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="角色：" prop="roles">
|
||||
<el-input disabled v-model="addOrEditForm.roles" />
|
||||
</el-form-item>
|
||||
|
|
@ -218,6 +234,7 @@ import {
|
|||
getDeptDetailsAPI,
|
||||
getAddressListAPI,
|
||||
} from '@/api/company-manage/index.js'
|
||||
import { getTemplateListAPI } from '@/api/permission-template/index.js'
|
||||
import { validateNewPassword } from '@/utils/validate'
|
||||
import { getToken } from '@/utils/auth'
|
||||
export default {
|
||||
|
|
@ -244,6 +261,7 @@ export default {
|
|||
provinceList: [],
|
||||
cityList: [],
|
||||
areaList: [],
|
||||
templateList: [],
|
||||
previewUrl: '',
|
||||
headers: {
|
||||
Authorization: 'Bearer ' + getToken(),
|
||||
|
|
@ -266,6 +284,7 @@ export default {
|
|||
city: '',
|
||||
district: '',
|
||||
address: '',
|
||||
dept: '',
|
||||
},
|
||||
addOrEditFormRef: {
|
||||
deptName: [
|
||||
|
|
@ -389,6 +408,13 @@ export default {
|
|||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
dept: [
|
||||
{
|
||||
required: true,
|
||||
message: '请选择权限模板',
|
||||
trigger: 'change',
|
||||
},
|
||||
],
|
||||
},
|
||||
}
|
||||
},
|
||||
|
|
@ -432,6 +458,7 @@ export default {
|
|||
city,
|
||||
district,
|
||||
address,
|
||||
dept,
|
||||
} = this.addOrEditForm
|
||||
const params = {
|
||||
deptName,
|
||||
|
|
@ -444,6 +471,7 @@ export default {
|
|||
city,
|
||||
district,
|
||||
address,
|
||||
dept,
|
||||
sysUser: {
|
||||
nickName,
|
||||
phonenumber,
|
||||
|
|
@ -548,9 +576,19 @@ export default {
|
|||
async onChangeCity(val) {
|
||||
this.areaList = await this.getAddressListData(val)
|
||||
},
|
||||
|
||||
async getTemplateListData() {
|
||||
const { rows: res } = await getTemplateListAPI({
|
||||
pageNum: 1,
|
||||
pageSize: 9999,
|
||||
})
|
||||
this.templateList = res
|
||||
console.log(res, '模板列表')
|
||||
},
|
||||
},
|
||||
async mounted() {
|
||||
this.getProvinceData()
|
||||
this.getTemplateListData()
|
||||
if (this.formType === 1 || this.formType === 2) {
|
||||
const { data: res } = await getDeptDetailsAPI(this.detailsId)
|
||||
const {
|
||||
|
|
@ -567,6 +605,7 @@ export default {
|
|||
city,
|
||||
district,
|
||||
address,
|
||||
menuTemplateId,
|
||||
} = res
|
||||
|
||||
this.cityList = await this.getAddressListData(province)
|
||||
|
|
@ -590,6 +629,7 @@ export default {
|
|||
city,
|
||||
district,
|
||||
address,
|
||||
dept: menuTemplateId,
|
||||
fileList: [{ url: logo }],
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<div>
|
||||
<el-avatar size="large" :src="companyInfo.logo" />
|
||||
</div>
|
||||
<div style="flex: 1; padding-left: 14px">
|
||||
<div style="flex: 1; padding-left: 14px; width: 100%">
|
||||
<div class="company-title">
|
||||
<div> {{ companyInfo.deptName }} </div>
|
||||
<el-tag
|
||||
|
|
@ -33,7 +33,9 @@
|
|||
</el-tag>
|
||||
</div>
|
||||
|
||||
<p class="company-remark"> {{ companyInfo.remark }} </p>
|
||||
<p class="company-remark">
|
||||
<span> {{ companyInfo.remark }}</span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -174,6 +176,7 @@ export default {
|
|||
.company-info {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
|
||||
.company-title {
|
||||
width: 100%;
|
||||
|
|
@ -186,6 +189,7 @@ export default {
|
|||
overflow: hidden;
|
||||
-webkit-line-clamp: 1;
|
||||
text-overflow: ellipsis;
|
||||
word-break: break-all;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -200,6 +204,7 @@ export default {
|
|||
overflow: hidden;
|
||||
-webkit-line-clamp: 2;
|
||||
text-overflow: ellipsis;
|
||||
word-break: break-all;
|
||||
}
|
||||
}
|
||||
.items-card {
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
@selection-change="handleSelectionChange"
|
||||
:selectable="checkSelectable"
|
||||
:row-class-name="getRowClassName"
|
||||
border
|
||||
class="app-content"
|
||||
>
|
||||
<el-table-column type="selection" min-width="55" align="center" />
|
||||
<el-table-column
|
||||
|
|
@ -270,9 +270,7 @@ export default {
|
|||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
roleName: undefined,
|
||||
roleKey: undefined,
|
||||
status: undefined,
|
||||
name: '',
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
|
|
@ -297,6 +295,7 @@ export default {
|
|||
},
|
||||
],
|
||||
},
|
||||
editId: '',
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -314,7 +313,7 @@ export default {
|
|||
// },
|
||||
// )
|
||||
|
||||
const res = await getTemplateListAPI()
|
||||
const res = await getTemplateListAPI(this.queryParams)
|
||||
this.roleList = res.rows
|
||||
this.total = res.total
|
||||
this.loading = false
|
||||
|
|
@ -481,6 +480,7 @@ export default {
|
|||
this.open = true
|
||||
this.form.name = row.name
|
||||
this.form.remark = row.remark
|
||||
this.editId = row.id
|
||||
// const roleId = row.roleId || this.ids
|
||||
const roleMenu = this.getRoleMenuTreeselect(row.id)
|
||||
this.$nextTick(() => {
|
||||
|
|
@ -527,7 +527,14 @@ export default {
|
|||
if (valid) {
|
||||
if (this.title === '修改权限模板') {
|
||||
// this.form.menuIds = this.getMenuAllCheckedKeys()
|
||||
editTemplateAPI(this.form).then((response) => {
|
||||
const { name, remark, menuIds } = this.form
|
||||
const params = {
|
||||
id: this.editId,
|
||||
name,
|
||||
remark,
|
||||
menuIds,
|
||||
}
|
||||
editTemplateAPI(params).then((response) => {
|
||||
this.$modal.msgSuccess('修改成功')
|
||||
this.open = false
|
||||
this.getList()
|
||||
|
|
@ -592,7 +599,7 @@ export default {
|
|||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
<style scoped>
|
||||
.disabled-row {
|
||||
background-color: #f5f7fa !important;
|
||||
color: #909399;
|
||||
|
|
@ -606,4 +613,10 @@ export default {
|
|||
.disabled-row:hover td {
|
||||
background-color: #f5f7fa !important;
|
||||
}
|
||||
|
||||
.app-content {
|
||||
flex: 1;
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Reference in New Issue