Dev yf' (a3243bcf) · Commits · 融通安全管理系统 / rongtong-app · GitLab

src/components/selectDept/index.vue

+1 −6

Original line number	Diff line number	Diff line
		<template>
		<div style="width:100%">
		<LHeader :text="text"></LHeader>
		<!-- 搜索 -->
		<div class="content-wrap">
		<!-- <div class="search-wrap">
		@@ -70,7 +69,6 @@
		</template>

		<script>
		import LHeader from "@/components/header.vue";
		import { getFun, postFun } from "@/service/table";
		import { getUserInfo } from "@/utils/userInfo";
		import { debounce } from "@/utils/common.js";
		@@ -78,9 +76,6 @@ import { Toast } from "vant";

		export default {
		name: "select-people",
		components: {
		LHeader
		},
		created() {
		this.getInsideUser(getUserInfo().secondaryUnit);
		},
		@@ -106,7 +101,7 @@ export default {
		this.resultName = this.allDeptList.find(
		item => item.deptId == this.result
		).deptName;
		this.$emit("changeDept", this.result);
		this.$emit("changeDept", this.result, this.resultName);
		},
		// 查询内部人员
		getInsideUser(id, val) {

src/views/riskProject/add/index.vue

+4 −3

Original line number	Diff line number	Diff line
		@@ -86,8 +86,8 @@
		<van-field
		required
		clickable
		name="deptId"
		:value="form.deptId"
		name="deptName"
		:value="form.deptName"
		label="评估小组选择"
		placeholder="请选择"
		@click="selectDept()"
		@@ -440,9 +440,10 @@ export default {
		selectDept() {
		this.projectDept = true;
		},
		changeDept(id) {
		changeDept(id, name) {
		console.log(id);
		this.form.deptId = id;
		this.form.deptName = name;
		},
		closeDept() {
		console.log(this.form.deptId);

src/views/riskProject/add/taskList.vue

+261 −76

Original line number	Diff line number	Diff line
		@@ -33,46 +33,127 @@
		</div>
		</van-grid-item>
		</van-grid>
		<van-steps :active="phase" active-icon="success" active-color="#38f" style="margin: 0.26rem 0;">
		<van-step name="1">任务发起</van-step>
		<van-step name="2">风险评估</van-step>
		<van-step name="3">评估审核</van-step>
		<van-step name="4">项目完成</van-step>
		<van-steps
		:active="status"
		active-icon="success"
		active-color="#38f"
		style="margin: 0.26rem 0;"
		>
		<van-step>任务发起</van-step>
		<van-step>风险评估</van-step>
		<van-step>评估审核</van-step>
		<van-step>项目完成</van-step>
		</van-steps>
		<van-tabs v-model="active" color="#2980f7" animated :sticky="true" offset-top="2.93rem">
		<van-tabs
		v-model="active"
		color="#2980f7"
		animated
		:sticky="true"
		offset-top="2.93rem"
		>
		<van-tab title="任务详情">
		<van-form :scroll-to-error="true" :show-error="false" validate-trigger="onSubmit">
		<van-field readonly name="createUserName" :value="form.createUserName" label="创建人员" input-align="right"
		:rules="[{ required: true, message: '创建人员不能为空' }]" />
		<van-field readonly name="createDeptName" :value="form.createDeptName" label="创建单位" input-align="right"
		:rules="[{ required: true, message: '创建单位不能为空' }]" />
		<van-field readonly name="projectName" :value="form.projectName" label="任务名称" input-align="right"
		:rules="[{ required: true, message: '任务名称不能为空' }]" />
		<van-form
		:scroll-to-error="true"
		:show-error="false"
		validate-trigger="onSubmit"
		>
		<van-field
		readonly
		name="createUserName"
		:value="form.createUserName"
		label="创建人员"
		input-align="right"
		:rules="[{ required: true, message: '创建人员不能为空' }]"
		/>
		<van-field
		readonly
		name="createDeptName"
		:value="form.createDeptName"
		label="创建单位"
		input-align="right"
		:rules="[{ required: true, message: '创建单位不能为空' }]"
		/>
		<van-field
		readonly
		name="projectName"
		:value="form.projectName"
		label="任务名称"
		input-align="right"
		:rules="[{ required: true, message: '任务名称不能为空' }]"
		/>

		<van-field readonly name="projectName" :value="form.projectName" label="关联项目" input-align="right"
		:rules="[{ required: true, message: '关联项目不能为空' }]" />
		<van-field
		readonly
		name="projectName"
		:value="form.projectName"
		label="关联项目"
		input-align="right"
		:rules="[{ required: true, message: '关联项目不能为空' }]"
		/>

		<van-field readonly name="buildingNames" :value="form.buildingNames" label="评估楼栋" input-align="right"
		:rules="[{ required: true, message: '评估楼栋不能为空' }]" />
		<van-field
		readonly
		name="buildingNames"
		:value="form.buildingNames"
		label="评估楼栋"
		input-align="right"
		:rules="[{ required: true, message: '评估楼栋不能为空' }]"
		/>

		<van-field readonly name="deptName" :value="form.deptName" label="评估小组选择" input-align="right"
		:rules="[{ required: true, message: '评估小组不能为空' }]" />
		<van-field
		readonly
		name="deptName"
		:value="form.deptName"
		label="评估小组选择"
		input-align="right"
		:rules="[{ required: true, message: '评估小组不能为空' }]"
		/>

		<van-field readonly name="leaderUserName" :value="form.leaderUserName" label="评估小组组长" input-align="right"
		:rules="[{ required: true, message: '评估小组组长不能为空' }]" />
		<van-field
		readonly
		name="leaderUserName"
		:value="form.leaderUserName"
		label="评估小组组长"
		input-align="right"
		:rules="[{ required: true, message: '评估小组组长不能为空' }]"
		/>

		<van-field clickable name="workUserNames" :value="form.workUserNames" label="评估成员" input-align="right"
		:rules="[{ required: true, message: '评估成员不能为空' }]" />
		<van-field
		clickable
		name="workUserNames"
		:value="form.workUserNames"
		label="评估成员"
		input-align="right"
		:rules="[{ required: true, message: '评估成员不能为空' }]"
		/>

		<van-field v-model="form.startTime" readonly name="location" label="任务开始时间" input-align="right" :formatter="() => {
		<van-field
		v-model="form.startTime"
		readonly
		name="location"
		label="任务开始时间"
		input-align="right"
		:formatter="
		() => {
		return timestampToTimes(form.startTime);
		}
		" :rules="[{ required: true, message: '任务开始时间不能为空' }]" />
		"
		:rules="[{ required: true, message: '任务开始时间不能为空' }]"
		/>

		<van-field v-model="form.endTime" readonly name="location" label="任务结束时间" :formatter="() => {
		<van-field
		v-model="form.endTime"
		readonly
		name="location"
		label="任务结束时间"
		:formatter="
		() => {
		return timestampToTimes(form.endTime);
		}
		" input-align="right" :rules="[{ required: true, message: '任务结束时间不能为空' }]" />
		"
		input-align="right"
		:rules="[{ required: true, message: '任务结束时间不能为空' }]"
		/>
		</van-form>
		</van-tab>
		<van-tab title="风险清单">
		@@ -84,11 +165,23 @@
		</van-dropdown-menu>
		</van-sticky>
		<div style="overflow-y: auto;">
		<van-cell-group inset v-for="(item, index) in riskList" :key="index">
		<van-row type="flex" justify="space-between" style="margin-top:10px;">
		<van-cell-group
		inset
		v-for="(item, index) in riskList"
		:key="index"
		>
		<van-row
		type="flex"
		justify="space-between"
		style="margin-top:10px;"
		>
		<van-col span="22" @click="toRiskDetail(item)">
		<van-col span="5">
		<van-image width="46" height="46" src="https://img01.yzcdn.cn/vant/cat.jpeg" />
		<van-image
		width="46"
		height="46"
		src="https://img01.yzcdn.cn/vant/cat.jpeg"
		/>
		</van-col>
		<van-col span="17">
		<van-row gutter="">
		@@ -98,21 +191,26 @@
		</van-col>
		</van-col>
		<van-col span="2">
		<van-row :style="{
		<van-row
		:style="{
		color: '#03b615'
		}">
		}"
		>
		<van-icon name="arrow" size="26px" @click="goColorDetail" />
		</van-row>
		</van-col>
		</van-row>
		</van-cell-group>
		</div>

		</van-tab>
		<van-tab title="审核记录">
		<div class="journal-wrap">
		<van-cell-group inset>
		<van-steps direction="vertical" :active="99999" v-if="riskLogList.length > 0">
		<van-steps
		direction="vertical"
		:active="99999"
		v-if="riskLogList.length > 0"
		>
		<van-step v-for="(item, index) in riskLogList" :key="index">
		<div class="step-wrap">
		<van-row>
		@@ -123,15 +221,21 @@
		</van-col>
		</van-row>
		<van-row>
		<van-col span="7"><span class="field-title">操作人：</span></van-col>
		<van-col span="7"
		><span class="field-title">操作人：</span></van-col
		>
		<van-col span="17">{{ item.approvalUserName }}</van-col>
		</van-row>
		<van-row>
		<van-col span="7"><span class="field-title">审批结果：</span></van-col>
		<van-col span="7"
		><span class="field-title">审批结果：</span></van-col
		>
		<van-col span="17">{{ item.taskName }}</van-col>
		</van-row>
		<van-row>
		<van-col span="7"><span class="field-title">岗位：</span></van-col>
		<van-col span="7"
		><span class="field-title">岗位：</span></van-col
		>
		<van-col span="17">{{ item.taskResult }}</van-col>
		</van-row>
		<!-- <van-row>
		@@ -150,13 +254,15 @@
		</div>
		</van-tab>
		<van-tab title="风险评估报告">
		<div style="height: 1.5rem;
		<div
		style="height: 1.5rem;
		background-color: #fff;
		border-bottom: 1px solid #97999a;
		display: flex;
		justify-content: space-between;
		line-height: 1.5rem;
		">
		"
		>
		<div><van-icon name="column" size="26px" /></div>
		<div style="flex-grow:1;line-height: 0.6rem">
		<div>风险评估报告.PDF</div>
		@@ -166,13 +272,15 @@
		<van-icon name="arrow" size="26px" />
		</div>
		</div>
		<div style="height: 1.5rem;
		<div
		style="height: 1.5rem;
		background-color: #fff;
		border-bottom: 1px solid #97999a;
		display: flex;
		justify-content: space-between;
		line-height: 1.5rem;
		">
		"
		>
		<div><van-icon name="column" size="26px" /></div>
		<div style="flex-grow:1;line-height: 0.6rem">
		<div>风险评估报告.PDF</div>
		@@ -185,7 +293,9 @@
		</van-tab>
		</van-tabs>
		</div>
		<div style="display: flex;
		<div
		v-show="pathAuth == 'riskAssess' && (status == 0 \|\| status == 1)"
		style="display: flex;
		justify-content: space-around;
		background-color: #fff;
		border-top: 1px solid #e3e3e3;
		@@ -193,8 +303,12 @@
		width: 100%;
		text-align: center;
		position: fixed;
		bottom: 0;">
		<div @click="performTasks" style="color: #4bced0;font-size: 14px;font-weight: 600;">
		bottom: 0;"
		>
		<div
		@click="performTasks"
		style="color: #4bced0;font-size: 14px;font-weight: 600;"
		>
		<div style="font-size: 22px;"><van-icon name="plus" /></div>
		<div>执行任务</div>
		</div>
		@@ -203,6 +317,35 @@
		<div>任务完成</div>
		</div> -->
		</div>
		<div
		v-show="pathAuth == 'riskManage' && status == 0"
		style="display: flex;
		justify-content: space-around;
		background-color: #fff;
		border-top: 1px solid #e3e3e3;
		height: 1.5rem;
		width: 100%;
		text-align: center;
		position: fixed;
		bottom: 0;"
		>
		<div
		@click="editTask"
		style="color: #4bced0;font-size: 14px;font-weight: 600;"
		>
		<div style="font-size: 22px;">
		<van-icon name="edit" />
		</div>
		<div>修改任务</div>
		</div>
		<div
		@click="delTask"
		style="color: #ec808d;font-size: 14px;font-weight: 600;"
		>
		<div style="font-size: 22px;"><van-icon name="cross" /></div>
		<div>删除任务</div>
		</div>
		</div>
		</div>
		</template>

		@@ -225,42 +368,50 @@ export default {
		Loop: "", // 定时器
		showIndex: null, // 是否显示遮罩层,
		active: 0,
		phase: 1,
		status: 0,
		pathAuth: "",
		form: {},
		tabs: [],
		riskList: [],
		value1: 0,
		value2: 'a',
		value3: '1',
		value2: "a",
		value3: "1",
		option1: [
		{ text: '楼栋', value: 0 },
		{ text: '全部', value: 1 },
		{ text: "楼栋", value: 0 },
		{ text: "全部", value: 1 }
		],
		option2: [
		{ text: '楼层', value: 'a' },
		{ text: '全部', value: 'b' },
		{ text: "楼层", value: "a" },
		{ text: "全部", value: "b" }
		],
		option3: [
		{ text: '房间', value: '1' },
		{ text: '全部', value: '2' },
		],
		{ text: "房间", value: "1" },
		{ text: "全部", value: "2" }
		]
		};
		},
		created() {
		var planId = this.$route.params.id \|\| sessionStorage.getItem("planId");
		var buildingId =
		this.$route.params.buildingId \|\| sessionStorage.getItem("buildingId");

		this.postList(planId, buildingId);
		this.getRiskTaskList(planId, buildingId)
		this.getRiskTaskList(planId, buildingId);
		},
		methods: {
		timestampToTimes(time) {
		return timestampToTime(new Date(time), "DT2", true);
		},
		performTasks() {
		sessionStorage.setItem('buildingId', this.messageList.riskBuildingListDtos[0].buildingId)
		sessionStorage.setItem('planId', this.messageList.id)
		sessionStorage.setItem('buildingName', this.messageList.riskBuildingListDtos[0].buildingName)
		sessionStorage.setItem(
		"buildingId",
		this.messageList.riskBuildingListDtos[0].buildingId
		);
		sessionStorage.setItem("planId", this.messageList.id);
		sessionStorage.setItem(
		"buildingName",
		this.messageList.riskBuildingListDtos[0].buildingName
		);
		this.$router.push({
		name: "riskInherent",
		params: {
		@@ -270,6 +421,14 @@ export default {
		}
		});
		},
		//修改任务
		editTask() {
		//TODO 修改任务
		},
		//删除任务
		delTask() {
		//TODO 删除任务
		},
		handadd() {
		this.$router.push({
		name: "riskAdd",
		@@ -280,10 +439,12 @@ export default {
		},
		//风险清单列表
		getRiskTaskList(planId, buildingId) {
		if (buildingId) {
		getFun(`/risk/plan/inherent/list/${planId}/${buildingId}`).then(res => {
		console.log(res.data, 'lll')
		this.riskList = res.data
		})
		console.log(res.data, "lll");
		this.riskList = res.data;
		});
		}
		},
		postList(id, buildingId) {
		console.log(buildingId, "123");
		@@ -302,6 +463,30 @@ export default {
		console.log(this.messageList);
		this.form = this.messageList.detailsDto;
		this.riskLogList = this.messageList.approveListDtos;
		console.log(this.messageList.statusKey, 111);
		switch (this.messageList.statusKey) {
		case "CREATE_TASK":
		case "WAIT_START":
		case "WAIT_RETURN":
		this.status = 0;
		break;
		case "CREATE_TASK":
		case "WAIT_LEADER_RETURN":
		case "PROJECT_REPORT":
		this.status = 1;
		break;
		case "WAIT_APPROVE":
		case "FINISH":
		this.status = 2;
		break;
		case "REVOKE":
		case "FINISH":
		this.status = 3;
		break;
		default:
		this.status = 0;
		break;
		}
		})
		.catch(() => {
		this.$toast.clear();
		@@ -324,7 +509,7 @@ export default {
		this.$router.push({
		name: "risk-big-detail",
		params: {
		id: data.businessId \|\| data.id,
		id: data.businessId \|\| data.id
		}
		});
		this.showIndex = null;
		@@ -349,17 +534,17 @@ export default {
		floorId: 18,
		isView: true
		}
		})
		});
		},
		//风险清单列表点击
		toRiskDetail(item) {
		console.log(item,'LLLL')
		console.log(item, "LLLL");
		this.$router.push({
		name: "taskDetail",
		params: {
		id: item.id
		}
		})
		});
		}
		}
		};

src/views/riskProject/assess/index.vue

+0 −11

Original line number	Diff line number	Diff line
		@@ -281,17 +281,6 @@ export default {
		sessionStorage.setItem("buildingId", item.buildingId);
		this.showIndex = false;
		},

		// 详情
		goDetail(data) {
		this.$router.push({
		name: "riskBigDetail",
		params: {
		id: data.businessId \|\| data.id
		}
		});
		this.showIndex = false;
		},
		// 确认
		goConfirm(data) {
		this.$router.push({