admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2023-06-07 16:32:03 +08:00
parent 69b6f6c4a9
commit a8cc3cbd23
13 changed files with 217 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/modules/goverment.ts
View File

@ -315,9 +315,9 @@ export const allOptionAudit = (params: any) => {
export const timeLineData = (params: { inspectQuestionId: string }) => {
return http.post(BASEURL + `/gov/inspectQuestionExamine/list`, params);
};
// 质量检查库大项分页列表
// 质量检查库大项列表
export const bigStore = (params: FormData) => {
return http.post(BASEURL + `/gov/inspectLibrary/page`, params);
return http.post(BASEURL + `/gov/inspectLibrary/list`, params);
};
// 质量检查库大项新增
export const bigStoreAdd = (params: FormData) => {

39
src/views/enterprise/qualitySupervision/components/transformInfo.vue
View File

@ -16,7 +16,8 @@
<el-row :gutter="20">
<el-col :span="8">
<span class="row-span"
>检查情况：{{
>检查情况：
<span>{{
basicData?.state == 1
? "执法中"
: basicData?.state == 2
@ -28,8 +29,8 @@
: basicData?.state == 5
? "已驳回"
: ""
}}</span
>
}}</span>
</span>
</el-col>
<el-col :span="8">
<span class="row-span">工程名称：{{ basicData?.engineeringName }}</span></el-col
@ -81,18 +82,17 @@
<div class="table">
<el-table
:data="recordData"
border
max-height="340"
class="el-table"
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
:row-style="{ height: '40px' }"
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center', height: '40px' }"
:cell-style="{ textAlign: 'center', height: '40px' }"
@row-click="rowClick"
>
<el-table-column prop="createByName" label="创建人" />
<el-table-column prop="questionDesc" label="隐患问题" />
<el-table-column label="隐患照片">
<template #default="scope">
<el-image style="width: 26px; height: 37px" :src="scope.row.image[0].url" fit="fill"></el-image>
<el-image style="width: 38px; height: 28px" :src="scope.row.image[0].url" fit="fill"></el-image>
</template>
</el-table-column>
<el-table-column prop="state" label="整改状态">
@ -126,7 +126,7 @@
<close @click="closeSecondary" />
</el-icon>
</div>
<div class="content-title">隐患记录</div>
<div class="content-title">隐患问题</div>
<div class="row">
<span>创建人:</span>
<span>{{ recordRowData.createByName }}</span>
@ -151,7 +151,11 @@
</div>
<div class="situation">
<span>整改情况</span>
<el-button type="success" @click="addSituation" v-if="recordRowData.state === 1 || recordRowData.state === 4"
<el-button
style="height: 21px"
type="success"
@click="addSituation"
v-if="recordRowData.state === 1 || recordRowData.state === 4"
>新增整改记录</el-button
>
</div>
@ -339,7 +343,7 @@ const getInfo = async () => {
recordData.value = res.result.inspectQuestionList;
recordData.value.map(item => {
item.image = eval(item.image);
if (item.state != 3) {
if (item.state == 1 || item.state == 4) {
isFinished.value = false;
}
});
@ -366,12 +370,9 @@ watch(
() => props.detailsDialog,
(n, o) => {
visible1.value = n;
}
);
watch(
() => props.relativeId,
(n, o) => {
getInfo();
if (n) {
getInfo();
}
}
);
// 监听el-dialog显示状态，再通过@update:visible 通知父组件，一般是用于关
@ -435,6 +436,10 @@ onMounted(() => {});
font-family: Source Han Sans CN-Medium, Source Han Sans CN;
font-weight: 500;
color: #333333;
> span {
font-weight: 400;
color: #008bff;
}
}
}
}

39
src/views/enterprise/safetySupervision/components/transformInfo.vue
View File

@ -16,7 +16,8 @@
<el-row :gutter="20">
<el-col :span="8">
<span class="row-span"
>检查情况：{{
>检查情况：
<span>{{
basicData?.state == 1
? "执法中"
: basicData?.state == 2
@ -28,8 +29,8 @@
: basicData?.state == 5
? "已驳回"
: ""
}}</span
>
}}</span>
</span>
</el-col>
<el-col :span="8">
<span class="row-span">工程名称：{{ basicData?.engineeringName }}</span></el-col
@ -81,18 +82,17 @@
<div class="table">
<el-table
:data="recordData"
border
max-height="340"
class="el-table"
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
:row-style="{ height: '40px' }"
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center', height: '40px' }"
:cell-style="{ textAlign: 'center', height: '40px' }"
@row-click="rowClick"
>
<el-table-column prop="createByName" label="创建人" />
<el-table-column prop="questionDesc" label="隐患问题" />
<el-table-column label="隐患照片">
<template #default="scope">
<el-image style="width: 26px; height: 37px" :src="scope.row.image[0].url" fit="fill"></el-image>
<el-image style="width: 38px; height: 28px" :src="scope.row.image[0].url" fit="fill"></el-image>
</template>
</el-table-column>
<el-table-column prop="state" label="整改状态">
@ -126,7 +126,7 @@
<close @click="closeSecondary" />
</el-icon>
</div>
<div class="content-title">隐患记录</div>
<div class="content-title">隐患问题</div>
<div class="row">
<span>创建人:</span>
<span>{{ recordRowData.createByName }}</span>
@ -151,7 +151,11 @@
</div>
<div class="situation">
<span>整改情况</span>
<el-button type="success" @click="addSituation" v-if="recordRowData.state === 1 || recordRowData.state === 4"
<el-button
style="height: 21px"
type="success"
@click="addSituation"
v-if="recordRowData.state === 1 || recordRowData.state === 4"
>新增整改记录</el-button
>
</div>
@ -340,7 +344,7 @@ const getInfo = async () => {
recordData.value = res.result.inspectQuestionList;
recordData.value.map(item => {
item.image = eval(item.image);
if (item.state != 3) {
if (item.state == 1 || item.state == 4) {
isFinished.value = false;
}
});
@ -367,12 +371,9 @@ watch(
() => props.detailsDialog,
(n, o) => {
visible1.value = n;
}
);
watch(
() => props.relativeId,
(n, o) => {
getInfo();
if (n) {
getInfo();
}
}
);
// 监听el-dialog显示状态，再通过@update:visible 通知父组件，一般是用于关
@ -436,6 +437,10 @@ onMounted(() => {});
font-family: Source Han Sans CN-Medium, Source Han Sans CN;
font-weight: 500;
color: #333333;
> span {
font-weight: 400;
color: #008bff;
}
}
}
}

2
src/views/enterprise/userManagement/departmentManage/index.vue
View File

@ -44,7 +44,7 @@
</el-form-item>
</el-form>
<div class="form-btn">
<el-button style="margin-right: 60px" @click="onReset" class="cancelButtonStyle">重置</el-button>
<!-- <el-button style="margin-right: 60px" @click="onReset" class="cancelButtonStyle">重置</el-button> -->
<el-button type="primary" @click="onSubmit">保存</el-button>
</div>
</div>

1
src/views/goverment/notice/myPosted/index.vue
View File

@ -180,6 +180,7 @@ const handleEditItem = async (row: any) => {
const { result } = await noticeDetailMyPost({ noticeId: row.noticeId });
console.log(result);
store.Message = result;
console.log(store.Message);
router.push({ path: "/goverment/notice/newNotification/index", query: { noticeId: row.noticeId } });
};

61
src/views/goverment/notice/newNotification/index.vue
View File

@ -203,8 +203,58 @@ let nameList = computed(val => {
});
const onChange = (row: any) => {
console.log(tags);
console.log(row);
tags.value = tags.value.includes(row) ? tags.value.filter(item => item !== row) : [...tags.value, row];
let isExist = -1;
isExist = tags.value.find(item => {
if (item.acceptName) {
return (
item.acceptName == row.realName ||
item.acceptName == row.enterpriseName ||
item.acceptName == row.projectName ||
item.acceptName == row.acceptName
);
} else {
if (item.realName) {
return item.realName == row.realName;
} else if (item.enterpriseName) {
return item.enterpriseName == row.enterpriseName;
} else if (item.projectName) {
return item.projectName == row.projectName;
} else if (item.acceptName) {
return item.acceptName == row.acceptName;
}
}
});
console.log(isExist);
if (isExist) {
tags.value = tags.value.filter(item => {
if (item.acceptName) {
if (row.realName) {
return item.acceptName != row.realName;
} else if (row.enterpriseName) {
return item.acceptName != row.enterpriseName;
} else if (row.projectName) {
return item.acceptName != row.projectName;
} else if (row.acceptName) {
return item.acceptName != row.acceptName;
}
} else {
if (item.realName) {
return item.realName != row.realName;
} else if (item.enterpriseName) {
return item.enterpriseName != row.enterpriseName;
} else if (item.projectName) {
return item.projectName != row.projectName;
} else if (item.acceptName) {
return item.acceptName != row.acceptName;
}
}
});
console.log(tags.value);
} else {
tags.value = [...tags.value, row];
}
};
const onAddData = () => {
@ -262,6 +312,7 @@ const handleSubmit = async (formEl: FormInstance | undefined) => {
} else {
(curr.accept = item.projectSn), (curr.acceptType = 4);
}
console.log(curr);
acceptsList.push(curr);
});
@ -274,7 +325,7 @@ const handleSubmit = async (formEl: FormInstance | undefined) => {
});
});
await noticeeditmyPost({
accepts: tags.value,
accepts: acceptsList,
annexFileList: editFiles,
content: leftForm.value.content,
title: leftForm.value.title,
@ -331,8 +382,8 @@ onMounted(async () => {
const res2 = await getproNamelist({});
// @ts-expect-error
proList.value = res2.result;
if (store.Message) {
console.log(store.Message);
if (store.Message && route.query.noticeId) {
// searchForm.value.type = store.Message.type;
searchForm.value.type = typeList.value[Number(store.Message.type)].value;
console.log(leftForm.value.content);
@ -358,7 +409,7 @@ onMounted(async () => {
});
item.files = files;
item.fileName = store.Message?.title;
// item.fileName = store.Message?.title;
});
tags.value = store.Message.acceptList;

26
src/views/goverment/qualitySupervision/checkStore/index.vue
View File

@ -2,8 +2,8 @@
<div class="store-box">
<div class="menu-content">
<div class="top-search">
<!-- <el-input placeholder="请输入" /> -->
<span>质量检测库--大项</span>
<el-input placeholder="请输入" v-model="bigForm.name" @input="getBigData" />
<!-- <span>质量检测库--大项</span> -->
<el-button type="primary" @click="opeateBigItem(1)">增加大项</el-button>
</div>
<div class="big-option">
@ -11,8 +11,11 @@
<template #default="{ node, data }">
<span class="custom-tree-node" @click.capture="selectTree(data)">
<span>{{ data.name }}</span>
<span @click="opeateBigItem(2, data)">编辑</span>
<span @click="deleteBigItem(data)">删除</span>
<el-button type="primary" link @click="opeateBigItem(2, data)">
<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
<span>编辑</span>
</el-button>
<el-button type="danger" style="margin-right: 5px" link :icon="Delete" @click="deleteBigItem(data)">删除</el-button>
</span>
</template>
</el-tree>
@ -119,6 +122,9 @@ const bigData = ref([
]
}
]);
const bigForm = ref({
name: ""
});
// 大项弹窗中的配置
const formBigConfig = {
formItemConfig: [
@ -138,7 +144,7 @@ const formSmallConfig = {
type: "input"
},
{
label: "小项描述",
label: "描述",
prop: "description",
type: "input"
}
@ -235,8 +241,8 @@ const handleAddItem = (index: number, row: any) => {
};
const getBigData = async () => {
// 大项列表
const { result } = await bigStore({ type: 2 });
bigData.value = result.records;
const { result } = await bigStore({ name: bigForm.value.name, type: 2 });
bigData.value = result;
};
// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
// 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList"
@ -304,13 +310,9 @@ onMounted(() => {
width: 100%;
display: flex;
align-items: center;
span:first-child {
> span:first-child {
margin-right: auto;
}
span:not(:first-child) {
color: #008bff;
margin-right: 10px;
}
}
:deep(.el-tree-node__content) {
height: 35px !important;

37
src/views/goverment/qualitySupervision/components/transformInfo.vue
View File

@ -16,7 +16,8 @@
<el-row :gutter="20">
<el-col :span="8">
<span class="row-span"
>检查情况：{{
>检查情况：
<span>{{
basicData?.state == 1
? "执法中"
: basicData?.state == 2
@ -28,8 +29,8 @@
: basicData?.state == 5
? "已驳回"
: ""
}}</span
>
}}</span>
</span>
</el-col>
<el-col :span="8">
<span class="row-span">工程名称：{{ basicData?.engineeringName }}</span></el-col
@ -81,18 +82,17 @@
<div class="table">
<el-table
:data="recordData"
border
max-height="340"
class="el-table"
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
:row-style="{ height: '40px' }"
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center', height: '40px' }"
:cell-style="{ textAlign: 'center', height: '40px' }"
@row-click="rowClick"
>
<el-table-column prop="createByName" label="创建人" />
<el-table-column prop="questionDesc" label="隐患问题" />
<el-table-column label="隐患照片">
<template #default="scope">
<el-image style="width: 26px; height: 37px" :src="scope.row.image[0].url" fit="fill"></el-image>
<el-image style="width: 38px; height: 28px" :src="scope.row.image[0].url" fit="fill"></el-image>
</template>
</el-table-column>
<el-table-column prop="state" label="整改状态">
@ -112,8 +112,10 @@
</el-table-column>
</el-table>
</div>
<div class="operation-btn" v-if="basicData?.state != 1">
<el-button type="info" style="margin-right: 98px" @click="backAll">驳回,请尽快整改</el-button>
<div class="operation-btn" v-if="basicData?.state != 1 || basicData?.state != 4">
<el-button type="info" style="margin-right: 98px; border: 0; background-color: #e6e6e6; color: #000000" @click="backAll"
>驳回,请尽快整改</el-button
>
<el-button type="primary" @click="allSubmit">整改完成,全部合格</el-button>
</div>
</div>
@ -125,7 +127,7 @@
<close @click="closeSecondary" />
</el-icon>
</div>
<div class="content-title">隐患记录</div>
<div class="content-title">隐患问题</div>
<div class="row">
<span>创建人:</span>
<span>{{ recordRowData.createByName }}</span>
@ -338,12 +340,9 @@ watch(
() => props.detailsDialog,
(n, o) => {
visible1.value = n;
}
);
watch(
() => props.relativeId,
(n, o) => {
getInfo();
if (n) {
getInfo();
}
}
);
// 监听el-dialog显示状态，再通过@update:visible 通知父组件，一般是用于关
@ -408,6 +407,10 @@ onMounted(() => {});
font-weight: 500;
color: #333333;
}
> span {
font-weight: 400;
color: #008bff;
}
}
}
.detail-table {

35
src/views/goverment/safetySupervision/checkStore/index.vue
View File

@ -2,24 +2,20 @@
<div class="store-box">
<div class="menu-content">
<div class="top-search">
<!-- <el-input placeholder="请输入" /> -->
<span>质量检测库--大项</span>
<el-input placeholder="请输入" v-model="bigForm.name" @input="getBigData" />
<!-- <span>安全检测库--大项</span> -->
<el-button type="primary" @click="opeateBigItem(1)">增加大项</el-button>
</div>
<div class="big-option">
<el-tree
:data="bigData"
:highlight-current="true"
node-key="id"
default-expand-all
:expand-on-click-node="false"
:default-checked-keys="[bigData[0]?.id]"
>
<el-tree :data="bigData" :highlight-current="true" node-key="id" default-expand-all :expand-on-click-node="false">
<template #default="{ node, data }">
<span class="custom-tree-node" @click.capture="selectTree(data)">
<span>{{ data.name }}</span>
<span @click="opeateBigItem(2, data)">编辑</span>
<span @click="deleteBigItem(data)">删除</span>
<el-button type="primary" link @click="opeateBigItem(2, data)">
<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
<span>编辑</span>
</el-button>
<el-button type="danger" style="margin-right: 5px" link :icon="Delete" @click="deleteBigItem(data)">删除</el-button>
</span>
</template>
</el-tree>
@ -105,6 +101,9 @@ const formSmallData = ref({
const bigVisible = ref(false);
const smallVisible = ref(false);
const bigData = ref([]);
const bigForm = ref({
name: ""
});
// 大项弹窗中的配置
const formBigConfig = {
formItemConfig: [
@ -124,7 +123,7 @@ const formSmallConfig = {
type: "input"
},
{
label: "小项描述",
label: "描述",
prop: "description",
type: "input"
}
@ -221,8 +220,8 @@ const handleAddItem = (index: number, row: any) => {
};
const getBigData = async () => {
// 大项列表
const { result } = await bigStore({ type: 1 });
bigData.value = result.records;
const { result } = await bigStore({ name: bigForm.value.name, type: 1 });
bigData.value = result;
};
// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
// 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList"
@ -291,13 +290,9 @@ onMounted(() => {
width: 100%;
display: flex;
align-items: center;
span:first-child {
> span:first-child {
margin-right: auto;
}
span:not(:first-child) {
color: #008bff;
margin-right: 10px;
}
}
:deep(.el-tree-node__content) {
height: 35px !important;

37
src/views/goverment/safetySupervision/components/transformInfo.vue
View File

@ -16,7 +16,8 @@
<el-row :gutter="20">
<el-col :span="8">
<span class="row-span"
>检查情况：{{
>检查情况：
<span>{{
basicData?.state == 1
? "执法中"
: basicData?.state == 2
@ -28,8 +29,8 @@
: basicData?.state == 5
? "已驳回"
: ""
}}</span
>
}}</span>
</span>
</el-col>
<el-col :span="8">
<span class="row-span">工程名称：{{ basicData?.engineeringName }}</span></el-col
@ -81,18 +82,17 @@
<div class="table">
<el-table
:data="recordData"
border
max-height="340"
class="el-table"
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
:row-style="{ height: '40px' }"
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center', height: '40px' }"
:cell-style="{ textAlign: 'center', height: '40px' }"
@row-click="rowClick"
>
<el-table-column prop="createByName" label="创建人" />
<el-table-column prop="questionDesc" label="隐患问题" />
<el-table-column label="隐患照片">
<template #default="scope">
<el-image style="width: 26px; height: 37px" :src="scope.row.image[0].url" fit="fill"></el-image>
<el-image style="width: 38px; height: 28px" :src="scope.row.image[0].url" fit="fill"></el-image>
</template>
</el-table-column>
<el-table-column prop="state" label="整改状态">
@ -112,8 +112,10 @@
</el-table-column>
</el-table>
</div>
<div class="operation-btn" v-if="basicData?.state != 1">
<el-button type="info" style="margin-right: 98px" @click="backAll">驳回,请尽快整改</el-button>
<div class="operation-btn" v-if="basicData?.state != 1 || basicData?.state != 4">
<el-button type="info" style="margin-right: 98px; border: 0; background-color: #e6e6e6; color: #000000" @click="backAll"
>驳回,请尽快整改</el-button
>
<el-button type="primary" @click="allSubmit">整改完成,全部合格</el-button>
</div>
</div>
@ -125,7 +127,7 @@
<close @click="closeSecondary" />
</el-icon>
</div>
<div class="content-title">隐患记录</div>
<div class="content-title">隐患问题</div>
<div class="row">
<span>创建人:</span>
<span>{{ recordRowData.createByName }}</span>
@ -339,12 +341,9 @@ watch(
() => props.detailsDialog,
(n, o) => {
visible1.value = n;
}
);
watch(
() => props.relativeId,
(n, o) => {
getInfo();
if (n) {
getInfo();
}
}
);
// 监听el-dialog显示状态，再通过@update:visible 通知父组件，一般是用于关
@ -409,6 +408,10 @@ onMounted(() => {});
font-weight: 500;
color: #333333;
}
> span {
font-weight: 400;
color: #008bff;
}
}
}
.detail-table {

37
src/views/project/qualitySupervision/components/transformInfo.vue
View File

@ -16,7 +16,8 @@
<el-row :gutter="20">
<el-col :span="8">
<span class="row-span"
>检查情况：{{
>检查情况：
<span>{{
basicData?.state == 1
? "执法中"
: basicData?.state == 2
@ -28,8 +29,8 @@
: basicData?.state == 5
? "已驳回"
: ""
}}</span
>
}}</span>
</span>
</el-col>
<el-col :span="8">
<span class="row-span">工程名称：{{ basicData?.engineeringName }}</span></el-col
@ -81,18 +82,17 @@
<div class="table">
<el-table
:data="recordData"
border
min-height="340"
class="el-table"
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
:row-style="{ height: '40px' }"
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center', height: '40px' }"
:cell-style="{ textAlign: 'center', height: '40px' }"
@row-click="rowClick"
>
<el-table-column prop="createByName" label="创建人" />
<el-table-column prop="questionDesc" label="隐患问题" />
<el-table-column label="隐患照片">
<template #default="scope">
<el-image style="width: 26px; height: 37px" :src="scope.row.image[0].url" fit="fill"></el-image>
<el-image style="width: 38px; height: 28px" :src="scope.row.image[0].url" fit="fill"></el-image>
</template>
</el-table-column>
<el-table-column prop="state" label="整改状态">
@ -126,7 +126,7 @@
<close @click="closeSecondary" />
</el-icon>
</div>
<div class="content-title">隐患记录</div>
<div class="content-title">隐患问题</div>
<div class="row">
<span>创建人:</span>
<span>{{ recordRowData.createByName }}</span>
@ -151,7 +151,11 @@
</div>
<div class="situation">
<span>整改情况</span>
<el-button type="success" @click="addSituation" v-if="recordRowData.state === 1 || recordRowData.state === 4"
<el-button
style="height: 21px"
type="success"
@click="addSituation"
v-if="recordRowData.state === 1 || recordRowData.state === 4"
>新增整改记录</el-button
>
</div>
@ -367,12 +371,9 @@ watch(
() => props.detailsDialog,
(n, o) => {
visible1.value = n;
}
);
watch(
() => props.relativeId,
(n, o) => {
getInfo();
if (n) {
getInfo();
}
}
);
// 监听el-dialog显示状态，再通过@update:visible 通知父组件，一般是用于关
@ -436,6 +437,10 @@ onMounted(() => {});
font-family: Source Han Sans CN-Medium, Source Han Sans CN;
font-weight: 500;
color: #333333;
> span {
font-weight: 400;
color: #008bff;
}
}
}
}

39
src/views/project/safetySupervision/components/transformInfo.vue
View File

@ -16,7 +16,8 @@
<el-row :gutter="20">
<el-col :span="8">
<span class="row-span"
>检查情况：{{
>检查情况：
<span>{{
basicData?.state == 1
? "执法中"
: basicData?.state == 2
@ -28,8 +29,8 @@
: basicData?.state == 5
? "已驳回"
: ""
}}</span
>
}}</span>
</span>
</el-col>
<el-col :span="8">
<span class="row-span">工程名称：{{ basicData?.engineeringName }}</span></el-col
@ -81,18 +82,17 @@
<div class="table">
<el-table
:data="recordData"
border
max-height="340"
class="el-table"
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
:row-style="{ height: '40px' }"
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center', height: '40px' }"
:cell-style="{ textAlign: 'center', height: '40px' }"
@row-click="rowClick"
>
<el-table-column prop="createByName" label="创建人" />
<el-table-column prop="questionDesc" label="隐患问题" />
<el-table-column label="隐患照片">
<template #default="scope">
<el-image style="width: 26px; height: 37px" :src="scope.row.image[0].url" fit="fill"></el-image>
<el-image style="width: 38px; height: 28px" :src="scope.row.image[0].url" fit="fill"></el-image>
</template>
</el-table-column>
<el-table-column prop="state" label="整改状态">
@ -126,7 +126,7 @@
<close @click="closeSecondary" />
</el-icon>
</div>
<div class="content-title">隐患记录</div>
<div class="content-title">隐患问题</div>
<div class="row">
<span>创建人:</span>
<span>{{ recordRowData.createByName }}</span>
@ -151,7 +151,11 @@
</div>
<div class="situation">
<span>整改情况</span>
<el-button type="success" @click="addSituation" v-if="recordRowData.state === 1 || recordRowData.state === 4"
<el-button
style="height: 21px"
type="success"
@click="addSituation"
v-if="recordRowData.state === 1 || recordRowData.state === 4"
>新增整改记录</el-button
>
</div>
@ -339,7 +343,7 @@ const getInfo = async () => {
recordData.value = res.result.inspectQuestionList;
recordData.value.map(item => {
item.image = eval(item.image);
if (item.state != 3) {
if (item.state == 1 || item.state == 4) {
isFinished.value = false;
}
});
@ -366,12 +370,9 @@ watch(
() => props.detailsDialog,
(n, o) => {
visible1.value = n;
}
);
watch(
() => props.relativeId,
(n, o) => {
getInfo();
if (n) {
getInfo();
}
}
);
// 监听el-dialog显示状态，再通过@update:visible 通知父组件，一般是用于关
@ -435,6 +436,10 @@ onMounted(() => {});
font-family: Source Han Sans CN-Medium, Source Han Sans CN;
font-weight: 500;
color: #333333;
> span {
font-weight: 400;
color: #008bff;
}
}
}
}

2
src/views/project/userManagement/departmentManage/index.vue
View File

@ -44,7 +44,7 @@
</el-form-item>
</el-form>
<div class="form-btn">
<el-button style="margin-right: 60px" @click="onReset" class="cancelButtonStyle">重置</el-button>
<!-- <el-button style="margin-right: 60px" @click="onReset" class="cancelButtonStyle">重置</el-button> -->
<el-button type="primary" @click="onSubmit">保存</el-button>
</div>
</div>