列表修改

pull/1/head
杨世强 1 year ago
parent 8901914034
commit bd25ab896d

@ -37,4 +37,7 @@ public class RoleBaseVO {
@Schema(description = "成员数量", example = "1024")
private Integer employeeNum;
@Schema(description = "状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer status;
}

@ -0,0 +1,217 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="业务线编号" prop="businessCode">
<el-input v-model="formData.businessCode" placeholder="请输入业务线编号" />
</el-form-item>
<el-form-item label="业务线名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入业务线名称" />
</el-form-item>
<el-form-item label="业务线简称" prop="businessSimple">
<el-input v-model="formData.businessSimple" placeholder="请输入业务线简称" />
</el-form-item>
<el-form-item label="业务线LOGO">
<UploadImg v-model="formData.businessLogo" />
</el-form-item>
<el-form-item label="父id" prop="parentId">
<el-input v-model="formData.parentId" placeholder="请输入父id" />
</el-form-item>
<el-form-item label="类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择类型">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.BUSINESS_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="formData.status" placeholder="请选择状态">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.CLASS_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="关联机构" prop="institutionNum">
<el-input v-model="formData.institutionNum" placeholder="请输入关联机构" />
</el-form-item>
<el-form-item label="成员数量" prop="employeeNum">
<el-input v-model="formData.employeeNum" placeholder="请输入成员数量" />
</el-form-item>
<el-form-item label="所属分类" prop="industry">
<el-select v-model="formData.industry" placeholder="请选择所属分类">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.DUTY_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="所在城市" prop="city">
<el-input v-model="formData.city" placeholder="请输入所在城市" />
</el-form-item>
<el-form-item label="成立时间" prop="establishDate">
<el-date-picker
v-model="formData.establishDate"
type="date"
value-format="x"
placeholder="选择成立时间"
/>
</el-form-item>
<el-form-item label="归属人员" prop="belongUserId">
<el-input v-model="formData.belongUserId" placeholder="请输入归属人员" />
</el-form-item>
<el-form-item label="品牌/业务线/事业群名称" prop="brandName">
<el-input v-model="formData.brandName" placeholder="请输入品牌/业务线/事业群名称" />
</el-form-item>
<el-form-item label="电话" prop="phone">
<el-input v-model="formData.phone" placeholder="请输入电话" />
</el-form-item>
<el-form-item label="业务线仓库区分(0业务线,1仓库)" prop="diffFlag">
<el-select v-model="formData.diffFlag" placeholder="请选择业务线仓库区分(0业务线,1仓库)">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.DIFF_FLAG)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="传真" prop="fax">
<el-input v-model="formData.fax" placeholder="请输入传真" />
</el-form-item>
<el-form-item label="网址" prop="url">
<el-input v-model="formData.url" placeholder="请输入网址" />
</el-form-item>
<el-form-item label="介绍" prop="description">
<el-input v-model="formData.description" type="textarea" placeholder="请输入介绍" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import * as BusinessWarehouseApi from '@/api/xxjj/businessWarehouse'
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
businessCode: undefined,
name: undefined,
businessSimple: undefined,
businessLogo: undefined,
parentId: undefined,
type: undefined,
status: undefined,
institutionNum: undefined,
employeeNum: undefined,
industry: undefined,
city: undefined,
establishDate: undefined,
belongUserId: undefined,
brandName: undefined,
phone: undefined,
diffFlag: undefined,
fax: undefined,
url: undefined,
description: undefined
})
const formRules = reactive({
businessCode: [{ required: true, message: '业务线编号不能为空', trigger: 'blur' }],
name: [{ required: true, message: '业务线名称不能为空', trigger: 'blur' }],
diffFlag: [{ required: true, message: '业务线仓库区分(0业务线,1仓库)不能为空', trigger: 'change' }]
})
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
if (id) {
formLoading.value = true
try {
formData.value = await BusinessWarehouseApi.getBusinessWarehouse(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
//
formLoading.value = true
try {
const data = formData.value as unknown as BusinessWarehouseApi.BusinessWarehouseVO
if (formType.value === 'create') {
await BusinessWarehouseApi.createBusinessWarehouse(data)
message.success(t('common.createSuccess'))
} else {
await BusinessWarehouseApi.updateBusinessWarehouse(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
businessCode: undefined,
name: undefined,
businessSimple: undefined,
businessLogo: undefined,
parentId: undefined,
type: undefined,
status: undefined,
institutionNum: undefined,
employeeNum: undefined,
industry: undefined,
city: undefined,
establishDate: undefined,
belongUserId: undefined,
brandName: undefined,
phone: undefined,
diffFlag: undefined,
fax: undefined,
url: undefined,
description: undefined
}
formRef.value?.resetFields()
}
</script>

@ -0,0 +1,200 @@
<template>
<el-drawer :model-value="props.isShow" :with-header="true" :show-close="false" class="xy-drawer" @closed="doClose"
size="40%">
<template #header style="background-color: red;">
<div class="xy-header-l">
<el-icon>
<Filter />
</el-icon>
</div>
<div class="xy-header-r">
<el-button type="" link :icon="ArrowRightBold" @click="doClose"></el-button>
</div>
</template>
<template #default>
<el-form :model="queryParams" ref="queryFormRef">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="部门名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入部门名称" clearable @keyup.enter="handleQuery"
style="width: 100%;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部门状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
<template #footer>
<div class="xy-footer">
<el-button type="primary" :icon="Search" @click="handleQuery"></el-button>
<el-button :icon="RefreshLeft" @click="resetQuery"></el-button>
</div>
</template>
</el-drawer>
</template>
<script setup lang="ts" name="DrawerFilter">
import { Filter, ArrowRightBold, Search, RefreshLeft } from '@element-plus/icons-vue'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import * as DeptApi from '@/api/system/dept'
import { handleTree } from '@/utils/tree'
const list = ref() //
const queryFormRef = ref() //
const loading = ref(true) //
const props = defineProps({
isShow: Boolean
})
const emit = defineEmits(['doClose'])
//
const doClose = () => {
emit('doClose', false)
}
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
businessType: null,
calssify: null,
name: null,
logo: null,
enterpriseNature: null,
industryClassify: null,
customerSource: null,
customerStarrating: null,
industrySchedule: null,
belongingPeople: null,
city: null,
country: null,
address: null,
phone: null,
companyFax: null,
companyHttp: null,
companyProfile: null,
customerStatus: null,
socialInformationCodeCertificate: null,
registerAddress: null,
informationCode: null,
operateStart: null,
operateEnd: null,
registerCapital: null,
businessScope: null,
proofPaidCapital: null,
assetCertificate: null,
assetCertificateMortgage: null,
otherQualifications: null,
collaborationStart: null,
collaborationEnd: null,
demandVolumeDown: null,
demandVolumeUpper: null,
fundLimit: null,
businessHours: null,
businessStart: null,
businessEnd: null,
allowableUnloadingStart: null,
allowableUnloadingEnd: null,
unloading: null,
unloadingEfficiency: null,
allowableShipmentStart: null,
allowableShipmentEnd: null,
shipment: null,
shipmentEffciency: null,
paymentMethod: null,
accountName: null,
bankAccount: null,
bankDeposit: null,
depositArea: null,
bankBranch: null,
companyTaxNumber: null,
enterpriseName: null,
workAddress: null,
collaborationMethod: null,
settlementMethod: null,
accountPeriod: null,
underpaymentMethod: null,
applyForUnderpaymentRatio: null,
marginMethod: null,
applyForMarginRatio: null,
overdueInterestRate: null,
applyForOverdueRatio: null,
reservedFields1: null,
reservedFields2: null,
reservedFields3: null,
reservedFields4: null,
reservedFields5: null,
reservedFields6: null,
creditRating: null,
autoCreditRating: null,
accountsReceivableUpper: null,
orderQuantityDown: null,
orderQuantityUpper: null,
accountsReceivableOverdue: null,
taxPaymentCertificate: null,
createTime: []
})
/** 查询部门列表 */
const getList = async () => {
loading.value = true
try {
debugger
const data = await DeptApi.getDeptPage(queryParams)
list.value = handleTree(data)
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
debugger
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryParams.pageNo = 1
queryFormRef.value.resetFields()
handleQuery()
}
</script>
<style lang="scss">
.xy-drawer {
.el-drawer__header {
margin: 0px;
border-bottom: solid 1px #D9D9D9;
padding: 10px 0px;
height: 50px;
.xy-header-l {
padding: 0px 10px;
}
.xy-header-r {
padding: 0px 10px;
}
}
.el-drawer__footer {
border-top: solid 1px #D9D9D9;
padding: 0px;
.xy-footer {
padding: 10px;
}
}
}
</style>

@ -0,0 +1,300 @@
<template>
<ContentWrap title="业务组织">
<!-- 搜索工作栏 -->
<el-row>
<el-col :span="24">
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-row>
<el-col :span="18">
<el-form-item label="" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入业务线名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button type="primary" link :icon="Filter" @click="doShowDrawerFilterA(true)"></el-button>
</el-form-item>
</el-col>
<el-col :span="6">
<el-button
type="primary"
@click="openForm('create')"
v-hasPermi="['system:business-warehouse:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增业务线
</el-button>
<el-button type="danger" plain @click="toggleExpandAll">
<Icon icon="ep:sort" class="mr-5px" /> 展开/折叠
</el-button>
</el-col>
</el-row>
</el-form>
</el-col>
</el-row>
<el-row>
<el-col :span="24" style="margin: 10px 0px;">
<!-- 列表 -->
<el-table v-loading="loading" :data="list" row-key="id" :stripe="true" :show-overflow-tooltip="true" :default-expand-all="isExpandAll" class="xy-table">
<!-- <el-table-column label="序号" type="index" width="70px" />
<el-table-column label="业务id" align="center" prop="id" width="150px"/>
<el-table-column label="业务线编号" align="center" prop="businessCode" width="150px"/> -->
<el-table-column label="业务线名称" fixed align="center" prop="name" width="150px"/>
<!-- <el-table-column label="业务线简称" align="center" prop="businessSimple" width="150px"/>
<el-table-column label="业务线LOGO" align="center" prop="businessLogo" width="150px"/>
<el-table-column label="父id" align="center" prop="parentId" width="150px"/> -->
<el-table-column label="类型" align="center" prop="type" width="150px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BUSINESS_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" width="150px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CLASS_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="关联机构" align="center" prop="institutionNum" width="150px"/>
<el-table-column label="成员数量" align="center" prop="employeeNum" width="150px"/>
<!-- <el-table-column label="所属分类" align="center" prop="industry" width="150px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.DUTY_TYPE" :value="scope.row.industry" />
</template>
</el-table-column>
<el-table-column label="所在城市" align="center" prop="city" width="150px"/>
<el-table-column
label="成立时间"
align="center"
prop="establishDate"
:formatter="dateFormatter"
width="150px"
/> -->
<el-table-column label="主管人员" align="center" prop="belongUserId" width="150px"/>
<!-- <el-table-column label="品牌/业务线/事业群名称" align="center" prop="brandName" width="150px"/>
<el-table-column label="电话" align="center" prop="phone" width="150px"/>
<el-table-column label="业务线仓库区分(0业务线,1仓库)" align="center" prop="diffFlag" width="150px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.DIFF_FLAG" :value="scope.row.diffFlag" />
</template>
</el-table-column>
<el-table-column label="传真" align="center" prop="fax" width="150px"/>
<el-table-column label="网址" align="center" prop="url" width="150px"/> -->
<el-table-column label="描述" align="center" prop="description" width="200px"/>
<el-table-column
label="更新时间"
align="center"
prop="updateTime"
:formatter="dateFormatter"
width="150px"
/>
<el-table-column label="操作" fixed="right" align="center" width="350">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:business-warehouse:update']"
>
编辑
</el-button>
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:business-warehouse:update']"
>
关联机构
</el-button>
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:business-warehouse:update']"
>
设置状态
</el-button>
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:business-warehouse:update']"
>
复制
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['system:business-warehouse:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</el-col>
</el-row>
</ContentWrap>
<DrawerFilter :isShow="isShowDrawerFilterA" @do-close="doCloseDrawerFilterA" />
<!-- 表单弹窗添加/修改 -->
<BusinessWarehouseForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts" name="BusinessWarehouse">
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import * as BusinessWarehouseApi from '@/api/xxjj/businessWarehouse'
import BusinessWarehouseForm from './BusinessWarehouseForm.vue'
import { handleTree } from '@/utils/tree'
import DrawerFilter from './DrawerFilter.vue'
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const total = ref(0) //
const list = ref([]) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
businessCode: null,
name: null,
businessSimple: null,
businessLogo: null,
parentId: null,
type: null,
status: null,
institutionNum: null,
employeeNum: null,
industry: null,
city: null,
establishDate: [],
belongUserId: null,
brandName: null,
phone: null,
diffFlag: null,
fax: null,
url: null,
description: null,
createTime: []
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
const isExpandAll = ref(true) //
const refreshTable = ref(true) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await BusinessWarehouseApi.getBusinessWarehousePage(queryParams)
list.value = handleTree(data.list)
total.value = data.total
} finally {
loading.value = false
}
}
/** 展开/折叠操作 */
const toggleExpandAll = () => {
refreshTable.value = false
isExpandAll.value = !isExpandAll.value
nextTick(() => {
refreshTable.value = true
})
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await BusinessWarehouseApi.deleteBusinessWarehouse(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await BusinessWarehouseApi.exportBusinessWarehouse(queryParams)
download.excel(data, '业务线表.xls')
} catch {
} finally {
exportLoading.value = false
}
}
//
let isShowDrawerFilterA = ref(false);
const doShowDrawerFilterA = (isshow: boolean) => {
isShowDrawerFilterA.value = isshow;
}
const doCloseDrawerFilterA = (isshow: boolean) => {
isShowDrawerFilterA.value = isshow;
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>
<style lang="scss">
.xy-table thead {
color: #1D2129;
}
.xy-table thead th.el-table__cell {
background-color: #F7F8FA;
}
.xy-table.is-scrolling-left th.el-table-fixed-column--left {
background-color: #F7F8FA;
}
</style>

@ -0,0 +1,200 @@
<template>
<el-drawer :model-value="props.isShow" :with-header="true" :show-close="false" class="xy-drawer" @closed="doClose"
size="40%">
<template #header style="background-color: red;">
<div class="xy-header-l">
<el-icon>
<Filter />
</el-icon>
</div>
<div class="xy-header-r">
<el-button type="" link :icon="ArrowRightBold" @click="doClose"></el-button>
</div>
</template>
<template #default>
<el-form :model="queryParams" ref="queryFormRef">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="部门名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入部门名称" clearable @keyup.enter="handleQuery"
style="width: 100%;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部门状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
<template #footer>
<div class="xy-footer">
<el-button type="primary" :icon="Search" @click="handleQuery"></el-button>
<el-button :icon="RefreshLeft" @click="resetQuery"></el-button>
</div>
</template>
</el-drawer>
</template>
<script setup lang="ts" name="DrawerFilter">
import { Filter, ArrowRightBold, Search, RefreshLeft } from '@element-plus/icons-vue'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import * as DeptApi from '@/api/system/dept'
import { handleTree } from '@/utils/tree'
const list = ref() //
const queryFormRef = ref() //
const loading = ref(true) //
const props = defineProps({
isShow: Boolean
})
const emit = defineEmits(['doClose'])
//
const doClose = () => {
emit('doClose', false)
}
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
businessType: null,
calssify: null,
name: null,
logo: null,
enterpriseNature: null,
industryClassify: null,
customerSource: null,
customerStarrating: null,
industrySchedule: null,
belongingPeople: null,
city: null,
country: null,
address: null,
phone: null,
companyFax: null,
companyHttp: null,
companyProfile: null,
customerStatus: null,
socialInformationCodeCertificate: null,
registerAddress: null,
informationCode: null,
operateStart: null,
operateEnd: null,
registerCapital: null,
businessScope: null,
proofPaidCapital: null,
assetCertificate: null,
assetCertificateMortgage: null,
otherQualifications: null,
collaborationStart: null,
collaborationEnd: null,
demandVolumeDown: null,
demandVolumeUpper: null,
fundLimit: null,
businessHours: null,
businessStart: null,
businessEnd: null,
allowableUnloadingStart: null,
allowableUnloadingEnd: null,
unloading: null,
unloadingEfficiency: null,
allowableShipmentStart: null,
allowableShipmentEnd: null,
shipment: null,
shipmentEffciency: null,
paymentMethod: null,
accountName: null,
bankAccount: null,
bankDeposit: null,
depositArea: null,
bankBranch: null,
companyTaxNumber: null,
enterpriseName: null,
workAddress: null,
collaborationMethod: null,
settlementMethod: null,
accountPeriod: null,
underpaymentMethod: null,
applyForUnderpaymentRatio: null,
marginMethod: null,
applyForMarginRatio: null,
overdueInterestRate: null,
applyForOverdueRatio: null,
reservedFields1: null,
reservedFields2: null,
reservedFields3: null,
reservedFields4: null,
reservedFields5: null,
reservedFields6: null,
creditRating: null,
autoCreditRating: null,
accountsReceivableUpper: null,
orderQuantityDown: null,
orderQuantityUpper: null,
accountsReceivableOverdue: null,
taxPaymentCertificate: null,
createTime: []
})
/** 查询部门列表 */
const getList = async () => {
loading.value = true
try {
debugger
const data = await DeptApi.getDeptPage(queryParams)
list.value = handleTree(data)
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
debugger
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryParams.pageNo = 1
queryFormRef.value.resetFields()
handleQuery()
}
</script>
<style lang="scss">
.xy-drawer {
.el-drawer__header {
margin: 0px;
border-bottom: solid 1px #D9D9D9;
padding: 10px 0px;
height: 50px;
.xy-header-l {
padding: 0px 10px;
}
.xy-header-r {
padding: 0px 10px;
}
}
.el-drawer__footer {
border-top: solid 1px #D9D9D9;
padding: 0px;
.xy-footer {
padding: 10px;
}
}
}
</style>

@ -0,0 +1,217 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="业务线编号" prop="businessCode">
<el-input v-model="formData.businessCode" placeholder="请输入业务线编号" />
</el-form-item>
<el-form-item label="业务线名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入业务线名称" />
</el-form-item>
<el-form-item label="业务线简称" prop="businessSimple">
<el-input v-model="formData.businessSimple" placeholder="请输入业务线简称" />
</el-form-item>
<el-form-item label="业务线LOGO">
<UploadImg v-model="formData.businessLogo" />
</el-form-item>
<el-form-item label="父id" prop="parentId">
<el-input v-model="formData.parentId" placeholder="请输入父id" />
</el-form-item>
<el-form-item label="类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择类型">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.BUSINESS_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="formData.status" placeholder="请选择状态">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.CLASS_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="关联机构" prop="institutionNum">
<el-input v-model="formData.institutionNum" placeholder="请输入关联机构" />
</el-form-item>
<el-form-item label="成员数量" prop="employeeNum">
<el-input v-model="formData.employeeNum" placeholder="请输入成员数量" />
</el-form-item>
<el-form-item label="所属分类" prop="industry">
<el-select v-model="formData.industry" placeholder="请选择所属分类">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.DUTY_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="所在城市" prop="city">
<el-input v-model="formData.city" placeholder="请输入所在城市" />
</el-form-item>
<el-form-item label="成立时间" prop="establishDate">
<el-date-picker
v-model="formData.establishDate"
type="date"
value-format="x"
placeholder="选择成立时间"
/>
</el-form-item>
<el-form-item label="归属人员" prop="belongUserId">
<el-input v-model="formData.belongUserId" placeholder="请输入归属人员" />
</el-form-item>
<el-form-item label="品牌/业务线/事业群名称" prop="brandName">
<el-input v-model="formData.brandName" placeholder="请输入品牌/业务线/事业群名称" />
</el-form-item>
<el-form-item label="电话" prop="phone">
<el-input v-model="formData.phone" placeholder="请输入电话" />
</el-form-item>
<el-form-item label="业务线仓库区分(0业务线,1仓库)" prop="diffFlag">
<el-select v-model="formData.diffFlag" placeholder="请选择业务线仓库区分(0业务线,1仓库)">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.DIFF_FLAG)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="传真" prop="fax">
<el-input v-model="formData.fax" placeholder="请输入传真" />
</el-form-item>
<el-form-item label="网址" prop="url">
<el-input v-model="formData.url" placeholder="请输入网址" />
</el-form-item>
<el-form-item label="介绍" prop="description">
<el-input v-model="formData.description" type="textarea" placeholder="请输入介绍" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import * as BusinessWarehouseApi from '@/api/xxjj/businessWarehouse'
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
businessCode: undefined,
name: undefined,
businessSimple: undefined,
businessLogo: undefined,
parentId: undefined,
type: undefined,
status: undefined,
institutionNum: undefined,
employeeNum: undefined,
industry: undefined,
city: undefined,
establishDate: undefined,
belongUserId: undefined,
brandName: undefined,
phone: undefined,
diffFlag: undefined,
fax: undefined,
url: undefined,
description: undefined
})
const formRules = reactive({
businessCode: [{ required: true, message: '业务线编号不能为空', trigger: 'blur' }],
name: [{ required: true, message: '业务线名称不能为空', trigger: 'blur' }],
diffFlag: [{ required: true, message: '业务线仓库区分(0业务线,1仓库)不能为空', trigger: 'change' }]
})
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
if (id) {
formLoading.value = true
try {
formData.value = await BusinessWarehouseApi.getBusinessWarehouse(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
//
formLoading.value = true
try {
const data = formData.value as unknown as BusinessWarehouseApi.BusinessWarehouseVO
if (formType.value === 'create') {
await BusinessWarehouseApi.createBusinessWarehouse(data)
message.success(t('common.createSuccess'))
} else {
await BusinessWarehouseApi.updateBusinessWarehouse(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
businessCode: undefined,
name: undefined,
businessSimple: undefined,
businessLogo: undefined,
parentId: undefined,
type: undefined,
status: undefined,
institutionNum: undefined,
employeeNum: undefined,
industry: undefined,
city: undefined,
establishDate: undefined,
belongUserId: undefined,
brandName: undefined,
phone: undefined,
diffFlag: undefined,
fax: undefined,
url: undefined,
description: undefined
}
formRef.value?.resetFields()
}
</script>

@ -1,15 +1,8 @@
<template>
<el-card class="box-card" style="width: 1520px;height: 1409px;margin:20px auto">
<!-- title -->
<template #header>
<div class="card-header">
<span>业务线管理</span>
</div>
</template>
<ContentWrap>
<ContentWrap title="业务线管理">
<!-- 搜索工作栏 -->
<el-row>
<el-col :span="21">
<el-col :span="24">
<el-form
class="-mb-15px"
:model="queryParams"
@ -17,6 +10,8 @@
:inline="true"
label-width="68px"
>
<el-row>
<el-col :span="21">
<el-form-item label="" prop="name">
<el-input
v-model="queryParams.name"
@ -29,8 +24,8 @@
<el-form-item>
<el-button type="primary" @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button type="primary" link :icon="Filter" @click="doShowDrawerFilterA(true)"></el-button>
</el-form-item>
</el-form>
</el-col>
<el-col :span="3">
<el-button
@ -43,16 +38,17 @@
</el-button>
</el-col>
</el-row>
</ContentWrap>
</el-form>
</el-col>
</el-row>
<el-row>
<el-col :span="24" style="margin: 10px 0px;">
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<!-- <el-table-column label="序号" type="index" width="70px" />
<el-table-column label="业务id" align="center" prop="id" width="150px"/>
<el-table-column label="业务线编号" align="center" prop="businessCode" width="150px"/> -->
<el-table-column label="业务线名称" align="center" prop="name" width="150px"/>
<el-table-column label="业务线名称" fixed align="center" prop="name" width="150px"/>
<!-- <el-table-column label="业务线简称" align="center" prop="businessSimple" width="150px"/>
<el-table-column label="业务线LOGO" align="center" prop="businessLogo" width="150px"/>
<el-table-column label="父id" align="center" prop="parentId" width="150px"/> -->
@ -99,7 +95,7 @@
:formatter="dateFormatter"
width="150px"
/>
<el-table-column label="操作" align="center" >
<el-table-column label="操作" fixed="right" align="center" width="350">
<template #default="scope">
<el-button
link
@ -109,6 +105,30 @@
>
编辑
</el-button>
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:business-warehouse:update']"
>
关联机构
</el-button>
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:business-warehouse:update']"
>
设置状态
</el-button>
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:business-warehouse:update']"
>
复制
</el-button>
<el-button
link
type="danger"
@ -127,11 +147,12 @@
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</el-col>
</el-row>
</ContentWrap>
<DrawerFilter :isShow="isShowDrawerFilterA" @do-close="doCloseDrawerFilterA" />
<!-- 表单弹窗添加/修改 -->
<BusinessWarehouseForm ref="formRef" @success="getList" />
</el-card>
</template>
<script setup lang="ts" name="BusinessWarehouse">
@ -140,6 +161,7 @@ import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import * as BusinessWarehouseApi from '@/api/xxjj/businessWarehouse'
import BusinessWarehouseForm from './BusinessWarehouseForm.vue'
import DrawerFilter from './DrawerFilter.vue'
const message = useMessage() //
const { t } = useI18n() //
@ -185,6 +207,15 @@ const getList = async () => {
}
}
//
let isShowDrawerFilterA = ref(false);
const doShowDrawerFilterA = (isshow: boolean) => {
isShowDrawerFilterA.value = isshow;
}
const doCloseDrawerFilterA = (isshow: boolean) => {
isShowDrawerFilterA.value = isshow;
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1

@ -7,6 +7,9 @@
:rules="formRules"
label-width="80px"
>
<el-form-item label="部门名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入部门名称" />
</el-form-item>
<el-form-item label="上级部门" prop="parentId">
<el-tree-select
v-model="formData.parentId"
@ -18,9 +21,6 @@
value-key="deptId"
/>
</el-form-item>
<el-form-item label="部门名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入部门名称" />
</el-form-item>
<el-form-item label="显示排序" prop="sort">
<el-input-number v-model="formData.sort" :min="0" controls-position="right" />
</el-form-item>
@ -34,11 +34,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="联系电话" prop="phone">
<el-input v-model="formData.phone" maxlength="11" placeholder="请输入联系电话" />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="formData.email" maxlength="50" placeholder="请输入邮箱" />
<el-form-item label="部门描述" prop="remake">
<el-input v-model="formData.remake" type="textarea" maxlength="60" show-word-limit placeholder="请输入部门描述" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="formData.status" clearable placeholder="请选择状态">
@ -82,7 +79,8 @@ const formData = ref({
leaderUserId: undefined,
phone: undefined,
email: undefined,
status: CommonStatusEnum.ENABLE
status: CommonStatusEnum.ENABLE,
remake: undefined
})
const formRules = reactive({
parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],

@ -15,44 +15,26 @@
<el-form :model="queryParams" ref="queryFormRef">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="客户名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入客户名称" clearable @keyup.enter="handleQuery"
<el-form-item label="部门名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入部门名称" clearable @keyup.enter="handleQuery"
style="width: 100%;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户分类" prop="calssify">
<el-select v-model="queryParams.calssify" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.CUSTOMER_CALSSIFY)" :key="dict.value"
<el-form-item label="部门状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="企业性质" prop="enterpriseNature">
<el-select v-model="queryParams.enterpriseNature" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.enterpriseNature)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="创建时间" prop="createTime">
<el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss"
type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-240px"
style="width: 100%;" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
<template #footer>
<div class="xy-footer">
<el-button type="primary" :icon="Search">查询</el-button>
<el-button :icon="RefreshLeft">重置</el-button>
<el-button type="primary" :icon="Search" @click="handleQuery"></el-button>
<el-button :icon="RefreshLeft" @click="resetQuery"></el-button>
</div>
</template>
</el-drawer>
@ -61,7 +43,12 @@
<script setup lang="ts" name="DrawerFilter">
import { Filter, ArrowRightBold, Search, RefreshLeft } from '@element-plus/icons-vue'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import * as DeptApi from '@/api/system/dept'
import { handleTree } from '@/utils/tree'
const list = ref() //
const queryFormRef = ref() //
const loading = ref(true) //
const props = defineProps({
isShow: Boolean
})
@ -73,6 +60,7 @@ const doClose = () => {
emit('doClose', false)
}
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
@ -154,6 +142,32 @@ const queryParams = reactive({
taxPaymentCertificate: null,
createTime: []
})
/** 查询部门列表 */
const getList = async () => {
loading.value = true
try {
debugger
const data = await DeptApi.getDeptPage(queryParams)
list.value = handleTree(data)
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
debugger
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryParams.pageNo = 1
queryFormRef.value.resetFields()
handleQuery()
}
</script>
<style lang="scss">

@ -12,7 +12,7 @@
>
<el-row>
<el-col :span="24">
<el-form-item label="部门名称" prop="title">
<el-form-item label="部门名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入部门名称"
@ -106,7 +106,15 @@
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:dept:update']"
>
修改
编辑
</el-button>
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:dept:update']"
>
设置状态
</el-button>
<el-button
link

@ -15,44 +15,26 @@
<el-form :model="queryParams" ref="queryFormRef">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="客户名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入客户名称" clearable @keyup.enter="handleQuery"
<el-form-item label="职务名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入职务名称" clearable @keyup.enter="handleQuery"
style="width: 100%;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户分类" prop="calssify">
<el-select v-model="queryParams.calssify" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.CUSTOMER_CALSSIFY)" :key="dict.value"
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="企业性质" prop="enterpriseNature">
<el-select v-model="queryParams.enterpriseNature" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.enterpriseNature)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="创建时间" prop="createTime">
<el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss"
type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-240px"
style="width: 100%;" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
<template #footer>
<div class="xy-footer">
<el-button type="primary" :icon="Search">查询</el-button>
<el-button :icon="RefreshLeft">重置</el-button>
<el-button type="primary" :icon="Search" @click="handleQuery"></el-button>
<el-button :icon="RefreshLeft" @click="resetQuery"></el-button>
</div>
</template>
</el-drawer>
@ -61,7 +43,12 @@
<script setup lang="ts" name="DrawerFilter">
import { Filter, ArrowRightBold, Search, RefreshLeft } from '@element-plus/icons-vue'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import * as DeptApi from '@/api/system/dept'
import { handleTree } from '@/utils/tree'
const list = ref() //
const queryFormRef = ref() //
const loading = ref(true) //
const props = defineProps({
isShow: Boolean
})
@ -73,6 +60,7 @@ const doClose = () => {
emit('doClose', false)
}
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
@ -154,6 +142,32 @@ const queryParams = reactive({
taxPaymentCertificate: null,
createTime: []
})
/** 查询部门列表 */
const getList = async () => {
loading.value = true
try {
debugger
const data = await DeptApi.getDeptPage(queryParams)
list.value = handleTree(data)
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
debugger
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryParams.pageNo = 1
queryFormRef.value.resetFields()
handleQuery()
}
</script>
<style lang="scss">

@ -7,15 +7,15 @@
:rules="formRules"
label-width="80px"
>
<el-form-item label="岗位标题" prop="name">
<el-input v-model="formData.name" placeholder="请输入岗位标题" />
<el-form-item label="职务名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入职务名称" />
</el-form-item>
<el-form-item label="岗位编码" prop="code">
<el-input v-model="formData.code" placeholder="请输入岗位编码" />
<el-form-item label="职务编码" prop="code">
<el-input v-model="formData.code" placeholder="请输入职务编码" />
</el-form-item>
<el-form-item label="岗位顺序" prop="sort">
<!-- <el-form-item label="岗位顺序" prop="sort">
<el-input v-model="formData.sort" placeholder="请输入岗位顺序" />
</el-form-item>
</el-form-item> -->
<el-form-item label="状态" prop="status">
<el-select v-model="formData.status" clearable placeholder="请选择状态">
<el-option
@ -26,8 +26,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输备注" type="textarea" />
<el-form-item label="职务描述" prop="remark">
<el-input v-model="formData.remark" placeholder="请输职务描述" type="textarea" />
</el-form-item>
</el-form>
<template #footer>

@ -15,7 +15,7 @@
<el-form-item label="职务名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入岗位名称"
placeholder="请输入职务名称"
clearable
@keyup.enter="handleQuery"
/>
@ -69,13 +69,13 @@
<el-table v-loading="loading" :data="list" :border="true" :stripe="true" :show-overflow-tooltip="true" class="xy-table">
<el-table-column fixed type="selection" width="40px" />
<!-- <el-table-column fixed label="岗位编号" align="center" prop="id" /> -->
<el-table-column label="职务名称" align="center" prop="name" />
<el-table-column label="状态" align="center" prop="status">
<el-table-column label="职务名称" align="center" prop="name" width="250"/>
<el-table-column label="状态" align="center" prop="status" width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="成员数量" align="center" prop="employeeNum" />
<el-table-column label="成员数量" align="center" prop="employeeNum" width="100"/>
<el-table-column label="部门描述" align="center" prop="remark" />
<el-table-column
label="更新时间"
@ -92,7 +92,31 @@
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:post:update']"
>
编辑
编辑职务
</el-button>
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:post:update']"
>
添加人员
</el-button>
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:post:update']"
>
设置状态
</el-button>
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:post:update']"
>
复制
</el-button>
<el-button
link

@ -113,6 +113,7 @@ const submitForm = async () => {
await RoleApi.createRole(data)
message.success(t('common.createSuccess'))
} else {
debugger
await RoleApi.updateRole(data)
message.success(t('common.updateSuccess'))
}

@ -21,7 +21,7 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="角色标识" prop="code">
<!-- <el-form-item label="角色标识" prop="code">
<el-input
v-model="queryParams.code"
class="!w-240px"
@ -29,7 +29,7 @@
placeholder="请输入角色标识"
@keyup.enter="handleQuery"
/>
</el-form-item>
</el-form-item> -->
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择状态">
<el-option
@ -118,25 +118,41 @@
prop="updateTime"
width="180"
/>
<el-table-column :width="300" align="center" label="操作" fixed="right">
<el-table-column :width="400" align="center" label="操作" fixed="right">
<template #default="scope">
<el-button
v-hasPermi="['system:permission:assign-role-menu']"
link
preIcon="ep:basketball"
title="菜单权限"
type="primary"
@click="openAssignMenuForm(scope.row)"
>
菜单权限
</el-button>
<el-button
v-hasPermi="['system:role:update']"
link
type="primary"
@click="openForm('update', scope.row.id)"
>
编辑
编辑角色
</el-button>
<el-button
v-hasPermi="['system:permission:assign-role-menu']"
v-hasPermi="['system:role:update']"
link
preIcon="ep:basketball"
title="菜单权限"
type="primary"
@click="openAssignMenuForm(scope.row)"
@click="openForm('update', scope.row.id)"
>
菜单权限
设置状态
</el-button>
<el-button
v-hasPermi="['system:role:update']"
link
type="primary"
@click="openForm('update', scope.row.id)"
>
复制
</el-button>
<el-button
v-hasPermi="['system:permission:assign-role-data-scope']"

@ -8,12 +8,12 @@
label-width="80px"
>
<el-row>
<el-col :span="12">
<el-col :span="24">
<el-form-item label="用户昵称" prop="nickname">
<el-input v-model="formData.nickname" placeholder="请输入用户昵称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="24">
<el-form-item label="归属部门" prop="deptId">
<el-tree-select
v-model="formData.deptId"
@ -25,38 +25,44 @@
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="24">
<el-form-item label="员工职务">
<el-select v-model="formData.postIds" multiple placeholder="请选择员工职务">
<el-option
v-for="item in postList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="员工工号" prop="jobNumber">
<el-input v-model="formData.jobNumber" placeholder="请输入员工工号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="手机号码" prop="mobile">
<el-input v-model="formData.mobile" maxlength="11" placeholder="请输入手机号码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input v-model="formData.email" maxlength="50" placeholder="请输入邮箱" />
<el-col :span="24">
<el-form-item label="微信账号" prop="wechatAccount">
<el-input v-model="formData.wechatAccount" placeholder="请输入微信账号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
<el-input v-model="formData.username" placeholder="请输入用户名称" />
<el-col :span="24">
<el-form-item label="邮箱地址" prop="email">
<el-input v-model="formData.email" placeholder="请输入邮箱地址" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
<el-input
v-model="formData.password"
placeholder="请输入用户密码"
show-password
type="password"
/>
<el-col :span="24">
<el-form-item label="出生日期" prop="birthDatetime">
<el-input v-model="formData.birthDatetime" placeholder="请输入出生日期" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="24">
<el-form-item label="用户性别">
<el-select v-model="formData.sex" placeholder="请选择">
<el-option
@ -68,16 +74,46 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="岗位">
<el-select v-model="formData.postIds" multiple placeholder="请选择">
<el-option
v-for="item in postList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
<el-col :span="24">
<el-form-item label="籍贯" prop="nativePlace">
<el-input v-model="formData.nativePlace" placeholder="请输入籍贯" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="学历" prop="education">
<el-input v-model="formData.education" placeholder="请输入学历" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="专业" prop="speciality">
<el-input v-model="formData.speciality" placeholder="请输入专业" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="毕业院校" prop="graduationInstitution">
<el-input v-model="formData.graduationInstitution" placeholder="请输入毕业院校" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="毕业时间" prop="institutionDatatime">
<el-input v-model="formData.institutionDatatime" placeholder="请输入毕业时间" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
<el-input v-model="formData.username" placeholder="请输入用户名称" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
<el-input
v-model="formData.password"
placeholder="请输入用户密码"
show-password
type="password"
/>
</el-form-item>
</el-col>
</el-row>
@ -124,7 +160,16 @@ const formData = ref({
postIds: [],
remark: '',
status: CommonStatusEnum.ENABLE,
roleIds: []
roleIds: [],
jobNumber: '',
wechatAccount: '',
birthDatetime: '',
nativePlace: '',
education: '',
speciality: '',
graduationInstitution: '',
institutionDatatime: '',
personalProfile: '',
})
const formRules = reactive({
username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
@ -211,7 +256,16 @@ const resetForm = () => {
postIds: [],
remark: '',
status: CommonStatusEnum.ENABLE,
roleIds: []
roleIds: [],
jobNumber: '',
wechatAccount: '',
birthDatetime: '',
nativePlace: '',
education: '',
speciality: '',
graduationInstitution: '',
institutionDatatime: '',
personalProfile: '',
}
formRef.value?.resetFields()
}

@ -28,9 +28,9 @@
>
<el-row>
<el-col >
<el-form-item label="用户名称" prop="username">
<el-form-item label="用户名称" prop="nickname">
<el-input
v-model="queryParams.username"
v-model="queryParams.nickname"
placeholder="请输入用户名称"
clearable
@keyup.enter="handleQuery"
@ -154,28 +154,27 @@
<el-table stripe :border="true" style="width: 1500px;margin-top:20px;" v-loading="loading" :data="list">
<el-table-column fixed="left" type="selection" />
<el-table-column label="用户编号" align="center" key="id" prop="id" />
<!-- <el-table-column label="用户编号" align="center" key="id" prop="id" /> -->
<el-table-column fixed="left" label="姓名" align="center" prop="nickname" />
<el-table-column
label="用户名称"
label="职务"
align="center"
prop="username"
prop="postName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="用户昵称"
label="组织部门"
align="center"
prop="nickname"
prop="deptName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="部门"
label="关联业务"
align="center"
key="deptName"
prop="dept.name"
prop="businessName"
:show-overflow-tooltip="true"
/>
<el-table-column label="手机号码" align="center" prop="mobile" width="120" />
<el-table-column label="状态" key="status">
<el-table-column label="账号状态" key="status" align="center">
<template #default="scope">
<el-switch
v-model="scope.row.status"
@ -185,14 +184,30 @@
/>
</template>
</el-table-column>
<el-table-column label="手机" align="center" prop="mobile" width="120" />
<el-table-column label="在线" key="status1"/>
<el-table-column
label="最后登录"
align="center"
prop="loginDate"
:formatter="dateFormatter"
width="165"
/>
<el-table-column
label="创建时间"
label="添加时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180"
width="165"
/>
<el-table-column
label="更新时间"
align="center"
prop="updateTime"
:formatter="dateFormatter"
width="165"
/>
<el-table-column label="操作" align="center" width="160">
<el-table-column label="操作" fixed="right" align="center" width="250">
<template #default="scope">
<div class="flex items-center justify-center">
<el-button
@ -201,7 +216,23 @@
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:user:update']"
>
<Icon icon="ep:edit" />修改
<Icon icon="ep:edit" />详情
</el-button>
<el-button
type="primary"
link
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:user:update']"
>
<Icon icon="ep:edit" />编辑
</el-button>
<el-button
type="primary"
link
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:user:update']"
>
<Icon icon="ep:edit" />设置
</el-button>
<el-dropdown
@command="(command) => handleCommand(command, scope.row)"
@ -285,6 +316,7 @@ const queryParams = reactive({
pageNo: 1,
pageSize: 10,
username: undefined,
nickname: undefined,
mobile: undefined,
status: undefined,
deptId: undefined,

Loading…
Cancel
Save