Skip to content

B
BCDH-APP
Commit 82ba47c2 authored by BlueWhite's avatar BlueWhite
Browse files
Options

重大隐患,督办台账和添加页面

parent 9773cbf3
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 65 deletions
src/service/danger.js
View file @ 82ba47c2
......@@ -193,6 +193,15 @@ export function majorList(url, data) {
})
}
//重大隐患添加
export function majorAdd(url, data) {
return request({
url: url,
method: 'post',
data
})
}
//隐患督办
export function superviseList(url, data) {
return request({
......@@ -203,7 +212,7 @@ export function superviseList(url, data) {
}
//经理督办
export function superviseSABList(url, data) {
export function superviseSABlist(url, data) {
return request({
url: url,
method: 'post',
......@@ -211,6 +220,18 @@ export function superviseSABList(url, data) {
})
}
//经理督办添加
export function superviseAdd(url, data) {
return request({
url: url,
method: 'post',
data
})
}
/*接口对接1 START*/
......
src/views/danger/majorDanger/majorSurvey.vue
View file @ 82ba47c2
......@@ -7,7 +7,7 @@
:scroll-to-error="true"
validate-trigger="onSubmit"
>
<van-field name="radio" label="隐患复查结果">
<van-field name="isResult" label="隐患复查结果">
<template #input>
<van-radio-group
v-model="radio"
......@@ -25,7 +25,7 @@
<van-field
v-model="agreeOpinion"
label="审批意见"
name="reviewDetails"
name="details"
rows="3"
type="textarea"
placeholder="请输入"
......@@ -37,7 +37,7 @@
<van-field
readonly
clickable
name="level"
name="thinkHdLev"
:value="thinkLevel"
label="认为隐患级别"
placeholder="请选择"
......@@ -57,7 +57,7 @@
<van-field
v-model="disagreeOpinion"
label="审批意见"
name="reviewDetails"
name="details"
rows="3"
type="textarea"
placeholder="请输入"
......@@ -81,7 +81,7 @@
<script>
import LHeader from "@/components/header.vue";
import { dangerReviewAdd } from "@/service/danger";
import { majorAdd } from "@/service/danger";
export default {
components: {
LHeader
......@@ -115,22 +115,24 @@ export default {
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("提交失败,请稍后再试");
// });
let formdata = new FormData()
formdata.append('isResult', values.isResult)
formdata.append('details', values.details)
formdata.append('thinkHdLev', values.thinkHdLev)
formdata.append('taskId', this.taskId)
majorAdd(`/majorapprove/add`,formdata)
.then(res => {
this.$toast.clear();
this.$toast.success({
message: "提交成功",
duration: 2000
});
history.go(-1);
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("提交失败,请稍后再试");
});
},
// 所属工程名称
......
src/views/danger/managerDanger/index.vue
View file @ 82ba47c2
......@@ -58,7 +58,7 @@
<script>
import LHeader from "@/components/header.vue";
import { superviseSABList } from "@/service/danger";
import { superviseList } from "@/service/danger";
/*接口对接2 START*/
// 例子：
......@@ -102,7 +102,7 @@ export default {
loadingType: "spinner",
duration: 0
});
superviseSABList("/supervise/list")
superviseList("/supervise/list")
.then(res => {
this.$toast.clear();
this.messageList = res.data
......
src/views/danger/managerDanger/managerSurvey.vue
View file @ 82ba47c2
......@@ -10,7 +10,7 @@
<van-field
v-model="opinion"
label="批示内容"
name="reviewDetails"
name="instructionsContent"
rows="3"
type="textarea"
placeholder="请输入"
......@@ -31,7 +31,7 @@
<script>
import LHeader from "@/components/header.vue";
import { dangerReviewAdd } from "@/service/danger";
import { superviseAdd } from "@/service/danger";
export default {
components: {
LHeader
......@@ -57,22 +57,21 @@ export default {
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("提交失败,请稍后再试");
// });
let formdata = new FormData()
formdata.append('instructionsContent', values.instructionsContent)
superviseAdd(`/instructions/add`,formdata)
.then(res => {
this.$toast.clear();
this.$toast.success({
message: "提交成功",
duration: 2000
});
history.go(-1);
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("提交失败,请稍后再试");
});
},
cancel() {
......
src/views/danger/superviseDanger/index.vue
View file @ 82ba47c2
......@@ -55,7 +55,7 @@
<script>
import LHeader from "@/components/header.vue";
import { superviseList } from "@/service/danger";
import { superviseSABlist } from "@/service/danger";
/*接口对接2 START*/
// 例子：
......@@ -91,9 +91,28 @@ export default {
},
methods: {
getList() {
/*接口对接3 START*/
/*接口对接3 END*/
this.$toast.loading({
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
});
superviseSABlist("/supervise/SABlist")
.then(res => {
this.$toast.clear();
this.messageList = res.data
// 判断有无数据返回
if (this.messageList.length == 0) {
this.isHaveNews = true;
}
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试");
});
},
onSearch(val) {
console.log(val);
},
......
src/views/danger/superviseDanger/superSurvey.vue
View file @ 82ba47c2
......@@ -7,16 +7,14 @@
:scroll-to-error="true"
validate-trigger="onSubmit"
>
<div class="agree" v-if="radio == 1">
<van-field
v-model="opinion"
label="批示内容"
name="reviewDetails"
name="superviseAdd"
rows="3"
type="textarea"
placeholder="请输入"
/>
</div>
<div style="margin: 16px;">
<van-button round block type="info" native-type="submit"
>保存</van-button
......@@ -33,7 +31,7 @@
<script>
import LHeader from "@/components/header.vue";
import { dangerReviewAdd } from "@/service/danger";
import { superviseAdd } from "@/service/danger";
export default {
components: {
LHeader
......@@ -59,22 +57,21 @@ export default {
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("提交失败,请稍后再试");
// });
let formdata = new FormData()
formdata.append('instructionsContent', values.instructionsContent)
superviseAdd(`/instructions/add`,formdata)
.then(res => {
this.$toast.clear();
this.$toast.success({
message: "提交成功",
duration: 2000
});
history.go(-1);
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("提交失败,请稍后再试");
});
},
cancel() {
......
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