sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

dev_xds
haha 2023-08-16 00:47:22 +08:00
parent b2caeb3999 2896fc4e41
commit 6a4ebb885b
16 changed files with 2373 additions and 674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ruoyi-ui/src/api/project/projectDeptWroks.js 100644
View File

@ -0,0 +1,60 @@
import request from '@/utils/request'
// 查询项目部门在册人员列表
export function listProjectDeptWroks(query) {
return request({
url: '/project/projectDeptWroks/list',
method: 'get',
params: query
})
}
export function listProjectDeptWroks2(query) {
return request({
url: '/project/projectDeptWroks/list2',
method: 'get',
params: query
})
}
export function unitList(query) {
return request({
url: '/project/projectDeptWroks/unitList',
method: 'get',
params: query
})
}
// 查询项目部门在册人员详细
export function getProjectDeptWroks(id) {
return request({
url: '/project/projectDeptWroks/' + id,
method: 'get'
})
}
// 新增项目部门在册人员
export function addProjectDeptWroks(data) {
return request({
url: '/project/projectDeptWroks',
method: 'post',
data: data
})
}
// 修改项目部门在册人员
export function updateProjectDeptWroks(data) {
return request({
url: '/project/projectDeptWroks',
method: 'put',
data: data
})
}
// 删除项目部门在册人员
export function delProjectDeptWroks(id) {
return request({
url: '/project/projectDeptWroks/' + id,
method: 'delete'
})
}

289
ruoyi-ui/src/views/project/projectDeptWroks/index.vue 100644
View File

@ -0,0 +1,289 @@
<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="projectId">
<el-input
v-model="queryParams.projectId"
placeholder="请输入项目主键"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="部门主键" prop="deptId">
<el-input
v-model="queryParams.deptId"
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="['project:projectDeptWroks:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['project:projectDeptWroks:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['project:projectDeptWroks:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['project:projectDeptWroks:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="projectDeptWroksList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="项目主键" align="center" prop="projectId" />
<el-table-column label="部门主键" align="center" prop="deptId" />
<el-table-column label="劳务人员" align="center" prop="servicePersonnel" />
<el-table-column label="管理人员" align="center" prop="supervisorPersonnel" />
<el-table-column label="总包人员" align="center" prop="contractorPersonnel" />
<el-table-column label="备注" align="center" prop="remark" />
<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="['project:projectDeptWroks:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['project:projectDeptWroks:remove']"
>删除</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"
/>
<!-- 添加或修改项目部门在册人员对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目主键" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目主键" />
</el-form-item>
<el-form-item label="部门主键" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门主键" />
</el-form-item>
<el-form-item label="劳务人员" prop="servicePersonnel">
<el-input v-model="form.servicePersonnel" placeholder="请输入劳务人员" />
</el-form-item>
<el-form-item label="管理人员" prop="supervisorPersonnel">
<el-input v-model="form.supervisorPersonnel" placeholder="请输入管理人员" />
</el-form-item>
<el-form-item label="总包人员" prop="contractorPersonnel">
<el-input v-model="form.contractorPersonnel" placeholder="请输入总包人员" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</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 { listProjectDeptWroks, getProjectDeptWroks, delProjectDeptWroks, addProjectDeptWroks, updateProjectDeptWroks } from "@/api/project/projectDeptWroks";
export default {
name: "ProjectDeptWroks",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 项目部门在册人员表格数据
projectDeptWroksList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
projectId: null,
deptId: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
projectId: [
{ required: true, message: "项目主键不能为空", trigger: "blur" }
],
deptId: [
{ required: true, message: "部门主键不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询项目部门在册人员列表 */
getList() {
this.loading = true;
listProjectDeptWroks(this.queryParams).then(response => {
this.projectDeptWroksList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
projectId: null,
deptId: null,
servicePersonnel: null,
supervisorPersonnel: null,
contractorPersonnel: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
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.reset();
this.open = true;
this.title = "添加项目部门在册人员";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getProjectDeptWroks(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改项目部门在册人员";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateProjectDeptWroks(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addProjectDeptWroks(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除项目部门在册人员编号为"' + ids + '"的数据项？').then(function() {
return delProjectDeptWroks(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('project/projectDeptWroks/export', {
...this.queryParams
}, `projectDeptWroks_${new Date().getTime()}.xlsx`)
}
}
};
</script>

115
ruoyi-ui/src/views/project/projectDeptWroks/projectDeptWroksDrawer.vue 100644
View File

@ -0,0 +1,115 @@
<template>
<div class="projectect-attendance-drawer">
<el-drawer
v-if="isOpen"
:visible.sync="isOpen"
direction="rtl"
size="30%"
style="padding-left: 20px"
>
<template slot="title">
<div>{{ title + " 【部门在册人员】" }}</div>
</template>
<el-tabs v-model="activeName" style="padding-left: 20px">
<el-tab-pane
v-for="(it, idx) in nodes"
:label="it.unitName + ''"
:name="it.unitId + ''"
:key="idx"
></el-tab-pane>
</el-tabs>
<el-form label-width="120px" ref="form" :rules="rules">
<el-form-item label="劳务人员" prop="servicePersonnel">
<el-input-number
style="width: 80%"
v-model="form.servicePersonnel"
:min="0"
:max="10000"
label="请输入劳务人员"
></el-input-number>
</el-form-item>
<el-form-item label="管理人员" prop="supervisorPersonnel">
<el-input-number
style="width: 80%"
v-model="form.supervisorPersonnel"
:min="0"
:max="10000"
label="请输入管理人员"
></el-input-number>
</el-form-item>
<el-form-item label="总包人员" prop="contractorPersonnel">
<el-input-number
style="width: 80%"
v-model="form.contractorPersonnel"
:min="0"
:max="10000"
label="请输入总包人员"
></el-input-number>
</el-form-item>
</el-form>
<div style="text-align: center">
<el-button type="primary" @click="doOk">确定</el-button>
<el-button @click="doCanel">取消</el-button>
</div>
</el-drawer>
</div>
</template>
<script>
import { mapGetters } from "vuex";
import {
unitList,
listProjectDeptWroks2,
updateProjectDeptWroks,
} from "@/api/project/projectDeptWroks";
export default {
name: "RuoyiUiProjectDeptWroksDrawer",
data() {
return {
isOpen: false,
project: null,
title: "",
nodes: [],
form: {},
rules: {},
activeName: "",
};
},
computed: {
...mapGetters(["dept"]),
},
mounted() {},
methods: {
doOk() {
updateProjectDeptWroks(this.form).then((response) => {
this.$modal.msgSuccess("保存成功");
this.isOpen = false;
});
},
doCanel() {
this.isOpen = false;
},
show(project) {
this.project = project;
this.title = project.projectName;
this.isOpen = true;
unitList({
projectId: project.id,
unitType: 2,
}).then((d) => {
this.nodes = d.rows;
if (this.nodes.length > 0) {
this.activeName = this.nodes[0].unitId + "";
listProjectDeptWroks2({
projectId: this.project.id,
}).then((d) => {
this.form = d.rows[0];
});
}
});
},
},
};
</script>
<style lang="scss" scoped></style>

647
ruoyi-ui/src/views/project/surProject/index.vue
View File

@ -1,12 +1,17 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="queryParams.projectName"
placeholder="请输入项目名称"
clearable
@keyup.enter.native="handleQuery"
/>
@ -22,7 +27,11 @@
</el-form-item>
<el-form-item label="项目分类" prop="projectType">
<el-select v-model="queryParams.projectType" placeholder="请选择项目分类" clearable>
<el-select
v-model="queryParams.projectType"
placeholder="请选择项目分类"
clearable
>
<el-option
v-for="dict in dict.type.project_category"
:key="dict.value"
@ -33,7 +42,11 @@
</el-form-item>
<el-form-item label="项目等级" prop="projiectLevel">
<el-select v-model="queryParams.projiectLevel" placeholder="请选择项目等级" clearable>
<el-select
v-model="queryParams.projiectLevel"
placeholder="请选择项目等级"
clearable
>
<el-option
v-for="dict in dict.type.project_level"
:key="dict.value"
@ -44,7 +57,11 @@
</el-form-item>
<el-form-item label="建设类型" prop="projectNature">
<el-select v-model="queryParams.projectNature" placeholder="请选择项目建设类型" clearable>
<el-select
v-model="queryParams.projectNature"
placeholder="请选择项目建设类型"
clearable
>
<el-option
v-for="dict in dict.type.project_build_type"
:key="dict.value"
@ -55,7 +72,11 @@
</el-form-item>
<el-form-item label="重要等级" prop="weightType">
<el-select v-model="queryParams.weightType" placeholder="请选择重要等级" clearable>
<el-select
v-model="queryParams.weightType"
placeholder="请选择重要等级"
clearable
>
<el-option
v-for="dict in dict.type.sur_project_weight"
:key="dict.value"
@ -77,7 +98,9 @@
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<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>
@ -91,7 +114,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['project:surProject:add']"
>新增</el-button>
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
@ -102,7 +126,8 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['project:surProject:edit']"
>修改</el-button>
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
@ -113,7 +138,8 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['project:surProject:remove']"
>删除</el-button>
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
@ -123,20 +149,48 @@
size="mini"
@click="handleExport"
v-hasPermi="['project:surProject:export']"
>导出</el-button>
>导出</el-button
>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="surProjectList" @selection-change="handleSelectionChange">
<el-table
v-loading="loading"
:data="surProjectList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="项目名称" align="left" prop="projectName" width="200" class-name="small-padding fixed-width" fixed="left" show-overflow-tooltip/>
<el-table-column
label="项目名称"
align="left"
prop="projectName"
width="200"
class-name="small-padding fixed-width"
fixed="left"
show-overflow-tooltip
/>
<el-table-column label="责任主体" align="center" prop="deptName" />
<el-table-column label="父级项目" align="left" prop="paretProjectName" width="200" show-overflow-tooltip/>
<el-table-column label="项目简称" align="left" prop="simpleName" width="200" show-overflow-tooltip/>
<el-table-column
label="父级项目"
align="left"
prop="paretProjectName"
width="200"
show-overflow-tooltip
/>
<el-table-column
label="项目简称"
align="left"
prop="simpleName"
width="200"
show-overflow-tooltip
/>
<el-table-column label="项目分类" align="center" prop="projectType">
<template slot-scope="scope">
<dict-tag :options="dict.type.project_category" :value="scope.row.projectType"/>
<dict-tag
:options="dict.type.project_category"
:value="scope.row.projectType"
/>
</template>
</el-table-column>
<el-table-column label="项目等级" align="center" prop="projiectLevel">
@ -145,80 +199,238 @@
</template>
</el-table-column>
<el-table-column label="项目区域" align="center" prop="projectRegional" />
<el-table-column label="进度展示" align="center" v-hasPermi="['project:surProject:progressVisible']">
<el-table-column
label="进度展示"
align="center"
v-hasPermi="['project:surProject:progressVisible']"
>
<template slot-scope="scope">
<el-switch v-model="scope.row.progressVisible"
<el-switch
v-model="scope.row.progressVisible"
active-value="0"
inactive-value="1"
@change="setVisibleStatus(scope.row,$event)"></el-switch>
@change="setVisibleStatus(scope.row, $event)"
></el-switch>
</template>
</el-table-column>
<el-table-column label="项目排序" align="center" width="150" v-hasPermi="['project:surProject:projectSort']">
<el-table-column
label="项目排序"
align="center"
width="150"
v-hasPermi="['project:surProject:projectSort']"
>
<template slot-scope="scope">
<el-input-number size="mini" v-model="scope.row.projectSort" :min="1" :max="999" @change="setProjectSort(scope.row,$event)"></el-input-number>
<el-input-number
size="mini"
v-model="scope.row.projectSort"
:min="1"
:max="999"
@change="setProjectSort(scope.row, $event)"
></el-input-number>
</template>
</el-table-column>
<el-table-column label="建设类型" align="left" prop="projectNature" width="120" show-overflow-tooltip>
<el-table-column
label="建设类型"
align="left"
prop="projectNature"
width="120"
show-overflow-tooltip
>
<template slot-scope="scope">
<dict-tag :options="dict.type.project_build_type" :value="scope.row.projectNature"/>
<dict-tag
:options="dict.type.project_build_type"
:value="scope.row.projectNature"
/>
</template>
</el-table-column>
<el-table-column label="重要等级" align="left" prop="weightType" width="120" show-overflow-tooltip>
<el-table-column
label="重要等级"
align="left"
prop="weightType"
width="120"
show-overflow-tooltip
>
<template slot-scope="scope">
<dict-tag :options="dict.type.sur_project_weight" :value="scope.row.weightType"/>
<dict-tag
:options="dict.type.sur_project_weight"
:value="scope.row.weightType"
/>
</template>
</el-table-column>
<el-table-column label="项目地址" align="left" prop="projectAddress" width="200" show-overflow-tooltip/>
<el-table-column label="项目负责人" align="center" prop="projectPerson" width="100" />
<el-table-column label="负责人电话" align="center" prop="projectPhone" width="110" />
<el-table-column
label="项目地址"
align="left"
prop="projectAddress"
width="200"
show-overflow-tooltip
/>
<el-table-column
label="项目负责人"
align="center"
prop="projectPerson"
width="100"
/>
<el-table-column
label="负责人电话"
align="center"
prop="projectPhone"
width="110"
/>
<el-table-column label="工程期限" align="center" prop="projectTimeLimit" />
<el-table-column label="总投资" align="center" prop="totalInvestment" />
<el-table-column label="总产值" align="center" prop="totalOutputValue" />
<el-table-column label="计划完成时间" align="center" prop="plannedCompletionTime" width="120" show-overflow-tooltip>
<el-table-column label="开累产值" align="center" prop="totalOutputValue" />
<el-table-column
label="计划完成时间"
align="center"
prop="plannedCompletionTime"
width="120"
show-overflow-tooltip
>
<template slot-scope="{ row }">{{ row.plannedCompletionTime }}</template>
</el-table-column>
<el-table-column label="计划开工时间" align="center" prop="scheduledStartTime" width="120" show-overflow-tooltip>
<el-table-column
label="计划开工时间"
align="center"
prop="scheduledStartTime"
width="120"
show-overflow-tooltip
>
<template slot-scope="{ row }">{{ row.scheduledStartTime }}</template>
</el-table-column>
<el-table-column label="实际开工时间" align="center" prop="actualOperatingTime" width="120" show-overflow-tooltip>
<el-table-column
label="实际开工时间"
align="center"
prop="actualOperatingTime"
width="120"
show-overflow-tooltip
>
<template slot-scope="{ row }">{{ row.actualOperatingTime }}</template>
</el-table-column>
<el-table-column label="实际完工时间" align="center" prop="actualCompletionTime" width="120" show-overflow-tooltip >
<el-table-column
label="实际完工时间"
align="center"
prop="actualCompletionTime"
width="120"
show-overflow-tooltip
>
<template slot-scope="{ row }">{{ row.actualCompletionTime }}</template>
</el-table-column>
<el-table-column label="合同总额" align="center" prop="contractAmount" width="80" />
<el-table-column label="付款金额" align="center" prop="paidAmount" width="80" />
<el-table-column label="挂账金额" align="center" prop="onAccountAmount" width="80"/>
<el-table-column
label="挂账金额"
align="center"
prop="onAccountAmount"
width="80"
/>
<el-table-column label="劳务人员" align="center" prop="servicePersonnel" />
<el-table-column label="监理人员" align="center" prop="supervisorPersonnel" />
<el-table-column label="总包人员" align="center" prop="generalContractor" />
<el-table-column label="备注" align="left" prop="remark" width="200" show-overflow-tooltip/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="240" >
<el-table-column
label="备注"
align="left"
prop="remark"
width="200"
show-overflow-tooltip
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
fixed="right"
width="240"
>
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-time" @click="prjProcessMgr(scope.row)" v-hasPermi="['project:surProject:edit']">进度管理</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:surProject:edit']">修改项目</el-button>
<el-button size="mini" type="text" icon="el-icon-user-solid" @click="handleProjectUserinfo(scope.row)" v-hasPermi="['project:surProjectUserInfo:add']">项目人员</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:assess:list','project:build_node_data:list','work:workTrain:list','work:emergencyDrill:list','project:surProjectSpecial:list','project:surProject:remove']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多操作</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-time"
@click="prjProcessMgr(scope.row)"
v-hasPermi="['project:surProject:edit']"
>进度管理</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['project:surProject:edit']"
>修改项目</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-user-solid"
@click="handleProjectUserinfo(scope.row)"
v-hasPermi="['project:surProjectUserInfo:add']"
>项目人员</el-button
>
<el-dropdown
size="mini"
@command="(command) => handleCommand(command, scope.row)"
v-hasPermi="[
'system:assess:list',
'project:build_node_data:list',
'work:workTrain:list',
'work:emergencyDrill:list',
'project:surProjectSpecial:list',
'project:projectDeptWroks:list',
'project:surProjectAttendance:add',
'project:surProject:remove',
]"
>
<el-button size="mini" type="text" icon="el-icon-d-arrow-right"
>更多操作</el-button
>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleAssess" icon="el-icon-coordinate"
v-hasPermi="['system:assess:list']">季度考核管理</el-dropdown-item>
<el-dropdown-item command="handleBuildNode" icon="el-icon-data-analysis"
v-hasPermi="['project:build_node_data:list']">计划节点管理</el-dropdown-item>
<el-dropdown-item command="handlePshProblemmodify" icon="el-icon-message-solid"
v-hasPermi="['trouble:sspProblemmodify:list']">安全隐患排查</el-dropdown-item>
<el-dropdown-item command="handleSspProblemmodify" icon="el-icon-camera-solid"
v-hasPermi="['trouble:sspProblemmodify:list']">质量隐患排查</el-dropdown-item>
<el-dropdown-item command="handleWorkTrain" icon="el-icon-notebook-2"
v-hasPermi="['work:workTrain:list']">项目专项培训</el-dropdown-item>
<el-dropdown-item command="handleEmergencyDrill" icon="el-icon-first-aid-kit"
v-hasPermi="['work:emergencyDrill:list']">项目应急演练</el-dropdown-item>
<el-dropdown-item command="handleProjectSpecial" icon="el-icon-user"
v-hasPermi="['project:surProjectSpecial:list']">项目特种人员</el-dropdown-item>
<el-dropdown-item command="handleProjectAttendance" icon="el-icon-trophy"
v-hasPermi="['project:surProjectAttendance:add']">今日出勤</el-dropdown-item>
<el-dropdown-item command="handleDelete" icon="el-icon-delete"
v-hasPermi="['project:surProject:remove']">删除项目</el-dropdown-item>
<el-dropdown-item
command="handleAssess"
icon="el-icon-coordinate"
v-hasPermi="['system:assess:list']"
>季度考核管理</el-dropdown-item
>
<el-dropdown-item
command="handleBuildNode"
icon="el-icon-data-analysis"
v-hasPermi="['project:build_node_data:list']"
>计划节点管理</el-dropdown-item
>
<el-dropdown-item
command="handleWorkTrain"
icon="el-icon-notebook-2"
v-hasPermi="['work:workTrain:list']"
>项目专项培训</el-dropdown-item
>
<el-dropdown-item
command="handleEmergencyDrill"
icon="el-icon-first-aid-kit"
v-hasPermi="['work:emergencyDrill:list']"
>项目应急演练</el-dropdown-item
>
<el-dropdown-item
command="handleProjectSpecial"
icon="el-icon-user"
v-hasPermi="['project:surProjectSpecial:list']"
>项目特种人员</el-dropdown-item
>
<el-dropdown-item
command="handleProjectDeptWroks"
icon="el-icon-s-custom"
v-hasPermi="['project:projectDeptWroks:list']"
>在册人员管理</el-dropdown-item
>
<el-dropdown-item
command="handleProjectAttendance"
icon="el-icon-trophy"
v-hasPermi="['project:surProjectAttendance:add']"
>今日出勤</el-dropdown-item
>
<el-dropdown-item
command="handleDelete"
icon="el-icon-delete"
v-hasPermi="['project:surProject:remove']"
>删除项目</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</template>
@ -234,12 +446,26 @@
/>
<!-- 添加或修改项目管理对话框 -->
<el-dialog :title="title" v-if="open" :visible.sync="open" width="1200px" append-to-body custom-class="prj-suprj-edit-dialog" :close-on-click-modal="false" :close-on-press-escape="false" >
<el-dialog
:title="title"
v-if="open"
:visible.sync="open"
width="1200px"
append-to-body
custom-class="prj-suprj-edit-dialog"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="8">
<el-form-item label="责任主体" prop="deptId">
<el-select v-model="form.deptId" placeholder="请选择责任主体" style="width: 100%;" :disabled="getDeptIdDisabled()" >
<el-select
v-model="form.deptId"
placeholder="请选择责任主体"
style="width: 100%"
:disabled="getDeptIdDisabled()"
>
<el-option
v-for="dict in depts"
:key="dict.deptId"
@ -256,7 +482,10 @@
</el-col>
<el-col :span="8">
<el-form-item label="父级项目" prop="paretProjectName">
<el-input v-model="form.paretProjectName" placeholder="请输入父级项目名称" />
<el-input
v-model="form.paretProjectName"
placeholder="请输入父级项目名称"
/>
</el-form-item>
</el-col>
</el-row>
@ -264,7 +493,11 @@
<el-row>
<el-col :span="8">
<el-form-item label="项目建设类型" prop="projectNature">
<el-select v-model="form.projectNature" placeholder="请选择项目建设类型" style="width: 100%;">
<el-select
v-model="form.projectNature"
placeholder="请选择项目建设类型"
style="width: 100%"
>
<el-option
v-for="dict in dict.type.project_build_type"
:key="dict.value"
@ -281,22 +514,26 @@
</el-col>
<el-col :span="8">
<el-form-item label="项目分类" prop="projectType">
<el-select v-model="form.projectType" placeholder="请选择项目分类" style="width: 100%;">
<el-select
v-model="form.projectType"
placeholder="请选择项目分类"
style="width: 100%"
>
<el-option
v-for="dict in dict.type.project_category"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item></el-col>
</el-select> </el-form-item
></el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="经纬度" prop="longitude">
<el-button @click="getMapInfo">选择经纬度</el-button>
<div style="display: inline-block;margin-left: 12px;">
<div style="display: inline-block; margin-left: 12px">
({{ form.longitude }},{{ form.latitude }})
{{ form.projectAddress }}
</div>
@ -304,7 +541,11 @@
</el-col>
<el-col :span="8">
<el-form-item label="项目等级" prop="projiectLevel">
<el-select v-model="form.projiectLevel" placeholder="请选择项目等级" style="width: 100%;">
<el-select
v-model="form.projiectLevel"
placeholder="请选择项目等级"
style="width: 100%"
>
<el-option
v-for="dict in dict.type.project_level"
:key="dict.value"
@ -340,68 +581,87 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总产值" prop="totalOutputValue">
<el-input v-model="form.totalOutputValue" placeholder="请输入总产值">
<el-form-item label="开累产值" prop="totalOutputValue">
<el-input v-model="form.totalOutputValue" placeholder="请输入开累产值">
<i slot="suffix">万元</i>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="计划完成时间" prop="plannedCompletionTime">
<el-date-picker
v-model="form.plannedCompletionTime"
type="month"
placeholder="选择计划完成时间" style="width: 100%;">
placeholder="选择计划完成时间"
style="width: 100%"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-form-item label="计划开工时间" prop="scheduledStartTime">
<el-col :span="8">
<el-form-item label="计划开工时间" prop="scheduledStartTime">
<el-date-picker
v-model="form.scheduledStartTime"
type="month"
placeholder="选择计划开工时间" style="width: 100%;">
</el-date-picker>
</el-form-item></el-col>
<el-col :span="8"> <el-form-item label="实际开工时间" prop="actualOperatingTime">
placeholder="选择计划开工时间"
style="width: 100%"
>
</el-date-picker> </el-form-item
></el-col>
<el-col :span="8">
<el-form-item label="实际开工时间" prop="actualOperatingTime">
<el-date-picker
v-model="form.actualOperatingTime"
type="month"
placeholder="选择实际开工时间" style="width: 100%;">
</el-date-picker>
</el-form-item></el-col>
<el-col :span="8"><el-form-item label="实际完工时间" prop="actualCompletionTime">
placeholder="选择实际开工时间"
style="width: 100%"
>
</el-date-picker> </el-form-item
></el-col>
<el-col :span="8"
><el-form-item label="实际完工时间" prop="actualCompletionTime">
<el-date-picker
v-model="form.actualCompletionTime"
type="month"
placeholder="选择实际完工时间" style="width: 100%;">
</el-date-picker>
</el-form-item></el-col>
placeholder="选择实际完工时间"
style="width: 100%"
>
</el-date-picker> </el-form-item
></el-col>
</el-row>
<el-row>
<el-col :span="8"><el-form-item label="合同总额" prop="contractAmount">
<el-col :span="8"
><el-form-item label="合同总额" prop="contractAmount">
<el-input v-model="form.contractAmount" placeholder="请输入合同总额">
<i slot="suffix">万元</i>
</el-input>
</el-form-item></el-col>
<el-col :span="8"> <el-form-item label="付款金额" prop="paidAmount">
</el-form-item></el-col
>
<el-col :span="8">
<el-form-item label="付款金额" prop="paidAmount">
<el-input v-model="form.paidAmount" placeholder="请输入付款金额">
<i slot="suffix">万元</i>
</el-input>
</el-form-item></el-col>
<el-col :span="8"> <el-form-item label="挂账金额" prop="onAccountAmount">
</el-form-item></el-col
>
<el-col :span="8">
<el-form-item label="挂账金额" prop="onAccountAmount">
<el-input v-model="form.onAccountAmount" placeholder="请输入挂账金额">
<i slot="suffix">万元</i>
</el-input>
</el-form-item></el-col>
</el-form-item></el-col
>
</el-row>
<el-row>
<el-col :span="8"><el-form-item label="项目进度" prop="projectSchedule">
<el-select v-model="form.projectSchedule" placeholder="请选择项目进度" style="width: 100%;">
<el-col :span="8"
><el-form-item label="项目进度" prop="projectSchedule">
<el-select
v-model="form.projectSchedule"
placeholder="请选择项目进度"
style="width: 100%"
>
<el-option
v-for="dict in dict.type.sur_project_xmjd"
:key="dict.value"
@ -411,37 +671,53 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8"> <el-form-item label="重要等级" prop="weightType">
<el-select v-model="form.weightType" placeholder="请选择重要等级" style="width: 100%;">
<el-col :span="8">
<el-form-item label="重要等级" prop="weightType">
<el-select
v-model="form.weightType"
placeholder="请选择重要等级"
style="width: 100%"
>
<el-option
v-for="dict in dict.type.sur_project_weight"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item></el-col>
</el-select> </el-form-item
></el-col>
<el-col :span="8"></el-col>
</el-row>
<el-row>
<el-col :span="8"><el-form-item label="劳务人员数" prop="servicePersonnel">
<el-col :span="8"
><el-form-item label="劳务人员数" prop="servicePersonnel">
<el-input v-model="form.servicePersonnel" placeholder="请输入劳务人员数">
<i slot="suffix">人</i>
</el-input>
</el-form-item></el-col>
<el-col :span="8"><el-form-item label="监理人员数" prop="supervisorPersonnel">
</el-form-item></el-col
>
<el-col :span="8"
><el-form-item label="监理人员数" prop="supervisorPersonnel">
<el-input v-model="form.supervisorPersonnel" placeholder="请输入监理人员数">
<i slot="suffix">人</i>
</el-input>
</el-form-item></el-col>
<el-col :span="8"> <el-form-item label="总包人员数" prop="generalContractor">
</el-form-item></el-col
>
<el-col :span="8">
<el-form-item label="总包人员数" prop="generalContractor">
<el-input v-model="form.generalContractor" placeholder="请输入总包人员数">
<i slot="suffix">人</i>
</el-input>
</el-form-item></el-col>
</el-form-item></el-col
>
</el-row>
<el-form-item label="项目概述" prop="projectSummarize">
<el-input v-model="form.projectSummarize" type="textarea" :rows="5" placeholder="请输入内容" />
<el-input
v-model="form.projectSummarize"
type="textarea"
:rows="5"
placeholder="请输入内容"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
@ -464,37 +740,67 @@
<workTrainDrawer
size="50%"
:visible.sync="workTrainDrawerVisible"
:form-data="formData"></workTrainDrawer>
:form-data="formData"
></workTrainDrawer>
<emergencyDrillDrawer
size="50%"
:visible.sync="emergencyDrillDrawerVisible"
:form-data="formData"></emergencyDrillDrawer>
:form-data="formData"
></emergencyDrillDrawer>
<surProjectSpecialDrawer
size="50%"
:visible.sync="projectSpecialDrawerVisible"
:form-data="formData"></surProjectSpecialDrawer>
:form-data="formData"
></surProjectSpecialDrawer>
<attendance-drawer ref="attDrawer"></attendance-drawer>
<projectDeptWroksDrawer ref="deptWroksDrawer"></projectDeptWroksDrawer>
</div>
</template>
<script>
import { listSurProject, getSurProject, delSurProject, addSurProject, updateSurProject, updateSurProjectProgressVisible, updateSurProjectSort } from "@/api/project/surProject";
import ProjectScheduleDlg from '../surProjectSchedule/ProjectScheduleDlg.vue'
import projectUserInfoDrawer from '../surProjectUserInfo/projectUserInfoDrawer.vue'
import BaiduMap from '@/components/BaiduMap/Map.vue'
import AssessDrawer from '../surProjectQuarterlyAssess/assessDrawer.vue'
import buildNodeDrawer from '../surBuildNode/buildNodeDrawer.vue'
import workTrainDrawer from '../../work/workTrain/workTrainDrawer.vue'
import emergencyDrillDrawer from '../../work/emergencyDrill/emergencyDrillDrawer.vue'
import surProjectSpecialDrawer from '../surProjectSpecial/surProjectSpecialDrawer.vue'
import attendanceDrawer from '../surProjectAttendance/attendanceDrawer.vue'
import {
listSurProject,
getSurProject,
delSurProject,
addSurProject,
updateSurProject,
updateSurProjectProgressVisible,
updateSurProjectSort,
} from "@/api/project/surProject";
import ProjectScheduleDlg from "../surProjectSchedule/ProjectScheduleDlg.vue";
import projectUserInfoDrawer from "../surProjectUserInfo/projectUserInfoDrawer.vue";
import BaiduMap from "@/components/BaiduMap/Map.vue";
import AssessDrawer from "../surProjectQuarterlyAssess/assessDrawer.vue";
import buildNodeDrawer from "../surBuildNode/buildNodeDrawer.vue";
import workTrainDrawer from "../../work/workTrain/workTrainDrawer.vue";
import emergencyDrillDrawer from "../../work/emergencyDrill/emergencyDrillDrawer.vue";
import surProjectSpecialDrawer from "../surProjectSpecial/surProjectSpecialDrawer.vue";
import attendanceDrawer from "../surProjectAttendance/attendanceDrawer.vue";
import projectDeptWroksDrawer from "../projectDeptWroks/projectDeptWroksDrawer.vue";
export default {
name: "SurProject",
components: {
attendanceDrawer, ProjectScheduleDlg,projectUserInfoDrawer,BaiduMap,AssessDrawer,buildNodeDrawer,workTrainDrawer,emergencyDrillDrawer,surProjectSpecialDrawer
attendanceDrawer,
ProjectScheduleDlg,
projectUserInfoDrawer,
BaiduMap,
AssessDrawer,
buildNodeDrawer,
workTrainDrawer,
emergencyDrillDrawer,
surProjectSpecialDrawer,
projectDeptWroksDrawer,
},
dicts: ['sys_check_state','sur_project_xmjd', 'project_build_type', 'sys_common_isdel', 'project_category','project_level','sur_project_weight'],
dicts: [
"sys_check_state",
"sur_project_xmjd",
"project_build_type",
"sys_common_isdel",
"project_category",
"project_level",
"sur_project_weight",
],
data() {
return {
projectUserInfoDrawerVisible: false,
@ -521,7 +827,7 @@ export default {
open: false,
formData: {
projectId: null,
projectName:null
projectName: null,
},
// 查询参数
queryParams: {
@ -567,26 +873,26 @@ export default {
form: {},
// 表单校验
rules: {
deptId:[{ required: true, message: '请选择责任主体', trigger: 'blur' }],
projectName:[{ required: true, message: '请输入项目名称', trigger: 'blur' }],
deptId: [{ required: true, message: "请选择责任主体", trigger: "blur" }],
projectName: [{ required: true, message: "请输入项目名称", trigger: "blur" }],
},
depts: [],
};
},
created() {
this.getList();
this.$api.publics.getZgsDeptList().then(d=>{
this.$api.publics.getZgsDeptList().then((d) => {
this.depts = d?.data || [];
})
});
},
methods: {
mapSuccess(pt, city) {
this.form.longitude = pt.lng.toFixed(3);
this.form.latitude = pt.lat.toFixed(3);
this.form.projectAddress=(city.address||'')+(city.poi_desc||'');
this.form.projectAddress = (city.address || "") + (city.poi_desc || "");
},
getMapInfo() {
this.$refs.map.showDialog('获取项目地理信息');
this.$refs.map.showDialog("获取项目地理信息");
},
//进度管理
prjProcessMgr(row) {
@ -595,7 +901,7 @@ export default {
/** 查询项目管理列表 */
getList() {
this.loading = true;
listSurProject(this.queryParams).then(response => {
listSurProject(this.queryParams).then((response) => {
this.surProjectList = response.rows;
this.total = response.total;
this.loading = false;
@ -649,7 +955,7 @@ export default {
createTime: null,
updateBy: null,
updateTime: null,
remark: null
remark: null,
};
this.resetForm("form");
},
@ -665,9 +971,9 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
@ -678,8 +984,8 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getSurProject(id).then(response => {
const id = row.id || this.ids;
getSurProject(id).then((response) => {
this.form = response.data;
this.open = true;
if (!this.form.projectAddress) {
@ -712,6 +1018,9 @@ export default {
case "handleProjectSpecial":
this.handleProjectSpecial(row);
break;
case "handleProjectDeptWroks":
this.$refs.deptWroksDrawer.show(row);
break;
case "handleProjectAttendance":
this.$refs.attDrawer.show(row);
break;
@ -734,16 +1043,16 @@ export default {
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateSurProject(this.form).then(response => {
updateSurProject(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addSurProject(this.form).then(response => {
addSurProject(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
@ -755,50 +1064,60 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除项目管理编号为"' + ids + '"的数据项？').then(function() {
this.$modal
.confirm('是否确认删除项目管理编号为"' + ids + '"的数据项？')
.then(function () {
return delSurProject(ids);
}).then(() => {
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
})
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('project/surProject/export', {
...this.queryParams
}, `surProject_${new Date().getTime()}.xlsx`)
this.download(
"project/surProject/export",
{
...this.queryParams,
},
`surProject_${new Date().getTime()}.xlsx`
);
},
//项目形象进度滑块控制
setVisibleStatus(row, val) {
this.$confirm(`是否确认修改形象进度为${val == '0' ? '显示' : '隐藏'}？`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async() => {
this.$confirm(`是否确认修改形象进度为${val == "0" ? "显示" : "隐藏"}？`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(async () => {
let param = {
id: row.id,
progressVisible: val
}
updateSurProjectProgressVisible(param).then(response => {
progressVisible: val,
};
updateSurProjectProgressVisible(param).then((response) => {
this.$modal.msgSuccess("修改成功");
this.getList();
});
}).catch(() => {
// 取消时恢复原始开关状态
if (val == '0') {
row.progressVisible = '1'
} else {
row.progressVisible = '0'
}
})
.catch(() => {
// 取消时恢复原始开关状态
if (val == "0") {
row.progressVisible = "1";
} else {
row.progressVisible = "0";
}
});
},
//项目排序控制
setProjectSort(row, val) {
let param = {
id: row.id,
projectSort: val
}
updateSurProjectSort(param).then(response => {
projectSort: val,
};
updateSurProjectSort(param).then((response) => {
this.$modal.msgSuccess("修改成功");
this.getList();
});
@ -817,8 +1136,8 @@ export default {
this.formData.projectId = row.id;
this.formData.projectName = row.projectName;
this.projectSpecialDrawerVisible = true;
}
}
},
},
};
</script>
<style lang="scss">

2
ruoyi-ui/src/views/project/surProject/myIndex.vue
View File

@ -60,7 +60,7 @@
<span class="sp-text">{{ prj.floorArea?prj.floorArea+'平方米':'' }}</span>
</el-col>
<el-col :span="12">
<span class="sp-label">总产值:</span>
<span class="sp-label">开累产值:</span>
<span class="sp-text">{{ prj.totalOutputValue?prj.totalOutputValue+'万元':'' }}</span>
</el-col>
<el-col :span="6">

78
ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue
View File

@ -1,24 +1,52 @@
<template>
<div class="prject-attendance-drawer">
<el-drawer v-if="isOpen" :visible.sync="isOpen" direction="rtl" size="400" style="padding-left: 20px;">
<el-drawer
v-if="isOpen"
:visible.sync="isOpen"
direction="rtl"
size="30%"
style="padding-left: 20px"
>
<template slot="title">
<div>{{ title + ' 【今日出勤】' }}</div>
<div>{{ title + " 【今日出勤】" }}</div>
</template>
<el-form label-width="120px" ref="frm1" :model="formData" :rules="rules">
<el-form-item label="出勤查询" prop="workDate">
<el-date-picker
clearable
v-model="queryParams.workDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择出勤时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="劳务人员" prop="servicePersonnel">
<el-input-number v-model="formData.servicePersonnel" :min="0" :max="10000" label="请输入劳务人员"></el-input-number>
<el-input-number
v-model="formData.servicePersonnel"
:min="0"
:max="10000"
label="请输入劳务人员"
></el-input-number>
</el-form-item>
<el-form-item label="管理人员" prop="supervisorPersonnel">
<el-input-number v-model="formData.supervisorPersonnel" :min="0" :max="10000" label="请输入管理人员"></el-input-number>
<el-input-number
v-model="formData.supervisorPersonnel"
:min="0"
:max="10000"
label="请输入管理人员"
></el-input-number>
</el-form-item>
<el-form-item label="总包人员" prop="contractorPersonnel">
<el-input-number v-model="formData.contractorPersonnel" :min="0" :max="10000" label="请输入总包人员"></el-input-number>
<el-input-number
v-model="formData.contractorPersonnel"
:min="0"
:max="10000"
label="请输入总包人员"
></el-input-number>
</el-form-item>
</el-form>
<div style="text-align: center;">
<div style="text-align: center">
<el-button type="primary" @click="doOk">确定</el-button>
<el-button @click="doCanel">取消</el-button>
</div>
@ -27,38 +55,36 @@
</template>
<script>
import { mapGetters } from 'vuex'
import { mapGetters } from "vuex";
import { selectByDate } from "@/api/project/surProjectAttendance";
export default {
name: 'RuoyiUiAttendanceDrawer',
name: "RuoyiUiAttendanceDrawer",
data() {
return {
isOpen: false,
prj: null,
title: '',
title: "",
oldData: null,
formData: {
servicePersonnel: 0,
supervisorPersonnel: 0,
contractorPersonnel:0
contractorPersonnel: 0,
},
rules:{}
queryParams: {
prijectId: null,
workDate: null,
},
rules: {},
};
},
computed: {
...mapGetters([
'dept',
]),
},
mounted() {
...mapGetters(["dept"]),
},
mounted() {},
methods: {
doOk(){
},
doOk() {},
doCanel() {
this.isOpen = false;
},
@ -69,12 +95,12 @@ export default {
selectByDate({
prijectId: prj.id,
deptId: this.dept.deptId,
createTime: +new Date()
}).then(d => {
createTime: +new Date(),
}).then((d) => {
let tmps = d.data || [];
this.oldData = tmps.length > 0 ? tmps[0] : null;
});
}
},
},
};
</script>

222
ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue
View File

@ -1,6 +1,13 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="项目名称" prop="problemArea">
<el-input
v-model="queryParams.problemArea"
@ -46,8 +53,16 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="责任主体" prop="projectDeptId" v-hasPermi="['project:project:zgs']">
<el-select v-model="queryParams.projectDeptId" placeholder="请选择责任主体" clearable>
<el-form-item
label="责任主体"
prop="projectDeptId"
v-hasPermi="['project:project:zgs']"
>
<el-select
v-model="queryParams.projectDeptId"
placeholder="请选择责任主体"
clearable
>
<el-option
v-for="dict in depts"
:key="dict.deptId"
@ -57,7 +72,9 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<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>
@ -112,14 +129,25 @@
<el-tab-pane label="全部数据" name="all"></el-tab-pane>
<el-tab-pane label="待整改" name="dzg"></el-tab-pane>
<el-tab-pane label="待复检" name="dqr"></el-tab-pane>
<el-tab-pane label="已处理" name="ycl"></el-tab-pane>
<el-tab-pane label="整改完成" name="ycl"></el-tab-pane>
<el-tab-pane label="整改超时" name="zgcs"></el-tab-pane>
<el-table v-loading="loading" :data="sspProblemmodifyList" @selection-change="handleSelectionChange">
<el-table
v-loading="loading"
:data="sspProblemmodifyList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="40" align="center" v-if="false" />
<el-table-column label="项目名称" align="center" prop="problemArea" width="200" show-overflow-tooltip/>
<el-table-column
label="项目名称"
align="center"
prop="problemArea"
width="200"
show-overflow-tooltip
/>
<el-table-column label="隐患图片" align="center" property="path" width="220">
<template slot-scope="scope">
<el-image ref="preview"
<el-image
ref="preview"
style="width: 200px; height: 100px"
:src="scope.row.marksPicture"
@click="onPreview(scope.row.smarkUrl)"
@ -132,38 +160,80 @@
<dict-tag :options="dict.type.ssp_aqyhlx" :value="scope.row.dangerType" />
</template>
</el-table-column>
<el-table-column label="隐患描述" align="center" prop="workParts" width="100" show-overflow-tooltip/>
<el-table-column label="整改要求" align="center" prop="changeInfo" width="200" show-overflow-tooltip/>
<el-table-column label="隐患整改人" align="left" width="120" show-overflow-tooltip>
<el-table-column
label="隐患描述"
align="center"
prop="workParts"
width="100"
show-overflow-tooltip
/>
<el-table-column
label="整改要求"
align="center"
prop="changeInfo"
width="200"
show-overflow-tooltip
/>
<el-table-column
label="整改截至时间"
align="center"
prop="nickedTime"
width="135"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.nickedTime, "{y}-{m}-{d} {h}:{s}") }}</span>
</template>
</el-table-column>
<el-table-column
label="隐患整改人"
align="left"
width="120"
show-overflow-tooltip
>
<template slot-scope="scope">
<div>{{ scope.row.lordSent }}</div>
<div>{{ scope.row.lordSentUser }}</div>
</template>
</el-table-column>
<el-table-column label="流程状态" align="center" prop="checkState">
<template slot-scope="scope">
<dict-tag
:options="dict.type.smz_ssp_checkstate"
:value="scope.row.checkState"
/>
</template>
</el-table-column>
<el-table-column label="复检人" align="left" width="120" show-overflow-tooltip>
<template slot-scope="scope">
<div>{{ scope.row.recheckSend }}</div>
<div>{{ scope.row.recheckSendUser }}</div>
</template>
</el-table-column>
<el-table-column label="抄送人" align="left" prop="copySend" width="120" show-overflow-tooltip>
<el-table-column
label="抄送人"
align="left"
prop="copySend"
width="120"
show-overflow-tooltip
>
<template slot-scope="scope">
<div>{{ scope.row.copySend }}</div>
<div>{{ scope.row.copySendUser }}</div>
</template>
</el-table-column>
<el-table-column label="流程状态" align="center" prop="checkState">
<template slot-scope="scope">
<dict-tag :options="dict.type.smz_ssp_checkstate" :value="scope.row.checkState"/>
</template>
</el-table-column>
<el-table-column label="提交用户" align="center" prop="createUser" width="100" />
<el-table-column label="提交时间" align="center" prop="createTime" width="135">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{s}') }}</span>
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{s}") }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="100"
fixed="right"
>
<template slot-scope="scope">
<!-- <el-button v-if="scope.row.marksVideo != null && scope.row.marksVideo != ''"
size="mini"
@ -185,14 +255,17 @@
icon="el-icon-notebook-2"
@click="handleLog(scope.row)"
v-hasPermi="['trouble:sspProblemmodify:query']"
>整改日志</el-button>
<el-button v-if="scope.row.vDel=='0'"
>整改日志</el-button
>
<el-button
v-if="scope.row.vDel == '0'"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['work:sspProblemmodify:remove']"
>删除</el-button>
>删除</el-button
>
</template>
</el-table-column>
</el-table>
@ -206,7 +279,6 @@
/>
</el-tabs>
<!-- 添加或修改安全整改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
@ -241,11 +313,13 @@
<el-input v-model="form.nickedArea" placeholder="请输入留痕定位" />
</el-form-item>
<el-form-item label="留痕时间" prop="nickedTime">
<el-date-picker clearable
<el-date-picker
clearable
v-model="form.nickedTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择留痕时间">
placeholder="请选择留痕时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="工序名称" prop="processName">
@ -283,9 +357,23 @@
<sspProblemmodifyAuditinfoDrawer
size="40%"
:visible.sync="sspProblemmodifyAuditinfoDrawerVisible"
:form-data="formData"/>
<el-dialog title="视频播放" :visible.sync="openVideo" width="980px" :before-close="cancelVideo" append-to-body>
<video ref="video" :src="videoSrc" controls="controls" autoplay="autoplay" poster="../../../assets/images/video_loading.gif" style="max-height: 550px;"/>
:form-data="formData"
/>
<el-dialog
title="视频播放"
:visible.sync="openVideo"
width="980px"
:before-close="cancelVideo"
append-to-body
>
<video
ref="video"
:src="videoSrc"
controls="controls"
autoplay="autoplay"
poster="../../../assets/images/video_loading.gif"
style="max-height: 550px"
/>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelVideo">关 闭</el-button>
</div>
@ -294,16 +382,23 @@
</template>
<script>
import { listSspProblemmodify, getSspProblemmodify, delSspProblemmodify, addSspProblemmodify, updateSspProblemmodify } from "@/api/trouble/sspProblemmodify";
import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
import sspProblemmodifyAuditinfoDrawer from '../sspProblemmodify/sspProblemmodifyAuditinfoDrawer.vue'
import {
listSspProblemmodify,
getSspProblemmodify,
delSspProblemmodify,
addSspProblemmodify,
updateSspProblemmodify,
} from "@/api/trouble/sspProblemmodify";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import sspProblemmodifyAuditinfoDrawer from "../sspProblemmodify/sspProblemmodifyAuditinfoDrawer.vue";
export default {
name: "SspProblemmodify",
components: {
sspProblemmodifyAuditinfoDrawer,ElImageViewer
sspProblemmodifyAuditinfoDrawer,
ElImageViewer,
},
dicts: ['ssp_aqyhlx','sys_common_isdel','smz_ssp_checkstate'],
dicts: ["ssp_aqyhlx", "sys_common_isdel", "smz_ssp_checkstate"],
data() {
return {
showViewer: false,
@ -364,21 +459,20 @@ export default {
// 表单参数
form: {},
// 表单校验
rules: {
},
rules: {},
srcList: [],
activeName: 'dzg',
activeName: "dzg",
sspProblemmodifyAuditinfoDrawerVisible: false,
formData: {
problemmodifyId:null
problemmodifyId: null,
},
};
},
created() {
this.getList();
this.$api.publics.getZgsDeptList().then(d=>{
this.$api.publics.getZgsDeptList().then((d) => {
this.depts = d?.data || [];
})
});
},
methods: {
onPreview(urls) {
@ -387,20 +481,20 @@ export default {
arrayurls.forEach((v, i) => {
this.srcList.push(v);
});
this.showViewer = true
this.showViewer = true;
},
closeViewer() {
this.showViewer = false
this.showViewer = false;
},
/** 查询安全整改列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeMarksTime && '' != this.daterangeMarksTime) {
if (null != this.daterangeMarksTime && "" != this.daterangeMarksTime) {
this.queryParams.params["beginMarksTime"] = this.daterangeMarksTime[0];
this.queryParams.params["endMarksTime"] = this.daterangeMarksTime[1];
}
listSspProblemmodify(this.queryParams).then(response => {
listSspProblemmodify(this.queryParams).then((response) => {
this.sspProblemmodifyList = response.rows;
this.total = response.total;
this.loading = false;
@ -443,7 +537,7 @@ export default {
createUser: null,
createTime: null,
updateUser: null,
updateTime: null
updateTime: null,
};
this.resetForm("form");
},
@ -460,9 +554,9 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
@ -473,8 +567,8 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getSspProblemmodify(id).then(response => {
const id = row.id || this.ids;
getSspProblemmodify(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改安全整改";
@ -482,16 +576,16 @@ export default {
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateSspProblemmodify(this.form).then(response => {
updateSspProblemmodify(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addSspProblemmodify(this.form).then(response => {
addSspProblemmodify(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
@ -508,12 +602,16 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除安全整改编号为"' + ids + '"的数据项？').then(function() {
this.$modal
.confirm('是否确认删除安全整改编号为"' + ids + '"的数据项？')
.then(function () {
return delSspProblemmodify(ids);
}).then(() => {
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
})
.catch(() => {});
},
handleLog(row) {
this.formData.problemmodifyId = row.id;
@ -521,10 +619,14 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('trouble/sspProblemmodify/export', {
...this.queryParams
}, `sspProblemmodify_${new Date().getTime()}.xlsx`)
}
}
this.download(
"trouble/sspProblemmodify/export",
{
...this.queryParams,
},
`sspProblemmodify_${new Date().getTime()}.xlsx`
);
},
},
};
</script>

216
ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue
View File

@ -1,6 +1,13 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="项目名称" prop="problemArea">
<el-input
v-model="queryParams.problemArea"
@ -46,8 +53,16 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="责任主体" prop="projectDeptId" v-hasPermi="['project:project:zgs']">
<el-select v-model="queryParams.projectDeptId" placeholder="请选择责任主体" clearable>
<el-form-item
label="责任主体"
prop="projectDeptId"
v-hasPermi="['project:project:zgs']"
>
<el-select
v-model="queryParams.projectDeptId"
placeholder="请选择责任主体"
clearable
>
<el-option
v-for="dict in depts"
:key="dict.deptId"
@ -57,7 +72,9 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<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>
@ -112,14 +129,26 @@
<el-tab-pane label="全部数据" name="all"></el-tab-pane>
<el-tab-pane label="待整改" name="dzg"></el-tab-pane>
<el-tab-pane label="待复检" name="dqr"></el-tab-pane>
<el-tab-pane label="已处理" name="ycl"></el-tab-pane>
<el-tab-pane label="整改完成" name="ycl"></el-tab-pane>
<el-tab-pane label="整改超时" name="zgcs"></el-tab-pane>
<el-table v-loading="loading" :data="sspProblemmodifyList" @selection-change="handleSelectionChange">
<el-table
v-loading="loading"
:data="sspProblemmodifyList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="40" align="center" v-if="false" />
<el-table-column label="项目名称" align="center" prop="problemArea" width="200" fixed="left" show-overflow-tooltip/>
<el-table-column
label="项目名称"
align="center"
prop="problemArea"
width="200"
fixed="left"
show-overflow-tooltip
/>
<el-table-column label="隐患图片" align="center" property="path" width="220">
<template slot-scope="scope">
<el-image ref="preview"
<el-image
ref="preview"
style="width: 200px; height: 100px"
:src="scope.row.marksPicture"
@click="onPreview(scope.row.smarkUrl)"
@ -132,14 +161,36 @@
<dict-tag :options="dict.type.ssp_zlyhlx" :value="scope.row.dangerType" />
</template>
</el-table-column>
<el-table-column label="隐患描述" align="center" prop="workParts" width="100" show-overflow-tooltip/>
<el-table-column label="整改要求" align="center" prop="changeInfo" width="200" show-overflow-tooltip/>
<el-table-column label="整改截至时间" align="center" prop="nickedTime" width="135">
<el-table-column
label="隐患描述"
align="center"
prop="workParts"
width="100"
show-overflow-tooltip
/>
<el-table-column
label="整改要求"
align="center"
prop="changeInfo"
width="200"
show-overflow-tooltip
/>
<el-table-column
label="整改截至时间"
align="center"
prop="nickedTime"
width="135"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.nickedTime, '{y}-{m}-{d} {h}:{s}') }}</span>
<span>{{ parseTime(scope.row.nickedTime, "{y}-{m}-{d} {h}:{s}") }}</span>
</template>
</el-table-column>
<el-table-column label="隐患整改人" align="left" width="120" show-overflow-tooltip>
<el-table-column
label="隐患整改人"
align="left"
width="120"
show-overflow-tooltip
>
<template slot-scope="scope">
<div>{{ scope.row.lordSent }}</div>
<div>{{ scope.row.lordSentUser }}</div>
@ -147,7 +198,10 @@
</el-table-column>
<el-table-column label="流程状态" align="center" prop="checkState">
<template slot-scope="scope">
<dict-tag :options="dict.type.smz_ssp_checkstate" :value="scope.row.checkState"/>
<dict-tag
:options="dict.type.smz_ssp_checkstate"
:value="scope.row.checkState"
/>
</template>
</el-table-column>
<el-table-column label="复检人" align="left" width="120" show-overflow-tooltip>
@ -156,7 +210,13 @@
<div>{{ scope.row.recheckSendUser }}</div>
</template>
</el-table-column>
<el-table-column label="抄送人" align="left" prop="copySend" width="120" show-overflow-tooltip>
<el-table-column
label="抄送人"
align="left"
prop="copySend"
width="120"
show-overflow-tooltip
>
<template slot-scope="scope">
<div>{{ scope.row.copySend }}</div>
<div>{{ scope.row.copySendUser }}</div>
@ -165,10 +225,16 @@
<el-table-column label="提交用户" align="center" prop="createUser" width="100" />
<el-table-column label="提交时间" align="center" prop="createTime" width="135">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{s}') }}</span>
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{s}") }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="100">
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
fixed="right"
width="100"
>
<template slot-scope="scope">
<!-- <el-button v-if="scope.row.marksVideo != null && scope.row.marksVideo != ''"
size="mini"
@ -183,14 +249,17 @@
icon="el-icon-notebook-2"
@click="handleLog(scope.row)"
v-hasPermi="['trouble:sspProblemmodify:query']"
>整改日志</el-button>
<el-button v-if="scope.row.vDel=='0'"
>整改日志</el-button
>
<el-button
v-if="scope.row.vDel == '0'"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['work:sspProblemmodify:remove']"
>删除</el-button>
>删除</el-button
>
</template>
</el-table-column>
</el-table>
@ -204,7 +273,6 @@
/>
</el-tabs>
<!-- 添加或修改质量整改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
@ -239,11 +307,13 @@
<el-input v-model="form.nickedArea" placeholder="请输入留痕定位" />
</el-form-item>
<el-form-item label="留痕时间" prop="nickedTime">
<el-date-picker clearable
<el-date-picker
clearable
v-model="form.nickedTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择留痕时间">
placeholder="请选择留痕时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="工序名称" prop="processName">
@ -281,9 +351,23 @@
<sspProblemmodifyAuditinfoDrawer
size="40%"
:visible.sync="sspProblemmodifyAuditinfoDrawerVisible"
:form-data="formData"/>
<el-dialog title="视频播放" :visible.sync="openVideo" width="980px" :before-close="cancelVideo" append-to-body>
<video ref="video" :src="videoSrc" controls="controls" autoplay="autoplay" poster="../../../assets/images/video_loading.gif" style="max-height: 550px;"/>
:form-data="formData"
/>
<el-dialog
title="视频播放"
:visible.sync="openVideo"
width="980px"
:before-close="cancelVideo"
append-to-body
>
<video
ref="video"
:src="videoSrc"
controls="controls"
autoplay="autoplay"
poster="../../../assets/images/video_loading.gif"
style="max-height: 550px"
/>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelVideo">关 闭</el-button>
</div>
@ -292,16 +376,23 @@
</template>
<script>
import { listSspProblemmodify, getSspProblemmodify, delSspProblemmodify, addSspProblemmodify, updateSspProblemmodify } from "@/api/trouble/sspProblemmodify";
import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
import sspProblemmodifyAuditinfoDrawer from './sspProblemmodifyAuditinfoDrawer.vue'
import {
listSspProblemmodify,
getSspProblemmodify,
delSspProblemmodify,
addSspProblemmodify,
updateSspProblemmodify,
} from "@/api/trouble/sspProblemmodify";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import sspProblemmodifyAuditinfoDrawer from "./sspProblemmodifyAuditinfoDrawer.vue";
export default {
name: "SspProblemmodify",
components: {
sspProblemmodifyAuditinfoDrawer,ElImageViewer
sspProblemmodifyAuditinfoDrawer,
ElImageViewer,
},
dicts: ['ssp_zlyhlx','sys_common_isdel','smz_ssp_checkstate'],
dicts: ["ssp_zlyhlx", "sys_common_isdel", "smz_ssp_checkstate"],
data() {
return {
showViewer: false,
@ -356,27 +447,26 @@ export default {
createTime: null,
updateUser: null,
updateTime: null,
projectDeptId: null
projectDeptId: null,
},
depts: null,
// 表单参数
form: {},
// 表单校验
rules: {
},
rules: {},
srcList: [],
activeName: 'dzg',
activeName: "dzg",
sspProblemmodifyAuditinfoDrawerVisible: false,
formData: {
problemmodifyId:null
problemmodifyId: null,
},
};
},
created() {
this.getList();
this.$api.publics.getZgsDeptList().then(d=>{
this.$api.publics.getZgsDeptList().then((d) => {
this.depts = d?.data || [];
})
});
},
methods: {
onPreview(urls) {
@ -385,20 +475,20 @@ export default {
arrayurls.forEach((v, i) => {
this.srcList.push(v);
});
this.showViewer = true
this.showViewer = true;
},
closeViewer() {
this.showViewer = false
this.showViewer = false;
},
/** 查询质量整改列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeMarksTime && '' != this.daterangeMarksTime) {
if (null != this.daterangeMarksTime && "" != this.daterangeMarksTime) {
this.queryParams.params["beginMarksTime"] = this.daterangeMarksTime[0];
this.queryParams.params["endMarksTime"] = this.daterangeMarksTime[1];
}
listSspProblemmodify(this.queryParams).then(response => {
listSspProblemmodify(this.queryParams).then((response) => {
this.sspProblemmodifyList = response.rows;
this.total = response.total;
this.loading = false;
@ -441,7 +531,7 @@ export default {
createUser: null,
createTime: null,
updateUser: null,
updateTime: null
updateTime: null,
};
this.resetForm("form");
},
@ -458,9 +548,9 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
@ -471,8 +561,8 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getSspProblemmodify(id).then(response => {
const id = row.id || this.ids;
getSspProblemmodify(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改质量整改";
@ -480,16 +570,16 @@ export default {
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateSspProblemmodify(this.form).then(response => {
updateSspProblemmodify(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addSspProblemmodify(this.form).then(response => {
addSspProblemmodify(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
@ -506,12 +596,16 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除质量整改编号为"' + ids + '"的数据项？').then(function() {
this.$modal
.confirm('是否确认删除质量整改编号为"' + ids + '"的数据项？')
.then(function () {
return delSspProblemmodify(ids);
}).then(() => {
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
})
.catch(() => {});
},
handleLog(row) {
this.formData.problemmodifyId = row.id;
@ -519,10 +613,14 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('trouble/sspProblemmodify/export', {
...this.queryParams
}, `sspProblemmodify_${new Date().getTime()}.xlsx`)
}
}
this.download(
"trouble/sspProblemmodify/export",
{
...this.queryParams,
},
`sspProblemmodify_${new Date().getTime()}.xlsx`
);
},
},
};
</script>

150
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectDeptWroksController.java 100644
View File

@ -0,0 +1,150 @@
package com.yanzhu.jh.project.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.SysRoleEnum;
import com.ruoyi.system.service.ISysDeptService;
import com.yanzhu.jh.project.domain.SurProjectUnitInfo;
import com.yanzhu.jh.project.service.ISurProjectUnitInfoService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.yanzhu.jh.project.domain.SurProjectDeptWroks;
import com.yanzhu.jh.project.service.ISurProjectDeptWroksService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 项目部门在册人员Controller
*
* @author JiangYuQi
* @date 2023-08-15
*/
@RestController
@RequestMapping("/project/projectDeptWroks")
public class SurProjectDeptWroksController extends BaseController
{
@Autowired
private ISurProjectDeptWroksService surProjectDeptWroksService;
@Autowired
private ISurProjectUnitInfoService surProjectUnitInfoService;
@Autowired
private ISysDeptService sysDeptService;
/**
* 查询项目部门在册人员列表
*/
@PreAuthorize("@ss.hasPermi('project:projectDeptWroks:list')")
@GetMapping("/list")
public TableDataInfo list(SurProjectDeptWroks surProjectDeptWroks)
{
surProjectDeptWroks.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(surProjectDeptWroks.getNowRole())){
surProjectDeptWroks.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{
surProjectDeptWroks.setNowDept(Convert.toStr(getDeptId()));
}
surProjectDeptWroks.setNowUser(Convert.toStr(getUserId()));
List<SurProjectDeptWroks> list = surProjectDeptWroksService.selectSurProjectDeptWroksList(surProjectDeptWroks);
return getDataTable(list);
}
/**
* 查询项目部门在册人员列表
*/
@PreAuthorize("@ss.hasPermi('project:projectDeptWroks:list')")
@GetMapping("/list2")
public TableDataInfo list2(SurProjectDeptWroks surProjectDeptWroks)
{
surProjectDeptWroks.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(surProjectDeptWroks.getNowRole())){
surProjectDeptWroks.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{
surProjectDeptWroks.setNowDept(Convert.toStr(getDeptId()));
}
surProjectDeptWroks.setNowUser(Convert.toStr(getUserId()));
List<SurProjectDeptWroks> list = surProjectDeptWroksService.selectSurProjectDeptWroksListv2(surProjectDeptWroks);
return getDataTable(list);
}
/**
* 查询项目部门在册人员列表
*/
@PreAuthorize("@ss.hasPermi('project:projectDeptWroks:list')")
@GetMapping("/unitList")
public TableDataInfo unitList(SurProjectUnitInfo surProjectUnitInfo)
{
return getDataTable(surProjectUnitInfoService.selectSurProjectUnitInfoList(surProjectUnitInfo));
}
/**
* 导出项目部门在册人员列表
*/
@PreAuthorize("@ss.hasPermi('project:projectDeptWroks:export')")
@Log(title = "项目部门在册人员", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SurProjectDeptWroks surProjectDeptWroks)
{
List<SurProjectDeptWroks> list = surProjectDeptWroksService.selectSurProjectDeptWroksList(surProjectDeptWroks);
ExcelUtil<SurProjectDeptWroks> util = new ExcelUtil<SurProjectDeptWroks>(SurProjectDeptWroks.class);
util.exportExcel(response, list, "项目部门在册人员数据");
}
/**
* 获取项目部门在册人员详细信息
*/
@PreAuthorize("@ss.hasPermi('project:projectDeptWroks:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(surProjectDeptWroksService.selectSurProjectDeptWroksById(id));
}
/**
* 新增项目部门在册人员
*/
@PreAuthorize("@ss.hasPermi('project:projectDeptWroks:add')")
@Log(title = "项目部门在册人员", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SurProjectDeptWroks surProjectDeptWroks)
{
return toAjax(surProjectDeptWroksService.insertSurProjectDeptWroks(surProjectDeptWroks));
}
/**
* 修改项目部门在册人员
*/
@PreAuthorize("@ss.hasPermi('project:projectDeptWroks:edit')")
@Log(title = "项目部门在册人员", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SurProjectDeptWroks surProjectDeptWroks)
{
return toAjax(surProjectDeptWroksService.updateSurProjectDeptWroks(surProjectDeptWroks));
}
/**
* 删除项目部门在册人员
*/
@PreAuthorize("@ss.hasPermi('project:projectDeptWroks:remove')")
@Log(title = "项目部门在册人员", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(surProjectDeptWroksService.deleteSurProjectDeptWroksByIds(ids));
}
}

4
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProject.java
View File

@ -101,8 +101,8 @@ public class SurProject extends BaseEntity
@Excel(name = "建筑面积")
private String floorArea;
/** 总产值 */
@Excel(name = "总产值")
/** 开累产值 */
@Excel(name = "开累产值")
private String totalOutputValue;
/** 计划完成时间 */

124
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectDeptWroks.java 100644
View File

@ -0,0 +1,124 @@
package com.yanzhu.jh.project.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 项目部门在册人员对象 sur_project_dept_wroks
*
* @author JiangYuQi
* @date 2023-08-15
*/
public class SurProjectDeptWroks extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 项目主键 */
@Excel(name = "项目主键")
private Long projectId;
/** 部门主键 */
@Excel(name = "部门主键")
private Long deptId;
/** 部门名称 */
@Excel(name = "部门名称")
private String deptName;
/** 劳务人员 */
@Excel(name = "劳务人员")
private Long servicePersonnel;
/** 管理人员 */
@Excel(name = "管理人员")
private Long supervisorPersonnel;
/** 总包人员 */
@Excel(name = "总包人员")
private Long contractorPersonnel;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setProjectId(Long projectId)
{
this.projectId = projectId;
}
public Long getProjectId()
{
return projectId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getDeptId()
{
return deptId;
}
public void setServicePersonnel(Long servicePersonnel)
{
this.servicePersonnel = servicePersonnel;
}
public Long getServicePersonnel()
{
return servicePersonnel;
}
public void setSupervisorPersonnel(Long supervisorPersonnel)
{
this.supervisorPersonnel = supervisorPersonnel;
}
public Long getSupervisorPersonnel()
{
return supervisorPersonnel;
}
public void setContractorPersonnel(Long contractorPersonnel)
{
this.contractorPersonnel = contractorPersonnel;
}
public Long getContractorPersonnel()
{
return contractorPersonnel;
}
public String getDeptName() {
return deptName;
}
public void setDeptName(String deptName) {
this.deptName = deptName;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("projectId", getProjectId())
.append("deptId", getDeptId())
.append("servicePersonnel", getServicePersonnel())
.append("supervisorPersonnel", getSupervisorPersonnel())
.append("contractorPersonnel", getContractorPersonnel())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}

77
yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectDeptWroksMapper.java 100644
View File

@ -0,0 +1,77 @@
package com.yanzhu.jh.project.mapper;
import java.util.List;
import com.yanzhu.jh.project.domain.SurProjectDeptWroks;
/**
* 项目部门在册人员Mapper接口
*
* @author JiangYuQi
* @date 2023-08-15
*/
public interface SurProjectDeptWroksMapper
{
/**
* 查询项目部门在册人员
*
* @param id 项目部门在册人员主键
* @return 项目部门在册人员
*/
public SurProjectDeptWroks selectSurProjectDeptWroksById(Long id);
/**
* 查询项目部门在册人员列表
*
* @param surProjectDeptWroks 项目部门在册人员
* @return 项目部门在册人员集合
*/
public List<SurProjectDeptWroks> selectSurProjectDeptWroksList(SurProjectDeptWroks surProjectDeptWroks);
/**
* 查询项目部门在册人员列表
*
* @param surProjectDeptWroks 项目部门在册人员
* @return 项目部门在册人员集合
*/
public List<SurProjectDeptWroks> selectSurProjectDeptWroksListv2(SurProjectDeptWroks surProjectDeptWroks);
/**
* 新增项目部门在册人员
*
* @param surProjectDeptWroks 项目部门在册人员
* @return 结果
*/
public int insertSurProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks);
/**
* 修改项目部门在册人员
*
* @param surProjectDeptWroks 项目部门在册人员
* @return 结果
*/
public int updateSurProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks);
/**
* 修改项目部门在册人员
*
* @param surProjectDeptWroks 项目部门在册人员
* @return 结果
*/
public int updateProjectDeptWorksById(SurProjectDeptWroks surProjectDeptWroks);
/**
* 删除项目部门在册人员
*
* @param id 项目部门在册人员主键
* @return 结果
*/
public int deleteSurProjectDeptWroksById(Long id);
/**
* 批量删除项目部门在册人员
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteSurProjectDeptWroksByIds(Long[] ids);
}

69
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectDeptWroksService.java 100644
View File

@ -0,0 +1,69 @@
package com.yanzhu.jh.project.service;
import java.util.List;
import com.yanzhu.jh.project.domain.SurProjectDeptWroks;
/**
* 项目部门在册人员Service接口
*
* @author JiangYuQi
* @date 2023-08-15
*/
public interface ISurProjectDeptWroksService
{
/**
* 查询项目部门在册人员
*
* @param id 项目部门在册人员主键
* @return 项目部门在册人员
*/
public SurProjectDeptWroks selectSurProjectDeptWroksById(Long id);
/**
* 查询项目部门在册人员列表
*
* @param surProjectDeptWroks 项目部门在册人员
* @return 项目部门在册人员集合
*/
public List<SurProjectDeptWroks> selectSurProjectDeptWroksList(SurProjectDeptWroks surProjectDeptWroks);
/**
* 查询项目部门在册人员列表
*
* @param surProjectDeptWroks 项目部门在册人员
* @return 项目部门在册人员集合
*/
public List<SurProjectDeptWroks> selectSurProjectDeptWroksListv2(SurProjectDeptWroks surProjectDeptWroks);
/**
* 新增项目部门在册人员
*
* @param surProjectDeptWroks 项目部门在册人员
* @return 结果
*/
public int insertSurProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks);
/**
* 修改项目部门在册人员
*
* @param surProjectDeptWroks 项目部门在册人员
* @return 结果
*/
public int updateSurProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks);
/**
* 批量删除项目部门在册人员
*
* @param ids 需要删除的项目部门在册人员主键集合
* @return 结果
*/
public int deleteSurProjectDeptWroksByIds(Long[] ids);
/**
* 删除项目部门在册人员信息
*
* @param id 项目部门在册人员主键
* @return 结果
*/
public int deleteSurProjectDeptWroksById(Long id);
}

118
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectDeptWroksServiceImpl.java 100644
View File

@ -0,0 +1,118 @@
package com.yanzhu.jh.project.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.yanzhu.jh.project.mapper.SurProjectDeptWroksMapper;
import com.yanzhu.jh.project.domain.SurProjectDeptWroks;
import com.yanzhu.jh.project.service.ISurProjectDeptWroksService;
import com.ruoyi.common.utils.SecurityUtils;
/**
* 项目部门在册人员Service业务层处理
*
* @author JiangYuQi
* @date 2023-08-15
*/
@Service
public class SurProjectDeptWroksServiceImpl implements ISurProjectDeptWroksService
{
@Autowired
private SurProjectDeptWroksMapper surProjectDeptWroksMapper;
/**
* 查询项目部门在册人员
*
* @param id 项目部门在册人员主键
* @return 项目部门在册人员
*/
@Override
public SurProjectDeptWroks selectSurProjectDeptWroksById(Long id)
{
return surProjectDeptWroksMapper.selectSurProjectDeptWroksById(id);
}
/**
* 查询项目部门在册人员列表
*
* @param surProjectDeptWroks 项目部门在册人员
* @return 项目部门在册人员
*/
@Override
public List<SurProjectDeptWroks> selectSurProjectDeptWroksList(SurProjectDeptWroks surProjectDeptWroks)
{
return surProjectDeptWroksMapper.selectSurProjectDeptWroksList(surProjectDeptWroks);
}
/**
* 查询项目部门在册人员列表
*
* @param surProjectDeptWroks 项目部门在册人员
* @return 项目部门在册人员集合
*/
@Override
public List<SurProjectDeptWroks> selectSurProjectDeptWroksListv2(SurProjectDeptWroks surProjectDeptWroks)
{
return surProjectDeptWroksMapper.selectSurProjectDeptWroksListv2(surProjectDeptWroks);
}
/**
* 新增项目部门在册人员
*
* @param surProjectDeptWroks 项目部门在册人员
* @return 结果
*/
@Override
public int insertSurProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks)
{
surProjectDeptWroks.setCreateBy(SecurityUtils.getUsername());
surProjectDeptWroks.setCreateTime(DateUtils.getNowDate());
return surProjectDeptWroksMapper.insertSurProjectDeptWroks(surProjectDeptWroks);
}
/**
* 修改项目部门在册人员
*
* @param surProjectDeptWroks 项目部门在册人员
* @return 结果
*/
@Override
public int updateSurProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks)
{
if(surProjectDeptWroks.getId()!=null){
surProjectDeptWroks.setUpdateBy(SecurityUtils.getUsername());
surProjectDeptWroks.setUpdateTime(DateUtils.getNowDate());
int res = surProjectDeptWroksMapper.updateProjectDeptWorksById(surProjectDeptWroks);
return surProjectDeptWroksMapper.updateSurProjectDeptWroks(surProjectDeptWroks);
}else{
surProjectDeptWroks.setCreateBy(SecurityUtils.getUsername());
surProjectDeptWroks.setCreateTime(DateUtils.getNowDate());
int res = surProjectDeptWroksMapper.updateProjectDeptWorksById(surProjectDeptWroks);
return surProjectDeptWroksMapper.insertSurProjectDeptWroks(surProjectDeptWroks);
}
}
/**
* 批量删除项目部门在册人员
*
* @param ids 需要删除的项目部门在册人员主键
* @return 结果
*/
@Override
public int deleteSurProjectDeptWroksByIds(Long[] ids)
{
return surProjectDeptWroksMapper.deleteSurProjectDeptWroksByIds(ids);
}
/**
* 删除项目部门在册人员信息
*
* @param id 项目部门在册人员主键
* @return 结果
*/
@Override
public int deleteSurProjectDeptWroksById(Long id)
{
return surProjectDeptWroksMapper.deleteSurProjectDeptWroksById(id);
}
}

152
yanzhu-jh/src/main/resources/mapper/project/SurProjectDeptWroksMapper.xml 100644
View File

@ -0,0 +1,152 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yanzhu.jh.project.mapper.SurProjectDeptWroksMapper">
<resultMap type="SurProjectDeptWroks" id="SurProjectDeptWroksResult">
<result property="id" column="id" />
<result property="projectId" column="project_id" />
<result property="deptId" column="dept_id" />
<result property="deptName" column="dept_name" />
<result property="servicePersonnel" column="service_personnel" />
<result property="supervisorPersonnel" column="supervisor_personnel" />
<result property="contractorPersonnel" column="contractor_personnel" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectSurProjectDeptWroksVo">
select id, project_id, dept_id, service_personnel, supervisor_personnel, contractor_personnel, create_by, create_time, update_by, update_time, remark from sur_project_dept_wroks
</sql>
<select id="selectSurProjectDeptWroksList" parameterType="SurProjectDeptWroks" resultMap="SurProjectDeptWroksResult">
<include refid="selectSurProjectDeptWroksVo"/>
<where>
<if test="projectId != null "> and project_id = #{projectId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
</where>
</select>
<select id="selectSurProjectDeptWroksListv2" parameterType="SurProjectDeptWroks" resultMap="SurProjectDeptWroksResult">
SELECT
spdw.id,
sp.id AS project_id,
spui.unitId AS dept_id,
spui.unitName AS dept_name,
IFNULL(spdw.service_personnel, 0) AS service_personnel,
IFNULL(
spdw.supervisor_personnel,
0
) AS supervisor_personnel,
IFNULL(
spdw.contractor_personnel,
0
) AS contractor_personnel
FROM
sur_project sp
LEFT JOIN sur_project_unit_info spui ON spui.projectId = sp.id and spui.unitType = 2
LEFT JOIN sur_project_dept_wroks spdw ON spui.unitId = spdw.dept_id
AND spdw.project_id = sp.id
<where>
<if test="projectId != null "> and sp.id = #{projectId}</if>
<if test='nowRole == "6"'> and spui.unitId = #{nowDept}</if>
</where>
</select>
<select id="selectSurProjectDeptWroksById" parameterType="Long" resultMap="SurProjectDeptWroksResult">
<include refid="selectSurProjectDeptWroksVo"/>
where id = #{id}
</select>
<insert id="insertSurProjectDeptWroks" parameterType="SurProjectDeptWroks" useGeneratedKeys="true" keyProperty="id">
insert into sur_project_dept_wroks
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="projectId != null">project_id,</if>
<if test="deptId != null">dept_id,</if>
<if test="servicePersonnel != null">service_personnel,</if>
<if test="supervisorPersonnel != null">supervisor_personnel,</if>
<if test="contractorPersonnel != null">contractor_personnel,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="projectId != null">#{projectId},</if>
<if test="deptId != null">#{deptId},</if>
<if test="servicePersonnel != null">#{servicePersonnel},</if>
<if test="supervisorPersonnel != null">#{supervisorPersonnel},</if>
<if test="contractorPersonnel != null">#{contractorPersonnel},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateSurProjectDeptWroks" parameterType="SurProjectDeptWroks">
update sur_project_dept_wroks
<trim prefix="SET" suffixOverrides=",">
<if test="projectId != null">project_id = #{projectId},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="servicePersonnel != null">service_personnel = #{servicePersonnel},</if>
<if test="supervisorPersonnel != null">supervisor_personnel = #{supervisorPersonnel},</if>
<if test="contractorPersonnel != null">contractor_personnel = #{contractorPersonnel},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSurProjectDeptWroksById" parameterType="Long">
delete from sur_project_dept_wroks where id = #{id}
</delete>
<delete id="deleteSurProjectDeptWroksByIds" parameterType="String">
delete from sur_project_dept_wroks where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<update id="updateProjectDeptWorksById" parameterType="SurProjectDeptWroks">
UPDATE sur_project sp
SET sp.servicePersonnel = (IFNULL(sp.servicePersonnel,0) - (
SELECT
IFNULL(service_personnel,0)
FROM
sur_project_dept_wroks
WHERE
project_id = sp.id
AND dept_id =#{deptId}
)) +#{servicePersonnel}, sp.supervisorPersonnel = (IFNULL(sp.supervisorPersonnel,0) - (
SELECT
IFNULL(supervisor_personnel,0)
FROM
sur_project_dept_wroks
WHERE
project_id = sp.id
AND dept_id =#{deptId}
)) +#{supervisorPersonnel}, sp.generalContractor = (IFNULL(sp.generalContractor,0) - (
SELECT
IFNULL(contractor_personnel,0)
FROM
sur_project_dept_wroks
WHERE
project_id = sp.id
AND dept_id =#{deptId}
)) +#{contractorPersonnel}
WHERE
id = #{projectId}
</update>
</mapper>

2
yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
View File

@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test='activeName == "dzg"'> and ssp.checkState in (0,3)</if>
<if test='activeName == "dqr"'> and ssp.checkState in (1)</if>
<if test='activeName == "ycl"'> and ssp.checkState = 4 </if>
<if test='activeName == "zgcs"'> and (ssp.updateTime is null or ssp.updateTime <![CDATA[ > ]]> ssp.nickedTime) </if>
<if test='activeName == "zgcs"'> and (NOW()<![CDATA[ > ]]> ssp.nickedTime and (ssp.updateTime is null or ssp.updateTime <![CDATA[ > ]]> ssp.nickedTime)) </if>
</where>
order by createTime desc
</select>