|
@@ -151,7 +151,7 @@
|
|
{{ parseTime(scope.row.createTimeView, '{y}-{m}-{d}') }}
|
|
{{ parseTime(scope.row.createTimeView, '{y}-{m}-{d}') }}
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column label="检查表" width="200" align="left" prop="checkFormName">
|
|
|
|
|
|
+ <el-table-column label="检查表" width="200" align="left" prop="checkFormName" :show-overflow-tooltip="true">
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
{{ scope.row.gridName + " - " + scope.row.checkFormName}}
|
|
{{ scope.row.gridName + " - " + scope.row.checkFormName}}
|
|
</template>
|
|
</template>
|
|
@@ -164,7 +164,7 @@
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column label="检查单号" width="231" align="left" prop="checkFormNo" />
|
|
<el-table-column label="检查单号" width="231" align="left" prop="checkFormNo" />
|
|
- <el-table-column label="所属部门" width="320" align="left" prop="departmentTxt" />
|
|
|
|
|
|
+ <el-table-column label="所属部门" width="280" align="left" prop="departmentTxt" :show-overflow-tooltip="true" />
|
|
<el-table-column label="所属关区" align="center" prop="customsName" />
|
|
<el-table-column label="所属关区" align="center" prop="customsName" />
|
|
<el-table-column label="检查人员" align="center" prop="checkPersonName" />
|
|
<el-table-column label="检查人员" align="center" prop="checkPersonName" />
|
|
<el-table-column label="是否有隐患" width="89" align="center" prop="hasDangerTxt">
|
|
<el-table-column label="是否有隐患" width="89" align="center" prop="hasDangerTxt">
|
|
@@ -180,7 +180,7 @@
|
|
<el-table-column
|
|
<el-table-column
|
|
label="操作"
|
|
label="操作"
|
|
align="left"
|
|
align="left"
|
|
- width="150"
|
|
|
|
|
|
+ width="210"
|
|
fixed="right"
|
|
fixed="right"
|
|
class-name="small-padding fixed-width"
|
|
class-name="small-padding fixed-width"
|
|
>
|
|
>
|
|
@@ -205,6 +205,13 @@
|
|
icon="Edit"
|
|
icon="Edit"
|
|
@click="handleDoForm(scope.row)"
|
|
@click="handleDoForm(scope.row)"
|
|
>填报</el-button>
|
|
>填报</el-button>
|
|
|
|
+ <el-button
|
|
|
|
+ v-if="scope.row.status === 10"
|
|
|
|
+ link
|
|
|
|
+ type="primary"
|
|
|
|
+ icon="Edit"
|
|
|
|
+ @click="handleDoForm(scope.row)"
|
|
|
|
+ >修改</el-button>
|
|
<el-button
|
|
<el-button
|
|
v-if="scope.row.status === 10"
|
|
v-if="scope.row.status === 10"
|
|
link
|
|
link
|
|
@@ -212,6 +219,13 @@
|
|
icon="Promotion"
|
|
icon="Promotion"
|
|
@click="onSubmitAdmin(scope.row.id)"
|
|
@click="onSubmitAdmin(scope.row.id)"
|
|
>提交</el-button>
|
|
>提交</el-button>
|
|
|
|
+ <el-button
|
|
|
|
+ v-if="showGridAdmin && scope.row.revokeStatus === 10"
|
|
|
|
+ link
|
|
|
|
+ type="danger"
|
|
|
|
+ icon="Avatar"
|
|
|
|
+ @click="onRevokeAudit(scope.row)"
|
|
|
|
+ >审核</el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -262,7 +276,7 @@
|
|
<el-dialog
|
|
<el-dialog
|
|
:title="titleRevoke"
|
|
:title="titleRevoke"
|
|
v-model="showRevoke"
|
|
v-model="showRevoke"
|
|
- width="900px"
|
|
|
|
|
|
+ width="600px"
|
|
append-to-body
|
|
append-to-body
|
|
>
|
|
>
|
|
<el-form
|
|
<el-form
|
|
@@ -287,6 +301,42 @@
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
|
+
|
|
|
|
+ <!-- 审核撤回申请模态框 -->
|
|
|
|
+ <el-dialog
|
|
|
|
+ :title="titleRevoke"
|
|
|
|
+ v-model="showRevokeAudit"
|
|
|
|
+ width="600px"
|
|
|
|
+ append-to-body
|
|
|
|
+ >
|
|
|
|
+ <el-form
|
|
|
|
+ ref="refFormRevokeAudit"
|
|
|
|
+ :model="formRevokeAudit"
|
|
|
|
+ :rules="rulesRevokeAudit"
|
|
|
|
+ label-width="85px"
|
|
|
|
+ >
|
|
|
|
+ <el-form-item label="审核结果" prop="result">
|
|
|
|
+ <el-input v-model="formRevokeAudit.id" type="hidden" />
|
|
|
|
+ <el-radio-group v-model="formRevokeAudit.result">
|
|
|
|
+ <el-radio :label="1">通过</el-radio>
|
|
|
|
+ <el-radio :label="2">拒绝</el-radio>
|
|
|
|
+ </el-radio-group>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ <el-form-item label="审核意见" prop="comment">
|
|
|
|
+ <el-input v-model="formRevokeAudit.comment" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="请输入" />
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-form>
|
|
|
|
+ <template #footer>
|
|
|
|
+ <div class="dialog-footer">
|
|
|
|
+ <el-button
|
|
|
|
+ :loading="loadingRevokeAudit"
|
|
|
|
+ type="primary"
|
|
|
|
+ @click="revokeAuditSubmit"
|
|
|
|
+ >提 交</el-button>
|
|
|
|
+ <el-button @click="showRevokeAudit = false">取 消</el-button>
|
|
|
|
+ </div>
|
|
|
|
+ </template>
|
|
|
|
+ </el-dialog>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -296,7 +346,7 @@ 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, listMine, listAdminMine, revoke
|
|
|
|
|
|
+ submit, detail, listMine, listAdminMine, revoke, revokeAudit
|
|
} 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';
|
|
import SubmitDangerCheck from '@/views/grid/components/SubmitDangerCheck';
|
|
@@ -313,7 +363,7 @@ const showGridPerson = ref(true);
|
|
const showGridAdmin = ref(false);
|
|
const showGridAdmin = ref(false);
|
|
const tabGridUserActiveName = ref('gridPerson');
|
|
const tabGridUserActiveName = ref('gridPerson');
|
|
function handleChangeGridUser(tab, event) {
|
|
function handleChangeGridUser(tab, event) {
|
|
- console.log(tabGridUserActiveName.value);
|
|
|
|
|
|
+ dataList.value = [];
|
|
showGridPerson.value = (tabGridUserActiveName.value === 'gridAdmin');
|
|
showGridPerson.value = (tabGridUserActiveName.value === 'gridAdmin');
|
|
showGridAdmin.value = (tabGridUserActiveName.value === 'gridPerson');
|
|
showGridAdmin.value = (tabGridUserActiveName.value === 'gridPerson');
|
|
getList();
|
|
getList();
|
|
@@ -344,6 +394,24 @@ const rulesRevoke = ref({
|
|
});
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
+const titleRevokeAudit = ref('');
|
|
|
|
+const showRevokeAudit = ref(false);
|
|
|
|
+const loadingRevokeAudit = ref(false);
|
|
|
|
+const formRevokeAudit = ref({
|
|
|
|
+ id: undefined,
|
|
|
|
+ result: 1,
|
|
|
|
+ comment: undefined
|
|
|
|
+});
|
|
|
|
+const rulesRevokeAudit = ref({
|
|
|
|
+ result: [{ required: true, message: "审核结果不能为空", trigger: "blur" }],
|
|
|
|
+ comment: [
|
|
|
|
+ { required: true, message: "审核意见不能为空", trigger: "blur" },
|
|
|
|
+ { max: 500, message: '审核意见字符长度不能超过500', trigger: 'blur' }
|
|
|
|
+ ]
|
|
|
|
+});
|
|
|
|
+
|
|
|
|
+
|
|
const total = ref(0);
|
|
const total = ref(0);
|
|
const dateRangeCheckTime = ref([]);
|
|
const dateRangeCheckTime = ref([]);
|
|
const ids = ref([]);
|
|
const ids = ref([]);
|
|
@@ -468,6 +536,33 @@ function revokeSubmit() {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+/** 隐患检查单-撤回申请审核-按钮 */
|
|
|
|
+function onRevokeAudit(row) {
|
|
|
|
+ formRevokeAudit.value.id = row.id;
|
|
|
|
+
|
|
|
|
+ showRevokeAudit.value = true;
|
|
|
|
+ titleRevokeAudit.value = '检查单撤回 - ' + row.checkFormNo;
|
|
|
|
+
|
|
|
|
+ console.log(JSON.stringify(formRevokeAudit.value));
|
|
|
|
+}
|
|
|
|
+/** 隐患检查单-撤回申请审核-提交 */
|
|
|
|
+function revokeAuditSubmit() {
|
|
|
|
+ proxy.$refs["refFormRevokeAudit"].validate((valid) => {
|
|
|
|
+ if (valid) {
|
|
|
|
+ loadingRevokeAudit.value = true;
|
|
|
|
+ revokeAudit(formRevokeAudit.value).then((response) => {
|
|
|
|
+ getList();
|
|
|
|
+ })
|
|
|
|
+ .finally(() => {
|
|
|
|
+ showRevokeAudit.value = false;
|
|
|
|
+ loadingRevokeAudit.value = false;
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
/** 隐患检查单,提交到网格管理员 */
|
|
/** 隐患检查单,提交到网格管理员 */
|
|
function onSubmitAdmin(id) {
|
|
function onSubmitAdmin(id) {
|
|
proxy.$modal.confirm('确认要提交到网格管理员吗?')
|
|
proxy.$modal.confirm('确认要提交到网格管理员吗?')
|