From ca7ec9812212102eb6a85a84a0bb5c13c3a14bd6 Mon Sep 17 00:00:00 2001
From: panzy <225@qq.com>
Date: 星期六, 14 五月 2022 12:12:38 +0800
Subject: [PATCH] 对接接口
---
src/views/hiddenDangerManagement/index.vue | 8 +-
src/views/delayHiddenDangerRectification/index.vue | 2
src/views/hiddenDangerManagement/fillRectificationAdd.vue | 96 ++++++++++---------------------
src/api/sgyhpczl/recheckCancellationNumber.js | 18 ++++++
4 files changed, 54 insertions(+), 70 deletions(-)
diff --git a/src/api/sgyhpczl/recheckCancellationNumber.js b/src/api/sgyhpczl/recheckCancellationNumber.js
index ac9bc16..f770b54 100644
--- a/src/api/sgyhpczl/recheckCancellationNumber.js
+++ b/src/api/sgyhpczl/recheckCancellationNumber.js
@@ -111,6 +111,22 @@
});
}
+
+
+//自查隐患详情
+export function self_info(id) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/danger/self_info?id="+id,
+ contentType: "application/json",
+ method: 'GET',
+ });
+}
+
+
//查询审批记录
export function getWfRecordList(id) {
return request({
@@ -124,5 +140,7 @@
});
}
+
+
// /taboi/file/dowloand_do?type=0&fileName=自查隐患管理表_453929676.xls
diff --git a/src/views/delayHiddenDangerRectification/index.vue b/src/views/delayHiddenDangerRectification/index.vue
index 686eeb8..e0fd2b9 100644
--- a/src/views/delayHiddenDangerRectification/index.vue
+++ b/src/views/delayHiddenDangerRectification/index.vue
@@ -431,7 +431,7 @@
sendBath() {
var selectData = this.$refs.dataTable.selection;
if (selectData.length < 1) {
- this.$message({type: 'warn', message: "请选择需要发送的数据！", duration: 3000})
+ this.$message({type: 'warning', message: "请选择需要发送的数据！", duration: 3000})
return;
}
var selectIds = "";
diff --git a/src/views/hiddenDangerManagement/fillRectificationAdd.vue b/src/views/hiddenDangerManagement/fillRectificationAdd.vue
index c4fe786..e7320f2 100644
--- a/src/views/hiddenDangerManagement/fillRectificationAdd.vue
+++ b/src/views/hiddenDangerManagement/fillRectificationAdd.vue
@@ -37,50 +37,6 @@
</el-form-item>
</el-col>
</el-row>
- <!--<el-row>
- <el-col :span="9">
- <el-form-item label="检查类别" prop="checktype">
- <el-select v-model="ruleForm.checktype" placeholder="请选择" style="width: 100%">
- <el-option
- v-for="item in JCLBList"
- :key="item.value"
- :label="item.value"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="9" :offset="4">
- <el-form-item label="检查单位" prop="check_main_branch">
- <el-select v-model="ruleForm.check_main_branch" placeholder="请选择" @change="changeJCDW" style="width: 100%">
- <el-option
- v-for="item in JCDWList"
- :key="item.label"
- :label="item.label"
- :value="item.label"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="9">
- <el-form-item label="检查部门" prop="check_branch">
- <el-select v-model="ruleForm.check_branch" placeholder="请选择" style="width: 100%">
- <el-option
- v-for="item in JCBMList"
- :key="item.value"
- :label="item.value"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="9" :offset="4">
-
- </el-col>
- </el-row>-->
<el-row>
<el-col :span="9">
@@ -88,21 +44,8 @@
<el-input v-model="ruleForm.check_man"></el-input>
</el-form-item>
</el-col>
- <!--<el-col :span="9" :offset="4">
- <el-form-item label="陪检人员" prop="acc_man">
- <el-input v-model="ruleForm.acc_man"></el-input>
- </el-form-item>
- </el-col>-->
</el-row>
-
- <!-- <el-row>
- <el-col :span="22">
- <el-form-item label="行走路线">
- <el-input v-model="ruleForm.route" rows="3" type="textarea" class="multiline"></el-input>
- </el-form-item>
- </el-col>
- </el-row>-->
<el-row style="margin-bottom: 20px">
<el-col :span="9">
@@ -341,9 +284,9 @@
initWxy
} from "@/api/sgyhpczl/initSelect";
import {initDangerRebound} from '@/api/sgyhpczl/hiddenDangerRegistration'
-import {getDangerDetails} from "@/api/sgyhpczl/recheckCancellationNumber";
+import {getDangerDetails,self_info} from "@/api/sgyhpczl/recheckCancellationNumber";
-import {saveSelfDanger} from '@/api/sgyhpczl/hiddenDangerManagement'
+import {saveSelfDanger,self_edit_do} from '@/api/sgyhpczl/hiddenDangerManagement'
import {deepClone} from '@/utils'
export default {
@@ -380,22 +323,22 @@
YWKSList: [],
update: false,
reboundList: [],
- ruleForm: {},
+ ruleForm: {
+ check_date:"",
+ check_class:"",
+ check_man:""
+ },
rules: {
check_date: [{required: true, message: '不能为空', trigger: 'blur'},],
check_class: [{required: true, message: '不能为空', trigger: 'blur'},],
- check_main_branch: [{required: true, message: '不能为空', trigger: 'blur'},],
- check_branch: [{required: true, message: '不能为空', trigger: 'blur'},],
check_man: [{required: true, message: '不能为空', trigger: 'blur'},],
- checktype: [{required: true, message: '不能为空', trigger: 'blur'},],
},
tableData: [],
};
},
mounted() {
if (this.$route.query != null) {
- console.log(11111)
- getDangerDetails(this.$route.query.id).then(res => {
+ self_info(this.$route.query.id).then(res => {
console.log(res)
if (res.data.ok) {
this.tableData.push(res.data.data);
@@ -614,6 +557,29 @@
});
} else {
console.log(this.tableData)
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ var requestData = this.tableData[0];
+ requestData.check_class= this.ruleForm.check_class
+ requestData.check_man= this.ruleForm.check_man
+ requestData.check_date= this.ruleForm.check_date
+ console.log(requestData)
+ self_edit_do(requestData).then(res => {
+ if (res.data.ok == 1) {
+ this.$message({type: 'success', message: "编辑成功", duration: 3000})
+ this.$router.push({
+ path: "/hiddenDangerManagement"
+ })
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+
+ } else {
+ console.log("error submit!!");
+ return false;
+ }
+ });
}
},
close() {
diff --git a/src/views/hiddenDangerManagement/index.vue b/src/views/hiddenDangerManagement/index.vue
index 30fa22e..addaa9a 100644
--- a/src/views/hiddenDangerManagement/index.vue
+++ b/src/views/hiddenDangerManagement/index.vue
@@ -478,7 +478,7 @@
fillRectification() {
var checkData = this.$refs.dataTable.selection;
if (checkData.length < 1) {
- this.$message({type: 'warn', message: "请选择勾选需要填写的数据！", duration: 3000})
+ this.$message({type: 'warning', message: "请选择勾选需要填写的数据！", duration: 3000})
return;
}
this.$router.push({
@@ -489,7 +489,7 @@
fillInspector() {
var checkData = this.$refs.dataTable.selection;
if (checkData.length < 1) {
- this.$message({type: 'warn', message: "请选择勾选需要填写的数据！", duration: 3000})
+ this.$message({type: 'warning', message: "请选择勾选需要填写的数据！", duration: 3000})
return;
}
this.$router.push({
@@ -571,7 +571,7 @@
revoke() {
var checkData = this.$refs.dataTable.selection;
if (checkData.length < 1) {
- this.$message({type: 'warn', message: "请勾选需要撤销的数据！", duration: 3000})
+ this.$message({type: 'warning', message: "请勾选需要撤销的数据！", duration: 3000})
return;
}
var revokeIds = "";
@@ -599,7 +599,7 @@
deleteBath() {
var checkData = this.$refs.dataTable.selection;
if (checkData.length < 1) {
- this.$message({type: 'warn', message: "请勾选需要删除的数据！", duration: 3000})
+ this.$message({type: 'warning', message: "请勾选需要删除的数据！", duration: 3000})
return;
}
var deleteIds = "";
--
Gitblit v1.9.2