Skip to content

H
huaxin-rq
Commit 479603c2 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

隐患整改新增

parent 036ebb8e
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 43 deletions
huaxin-admin/src/main/java/com/zehong/web/controller/checktask/TRectifyGroupMemberInfoController.java
View file @ 479603c2
......@@ -39,6 +39,13 @@ public class TRectifyGroupMemberInfoController extends BaseController
return getDataTable(list);
}
@GetMapping("/memberInfoList")
public AjaxResult memberInfoList(TRectifyGroupMemberInfo tRectifyGroupMemberInfo) {
List<TRectifyGroupMemberInfo> list = tRectifyGroupMemberInfoService.selectTRectifyGroupMemberInfoList(tRectifyGroupMemberInfo);
return AjaxResult.success(list);
}
/**
* 导出整改组内成员信息列表
*/
......
huaxin-web/src/api/checktask/dangerGroupMember.js
View file @ 479603c2
......@@ -60,3 +60,12 @@ export function selectRectifyUserByPostCode(data) {
data: data
})
}
//获取整改组内成员信息
export function memberInfoList(query) {
return request({
url: '/danger/member/memberInfoList',
method: 'get',
params: query
})
}
huaxin-web/src/views/checktask/danger/components/DangerDetail.vue
View file @ 479603c2
......@@ -113,14 +113,14 @@
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<!--<el-col :span="12">
<el-form-item label="责任归属">
<span v-if="dangerDetailInfo.flag == 1">安全管理部</span>
<span v-else-if="dangerDetailInfo.flag == 2">客服运营部</span>
<span v-else-if="dangerDetailInfo.flag == 3">生产运营部</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-col>-->
<el-col :span="12">
<el-form-item label="整改前图片" prop="beforeImg">
......
huaxin-web/src/views/checktask/danger/index.vue
View file @ 479603c2
......@@ -92,7 +92,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!--<el-col :span="1.5">
<el-col :span="1.5">
<el-button
type="primary"
plain
......@@ -101,7 +101,7 @@
@click="handleAdd"
v-hasPermi="['checkTask:danger:add']"
>新增</el-button>
</el-col>-->
</el-col>
<el-col :span="1.5">
<el-button
......@@ -138,14 +138,14 @@
<el-table-column label="隐患来源" align="center" prop="type" :formatter="typeFormatter"/>
<el-table-column label="营业网点" align="center" prop="branch" :formatter="branchFormat"/>
<el-table-column label="表具编号" align="center" prop="meterNum" />
<el-table-column label="责任归属" align="center" prop="flag">
<!--<el-table-column label="责任归属" align="center" prop="flag">
<template slot-scope="scope">
<span v-if="scope.row.flag == 1">安全管理部</span>
<span v-else-if="scope.row.flag == 2">客服运营部</span>
<span v-else-if="scope.row.flag == 3">生产运营部</span>
<span v-else>-</span>
</template>
</el-table-column>
</el-table-column>-->
<!--<el-table-column label="隐患级别" align="center" prop="level">
<template slot-scope="scope">
<span v-if="scope.row.level == 1">重大</span>
......@@ -221,25 +221,6 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="隐患来源" prop="type">
<el-select v-model="form.type" placeholder="请选择隐患来源" style="width: 100%">
<el-option label="居民" value="1" />
<el-option label="工商户" value="2" />
<el-option label="工业" value="3" />
<el-option label="其他" value="4" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="居民" prop="receiveId">
<el-input v-model="form.receiveId" placeholder="请输入居民" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="隐患级别" prop="level">
<el-select v-model="form.level" placeholder="请选择隐患级别" style="width: 100%">
......@@ -250,22 +231,33 @@
</el-col>
</el-row>
<el-form-item label="隐患内容">
<el-form-item label="隐患内容" prop="beforeContent">
<el-input v-model="form.beforeContent" type="textarea" placeholder="请输入隐患内容" />
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="责任归属" prop="flag">
<el-select v-model="form.flag" placeholder="请选择责任归属" style="width: 100%">
<el-option label="安全管理部" value="1" />
<el-option label="客服运营部" value="2" />
<el-option label="生产运营部" value="3" />
<el-form-item label="整改人" prop="reformId">
<el-select v-model="form.reformId" placeholder="请选择隐患级别" style="width: 100%">
<el-option
v-for="member in memberInfoList"
:key="member.memberId"
:label="member.nickName"
:value="member.userId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" maxlength="11" placeholder="请输入联系电话" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="具体地址" prop="address">
<el-input v-model="form.address" placeholder="请输入具体地址" />
</el-form-item>
......@@ -288,15 +280,8 @@
</el-col>
</el-row>
<el-form-item label="隐患整改前图片" prop="beforeImg">
<el-input v-model="form.beforeImg" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="隐患整改前视频" prop="beforeVideo">
<el-input v-model="form.beforeVideo" placeholder="请输入隐患整改前视频" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-input type="textarea" v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -329,6 +314,7 @@ import Editor from '@/components/Editor';
import GetPos from '@/components/GetPos';
import DangerDetail from "./components/DangerDetail";
import Approval from "./components/Approval";
import { memberInfoList } from "@/api/checktask/dangerGroupMember";
export default {
name: "Danger",
components: {
......@@ -392,11 +378,43 @@ export default {
form: {},
// 表单校验
rules: {
title: [
{ required: true, message: "隐患标题不能为空", trigger: "blur" }
],
level: [
{ required: true, message: "请选择隐患级别", trigger: "change" }
],
beforeContent: [
{ required: true, message: "隐患内容不能为空", trigger: "blur" }
],
phone: [
{ required: true, message: "电话不能为空", trigger: "blur" },
{
type: 'number',
message: '手机号格式不正确',
trigger: 'blur',
transform(value) {
let phonereg = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/
if (!phonereg.test(value)) {
return false
} else {
return Number(value)
}
}
}
],
address: [
{ required: true, message: "地址不能为空", trigger: "blur" }
],
reformId: [
{ required: true, message: "请选择整改人", trigger: "change" }
],
},
dialogTableVisibles: false,
devicePos: [],
dangerSource: [],
reportTimeRange: [],
memberInfoList: []
};
},
created() {
......@@ -426,7 +444,7 @@ export default {
});
},
typeFormatter(row){
const receiveName = row.receiveName ? '[' + row.receiveName + ']' : '';
const receiveName = (row.receiveName && !row.receiveName?.includes("-")) ? '[' + row.receiveName + ']' : '';
return this.selectDictLabel(
this.dangerSource,
row.type
......@@ -443,7 +461,7 @@ export default {
id: null,
taskId: null,
inspectId: null,
type: null,
type: 7,
receiveId: null,
title: null,
level: null,
......@@ -459,6 +477,7 @@ export default {
startTime: null,
endTime: null,
status: 0,
reformId: null,
createTime: null,
remark: null
};
......@@ -486,6 +505,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.getMemberInfoList();
this.open = true;
this.title = "添加安检隐患整改";
},
......@@ -589,6 +609,15 @@ export default {
approvalIds = this.ids;
}
this.$refs.approval.open(approvalIds);
},
//获取维修班班长
getMemberInfoList(){
memberInfoList({type: '2',post: '1'}).then(res =>{
if(res.code == 200){
this.memberInfoList = res.data;
console.log("===============>>>>",res.data)
}
})
}
}
};
......
huaxin-web/src/views/checktask/task/components/DangerDetailInfo.vue
View file @ 479603c2
......@@ -116,14 +116,14 @@
</el-form-item>
</el-col>
<el-col :span="12">
<!--<el-col :span="12">
<el-form-item label="责任归属">
<span v-if="dangerDetailInfo.flag == 1">安全管理部</span>
<span v-else-if="dangerDetailInfo.flag == 2">客服运营部</span>
<span v-else-if="dangerDetailInfo.flag == 3">生产运营部</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-col>-->
<el-col :span="12">
<el-form-item label="整改前图片" prop="beforeImg">
......
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