From 7efc6ed86025b610cab109a2e9f83362740d8ed4 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 08 十二月 2023 13:29:07 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe

---
 web/src/views/SecureManage/NipCheck/NipTips.vue |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/web/src/views/SecureManage/NipCheck/NipTips.vue b/web/src/views/SecureManage/NipCheck/NipTips.vue
index 7753e63..07d4fc9 100644
--- a/web/src/views/SecureManage/NipCheck/NipTips.vue
+++ b/web/src/views/SecureManage/NipCheck/NipTips.vue
@@ -38,7 +38,7 @@
         <el-table-column label="操作" align="center" width="250">
           <template #default="{ row }">
             <el-button class="table_btn" size="mini" v-if="showButton('update')" @click="updateProp(row)">修改</el-button>
-            <el-button class="delete_btn" size="mini" v-if="showButton('delete')" @click="deleteInfo(row)">删除</el-button>
+            <!-- <el-button class="delete_btn" size="mini" v-if="showButton('delete')" @click="deleteInfo(row)">删除</el-button> -->
             <el-button class="table_btn" size="mini" v-if="showButton('update')&&row.auditStatus!==1" @click="checkHidden(row)">审核</el-button>
           </template>
         </el-table-column>
@@ -135,6 +135,7 @@
         total: 0,
         disabled:false,
         loading: false,
+        userId:null,//创建人
         dataList: [], //举报隐患信息列表
         positonOptions:[],//隐患地点
         imageList:[],
@@ -160,7 +161,7 @@
           dangerLocation: [{
             required: true,
             message: '请输入隐患地点',
-            trigger: 'blur'
+            trigger: 'change'
           }],
           title: [{
             required: true,
@@ -191,6 +192,7 @@
         optionsType:[],//设备类型
         optionsDevice:[],//设备名称
         optionsUser:[],//负责人
+        dictId:null,
       }
     },
     watch: {
@@ -254,6 +256,7 @@
     },
       // 审核按钮
       checkHidden(row) {
+        this.userId = row.createUser
         this.asyncTitle = true;
         this.imageList = []
         this.asyncVisible = true;
@@ -307,6 +310,7 @@
         this.$api.Safety.detailsHiddenInfo({id: row.id}).then(res=>{
             if(res.statusMsg === 'ok'){
                 this.ruleForm = res.data
+                this.dictId = res.data.dictId
                 res.data.imgEntities.map(item=>{
                     this.imageList.push({
                         id: this.imageList.length + 1,
@@ -352,6 +356,7 @@
                 arrTitle.push({imgPath:item.name})
             })
             params.imgEntities = arrTitle
+            params.createUser = this.userId
             this.$api.Safety.checkHiddenInfo(params).then((res) => {
               if(res.statusMsg === 'ok') {
                 this.asyncVisible = false;
@@ -374,6 +379,7 @@
                 arrTitle.push({imgPath:item.name})
             })
             params.imgEntities = arrTitle
+            params.dictId = this.dictId
             this.$api.Safety.updateHiddenInfo(params).then((res) => {
               if(res.statusMsg === 'ok') {
                 this.asyncVisible = false;

--
Gitblit v1.9.3