Skip to content

R
rongtong-pc
Commit 39ce0455 authored by 陈晓晋's avatar 陈晓晋
Browse files
Options

任务新增修改删除操作20230731

parent c3e985cb
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 46 deletions
src/views/ledger/project/index.vue
View file @ 39ce0455
......@@ -67,7 +67,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['ledger/project:project:add']"
v-hasPermi="['system:ledgerProject:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
......@@ -78,7 +78,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['ledger/project:project:edit']"
v-hasPermi="['system:ledgerProject:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
......@@ -89,7 +89,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['ledger/project:project:remove']"
v-hasPermi="['system:ledgerProject:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
......@@ -99,7 +99,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['ledger/project:project:export']"
v-hasPermi="['system:ledgerProject:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -134,14 +134,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['ledger/project:project:edit']"
v-hasPermi="['system:ledgerProject:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['ledger/project:project:remove']"
v-hasPermi="['system:ledgerProject:remove']"
>删除</el-button>
</template>
</el-table-column>
......
src/views/ledger/room/index.vue
View file @ 39ce0455
......@@ -47,7 +47,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:room:add']"
v-hasPermi="['system:ledgerRoom:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
......@@ -58,7 +58,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:room:edit']"
v-hasPermi="['system:ledgerRoom:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
......@@ -69,7 +69,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:room:remove']"
v-hasPermi="['system:ledgerRoom:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
......@@ -79,14 +79,14 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:room:export']"
v-hasPermi="['system:ledgerRoom:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="roomList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="60">
<template #default="{ $index }">
......@@ -110,14 +110,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:room:edit']"
v-hasPermi="['system:ledgerRoom:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:room:remove']"
v-hasPermi="['system:ledgerRoom:remove']"
>删除</el-button>
</template>
</el-table-column>
......
src/views/risk/inherent/index.vue
View file @ 39ce0455
......@@ -129,7 +129,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['risk:inherent:add']"
v-hasPermi="['system:riskInherent:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
......@@ -140,7 +140,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['risk:inherent:edit']"
v-hasPermi="['system:riskInherent:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
......@@ -151,7 +151,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['risk:inherent:remove']"
v-hasPermi="['system:riskInherent:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
......@@ -161,7 +161,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['risk:inherent:export']"
v-hasPermi="['system:riskInherent:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -215,14 +215,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['risk:inherent:edit']"
v-hasPermi="['system:riskInherent:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['risk:inherent:remove']"
v-hasPermi="['system:riskInherent:remove']"
>删除</el-button>
</template>
</el-table-column>
......
src/views/risk/plan/index.vue
View file @ 39ce0455
......@@ -67,32 +67,55 @@
</el-row>
<el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center">
<el-table-column type="selection" align="center" />
<el-table-column label="序号" align="center" >
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="任务名称" align="center" prop="name" />
<el-table-column label="任务编号" align="center" prop="no" />
<el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="楼栋名称" align="center" prop="buildingNames" />
<el-table-column label="创建人员" align="center" prop="createUserName" />
<el-table-column label="创建单位" align="center" prop="createDeptName" />
<el-table-column label="任务名称" align="left" prop="name" width="200px"/>
<!-- <el-table-column label="任务编号" align="center" prop="no" /> -->
<el-table-column label="项目名称" align="left" prop="projectName" width="200px"/>
<el-table-column label="楼栋名称" align="left" prop="buildingNames" width="300px" >
<template slot-scope="scope">
<el-popover
placement="top-start"
title="楼栋名称"
width="200"
trigger="hover"
:content="scope.row.buildingNames">
<span slot="reference">{{ scope.row.buildingNames.length>25?scope.row.buildingNames.substring(0,25)+"...":scope.row.buildingNames}}</span>
</el-popover>
</template>
</el-table-column>
<!-- <el-table-column label="创建人员" align="center" prop="createUserName" />
<el-table-column label="创建单位" align="center" prop="createDeptName" /> -->
<el-table-column label="负责人" align="center" prop="leaderUserName" />
<el-table-column label="执行人员" align="center" prop="workUserNames" />
<el-table-column label="开始时间" align="center" prop="startTime" width="180">
<el-table-column label="执行人员" align="center" prop="workUserNames" width="120"/>
<el-table-column label="开始时间" align="center" prop="startTime" width="120" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="结束时间" align="center" prop="endTime" width="180">
<el-table-column label="结束时间" align="center" prop="endTime" width="120">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="statusName" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="状态" align="center" prop="statusName" width="120">
<template slot-scope="scope">
<div>
<div v-if="scope.row.statusName=='项目完成'"><el-tag type="info">项目完成</el-tag></div>
<div v-else-if="scope.row.statusName=='审批任务'"><el-tag >审批任务</el-tag></div>
<div v-else-if="scope.row.statusName=='任务待执行'"><el-tag type="warning">任务待执行</el-tag></div>
<div v-else-if="scope.row.statusName=='验收任务'"><el-tag type="success">验收任务</el-tag></div>
<div v-else><el-tag type="danger">{{scope.row.statusName}}</el-tag></div>
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
......@@ -112,7 +135,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="创建人员" prop="createUserId">
<el-input v-model="user.userName" placeholder="请输入创建人员" required="true" />
<el-input v-model="user.nickName" placeholder="请输入创建人员" required="true" />
</el-form-item>
<el-form-item label="创建单位" prop="createDeptId">
<el-input v-model="user.dept.deptName" placeholder="请输入创建单位" />
......@@ -120,6 +143,9 @@
<el-form-item label="任务名称" prop="name">
<el-input v-model="form.name" placeholder="请输入任务名称" />
</el-form-item>
<el-form-item label="项目id" prop="projectIdV" v-show="false">
<el-input v-model="form.projectIdV" placeholder="请输入任务名称" />
</el-form-item>
<el-form-item label="关联项目" prop="projectId">
<el-select v-model="form.projectId" @change="getBuildingList(form.projectId)" filterable remote
reserve-keyword placeholder="请输入项目关键词" :remote-method="remoteMethod" :loading="loading">
......@@ -135,7 +161,7 @@
<!-- <el-input v-model="form.buildingIds" placeholder="请输入评估楼栋" /> -->
</el-form-item>
<el-form-item label="评估小组选择" prop="deptId">
<treeselect v-model="user.dept.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
<!-- <el-input v-model="user.dept.deptName" placeholder="请输评估小组选择" /> -->
</el-form-item>
<el-form-item label="评估小组组长" prop="leaderUserId">
......@@ -253,6 +279,7 @@
},
// 表单参数
form: {
projectIdV:'',
deptId: '',
createUserId:'',
createDeptId:'',
......@@ -296,7 +323,7 @@
buildingIds: [{
required: true,
message: '请输入任务名称',
trigger: 'blur'
trigger: 'change'
},
],
......@@ -334,7 +361,6 @@
},
created() {
this.getUser();
this.getDeptTree();
this.getList();
......@@ -369,8 +395,10 @@
getUser() {
getUserProfile().then(response => {
this.user = response.data;
this.form.deptId = this.user.deptId;
console.log(this.user)
this.form.deptId = response.data.deptId;
this.getUserListByDeptId(this.user.dept.deptId);
});
},
......@@ -420,11 +448,11 @@
name: null,
no: null,
projectId: null,
buildingIds: null,
buildingIds: [],
createUserId: null,
createDeptId: null,
leaderUserId: null,
workUserIds: null,
workUserIds: [],
startTime: null,
endTime: null,
status: null,
......@@ -455,15 +483,35 @@
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.getUser();
this.open = true;
this.title = "创建任务";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.getUser();
const id = row.id || this.ids
getPlan(id).then(response => {
this.form = response.data;
var projectIdV=response.data.projectId;
this.getBuildingList(response.data.projectId);
//执行人员
var workUserArr=[];
response.data.workUserIds.split(',').forEach(item=>{
workUserArr.push(item*1)
});
this.form.workUserIds = workUserArr;
//楼栋信息
var buildingsArr=[];
response.data.buildingIds.split(',').forEach(item=>{
buildingsArr.push(item*1)
});
this.form.buildingIds = buildingsArr;
this.form.projectId=response.data.projectName;
this.form.projectIdV=projectIdV;
this.open = true;
this.title = "修改风险计划";
});
......@@ -472,8 +520,10 @@
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.buildingIds=this.form.buildingIds.join();
this.form.workUserIds=this.form.workUserIds.join();
this.form.projectId=this.form.projectIdV;
if (this.form.id != null) {
updatePlan(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
......
src/views/risk/plan/ledger.vue
View file @ 39ce0455
......@@ -16,12 +16,25 @@
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="任务名称" align="center" prop="name" />
<el-table-column label="任务编号" align="center" prop="no" />
<el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="楼栋名称" align="center" prop="buildingNames" />
<el-table-column label="创建人员" align="center" prop="createUserName" />
<el-table-column label="创建单位" align="center" prop="createDeptName" />
<el-table-column label="任务名称" align="left" prop="name" width="220px"/>
<!-- <el-table-column label="任务编号" align="center" prop="no" /> -->
<el-table-column label="项目名称" align="left" prop="projectName" width="220px"/>
<el-table-column label="楼栋名称" align="left" prop="buildingNames" width="220px">
<template slot-scope="scope">
<el-popover
placement="top-start"
title="楼栋名称"
width="200"
trigger="hover"
:content="scope.row.buildingNames">
<span slot="reference">{{ scope.row.buildingNames.length>25?scope.row.buildingNames.substring(0,25)+"...":scope.row.buildingNames}}</span>
</el-popover>
</template>
</el-table-column>
<!-- <el-table-column label="创建人员" align="center" prop="createUserName" />
<el-table-column label="创建单位" align="center" prop="createDeptName" /> -->
<el-table-column label="负责人" align="center" prop="leaderUserName" />
<el-table-column label="执行人员" align="center" prop="workUserNames" />
<el-table-column label="开始时间" align="center" prop="startTime" width="180">
......@@ -159,4 +172,4 @@
},
},
};
</script>
\ No newline at end of file
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment