diff --git a/index.html b/index.html
index 290cd5d..db9b15e 100644
--- a/index.html
+++ b/index.html
@@ -140,8 +140,8 @@
</div>
<script type="module" src="/src/main.ts"></script>
- <!-- <script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=PQ5BZ-GZ5C7-RTMXB-HSAPB-3TOAV-5CBLZ"></script> -->
- <div id="app"></div>
+ <script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=OB4BZ-D4W3U-B7VVO-4PJWW-6TKDJ-WPB77"></script>
+
</body>
</html>
diff --git a/src/views/enterprises/components/SelectUser.vue b/src/views/enterprises/components/SelectUser.vue
index 89c031e..7e0200d 100644
--- a/src/views/enterprises/components/SelectUser.vue
+++ b/src/views/enterprises/components/SelectUser.vue
@@ -1,85 +1,22 @@
<template>
- <section class="select-wrapper" v-if="show">
- <!-- 左侧部门树 -->
- <section class="dept-wrapper">
- <DeptTree @node-click="handleDeptNodeClick" />
+ <Teleport to="body">
+ <section class="view-container" v-show="show">
+ <section class="user-conatiner">
+ <section class="close">
+ <el-button type="primary" circle size="small" @click="close">
+ <Icon icon="ep:close" /> </el-button
+ ></section>
+ <User ref="userComponent" isInset v-bind="$attrs" />
+ </section>
</section>
- <section class="dept-wrapper">
- <el-table v-loading="loading" :data="list" @row-click="handleClickRow">
- <el-table-column label="用户编号" align="center" key="id" prop="id" />
- <el-table-column
- label="用户名称"
- align="center"
- prop="username"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="用户昵称"
- align="center"
- prop="nickname"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="部门"
- align="center"
- key="deptName"
- prop="deptName"
- :show-overflow-tooltip="true"
- />
- </el-table>
- <Pagination
- :total="total"
- v-model:page="queryParams.pageNo"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- />
- <el-button type="primary" class="close" circle size="small" @click="close">
- <Icon icon="ep:close" />
- </el-button>
- </section>
- </section>
+ </Teleport>
</template>
-<script lang="ts" setup>
-import * as UserApi from '@/api/system/user'
-import DeptTree from '@/views/system/user/DeptTree.vue'
-import {getPcUserPage} from "@/api/system/user";
-const show = ref(false)
-const loading = ref(true) // 列表的加载中
-const total = ref(0) // 列表的总页数
-const list = ref([]) // 列表的数
-const queryParams = reactive({
- pageNo: 1,
- pageSize: 10,
- username: undefined,
- mobile: undefined,
- status: undefined,
- deptId: undefined,
- createTime: []
-})
-const emit = defineEmits(['select', 'close'])
-/** 查询列表 */
-const getList = async () => {
- loading.value = true
- try {
- const data = await UserApi.getPcUserPage(queryParams)
- list.value = data.list
- total.value = data.total
- } finally {
- loading.value = false
- }
-}
-/** 处理部门被点击 */
-const handleDeptNodeClick = async (row) => {
- queryParams.deptId = row.id
- await getList()
-}
-
-function handleClickRow(row) {
- emit('select', row)
-}
-function open() {
- getList()
+<script setup>
+import User from '@/views/system/user/index.vue'
+const show = ref(false)
+const emit = defineEmits(['select'])
+const open = () => {
show.value = true
}
@@ -87,51 +24,40 @@ function close() {
show.value = false
emit('close')
}
-defineExpose({ open })
-</script>
-<style lang="scss" scoped>
-.select-wrapper {
- display: flex;
- flex-flow: row nowrap;
- background-color: #fff;
- padding: 10px;
- padding-top: 50px;
- border-radius: 6px;
- min-height: 50vh;
- position: relative;
- .close {
- position: absolute;
- top: 10px;
- right: 10px;
- }
- .selec-wrapper {
- max-width: 400px;
- display: flex;
- flex-flow: row nowrap;
- gap: 5px;
+const dblclickRow = (row) => {
+ emit('dbClickRow', row)
+}
- .users {
- flex: 1;
- display: flex;
- flex-flow: row wrap;
- gap: 5px;
- }
+provide('closeParent', close);
- .select {
- cursor: pointer;
- background-color: #f1faff;
- border: 1px dashed #00a3ff;
- padding: 0px 15px;
- color: #00a3ff;
- // color: #00a3ff;
- // text-decoration: underline;
- border-radius: 6px;
- height: fit-content;
- &:hover {
- opacity: 0.8;
- }
+defineExpose({
+ open
+})
+</script>
+
+<style lang="scss" scoped>
+.view-container {
+ background-color: #0000006f;
+ position: absolute;
+ inset: 0;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 9999;
+ .user-conatiner {
+ width: 80vw;
+ border-radius: 8px;
+ // overflow: hidden;
+ padding: 12px;
+ background-color: #fff;
+ position: relative;
+ .close {
+ position: absolute;
+ right: 0;
+ top: 0;
+ transform: translateX(50%) translateY(-50%);
}
}
}
diff --git a/src/views/enterprises/update.vue b/src/views/enterprises/update.vue
index 98f526a..ddf23a5 100644
--- a/src/views/enterprises/update.vue
+++ b/src/views/enterprises/update.vue
@@ -1,129 +1,139 @@
<template>
- <ContentWrap title="企业基本信息">
+ <ContentWrap
+ >{{ formData.id ? '修改企业信息' : '发布企业信息' }}
<section class="taskForm">
- <el-form ref="formRef" :model="formData" :rules="formRules" label-width="auto" v-loading="loading">
+ <el-form
+ ref="formRef"
+ :model="formData"
+ :rules="formRules"
+ label-width="auto"
+ v-loading="loading"
+ >
+ <el-form-item label="企业名称" prop="enterprisesName">
+ <el-input v-model="formData.enterprisesName" placeholder="请输入企业名称" />
+ </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.ENTERPRISES_TYPE)"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
+ <el-select v-model="formData.type" placeholder="请选择企业类型">
+ <el-option
+ v-for="dict in getStrDictOptions(DICT_TYPE.ENTERPRISES_TYPE)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="企业所属区域" prop="region">
+ <el-select v-model="formData.region" placeholder="请选择企业所属区域">
+ <el-option
+ v-for="dict in getStrDictOptions(DICT_TYPE.ENTERPRISES_AREA)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="专管员" prop="startUserSelectAssignees">
+ <section class="selec-wrapper">
+ <!-- 动态显示选中的专管员 -->
+ <section class="select" @click="handlerClickSelect">
+ {{ selectedUser ? selectedUser : '请选择专管员' }}
+ </section>
+ </section>
+ </el-form-item>
+
+ <el-form-item label="企业地址" prop="address">
+ <el-input v-model="formData.address" type="textarea" placeholder="请输入企业地址" />
+ </el-form-item>
+ <el-form-item label="企业环保负责人姓名" prop="contactName">
+ <el-input v-model="formData.contactName" placeholder="请输入环保负责人姓名" />
+ </el-form-item>
+ <el-form-item label="企业环保负责人联系电话" prop="environmentalContactPhone">
+ <el-input
+ v-model="formData.environmentalContactPhone"
+ placeholder="请输入企业环保负责人联系电话"
/>
- </el-select>
- </el-form-item>
- <el-form-item label="企业所属区域" prop="region">
- <el-select v-model="formData.region" placeholder="请选择企业所属区域">
- <el-option
- v-for="dict in getStrDictOptions(DICT_TYPE.ENTERPRISES_AREA)"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
+ </el-form-item>
+ <el-form-item label="企业注册号" prop="registrationNumber">
+ <el-input v-model="formData.registrationNumber" placeholder="请输入企业注册号" />
+ </el-form-item>
+ <el-form-item label="企业介绍" prop="introduction">
+ <el-input v-model="formData.introduction" type="textarea" placeholder="请输入企业介绍" />
+ </el-form-item>
+ <el-form-item label="企业照片" prop="size">
+ <InnerUploadImg
+ :uploadList="uploadList"
+ @handler-success="uploadSuccess"
+ ref="uploadRef"
+ @handler-remove="uploadRemove"
/>
- </el-select>
- </el-form-item>
-
-
- <el-form-item label="专管员" prop="startUserSelectAssignees">
- <section class="selec-wrapper">
- <section class="users">
- <el-tag
- v-for="user in formData.startUserSelectAssignees"
- :key="user.id"
- closable
- @close="removeUser(user.id)"
- >
- {{ user.nickname }} {{ user.deptName }}
- </el-tag>
- </section>
- <section class="select" @click="handlerClickSelect"> 请选择专管员</section>
- </section>
- </el-form-item>
-
-
- <el-form-item label="企业名称" prop="enterprisesName">
- <el-input v-model="formData.enterprisesName" placeholder="请输入企业名称" />
- </el-form-item>
- <el-form-item label="企业地址" prop="address">
- <el-input v-model="formData.address" type="textarea" placeholder="请输入企业地址" />
- </el-form-item>
- <el-form-item label="环保负责人姓名" prop="contactName">
- <el-input v-model="formData.contactName" placeholder="请输入环保负责人姓名" />
- </el-form-item>
- <el-form-item label="企业环保负责人联系电话" prop="environmentalContactPhone">
- <el-input v-model="formData.environmentalContactPhone" placeholder="请输入企业环保负责人联系电话" />
- </el-form-item>
- <el-form-item label="企业注册号" prop="registrationNumber">
- <el-input v-model="formData.registrationNumber" placeholder="请输入企业注册号" />
- </el-form-item>
- <el-form-item label="企业介绍" prop="introduction">
- <el-input v-model="formData.introduction" type="textarea" placeholder="请输入企业介绍" />
- </el-form-item>
- <el-form-item label="企业照片" prop="size">
- <InnerUploadImg
- :uploadList="uploadList"
- @handler-success="uploadSuccess"
- ref="uploadRef"
- @handler-remove="uploadRemove"
- />
- </el-form-item>
- <el-form-item label="企业成立时间" prop="establishmentDate">
- <el-date-picker
- v-model="formData.establishmentDate"
- type="date"
- value-format="x"
- placeholder="选择企业成立时间"
- />
- </el-form-item>
-
-
- <el-form-item label="企业经纬度" prop="gpsLocation">
- <el-input
- v-model="formData.gpsLocation"
- placeholder="点击按钮选择坐标"
- readonly
- >
- <template #append>
- <!-- 选择坐标按钮 -->
- <el-button @click="showMap = true">选择坐标</el-button>
- </template>
- </el-input>
- </el-form-item>
-
- <!-- 地图弹窗 -->
- <el-dialog
- v-model="showMap"
- title="选择坐标"
- width="80%"
- :before-close="handleClose"
- >
- <div id="map-container" style="width: 100%; height: 400px;"></div>
- <template #footer>
- <el-button @click="showMap = false">取消</el-button>
- <el-button type="primary" @click="confirmCoordinate">确定</el-button>
- </template>
- </el-dialog>
+ </el-form-item>
+
- <el-form-item label="签到半径" prop="gpsLocation" >
- <el-input v-model="formData.signRadius" placeholder="请输入签到半径" style="width: 280px;" /><span style="margin-left: 10px">单位：元</span>
- </el-form-item>
+ <el-form-item label="企业资质照片" prop="size">
+ <InnerUploadImg
+ :uploadList="uploadList"
+ @handler-success="uploadSuccess"
+ ref="uploadRef"
+ @handler-remove="uploadRemove"
+ />
+ </el-form-item>
+ <el-form-item label="企业成立时间" prop="establishmentDate">
+ <el-date-picker
+ v-model="formData.establishmentDate"
+ type="date"
+ value-format="x"
+ placeholder="选择企业成立时间"
+ />
+ </el-form-item>
+
+ <el-form-item label="企业经纬度" prop="gpsLocation">
+ <el-input
+ v-model="formData.gpsLocation"
+ placeholder="点击按钮选择坐标"
+ readonly
+ style="width: 500px"
+ >
+ <template #append>
+ <!-- 选择坐标按钮 -->
+ <el-button @click="showMap = true">选择坐标</el-button>
+ </template>
+ </el-input>
+ </el-form-item>
+
+ <!-- 地图弹窗 -->
+ <el-dialog v-model="showMap" title="选择坐标" width="80%" :before-el-close="handleClose">
+ <div>
+ <el-input
+ type="text"
+ v-model="formData.searchQuery"
+ placeholder="可通过名称联想搜索"
+ style="width: 20%"
+ />
+ <el-button @click="handleSearch">搜索</el-button>
+ </div>
+ <div ref="mapContainerRef" style="width: 100%; height: 600px"></div>
+ <template #footer>
+ <el-button @click="showMap = false">关闭</el-button>
+ <el-button type="primary" @click="showMap = false">确定</el-button>
+ </template>
+ </el-dialog>
+
+ <el-form-item label="签到半径" prop="gpsLocation">
+ <el-input
+ v-model="formData.signRadius"
+ placeholder="请输入签到半径"
+ style="width: 280px"
+ /><span style="margin-left: 10px">单位：米</span>
+ </el-form-item>
+ <el-form-item style="align-items: center">
+ <el-button type="success" @click="submitForm">确认</el-button>
+ </el-form-item>
</el-form>
</section>
-
- <el-dialog v-model="dialogVisible" title="选择用户">
- <!-- 将 SelectUser 组件放入弹框中 -->
- <template #content>
- <SelectUser ref="selectUserRef" @select="handlerSelectUser" />
- </template>
- <!-- 弹框底部的取消和确定按钮 -->
- <template #footer>
- <el-button @click="dialogVisible = false">取消</el-button>
- <el-button type="primary" @click="dialogVisible = false">确定</el-button>
- </template>
- </el-dialog>
-
+ <SelectUser ref="selectUserRef" @select-user="echoUser" />
</ContentWrap>
</template>
<script setup lang="ts">
@@ -131,7 +141,8 @@ import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import { EnterprisesApi, EnterprisesVO } from '@/api/enterprises'
import { FileInfoApi } from '@/api/enterprises/fileinfo'
import { ElMessage } from 'element-plus'
-import SelectUser from '@/views/enterprises/components/SelectUser.vue'
+import SelectUser from './components/SelectUser.vue'
+import * as UserApi from '@/api/system/user'
/** 企业 表单 */
defineOptions({ name: 'UpdateEnterprises' })
@@ -143,6 +154,8 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const selectUserRef = ref()
const loading = ref(false)
+const selectedUser = ref()
+
const formData = ref({
id: undefined,
departmentId: undefined,
@@ -152,44 +165,152 @@ const formData = ref({
enterprisesName: undefined,
address: undefined,
contactName: undefined,
+ enterprisesStatus:undefined,
environmentalContactPhone: undefined,
registrationNumber: undefined,
introduction: undefined,
establishmentDate: undefined,
gpsLocation: undefined,
+ searchQuery: undefined,
managerDeptId: undefined,
- ides:undefined,
- startUserSelectAssignees: []
+ ides: undefined,
+ startUserSelectAssignees:undefined
})
const formRules = reactive({
type: [{ required: true, message: '企业类型不能为空', trigger: 'change' }],
enterprisesName: [{ required: true, message: '企业名称不能为空', trigger: 'blur' }],
+ contactName: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+ environmentalContactPhone: [{ required: true, message: '企业环保负责人联系电话不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
-const {query}=useRoute()
-
-function init(){
- if(query.id){
- EnterprisesApi.getEnterprises(query.id).then(res=>{
- formData.value=res
- })
- }
+const { query } = useRoute()
+
+function init() {
+ if (query.id) {
+ // 修改：如果有 id 则设置为 'update'
+ formType.value = 'update'
+ EnterprisesApi.getEnterprises(query.id).then((res) => {
+ selectedUser.value=res.inviterName;
+ // formData.value.startUserSelectAssignees=res.userId;
+ formData.value = res
+ })
+ }else{ formType.value = 'create'}
}
+// 控制地图弹窗显示隐藏
+const showMap = ref(false)
+// 地图实例
+let map
+// 标记实例
+let marker
+let searchService=null
+// const searchService = ref()
+const mapContainerRef = ref<HTMLDivElement | null>(null)
+// 初始化地图
+const initMap = () => {
+ if (!window.qq || !window.qq.maps) {
+ ElMessage.error('腾讯地图 API 未加载完成')
+ return
+ }
+ if (!mapContainerRef.value) {
+ ElMessage.error('地图容器元素未找到')
+ return
+ }
+ map = new window.qq.maps.Map(mapContainerRef.value, {
+ center: new window.qq.maps.LatLng(41.520282, 121.265721), // 初始中心点
+ zoom: 14
+ })
-onMounted(()=>{
- init()
-})
+ // 添加地图点击事件监听器
+ window.qq.maps.event.addListener(map, 'click', (event: any) => {
+ const latLng = event.latLng
+ const lat = latLng.getLat()
+ const lng = latLng.getLng()
+
+ // 更新表单中的经纬度信息
+ formData.value.gpsLocation = `${lat},${lng}`
+
+ // 在地图上显示标记
+ if (marker) {
+ marker.setMap(null) // 清除之前的标记
+ }
+ marker = new window.qq.maps.Marker({
+ position: latLng,
+ map: map
+ })
+ })
+
+ // 确保 searchService 已经正确初始化
+ searchService = new window.qq.maps.SearchService({
+ complete: (results) => {
+ // console.log('搜索结果:', results) // 打印 results 对象
+ if (results.detail && results.detail.pois.length > 0) {
+ const firstResult = results.detail.pois[0]
+ const position = firstResult.latLng
+ // 设置地图中心点为搜索结果的位置
+ map.setCenter(position)
+ // 创建标记
+ if (marker) {
+ marker.setMap(null)
+ }
+ marker = new window.qq.maps.Marker({
+ position: position,
+ map: map
+ })
+ // 更新表单中的经纬度信息
+ formData.value.gpsLocation = `${position.getLat()},${position.getLng()}`
+ }
+ },
+ error: (e) => {
+ console.error('搜索出错:', e)
+ ElMessage.error('搜索出错，请重试')
+ }
+ })
+}
+
+// 搜索按钮点击事件处理函数
+const handleSearch = () => {
+ if (searchService && formData.value.searchQuery) {
+ searchService.search(formData.value.searchQuery)
+ } else {
+ ElMessage.error('请输入搜索关键词')
+ }
+}
+
+
+
+
+onMounted(() => {
+ init()
+
+ const openMapAndInit = async () => {
+ if (showMap.value) {
+ await nextTick() // 等待 DOM 更新
+ if (qq && qq.maps) {
+ initMap() // 初始化地图
+ } else {
+ console.error('腾讯地图 API 未加载完成')
+ }
+ }
+ }
+
+ // 监听 showMap 的变化
+ watch(
+ showMap,
+ () => {
+ openMapAndInit()
+ },
+ { immediate: true }
+ )
+})
function handlerClickSelect() {
- dialogVisible.value = true;
// 调用 SelectUser 组件的 open 方法
- unref(selectUserRef)?.open();
+ unref(selectUserRef)?.open()
}
-
function handlerSelectUser(row) {
if (formData.value.startUserSelectAssignees.findIndex((i) => i.id == row.id) > -1) return
formData.value.startUserSelectAssignees.push(row)
@@ -200,12 +321,15 @@ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成
const submitForm = async () => {
// 校验表单
await formRef.value.validate()
+ formData.value.enterprisesStatus=1;
// 提交请求
loading.value = true
try {
+
const data = formData.value as unknown as EnterprisesVO
if (formType.value === 'create') {
- await EnterprisesApi.createEnterprises(data)
+
+ await EnterprisesApi.pccreateEnterprises(data)
message.success(t('common.createSuccess'))
} else {
await EnterprisesApi.updateEnterprises(data)
@@ -219,6 +343,13 @@ const submitForm = async () => {
}
}
+const echoUser = async (v) => {
+ // console.log('当前选择',v)
+ const users = await UserApi.getUser(v)
+ selectedUser.value = users.username
+ formData.value.userId=users.id
+}
+
/** 重置表单 */
const resetForm = () => {
formData.value = {
@@ -235,8 +366,9 @@ const resetForm = () => {
introduction: undefined,
establishmentDate: undefined,
gpsLocation: undefined,
+ searchadd: undefined,
managerDeptId: undefined,
- startUserSelectAssignees: []
+ startUserSelectAssignees: undefined
}
formRef.value?.resetFields()
}
@@ -282,41 +414,38 @@ function uploadRemove(file) {
ElMessage.success('删除成功')
})
}
-
-
-
</script>
<style lang="scss" scoped>
- .selec-wrapper {
- max-width: 400px;
- display: flex;
- flex-flow: row nowrap;
- gap: 5px;
-
- .users {
- flex: 1;
- display: flex;
- flex-flow: row wrap;
- gap: 5px;
- }
-
- .select {
- cursor: pointer;
- background-color: #f1faff;
- border: 1px dashed #00a3ff;
- padding: 0px 15px;
- color: #00a3ff;
- // color: #00a3ff;
- // text-decoration: underline;
- border-radius: 6px;
- height: fit-content;
-
- &:hover {
- opacity: 0.8;
- }
- }
- }
+.selec-wrapper {
+ max-width: 400px;
+ display: flex;
+ flex-flow: row nowrap;
+ gap: 5px;
+
+ .users {
+ flex: 1;
+ display: flex;
+ flex-flow: row wrap;
+ gap: 5px;
+ }
+
+ .select {
+ cursor: pointer;
+ background-color: #f1faff;
+ border: 1px dashed #00a3ff;
+ padding: 1px 40px;
+ color: #00a3ff;
+ // color: #00a3ff;
+ // text-decoration: underline;
+ border-radius: 6px;
+ height: fit-content;
+
+ &:hover {
+ opacity: 0.8;
+ }
+ }
+}
.modal-enter-from {
opacity: 0;
@@ -338,7 +467,4 @@ function uploadRemove(file) {
height: 400px;
margin-top: 20px;
}
-
-
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 9bc1349..8c38e96 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,8 +1,4 @@
<template>
-
-
-
-
<el-row :gutter="20">
<!-- 左侧部门树 -->
<el-col :span="4" :xs="24">
@@ -38,7 +34,7 @@
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="状态" prop="status">
+ <el-form-item label="状态" prop="status" v-if="!isInset">
<el-select
v-model="queryParams.status"
placeholder="用户状态"
@@ -53,7 +49,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="创建时间" prop="createTime">
+ <el-form-item label="创建时间" prop="createTime" v-if="!isInset">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
@@ -71,6 +67,7 @@
plain
@click="openForm('create')"
v-hasPermi="['system:user:create']"
+ v-if="!isInset"
>
<Icon icon="ep:plus" /> 新增
</el-button>
@@ -79,6 +76,7 @@
plain
@click="handleImport"
v-hasPermi="['system:user:import']"
+ v-if="!isInset"
>
<Icon icon="ep:upload" /> 导入
</el-button>
@@ -88,6 +86,7 @@
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['system:user:export']"
+ v-if="!isInset"
>
<Icon icon="ep:download" />导出
</el-button>
@@ -117,7 +116,7 @@
: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" v-if="!isInset">
<template #default="scope">
<el-switch
v-model="scope.row.status"
@@ -135,7 +134,7 @@
:formatter="dateFormatter"
width="180"
/>
- <el-table-column label="操作" align="center" width="160">
+ <el-table-column label="操作" align="center" width="160" v-if="!isInset">
<template #default="scope">
<div class="flex items-center justify-center">
<el-button
@@ -181,6 +180,13 @@
</div>
</template>
</el-table-column>
+ <el-table-column label="操作" align="center" width="100" v-if="isInset">
+ <template #default="{ row }">
+ <el-button type="primary" link @click="selectUser(row.id)">
+ <Icon icon="ep:select" />选择
+ </el-button>
+ </template>
+ </el-table-column>
</el-table>
<Pagination
:total="total"
@@ -213,6 +219,14 @@ import DeptTree from './DeptTree.vue'
defineOptions({ name: 'SystemUser' })
+const closeParent = inject('closeParent');
+
+const props = defineProps({
+ isInset: {
+ type: Boolean,
+ default: false
+ }
+})
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
@@ -226,13 +240,12 @@ const queryParams = reactive({
mobile: undefined,
status: undefined,
deptId: undefined,
- audit: "2",
- userType: "3",
+ audit: '2',
+ userType: '3',
createTime: []
-
})
const queryFormRef = ref() // 搜索的表单
-
+const emit = defineEmits(['selectUser'])
/** 查询列表 */
const getList = async () => {
loading.value = true
@@ -245,6 +258,11 @@ const getList = async () => {
}
}
+const selectUser = (id) => {
+ emit('selectUser', id)
+ closeParent();
+}
+
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
diff --git a/src/views/task/create.vue b/src/views/task/create.vue
index 7e4cd74..7b8afda 100644
--- a/src/views/task/create.vue
+++ b/src/views/task/create.vue
@@ -19,19 +19,13 @@
<el-form-item label="类型" prop="taskType">
<el-tree-select
- v-model="formData.tags"
- :data="tagList"
+ v-model="formData.taskType"
+ :data="typeList"
+ :props="defaultProps"
check-strictly
- :render-after-expand="false"
- placeholder="请选择类型"
node-key="id"
- show-checkbox
- multiple
- :props="{
- label: 'tagName'
- }"
+ placeholder="请选择归属部门"
/>
-
</el-form-item>
<el-form-item label="执行周期" prop="execCycle" v-if="formData.taskType == 2">
@@ -253,12 +247,10 @@ import { TagLibraryApi } from '@/api/system/taglibrary'
import { EnterprisesApi, EnterprisesVO } from '@/api/enterprises'
import { TaskInfoApi } from '@/api/system/taskinfo'
import { useTagsViewStore} from '@/store/modules/tagsView'
-import {defaultProps, handleTree} from "@/utils/tree";
-
-
+import {defaultProps} from "@/utils/tree";
defineOptions({ name: 'CreateTask' })
-const typeList = ref<Tree[]>([]) // 树形
+
const loading = ref(false)
const formData = ref({
id: undefined,
@@ -324,11 +316,14 @@ const resetQuery = () => {
handleQuery()
}
+ //
+ typeList.value = handleTree(await DeptApi.getSimpleDeptList())
+
/**
* 获取标签列表
*/
function getTagList() {
- TagLibraryApi.getTagLibraryPage({tagType:'2'}).then((res) => {
+ TagLibraryApi.getTagLibraryPage({}).then((res) => {
tagList.value = res
})
}
@@ -404,7 +399,7 @@ function uniqueFunc(arr, uniId) {
const res = new Map()
return arr.filter((item) => !res.has(item[uniId]) && res.set(item[uniId], 1))
}
-// typeList.value = handleTree(await TagLibraryApi.getTagLibraryPage(formData.value.id))
+
/**
* 提交表单
*/