Skip to content

B
BCDH-APP
Commit ea1bdbfc authored by 13841799530's avatar 13841799530
Browse files
Options

Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

parents 64d19b30 69026c87
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 777 additions and 146 deletions
src/router/index.js
View file @ ea1bdbfc
......@@ -323,11 +323,20 @@ const routes = [{
path: '/change-info',
name: 'change-info',
meta: {
title: '隐患整改表单',
title: '隐患整改保存',
index: 1
},
component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/changeDanger/changeInfo'),
},
{
path: '/delay-info',
name: 'delay-info',
meta: {
title: '隐患整改延期',
index: 1
},
component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/changeDanger/delayInfo'),
},
{
path: '/review-danger',
......@@ -377,6 +386,16 @@ const routes = [{
},
component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/superviseDanger'),
},
// 隐患督办批示
{
path: '/super-survey',
name: 'super-survey',
meta: {
title: '隐患督办',
index: 1
},
component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/superviseDanger/superSurvey'),
},
// 重大隐患列表
{
path: '/major-danger',
......@@ -387,7 +406,20 @@ const routes = [{
},
component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/majorDanger'),
},
// 延期审批
// 重大隐患审批
{
path: '/major-survey',
name: 'major-survey',
meta: {
title: '重大隐患审批',
index: 1
},
component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/majorDanger/majorSurvey'),
},
// 延期审批列表
{
path: '/delay-approval',
name: 'delay-approval',
......@@ -397,7 +429,18 @@ const routes = [{
},
component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/delayApproval'),
},
// 项目经理督办
// 延期审批确定
{
path: '/ratify-info',
name: 'ratify-info',
meta: {
title: '延期审批',
index: 1
},
component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/delayApproval/ratifyInfo'),
},
// 项目经理督办列表
{
path: '/manager-danger',
name: 'manager-danger',
......@@ -407,6 +450,18 @@ const routes = [{
},
component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/managerDanger'),
},
// 项目经理督办批示
{
path: '/manager-survey',
name: 'manager-survey',
meta: {
title: '项目经理督办',
index: 1
},
component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/managerDanger/managerSurvey'),
},
{
......
src/service/risk.js
View file @ ea1bdbfc
......@@ -94,6 +94,14 @@ export function postriskBook(url,data) {
})
}
// 风险详情
export function riskDetail(url,data) {
return request({
url: url,
method: 'post',
data
})
}
/*接口对接1 START*/
......
src/views/danger/addDanger/addDanger.vue
View file @ ea1bdbfc
......@@ -280,6 +280,8 @@ export default {
this.isShowreturnCause = true;
this.text = "隐患上报退回";
this.postReturnEcho()
console.log(this.taskId);
console.log(Boolean( this.taskId));
}
console.log("taskid"+this.taskId);
this.getList();
......@@ -354,12 +356,12 @@ export default {
loadingType: "spinner",
duration: 0
});
url =
// if(this.taskId){
// url = `/hdreport/editSave/${this.taskId}`
// }
let url = "/hdreport/add"
if(this.taskId){
url = `/hdreport/editSave/${this.taskId}`
}
postHdReportAdd("/hdreport/add", formdata)
postHdReportAdd(url, formdata)
.then(res => {
this.$toast.clear();
this.$toast.success({
......
src/views/danger/changeDanger/delayInfo.vue 0 → 100644
View file @ ea1bdbfc
<template>
<div>
<LHeader :text="text"></LHeader>
<van-form
@submit="onSubmit"
:show-error="false"
:scroll-to-error="true"
validate-trigger="onSubmit"
>
<van-field
readonly
clickable
name="delayTime"
:value="delayTime"
label="延期时间"
placeholder="点击选择日期"
@click="showDelayTime = true"
:rules="[{ required: true, message: '延期时间不能为空' }]"
/>
<van-popup v-model="showDelayTime" position="bottom">
<van-datetime-picker
type="datetime"
@confirm="onConDelayTime"
@cancel="showDelayTime = false"
/>
</van-popup>
<van-field
v-model="delayApply"
label="延期理由"
name="delayApply"
rows="3"
type="textarea"
placeholder="请输入"
:rules="[{ required: true, message: '延期理由不能为空' }]"
/>
<div style="margin: 16px;">
<van-button round block type="info" native-type="submit"
>保存</van-button
>
</div>
</van-form>
<div style="margin:10px 16px 0px;padding-bottom:16px">
<van-button round block type="warning" @click.native="cancel"
>取消</van-button
>
</div>
</div>
</template>
<script>
import LHeader from "@/components/header.vue";
import { timestampToTime } from "@/utils/format";
export default {
components: {
LHeader
},
data() {
return {
text: "延期申请",
taskId: "",
delayTime: "", // 延迟时间
showDelayTime: false,
delayApply: "", // 延迟理由
};
},
created() {
this.taskId = this.$route.params.taskId;
},
methods: {
onSubmit(values) {
console.log("submit", values);
},
// 延期时间
onConDelayTime(date) {
this.delayTime = timestampToTime(date, "DT1", true);
this.showDelayTime = false;
},
cancel() {
this.$router.go(-1);
}
}
};
</script>
<style lang="less" scoped>
/* @import url(); 引入css类 */
</style>
src/views/danger/changeDanger/index.vue
View file @ ea1bdbfc
......@@ -51,6 +51,9 @@
<van-button round type="info" @touchstart="goConfirm(item)"
>确认</van-button
>
<van-button round type="info" @touchstart="goDelay(item)"
>延期</van-button
>
</div>
</van-overlay>
</van-cell-group>
......@@ -134,6 +137,18 @@ export default {
}
});
this.showIndex = null;
},
// 延期
goDelay(data) {
console.log(data);
this.$router.push({
name:"delay-info",
params:{
"taskId":data.taskId,
"taskName":data.taskName
}
});
this.showIndex = null;
}
},
filters:{
......
src/views/danger/delayApproval/index.vue
View file @ ea1bdbfc
......@@ -39,6 +39,9 @@
<van-button round type="primary" @touchstart="goDetail(item)"
>详情</van-button
>
<van-button round type="info" @touchstart="goConfirm(item)"
>审批</van-button
>
</div>
</van-overlay>
</van-cell-group>
......@@ -50,22 +53,8 @@
<script>
import LHeader from "@/components/header.vue";
import { postriskBook } from "@/service/risk";
/*接口对接2 START*/
// 例子：
// import {
// getFormList,
// postHdTyp,
// postHdName,
// postHdInventories,
// postHdRiskSource,
// postHdShowPeople,
// postHdReportAdd,
// dangerReturnEcho,
// } from "@/service/danger";
/*接口对接2 END*/
export default {
components: {
......@@ -85,25 +74,7 @@ export default {
},
methods: {
getList() {
/*接口对接3 START*/
// 例子：
this.$toast.loading({
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
});
postriskBook("/riskMain/doneList")
.then(res => {
this.$toast.clear();
this.messageList = res.rows
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试");
});
/*接口对接3 END*/
},
onSearch(val) {
console.log(val);
......@@ -135,6 +106,17 @@ export default {
});
this.showIndex = null;
},
// 审批
goConfirm(data) {
console.log(data);
this.$router.push({
name:"ratify-info",
params:{
"taskId":data.taskId
}
});
this.showIndex = null;
}
}
};
</script>
......
src/views/danger/delayApproval/ratifyInfo.vue 0 → 100644
View file @ ea1bdbfc
<template>
<div>
<LHeader :text="text"></LHeader>
<van-form
@submit="onSubmit"
:show-error="false"
:scroll-to-error="true"
validate-trigger="onSubmit"
>
<van-field
v-model="delayTime"
name="delayTime"
label="延期时间"
placeholder="请输入"
:rules="[{ required: true, message: '延期时间不能为空' }]"
/>
<van-field
v-model="delayApply"
readonly
label="延期理由"
name="delayApply"
rows="1"
autosize
type="textarea"
/>
<van-field name="isAgree" label="延期是否通过">
<template #input>
<van-radio-group
v-model="isAgree"
direction="horizontal"
@change="selectResult"
>
<van-radio name="1">通过</van-radio>
<van-radio name="0">退回</van-radio>
</van-radio-group>
</template>
</van-field>
<van-field
v-model="opinion"
label="理由或者意见"
name="opinion"
rows="3"
type="textarea"
placeholder="请输入"
:rules="[{ required: true, message: '理由或者意见不能为空' }]"
/>
<div style="margin: 16px;">
<van-button round block type="info" native-type="submit"
>保存</van-button
>
</div>
</van-form>
<div style="margin:10px 16px 0px;padding-bottom:16px">
<van-button round block type="warning" @click.native="cancel"
>取消</van-button
>
</div>
</div>
</template>
<script>
import LHeader from "@/components/header.vue";
import { timestampToTime } from "@/utils/format";
export default {
components: {
LHeader
},
data() {
return {
text: "延期审批",
taskId: "",
delayTime: "", // 延迟时间
showDelayTime: false,
delayApply: "", // 延迟理由
isAgree: 1, // 延期是否通过
opinion: "", //理由或者意见
};
},
created() {
this.taskId = this.$route.params.taskId;
},
methods: {
onSubmit(values) {
console.log("submit", values);
},
selectResult(val) {
this.isAgree = val;
},
cancel() {
this.$router.go(-1);
}
}
};
</script>
<style lang="less" scoped>
/* @import url(); 引入css类 */
</style>
src/views/danger/majorDanger/index.vue
View file @ ea1bdbfc
......@@ -39,7 +39,11 @@
<van-button round type="primary" @touchstart="goDetail(item)"
>详情</van-button
>
<van-button round type="info" @touchstart="goConfirm(item)"
>审批</van-button
>
</div>
</van-overlay>
</van-cell-group>
</div>
......@@ -126,15 +130,26 @@ export default {
// 详情
goDetail(data) {
console.log(data);
this.$router.push({
name: "normal-detail",
params:{
id: data.taskId
}
});
this.showIndex = null;
},
// 确认
goConfirm(data) {
console.log(data);
this.$router.push({
name: "risk-big-detail",
params: {
id: data.businessId
name:"major-survey",
params:{
"taskId":data.taskId
}
});
this.showIndex = null;
},
}
}
};
</script>
......
src/views/danger/majorDanger/majorSurvey.vue 0 → 100644
View file @ ea1bdbfc
<template>
<div>
<LHeader :text="text"></LHeader>
<van-form
@submit="onSubmit"
:show-error='false'
:scroll-to-error="true"
validate-trigger="onSubmit"
>
<van-field name="radio" label="隐患复查结果">
<template #input>
<van-radio-group
v-model="radio"
direction="horizontal"
@change="selectResult"
>
<van-radio name="1">同意</van-radio>
<van-radio name="0">退回</van-radio>
</van-radio-group>
</template>
</van-field>
<!-- 同意时的选项 -->
<div class="agree" v-if="radio == 1">
<van-field
v-model="agreeOpinion"
label="审批意见"
name="reviewDetails"
rows="3"
type="textarea"
placeholder="请输入"
/>
</div>
<!-- 退回是的选项 -->
<div class="disagree" v-else>
<van-field
readonly
clickable
name="level"
:value="thinkLevel"
label="认为隐患级别"
placeholder="请选择"
@click="showThinkLevel = true"
:rules="[{ required: true, message: '认为隐患级别不能为空' }]"
/>
<van-popup v-model="showThinkLevel" position="bottom">
<van-picker
show-toolbar
value-key="projectName"
:columns="columnsThinkLevel"
@confirm="onConThinkLevel"
@cancel="showThinkLevel = false"
/>
</van-popup>
<van-field
v-model="disagreeOpinion"
label="审批意见"
name="reviewDetails"
rows="3"
type="textarea"
placeholder="请输入"
:rules="[{ required: true, message: '退回原因不能为空' }]"
/>
</div>
<div style="margin: 16px;">
<van-button round block type="info" native-type="submit"
>保存</van-button
>
</div>
</van-form>
<div style="margin:10px 16px 0px;padding-bottom:16px">
<van-button round block type="warning" @click.native="cancel"
>取消</van-button
>
</div>
</div>
</template>
<script>
import LHeader from "@/components/header.vue";
import { dangerReviewAdd } from "@/service/danger";
export default {
components: {
LHeader
},
data() {
return {
taskId: "",
radio: "1",
text: "重大隐患审批",
agreeOpinion: "",
disagreeOpinion: "",
thinkLevel:'', //因为隐患级别
showThinkLevel: false,
columnsThinkLevel:["重大隐患","一般隐患A","一般隐患B","一般隐患C",]
};
},
created() {
this.taskId = this.$route.params.taskId;
},
methods: {
selectResult(val) {
this.radio = val;
},
onSubmit(values) {
console.log("submit", values);
this.$toast.loading({
message: "提交中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
});
// let formdata = new FormData()
// formdata.append('reviewResult', this.radio)
// formdata.append('reviewDetails', values.reviewDetails)
// dangerReviewAdd(`/review/add1/${this.taskId}`,formdata)
// .then(res => {
// this.$toast.clear();
// this.$toast.success({
// message: "提交成功",
// duration: 2000
// });
// history.go(-1);
// })
// .catch(() => {
// this.$toast.clear();
// this.$toast.fail("提交失败,请稍后再试");
// });
},
// 所属工程名称
onConThinkLevel(value) {
this.thinkLevel = value;
this.showProjectName = false;
},
cancel() {
this.$router.go(-1);
}
}
};
</script>
<style lang="less" scoped>
/* @import url(); 引入css类 */
</style>
src/views/danger/managerDanger/index.vue
View file @ ea1bdbfc
......@@ -16,7 +16,7 @@
<van-row gutter="">
<van-col span="7">隐患编号:</van-col>
<van-col span="17">{{ item.processInstanceId }}</van-col>
<van-col span="17">{{ item.hdProjectId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7">隐患项目名称:</van-col>
......@@ -38,6 +38,9 @@
<van-button round type="primary" @touchstart="goDetail(item)"
>详情</van-button
>
<van-button round type="info" @touchstart="goConfirm(item)"
>批示</van-button
>
</div>
</van-overlay>
</van-cell-group>
......@@ -92,10 +95,10 @@ export default {
loadingType: "spinner",
duration: 0
});
superviseSABList("/supervise/SABlist")
superviseSABList("/supervise/list")
.then(res => {
this.$toast.clear();
this.messageList = res.rows
this.messageList = res.data
})
.catch(() => {
......@@ -125,15 +128,26 @@ export default {
// 详情
goDetail(data) {
console.log(data);
this.$router.push({
name: "normal-detail",
params:{
id: data.pid
}
});
this.showIndex = null;
},
// 确认
goConfirm(data) {
console.log(data);
this.$router.push({
name: "risk-big-detail",
params: {
id: data.businessId
name:"manager-survey",
params:{
"taskId":data.taskId
}
});
this.showIndex = null;
},
}
}
};
</script>
......
src/views/danger/managerDanger/managerSurvey.vue 0 → 100644
View file @ ea1bdbfc
<template>
<div>
<LHeader :text="text"></LHeader>
<van-form
@submit="onSubmit"
:show-error='false'
:scroll-to-error="true"
validate-trigger="onSubmit"
>
<van-field
v-model="opinion"
label="批示内容"
name="reviewDetails"
rows="3"
type="textarea"
placeholder="请输入"
/>
<div style="margin: 16px;">
<van-button round block type="info" native-type="submit"
>保存</van-button
>
</div>
</van-form>
<div style="margin:10px 16px 0px;padding-bottom:16px">
<van-button round block type="warning" @click.native="cancel"
>取消</van-button
>
</div>
</div>
</template>
<script>
import LHeader from "@/components/header.vue";
import { dangerReviewAdd } from "@/service/danger";
export default {
components: {
LHeader
},
data() {
return {
taskId: "",
text: "项目经理督办批示",
opinion: "",
};
},
created() {
this.taskId = this.$route.params.taskId;
},
methods: {
onSubmit(values) {
console.log("submit", values);
this.$toast.loading({
message: "提交中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
});
// let formdata = new FormData()
// formdata.append('reviewResult', this.radio)
// formdata.append('reviewDetails', values.reviewDetails)
// dangerReviewAdd(`/review/add1/${this.taskId}`,formdata)
// .then(res => {
// this.$toast.clear();
// this.$toast.success({
// message: "提交成功",
// duration: 2000
// });
// history.go(-1);
// })
// .catch(() => {
// this.$toast.clear();
// this.$toast.fail("提交失败,请稍后再试");
// });
},
cancel() {
this.$router.go(-1);
}
}
};
</script>
<style lang="less" scoped>
/* @import url(); 引入css类 */
</style>
src/views/danger/standBook/normalDetail.vue
View file @ ea1bdbfc
......@@ -265,7 +265,7 @@
<div class="step-wrap">
<van-row>
<van-col span="24"
><div class="info-title">日志信息</div></van-col
><div class="info-title">督办信息</div></van-col
>
</van-row>
<van-row>
......@@ -274,17 +274,11 @@
>
<van-col span="19">{{item.userName}}</van-col>
</van-row>
<van-row>
<van-col span="5"
><span class="field-title">节点：</span></van-col
>
<van-col span="19">{{item.logNode}}</van-col>
</van-row>
<van-row>
<van-row>
<van-col span="5"
><span class="field-title">结果：</span></van-col
><span class="field-title">时间：</span></van-col
>
<van-col span="19">{{item.logResult}}</van-col>
<van-col span="19">{{item.createTime}}</van-col>
</van-row>
<van-row>
<van-col span="5"
......@@ -292,11 +286,11 @@
>
<van-col span="19">{{item.deptName}}</van-col>
</van-row>
<van-row>
<van-row>
<van-col span="5"
><span class="field-title">时间：</span></van-col
><span class="field-title">结果：</span></van-col
>
<van-col span="19">{{item.createTime}}</van-col>
<van-col span="19">{{item.instructionsContent}}</van-col>
</van-row>
</div>
</van-step>
......
src/views/danger/superviseDanger/index.vue
View file @ ea1bdbfc
......@@ -37,6 +37,9 @@
<van-button round type="primary" @touchstart="goDetail(item)"
>详情</van-button
>
<van-button round type="info" @touchstart="goConfirm(item)"
>批示</van-button
>
</div>
</van-overlay>
</van-cell-group>
......@@ -71,7 +74,7 @@ export default {
},
data() {
return {
text: "隐患督办123",
text: "隐患督办",
searchValue: "",
messageList: [],
Loop: "", // 定时器
......@@ -84,23 +87,7 @@ export default {
methods: {
getList() {
/*接口对接3 START*/
// 例子：
this.$toast.loading({
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
});
superviseList("/supervise/list")
.then(res => {
this.$toast.clear();
this.messageList = res.data
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试");
});
/*接口对接3 END*/
},
onSearch(val) {
......@@ -124,15 +111,26 @@ export default {
// 详情
goDetail(data) {
console.log(data);
this.$router.push({
name: "normal-detail",
params:{
id: data.pid
}
});
this.showIndex = null;
},
// 确认
goConfirm(data) {
console.log(data);
this.$router.push({
name: "risk-big-detail",
params: {
id: data.businessId
name:"super-survey",
params:{
"taskId":data.taskId
}
});
this.showIndex = null;
},
}
}
};
</script>
......
src/views/danger/superviseDanger/superSurvey.vue 0 → 100644
View file @ ea1bdbfc
<template>
<div>
<LHeader :text="text"></LHeader>
<van-form
@submit="onSubmit"
:show-error='false'
:scroll-to-error="true"
validate-trigger="onSubmit"
>
<div class="agree" v-if="radio == 1">
<van-field
v-model="opinion"
label="批示内容"
name="reviewDetails"
rows="3"
type="textarea"
placeholder="请输入"
/>
</div>
<div style="margin: 16px;">
<van-button round block type="info" native-type="submit"
>保存</van-button
>
</div>
</van-form>
<div style="margin:10px 16px 0px;padding-bottom:16px">
<van-button round block type="warning" @click.native="cancel"
>取消</van-button
>
</div>
</div>
</template>
<script>
import LHeader from "@/components/header.vue";
import { dangerReviewAdd } from "@/service/danger";
export default {
components: {
LHeader
},
data() {
return {
taskId: "",
text: "隐患督办批示",
opinion: "",
};
},
created() {
this.taskId = this.$route.params.taskId;
},
methods: {
onSubmit(values) {
console.log("submit", values);
this.$toast.loading({
message: "提交中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
});
// let formdata = new FormData()
// formdata.append('reviewResult', this.radio)
// formdata.append('reviewDetails', values.reviewDetails)
// dangerReviewAdd(`/review/add1/${this.taskId}`,formdata)
// .then(res => {
// this.$toast.clear();
// this.$toast.success({
// message: "提交成功",
// duration: 2000
// });
// history.go(-1);
// })
// .catch(() => {
// this.$toast.clear();
// this.$toast.fail("提交失败,请稍后再试");
// });
},
cancel() {
this.$router.go(-1);
}
}
};
</script>
<style lang="less" scoped>
/* @import url(); 引入css类 */
</style>
src/views/risk/riskConfirme/index.vue
View file @ ea1bdbfc
......@@ -122,7 +122,12 @@ export default {
// 详情
goDetail(data) {
console.log(data);
this.$router.push("/affirm-detail");
this.$router.push({
name: "risk-big-detail",
params: {
id: data.taskId
}
});
this.showIndex = null;
},
// 确认
......
src/views/risk/riskReturn/index.vue
View file @ ea1bdbfc
......@@ -118,7 +118,7 @@ export default {
clearInterval(this.Loop);
},
// 详情
// 重新上报
goDetail(data) {
console.log(data);
this.$router.push({
......
src/views/saveWorkbench/index.vue
View file @ ea1bdbfc
......@@ -184,7 +184,7 @@ export default {
},
{
key: "8",
path: "/major-danger",
path: "/delay-approval",
imgUrl: require("@/assets/workbench/inspect-plane.png"),
text: "延期审批"
},
......
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