Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
姜玉琦
commit
c02f15dc7b
|
|
@ -214,54 +214,94 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</foreach>
|
||||
</delete>
|
||||
<sql id="countUserWhere">
|
||||
<if test="problemType != null and problemType != ''"> and problemType = #{problemType}</if>
|
||||
<if test="dangerType != null and dangerType != ''"> and danger_type = #{dangerType}</if>
|
||||
<if test="createTime != null "> and date(createTime) >= date(#{createTime})</if>
|
||||
<if test="updateTime != null "> and date(updateTime) <= date(#{updateTime})</if>
|
||||
<if test="createUser != null"> and createUser = #{createUser}</if>
|
||||
<if test="lordSent != null and lordSent != ''"> and lordSent = #{lordSent}</if>
|
||||
<if test="problemType != null and problemType != ''"> and a,problemType = #{problemType}</if>
|
||||
<if test="dangerType != null and dangerType != ''"> and a.danger_type = #{dangerType}</if>
|
||||
<if test="createTime != null "> and date(a.createTime) >= date(#{createTime})</if>
|
||||
<if test="updateTime != null "> and date(a.updateTime) <= date(#{updateTime})</if>
|
||||
<if test="createUser != null"> and a.createUser = #{createUser}</if>
|
||||
<if test="lordSent != null and lordSent != ''"> and a.lordSent = #{lordSent}</if>
|
||||
<if test="currentUserId != null and currentUserId!=''">
|
||||
AND
|
||||
(
|
||||
createUser=#{currentUserId} or lordSent=#{currentUserId} or find_in_set(#{currentUserId},copySend) or recheckSend=#{currentUserId}
|
||||
a.createUser=#{currentUserId} or a.lordSent=#{currentUserId} or find_in_set(#{currentUserId},a.copySend) or a.recheckSend=#{currentUserId}
|
||||
)
|
||||
</if>
|
||||
</sql>
|
||||
|
||||
<select id="getListCount" parameterType="SmzSspProblemmodify" resultMap="SmzSspProblemmodifyResult">
|
||||
select 'a' projectName, count(1) id ,'全部' remark from smz_ssp_problemmodify where projectId=#{projectId} and comId=#{comId} and infoType=#{infoType} and isDel=0
|
||||
select 'a' projectName, count(1) id ,'全部' remark from smz_ssp_problemmodify a where a.projectId=#{projectId} and a.comId=#{comId} and a.infoType=#{infoType} and a.isDel=0
|
||||
<include refid="countUserWhere"></include>
|
||||
union
|
||||
select 'b' projectName, count(1) id,'待整改' remark from smz_ssp_problemmodify where projectId=#{projectId} and comId=#{comId} and infoType=#{infoType} and isDel=0 and checkState in (0,3)
|
||||
select 'b' projectName, count(1) id,'待整改' remark from smz_ssp_problemmodify a where a.projectId=#{projectId} and a.comId=#{comId} and a.infoType=#{infoType} and a.isDel=0 and a.checkState in (0,3)
|
||||
<include refid="countUserWhere"></include>
|
||||
union
|
||||
select 'c' projectName, count(1) id,'待复检' remark from smz_ssp_problemmodify where projectId=#{projectId} and comId=#{comId} and infoType=#{infoType} and isDel=0 and checkState in (1)
|
||||
select 'c' projectName, count(1) id,'待复检' remark from smz_ssp_problemmodify a where a.projectId=#{projectId} and a.comId=#{comId} and a.infoType=#{infoType} and a.isDel=0 and a.checkState in (1)
|
||||
<include refid="countUserWhere"></include>
|
||||
union
|
||||
select 'd' projectName, count(1) id,'整改完成' remark from smz_ssp_problemmodify where projectId=#{projectId} and comId=#{comId} and infoType=#{infoType} and isDel=0 and checkState in (4)
|
||||
select 'd' projectName, count(1) id,'整改完成' remark from smz_ssp_problemmodify a where a.projectId=#{projectId} and a.comId=#{comId} and a.infoType=#{infoType} and a.isDel=0 and a.checkState in (4)
|
||||
<include refid="countUserWhere"></include>
|
||||
union
|
||||
select 'e' projectName, count(1) id,'整改超时' remark from smz_ssp_problemmodify where projectId=#{projectId} and comId=#{comId} and infoType=#{infoType} and isDel=0 and checkState not in (4) and date(nickedTime) <= curdate()
|
||||
select 'e' projectName, count(1) id,'整改超时' remark from smz_ssp_problemmodify a where a.projectId=#{projectId} and a.comId=#{comId} and a.infoType=#{infoType} and a.isDel=0 and a.checkState not in (4) and date(a.nickedTime) <= curdate()
|
||||
<include refid="countUserWhere"></include>
|
||||
</select>
|
||||
|
||||
<select id="selectList" parameterType="SmzSspProblemmodify" resultMap="SmzSspProblemmodifyResult">
|
||||
<include refid="selectSmzSspProblemmodifyVo"/>
|
||||
where isDel=0 and projectId=#{projectId} and comId=#{comId} and infoType=#{infoType}
|
||||
SELECT
|
||||
a.id,
|
||||
a.comId,
|
||||
a.projectId,
|
||||
a.infoType,
|
||||
a.marks_picture,
|
||||
a.marks_video,
|
||||
a.correction_picture,
|
||||
a.problemArea,
|
||||
a.workParts,
|
||||
a.changeInfo,
|
||||
CONCAT(a.lordSentUser ,'【',b.sub_dept_name,'】',b.user_phone) as lordSent,
|
||||
a.lordSentUser,
|
||||
a.copySend,
|
||||
a.copySendUser,
|
||||
a.checkState,
|
||||
a.nickedArea,
|
||||
a.nickedTime,
|
||||
a.projectType,
|
||||
a.processName,
|
||||
a.projectName,
|
||||
a.nickedInfo,
|
||||
a.checkUser,
|
||||
a.checkUserPhone,
|
||||
a.smark_url,
|
||||
a.isDel,
|
||||
CONCAT(c.nick_name,'【',c.phonenumber,'】') as createUser,
|
||||
a.createTime,
|
||||
a.updateUser,
|
||||
a.updateTime,
|
||||
a.danger_type,
|
||||
CONCAT(a.recheckSendUser ,'【',d.sub_dept_name,'】',d.user_phone) as recheckSend,
|
||||
a.recheckSendUser,
|
||||
a.roleType,
|
||||
a.problemType
|
||||
FROM
|
||||
smz_ssp_problemmodify a
|
||||
LEFT JOIN pro_project_info_subdepts_users b ON a.lordSent = b.user_id AND a.projectId = b.project_id AND a.comId = b.com_id
|
||||
LEFT JOIN pro_project_info_subdepts_users d ON a.recheckSend = d.user_id AND a.projectId = d.project_id AND a.comId = d.com_id
|
||||
LEFT JOIN sys_user c ON a.createUser = c.user_id
|
||||
|
||||
where a.isDel=0 and a.projectId=#{projectId} and a.comId=#{comId} and a.infoType=#{infoType}
|
||||
<if test="projectName==1">
|
||||
|
||||
</if>
|
||||
<if test="projectName==2">
|
||||
and checkState in (0,3)
|
||||
and a.checkState in (0,3)
|
||||
</if>
|
||||
<if test="projectName==3">
|
||||
and checkState in (1)
|
||||
and a.checkState in (1)
|
||||
</if>
|
||||
<if test="projectName==4">
|
||||
and checkState in (4)
|
||||
and a.checkState in (4)
|
||||
</if>
|
||||
<if test="projectName==5">
|
||||
and checkState not in (4) and date(nickedTime) <= curdate()
|
||||
and a.checkState not in (4) and date(nickedTime) <= curdate()
|
||||
</if>
|
||||
<include refid="countUserWhere"></include>
|
||||
</select>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||
import com.yanzhu.common.core.context.SecurityContextHolder;
|
||||
import com.yanzhu.common.core.utils.DateUtils;
|
||||
import com.yanzhu.common.security.utils.SecurityUtils;
|
||||
import com.yanzhu.system.api.domain.SysUser;
|
||||
import com.yanzhu.system.api.model.LoginUser;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.yanzhu.manage.mapper.SmzSspProblemmodifyMapper;
|
||||
|
|
@ -104,12 +106,15 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi
|
|||
@Override
|
||||
public int insertSmzSspProblemmodifies(List<SmzSspProblemmodify> list) {
|
||||
AtomicInteger count = new AtomicInteger();
|
||||
LoginUser loginUser=SecurityUtils.getLoginUser();
|
||||
SysUser sysUser=loginUser.getSysUser();
|
||||
list.stream().forEach(it->{
|
||||
it.setCheckState(0L);
|
||||
it.setIsDel(0L);
|
||||
it.setCreateTime(DateUtils.getNowDate());
|
||||
it.setCreateBy(""+SecurityUtils.getLoginUser().getSysUser().getUserId());
|
||||
it.setCreateUser(""+SecurityUtils.getLoginUser().getSysUser().getUserId());
|
||||
it.setProjectName(sysUser.getActiveProjectName());
|
||||
it.setCreateBy(""+sysUser.getUserId());
|
||||
it.setCreateUser(""+sysUser.getUserId());
|
||||
count.addAndGet(smzSspProblemmodifyMapper.insertSmzSspProblemmodify(it));
|
||||
});
|
||||
return count.get();
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
<svg class="icon" style="width: 1em;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4939"><path d="M60.8 1024c-33.6 0-60.8-27.2-60.8-60.8v-243.2c0-33.6 27.2-60.8 60.8-60.8s60.8 27.2 60.8 60.8v243.2c0 33.6-27.2 60.8-60.8 60.8zM361.6 1024c-33.6 0-60.8-27.2-60.8-60.8v-473.6c0-33.6 27.2-60.8 60.8-60.8s60.8 27.2 60.8 60.8v473.6c0 33.6-27.2 60.8-60.8 60.8zM662.4 1024c-33.6 0-60.8-27.2-60.8-60.8v-678.4c0-33.6 27.2-60.8 60.8-60.8s60.8 27.2 60.8 60.8v678.4c0 33.6-27.2 60.8-60.8 60.8zM963.2 1024c-33.6 0-60.8-27.2-60.8-60.8V60.8c0-33.6 27.2-60.8 60.8-60.8s60.8 27.2 60.8 60.8v902.4c0 33.6-27.2 60.8-60.8 60.8z" p-id="4940"></path></svg>
|
||||
|
After Width: | Height: | Size: 735 B |
|
|
@ -2,22 +2,11 @@
|
|||
<div>
|
||||
<template v-for="(item, index) in options">
|
||||
<template v-if="values.includes(item.value)">
|
||||
<span
|
||||
v-if="item.elTagType == 'default' || item.elTagType == ''"
|
||||
:key="item.value"
|
||||
:index="index"
|
||||
:class="item.elTagClass"
|
||||
>{{ item.label + " " }}</span
|
||||
>
|
||||
<el-tag
|
||||
v-else
|
||||
:disable-transitions="true"
|
||||
:key="item.value + ''"
|
||||
:index="index"
|
||||
:type="item.elTagType === 'primary' ? 'info' : item.elTagType"
|
||||
:class="item.elTagClass"
|
||||
>{{ item.label + " " }}</el-tag
|
||||
>
|
||||
<span v-if="item.elTagType == 'default' || item.elTagType == ''" :key="item.value" :index="index"
|
||||
:class="item.elTagClass">{{ item.label + " " }}</span>
|
||||
<el-tag v-else :disable-transitions="true" :key="item.value + ''" :index="index"
|
||||
:type="item.elTagType === 'primary' ? 'info' : item.elTagType" :class="item.elTagClass">{{ item.label + " "
|
||||
}}</el-tag>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
|
|
@ -45,10 +34,6 @@ const props = defineProps({
|
|||
|
||||
const values = computed(() => {
|
||||
if (props.value !== null && typeof props.value !== "undefined") {
|
||||
console.log("sssssssssssss1==>",Array.isArray(props.value))
|
||||
console.log("sssssssssssss2==>",props.value)
|
||||
console.log("sssssssssssss3==>",String(props.value))
|
||||
console.log("sssssssssssss4==>",[String(props.value)])
|
||||
return Array.isArray(props.value) ? props.value : [String(props.value)];
|
||||
} else {
|
||||
return [];
|
||||
|
|
|
|||
|
|
@ -150,8 +150,8 @@
|
|||
<el-form-item label="用户类型" prop="userType">
|
||||
<el-select v-model="form.userType" placeholder="请选择用户类型" style="width: 100%"
|
||||
@change="doRoleChange">
|
||||
<el-option v-for="dict in sys_user_type" v-show="dict.value != '99'" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value" />
|
||||
<el-option v-for="dict in sys_user_type" v-show="dict.value != '99'" :key="dict.value"
|
||||
:label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -797,7 +797,6 @@ function submitForm() {
|
|||
data.loading = true;
|
||||
proxy.$refs["userRef"].validate(valid => {
|
||||
if (valid) {
|
||||
debugger
|
||||
let obj = form.value.userInfos || {};
|
||||
obj.cardImgPos = form.value.cardImgPos;
|
||||
obj.cardImgInv = form.value.cardImgInv;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,254 @@
|
|||
<template>
|
||||
<el-drawer v-model="data.visible" :close-on-click-modal="false" :close-on-press-escape="false" size="1000px"
|
||||
:append-to-body="true" title="安全隐患详情" class="problemmodify-detail-drawer">
|
||||
<el-row v-if="data && data.row" style="padding:20px;">
|
||||
<el-col :span="10" class="detail-left">
|
||||
<el-steps style="max-width: 600px" :active="1" finish-status="success" simple>
|
||||
<el-step title="待整改" />
|
||||
<el-step title="待复检" />
|
||||
<el-step title="复检驳回" />
|
||||
<el-step title="复检通过" />
|
||||
</el-steps>
|
||||
|
||||
<div class="step-header" :class="data.row.checkState >= 0 ? 'is-active' : ''">
|
||||
<el-icon>
|
||||
<SuccessFilled />
|
||||
</el-icon>
|
||||
01.待整改
|
||||
</div>
|
||||
<el-card>
|
||||
<table border class="step-table">
|
||||
<tr>
|
||||
<td width="40%"><el-icon>
|
||||
<User />
|
||||
</el-icon>办理用户</td>
|
||||
<td>{{ data.row.createUser }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><el-icon>
|
||||
<Calendar />
|
||||
</el-icon>办理时间</td>
|
||||
<td>{{ data.row.createTime }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><el-icon>
|
||||
<Picture />
|
||||
</el-icon>隐患图片</td>
|
||||
<td>
|
||||
<el-image :src="data.row.smarkUrlPic" style="height:80px;" :preview-teleported="true"
|
||||
:preview-src-list="data.row.smarkUrlPics"></el-image>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="14" class="detail-right">
|
||||
<el-form style="margin: 0px 20px;">
|
||||
<el-form-item label="项目名称">
|
||||
{{ data.row.projectName }}
|
||||
</el-form-item>
|
||||
<el-form-item label="隐患图片">
|
||||
<el-image :src="data.row.smarkUrlPic" style="height:80px;" :preview-teleported="true"
|
||||
:preview-src-list="data.row.smarkUrlPics"></el-image>
|
||||
</el-form-item>
|
||||
<el-form-item label="检查类型">
|
||||
<dict-tag :options="ssp_proble_type" :value="data.row.problemType" />
|
||||
</el-form-item>
|
||||
<el-form-item label="隐患类型">
|
||||
<dict-tag :options="ssp_proble_sub_type" :value="data.row.dangerType" />
|
||||
</el-form-item>
|
||||
<el-form-item label="施工部位">
|
||||
{{ data.row.workParts }}
|
||||
</el-form-item>
|
||||
<el-form-item label="整改要求">
|
||||
{{ data.row.changeInfo }}
|
||||
</el-form-item>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="提交人">
|
||||
{{ data.row.createUser }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="提交时间">
|
||||
{{ data.row.createTime }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="整改人">
|
||||
{{ data.row.lordSent }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="抄送人">
|
||||
{{ data.row.copySendUser }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="复检人">
|
||||
{{ data.row.recheckSend }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="截至时间">
|
||||
{{ data.row.nickedTime }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div class="step-2">
|
||||
<div class="step-header">
|
||||
<svg-icon icon-class="twrap" /> 整改情况
|
||||
</div>
|
||||
<el-form ref="formStep2Ref" :mode="step2Form" :rules="step2Rules">
|
||||
<el-form-item label="整改说明" prop="opinion">
|
||||
<el-input v-model="step2Form.opinion" style="width: 100%" maxlength="200" :rows="3"
|
||||
type="textarea" placeholder="请输入整改说明（最多200字）" />
|
||||
</el-form-item>
|
||||
<el-form-item label="整改图片" prop="images" style="margin-top:15px">
|
||||
<image-upload v-model="step2Form.images" previewAll :limit="5"
|
||||
@change="doStep2ImageUpload" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div style="text-align: center;">
|
||||
<el-button type="primary" @click="step2Submit" :disabled="data.loading">提交</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-drawer>
|
||||
</template>
|
||||
|
||||
<script setup name="Problemmodify">
|
||||
const { proxy } = getCurrentInstance();
|
||||
const { ssp_proble_type, ssp_proble_sub_type } = proxy.useDict('ssp_proble_type', 'ssp_proble_sub_type');
|
||||
const formStep2Ref = ref();
|
||||
let data = reactive({
|
||||
loading: false,
|
||||
visible: false,
|
||||
row: null,
|
||||
step2: {
|
||||
opinion: '',
|
||||
images: [],
|
||||
},
|
||||
step2Form: {},
|
||||
step2Rules: {
|
||||
opinion: [
|
||||
{ required: true, message: "请输入审核意见", trigger: "blur" },
|
||||
{ min: 1, max: 200, message: "长度在 1 到 255 个字符", trigger: "blur" }
|
||||
],
|
||||
images: [
|
||||
{ validator: validateStep2Images }
|
||||
]
|
||||
}
|
||||
});
|
||||
const { step2Form, step2Rules } = toRefs(data);
|
||||
function validateStep2Images(rule, value, callback) {
|
||||
if (value.length == 0) {
|
||||
callback(new Error("请上传图片!"))
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
function showDrawer(row) {
|
||||
data.row = row;
|
||||
data.visible = true;
|
||||
}
|
||||
|
||||
function step2Submit() {
|
||||
data.loading = true;
|
||||
formStep2Ref.value.validate(v => {
|
||||
data.loading = false;
|
||||
if (v) {
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
function doStep2ImageUpload() {
|
||||
formStep2Ref.value.validateField("images");
|
||||
|
||||
}
|
||||
defineExpose({
|
||||
showDrawer
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.problemmodify-detail-drawer {
|
||||
.el-drawer__header {
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
.el-drawer__body {
|
||||
padding: 0px 20px;
|
||||
|
||||
.detail-left {
|
||||
.el-steps--simple {
|
||||
padding: 13px;
|
||||
|
||||
.el-step__title {
|
||||
font-size: 12px;
|
||||
max-width: unset;
|
||||
}
|
||||
}
|
||||
|
||||
.el-card__body {
|
||||
padding: 8px !important;
|
||||
}
|
||||
|
||||
.step-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
border-color: #dddddda6;
|
||||
|
||||
td {
|
||||
color: #888;
|
||||
font-size: 12px;
|
||||
padding: 4px 10px;
|
||||
background: #eeebeb;
|
||||
}
|
||||
}
|
||||
|
||||
.step-header {
|
||||
line-height: 40px;
|
||||
font-weight: bold;
|
||||
|
||||
&.is-active {
|
||||
color: var(--el-color-success);
|
||||
}
|
||||
|
||||
.el-icon {
|
||||
position: relative;
|
||||
top: 2px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.detail-right {
|
||||
|
||||
.el-upload-list__item,
|
||||
.el-upload--picture-card {
|
||||
width: 80px !important;
|
||||
height: 80px !important;
|
||||
}
|
||||
|
||||
.el-form-item--default {
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
.step-header {
|
||||
color: var(--el-color-primary);
|
||||
font-weight: bold;
|
||||
line-height: 30px;
|
||||
border-bottom: dotted 1px var(--el-border-color-light);
|
||||
margin-block: 12px;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
<el-form class="header-form" :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
|
||||
|
||||
<el-form-item label="检查类型" prop="problemType">
|
||||
<el-select v-model="queryParams.problemType" placeholder="请选择检查类型" clearable4 style="width: 160px;">
|
||||
<el-select v-model="queryParams.problemType" placeholder="请选择检查类型" clearable style="width: 160px;">
|
||||
<el-option v-for="dict in ssp_proble_type" :key="dict.value" :label="dict.label" :value="dict.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
|
|
@ -29,80 +29,73 @@
|
|||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-tabs v-model="data.activeName" class="main-tabs">
|
||||
<el-tabs v-model="data.activeName" class="main-tabs" @tab-click="tabClick">
|
||||
<el-tab-pane :label="data.tabInfo['a']" name="a"></el-tab-pane>
|
||||
<el-tab-pane :label="data.tabInfo['b']" name="b"></el-tab-pane>
|
||||
<el-tab-pane :label="data.tabInfo['c']" name="c"></el-tab-pane>
|
||||
<el-tab-pane :label="data.tabInfo['d']" name="d"></el-tab-pane>
|
||||
<el-tab-pane :label="data.tabInfo['e']" name="e"></el-tab-pane>
|
||||
</el-tabs>
|
||||
<el-table v-loading="loading" :data="problemmodifyList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="${comment}" align="center" prop="id" />
|
||||
<el-table-column label="租户ID" align="center" prop="comId" />
|
||||
<el-table-column label="项目id" align="center" prop="projectId" />
|
||||
<el-table-column label="信息类型" align="center" prop="infoType" />
|
||||
<el-table-column label="留痕图片" align="center" prop="marksPicture" />
|
||||
<el-table-column label="留痕视频" align="center" prop="marksVideo" />
|
||||
<el-table-column label="整改图片" align="center" prop="correctionPicture" />
|
||||
<el-table-column label="拍摄位置" align="center" prop="problemArea" />
|
||||
<el-table-column label="施工部位" align="center" prop="workParts" />
|
||||
<el-table-column label="整改要求" align="center" prop="changeInfo" />
|
||||
<el-table-column label="主送人姓名" align="center" prop="lordSent" />
|
||||
<el-table-column label="主送人手机号" align="center" prop="lordSentUser" />
|
||||
<el-table-column label="抄送人姓名" align="center" prop="copySend" />
|
||||
<el-table-column label="抄送人手机号" align="center" prop="copySendUser" />
|
||||
<el-table-column label="流程状态" align="center" prop="checkState" />
|
||||
<el-table-column label="整改定位" align="center" prop="nickedArea" />
|
||||
<el-table-column label="整改截至时间" align="center" prop="nickedTime" width="180">
|
||||
<el-table v-loading="loading" :data="problemmodifyList">
|
||||
<el-table-column prop="id" width="55" label="序号" align="center">
|
||||
<template #default="scope">{{ scope.$index + 1 + (queryParams.pageNum - 1) * queryParams.pageSize }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="问题图片" align="center" prop="smarkUrl">
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.nickedTime, '{y}-{m}-{d}') }}</span>
|
||||
<el-image :src="scope.row.smarkUrlPic" style="height:80px;" :preview-teleported="true"
|
||||
:preview-src-list="scope.row.smarkUrlPics"></el-image>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工程类型" align="center" prop="projectType" />
|
||||
<el-table-column label="工序名称" align="center" prop="processName" />
|
||||
<el-table-column label="工程名称" align="center" prop="projectName" />
|
||||
<el-table-column label="留痕说明" align="center" prop="nickedInfo" />
|
||||
<el-table-column label="审核人" align="center" prop="checkUser" />
|
||||
<el-table-column label="审核人手机号" align="center" prop="checkUserPhone" />
|
||||
<el-table-column label="智能公司展示的图片url" align="center" prop="smarkUrl" />
|
||||
<el-table-column label="删除状态" align="center" prop="isDel" />
|
||||
<el-table-column label="创建人" align="center" prop="createUser" />
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
||||
<el-table-column label="检查类型" align="center" prop="problemType">
|
||||
<template #default="scope">
|
||||
<dict-tag :options="ssp_proble_type" :value="scope.row.problemType" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="隐患类型" align="center" prop="dangerType">
|
||||
<template #default="scope">
|
||||
<dict-tag :options="ssp_proble_sub_type" :value="scope.row.dangerType" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="施工部位" align="center" prop="workParts" />
|
||||
<el-table-column label="整改要求" align="center" prop="changeInfo" />
|
||||
<el-table-column label="整改截至时间" align="center" prop="nickedTime" width="120" />
|
||||
<el-table-column label="整改人" align="center" prop="lordSent" width="200" />
|
||||
<el-table-column label="复检人" align="center" prop="recheckSend" width="200" />
|
||||
<el-table-column label="抄送人" align="center" prop="copySendUser" width="200" />
|
||||
<el-table-column label="流程状态" align="center" prop="checkState">
|
||||
<template #default="scope">
|
||||
<dict-tag :options="data.checkStates" :value="scope.row.checkState" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="提交人" align="center" prop="createUser" />
|
||||
<el-table-column label="提交时间" align="center" prop="createTime" width="180">
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="修改人" align="center" prop="updateUser" />
|
||||
<el-table-column label="修改时间" align="center" prop="updateTime" width="180">
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right">
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="隐患类型" align="center" prop="dangerType" />
|
||||
<el-table-column label="复检人" align="center" prop="recheckSend" />
|
||||
<el-table-column label="复检人手机号" align="center" prop="recheckSendUser" />
|
||||
<el-table-column label="角色类型" align="center" prop="roleType" />
|
||||
<el-table-column label="问题类型" align="center" prop="problemType" />
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['trouble:problemmodify:edit']">修改</el-button>
|
||||
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
|
||||
v-hasPermi="['trouble:problemmodify:remove']">删除</el-button>
|
||||
|
||||
<el-button v-if="getIsModify(scope.row)" link type="primary" size="small" :icon="Check"
|
||||
@click="handleModify(scope.row)" v-hasPermi="['trouble:problemmodify:edit']">处理</el-button>
|
||||
<el-button size="small" :icon="Document" link type="primary" @click="handleDetail(scope.row)"
|
||||
v-hasPermi="['trouble:problemmodify:query']">详情</el-button>
|
||||
<el-button v-if="getIsVdel(scope.row)" size="small" link type="primary" :icon="Delete"
|
||||
@click="handleDelete(scope.row)" v-hasPermi="['trouble:problemmodify:remove']">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||
|
||||
<detailDrawer ref="detailDrawerRef"></detailDrawer>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup name="Problemmodify">
|
||||
import detailDrawer from "./detailDrawer.vue";
|
||||
import { Check, Document, Delete } from '@element-plus/icons-vue'
|
||||
import { listProblemmodify, getProblemmodify, delProblemmodify, addProblemmodify, updateProblemmodify, getListCount } from "@/api/trouble/problemmodify";
|
||||
|
||||
const { proxy } = getCurrentInstance();
|
||||
const { ssp_proble_type, ssp_proble_sub_type } = proxy.useDict('ssp_proble_type', 'ssp_proble_sub_type');
|
||||
const problemmodifyList = ref([]);
|
||||
|
|
@ -114,7 +107,7 @@ const single = ref(true);
|
|||
const multiple = ref(true);
|
||||
const total = ref(0);
|
||||
const title = ref("");
|
||||
|
||||
const detailDrawerRef = ref();
|
||||
const data = reactive({
|
||||
form: {},
|
||||
queryParams: {
|
||||
|
|
@ -135,7 +128,10 @@ const data = reactive({
|
|||
],
|
||||
},
|
||||
activeName: 'a',
|
||||
tabInfo: {}
|
||||
tabInfo: {},
|
||||
checkStates: [{ value: "0", label: '待整改' }, { value: "1", label: '待复检' },
|
||||
{ value: "2", label: '复检驳回' },
|
||||
{ value: "3", label: '复检通过' }]
|
||||
});
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data);
|
||||
|
|
@ -156,60 +152,39 @@ function getList() {
|
|||
postData.updateTime = queryParams.value.dataRange[1];
|
||||
}
|
||||
listProblemmodify(postData).then(response => {
|
||||
problemmodifyList.value = response.rows;
|
||||
problemmodifyList.value = (response.rows || []).map(it => {
|
||||
it.smarkUrlPic = it.smarkUrl.split(",")[0];
|
||||
it.smarkUrlPics = it.smarkUrl.split(",")
|
||||
return it;
|
||||
});
|
||||
total.value = response.total;
|
||||
loading.value = false;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
// 表单重置
|
||||
function reset() {
|
||||
form.value = {
|
||||
id: null,
|
||||
comId: null,
|
||||
projectId: null,
|
||||
infoType: null,
|
||||
marksPicture: null,
|
||||
marksVideo: null,
|
||||
correctionPicture: null,
|
||||
problemArea: null,
|
||||
workParts: null,
|
||||
changeInfo: null,
|
||||
lordSent: null,
|
||||
lordSentUser: null,
|
||||
copySend: null,
|
||||
copySendUser: null,
|
||||
checkState: null,
|
||||
nickedArea: null,
|
||||
nickedTime: null,
|
||||
projectType: null,
|
||||
processName: null,
|
||||
projectName: null,
|
||||
nickedInfo: null,
|
||||
checkUser: null,
|
||||
checkUserPhone: null,
|
||||
smarkUrl: null,
|
||||
isDel: null,
|
||||
createUser: null,
|
||||
createTime: null,
|
||||
updateUser: null,
|
||||
updateTime: null,
|
||||
dangerType: null,
|
||||
recheckSend: null,
|
||||
recheckSendUser: null,
|
||||
roleType: null,
|
||||
problemType: null
|
||||
};
|
||||
proxy.resetForm("problemmodifyRef");
|
||||
}
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
function handleQuery() {
|
||||
queryParams.value.pageNum = 1;
|
||||
getCount();
|
||||
getList();
|
||||
}
|
||||
|
||||
function tabClick() {
|
||||
setTimeout(handleQuery, 800);
|
||||
}
|
||||
|
||||
function handleModify(row) {
|
||||
|
||||
}
|
||||
function handleDetail(row) {
|
||||
detailDrawerRef.value.showDrawer(row);
|
||||
}
|
||||
function getIsVdel(row) {
|
||||
return true;
|
||||
}
|
||||
function getIsModify(row) {
|
||||
return true;
|
||||
}
|
||||
/** 重置按钮操作 */
|
||||
function resetQuery() {
|
||||
proxy.resetForm("queryRef");
|
||||
|
|
@ -223,46 +198,6 @@ function handleSelectionChange(selection) {
|
|||
single.value = selection.length != 1;
|
||||
multiple.value = !selection.length;
|
||||
}
|
||||
|
||||
/** 新增按钮操作 */
|
||||
function handleAdd() {
|
||||
reset();
|
||||
open.value = true;
|
||||
title.value = "添加安全隐患整改";
|
||||
}
|
||||
|
||||
/** 修改按钮操作 */
|
||||
function handleUpdate(row) {
|
||||
reset();
|
||||
const _id = row.id || ids.value
|
||||
getProblemmodify(_id).then(response => {
|
||||
form.value = response.data;
|
||||
open.value = true;
|
||||
title.value = "修改安全隐患整改";
|
||||
});
|
||||
}
|
||||
|
||||
/** 提交按钮 */
|
||||
function submitForm() {
|
||||
proxy.$refs["problemmodifyRef"].validate(valid => {
|
||||
if (valid) {
|
||||
if (form.value.id != null) {
|
||||
updateProblemmodify(form.value).then(response => {
|
||||
proxy.$modal.msgSuccess("修改成功");
|
||||
open.value = false;
|
||||
getList();
|
||||
});
|
||||
} else {
|
||||
addProblemmodify(form.value).then(response => {
|
||||
proxy.$modal.msgSuccess("新增成功");
|
||||
open.value = false;
|
||||
getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/** 删除按钮操作 */
|
||||
function handleDelete(row) {
|
||||
const _ids = row.id || ids.value;
|
||||
|
|
@ -305,10 +240,10 @@ function getCount() {
|
|||
data.tabInfo[it.projectName] = obj[it.projectName] + `(${it.id || 0})`
|
||||
});
|
||||
});
|
||||
handleQuery();
|
||||
}
|
||||
|
||||
getCount();
|
||||
handleQuery();
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.trouble-problemodify-index {
|
||||
|
|
|
|||
Loading…
Reference in New Issue