diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 07a4c5f..8b4e5a8 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -14,7 +14,7 @@
}
// 根据部门找其默认区域
-export function getAreaByDept(deptid) {
+export function getAreaByDept(deptid: string) {
return request({
url: 'config/getAreaByDept',
method: 'get',
@@ -24,7 +24,7 @@
})
}
// 区域查询
-export function getAreaList(pid) {
+export function getAreaList(pid: string) {
return request({
url: `${prefix}/area/list`,
method: 'get',
@@ -35,7 +35,7 @@
}
// 区域查询,非分页,加载树用
-export function getAreaTree(params) {
+export function getAreaTree(params: object) {
return request({
url: `${prefix}/area/list`,
method: 'get',
@@ -51,7 +51,7 @@
}
// 添加区域
-export function addArea(data) {
+export function addArea(data: object) {
return request({
url: `${prefix}/area/add`,
method: 'post',
@@ -59,7 +59,7 @@
})
}
// 修改区域机构
-export function updateArea(data) {
+export function updateArea(data: object) {
return request({
url: `${prefix}/area/update`,
method: 'post',
@@ -67,7 +67,7 @@
})
}
// 删除区域机构
-export function delArea(id) {
+export function delArea(id: string) {
return request({
url: `${prefix}/area/delete`,
method: 'post',
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 07a4c5f..8b4e5a8 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -14,7 +14,7 @@
}
// 根据部门找其默认区域
-export function getAreaByDept(deptid) {
+export function getAreaByDept(deptid: string) {
return request({
url: 'config/getAreaByDept',
method: 'get',
@@ -24,7 +24,7 @@
})
}
// 区域查询
-export function getAreaList(pid) {
+export function getAreaList(pid: string) {
return request({
url: `${prefix}/area/list`,
method: 'get',
@@ -35,7 +35,7 @@
}
// 区域查询,非分页,加载树用
-export function getAreaTree(params) {
+export function getAreaTree(params: object) {
return request({
url: `${prefix}/area/list`,
method: 'get',
@@ -51,7 +51,7 @@
}
// 添加区域
-export function addArea(data) {
+export function addArea(data: object) {
return request({
url: `${prefix}/area/add`,
method: 'post',
@@ -59,7 +59,7 @@
})
}
// 修改区域机构
-export function updateArea(data) {
+export function updateArea(data: object) {
return request({
url: `${prefix}/area/update`,
method: 'post',
@@ -67,7 +67,7 @@
})
}
// 删除区域机构
-export function delArea(id) {
+export function delArea(id: string) {
return request({
url: `${prefix}/area/delete`,
method: 'post',
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
index a6ddd4c..43e73d7 100644
--- a/src/views/system/area/areaSelectTree.vue
+++ b/src/views/system/area/areaSelectTree.vue
@@ -1,5 +1,5 @@
-
+
-import { reactive, ref } from 'vue'
+import { defineExpose, reactive, ref } from 'vue'
import type { IlistQuerySelectTree } from './area_interface'
import { getAreaTree } from '@/api/system/area'
@@ -19,9 +19,12 @@
const initDialog = () => {
dialogFormVisible.value = true
}
+defineExpose({
+ initDialog,
+})
// 加载数据
-const loadNode = (node, resolve) => {
+const loadNode = (node: any, resolve: any) => {
if (node.data && node.data.id) {
listQuery.pid = node.data.id
}
@@ -43,7 +46,7 @@
-
+
-import { computed, nextTick, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { computed, defineExpose, nextTick, reactive, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import AreaSelectTree from './areaSelectTree.vue'
import type { IareaForm } from './area_interface'
import { toTreeList } from '@/utils/structure'
import { addArea, getAreaType, updateArea } from '@/api/system/area'
const emits = defineEmits(['watchChild'])
-const dataFormRef = ref(null) as any
-const areaSelect = ref(null) as any
+const dataFormRef = ref()
+const areaSelect = ref()
const dialogFormVisible = ref(false) // 对话框是否显示
const dialogStatus = ref('') // 对话框类型:create,update
const isEditMode = ref(true)
-let areaForm: IareaForm = reactive ({
+const areaForm: Ref = ref({
id: '', // 编号
pid: '', // 父级编号
pName: '', // 父级名称
@@ -42,7 +43,7 @@
})
// 重置表单
const resetForm = () => {
- areaForm = {
+ areaForm.value = {
id: '', // 编号
pid: '', // 父级编号
pName: '', // 父级名称
@@ -62,19 +63,19 @@
fetchAreaType()
// 初始化对话框
-const initDialog = (dialogStatus, row = null) => {
- dialogStatus.value = dialogStatus
+const initDialog = (dialogStatusValue: string, row: IareaForm) => {
+ dialogStatus.value = dialogStatusValue
dialogFormVisible.value = true
btnLoading.value = false
- if (dialogStatus === 'create') { // 如果是新增,清除验证
+ if (dialogStatus.value === 'create') { // 如果是新增,清除验证
resetForm()
isEditMode.value = false
nextTick(() => {
dataFormRef.value.clearValidate()
})
}
- else if (dialogStatus === 'update') { // 如果是修改,将row中数据填写到输入框中
- areaForm = {
+ else if (dialogStatus.value === 'update') { // 如果是修改,将row中数据填写到输入框中
+ areaForm.value = {
id: row.id, // 编号
pid: row.pid, // 父级编号
pName: row.pName, // 父级编号
@@ -86,7 +87,9 @@
isEditMode.value = true
}
}
-
+defineExpose({
+ initDialog,
+})
// 打开区域选择弹窗
const openAreaSelect = () => {
areaSelectShow.value = true
@@ -94,17 +97,17 @@
}
// 修改pid
-const changeParent = (node) => {
- areaForm.pid = node.id
- areaForm.pName = node.name
+const changeParent = (node: any) => {
+ areaForm.value.pid = node.id
+ areaForm.value.pName = node.name
}
// 新增数据
const createData = () => {
- dataFormRef.value.validate((valid) => {
+ dataFormRef.value.validate((valid: any) => {
if (valid) {
btnLoading.value = true
- addArea(areaForm).then((response) => {
+ addArea(areaForm.value).then((response) => {
if (response.code === 200) {
ElMessageBox.confirm('新增成功,是否继续新增?', '提示', {
confirmButtonText: '是',
@@ -130,10 +133,10 @@
// 修改数据
const updateData = () => {
- dataFormRef.value.validate((valid) => {
+ dataFormRef.value.validate((valid: any) => {
if (valid) {
btnLoading.value = true
- updateArea(areaForm).then((response) => {
+ updateArea(areaForm.value).then((response) => {
if (response.code === 200) {
ElMessage({
message: '修改成功',
@@ -166,7 +169,7 @@
-
+
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 07a4c5f..8b4e5a8 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -14,7 +14,7 @@
}
// 根据部门找其默认区域
-export function getAreaByDept(deptid) {
+export function getAreaByDept(deptid: string) {
return request({
url: 'config/getAreaByDept',
method: 'get',
@@ -24,7 +24,7 @@
})
}
// 区域查询
-export function getAreaList(pid) {
+export function getAreaList(pid: string) {
return request({
url: `${prefix}/area/list`,
method: 'get',
@@ -35,7 +35,7 @@
}
// 区域查询,非分页,加载树用
-export function getAreaTree(params) {
+export function getAreaTree(params: object) {
return request({
url: `${prefix}/area/list`,
method: 'get',
@@ -51,7 +51,7 @@
}
// 添加区域
-export function addArea(data) {
+export function addArea(data: object) {
return request({
url: `${prefix}/area/add`,
method: 'post',
@@ -59,7 +59,7 @@
})
}
// 修改区域机构
-export function updateArea(data) {
+export function updateArea(data: object) {
return request({
url: `${prefix}/area/update`,
method: 'post',
@@ -67,7 +67,7 @@
})
}
// 删除区域机构
-export function delArea(id) {
+export function delArea(id: string) {
return request({
url: `${prefix}/area/delete`,
method: 'post',
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
index a6ddd4c..43e73d7 100644
--- a/src/views/system/area/areaSelectTree.vue
+++ b/src/views/system/area/areaSelectTree.vue
@@ -1,5 +1,5 @@
-
+
-import { computed, nextTick, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { computed, defineExpose, nextTick, reactive, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import AreaSelectTree from './areaSelectTree.vue'
import type { IareaForm } from './area_interface'
import { toTreeList } from '@/utils/structure'
import { addArea, getAreaType, updateArea } from '@/api/system/area'
const emits = defineEmits(['watchChild'])
-const dataFormRef = ref(null) as any
-const areaSelect = ref(null) as any
+const dataFormRef = ref()
+const areaSelect = ref()
const dialogFormVisible = ref(false) // 对话框是否显示
const dialogStatus = ref('') // 对话框类型:create,update
const isEditMode = ref(true)
-let areaForm: IareaForm = reactive ({
+const areaForm: Ref = ref({
id: '', // 编号
pid: '', // 父级编号
pName: '', // 父级名称
@@ -42,7 +43,7 @@
})
// 重置表单
const resetForm = () => {
- areaForm = {
+ areaForm.value = {
id: '', // 编号
pid: '', // 父级编号
pName: '', // 父级名称
@@ -62,19 +63,19 @@
fetchAreaType()
// 初始化对话框
-const initDialog = (dialogStatus, row = null) => {
- dialogStatus.value = dialogStatus
+const initDialog = (dialogStatusValue: string, row: IareaForm) => {
+ dialogStatus.value = dialogStatusValue
dialogFormVisible.value = true
btnLoading.value = false
- if (dialogStatus === 'create') { // 如果是新增,清除验证
+ if (dialogStatus.value === 'create') { // 如果是新增,清除验证
resetForm()
isEditMode.value = false
nextTick(() => {
dataFormRef.value.clearValidate()
})
}
- else if (dialogStatus === 'update') { // 如果是修改,将row中数据填写到输入框中
- areaForm = {
+ else if (dialogStatus.value === 'update') { // 如果是修改,将row中数据填写到输入框中
+ areaForm.value = {
id: row.id, // 编号
pid: row.pid, // 父级编号
pName: row.pName, // 父级编号
@@ -86,7 +87,9 @@
isEditMode.value = true
}
}
-
+defineExpose({
+ initDialog,
+})
// 打开区域选择弹窗
const openAreaSelect = () => {
areaSelectShow.value = true
@@ -94,17 +97,17 @@
}
// 修改pid
-const changeParent = (node) => {
- areaForm.pid = node.id
- areaForm.pName = node.name
+const changeParent = (node: any) => {
+ areaForm.value.pid = node.id
+ areaForm.value.pName = node.name
}
// 新增数据
const createData = () => {
- dataFormRef.value.validate((valid) => {
+ dataFormRef.value.validate((valid: any) => {
if (valid) {
btnLoading.value = true
- addArea(areaForm).then((response) => {
+ addArea(areaForm.value).then((response) => {
if (response.code === 200) {
ElMessageBox.confirm('新增成功,是否继续新增?', '提示', {
confirmButtonText: '是',
@@ -130,10 +133,10 @@
// 修改数据
const updateData = () => {
- dataFormRef.value.validate((valid) => {
+ dataFormRef.value.validate((valid: any) => {
if (valid) {
btnLoading.value = true
- updateArea(areaForm).then((response) => {
+ updateArea(areaForm.value).then((response) => {
if (response.code === 200) {
ElMessage({
message: '修改成功',
@@ -166,7 +169,7 @@
-
+
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index 1d5c05a..16a8cc8 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -5,7 +5,7 @@
import EditArea from './editArea.vue'
import { delArea, getAreaListPage } from '@/api/system/area'
const { proxy } = getCurrentInstance() as any
-const editarea = ref(null) as any
+const editarea = ref()
const listQuery: IlistQuery = reactive({
keywords: '',
offset: 1,
@@ -13,7 +13,7 @@
sort: '',
order: '',
}) // 筛选条件
-const columns = [
+const columns: any = [
{
text: '区域名称',
value: 'areaName',
@@ -74,24 +74,24 @@
})
// 打开详情对话框
-const detail = (row) => {
- editarea.value.detailwell.initDialog(true, row)
+const detail = (row: any) => {
+ // detailwell.initDialog(true, row)
}
// 新增区域
const add = () => {
dialogFormVisible.value = true
- editarea.value.editarea.initDialog('create')
+ editarea.value.initDialog('create')
}
// 编辑区域信息
-const edit = (row) => {
+const edit = (row: any) => {
dialogFormVisible.value = true
// editShow = true
- editarea.value.editarea.initDialog('update', row)
+ editarea.value.initDialog('update', row)
}
// 删除区域
-const del = (row) => {
+const del = (row: any) => {
ElMessageBox.confirm(
'确定要删除区域吗?',
'确认操作',
@@ -118,7 +118,7 @@
fetchData(false)
}
// 页数发生变化后的操作,可能是页码变化,可能是每页容量变化,此函数必写
-const changePage = (val) => {
+const changePage = (val: any) => {
if (val && val.size) {
listQuery.limit = val.size
}
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 07a4c5f..8b4e5a8 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -14,7 +14,7 @@
}
// 根据部门找其默认区域
-export function getAreaByDept(deptid) {
+export function getAreaByDept(deptid: string) {
return request({
url: 'config/getAreaByDept',
method: 'get',
@@ -24,7 +24,7 @@
})
}
// 区域查询
-export function getAreaList(pid) {
+export function getAreaList(pid: string) {
return request({
url: `${prefix}/area/list`,
method: 'get',
@@ -35,7 +35,7 @@
}
// 区域查询,非分页,加载树用
-export function getAreaTree(params) {
+export function getAreaTree(params: object) {
return request({
url: `${prefix}/area/list`,
method: 'get',
@@ -51,7 +51,7 @@
}
// 添加区域
-export function addArea(data) {
+export function addArea(data: object) {
return request({
url: `${prefix}/area/add`,
method: 'post',
@@ -59,7 +59,7 @@
})
}
// 修改区域机构
-export function updateArea(data) {
+export function updateArea(data: object) {
return request({
url: `${prefix}/area/update`,
method: 'post',
@@ -67,7 +67,7 @@
})
}
// 删除区域机构
-export function delArea(id) {
+export function delArea(id: string) {
return request({
url: `${prefix}/area/delete`,
method: 'post',
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
index a6ddd4c..43e73d7 100644
--- a/src/views/system/area/areaSelectTree.vue
+++ b/src/views/system/area/areaSelectTree.vue
@@ -1,5 +1,5 @@
-
+
-import { computed, nextTick, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { computed, defineExpose, nextTick, reactive, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import AreaSelectTree from './areaSelectTree.vue'
import type { IareaForm } from './area_interface'
import { toTreeList } from '@/utils/structure'
import { addArea, getAreaType, updateArea } from '@/api/system/area'
const emits = defineEmits(['watchChild'])
-const dataFormRef = ref(null) as any
-const areaSelect = ref(null) as any
+const dataFormRef = ref()
+const areaSelect = ref()
const dialogFormVisible = ref(false) // 对话框是否显示
const dialogStatus = ref('') // 对话框类型:create,update
const isEditMode = ref(true)
-let areaForm: IareaForm = reactive ({
+const areaForm: Ref = ref({
id: '', // 编号
pid: '', // 父级编号
pName: '', // 父级名称
@@ -42,7 +43,7 @@
})
// 重置表单
const resetForm = () => {
- areaForm = {
+ areaForm.value = {
id: '', // 编号
pid: '', // 父级编号
pName: '', // 父级名称
@@ -62,19 +63,19 @@
fetchAreaType()
// 初始化对话框
-const initDialog = (dialogStatus, row = null) => {
- dialogStatus.value = dialogStatus
+const initDialog = (dialogStatusValue: string, row: IareaForm) => {
+ dialogStatus.value = dialogStatusValue
dialogFormVisible.value = true
btnLoading.value = false
- if (dialogStatus === 'create') { // 如果是新增,清除验证
+ if (dialogStatus.value === 'create') { // 如果是新增,清除验证
resetForm()
isEditMode.value = false
nextTick(() => {
dataFormRef.value.clearValidate()
})
}
- else if (dialogStatus === 'update') { // 如果是修改,将row中数据填写到输入框中
- areaForm = {
+ else if (dialogStatus.value === 'update') { // 如果是修改,将row中数据填写到输入框中
+ areaForm.value = {
id: row.id, // 编号
pid: row.pid, // 父级编号
pName: row.pName, // 父级编号
@@ -86,7 +87,9 @@
isEditMode.value = true
}
}
-
+defineExpose({
+ initDialog,
+})
// 打开区域选择弹窗
const openAreaSelect = () => {
areaSelectShow.value = true
@@ -94,17 +97,17 @@
}
// 修改pid
-const changeParent = (node) => {
- areaForm.pid = node.id
- areaForm.pName = node.name
+const changeParent = (node: any) => {
+ areaForm.value.pid = node.id
+ areaForm.value.pName = node.name
}
// 新增数据
const createData = () => {
- dataFormRef.value.validate((valid) => {
+ dataFormRef.value.validate((valid: any) => {
if (valid) {
btnLoading.value = true
- addArea(areaForm).then((response) => {
+ addArea(areaForm.value).then((response) => {
if (response.code === 200) {
ElMessageBox.confirm('新增成功,是否继续新增?', '提示', {
confirmButtonText: '是',
@@ -130,10 +133,10 @@
// 修改数据
const updateData = () => {
- dataFormRef.value.validate((valid) => {
+ dataFormRef.value.validate((valid: any) => {
if (valid) {
btnLoading.value = true
- updateArea(areaForm).then((response) => {
+ updateArea(areaForm.value).then((response) => {
if (response.code === 200) {
ElMessage({
message: '修改成功',
@@ -166,7 +169,7 @@
-
+
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index 1d5c05a..16a8cc8 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -5,7 +5,7 @@
import EditArea from './editArea.vue'
import { delArea, getAreaListPage } from '@/api/system/area'
const { proxy } = getCurrentInstance() as any
-const editarea = ref(null) as any
+const editarea = ref()
const listQuery: IlistQuery = reactive({
keywords: '',
offset: 1,
@@ -13,7 +13,7 @@
sort: '',
order: '',
}) // 筛选条件
-const columns = [
+const columns: any = [
{
text: '区域名称',
value: 'areaName',
@@ -74,24 +74,24 @@
})
// 打开详情对话框
-const detail = (row) => {
- editarea.value.detailwell.initDialog(true, row)
+const detail = (row: any) => {
+ // detailwell.initDialog(true, row)
}
// 新增区域
const add = () => {
dialogFormVisible.value = true
- editarea.value.editarea.initDialog('create')
+ editarea.value.initDialog('create')
}
// 编辑区域信息
-const edit = (row) => {
+const edit = (row: any) => {
dialogFormVisible.value = true
// editShow = true
- editarea.value.editarea.initDialog('update', row)
+ editarea.value.initDialog('update', row)
}
// 删除区域
-const del = (row) => {
+const del = (row: any) => {
ElMessageBox.confirm(
'确定要删除区域吗?',
'确认操作',
@@ -118,7 +118,7 @@
fetchData(false)
}
// 页数发生变化后的操作,可能是页码变化,可能是每页容量变化,此函数必写
-const changePage = (val) => {
+const changePage = (val: any) => {
if (val && val.size) {
listQuery.limit = val.size
}
diff --git a/src/views/system/tenant/relateDept.vue b/src/views/system/tenant/relateDept.vue
index 458d7ee..28d95cc 100644
--- a/src/views/system/tenant/relateDept.vue
+++ b/src/views/system/tenant/relateDept.vue
@@ -1,5 +1,5 @@