Эх сурвалжийг харах

reactor:140 重办的安全隐患工单需要显示是否整改这些

zhangchong 3 долоо хоног өмнө
parent
commit
250ba5512f

+ 4 - 2
src/components/ProcessAudit/ZGSSPProcess.vue

@@ -1013,16 +1013,18 @@ const orgDQH = computed(() => {
 // 会签 部门会签 判断当前工单是 安全隐患 并且当前节点是最初发起会签的节点 并且选择的下一节点是汇总或者归档
 // 非会签 判断当前工单是 安全隐患 并且是部门办理时 并且当前节点是普通节点 并且当前不能是会签汇总节点 并且选择的下一节点是汇总或者归档
 const orgAQYH = computed(() => {
+	// 判断名字是否是以安全隐患开头
+	const isAQYHOrder = state.orderDetail.industryName?.startsWith('安全隐患');
 	return (
 		(currentParams.value.counterSignType === 1 &&
 			currentParams.value.currentIsTopCountersignEndStep &&
 			(selectNext.value.stepType === 3 || selectNext.value.key === 'end') &&
-			state.orderDetail.industryName === '安全隐患') ||
+			isAQYHOrder) ||
 		(currentParams.value.counterSignType === null &&
 		currentParams.value.currentStepBusinessType === 2 &&
 		currentParams.value.currentStepType === 0 &&
 		(selectNext.value.stepType === 3 || selectNext.value.key === 'end') &&
-		state.orderDetail.industryName === '安全隐患')
+			isAQYHOrder)
 	);
 });
 //  currentParams.value.CounterSignType 判断当前节点是否在会签中 0中心会签 1部门会签

+ 1 - 1
src/views/judicial/order/components/orderDetail.vue

@@ -83,7 +83,7 @@
 								<el-form-item label="热点分类"> {{ state.ruleForm.hotspotSpliceName }} </el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="state.ruleForm.eventTypeSpliceName">
-								<el-form-item label="事项类型"> {{ state.ruleForm.eventTypeSpliceName }} </el-form-item>
+								<el-form-item label="问题类型"> {{ state.ruleForm.eventTypeSpliceName }} </el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
 								<el-form-item label="受理人">

+ 12 - 6
src/views/judicial/order/components/verify.vue

@@ -9,9 +9,9 @@
 					</el-radio-group>
 				</el-form-item>
 				<el-form-item
-					label="事项类型"
+					label="问题类型"
 					prop="eventTypeId"
-					:rules="[{ required: true, message: '请选择事项类型', trigger: 'change' }]"
+					:rules="[{ required: true, message: '请选择问题类型', trigger: 'change' }]"
 					v-if="state.ruleForm.isTheClueTrue"
 				>
 					<el-tree-select
@@ -31,6 +31,12 @@
 						node-key="id"
 					/>
 				</el-form-item>
+				<el-form-item label="个案类型" prop="isTheClueTrue" :rules="[{ required: true, message: '请选择个案类型', trigger: 'change' }]" v-if="state.ruleForm.isTheClueTrue">
+					<el-radio-group v-model="state.ruleForm.isTheClueTrue">
+						<el-radio-button label="一般个案例" value="1" />
+						<el-radio-button label="重点关注个案" value="2" />
+					</el-radio-group>
+				</el-form-item>
 			</el-form>
 		</div>
 		<template #footer>
@@ -55,9 +61,9 @@ const state = reactive<any>({
 	loading: false, // 是否显示加载
 	ruleForm: {
 		isTheClueTrue: null, // 线索是否属实
-		eventTypeId: null, // 事项类型
-		eventTypeName: null, // 事项类型名称
-		eventTypeSpliceName: null, // 事项类型全名
+		eventTypeId: null, // 问题类型
+		eventTypeName: null, // 问题类型名称
+		eventTypeSpliceName: null, // 问题类型全名
 	},
 });
 const ruleFormRef = ref<RefType>();
@@ -104,7 +110,7 @@ const close = () => {
 	ruleFormRef.value?.clearValidate();
 	ruleFormRef.value?.resetFields();
 };
-const change = (val) => {
+const change = (val:boolean) => {
 	if (!val) {
 		ruleFormRef.value.resetFields('eventTypeId');
 		state.ruleForm.eventTypeId = null;

+ 7 - 3
src/views/judicial/order/index.vue

@@ -54,7 +54,7 @@
 			>
 				<template #buttons>
 					<el-button type="primary" @click="onVerify(null)" v-auth="'judicial:order:verify:multiple'" :disabled="isChecked" :loading="state.loading"
-						>线索核实
+						>线索核实<span v-if="checkTable.length">({{ checkTable.length }})</span>
 					</el-button>
 				</template>
 			</vxe-toolbar>
@@ -99,8 +99,8 @@
 					<vxe-column field="isPassTheBuckOrderText" title="是否推诿工单" width="120"></vxe-column>
 					<vxe-column field="isTheClueTrueText" title="线索是否属实" width="120"></vxe-column>
 					<vxe-column field="isEnforcementOrderText" title="是否行政执法类工单" width="150"></vxe-column>
-					<vxe-column field="eventTypeName" title="事项类型" width="150"></vxe-column>
-					<vxe-column title="操作" fixed="right" width="140" align="center" :show-overflow="false">
+					<vxe-column field="eventTypeName" title="问题类型" width="150"></vxe-column>
+					<vxe-column title="操作" fixed="right" width="120" align="center" :show-overflow="false">
 						<template #default="{ row }">
 							<el-button
 								link
@@ -313,9 +313,13 @@ const queryList = () => {
 			state.tableData = response?.result.items ?? [];
 			state.total = response?.result.total;
 			state.loading = false;
+			tableRef.value.clearCheckboxRow();
+			checkTable.value = [];
 		})
 		.catch(() => {
 			state.loading = false;
+			tableRef.value.clearCheckboxRow();
+			checkTable.value = [];
 		});
 };
 /** 重置按钮操作 */

+ 2 - 2
src/views/judicial/statistics/detailArea.vue

@@ -17,7 +17,7 @@
 					:loading="state.loading"
 					:data="state.tableData"
 					:column-config="{ resizable: true }"
-					:row-config="{ isCurrent: true, isHover: true, height: 30,useKey: true  }"
+					:row-config="{ isCurrent: true, isHover: true, height: 30, useKey: true }"
 					ref="tableRef"
 					height="auto"
 					auto-resize
@@ -47,7 +47,7 @@
 					<vxe-column field="isPassTheBuckOrderText" title="是否推诿工单" width="120"></vxe-column>
 					<vxe-column field="isTheClueTrueText" title="线索是否属实" width="120"></vxe-column>
 					<vxe-column field="isEnforcementOrderText" title="是否行政执法类工单" width="150"></vxe-column>
-					<vxe-column field="eventTypeName" title="事项类型" width="150"></vxe-column>
+					<vxe-column field="eventTypeName" title="问题类型" width="150"></vxe-column>
 				</vxe-table>
 			</div>
 			<pagination

+ 1 - 1
src/views/judicial/statistics/detailDepartment.vue

@@ -47,7 +47,7 @@
 					<vxe-column field="isPassTheBuckOrderText" title="是否推诿工单" width="120"></vxe-column>
 					<vxe-column field="isTheClueTrueText" title="线索是否属实" width="120"></vxe-column>
 					<vxe-column field="isEnforcementOrderText" title="是否行政执法类工单" width="150"></vxe-column>
-					<vxe-column field="eventTypeName" title="事项类型" width="150"></vxe-column>
+					<vxe-column field="eventTypeName" title="问题类型" width="150"></vxe-column>
 				</vxe-table>
 			</div>
 			<pagination

+ 1 - 1
src/views/judicial/statistics/detailEventClass.vue

@@ -47,7 +47,7 @@
 					<vxe-column field="isPassTheBuckOrderText" title="是否推诿工单" width="120"></vxe-column>
 					<vxe-column field="isTheClueTrueText" title="线索是否属实" width="120"></vxe-column>
 					<vxe-column field="isEnforcementOrderText" title="是否行政执法类工单" width="150"></vxe-column>
-					<vxe-column field="eventTypeName" title="事项类型" width="150"></vxe-column>
+					<vxe-column field="eventTypeName" title="问题类型" width="150"></vxe-column>
 				</vxe-table>
 			</div>
 			<pagination

+ 1 - 1
src/views/judicial/statistics/detailSatisfied.vue

@@ -47,7 +47,7 @@
 					<vxe-column field="isPassTheBuckOrderText" title="是否推诿工单" width="120"></vxe-column>
 					<vxe-column field="isTheClueTrueText" title="线索是否属实" width="120"></vxe-column>
 					<vxe-column field="isEnforcementOrderText" title="是否行政执法类工单" width="150"></vxe-column>
-					<vxe-column field="eventTypeName" title="事项类型" width="150"></vxe-column>
+					<vxe-column field="eventTypeName" title="问题类型" width="150"></vxe-column>
 					<vxe-column title="操作" width="90" fixed="right">
 						<template #default="{ row }">
 							<el-button link type="primary" @click="visitDetail(row)" title="查看回访详情"> 回访详情 </el-button>

+ 1 - 1
src/views/judicial/statistics/eventClass.vue

@@ -102,7 +102,7 @@
 					show-footer
 					:footer-method="footerMethod"
 				>
-					<vxe-column field="name" title="事项类型" min-width="200" tree-node></vxe-column>
+					<vxe-column field="name" title="问题类型" min-width="200" tree-node></vxe-column>
 					<vxe-column field="num" title="工单总量" width="100">
 						<template #default="{ row }">
 							<el-button type="primary" link @click="linkDetail(row)">