yunxi
/
mes-majoys
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

部门/车间 新增获取数据按钮 去除新增编辑 新增详情

Browse Source
dev
qiuhongwu 6 months ago
parent 280288f509
commit 5872419655
4 changed files with 134 additions and 149 deletions
Show Stats Download Patch File Download Diff File

12
mes-ui/mes-ui-admin-vue3/src/views/biz/dept/DeptForm.vue
Unescape View File

@ -2,16 +2,16 @@
<Dialog v-model="dialogVisible" :title="dialogTitle">
<el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="108px">
<el-form-item label="上级部门" prop="parentId">
<BranchSelect v-model="formData.parentId" />
<BranchSelect v-model="formData.parentId" disabled/>
</el-form-item>
<el-form-item label="部门名称" prop="name">
<el-input v-model="formData.name" class="!w-250px" placeholder="请输入部门名称" />
<el-input v-model="formData.name" class="!w-250px" disabled placeholder="请输入部门名称" />
</el-form-item>
<el-form-item label="显示排序" prop="sort">
<el-input-number v-model="formData.sort" :min="0" controls-position="right" class="!w-250px" />
<el-input-number v-model="formData.sort" :min="0 " disabled controls-position="right" class="!w-250px" />
</el-form-item>
<el-form-item label="负责人" prop="leaderUserId">
<UserSelect v-model="formData.leaderUserId" @update:newValue="handleSelectedUser" />
<UserSelect v-model="formData.leaderUserId" disabled @update:newValue="handleSelectedUser" />
</el-form-item>
<!-- <el-form-item label="联系电话" prop="phone">
<el-input v-model="formData.phone" maxlength="11" placeholder="请输入联系电话" />
@ -21,14 +21,14 @@
</el-form-item>-->
<el-form-item label="启用状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_SYSTEM_COMMON_STATUS)" :key="dict.value" :label="dict.value">
<el-radio v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_SYSTEM_COMMON_STATUS)" :key="dict.value" :label="dict.value" disabled>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<el-button type="primary" @click="submitForm">确 定</el-button>
<!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>

176
mes-ui/mes-ui-admin-vue3/src/views/biz/dept/index.vue
Unescape View File

@ -1,102 +1,66 @@
<template>
<el-card class="hl-card">
<template #header>
<span>部门管理</span>
</template>
<el-card class="hl-card">
<template #header>
<span>部门管理</span>
</template>
<!-- 搜索工作栏 -->
<ContentWrap class="borderxx">
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="108px"
>
<el-form-item label="部门名称" label-width="108px" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入部门名称"
clearable
class="!w-240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="启用状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择部门启用状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_SYSTEM_COMMON_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
<ContentWrap class="borderxx">
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
<el-form-item label="部门名称" label-width="108px" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入部门名称" clearable class="!w-240px" @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="启用状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择部门启用状态" clearable class="!w-240px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_SYSTEM_COMMON_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery" type="primary">
<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"
plain
@click="openForm('create')"
v-hasPermi="['system:dept: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-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table
v-loading="loading"
:data="list"
row-key="id"
:default-expand-all="isExpandAll"
v-if="refreshTable"
class="hl-table"
size="large"
:show-overflow-tooltip="true"
>
<el-table-column prop="name" label="部门名称" />
<el-table-column prop="leader" label="负责人">
<template #default="scope">
{{ userList.find((user) => user.id === scope.row.leaderUserId)?.nickname }}
</template>
</el-table-column>
<el-table-column prop="sort" label="排序" />
<el-table-column prop="status" label="启用状态">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_SYSTEM_COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="220"
:formatter="dateFormatter"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:dept:update']"
>
编辑
</el-button> -->
<el-button @click="getChanjet()" style="background-color: rgba(0, 0, 255, 1);color:#fff;">
获取数据
</el-button>
<!-- <el-button
<el-button type="danger" plain @click="toggleExpandAll">
<Icon icon="ep:sort" class="mr-5px" /> 展开/折叠
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" row-key="id" :default-expand-all="isExpandAll" v-if="refreshTable" class="hl-table" size="large" :show-overflow-tooltip="true">
<el-table-column prop="name" label="部门名称" />
<el-table-column prop="leader" label="负责人">
<template #default="scope">
{{ userList.find((user) => user.id === scope.row.leaderUserId)?.nickname }}
</template>
</el-table-column>
<el-table-column prop="sort" label="排序" />
<el-table-column prop="status" label="启用状态">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_SYSTEM_COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="220" :formatter="dateFormatter" />
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button link type="primary" @click="openForm('detail', scope.row.id)" v-hasPermi="['system:dept:detail']">
详情
</el-button>
<!-- <el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
@ -104,12 +68,12 @@
>
删除
</el-button>-->
</template>
</el-table-column>
</el-table>
</ContentWrap>
</template>
</el-table-column>
</el-table>
</ContentWrap>
</el-card>
</el-card>
<!-- 表单弹窗：添加/修改 -->
<DeptForm ref="formRef" @success="getList" />
</template>
@ -125,7 +89,6 @@ defineOptions({ name: 'SystemDept' })
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
const list = ref() // 列表的数据
const queryParams = reactive({
@ -139,6 +102,25 @@ const isExpandAll = ref(true) // 是否展开，默认全部展开
const refreshTable = ref(true) // 重新渲染表格启用状态
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
const reload: any = inject('reload')
const getChanjet = async () => {
try {
const response = await DeptApi.queryDeptChanjet()
if (response === true) {
// 请求成功，处理数据或进行其他操作
message.success(t('获取成功'))
reload()
} else {
// 请求失败，处理错误
message.error(t('获取失败'))
}
} catch (error) {
// 发生网络错误、超时或其他未捕获异常
message.error(t('请求异常'))
console.error('Error fetching chanjet:', error)
}
}
/** 查询部门列表 */
const getList = async () => {
loading.value = true
@ -168,7 +150,7 @@ const handleQuery = () => {
const resetQuery = () => {
queryParams.pageNo = 1
queryFormRef.value.resetFields()
console.log(queryParams);
console.log(queryParams)
handleQuery()
}

62
mes-ui/mes-ui-admin-vue3/src/views/biz/workshop/WorkshopForm.vue
Unescape View File

@ -1,54 +1,32 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="108px"
v-loading="formLoading"
>
<el-form ref="formRef" :model="formData" :rules="formRules" label-width="108px" v-loading="formLoading">
<el-form-item label="车间编码" prop="code">
<el-input v-model="formData.code" disabled placeholder="系统自动生成" class="!w-250px" />
</el-form-item>
<el-form-item label="车间名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入车间名称" class="!w-250px" />
<el-input v-model="formData.name" disabled placeholder="请输入车间名称" class="!w-250px" />
</el-form-item>
<el-form-item label="所属部门" prop="deptId">
<el-tree-select
v-model="formData.deptId"
:data="deptList"
:props="defaultProps"
check-strictly
node-key="id"
clearable
placeholder="请选择归属部门"
/>
<el-form-item label="所属部门" disabled prop="deptId">
<el-tree-select v-model="formData.deptId" :data="deptList" :props="defaultProps" check-strictly node-key="id" clearable placeholder="请选择归属部门" disabled />
</el-form-item>
<el-form-item label="负责人" prop="leaderUserId">
<UserSelect
v-model="formData.leaderUserId"
@update:newValue="handleSelectedUser"
/>
<UserSelect v-model="formData.leaderUserId" @update:newValue="handleSelectedUser" disabled />
</el-form-item>
<el-form-item label="描述信息" prop="description">
<el-input type="textarea" v-model="formData.description" height="150px" show-word-limit maxlength="200"/>
<el-input type="textarea" v-model="formData.description" height="150px" show-word-limit maxlength="200" disabled/>
</el-form-item>
<el-form-item label="启用状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_COMMON_STATUS)"
:key="dict.value"
:label="dict.value"
>
<el-radio v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_COMMON_STATUS)" disabled :key="dict.value" :label="dict.value">
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
<!-- <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> -->
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>
@ -56,9 +34,9 @@
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import * as WorkshopApi from '@/api/biz/workshop'
import {defaultProps, handleTree} from "@/utils/tree";
import { defaultProps, handleTree } from '@/utils/tree'
import * as DeptApi from '@/api/system/dept'
import * as UserApi from "@/api/system/user";
import * as UserApi from '@/api/system/user'
import UserSelect from '../hlvuestyle/userSelect.vue'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
@ -74,18 +52,18 @@ const formData = ref({
deptId: undefined,
leaderUserId: undefined,
description: undefined,
status: 1,
status: 1
})
const formRules = reactive({
name: [{ required: true, message: '车间名称不能为空', trigger: 'blur' }],
deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
status: [{ required: true, message: '启用状态不能为空', trigger: 'blur' }],
status: [{ required: true, message: '启用状态不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
const deptList = ref<Tree[]>([]) // 树形结构
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
const userSelectList = ref<UserApi.UserVO[]>([])
const userSelectLoading = ref(false);
const userSelectLoading = ref(false)
const remoteUserSearch = (query: string) => {
if (query) {
@ -93,7 +71,10 @@ const remoteUserSearch = (query: string) => {
setTimeout(() => {
userSelectLoading.value = false
userSelectList.value = userList.value.filter((item) => {
return item.nickname.toLowerCase().includes(query.toLowerCase()) || item.username.toLowerCase().includes(query.toLowerCase())
return (
item.nickname.toLowerCase().includes(query.toLowerCase()) ||
item.username.toLowerCase().includes(query.toLowerCase())
)
})
}, 200)
} else {
@ -119,15 +100,14 @@ const open = async (type: string, id?: number) => {
let userParams = {
pageNo: 1,
pageSize: 10,
status: "0"
status: '0'
}
const data = await UserApi.getUserPage(userParams)
userList.value = data.list;
userSelectList.value = data.list;
userList.value = data.list
userSelectList.value = data.list
} finally {
formLoading.value = false
}
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@ -164,7 +144,7 @@ const resetForm = () => {
deptId: undefined,
leaderUserId: undefined,
description: undefined,
status: 1,
status: 1
}
formRef.value?.resetFields()
}

33
mes-ui/mes-ui-admin-vue3/src/views/biz/workshop/index.vue
Unescape View File

@ -45,7 +45,7 @@
</el-form-item>
<el-form-item>
<el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<!-- <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@ -53,7 +53,7 @@
v-hasPermi="['biz:workshop:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
</el-button> -->
<!-- <el-button
type="success"
plain
@ -63,6 +63,9 @@
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>-->
<el-button @click="getChanjet()" style="background-color: rgba(0, 0, 255, 1);color:#fff;">
获取数据
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
@ -93,10 +96,10 @@
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['biz:workshop:update']"
@click="openForm('detail', scope.row.id)"
v-hasPermi="['biz:workshop:detail']"
>
编辑
详情
</el-button>
<!-- <el-button
link
@ -152,7 +155,27 @@ const queryParams = reactive({
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
const reload: any = inject('reload')
const getChanjet = async () => {
// try {
// const response = await WorkshopApi.queryDeptChanjet()
// if (response === true) {
// // 请求成功，处理数据或进行其他操作
// message.success(t('获取成功'))
// reload()
// } else {
// // 请求失败，处理错误
// message.error(t('获取失败'))
// }
// } catch (error) {
// // 发生网络错误、超时或其他未捕获异常
// message.error(t('请求异常'))
// console.error('Error fetching chanjet:', error)
// }
}
/** 查询列表 */
const getList = async () => {
loading.value = true
try {

Write Preview
Loading…
Cancel
Save