From 33fecfe3cfe368fea8f82bfcea3a4e8e20fee38b Mon Sep 17 00:00:00 2001
From: zhoucong <123456>
Date: 星期二, 10 五月 2022 10:32:00 +0800
Subject: [PATCH] fix
---
src/views/hiddenDangerReview/recheckHiddenDangerList.vue | 2
src/views/hiddenDangerRectification/sendHiddenDangerList.vue | 172 ++++++++++++++++++++++++++++----------------------------
2 files changed, 87 insertions(+), 87 deletions(-)
diff --git a/src/views/hiddenDangerRectification/sendHiddenDangerList.vue b/src/views/hiddenDangerRectification/sendHiddenDangerList.vue
index d7706e0..bd318b2 100644
--- a/src/views/hiddenDangerRectification/sendHiddenDangerList.vue
+++ b/src/views/hiddenDangerRectification/sendHiddenDangerList.vue
@@ -44,7 +44,7 @@
<el-col :span="9">
<el-form-item label="检查时间" prop="name">
<el-date-picker
- v-model="check_date"
+ v-model="ruleForm.check_date"
type="date"
:disabled="true"
placeholder="选择日期"
@@ -180,7 +180,7 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="完成时间" prop="name">
+ <el-form-item label="完成时间" prop="ACCOMPLISHTIME">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="ruleForm.ACCOMPLISHTIME"
@@ -268,19 +268,19 @@
border
style="width: 100%">
<el-table-column
- prop="date"
+ type="index"
label="步骤"
align="center"
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">
@@ -290,9 +290,16 @@
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="scope.row.url+'/'+item">
+ {{ item.split("fileName=")[1] }}
+ </a>
+ </template>
</el-table-column>
<el-table-column
- prop="address"
+ prop="ispass"
label="流程信息"
align="center"
width="170">
@@ -310,22 +317,39 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="是否发送" prop="name">
- <el-radio-group v-model="ruleForm.safetyInspectionItemResult">
- <el-radio :label="0">通过</el-radio>
- <el-radio :label="1">不通过</el-radio>
+ <el-form-item label="申请复查" prop="name">
+ <el-radio-group v-model="ispass">
+ <el-radio :label="0" checked>申请复查</el-radio>
+ <el-radio :label="1">不接受,返回{{ruleForm.check_main_branch}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<div
- v-if="ruleForm.safetyInspectionItemResult == 0">
+ v-if="ispass == 0">
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="落实责任人" prop="duty_officer">
+ <el-input v-model="sendDataForm.duty_officer" ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
<el-row>
<el-col :span="9">
- <el-form-item label="复查时间" prop="reviewTime">
+ <el-form-item label="选择复查单位/人" prop="callback_branch">
+ <el-input v-model="ruleForm.callback_branch" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="完成时间" prop="ACCOMPLISHTIME">
<el-date-picker
- v-model="ruleForm.reviewTime"
+ v-model="sendDataForm.ACCOMPLISHTIME"
type="date"
+ value-format="yyyy-MM-dd"
placeholder="选择日期"
style="width: 100%">
</el-date-picker>
@@ -334,62 +358,21 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="复查人" prop="rechecker">
- <el-input v-model="ruleForm.rechecker" 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-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-form-item label="所需资金" prop="penalty_dy">
+ <el-input v-model="sendDataForm.penalty_dy" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
- <div
- v-else="ruleForm.safetyInspectionItemResult == 1">
- <el-row>
- <el-col :span="9">
- <el-form-item label="复查时间" prop="reviewTime">
- <el-date-picker
- v-model="ruleForm.reviewTime"
- type="date"
- placeholder="选择日期"
- style="width: 100%">
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="9">
- <el-form-item label="复查人" prop="rechecker">
- <el-input v-model="ruleForm.rechecker" 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-form-item label="备注" prop="dealContent">
+ <el-input class="textarea" type="textarea" v-model="sendDataForm.dealContent"></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-form-item>
- </el-col>
- </el-row>
- </div>
+
+
<el-row>
<el-col :span="22">
<el-form-item style="text-align: center;">
@@ -409,12 +392,22 @@
import Titlename from "../../components/Titlename/index.vue";
import {sendDangerNext, getDangerDetails, getWfRecordList} from "@/api/sgyhpczl/recheckCancellationNumber";
-
export default {
components: {Titlename},
name: "sendHiddenDangerList",
data() {
return {
+ sendDataForm: {
+ id: "",
+ step: "2",
+ ispass: "",
+ callback_branch:"",
+ ACCOMPLISHTIME: "",
+ penalty_dy: "",
+ realFileName: "",
+ dealContent: "",
+ },
+ ispass:0,
ruleForm: {
name: '',
region: '',
@@ -434,36 +427,15 @@
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: '已发送众泰煤焦化安全环保部',
- }],
+ tableData: [],
fileList: [],
// safetyInspectionItemResult:'0',
};
},
mounted() {
this.getDangerDetails();
+ this.getWfRecordList()
},
methods: {
getDangerDetails() {
@@ -472,6 +444,8 @@
if (data.ok) {
this.ruleForm = data.data;
this.ruleForm.url = process.env.BASE_API;
+ this.ruleForm.callback_branch= data.data.check_main_branch
+ //this.ruleForm.ispass=0
this.sendDataForm.id = this.ruleForm.id
} else {
this.$message({type: 'error', message: "数据查询失败，请重试！", duration: 3000})
@@ -489,14 +463,40 @@
})
},
submitForm(formName) {
- this.$refs[formName].validate((valid) => {
+ if(this.ispass==0){
+ if(this.sendDataForm.duty_officer==null || this.sendDataForm.duty_officer==""){
+ this.$message({type: 'error', message: "请输入落实责任人", duration: 3000})
+ return
+ }
+ if(this.sendDataForm.ACCOMPLISHTIME==null || this.sendDataForm.ACCOMPLISHTIME==""){
+ this.$message({type: 'error', message: "请选择完成时间", duration: 3000})
+ return
+ }
+ this.sendDataForm.ispass="申请复查"
+ }
+ if(this.ispass==1){
+ this.sendDataForm.ispass="不接受,返回"+this.ruleForm.check_main_branch
+ }
+ this.sendDataForm.callback_branch=this.ruleForm.check_main_branch
+ sendDangerNext(this.sendDataForm).then(res => {
+ var msg = res.data.msg;
+ if (res.data.ok) {
+ this.$router.push({
+ path:"/hiddenDangerRectification",
+ })
+ this.$message({type: 'success', message: msg, duration: 3000})
+ } else {
+ this.$message({type: 'error', message: msg, duration: 3000})
+ }
+ })
+ /*this.$refs[formName].validate((valid) => {
if (valid) {
alert('submit!');
} else {
console.log('error submit!!');
return false;
}
- });
+ });*/
},
handleRemove(file, fileList) {
console.log(file, fileList);
diff --git a/src/views/hiddenDangerReview/recheckHiddenDangerList.vue b/src/views/hiddenDangerReview/recheckHiddenDangerList.vue
index 183fa5c..95ccbae 100644
--- a/src/views/hiddenDangerReview/recheckHiddenDangerList.vue
+++ b/src/views/hiddenDangerReview/recheckHiddenDangerList.vue
@@ -272,7 +272,7 @@
border
style="width: 100%">
<el-table-column
- prop="date"
+ type="index"
label="步骤"
align="center"
width="60">
--
Gitblit v1.9.2