完成公司管理和项目管理

main
haha 2024-02-24 11:00:13 +08:00
parent 732711a605
commit f57b94ba30
14 changed files with 648 additions and 18 deletions

View File

@ -0,0 +1,30 @@
package com.yanzhu.project.controller;
import com.yanzhu.common.core.controller.BaseController;
import com.yanzhu.common.core.domain.AjaxResult;
import com.yanzhu.common.core.domain.entity.SysDept;
import com.yanzhu.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/project/company")
public class CompanyController extends BaseController {
@Autowired
private ISysDeptService deptService;
@PreAuthorize("@ss.hasPermi('project:company:list')")
@PostMapping("/list")
public AjaxResult companyList(@RequestBody SysDept where)
{
where.setParentId(100l);
where.setDelFlag("0");
List<SysDept> depts = deptService.selectDeptList(where);
return success(depts);
}
}

View File

@ -0,0 +1,32 @@
package com.yanzhu.project.controller;
import com.yanzhu.common.core.controller.BaseController;
import com.yanzhu.common.core.domain.AjaxResult;
import com.yanzhu.common.core.domain.entity.SysDept;
import com.yanzhu.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping("/project/project")
public class ProjectController extends BaseController {
@Autowired
private ISysDeptService deptService;
@PreAuthorize("@ss.hasPermi('project:project:list')")
@PostMapping("/list")
public AjaxResult companyList(@RequestBody SysDept where)
{
where.setDelFlag("0");
List<SysDept> depts = deptService.selectDeptList(where);
return success(depts);
}
}

View File

@ -1,10 +1,10 @@
# 页面标题
VUE_APP_TITLE = 若依管理系统
VUE_APP_TITLE = 研筑临时项目管理系统
# 开发环境配置
ENV = 'development'
# 若依管理系统/开发环境
# 研筑临时项目管理系统/开发环境
VUE_APP_BASE_API = '/dev-api'
# 路由懒加载

View File

@ -1,8 +1,8 @@
# 页面标题
VUE_APP_TITLE = 若依管理系统
VUE_APP_TITLE = 研筑临时项目管理系统
# 生产环境配置
ENV = 'production'
# 若依管理系统/生产环境
# 研筑临时项目管理系统/生产环境
VUE_APP_BASE_API = '/prod-api'

View File

@ -1,10 +1,10 @@
# 页面标题
VUE_APP_TITLE = 若依管理系统
VUE_APP_TITLE = 研筑临时项目管理系统
NODE_ENV = production
# 测试环境配置
ENV = 'staging'
# 若依管理系统/测试环境
# 研筑临时项目管理系统/测试环境
VUE_APP_BASE_API = '/stage-api'

View File

@ -1,8 +1,8 @@
{
"name": "yanZhu",
"version": "3.8.7",
"description": "若依管理系统",
"author": "若依",
"description": "研筑临时项目管理系统",
"author": "研筑科技",
"license": "MIT",
"scripts": {
"dev": "vue-cli-service serve",

View File

@ -0,0 +1,11 @@
import request from '@/utils/request'
// 查询项目申请列表
export function companyList(data) {
return request({
url: '/project/company/list',
method: 'post',
data:data
})
}

View File

@ -0,0 +1,11 @@
import request from '@/utils/request'
// 查询项目申请列表
export function projectList(data) {
return request({
url: '/project/project/list',
method: 'post',
data:data
})
}

View File

@ -9,13 +9,8 @@
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
<el-tooltip content="源码地址" effect="dark" placement="bottom">
<ruo-yi-git id="yanzhu-git" class="right-menu-item hover-effect" />
</el-tooltip>
<el-tooltip content="文档地址" effect="dark" placement="bottom">
<ruo-yi-doc id="yanzhu-doc" class="right-menu-item hover-effect" />
</el-tooltip>
</el-tooltip>
<screenfull id="screenfull" class="right-menu-item hover-effect" />

View File

@ -1,7 +1,7 @@
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">若依后台管理系统</h3>
<h3 class="title">研筑临时项目管理系统</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"

View File

@ -0,0 +1,264 @@
<template>
<div class="app-container project-company">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="公司名称" prop="deptName">
<el-input v-model="queryParams.deptName" placeholder="请输入公司名称" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="联系人" prop="leader">
<el-input v-model="queryParams.leader" placeholder="请输入联系人" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="公司状态" clearable @change="handleQuery">
<el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:dept:add']">新增</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId">
<el-table-column prop="deptName" label="公司名称" width="260"></el-table-column>
<el-table-column prop="leader" label="联系人" width="260"></el-table-column>
<el-table-column prop="phone" label="联系电话" width="260"></el-table-column>
<el-table-column prop="status" label="状态" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="200">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:dept:edit']">修改</el-button>
<el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete"
@click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 添加或修改公司对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24">
<el-form-item label="公司名称" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入公司名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="负责人" prop="leader">
<el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="公司状态">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value"
:label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
import { companyList } from '@/api/project/company'
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "projectCompany",
dicts: ['sys_normal_disable'],
components: { Treeselect },
data() {
return {
//
loading: true,
//
showSearch: true,
//
deptList: [],
//
deptOptions: [],
//
title: "",
//
open: false,
//
refreshTable: true,
//
queryParams: {
deptName: '',
status: '',
leader: '',
},
//
form: {},
//
rules: {
deptName: [
{ required: true, message: "公司名称不能为空", trigger: "blur" }
],
leader: [
{ required: true, message: "联系人不能为空", trigger: "blur" }
],
phone: [
{
required: true,
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur"
}
]
}
};
},
created() {
this.getList();
},
methods: {
/** 查询公司列表 */
getList() {
this.loading = true;
companyList(this.queryParams).then(response => {
this.deptList = response.data;
this.loading = false;
});
},
/** 转换公司数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.deptId,
label: node.deptName,
children: node.children
};
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
deptId: undefined,
parentId: 100,
deptName: undefined,
orderNum: 100,
leader: undefined,
phone: undefined,
email: '',
status: "0"
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd(row) {
this.reset();
this.form.parentId = 100;
this.open = true;
this.title = "添加公司";
listDept().then(response => {
this.deptOptions = this.handleTree(response.data, "deptId");
});
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
getDept(row.deptId).then(response => {
this.form = response.data;
this.form.parentId = 100;
this.open = true;
this.title = "修改公司";
listDeptExcludeChild(row.deptId).then(response => {
this.deptOptions = this.handleTree(response.data, "deptId");
if (this.deptOptions.length == 0) {
const noResultsOptions = { deptId: this.form.parentId, deptName: this.form.parentName, children: [] };
this.deptOptions.push(noResultsOptions);
}
});
});
},
/** 提交按钮 */
submitForm: function () {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.deptId != undefined) {
updateDept(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addDept(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function () {
return delDept(row.deptId);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => { });
}
}
};
</script>

View File

@ -0,0 +1,287 @@
<template>
<div class="app-container project-company">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="所属公司" prop="parentId">
<el-select v-model="queryParams.parentId" placeholder="请选择公司" @change="companyChange">
<el-option v-for="it in companyOpts" :label="it.deptName" :key="it.deptId"
:value="it.deptId" />
</el-select>
</el-form-item>
<el-form-item label="项目名称" prop="deptName">
<el-input v-model="queryParams.deptName" placeholder="请输入项目名称" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="联系人" prop="leader">
<el-input v-model="queryParams.leader" placeholder="请输入联系人" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="项目状态" clearable @change="handleQuery">
<el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:dept:add']">新增</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-if="refreshTable" v-loading="loading" :data="projectList" row-key="deptId">
<el-table-column prop="deptName" label="项目名称" width="260"></el-table-column>
<el-table-column prop="leader" label="联系人" width="260"></el-table-column>
<el-table-column prop="phone" label="联系电话" width="260"></el-table-column>
<el-table-column prop="status" label="状态" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="200">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:dept:edit']">修改</el-button>
<el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete"
@click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 添加或修改项目对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24">
<el-form-item label="所属公司" >
<el-input v-model="company.deptName" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="项目名称" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入项目名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="负责人" prop="leader">
<el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="项目状态">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value"
:label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { getDept, delDept, addDept, updateDept } from "@/api/system/dept";
import { companyList } from '@/api/project/company'
import {projectList} from '@/api/project/project'
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "projectCompany",
dicts: ['sys_normal_disable'],
components: { Treeselect },
data() {
return {
company:{},
companyOpts:[],
//
loading: true,
//
showSearch: true,
//
projectList: [],
//
deptOptions: [],
//
title: "",
//
open: false,
//
refreshTable: true,
//
queryParams: {
deptName: '',
status: '',
leader: '',
},
//
form: {},
//
rules: {
deptName: [
{ required: true, message: "项目名称不能为空", trigger: "blur" }
],
leader: [
{ required: true, message: "联系人不能为空", trigger: "blur" }
],
phone: [
{
required: true,
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur"
}
]
}
};
},
created() {
companyList({}).then(response => {
this.companyOpts=response.data;
if(this.companyOpts.length>0){
this.company=this.companyOpts[0];
this.queryParams.parentId=this.company.deptId;
this.getList();
}
});
this.getList();
},
methods: {
companyChange(companyId){
this.queryParams.parentId=companyId;
let tmps=this.companyOpts.filter(d=>d.deptId==companyId);
this.company=tmps.length>0? tmps[0]:{};
this.handleQuery();
},
/** 查询项目列表 */
getList() {
this.loading = true;
projectList(this.queryParams).then(response => {
this.projectList = response.data;
this.loading = false;
});
},
/** 转换项目数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.deptId,
label: node.deptName,
children: node.children
};
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
deptId: undefined,
parentId: this.queryParams.parentId,
deptName: undefined,
orderNum: 100,
leader: undefined,
phone: undefined,
email: '',
status: "0"
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd(row) {
this.reset();
this.form.parentId = this.queryParams.parentId;
this.open = true;
this.title = "添加项目";
listDept().then(response => {
this.deptOptions = this.handleTree(response.data, "deptId");
});
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
getDept(row.deptId).then(response => {
this.form = response.data;
this.form.parentId = this.queryParams.parentId;
this.open = true;
this.title = "修改项目";
});
},
/** 提交按钮 */
submitForm: function () {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.deptId != undefined) {
updateDept(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addDept(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function () {
return delDept(row.deptId);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => { });
}
}
};
</script>

View File

@ -1,7 +1,7 @@
<template>
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">若依后台管理系统</h3>
<h3 class="title">研筑临时项目管理系统</h3>
<el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

View File

@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
const name = process.env.VUE_APP_TITLE || '研筑临时项目管理系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口