Merge branch 'main' of http://192.168.0.75:3000/bonus/bns_zhgd_web
This commit is contained in:
commit
76ca34029e
|
|
@ -4,30 +4,65 @@ import request from '@/utils/request'
|
|||
* @data 项目管理新增
|
||||
*/
|
||||
export const addProjectAPI = (data) => {
|
||||
return request.post('/smart-site/bm_project', data)
|
||||
return request.post('/smart-site/bm_project/addProject', data)
|
||||
}
|
||||
/**
|
||||
* @data 项目管理修改
|
||||
*/
|
||||
export const editTemplateAPI = (data) => {
|
||||
return request.post('/system/template/edit', data)
|
||||
return request.post('/smart-site/bm_project/editProject', data)
|
||||
}
|
||||
/**
|
||||
* @data 项目管理列表
|
||||
*/
|
||||
export const getProjectListAPI = (data) => {
|
||||
return request.get(`/smart-site/bm_project/list`, { params: data })
|
||||
return request.get(`/smart-site/bm_project/list`, { params: data })
|
||||
}
|
||||
/**
|
||||
* @data 项目管理删除
|
||||
* @ids 参数
|
||||
*/
|
||||
export const deleteTemplateAPI = (data) => {
|
||||
return request.post('/system/template/delete/' + data)
|
||||
export const delProjectApi = (data) => {
|
||||
return request.post('/smart-site/bm_project/delProject', data)
|
||||
}
|
||||
/**
|
||||
* @data 项目管理详情
|
||||
*/
|
||||
export const getTemplateMenuTreeselectAPI = (id) => {
|
||||
return request.get(`/system/template/templateMenuTreeselect/${id}`)
|
||||
export const getDetailById = (params) => {
|
||||
return request.get(`/smart-site/bm_project/getDetailById`, { params })
|
||||
}
|
||||
|
||||
// 公司-通用下拉
|
||||
export const getBranchCompanysAPI = () => {
|
||||
return request.get(`/smart-site/select/getBranchCompanys`)
|
||||
}
|
||||
|
||||
// 项目部-列表
|
||||
export const getDepartsAPI = (params) => {
|
||||
return request.get(`/smart-site/depart/getDeparts`, { params })
|
||||
}
|
||||
|
||||
// 项目部-详情
|
||||
export const detailDepartAPI = (params) => {
|
||||
return request.get(`/smart-site/depart/detailDepart`, { params })
|
||||
}
|
||||
|
||||
// 项目部-新增
|
||||
export const addDepartAPI = (data) => {
|
||||
return request.post(`/smart-site/depart/addDepart`, data)
|
||||
}
|
||||
|
||||
// 项目部-修改
|
||||
export const editDepartAPI = (data) => {
|
||||
return request.post(`/smart-site/depart/editDepart`, data)
|
||||
}
|
||||
|
||||
// 项目部-删除
|
||||
export const delDepartAPI = (data) => {
|
||||
return request.post(`/smart-site/depart/delDepart`, data)
|
||||
}
|
||||
|
||||
// 项目部-修改状态
|
||||
export const editDepartStatusAPI = (data) => {
|
||||
return request.post(`/smart-site/depart/editDepartStatus`, data)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,55 @@
|
|||
import request from '@/utils/request';
|
||||
|
||||
// 查询分公司列表
|
||||
export function queryBranchCompanyList(query) {
|
||||
return request({
|
||||
url: '/smart-site/branchCompany/queryBranchCompanyList',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 分公司-新增
|
||||
export function addBranchCompany(data) {
|
||||
return request({
|
||||
url: '/smart-site/branchCompany/addBranchCompany',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
// 分公司-修改
|
||||
export function editBranchCompany(data) {
|
||||
return request({
|
||||
url: '/smart-site/branchCompany/editBranchCompany',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
// 分公司-删除
|
||||
export function delBranchCompany(data) {
|
||||
return request({
|
||||
url: '/smart-site/branchCompany/delBranchCompany',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
// 分公司详情
|
||||
export function detailBranchCompany(query) {
|
||||
return request({
|
||||
url: '/smart-site/branchCompany/detailBranchCompany',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 分公司-修改状态
|
||||
export function editBranchCompanyStatus(data) {
|
||||
return request({
|
||||
url: '/smart-site/branchCompany/editBranchCompanyStatus',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
|
@ -2,17 +2,14 @@
|
|||
<div>
|
||||
<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
|
||||
<el-form :model="formData" ref="dialogForm" size="small" label-width="100px" :rules="rules">
|
||||
<el-form-item label="所属公司" prop="company">
|
||||
<el-input v-model="formData.company" placeholder="请输入所属公司" style="width: 100%" disabled />
|
||||
</el-form-item>
|
||||
<el-form-item label="分公司" prop="subCompany">
|
||||
<el-select v-model="formData.subCompany" placeholder="请选择分公司" clearable style="width: 100%">
|
||||
<el-option v-for="item in subCompanyOpts" :key="item.value" :label="item.label" :value="item.value" />
|
||||
<el-form-item label="分公司" prop="branchCompanyId">
|
||||
<el-select v-model="formData.branchCompanyId" placeholder="请选择分公司" clearable style="width: 100%">
|
||||
<el-option v-for="(item, index) in subCompanyOpts" :key="index" :label="item.value" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="项目部名称" prop="proName">
|
||||
<el-form-item label="项目部名称" prop="departName">
|
||||
<el-input
|
||||
v-model="formData.proName"
|
||||
v-model="formData.departName"
|
||||
placeholder="请输入项目部名称"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
|
|
@ -43,25 +40,26 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { getBranchCompanysAPI, addDepartAPI, editDepartAPI, detailDepartAPI } from '@/api/project-manage/index.js'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
row: {
|
||||
isAdd: true,
|
||||
},
|
||||
dialogVisible: false,
|
||||
dialogTitle: '新建项目部',
|
||||
formData: {
|
||||
company: '', // 所属公司
|
||||
subCompany: '', // 分公司
|
||||
proName: '', // 项目部名称
|
||||
branchCompanyId: undefined, // 所属公司
|
||||
departName: '', // 项目部名称
|
||||
remark: '', // 备注
|
||||
// useStatus: 1, // 状态
|
||||
},
|
||||
subCompanyOpts: [
|
||||
{ label: '分公司1', value: '1' },
|
||||
{ label: '分公司2', value: '2' },
|
||||
{ label: '分公司3', value: '3' },
|
||||
],
|
||||
subCompanyOpts: [],
|
||||
rules: {
|
||||
subCompany: [{ required: true, message: '请选择分公司', trigger: 'change' }],
|
||||
proName: [
|
||||
branchCompanyId: [{ required: true, message: '请选择分公司', trigger: 'change' }],
|
||||
departName: [
|
||||
{ required: true, message: '请输入项目部名称', trigger: 'blur' },
|
||||
{ min: 1, max: 99, message: '长度在 1 到 99 个字符', trigger: 'blur' },
|
||||
],
|
||||
|
|
@ -70,38 +68,62 @@ export default {
|
|||
},
|
||||
created() {},
|
||||
methods: {
|
||||
openDialog(data) {
|
||||
console.log('🚀 ~ openDialog ~ data:', data)
|
||||
this.dialogTitle = data.dialogTitle
|
||||
openDialog(row) {
|
||||
console.log('🚀 ~ openDialog ~ row:', row)
|
||||
this.getBranchCompanys()
|
||||
|
||||
this.row = row
|
||||
this.dialogTitle = row.dialogTitle
|
||||
this.dialogVisible = true
|
||||
|
||||
this.$nextTick(() => {
|
||||
this.$refs.dialogForm.resetFields()
|
||||
if (!data.isAdd) {
|
||||
this.handleEditDetail(data)
|
||||
if (!row.isAdd) {
|
||||
this.handleEditDetail(row)
|
||||
this.$refs.dialogForm.clearValidate()
|
||||
}
|
||||
})
|
||||
},
|
||||
async getBranchCompanys() {
|
||||
try {
|
||||
const res = await getBranchCompanysAPI()
|
||||
this.subCompanyOpts = res.data
|
||||
} catch (error) {
|
||||
console.log('🚀 ~ getBranchCompanys ~ error:', error)
|
||||
}
|
||||
},
|
||||
// 编辑详情
|
||||
async handleEditDetail(row) {
|
||||
console.log('🚀 ~ handleEditDetail ~ row:', row)
|
||||
try {
|
||||
// const params = {
|
||||
// id: row.id,
|
||||
// }
|
||||
// this.formData = await
|
||||
const params = { id: row.id }
|
||||
const res = await detailDepartAPI(params)
|
||||
this.formData = res.data
|
||||
} catch (error) {
|
||||
console.log('🚀 ~ handleEditDetail ~ error:', error)
|
||||
}
|
||||
},
|
||||
dialogConfirm() {
|
||||
this.$refs.dialogForm.validate((valid) => {
|
||||
this.$refs.dialogForm.validate(async (valid) => {
|
||||
if (valid) {
|
||||
this.dialogVisible = false
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '操作成功!',
|
||||
})
|
||||
this.$emit('getList')
|
||||
let res = {}
|
||||
try {
|
||||
if (this.row.isAdd) {
|
||||
res = await addDepartAPI(this.formData)
|
||||
} else {
|
||||
res = await editDepartAPI(this.formData)
|
||||
}
|
||||
if (res.code == 200) {
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '操作成功!',
|
||||
})
|
||||
this.$emit('getList')
|
||||
this.dialogVisible = false
|
||||
}
|
||||
} catch (error) {
|
||||
console.log('🚀 ~ this.$refs.dialogForm.validate ~ error:', error)
|
||||
}
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,31 @@
|
|||
<template>
|
||||
<!-- 新增修改弹框 -->
|
||||
<div>
|
||||
<el-form
|
||||
label-width="auto"
|
||||
:model="addOrEditForm"
|
||||
:rules="addOrEditFormRef"
|
||||
ref="addOrEditFormRef"
|
||||
>
|
||||
<el-form label-width="auto" :model="addOrEditForm" :rules="addOrEditFormRef" ref="addOrEditFormRef">
|
||||
<TitleTip :titleText="`基本信息`" />
|
||||
<el-form-item label="所属公司:" prop="company">
|
||||
<el-input v-model="addOrEditForm.company" disabled />
|
||||
<el-form-item label="所属公司:" prop="companyId">
|
||||
<el-select v-model="addOrEditForm.companyId" placeholder="请选择所属公司" clearable style="width: 100%">
|
||||
<el-option v-for="item in companyOpts" :key="item.id" :label="item.value" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="项目名称:" prop="projectName">
|
||||
<el-input v-model="addOrEditForm.projectName" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="项目状态:" prop="projectStatus">
|
||||
<el-select
|
||||
v-model="addOrEditForm.projectStatus"
|
||||
placeholder="请选择项目状态"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.type.pro_status"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="业主单位:" prop="ownerUnit">
|
||||
<el-input v-model="addOrEditForm.ownerUnit" clearable />
|
||||
</el-form-item>
|
||||
|
|
@ -55,20 +67,27 @@
|
|||
v-model="addOrEditForm.projectScale"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注:">
|
||||
<el-input
|
||||
clearable
|
||||
type="textarea"
|
||||
:autosize="{ minRows: 3, maxRows: 10 }"
|
||||
v-model="addOrEditForm.remark"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item class="handle">
|
||||
<el-button> 取消 </el-button>
|
||||
<el-button type="primary" @click="onSubmitForm">
|
||||
保存
|
||||
</el-button>
|
||||
<el-button type="primary" @click="onSubmitForm"> 保存 </el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { addProjectAPI } from '@/api/project-manage/index.js'
|
||||
import { addProjectAPI, editTemplateAPI, getBranchCompanysAPI, getDetailById } from '@/api/project-manage/index.js'
|
||||
export default {
|
||||
dicts: ['pro_status'],
|
||||
props: {
|
||||
row: {
|
||||
type: Object,
|
||||
|
|
@ -97,10 +116,11 @@ export default {
|
|||
callback()
|
||||
}
|
||||
return {
|
||||
queryParams: {},
|
||||
// 新增或修改接口
|
||||
addOrEditForm: {
|
||||
companyId: '', // 公司id
|
||||
projectName: '', // 项目名称
|
||||
projectStatus: '', // 项目状态
|
||||
ownerUnit: '', // 业主单位
|
||||
planStartTime: '', //计划开工日期
|
||||
planEndTime: '', // 计划竣工日期
|
||||
|
|
@ -108,8 +128,17 @@ export default {
|
|||
projectAmount: '', // 项目金额
|
||||
projectManager: '', // 项目负责任人
|
||||
projectScale: '', // 工程规格
|
||||
remark: '', // 备注
|
||||
},
|
||||
companyOpts: [], // 所属公司
|
||||
addOrEditFormRef: {
|
||||
companyId: [
|
||||
{
|
||||
required: true,
|
||||
message: '请选择所属公司',
|
||||
trigger: 'change',
|
||||
},
|
||||
],
|
||||
projectName: [
|
||||
{
|
||||
required: true,
|
||||
|
|
@ -123,6 +152,13 @@ export default {
|
|||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
projectStatus: [
|
||||
{
|
||||
required: true,
|
||||
message: '请选择项目状态',
|
||||
trigger: 'change',
|
||||
},
|
||||
],
|
||||
ownerUnit: [
|
||||
{
|
||||
required: true,
|
||||
|
|
@ -156,13 +192,33 @@ export default {
|
|||
}
|
||||
},
|
||||
created() {
|
||||
this.getcompanyOpts()
|
||||
console.log('🚀 ~ created ~ row:', this.row)
|
||||
if (this.row.projectId) {
|
||||
this.queryParams = this.row
|
||||
console.log('🚀 ~ created ~ this.queryParams:', this.queryParams)
|
||||
this.getDetails()
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
async getcompanyOpts() {
|
||||
try {
|
||||
const res = await getBranchCompanysAPI()
|
||||
this.companyOpts = res.data
|
||||
console.log('🚀 ~ getcompanyOpts ~ this.companyOpts:', this.companyOpts)
|
||||
} catch (error) {
|
||||
console.log('🚀 ~ getcompanyOpts ~ error:', error)
|
||||
}
|
||||
},
|
||||
// 编辑详情回显
|
||||
async getDetails() {
|
||||
try {
|
||||
const res = await getDetailById({ projectId: this.row.projectId })
|
||||
console.log('🚀 ~ getDetails ~ res:', res)
|
||||
this.addOrEditForm = res.data
|
||||
} catch (error) {
|
||||
console.log('🚀 ~ getDetails ~ error:', error)
|
||||
|
||||
}
|
||||
},
|
||||
handleClose() {
|
||||
this.$refs.addOrEditFormRef.resetFields()
|
||||
// this.$emit('update:formDialogVisible', false)
|
||||
|
|
@ -171,12 +227,19 @@ export default {
|
|||
onSubmitForm() {
|
||||
this.$refs.addOrEditFormRef.validate(async (valid) => {
|
||||
if (valid) {
|
||||
const res = await addProjectAPI(this.addOrEditForm)
|
||||
if (res.code === 200) {
|
||||
this.$modal.msgSuccess('新增成功')
|
||||
if (!this.row.projectId) {
|
||||
const res = await addProjectAPI(this.addOrEditForm)
|
||||
if (res.code === 200) {
|
||||
this.$modal.msgSuccess('新增成功')
|
||||
}
|
||||
this.$emit('onCloseDialog')
|
||||
} else {
|
||||
const res = await editTemplateAPI(this.addOrEditForm)
|
||||
if (res.code === 200) {
|
||||
this.$modal.msgSuccess('修改成功')
|
||||
}
|
||||
this.$emit('onCloseDialog')
|
||||
}
|
||||
// this.$emit('update:formDialogVisible', false)
|
||||
this.$emit('onCloseDialog')
|
||||
}
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,34 +1,22 @@
|
|||
|
||||
// 分公司-下拉
|
||||
let departList = [
|
||||
{ value: '1', label: '上海分公司' },
|
||||
{ value: '2', label: '北京分公司' },
|
||||
]
|
||||
// 项目状态-下拉
|
||||
let proStatusList = [
|
||||
{ value: '1', label: '未开始' },
|
||||
{ value: '2', label: '进行中' },
|
||||
{ value: '3', label: '已结束' },
|
||||
]
|
||||
|
||||
export const formLabel = [
|
||||
{
|
||||
f_label: '所属公司',
|
||||
f_model: 'departName',
|
||||
f_model: 'companyId',
|
||||
f_type: 'sel',
|
||||
isShow: false,
|
||||
},
|
||||
{ f_label: '搜索关键词', f_model: 'proName', f_type: 'ipt', isShow: false },
|
||||
{ f_label: '项目状态', f_model: 'relUser', f_type: 'sel', isShow: false },
|
||||
{ f_label: '搜索关键词', f_model: 'keyWord', f_type: 'ipt', isShow: false },
|
||||
{ f_label: '项目状态', f_model: 'projectStatus', f_type: 'sel', isShow: false },
|
||||
]
|
||||
export const columnsList = [
|
||||
{ t_props: 'companyName', t_label: '分公司名称' },
|
||||
{ t_props: 'projectName', t_label: '项目名称' },
|
||||
{ t_props: 'address', t_label: '项目地址' },
|
||||
{ t_props: 'planStartTime', t_label: '计划开工日期' },
|
||||
{ t_props: 'planEndTime', t_label: '计划竣工日期' },
|
||||
{ t_props: 'ownerUnit', t_label: '业主单位' },
|
||||
{ t_props: 'projectStatus', t_label: '项目状态', t_slot: 'status' },
|
||||
{ t_props: 'auditStatus', t_label: '标段工程数量', t_slot: 'auditStatus' },
|
||||
{ t_props: 'bidNum', t_label: '标段工程数量', t_slot: 'bidStatus' },
|
||||
]
|
||||
|
||||
export const dialogConfig = {
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
</template>
|
||||
|
||||
<template slot="status" slot-scope="{ data }">
|
||||
<el-tag size="mini">状态 </el-tag>
|
||||
<el-tag size="mini">{{ data.projectStatus }}</el-tag>
|
||||
</template>
|
||||
<template slot="auditStatus" slot-scope="{ data }">
|
||||
<span v-if="data.projectAmount > 0" @click="handleLot(data)" style="color: #409eff; cursor: pointer">{{
|
||||
data.projectAmount
|
||||
<template slot="bidStatus" slot-scope="{ data }">
|
||||
<span v-if="data.bidNum > 0" @click="handleLot(data)" style="color: #409eff; cursor: pointer">{{
|
||||
data.bidNum
|
||||
}}</span>
|
||||
<span v-else>-</span>
|
||||
<span v-else>{{ data.bidNum }}</span>
|
||||
</template>
|
||||
</TableModel>
|
||||
|
||||
|
|
@ -45,8 +45,9 @@ import AddEditForm from './components/add-edit-form'
|
|||
import ProjectDetails from './components/project-details'
|
||||
import LotList from './components/LotList'
|
||||
import { formLabel, columnsList, dialogConfig } from './config'
|
||||
import { getProjectListAPI } from '@/api/project-manage/index.js'
|
||||
import { getProjectListAPI, getBranchCompanysAPI, delProjectApi } from '@/api/project-manage/index.js'
|
||||
export default {
|
||||
dicts: ['pro_status'],
|
||||
components: {
|
||||
TableModel,
|
||||
DialogModel,
|
||||
|
|
@ -63,24 +64,36 @@ export default {
|
|||
dialogType: 1,
|
||||
proDetail: {},
|
||||
addEditRow: {},
|
||||
departList: [
|
||||
{ value: '1', label: '上海分公司' },
|
||||
{ value: '2', label: '北京分公司' },
|
||||
],
|
||||
proStatusList: [
|
||||
{ value: '1', label: '未开始' },
|
||||
{ value: '2', label: '进行中' },
|
||||
{ value: '3', label: '已结束' },
|
||||
]
|
||||
departList: [],
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getDepartList()
|
||||
formLabel[0].f_selList = this.departList
|
||||
formLabel[2].f_selList = this.proStatusList
|
||||
formLabel[2].f_selList = this.dict.type.pro_status
|
||||
},
|
||||
methods: {
|
||||
// 获取公司下拉
|
||||
async getDepartList() {
|
||||
try {
|
||||
const res = await getBranchCompanysAPI()
|
||||
console.log('🚀 ~ getDepartList ~ res:', res)
|
||||
if (res.data && res.data.length > 0) {
|
||||
res.data.forEach((item) => {
|
||||
this.departList.push({
|
||||
value: item.id,
|
||||
label: item.value,
|
||||
})
|
||||
})
|
||||
}
|
||||
} catch (error) {
|
||||
console.log('🚀 ~ getDepartList ~ error:', error)
|
||||
}
|
||||
},
|
||||
handleExport() {
|
||||
console.log('导出')
|
||||
const params = this.$refs.tableModel.queryParams
|
||||
console.log('导出', params)
|
||||
this.download('smart-site/bm_project/export', params, `项目管理_${new Date().getTime()}.xlsx`)
|
||||
},
|
||||
handleAddData() {
|
||||
console.log('新增')
|
||||
|
|
@ -105,13 +118,15 @@ export default {
|
|||
handleDeleteData(data) {
|
||||
console.log('删除', data)
|
||||
// 确认
|
||||
this.$confirm('是否删除?', '提示', {
|
||||
this.$confirm('是否确定删除?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
})
|
||||
.then(() => {
|
||||
this.$refs.tableModel.getTableList()
|
||||
delProjectApi({ projectId: data.projectId }).then((res) => {
|
||||
this.$refs.tableModel.getTableList()
|
||||
})
|
||||
})
|
||||
.catch(() => {
|
||||
console.log('取消删除')
|
||||
|
|
@ -120,6 +135,7 @@ export default {
|
|||
/** 关闭外侧弹框 */
|
||||
closeDialogOuter() {
|
||||
this.dialogConfig.outerVisible = false
|
||||
this.$refs.tableModel.getTableList()
|
||||
},
|
||||
handleLot(data) {
|
||||
this.$refs.lotList.openDialog(data)
|
||||
|
|
|
|||
|
|
@ -46,16 +46,21 @@
|
|||
align="center"
|
||||
>
|
||||
<!-- 插槽 -->
|
||||
<template v-slot="{ row }" v-if="column.prop == 'status'">
|
||||
<template v-slot="{ row }" v-if="column.prop == 'useStatus'">
|
||||
<span>
|
||||
<el-switch v-model="row.status" active-value="1" inactive-value="0" @change="changeSwitch(row)"></el-switch>
|
||||
<el-switch
|
||||
v-model="row.useStatus"
|
||||
active-value="1"
|
||||
inactive-value="0"
|
||||
@change="changeSwitch(row)"
|
||||
></el-switch>
|
||||
</span>
|
||||
</template>
|
||||
<template v-slot="{ row }" v-else-if="column.prop == 'lotCount'">
|
||||
<span v-if="row.lotCount > 0" @click="handleLot(row)" style="color: #409eff; cursor: pointer">{{
|
||||
row.lotCount
|
||||
<template v-slot="{ row }" v-else-if="column.prop == 'bidNum'">
|
||||
<span v-if="row.bidNum > 0" @click="handleLot(row)" style="color: #409eff; cursor: pointer">{{
|
||||
row.bidNum
|
||||
}}</span>
|
||||
<span v-else>-</span>
|
||||
<span v-else>{{ row.bidNum }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
|
@ -85,6 +90,8 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { getDepartsAPI, editDepartStatusAPI, delDepartAPI } from '@/api/project-manage/index.js'
|
||||
|
||||
export default {
|
||||
components: {
|
||||
LotList: () => import('./components/LotList'),
|
||||
|
|
@ -101,27 +108,16 @@ export default {
|
|||
total: 0, // 总条数
|
||||
// 表头
|
||||
tableColumns: [
|
||||
{ label: '分公司名称', prop: 'proName' },
|
||||
{ label: '项目部名称', prop: 'projectDepartment' },
|
||||
{ label: '状态', prop: 'status' },
|
||||
{ label: '标段工程数量', prop: 'lotCount' },
|
||||
{ label: '更新人员', prop: 'updateUser' },
|
||||
{ label: '分公司名称', prop: 'branchCompanyName' },
|
||||
{ label: '项目部名称', prop: 'departName' },
|
||||
{ label: '状态', prop: 'useStatus' },
|
||||
{ label: '标段工程数量', prop: 'bidNum' },
|
||||
{ label: '更新人员', prop: 'updateUserName' },
|
||||
{ label: '更新时间', prop: 'updateTime' },
|
||||
{ label: '备注', prop: 'remark' },
|
||||
],
|
||||
// 表格数据
|
||||
tableList: [
|
||||
{
|
||||
id: 1,
|
||||
proName: '分公司名称',
|
||||
projectDepartment: '项目部名称',
|
||||
status: '1',
|
||||
lotCount: 10,
|
||||
updateUser: '更新人员',
|
||||
updateTime: '2023-10-01 12:00:00',
|
||||
remark: '备注',
|
||||
},
|
||||
],
|
||||
tableList: [],
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -146,10 +142,10 @@ export default {
|
|||
const loading = this.$loading({ text: '加载中...' })
|
||||
try {
|
||||
const params = { ...this.queryParams }
|
||||
// const res = await
|
||||
const res = await getDepartsAPI(params)
|
||||
// console.log('🚀 ~ 获取列表 ~ res:', res)
|
||||
// this.tableList = res.rows
|
||||
// this.total = res.total
|
||||
this.tableList = res.rows
|
||||
this.total = res.total
|
||||
loading.close()
|
||||
} catch (error) {
|
||||
console.log('🚀 ~ 获取列表 ~ error:', error)
|
||||
|
|
@ -167,13 +163,19 @@ export default {
|
|||
confirmButtonText: '确定',
|
||||
})
|
||||
.then(() => {
|
||||
// const res = await
|
||||
// console.log('🚀 ~ 修改状态 ~ res:', res)
|
||||
row.status = row.status == '1' ? '1' : '0'
|
||||
editDepartStatusAPI({ id: row.id, useStatus: row.useStatus }).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '修改成功',
|
||||
})
|
||||
this.getList()
|
||||
}
|
||||
})
|
||||
})
|
||||
.catch(() => {
|
||||
console.log('取消修改', row.status)
|
||||
row.status = row.status == '1' ? '0' : '1'
|
||||
console.log('取消修改', row.useStatus)
|
||||
row.useStatus = row.useStatus == '1' ? '0' : '1'
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消',
|
||||
|
|
@ -199,9 +201,13 @@ export default {
|
|||
type: 'warning',
|
||||
})
|
||||
.then(() => {
|
||||
// const res = await
|
||||
// console.log('🚀 ~ 删除 ~ res:', res)
|
||||
this.getList()
|
||||
delDepartAPI({ id: row.id }).then((res) => {
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '删除成功!',
|
||||
})
|
||||
this.getList()
|
||||
})
|
||||
})
|
||||
.catch(() => {
|
||||
console.log('取消删除')
|
||||
|
|
@ -209,14 +215,9 @@ export default {
|
|||
},
|
||||
// 导出数据
|
||||
handleExport() {
|
||||
this.$message({
|
||||
type: 'warning',
|
||||
message: '导出功能开发中,敬请期待!',
|
||||
})
|
||||
return
|
||||
try {
|
||||
let fileName = `项目部管理_${new Date().getTime()}.xLsx`
|
||||
let url = ''
|
||||
let url = 'smart-site/depart/export'
|
||||
const params = { ...this.queryParams }
|
||||
console.log('🚀 ~ 导出 ~ params:', params)
|
||||
this.download(url, params, fileName)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,175 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
|
||||
label-width="68px">
|
||||
<el-form-item label="关键字" prop="keyWord">
|
||||
<el-input v-model="queryParams.keyWord" placeholder="请输入关键字" clearable
|
||||
@keyup.enter.native="handleQuery" />
|
||||
</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="['basic:branchCompany:add']">新增</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
||||
v-hasPermi="['system:post:export']">导出</el-button>
|
||||
</el-col> -->
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
<el-table v-loading="loading" :data="branchCompanyList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="分公司名称" align="center" prop="companyName" />
|
||||
<el-table-column label="分公司简称" align="center" prop="abbrName" />
|
||||
<el-table-column label="状态" align="center" key="useStatus">
|
||||
<template slot-scope="scope">
|
||||
<el-switch v-model="scope.row.useStatus" active-value="1" inactive-value="0"
|
||||
@change="handleStatusChange(scope.row)"></el-switch>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
<el-table-column label="更新人员" align="center" prop="updateUserName" />
|
||||
<el-table-column label="更新时间" align="center" prop="updateTime" width="180"></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="['basic:branchCompany:edit']">修改</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
||||
v-hasPermi="['basic:branchCompany:del']">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize" @pagination="getList" />
|
||||
<!-- 新增/编辑 -->
|
||||
<BranchCompanypop v-if="isflag" :isAdd="isAdd" :rowData="row" @handleQuery="handleQuery" :title="title"
|
||||
@closeDialog="closeDialog" @showColose="showColose" :dataForm="row" :disabled="loading" :width="600" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { queryBranchCompanyList, delDev,editBranchCompanyStatus } from "@/api/system/branchCompany";
|
||||
import BranchCompanypop from "./prop/branchCompanypop.vue";
|
||||
export default {
|
||||
name: "BranchCompany",
|
||||
dicts: ['video_device'],
|
||||
components: {
|
||||
BranchCompanypop
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 岗位表格数据
|
||||
branchCompanyList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
keyWord: '',
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
isflag: false,
|
||||
row: {},
|
||||
isAdd: ''
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 视频设备列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
queryBranchCompanyList(this.queryParams).then(response => {
|
||||
this.branchCompanyList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
closeDialog() {
|
||||
this.isflag = false;
|
||||
},
|
||||
showColose() {
|
||||
this.isflag = false;
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.id)
|
||||
this.single = selection.length != 1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.title = "新增";
|
||||
this.isAdd = 'add';
|
||||
this.isflag = true;
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.title = "修改";
|
||||
this.isAdd = 'edit';
|
||||
this.row = row;
|
||||
this.isflag = true;
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const id = row.id || this.ids;
|
||||
this.$modal.confirm('是否确认删除分公司名称为"' + row.companyName + '"的数据项?').then(function () {
|
||||
return delDev({ id: id });
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => { });
|
||||
},
|
||||
// 分公司状态修改
|
||||
handleStatusChange(row) {
|
||||
let text = row.useStatus === '1' ? '启用' : '禁用'
|
||||
this.$modal.confirm('确认要"' + text + '""' + row.companyName + '"数据吗?').then(function () {
|
||||
return editBranchCompanyStatus({ id: row.id, useStatus: row.useStatus })
|
||||
}).then(() => {
|
||||
this.$modal.msgSuccess(text + '成功')
|
||||
}).catch(function () {
|
||||
row.useStatus = row.useStatus === '1' ? '0' : '1'
|
||||
})
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('system/post/export', {
|
||||
...this.queryParams
|
||||
}, `post_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -0,0 +1,169 @@
|
|||
<template>
|
||||
<!-- 小型弹窗,用于完成,删除,保存等操作 -->
|
||||
<el-dialog class="l-dialog" :class="lDialog" :title="title" :visible.sync="dialogVisible" :showClose="true"
|
||||
:closeOnClickModal="false" @close="handleClose" :append-to-body="true">
|
||||
<div>
|
||||
<el-form :model="form" :rules="rules" ref="ruleForm" label-width="110px">
|
||||
<el-form-item label="分公司名称" prop="companyName">
|
||||
<el-input style="width:100%" v-model="form.companyName" placeholder="请输入分公司名称" maxlength="64"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="简称" prop="abbrName">
|
||||
<el-input style="width:100%" v-model="form.abbrName" placeholder="请输入简称" maxlength="64"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="useStatus">
|
||||
<el-switch v-model="form.useStatus" :active-value="1" :inactive-value="0"></el-switch>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input type="textarea" style="width:100%" v-model="form.remark" placeholder="请输入备注" maxlength="255"></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button class="clear-btn" @click="handleClose" :disabled="disabled">取消</el-button>
|
||||
<el-button type="primary" class="search-btn" :disabled="disabled" @click="submitForm('ruleForm')">确认</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
<script>
|
||||
import { detailBranchCompany, addBranchCompany, editBranchCompany } from "@/api/system/branchCompany";
|
||||
export default {
|
||||
name: "BranchCompanypop",
|
||||
props: ["width", "dataForm", "title", "disabled", "isAdd", "rowData"],
|
||||
data() {
|
||||
return {
|
||||
roles: [],
|
||||
lDialog: this.width > 500 ? "w700" : "w500",
|
||||
dialogVisible: true,
|
||||
isDisabled: true,
|
||||
form: {
|
||||
companyName: null,
|
||||
abbrName: null,
|
||||
useStatus: 1,
|
||||
remark:null
|
||||
},
|
||||
rules: {
|
||||
companyName: [
|
||||
{ required: true, message: '分公司名称不能为空', trigger: 'blur' }
|
||||
],
|
||||
abbrName: [
|
||||
{ required: true, message: '简称不能为空', trigger: 'blur' }
|
||||
]
|
||||
},
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
if (this.isAdd === 'add') { // 新增
|
||||
} else if (this.isAdd === 'edit') { // 修改
|
||||
this.queryDetailDev();
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
/**详情*/
|
||||
queryDetailDev() {
|
||||
detailBranchCompany({ id: this.rowData.id }).then(res => {
|
||||
this.form = res.data;
|
||||
this.form.useStatus = parseInt(res.data.useStatus);
|
||||
}).catch(error => {
|
||||
|
||||
})
|
||||
},
|
||||
/*关闭弹窗 */
|
||||
handleClose() {
|
||||
this.dialogVisible = false;
|
||||
this.$emit("closeDialog");
|
||||
setTimeout(() => {
|
||||
this.dialogVisible = true;
|
||||
});
|
||||
},
|
||||
/**确认弹窗 */
|
||||
sureBtnClick() {
|
||||
this.dialogVisible = false;
|
||||
this.$emit("closeDialog");
|
||||
setTimeout(() => {
|
||||
this.dialogVisible = true;
|
||||
});
|
||||
},
|
||||
/**重置表单*/
|
||||
reset() {
|
||||
this.form = {
|
||||
devName: null,
|
||||
macId: null,
|
||||
devTypeCode: null,
|
||||
puid: null,
|
||||
gbCode: null,
|
||||
playIdx: 0
|
||||
};
|
||||
this.resetForm("ruleForm");
|
||||
},
|
||||
handleReuslt(res) {
|
||||
this.$modal.msgSuccess(res.msg);
|
||||
this.reset();
|
||||
this.$emit('handleQuery');
|
||||
this.handleClose();
|
||||
},
|
||||
/**验证 */
|
||||
submitForm(formName) {
|
||||
this.$refs[formName].validate(valid => {
|
||||
if (valid) {
|
||||
let loading = this.$loading({
|
||||
lock: true,
|
||||
text: "数据提交中,请稍候...",
|
||||
background: 'rgba(0,0,0,0.2)',
|
||||
target: this.$el.querySelector('.el-dialog') || document.body
|
||||
})
|
||||
let params = _.cloneDeep(this.form);
|
||||
if (this.isAdd === 'add') {
|
||||
addBranchCompany(params).then(res => {
|
||||
loading.close();
|
||||
if (res.code === 200) {
|
||||
this.handleReuslt(res);
|
||||
} else {
|
||||
this.$modal.msgError(res.msg);
|
||||
}
|
||||
}).catch(error => {
|
||||
loading.close();
|
||||
});
|
||||
} else {
|
||||
editBranchCompany(params).then(res => {
|
||||
loading.close();
|
||||
if (res.code === 200) {
|
||||
this.handleReuslt(res);
|
||||
} else {
|
||||
this.$modal.msgError(res.msg);
|
||||
}
|
||||
}).catch(error => {
|
||||
loading.close();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.w700 .el-dialog {
|
||||
width: 700px;
|
||||
}
|
||||
|
||||
.w500 .el-dialog {
|
||||
width: 500px;
|
||||
}
|
||||
|
||||
.w500 .el-dialog__header,
|
||||
.w700 .el-dialog__header {
|
||||
background: #eeeeee;
|
||||
|
||||
.el-dialog__title {
|
||||
font-size: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
.yxq .el-range-separator {
|
||||
margin-right: 7px !important;
|
||||
}
|
||||
|
||||
.el-date-editor--daterange.el-input__inner {
|
||||
width: 260px;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -36,7 +36,8 @@ module.exports = {
|
|||
// detail: https://cli.vuejs.org/config/#devserver-proxy
|
||||
[process.env.VUE_APP_BASE_API]: {
|
||||
// target: `http://192.168.2.209:38080`,
|
||||
target: `http://192.168.0.60:38080`,
|
||||
// target: `http://192.168.0.60:38080`, // 福
|
||||
target: `http://192.168.0.39:38080`, // 文
|
||||
// target: `http://192.168.0.244:18877`,
|
||||
changeOrigin: true,
|
||||
pathRewrite: {
|
||||
|
|
|
|||
Loading…
Reference in New Issue