From c562fa2e66f4972ae23fa57ef7412da6e18991ed Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期二, 12 七月 2022 14:31:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master
---
src/views/oneFromanotherN/index.vue | 142 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 124 insertions(+), 18 deletions(-)
diff --git a/src/views/oneFromanotherN/index.vue b/src/views/oneFromanotherN/index.vue
index ebb7b92..1e454d1 100644
--- a/src/views/oneFromanotherN/index.vue
+++ b/src/views/oneFromanotherN/index.vue
@@ -77,11 +77,11 @@
<el-radio-button label="0">待发送</el-radio-button>
<el-radio-button label="1">已发送</el-radio-button>
</el-radio-group>
- <el-radio-group v-if="table2" >
+ <el-radio-group v-if="table2" v-model="listQuery.sendType" @change="sendTypeChange">
<el-radio-button label="0">待自查</el-radio-button>
<el-radio-button label="1">已自查</el-radio-button>
</el-radio-group>
- <el-button class="btns" type="primary" size="small" v-if="table1" @click="handoff(1)">进入自查（3）</el-button>
+ <el-button class="btns" type="primary" size="small" v-if="table1" @click="handoff(1)">进入自查（{{selfTotal}}）</el-button>
<el-button class="btns" type="primary" size="small" v-if="table2" @click="handoff(2)">返回填写</el-button>
</el-col>
<div v-if="table1">
@@ -115,7 +115,17 @@
<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="address" label="隐患地点" align="center"></el-table-column>
- <el-table-column prop="ht_content" label="隐患内容" width="200" align="center"></el-table-column>
+ <el-table-column prop="ht_content" label="隐患内容" width="200" align="center">
+ <template slot-scope="scope">
+ <el-popover trigger="hover" placement="top">
+ <p>{{ scope.row.ht_content }}</p>
+ <div slot="reference" class="name-wrapper">{{
+ scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
+ }}
+ </div>
+ </el-popover>
+ </template>
+ </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">
@@ -138,7 +148,17 @@
<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="address" label="隐患地点" align="center"></el-table-column>
- <el-table-column prop="ht_content" label="隐患内容" width="200" align="center"></el-table-column>
+ <el-table-column prop="ht_content" label="隐患内容" width="200" align="center">
+ <template slot-scope="scope">
+ <el-popover trigger="hover" placement="top">
+ <p>{{ scope.row.ht_content }}</p>
+ <div slot="reference" class="name-wrapper">{{
+ scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
+ }}
+ </div>
+ </el-popover>
+ </template>
+ </el-table-column>
<el-table-column prop="workGroupName" label="发送单位" align="center"></el-table-column>
<el-table-column prop="state" label="未自查单位" align="center"></el-table-column>
</el-table>
@@ -165,8 +185,9 @@
<el-table-column prop="workGroupName" 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>
- <el-button @click="handleClick(scope.row)" type="text" size="small">存在</el-button>
+ <el-button @click="handleClick(scope.row,'不存在')" type="text" size="small">不存在</el-button>
+ <el-button @click="handleClick(scope.row)" type="text" v-if="listQuery.sendType=='0'" size="small">存在</el-button>
+ <el-button @click="handleClick(scope.row)" type="text" v-if="listQuery.sendType=='1'" size="small">追查结果</el-button>
</template>
</el-table-column>
</el-table>
@@ -286,7 +307,7 @@
v-for="item in YHBMList"
v-model="checked"
:label="item.branch_id"
- :key="item.branch_id">
+ :key="item.branch_name">
{{item.branch_name}}
</el-checkbox>
</el-row>
@@ -303,10 +324,34 @@
</el-form>
</el-dialog>
+ <!-- 不存在弹窗-->
+ <el-dialog :title="selfTitle" :visible.sync="selfInspectVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px">
+ <el-form ref="selfInspectForm" :rules="selfInspectFormRules" :model="selfInspectForm" label-position="right" label-width="80px">
+ <el-form-item label="自查人" prop="markUserName">
+ <el-input v-model="selfInspectForm.markUserName" class="analyseUnit_input"></el-input>
+ </el-form-item>
+ <el-form-item label="自查时间" prop="markDate">
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="selfInspectForm.markDate"
+ style="width: 100%;" value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item label="备注" prop="remark">
+ <el-input v-model="selfInspectForm.remark" type="textarea" rows="5" class="analyseUnit_input"></el-input>
+ </el-form-item>
+ </el-form>
+ <div align="center">
+ <el-button type="primary" v-if="listQuery.sendType == '0'" @click="submitSelfInspect()">确认</el-button>
+ <el-button @click="selfInspectVisible = false">关闭</el-button>
+ </div>
+ </el-dialog>
+
</div>
</template>
<script>
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'
@@ -318,8 +363,10 @@
page:1,
limit:10,
type: 0,
+ sendType: 0,
form:{},
},
+ selfTotal: 0,
radio1:'待发送',
table1:true,
table2:false,
@@ -345,6 +392,7 @@
markDate:'',
remark:'',
},
+ selfTitle: '',
selfInspectFormRules:{
markUserName: [{ required: true, message: '自查人不能为空', trigger: 'blur' }],
markDate: [{ required: true, message: '自查时间不能为空', trigger: 'blur' }]
@@ -357,10 +405,12 @@
checktype: [{ required: true, message: '不能为空', trigger: 'blur' },],
},
+
}
},
mounted() {
this.getPageList();
+ this.getSelfTotal();
this.initYHBM();
this.initJCLB();
this.initXFDW();
@@ -370,25 +420,66 @@
methods:{
addDanger(){
this.$router.push({
- path:'/existN',
+ path:'/addDanger',
})
},
handleClick(data,val){
- if(val=='存在'){
- this.$router.push({
- path:'/exist'
+ if(val=='不存在'){
+ this.$nextTick(() =>{
+ this.$refs["selfInspectForm"].clearValidate()
})
+ this.selfInspectForm={id:data.id}
+ this.selfInspectVisible = true
+ if (this.listQuery.sendType == '1'){
+ let params = {
+ id: data.id,
+ type: 1,
+ }
+ selfCheckNotInfo(params).then(res=>{
+ if (res.data.ok==1){
+ this.selfInspectForm=res.data.data[0]
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ }
+ return
}
+ let puType = '0';
+ this.$router.push({
+ path:'/existN',
+ query: {
+ data: data,
+ type: puType
+ }
+ })
+ },
+ //不存在提交
+ submitSelfInspect(){
+ this.$refs["selfInspectForm"].validate((valid) =>{
+ if (valid){
+ noExistSave(this.selfInspectForm).then((res)=>{
+ if (res.data.ok==1) {
+ this.$message({type:'success', message:"保存成功", duration:3000});
+ this.selfInspectVisible = false
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ }
+ })
},
handoff(index){
if(index==1){
this.table1=false
this.table2=true
this.listQuery.type = 2
+ this.listQuery.sendType = 0
this.getPageList()
}else{
this.listQuery.type = 0
this.getPageList()
+ this.getSelfTotal();
this.table1=true
this.table2=false
}
@@ -447,13 +538,6 @@
}
}
- 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
- }
- }
},
//搜索
getPageList(){
@@ -469,6 +553,24 @@
this.$message({type:'error', message:res.data.msg, duration:3000})
}
})
+ },
+ //获取待自查数量
+ getSelfTotal(){
+ if (this.listQuery.type != '2'){
+ let query = {
+ page: 1,
+ sendType: 0,
+ type: 2,
+ form:{},
+ };
+ getPageList(query).then(res=>{
+ if (res.data.ok==1) {
+ this.selfTotal=res.data.data.total
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ }
},
//重置
reset(){
@@ -498,6 +600,10 @@
this.listQuery.type = val;
this.getPageList()
},
+ sendTypeChange(val){
+ this.listQuery.sendType = val;
+ this.getPageList()
+ },
handleSelectionChange(val){
this.selectedList = []
val.forEach((item) => {
--
Gitblit v1.9.2