|
@@ -182,7 +182,7 @@
|
|
>
|
|
>
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
<el-button
|
|
<el-button
|
|
- v-if="scope.row.status === 20"
|
|
|
|
|
|
+ v-if="scope.row.status != 0"
|
|
link
|
|
link
|
|
type="primary"
|
|
type="primary"
|
|
@click="handleDetail(scope.row)"
|
|
@click="handleDetail(scope.row)"
|
|
@@ -220,6 +220,40 @@
|
|
@pagination="getList"
|
|
@pagination="getList"
|
|
/>
|
|
/>
|
|
|
|
|
|
|
|
+ <!-- 提交检查单/检查单详情模态框 -->
|
|
|
|
+ <el-dialog
|
|
|
|
+ :title="titleSubmit"
|
|
|
|
+ v-model="showSubmitCheck"
|
|
|
|
+ width="900px"
|
|
|
|
+ append-to-body
|
|
|
|
+ >
|
|
|
|
+ <!-- 设置对话框内容高度 -->
|
|
|
|
+ <div style="height:70vh;">
|
|
|
|
+ <el-scrollbar>
|
|
|
|
+ <submit-danger-check
|
|
|
|
+ ref="refSubmitCheck"
|
|
|
|
+ v-if="showSubmitCheck"
|
|
|
|
+ :checkRecordId="submitItem.id"
|
|
|
|
+ :checkFormNo="submitItem.checkFormNo"
|
|
|
|
+ :isSubmit="isSubmit"
|
|
|
|
+ :showDetail="showDetail"
|
|
|
|
+ @closeCallback="submitCallBack"
|
|
|
|
+ ></submit-danger-check>
|
|
|
|
+ </el-scrollbar>
|
|
|
|
+ </div>
|
|
|
|
+ <template #footer>
|
|
|
|
+ <div class="dialog-footer">
|
|
|
|
+ <el-button
|
|
|
|
+ v-if="!showDetail"
|
|
|
|
+ :loading="loadingSubmitCheck"
|
|
|
|
+ type="primary"
|
|
|
|
+ @click="submitCheck"
|
|
|
|
+ >提 交</el-button>
|
|
|
|
+ <el-button @click="showSubmitCheck = false">取 消</el-button>
|
|
|
|
+ </div>
|
|
|
|
+ </template>
|
|
|
|
+ </el-dialog>
|
|
|
|
+
|
|
<!-- 撤回申请模态框 -->
|
|
<!-- 撤回申请模态框 -->
|
|
<el-dialog
|
|
<el-dialog
|
|
:title="titleRevoke"
|
|
:title="titleRevoke"
|
|
@@ -258,9 +292,10 @@ import { listAllGridCategory } from "@/api/grid/GridCategory";
|
|
import { listAllDangerCategory } from "@/api/danger/DangerCategory";
|
|
import { listAllDangerCategory } from "@/api/danger/DangerCategory";
|
|
import { listEnumValue } from "@/api/system/base"
|
|
import { listEnumValue } from "@/api/system/base"
|
|
import {
|
|
import {
|
|
- submit, detail, modify, listMine, listAdminMine
|
|
|
|
|
|
+ submit, detail, listMine, listAdminMine, revoke
|
|
} from "@/api/form/DangerCheckRecord";
|
|
} from "@/api/form/DangerCheckRecord";
|
|
import { parseTime } from "@/utils/ruoyi"
|
|
import { parseTime } from "@/utils/ruoyi"
|
|
|
|
+import SubmitDangerCheck from '@/views/grid/components/SubmitDangerCheck';
|
|
|
|
|
|
const { proxy } = getCurrentInstance();
|
|
const { proxy } = getCurrentInstance();
|
|
|
|
|
|
@@ -273,6 +308,14 @@ const checkFormStatusList = ref([]);
|
|
const dataList = ref([]);
|
|
const dataList = ref([]);
|
|
|
|
|
|
|
|
|
|
|
|
+const showSubmitCheck = ref(false);
|
|
|
|
+const submitItem = ref({});
|
|
|
|
+const loadingSubmitCheck = ref(false);
|
|
|
|
+const titleSubmit = ref('');
|
|
|
|
+const showDetail = ref(false);
|
|
|
|
+const isSubmit = ref(true);
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
const titleRevoke = ref('');
|
|
const titleRevoke = ref('');
|
|
const showRevoke = ref(false);
|
|
const showRevoke = ref(false);
|
|
@@ -294,9 +337,6 @@ const dateRangeCheckTime = ref([]);
|
|
const ids = ref([]);
|
|
const ids = ref([]);
|
|
const single = ref(true);
|
|
const single = ref(true);
|
|
const multiple = ref(true);
|
|
const multiple = ref(true);
|
|
-const title = ref("");
|
|
|
|
-const cancelModifyTxt = ref("取 消");
|
|
|
|
-const isDetail = ref(false);
|
|
|
|
|
|
|
|
const queryParams = ref({
|
|
const queryParams = ref({
|
|
page: 1,
|
|
page: 1,
|
|
@@ -354,6 +394,36 @@ function handleSelectionChange(selection) {
|
|
|
|
|
|
/** 详情按钮 */
|
|
/** 详情按钮 */
|
|
function handleDetail(row) {
|
|
function handleDetail(row) {
|
|
|
|
+ submitItem.value = row;
|
|
|
|
+ isSubmit.value = false;
|
|
|
|
+ showSubmitCheck.value = true;
|
|
|
|
+ showDetail.value = true;
|
|
|
|
+ titleSubmit.value = '隐患检查单 - ' + row.checkFormNo;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+/** 指定网格-填报 */
|
|
|
|
+function handleDoForm(row) {
|
|
|
|
+ if (row.checkFormId === 0) {
|
|
|
|
+ proxy.$modal.msgError("当前网格没有配置检查表!");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ submitItem.value = row;
|
|
|
|
+ isSubmit.value = true;
|
|
|
|
+ showSubmitCheck.value = true;
|
|
|
|
+ showDetail.value = false;
|
|
|
|
+ titleSubmit.value = '隐患检查单 - ' + row.checkFormNo;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+function submitCheck() {
|
|
|
|
+ // 调用子组件的函数
|
|
|
|
+ proxy.$refs.refSubmitCheck.submitCheck();
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+function submitCallBack() {
|
|
|
|
+ showSubmitCheck.value = false;
|
|
|
|
+ getList();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -374,7 +444,7 @@ function revokeSubmit() {
|
|
if (valid) {
|
|
if (valid) {
|
|
loadingRevoke.value = true;
|
|
loadingRevoke.value = true;
|
|
revoke(formRevoke.value).then((response) => {
|
|
revoke(formRevoke.value).then((response) => {
|
|
- getListPerson();
|
|
|
|
|
|
+ getList();
|
|
})
|
|
})
|
|
.finally(() => {
|
|
.finally(() => {
|
|
showRevoke.value = false;
|
|
showRevoke.value = false;
|
|
@@ -391,7 +461,7 @@ function onSubmitAdmin(id) {
|
|
proxy.$modal.confirm('确认要提交到网格管理员吗?')
|
|
proxy.$modal.confirm('确认要提交到网格管理员吗?')
|
|
.then(() => {
|
|
.then(() => {
|
|
submitAdmin(id).then((response) => {
|
|
submitAdmin(id).then((response) => {
|
|
- getListPerson();
|
|
|
|
|
|
+ getList();
|
|
})
|
|
})
|
|
.finally(() => {
|
|
.finally(() => {
|
|
//createLoading.value = false;
|
|
//createLoading.value = false;
|