From 861ffa46e91d5294ebb6660561fc0acddcd17a69 Mon Sep 17 00:00:00 2001
From: cqf <2252655793@qq.com>
Date: 星期一, 09 五月 2022 08:24:24 +0800
Subject: [PATCH] 众泰接口对接
---
src/api/sgyhpczl/hiddenDangerRectification.js | 26 +
src/views/hiddenDangerReview/recheckHiddenDangerList.vue | 327 +++++++++--------
src/views/hiddenDangerReview/recheckCancellationNumber.vue | 5
src/views/hiddenDangerRectification/index.vue | 642 ++++++++++++++++++++---------------
src/api/sgyhpczl/recheckCancellationNumber.js | 43 ++
5 files changed, 609 insertions(+), 434 deletions(-)
diff --git a/src/api/sgyhpczl/hiddenDangerRectification.js b/src/api/sgyhpczl/hiddenDangerRectification.js
index 914812c..476006b 100644
--- a/src/api/sgyhpczl/hiddenDangerRectification.js
+++ b/src/api/sgyhpczl/hiddenDangerRectification.js
@@ -75,3 +75,29 @@
data
});
}
+export function uploadFile(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/file/upload_do",
+ contentType: "multipart/form-data",
+ method: 'POST',
+ data,
+ });
+}
+
+//保存延期申请
+export function saveDelayApply(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/danger/delay_do",
+ contentType: "application/json",
+ method: 'POST',
+ data,
+ });
+}
diff --git a/src/api/sgyhpczl/recheckCancellationNumber.js b/src/api/sgyhpczl/recheckCancellationNumber.js
index 5a99ec2..5287585 100644
--- a/src/api/sgyhpczl/recheckCancellationNumber.js
+++ b/src/api/sgyhpczl/recheckCancellationNumber.js
@@ -83,3 +83,46 @@
data
});
}
+
+//保存延期申请
+export function sendDangerNext(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/danger/next_step_do",
+ contentType: "application/json",
+ method: 'POST',
+ data,
+ });
+}
+
+//隐患详情
+export function getDangerDetails(id) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/danger/danger_info?id="+id,
+ contentType: "application/json",
+ method: 'GET',
+ });
+}
+
+//查询审批记录
+export function getWfRecordList(id) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "taboi/user/wf_record_list?id="+id,
+ contentType: "application/json",
+ method: 'GET',
+ });
+}
+
+// /taboi/file/dowloand_do?type=0&fileName=自查隐患管理表_453929676.xls
+
diff --git a/src/views/hiddenDangerRectification/index.vue b/src/views/hiddenDangerRectification/index.vue
index c57ca8d..1fb3457 100644
--- a/src/views/hiddenDangerRectification/index.vue
+++ b/src/views/hiddenDangerRectification/index.vue
@@ -5,7 +5,7 @@
<el-input v-model="listQuery.form.number" style="width:202px" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="检查单位">
- <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择" @change="changeJCDW">
+ <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择" @change="changeJCDW">
<el-option
v-for="item in JCDWList"
:key="item.value"
@@ -117,59 +117,64 @@
</el-form-item>-->
<el-form-item label="检查时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart"
+ style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd"
+ style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item label="限改时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart"
+ value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd"
+ value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item style="text-align:center;padding:0 50px">
- <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询</el-button>
+ <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询
+ </el-button>
<el-button type="primary" class="btns" size="small" @click="reset()">重置</el-button>
<el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
</el-form-item>
</el-form>
<el-row class="title-center">
- <el-col :span="24" style="text-align:right;">
- <el-button class="btns" type="primary" size="small" @click="dialogVisible=true">申请延期</el-button>
+ <el-col :span="24" style="text-align:right;">
+ <el-button class="btns" type="primary" size="small" @click="applyDelay()">申请延期</el-button>
</el-col>
</el-row>
- <el-table :data="tableData" style="width: 100%">
+ <el-table :data="tableData" ref="dangerRectificationTable" style="width: 100%">
<el-table-column type="selection" width="55" align="center"></el-table-column>
- <el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
- <el-table-column prop="check_branch" label="检查部门" align="center" width="120"></el-table-column>
- <el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
+ <el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
+ <el-table-column prop="check_branch" label="检查部门" align="center" width="120"></el-table-column>
+ <el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
<el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
<el-table-column label="隐患项目" align="center">
- <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
- <el-table-column prop="address" label="地点" align="center"> </el-table-column>
- <el-table-column prop="ht_content" label="内容" align="center"> </el-table-column>
- <el-table-column prop="ht_typesub" label="类别" align="center"> </el-table-column>
- <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column>
+ <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="address" label="地点" align="center"></el-table-column>
+ <el-table-column prop="ht_content" label="内容" align="center"></el-table-column>
+ <el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
+ <el-table-column prop="ht_level" label="级别" align="center"></el-table-column>
</el-table-column>
<el-table-column label="整改计划" align="center">
- <el-table-column prop="measure" label="整改措施" align="center"> </el-table-column>
- <el-table-column prop="ht_branch" label="隐患部门" align="center"> </el-table-column>
- <el-table-column prop="duty_officer" label="责任人" align="center"> </el-table-column>
- <el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="measure" label="整改措施" align="center"></el-table-column>
+ <el-table-column prop="ht_branch" label="隐患部门" align="center"></el-table-column>
+ <el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
+ <el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column>
</el-table-column>
<el-table-column label="整改情况" align="center">
- <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="120" align="center"> </el-table-column>
- <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"> </el-table-column>
- <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"> </el-table-column>
- <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column>
+ <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
+ <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column>
</el-table-column>
- <el-table-column label="隐患处理状态" align="center">
+ <el-table-column label="隐患处理状态" align="center">
<template slot-scope="scope">
<span v-if="scope.row.step =='1'">初始状态</span>
<span v-if="scope.row.step =='2'">整改中</span>
@@ -177,10 +182,10 @@
<span v-if="scope.row.step =='end'">处理结束</span>
</template>
</el-table-column>
- <el-table-column prop="date" label="是否关联" align="center"> </el-table-column>
- <el-table-column prop="DTRisk_level" label="风险等级" align="center"> </el-table-column>
- <el-table-column prop="warningLevel" label="初始警情" align="center"> </el-table-column>
- <el-table-column prop="curWarningLevel" label="当前警情" align="center"> </el-table-column>
+ <el-table-column prop="date" label="是否关联" align="center"></el-table-column>
+ <el-table-column prop="DTRisk_level" label="风险等级" align="center"></el-table-column>
+ <el-table-column prop="warningLevel" label="初始警情" align="center"></el-table-column>
+ <el-table-column prop="curWarningLevel" label="当前警情" align="center"></el-table-column>
<el-table-column prop="date" label="流程操作" align="center">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
@@ -194,14 +199,15 @@
:close-on-click-modal="false"
width="30%"
:before-close="handleClose">
- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+ <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="16" :offset="3">
- <el-form-item label="申请限改时间" prop="name">
+ <el-form-item label="申请限改时间" prop="application_time">
<el-date-picker
- v-model="value1"
+ v-model="ruleForm.application_time"
+ :picker-options="pickerOptions"
type="date"
- :disabled="true"
+ :disabled="false"
placeholder="选择日期"
style="width: 100%">
</el-date-picker>
@@ -214,12 +220,13 @@
<el-upload
class="upload-demo"
ref="upload"
- action="https://jsonplaceholder.typicode.com/posts/"
+ :http-request="uploadSectionFile"
:on-preview="handlePreview"
:on-remove="handleRemove"
:file-list="fileList"
:before-upload="beforeUpload"
- :auto-upload="true">
+ :auto-upload="true"
+ >
<el-button slot="trigger" size="small" type="primary" class="btns">选择文件</el-button>
<div slot="tip" class="el-upload__tip">只能上传.jpg,.gif,.bmp,.png,.jpeg格式的图片</div>
</el-upload>
@@ -229,12 +236,12 @@
<el-row>
<el-col :span="16" :offset="3">
<el-form-item label="备注" prop="desc">
- <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></el-input>
+ <el-input class="textarea" type="textarea" v-model="ruleForm.remark"></el-input>
</el-form-item>
</el-col>
</el-row>
<div style="text-align: center">
- <el-button class="btns" size="small" type="primary" @click="dialogVisible = false">保存</el-button>
+ <el-button class="btns" size="small" type="primary" @click="applyDelaySave()">保存</el-button>
<el-button size="small" @click="dialogVisible = false">关闭</el-button>
</div>
</el-form>
@@ -256,254 +263,329 @@
</div>
</template>
<script>
- import {getPageList} from "@/api/sgyhpczl/hiddenDangerRectification";
- import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
- export default {
- data() {
- return {
- reList:[{label:"未关联",value:0}],
- options: [],
- form:{},
- value1:"",
- llrList:[],
- JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}],
- JCBMList:[],
- YHLXList:[],
- BCList:[],
- JCLBList:[],
- YHBMList:[],
- YHJBList:[],
- tableData: [],
- listQuery:{
- page:1,
- limit:10,
- form:{
- ht_community:"众泰煤焦化"
- },
+import {getPageList, uploadFile, saveDelayApply} from "@/api/sgyhpczl/hiddenDangerRectification";
+import {initJCBM, initYHLX, initBC, initJCLB, initYHBM, initYHJB, initLlr} from "@/api/sgyhpczl/initSelect";
+
+export default {
+ data() {
+ return {
+ reList: [{label: "未关联", value: 0}],
+ options: [],
+ form: {},
+ value1: "",
+ llrList: [],
+ JCDWList: [{label: "众泰煤焦化", value: 0}, {label: "上级单位", value: 1}],
+ JCBMList: [],
+ YHLXList: [],
+ BCList: [],
+ JCLBList: [],
+ YHBMList: [],
+ YHJBList: [],
+ tableData: [],
+ listQuery: {
+ page: 1,
+ limit: 10,
+ form: {
+ ht_community: "众泰煤焦化"
},
+ },
- dialogVisible: false,
- ruleForm: {
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- value1: '',
- desc: ''
+ dialogVisible: false,
+ ruleForm: {
+ application_time: "",
+ remark: "",
+ realFileName: "",
+ id: "",
+ },
+ rules: {
+ application_time: [{required: true, message: '申请限改时间不能为空', trigger: 'blur'}],
+ },
+ fileList: [],
+ currentPage: 1,
+ pageSize: 10,
+ recordTotal: 0,
+ pickerOptions: { //禁用当前日期之前的日期
+ disabledDate(time) {
+ //Date.now()是javascript中的内置函数，它返回自1970年1月1日00:00:00 UTC以来经过的毫秒数。
+ return time.getTime() < Date.now() - 8.64e7;
},
- rules: {},
- fileList: [],
- currentPage: 1,
- pageSize: 10,
- recordTotal: 0,
- };
- },
- mounted(){
- this.getPageList()
- this.initYHLX()
- this.initYHJB()
- this.initBC()
- this.initJCLB()
- this.initLlr()
- this.initYHBM()
- },
+ },
+ };
+ },
+ mounted() {
+ this.getPageList()
+ this.initYHLX()
+ this.initYHJB()
+ this.initBC()
+ this.initJCLB()
+ this.initLlr()
+ this.initYHBM()
+ },
- methods:{
- initLlr(){
- initLlr().then(res=>{
- if (res.data.ok==1){
- this.llrList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initYHBM(val){
- initYHBM().then(res=>{
- if (res.data.ok==1){
- this.YHBMList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- changeJCDW(val){
- initJCBM(val).then(res=>{
- if (res.data.ok==1){
- this.JCBMList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- checkTime(){
- if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
- if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
- }else {
- this.$message({type:'error', message:"请选择检查结束时间", duration:3000})
- return
- }
-
+ watch: {
+ dialogVisible(nval, oval) {
+ //弹框关闭，重置值
+ if (!nval) {
+ this.fileList = [];
+ this.ruleForm = {
+ application_time: "",
+ remark: "",
+ realFileName: "",
+ id: "",
}
- if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
- if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
- }else {
- this.$message({type:'error', message:"请选择检查开始时间", duration:3000})
- return
- }
- }
- if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
- if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
- }else {
- this.$message({type:'error', message:"请选择限改结束时间", duration:3000})
- return
- }
-
- }
- if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
- if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
- }else {
- this.$message({type:'error', message:"请选择改开始时间", duration:3000})
- return
- }
- }
- },
- getPageList(){
- this.listQuery.page=1
- this.checkTime()
- getPageList(this.listQuery).then(res=>{
- if (res.data.ok==1) {
- this.tableData = res.data.data.items
- this.recordTotal=res.data.data.total
- }else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- reset(){
- this.listQuery.form={ht_community:"众泰煤焦化"}
- this.getPageList()
- },
- handleSizeChange(val){
- this.listQuery.limit = val
- this.getPageListForPagination();
- },
- handleCurrentChange(val){
- this.listQuery.page = val
- this.getPageListForPagination();
- },
- getPageListForPagination(){
- this.checkTime()
- getPageList(this.listQuery).then(res=>{
- if (res.data.ok==1) {
- this.tableData = res.data.data.items
- this.recordTotal=res.data.data.total
- }else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initYHLX(){
- initYHLX().then(res=>{
- if (res.data.ok==1){
- this.YHLXList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initYHJB(){
- initYHJB().then(res=>{
- if (res.data.ok==1){
- this.YHJBList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initBC(){
- initBC().then(res=>{
- if (res.data.ok==1){
- this.BCList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initJCLB(){
- initJCLB().then(res=>{
- if (res.data.ok==1){
- this.JCLBList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
-
-
- // 发送隐患单跳转
-
-
- handleClick(){
- this.$router.push({
- path:"/sendHiddenDangerList"
- })
- },
- handleClose(done) {
- this.$confirm('确认关闭？')
- .then(_ => {
- done();
- })
- .catch(_ => {});
- },
- handleRemove(file, fileList) {
- console.log(file, fileList)
- },
- handlePreview(file) {
- console.log(file)
- },
- beforeUpload(file) {
- var FileExt = file.name.replace(/.+\./, "");
- if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
- this.$message({
- type: 'warning',
- message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
- });
- return false;
- }
- },
+ }
}
- };
+ },
+ methods: {
+ initLlr() {
+ initLlr().then(res => {
+ if (res.data.ok == 1) {
+ this.llrList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ initYHBM(val) {
+ initYHBM().then(res => {
+ if (res.data.ok == 1) {
+ this.YHBMList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ changeJCDW(val) {
+ initJCBM(val).then(res => {
+ if (res.data.ok == 1) {
+ this.JCBMList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ checkTime() {
+ if (this.listQuery.form.check_dateStart != null && this.listQuery.form.check_dateStart != '') {
+ if (this.listQuery.form.check_dateEnd != null && this.listQuery.form.check_dateEnd != '') {
+ } else {
+ this.$message({type: 'error', message: "请选择检查结束时间", duration: 3000})
+ return
+ }
+
+ }
+ if (this.listQuery.form.check_dateEnd != null && this.listQuery.form.check_dateEnd != '') {
+ if (this.listQuery.form.check_dateStart != null && this.listQuery.form.check_dateStart != '') {
+ } else {
+ this.$message({type: 'error', message: "请选择检查开始时间", duration: 3000})
+ return
+ }
+ }
+ if (this.listQuery.form.alter_timeStart != null && this.listQuery.form.alter_timeStart != '') {
+ if (this.listQuery.form.alter_timeEnd != null && this.listQuery.form.alter_timeEnd != '') {
+ } else {
+ this.$message({type: 'error', message: "请选择限改结束时间", duration: 3000})
+ return
+ }
+
+ }
+ if (this.listQuery.form.alter_timeEnd != null && this.listQuery.form.alter_timeEnd != '') {
+ if (this.listQuery.form.alter_timeStart != null && this.listQuery.form.alter_timeStart != '') {
+ } else {
+ this.$message({type: 'error', message: "请选择改开始时间", duration: 3000})
+ return
+ }
+ }
+ },
+ getPageList() {
+ this.listQuery.page = 1
+ this.checkTime()
+ getPageList(this.listQuery).then(res => {
+ if (res.data.ok == 1) {
+ this.tableData = res.data.data.items
+ this.recordTotal = res.data.data.total
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ reset() {
+ this.listQuery.form = {ht_community: "众泰煤焦化"}
+ this.getPageList()
+ },
+ handleSizeChange(val) {
+ this.listQuery.limit = val
+ this.getPageListForPagination();
+ },
+ handleCurrentChange(val) {
+ this.listQuery.page = val
+ this.getPageListForPagination();
+ },
+ getPageListForPagination() {
+ this.checkTime()
+ getPageList(this.listQuery).then(res => {
+ if (res.data.ok == 1) {
+ this.tableData = res.data.data.items
+ this.recordTotal = res.data.data.total
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ initYHLX() {
+ initYHLX().then(res => {
+ if (res.data.ok == 1) {
+ this.YHLXList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ initYHJB() {
+ initYHJB().then(res => {
+ if (res.data.ok == 1) {
+ this.YHJBList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ initBC() {
+ initBC().then(res => {
+ if (res.data.ok == 1) {
+ this.BCList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ initJCLB() {
+ initJCLB().then(res => {
+ if (res.data.ok == 1) {
+ this.JCLBList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+
+
+ // 发送隐患单跳转
+
+
+ handleClick() {
+ this.$router.push({
+ path: "/sendHiddenDangerList"
+ })
+ },
+ handleClose(done) {
+ this.$confirm('确认关闭？')
+ .then(_ => {
+ done();
+ })
+ .catch(_ => {
+ });
+ },
+ handleRemove(file, fileList) {
+ console.log(file, fileList)
+ },
+ handlePreview(file) {
+ console.log(file)
+ },
+ beforeUpload(file) {
+ var FileExt = file.name.replace(/.+\./, "");
+ if (['jpg', 'png', 'bmp', 'gif', 'jpeg'].indexOf(FileExt.toLowerCase()) === -1) {
+ this.$message({
+ type: 'warning',
+ message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
+ });
+ return false;
+ }
+ },
+ applyDelay() {
+ var selectDataList = this.$refs.dangerRectificationTable.selection;
+ if (selectDataList.length != 1) {
+ this.$message({
+ type: 'warning',
+ message: '请选择一条数据！'
+ });
+ return false;
+ } else {
+ this.ruleForm.id = selectDataList[0].id;
+ console.log(this.ruleForm)
+ this.dialogVisible = true;
+ }
+ },
+ applyDelaySave() {
+ this.$refs["ruleForm"].validate((valid) => {
+ if (valid) {
+ saveDelayApply(this.ruleForm).then(res => {
+ this.dialogVisible = false;
+ this.$message({
+ type: 'success',
+ message: '保存成功！'
+ });
+ this.getPageList();
+ })
+ }
+ })
+ },
+ uploadSectionFile(param) {
+ let form = new FormData();
+ var that = this;
+ form.append('file', param.file);
+ //隐患延期申请附件
+ form.append('type', "0");
+ uploadFile(form).then(res => {
+ var data = res.data;
+ if (data.ok) {
+ var fileName = data.data.fileName[0];
+ if (!fileName.endsWith("a62b")) {
+ fileName = fileName + param.file.realFileName;
+ }
+ that.ruleForm.realFileName = that.ruleForm.realFileName + "," + fileName;
+ }
+ }).error(res => {
+ this.$message({
+ type: 'error',
+ message: '附件上传失败，请重试！'
+ });
+ })
+ },
+ }
+};
</script>
<style>
- .inquire{
- display: flex;
- justify-content:left;
- flex-wrap: wrap;
- }
- .inquire .el-form-item{
- padding: 0 46px;
- }
- .title-center{
- padding: 20px 0;
- }
- .btns {
- background-color: #034ea2;
- border: 1px solid #034ea2;
- }
- /deep/ .el-dialog .el-textarea__inner{
- height: 80px;
- max-height: 80px;
- overflow-y: auto
- }
- /deep/.el-dialog .button .el-form-item__content{
- margin-left: 0;
- }
- .textarea{
- max-height: 70px;
- overflow-y: auto;
- }
+.inquire {
+ display: flex;
+ justify-content: left;
+ flex-wrap: wrap;
+}
+
+.inquire .el-form-item {
+ padding: 0 46px;
+}
+
+.title-center {
+ padding: 20px 0;
+}
+
+.btns {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
+
+/deep/ .el-dialog .el-textarea__inner {
+ height: 80px;
+ max-height: 80px;
+ overflow-y: auto
+}
+
+/deep/ .el-dialog .button .el-form-item__content {
+ margin-left: 0;
+}
+
+.textarea {
+ max-height: 70px;
+ overflow-y: auto;
+}
</style>
diff --git a/src/views/hiddenDangerReview/recheckCancellationNumber.vue b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
index a38f044..11be15b 100644
--- a/src/views/hiddenDangerReview/recheckCancellationNumber.vue
+++ b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
@@ -381,9 +381,10 @@
},
// 发送隐患单跳转
- handleClick(){
+ handleClick(row){
this.$router.push({
- path:"/recheckHiddenDangerList"
+ path:"/recheckHiddenDangerList",
+ query:{"id":row.id}
})
},
}
diff --git a/src/views/hiddenDangerReview/recheckHiddenDangerList.vue b/src/views/hiddenDangerReview/recheckHiddenDangerList.vue
index 65c83af..ecff40c 100644
--- a/src/views/hiddenDangerReview/recheckHiddenDangerList.vue
+++ b/src/views/hiddenDangerReview/recheckHiddenDangerList.vue
@@ -8,13 +8,13 @@
<el-row>
<el-col :span="9">
<el-form-item label="隐患编号" prop="name">
- <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ <el-input v-model="ruleForm.number" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
<el-form-item label="检查单位" prop="elementAName">
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.check_main_branch"
:disabled="true"
style="width: 100%"
>
@@ -25,7 +25,7 @@
<el-row>
<el-col :span="9">
<el-form-item label="检查人" prop="region">
- <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ <el-input v-model="ruleForm.check_man" :disabled="true"></el-input>
<!-- <el-select-->
<!-- v-model="ruleForm.elementAName"-->
<!-- :disabled="true"-->
@@ -36,7 +36,7 @@
</el-col>
<el-col :span="9" :offset="4">
<el-form-item label="陪检人员" prop="name">
- <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ <el-input v-model="ruleForm.acc_man" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -44,7 +44,7 @@
<el-col :span="9">
<el-form-item label="检查时间" prop="name">
<el-date-picker
- v-model="value1"
+ v-model="ruleForm.check_date"
type="date"
:disabled="true"
placeholder="选择日期"
@@ -58,7 +58,7 @@
<!-- </el-form-item>-->
<el-form-item label="班次" prop="elementAName">
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.check_class"
:disabled="true"
style="width: 100%"
>
@@ -69,19 +69,20 @@
<el-row>
<el-col :span="9">
<el-form-item label="跟班、带班情况" prop="name">
- <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ <el-input v-model="ruleForm.class_situation" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
<el-form-item label="跟班、带班人员" prop="name">
- <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ <el-input v-model="ruleForm.class_man" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="行走路线" prop="name">
- <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-input type="textarea" v-model="ruleForm.route" class="multiline"
+ :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -90,7 +91,7 @@
<el-form-item label="隐患单位" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.ht_community"
:disabled="true"
style="width: 100%"
>
@@ -101,7 +102,7 @@
<el-form-item label="隐患部门" prop="name">
<!-- <el-input v-model="ruleForm.name"></el-input>-->
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.ht_branch"
:disabled="true"
style="width: 100%"
>
@@ -112,14 +113,16 @@
<el-row>
<el-col :span="22">
<el-form-item label="隐患地点" prop="name">
- <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-input type="textarea" v-model="ruleForm.address" class="multiline"
+ :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="隐患内容" prop="name">
- <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-input type="textarea" v-model="ruleForm.ht_content" class="multiline"
+ :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -128,7 +131,7 @@
<el-form-item label="隐患类别" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.ht_typesub"
:disabled="true"
style="width: 100%"
>
@@ -139,7 +142,7 @@
<el-form-item label="隐患级别" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.ht_level"
:disabled="true"
style="width: 100%"
>
@@ -150,7 +153,7 @@
<el-row>
<el-col :span="9">
<el-form-item label="整改措施" prop="name">
- <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ <el-input v-model="ruleForm.measure" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
@@ -164,7 +167,7 @@
<el-form-item label="限改时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
- v-model="value1"
+ v-model="ruleForm.alter_time"
type="date"
:disabled="true"
placeholder="选择日期"
@@ -174,7 +177,7 @@
</el-col>
<el-col :span="9" :offset="4">
<el-form-item label="责任人" prop="name">
- <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ <el-input v-model="ruleForm.duty_officer" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -183,7 +186,7 @@
<el-form-item label="完成时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
- v-model="value1"
+ v-model="ruleForm.ACCOMPLISHTIME"
type="date"
:disabled="true"
placeholder="选择日期"
@@ -202,7 +205,7 @@
<el-form-item label="复查时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
- v-model="value1"
+ v-model="ruleForm.CALLBACKTIME"
type="date"
:disabled="true"
placeholder="选择日期"
@@ -212,26 +215,27 @@
</el-col>
<el-col :span="9" :offset="4">
<el-form-item label="复查人" prop="name">
- <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ <el-input v-model="ruleForm.CALLBACKPERSON" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
<el-form-item label="复查结果" prop="name">
- <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ <el-input v-model="ruleForm.CALLBACKRESULT" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
<el-form-item label="整改次数" prop="name">
- <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ <el-input v-model="ruleForm.amendnum" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="危险源" prop="name">
- <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-input type="textarea" v-model="ruleForm.dangerousSource" class="multiline"
+ :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -240,7 +244,7 @@
<el-form-item label="风险等级" prop="name">
<!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.DTRisk_level"
:disabled="true"
style="width: 100%"
>
@@ -251,7 +255,7 @@
<el-form-item label="业务科室" prop="name">
<!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.Review"
:disabled="true"
style="width: 100%"
>
@@ -274,25 +278,32 @@
width="60">
</el-table-column>
<el-table-column
- prop="name"
+ prop="realname"
label="操作人"
align="center"
width="138">
</el-table-column>
<el-table-column
- prop="province"
+ prop="create_time"
label="处理时间"
align="center"
width="200">
</el-table-column>
<el-table-column
- prop="city"
+ prop="content"
label="审批意见"
align="center"
width="260">
+ <template slot-scope="scope">
+ <span size="medium">{{ scope.row.content }}</span>
+ <a v-for="item in scope.row.realFileName"
+ :href="process.env.BASE_API+'/'+item">
+ {{ item.split("fileName=")[1] }}
+ </a>
+ </template>
</el-table-column>
<el-table-column
- prop="address"
+ prop="ispass"
label="流程信息"
align="center"
width="170">
@@ -304,14 +315,15 @@
<el-row>
<el-col :span="22">
<el-form-item label="发送流程" prop="name">
- <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline"
+ :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="是否发送" prop="name">
- <el-radio-group v-model="ruleForm.safetyInspectionItemResult">
+ <el-radio-group v-model="ruleForm.ispass">
<el-radio :label="0">通过</el-radio>
<el-radio :label="1">不通过</el-radio>
</el-radio-group>
@@ -324,7 +336,7 @@
<el-col :span="9">
<el-form-item label="复查时间" prop="reviewTime">
<el-date-picker
- v-model="ruleForm.reviewTime"
+ v-model="ruleForm.CALLBACKTIME"
type="date"
placeholder="选择日期"
style="width: 100%">
@@ -335,21 +347,22 @@
<el-row>
<el-col :span="9">
<el-form-item label="复查人" prop="rechecker">
- <el-input v-model="ruleForm.rechecker" clearable></el-input>
+ <el-input v-model="ruleForm.CALLBACKPERSON" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="复查结果" prop="reviewResults">
- <el-input class="textarea2" type="textarea" clearable v-model="ruleForm.reviewResults"></el-input>
+ <el-input class="textarea2" type="textarea" clearable
+ v-model="ruleForm.CALLBACKRESULT"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="备注" prop="desc">
- <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></el-input>
+ <el-input class="textarea" type="textarea" v-model="ruleForm.dealContent"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -360,7 +373,7 @@
<el-col :span="9">
<el-form-item label="复查时间" prop="reviewTime">
<el-date-picker
- v-model="ruleForm.reviewTime"
+ v-model="ruleForm.CALLBACKTIME"
type="date"
placeholder="选择日期"
style="width: 100%">
@@ -371,21 +384,22 @@
<el-row>
<el-col :span="9">
<el-form-item label="复查人" prop="rechecker">
- <el-input v-model="ruleForm.rechecker" clearable></el-input>
+ <el-input v-model="ruleForm.CALLBACKPERSON" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="复查结果" prop="reviewResults">
- <el-input class="textarea2" type="textarea" v-model="ruleForm.reviewResults1"></el-input>
+ <el-input class="textarea2" type="textarea"
+ v-model="ruleForm.CALLBACKRESULT"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="备注" prop="desc1">
- <el-input class="textarea" type="textarea" v-model="ruleForm.desc1"></el-input>
+ <el-input class="textarea" type="textarea" v-model="ruleForm.dealContent"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -393,7 +407,8 @@
<el-row>
<el-col :span="22">
<el-form-item style="text-align: center;">
- <el-button class="btn" size="small" type="primary" @click="submitForm('ruleForm')">保存</el-button>
+ <el-button class="btn" size="small" type="primary" @click="submitForm('ruleForm')">保存
+ </el-button>
<el-button size="small" @click="close()">关闭</el-button>
</el-form-item>
</el-col>
@@ -406,127 +421,135 @@
</template>
<script>
- import Titlename from "../../components/Titlename/index.vue";
+import Titlename from "../../components/Titlename/index.vue";
+import {sendDangerNext, getDangerDetails, getWfRecordList} from "@/api/sgyhpczl/recheckCancellationNumber";
- export default {
- components: {Titlename},
- name: "recheckHiddenDangerList",
- data() {
- return {
- ruleForm: {
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- value1: '',
- desc: '',
- rechecker:'',
- reviewTime:'',
- reviewResults:'',
- rechecker1:'',
- reviewTime1:'',
- reviewResults1:'',
- desc1:''
- },
- rules: {
- reviewTime: { required: true, message: '请填写复查时间', trigger: 'blur' },
- rechecker: { required: true, message: '请填写复查人', trigger: 'blur' },
- reviewResults: { required: true, message: '请填写复查结果', trigger: 'blur' },
- desc1: { required: true, message: '复查不通过时请在备注说明原因！', trigger: 'blur' },
- },
- tableData: [{
- date: ' 1',
- name: '超级管理员',
- province: '2022-04-07 16:10:27',
- city: '',
- address: '已发送众泰煤焦化安全环保部',
- }, {
- date: ' 1',
- name: '超级管理员',
- province: '2022-04-07 16:10:27',
- city: '',
- address: '已发送众泰煤焦化安全环保部',
- }, {
- date: ' 1',
- name: '超级管理员',
- province: '2022-04-07 16:10:27',
- city: '',
- address: '已发送众泰煤焦化安全环保部',
- }],
- fileList: [],
- // safetyInspectionItemResult:'0',
- };
+export default {
+ components: {Titlename},
+ name: "recheckHiddenDangerList",
+ data() {
+ return {
+ ruleForm: {
+ id: "",
+ step: "3",
+ ispass: "",
+ CALLBACKTIME: "",
+ CALLBACKPERSON: "",
+ CALLBACKRESULT: "",
+ dealContent: "",
+ },
+ rules: {
+ CALLBACKTIME: {required: true, message: '请填写复查时间', trigger: 'blur'},
+ CALLBACKPERSON: {required: true, message: '请填写复查人', trigger: 'blur'},
+ CALLBACKRESULT: {required: true, message: '请填写复查结果', trigger: 'blur'},
+ dealContent: {required: true, message: '复查不通过时请在备注说明原因！', trigger: 'blur'},
+ },
+ tableData: [],
+ fileList: [],
+ // safetyInspectionItemResult:'0',
+ };
+ },
+ mounted() {
+ console.log(process.env.BASE_API)
+ this.getDangerDetails();
+ this.getWfRecordList();
+ },
+ methods: {
+ getDangerDetails() {
+ getDangerDetails(this.$route.query.id).then(res => {
+ var data = res.data;
+ if (data.ok) {
+ this.ruleForm = data.data;
+ console.log(this.ruleForm);
+ } else {
+ this.$message({type: 'error', message: "数据查询失败，请重试！", duration: 3000})
+ }
+ })
},
- methods: {
- submitForm(formName) {
- this.$refs[formName].validate((valid) => {
- if (valid) {
- alert('submit!');
- } else {
- console.log('error submit!!');
- return false;
- }
- });
- },
- handleRemove(file, fileList) {
- console.log(file, fileList);
- },
- handlePreview(file) {
- console.log(file);
- },
- beforeUpload(file) {
- var FileExt = file.name.replace(/.+\./, "");
- if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
- this.$message({
- type: 'warning',
- message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
- });
+ getWfRecordList() {
+ getWfRecordList(this.$route.query.id).then(res => {
+ var data = res.data;
+ if (data.ok) {
+ this.tableData = data.data;
+ } else {
+ this.$message({type: 'error', message: "数据查询失败，请重试！", duration: 3000})
+ }
+ })
+ },
+ submitForm(formName) {
+ console.log(this.ruleForm);
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ sendDangerNext(this.ruleForm).then(res => {
+
+ })
+ // alert('submit!');
+ } else {
+ console.log('error submit!!');
return false;
}
- },
- close(){
- this.$router.push({
- path:"/recheckCancellationNumber"
- })
+ });
+ },
+ handleRemove(file, fileList) {
+ console.log(file, fileList);
+ },
+ handlePreview(file) {
+ console.log(file);
+ },
+ beforeUpload(file) {
+ var FileExt = file.name.replace(/.+\./, "");
+ if (['jpg', 'png', 'bmp', 'gif', 'jpeg'].indexOf(FileExt.toLowerCase()) === -1) {
+ this.$message({
+ type: 'warning',
+ message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
+ });
+ return false;
}
+ },
+ close() {
+ this.$router.push({
+ path: "/recheckCancellationNumber"
+ })
}
}
+}
</script>
<style scoped>
- .app-container {
- padding: 20px;
- height: 850px;
- overflow-y: auto;
- }
+.app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
+}
- /deep/ .box {
- padding-top: 0;
- }
+/deep/ .box {
+ padding-top: 0;
+}
- /deep/ .multiline .el-input__inner {
- height: 62px;
- }
- /deep/ .textarea .el-textarea__inner{
- height: 80px;
- max-height: 80px;
- overflow-y: auto
- }
- /deep/ .textarea2 .el-textarea__inner{
- height: 100px;
- max-height: 100px;
- overflow-y: auto
- }
- .btn {
- background-color: #034ea2;
- border: 1px solid #034ea2;
- }
- /*.el-button:hover {*/
- /* background: #66b1ff;*/
- /* border-color: #66b1ff;*/
- /* color: #FFF;*/
- /*}*/
+/deep/ .multiline .el-input__inner {
+ height: 62px;
+}
+
+/deep/ .textarea .el-textarea__inner {
+ height: 80px;
+ max-height: 80px;
+ overflow-y: auto
+}
+
+/deep/ .textarea2 .el-textarea__inner {
+ height: 100px;
+ max-height: 100px;
+ overflow-y: auto
+}
+
+.btn {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
+
+/*.el-button:hover {*/
+/* background: #66b1ff;*/
+/* border-color: #66b1ff;*/
+/* color: #FFF;*/
+/*}*/
</style>
--
Gitblit v1.9.2