From a90cf43e7a1f41dcde401ed1fd118b0f90d7c3f5 Mon Sep 17 00:00:00 2001
From: cqf
Date: 星期四, 26 五月 2022 11:41:49 +0800
Subject: [PATCH] 举一反三隐患-存在
---
src/api/sgyhpczl/oneFromanotherN.js | 14 ----
src/views/oneFromanotherN/index.vue | 7 +-
src/views/oneFromanother/index.vue | 2
src/router/index.js | 5 +
src/views/oneFromanother/exist.vue | 105 ++++++++++++++++++----------------
5 files changed, 65 insertions(+), 68 deletions(-)
diff --git a/src/api/sgyhpczl/oneFromanotherN.js b/src/api/sgyhpczl/oneFromanotherN.js
index dffc8e6..bd71dd3 100644
--- a/src/api/sgyhpczl/oneFromanotherN.js
+++ b/src/api/sgyhpczl/oneFromanotherN.js
@@ -117,17 +117,3 @@
data
});
}
-//不存在结果详情
-export function selfCheckNotInfo(params) {
- return request({
- headers: {
- 'token': getTokenAndVerify().token,
- 'verify': getTokenAndVerify().verify
- },
- url: '/taboi/danger/self_check_not_info',
- // '?id=24871&type=0',
- contentType: "multipart/form-data",
- method: 'GET',
- params:params?params:{}
- });
-}
diff --git a/src/router/index.js b/src/router/index.js
index eab9cec..941657f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -389,6 +389,11 @@
meta: { title: '内部举一反三', icon: '' }
},
{
+ path: '/addDanger',
+ component: () => import('@/views/oneFromanotherN/addDanger'),
+ hidden: true
+ },
+ {
path: '/existN',
component: () => import('@/views/oneFromanotherN/existN'),
hidden: true
diff --git a/src/views/oneFromanother/exist.vue b/src/views/oneFromanother/exist.vue
index b1a35e1..573f93f 100644
--- a/src/views/oneFromanother/exist.vue
+++ b/src/views/oneFromanother/exist.vue
@@ -86,11 +86,11 @@
</el-col>
</el-row>
- <!-- <el-row style="margin-bottom: 20px" v-if="addShow">
+ <el-row style="margin-bottom: 20px">
<el-col :span="9">
<el-button type="primary" class="btns" @click="addDanger">新增隐患</el-button>
</el-col>
- </el-row> -->
+ </el-row>
<el-table :data="tableData" style="width: 100%">
<el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
@@ -361,7 +361,7 @@
initYHLX,
initYwks
} from "@/api/sgyhpczl/initSelect";
- import {getPageList,initDangerRebound} from '@/api/sgyhpczl/hiddenDangerRegistration'
+ import {getPageList,initDangerRebound,saveDanger} from '@/api/sgyhpczl/hiddenDangerRegistration'
import {deepClone} from '@/utils'
export default {
@@ -379,6 +379,7 @@
address: [{ required: true, message: '不能为空', trigger: 'blur' },],
ht_content: [{ required: true, message: '不能为空', trigger: 'blur' },],
ht_typesub: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ measure: [{ required: true, message: '不能为空', trigger: 'blur' },],
DTRisk_bankId: [{ required: true, message: '不能为空', trigger: 'blur' },],
ht_level: [{ required: true, message: '不能为空', trigger: 'blur' },],
alter_time: [{ required: true, message: '不能为空', trigger: 'blur' },],
@@ -419,6 +420,8 @@
pageSize: 10,
recordTotal: 0,
detailTableData:[],//隐患详情列表
+ beforeData:{}, //上个页面信息
+ beforeFlag:true,//上个页面信息保存标志
};
},
@@ -445,11 +448,13 @@
initInfo(data){
this.paramsData = this.$route.query.data;
this.ruleForm.jyfsId = data.id;
- this.tableData[0] = {
- address: data.address,
- ht_content: data.ht_content,
- ht_level: data.ht_level,
- };
+ this.dangerForm.address = data.address;
+ this.dangerForm.ht_content = data.ht_content;
+ // this.tableData[0] = {
+ // address: data.address,
+ // ht_content: data.ht_content,
+ // ht_level: data.ht_level,
+ // };
},
// async initInfo(){
@@ -474,7 +479,9 @@
this.$refs[formName].validate((valid) => {
if (valid) {
if(this.title=='新增'){
+ this.beforeFlag = false;
this.tableData.push(this.dangerForm)
+ console.log(this.tableData)
}else {
var arr = this.tableData;
arr.splice(this.rowIndex, 1, this.dangerForm);
@@ -531,7 +538,9 @@
},
addDanger(){
- this.dangerForm={}
+ if (!this.beforeFlag){
+ this.dangerForm={}
+ }
this.title="新增"
this.dialogVisible=true
},
@@ -655,51 +664,47 @@
},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
-
if (valid) {
this.ruleForm.items=this.tableData
- if(this.judge(this.tableData[0])){
- this.$message({type:'error', message:"请完整录入隐患", duration:2000})
- }
// if(this.addShow){
- console.log(this.ruleForm)
- saveDanger(this.ruleForm).then(res=>{
- if (res.data.ok==1){
- this.$message({type:'success', message:"保存成功", duration:3000})
- this.$router.push({
- path:"/oneFromanother"
- })
- }else {
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
+ console.log(this.ruleForm)
+ saveDanger(this.ruleForm).then(res=>{
+ if (res.data.ok==1){
+ this.$message({type:'success', message:"保存成功", duration:3000})
+ this.$router.push({
+ path:"/oneFromanother"
+ })
+ }else {
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
// }else {
- // var param=deepClone(this.ruleForm)
- // var obj=deepClone(this.tableData[0])
- // param.ht_branch=obj.ht_branch
- // param.address=obj.address
- // param.ht_content=obj.ht_content
- // param.measure=obj.measure
- // param.ht_typesub=obj.ht_typesub
- // param.DTRisk_bankId=obj.DTRisk_bankId
- // param.DTRisk_level=obj.mriskLevel
- // param.dangerousSource=obj.mriskPoint
- // param.ht_level=obj.ht_level
- // param.alter_time=obj.alter_time
- // param.duty_officer=obj.duty_officer
- // param.alter_status=obj.alter_status
- // param.Review=obj.Review
- // param.repeatId=obj.repeatId
- // editDanger(param).then(res=>{
- // if (res.data.ok==1){
- // this.$message({type:'success', message:"编辑成功", duration:3000})
- // this.$router.push({
- // path:"/hiddenDangerRegistration"
- // })
- // }else {
- // this.$message({type:'error', message:res.data.msg, duration:3000})
- // }
- // })
+ // var param=deepClone(this.ruleForm)
+ // var obj=deepClone(this.tableData[0])
+ // param.ht_branch=obj.ht_branch
+ // param.address=obj.address
+ // param.ht_content=obj.ht_content
+ // param.measure=obj.measure
+ // param.ht_typesub=obj.ht_typesub
+ // param.DTRisk_bankId=obj.DTRisk_bankId
+ // param.DTRisk_level=obj.mriskLevel
+ // param.dangerousSource=obj.mriskPoint
+ // param.ht_level=obj.ht_level
+ // param.alter_time=obj.alter_time
+ // param.duty_officer=obj.duty_officer
+ // param.alter_status=obj.alter_status
+ // param.Review=obj.Review
+ // param.repeatId=obj.repeatId
+ // editDanger(param).then(res=>{
+ // if (res.data.ok==1){
+ // this.$message({type:'success', message:"编辑成功", duration:3000})
+ // this.$router.push({
+ // path:"/hiddenDangerRegistration"
+ // })
+ // }else {
+ // this.$message({type:'error', message:res.data.msg, duration:3000})
+ // }
+ // })
// }
diff --git a/src/views/oneFromanother/index.vue b/src/views/oneFromanother/index.vue
index 27e471f..00bd1e1 100644
--- a/src/views/oneFromanother/index.vue
+++ b/src/views/oneFromanother/index.vue
@@ -224,7 +224,7 @@
this.$nextTick(() =>{
this.$refs["selfInspectForm"].clearValidate()
})
- this.selfInspectForm={}
+ this.selfInspectForm={id:data.id}
this.selfInspectVisible = true
if (this.listQuery.type == '1'){
let params = {
diff --git a/src/views/oneFromanotherN/index.vue b/src/views/oneFromanotherN/index.vue
index dc2348d..66a5282 100644
--- a/src/views/oneFromanotherN/index.vue
+++ b/src/views/oneFromanotherN/index.vue
@@ -330,7 +330,8 @@
</div>
</template>
<script>
-import { getPageList, edit, del, send, revoke,selfCheckNotInfo} from "@/api/sgyhpczl/oneFromanotherN"
+import { getPageList, edit, del, send, revoke} from "@/api/sgyhpczl/oneFromanotherN"
+import {noExistSave,selfCheckNotInfo} from "@/api/sgyhpczl/oneFromanother"
import {initJCBM, initYHLX, initJCLB, initYHJB,initYHBM} from "@/api/sgyhpczl/initSelect";
import {deepClone} from '@/utils'
@@ -407,12 +408,12 @@
this.$nextTick(() =>{
this.$refs["selfInspectForm"].clearValidate()
})
- this.selfInspectForm={}
+ this.selfInspectForm={id:data.id}
this.selfInspectVisible = true
if (this.listQuery.sendType == '1'){
let params = {
id: data.id,
- type: 0,
+ type: 1,
}
selfCheckNotInfo(params).then(res=>{
if (res.data.ok==1){
--
Gitblit v1.9.2