From 5df79be2b15c0c22e4c25f94b02464ad70d793c3 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期三, 16 七月 2025 14:52:28 +0800
Subject: [PATCH] 修改新增
---
src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue | 153 ++++++++++++++++++++++++++++++++------------------
1 files changed, 98 insertions(+), 55 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue b/src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue
index b829ad5..6846f7c 100644
--- a/src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue
+++ b/src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue
@@ -11,27 +11,35 @@
>新增</el-button>
</el-form-item>
<el-form-item label="企业名称:" v-if="data.isAdmin" style="margin-left: 20px">
- <el-select
- v-model="data.queryParams.companyName"
- filterable
- remote
- @change="selectValue"
- reserve-keyword
- placeholder="请输入企业名称"
- remote-show-suffix
- :remote-method="getCompanyList"
- :loading="loadingCompany"
- style="width: 240px"
- >
+ <el-select v-model="data.queryParams.companyId" filterable placeholder="请选择" clearable>
<el-option
v-for="item in data.companyList"
:key="item.id"
:label="item.name"
- :value="item.name"
- />
+ :value="item.id">
+ </el-option>
</el-select>
+<!-- <el-select-->
+<!-- v-model="data.companyName"-->
+<!-- filterable-->
+<!-- remote-->
+<!-- @change="selectValue"-->
+<!-- reserve-keyword-->
+<!-- placeholder="请输入企业名称"-->
+<!-- remote-show-suffix-->
+<!-- :remote-method="getCompanyList"-->
+<!-- :loading="loadingCompany"-->
+<!-- style="width: 240px"-->
+<!-- >-->
+<!-- <el-option-->
+<!-- v-for="item in data.companyList"-->
+<!-- :key="item.id"-->
+<!-- :label="item.name"-->
+<!-- :value="item.name"-->
+<!-- />-->
+<!-- </el-select>-->
</el-form-item>
- <el-form-item>
+ <el-form-item v-if="data.isAdmin">
<el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
<el-button plain @click="reset">重置</el-button>
</el-form-item>
@@ -41,7 +49,7 @@
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
- <el-table-column label="企业名称" prop="conpanyName" align="center" />
+ <el-table-column label="企业名称" prop="companyName" align="center" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
<template #default="scope">
<el-button link type="primary" @click="openDialog('review',scope.row)" >查看</el-button>
@@ -72,6 +80,7 @@
import {ElMessage, ElMessageBox} from "element-plus";
import {getCompany} from "@/api/onlineEducation/company";
import Cookies from "js-cookie";
+import {delCom, getCom} from "@/api/companyInfo/overview";
const { proxy } = getCurrentInstance();
const loading = ref(false);
const noticeRef = ref();
@@ -83,7 +92,8 @@
companyId: null,
},
companyList: [],
- isAdmin: false
+ isAdmin: false,
+ companyName: ''
});
const dataList = ref([]);
const total = ref(0);
@@ -94,22 +104,26 @@
const userInfo = JSON.parse(Cookies.get('userInfo'))
console.log("userInfo",userInfo)
data.isAdmin = userInfo.userType === 0;
+ if(data.isAdmin){
+ data.queryParams.companyId = null
+ }else {
+ data.queryParams.companyId = userInfo.companyId
+ }
getList();
+ if(data.isAdmin){
+ getCompanyList()
+ }
});
const getList = async () => {
loading.value = true;
- // const res = await getNoticeList(data.queryParams);
- // if(res.code === 200){
- // dataList.value = res.data.list.map(item => {
- // return {
- // ...item,
- // createTime: item.createTime.replace(/T/g," ")
- // }
- // })
- // total.value = res.data.total
- // }else{
- // ElMessage.warning(res.message)
- // }
+ const res = await getCom(data.queryParams);
+ if(res.code === 200){
+ dataList.value = res.data.list
+ total.value = res.data.total
+ }else{
+ ElMessage.warning(res.message)
+ }
+ loading.value = false;
loading.value = false;
}
@@ -118,7 +132,7 @@
getList();
}
const openDialog = (type, value) => {
- noticeRef.value.openDialog(type, value);
+ noticeRef.value.openDialog(type, value,data.companyList);
}
const selectValue = (val) => {
data.companyList.forEach(item => {
@@ -128,22 +142,49 @@
})
}
-const getCompanyList = async (val)=>{
- if(val != ""){
- loadingCompany.value = true;
- const queryParams = {
- name: val
- }
- const res = await getCompany(queryParams)
- if (res.code == 200) {
- loadingCompany.value = false;
- data.companyList = res.data.list
-
- } else {
- ElMessage.warning(res.message)
- }
+const getCompanyList = async ()=>{
+ const queryParams = {
+ pageNum: 1,
+ pageSize: 999
+ }
+ const res = await getCompany(queryParams)
+ if (res.code == 200) {
+ data.companyList = res.data.list?res.data.list:[]
+ // data.queryParams.companyId = data.companyList[0].id
+ } else {
+ ElMessage.warning(res.message)
}
}
+// const getCompanyList = async (val)=>{
+// if(val){
+// loadingCompany.value = true;
+// const queryParams = {
+// name: val
+// }
+// const res = await getCompany(queryParams)
+// if (res.code == 200) {
+// loadingCompany.value = false;
+// data.companyList = res.data.list
+//
+// } else {
+// ElMessage.warning(res.message)
+// }
+// }else{
+// loadingCompany.value = true;
+// const queryParams = {
+// pageSize: 999,
+// pageNum: 1,
+// }
+// const res = await getCompany(queryParams)
+// if (res.code == 200) {
+// loadingCompany.value = false;
+// data.companyList = res.data.list
+//
+// } else {
+// ElMessage.warning(res.message)
+// }
+// }
+// }
const handleSizeChange = (val) => {
data.queryParams.pageSize = val
@@ -157,12 +198,14 @@
/** 重置新增的表单以及其他数据 */
function reset() {
data.queryParams = {
- companyId: '',
+ companyId: null,
pageNum: 1,
pageSize: 10,
}
+ data.companyName = ''
data.companyList = [];
getList();
+ getCompanyList()
}
const handleDelete = (val) => {
ElMessageBox.confirm(
@@ -174,16 +217,16 @@
type: 'warning',
})
.then( async() => {
- // const res = await delNotice(val);
- // if(res.code === 200){
- // ElMessage({
- // type: 'success',
- // message: '删除成功'
- // });
- // getList();
- // }else{
- // ElMessage.warning(res.message)
- // }
+ const res = await delCom(val.id);
+ if(res.code === 200){
+ ElMessage({
+ type: 'success',
+ message: '删除成功'
+ });
+ getList();
+ }else{
+ ElMessage.warning(res.message)
+ }
})
}
--
Gitblit v1.9.2