reactor:二次办理审批新增更多查询

src/views/business/delay/audit.vue

@@ -220,20 +220,21 @@
 				<el-form-item label="延期申请人" prop="ApplyName">
 					<el-input v-model.trim="state.queryParams.ApplyName" placeholder="延期申请人" clearable @keyup.enter="handleQuery" />
 				</el-form-item>
-
 				<el-form-item label="延期申请部门" prop="ApplyOrgName">
 					<el-input v-model.trim="state.queryParams.ApplyOrgName" placeholder="延期申请部门" clearable @keyup.enter="handleQuery" />
 				</el-form-item>
 				<el-form-item label="延期申请时限" prop="DelayNum">
 					<el-input v-model.trim="state.queryParams.DelayNum" placeholder="延期申请时限" clearable @keyup.enter="handleQuery" />
 				</el-form-item>
-				<el-form-item label="延期申请单位" prop="DelayUnit">
-					<el-input v-model.trim="state.queryParams.DelayUnit" placeholder="延期申请单位" clearable @keyup.enter="handleQuery" />
+				<el-form-item prop="DelayUnit" label="延期申请单位">
+					<el-select v-model="state.queryParams.DelayUnit" placeholder="请选择延期申请单位" clearable class="w100" @change="handleQuery">
+						<el-option v-for="item in delayUnitOptions" :value="item.key" :key="item.key" :label="item.value" />
+					</el-select>
 				</el-form-item>
 				<el-form-item label="申请理由" prop="DelayReason">
 					<el-input v-model.trim="state.queryParams.DelayReason" placeholder="申请理由" clearable @keyup.enter="handleQuery" />
 				</el-form-item>
-				<el-form-item label="申请前期满时间" prop="sqqTime">
+				<el-form-item label="申请前期满时间" prop="sqqTime" label-width="120px">
 					<el-date-picker
 						v-model="state.queryParams.sqqTime"
 						type="datetimerange"
@@ -400,16 +401,14 @@ const onAuditBatch = () => {
 };
 // 获取基础数据
 const channelOptions = ref<EmptyArrayType>([]); // 来源渠道
-const orderStatusOptions = ref<EmptyArrayType>([]); // 工单状态
 const acceptTypeOptions = ref<EmptyArrayType>([]); // 受理类型
-const currentStepOptions = ref<EmptyArrayType>([]); // 当前节点
+const delayUnitOptions = ref<EmptyArrayType>([]); // 延期单位
 const getBaseData = async () => {
 	try {
 		const { result } = await orderBaseData();
 		channelOptions.value = result.channelOptions ?? [];
-		orderStatusOptions.value = result.orderStatusOptions ?? [];
 		acceptTypeOptions.value = result.acceptTypeOptions ?? [];
-		currentStepOptions.value = result.currentStepOptions ?? [];
+		delayUnitOptions.value = result.delayUnitOptions ?? [];
 	} catch (e) {
 		console.log(e);
 	}

src/views/business/secondHandle/audit.vue

@@ -6,33 +6,15 @@
 				<el-tab-pane :name="4" label="已审批" :disabled="state.loading"></el-tab-pane>
 			</el-tabs>
 			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline :disabled="state.loading">
-				<el-form-item label="关键词" prop="Keyword">
-					<el-input v-model.trim="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="handleQuery" class="keyword-input" />
+				<el-form-item label="工单编码" prop="No">
+					<el-input v-model.trim="state.queryParams.No" placeholder="工单编码" clearable @keyup.enter="handleQuery" class="keyword-input" />
 				</el-form-item>
-				<!--        <el-form-item label="申请状态" prop="Status">
-									<el-select v-model="state.queryParams.Status" placeholder="请选择申请状态" clearable @change="handleQuery">
-										<el-option v-for="item in state.statusOptions" :value="item.key" :key="item.key" :label="item.value" />
-									</el-select>
-								</el-form-item>-->
-				<el-form-item label="申请时间" prop="crTime">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="datetimerange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD[T]HH:mm:ss"
-						:default-time="defaultTimeStartEnd"
-					/>
+				<el-form-item label="工单标题" prop="Title">
+					<el-input v-model.trim="state.queryParams.Title" placeholder="工单标题" clearable @keyup.enter="handleQuery" class="keyword-input" />
 				</el-form-item>
 				<el-form-item>
 					<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-					<el-button @click="resetQuery(ruleFormRef)" v-waves class="default-button" :loading="state.loading">
-						<SvgIcon name="ele-Refresh" class="mr5" />重置
-					</el-button>
+					<el-button @click="drawer = true" class="default-button"> <SvgIcon name="ele-Search" class="mr5" />更多查询</el-button>
 				</el-form-item>
 			</el-form>
 			<vxe-toolbar
@@ -131,6 +113,54 @@
 		<second-handle-audit-multiple ref="secondHandleAuditMultipleRef" @updateList="refreshList" />
 		<!--  办理明细  -->
 		<second-handle-detail ref="secondHandleDetailRef" @updateList="refreshList" />
+		<!--	更多查询	-->
+		<el-drawer v-model="drawer" title="更多查询" size="500px">
+			<el-form :model="state.queryParams" ref="drawerRuleFormRef" @submit.native.prevent label-width="100px" :disabled="state.loading">
+				<el-form-item prop="Channel" label="来源渠道">
+					<el-select v-model="state.queryParams.Channel" placeholder="请选择来源渠道" clearable class="w100" @change="handleQuery">
+						<el-option v-for="item in channelOptions" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
+					</el-select>
+				</el-form-item>
+				<el-form-item prop="SendBack" label="重提办理">
+					<el-select v-model="state.queryParams.SendBack" placeholder="请选择重提办理" clearable class="w100" @change="handleQuery">
+						<el-option :value="1"  label="是" />
+						<el-option :value="0"  label="否" />
+					</el-select>
+				</el-form-item>
+				<el-form-item label="申请人" prop="ApplyName">
+					<el-input v-model.trim="state.queryParams.ApplyName" placeholder="申请人" clearable @keyup.enter="handleQuery" />
+				</el-form-item>
+				<el-form-item label="申请部门" prop="ApplyOrgName">
+					<el-input v-model.trim="state.queryParams.ApplyOrgName" placeholder="申请部门" clearable @keyup.enter="handleQuery" />
+				</el-form-item>
+				<el-form-item label="申请时间" prop="crTime">
+					<el-date-picker
+						v-model="state.queryParams.crTime"
+						type="datetimerange"
+						unlink-panels
+						range-separator="至"
+						start-placeholder="开始时间"
+						end-placeholder="结束时间"
+						:shortcuts="shortcuts"
+						@change="handleQuery"
+						value-format="YYYY-MM-DD[T]HH:mm:ss"
+						:default-time="defaultTimeStartEnd"
+					/>
+				</el-form-item>
+				<el-form-item prop="AcceptTypeCode" label="受理类型">
+					<el-select v-model="state.queryParams.AcceptTypeCode" placeholder="请选择受理类型" clearable class="w100" @change="handleQuery">
+						<el-option v-for="item in acceptTypeOptions" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
+					</el-select>
+				</el-form-item>
+				<el-form-item label="热点分类" prop="Hotspot">
+					<el-input v-model.trim="state.queryParams.Hotspot" placeholder="热点分类" clearable @keyup.enter="handleQuery" />
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+				<el-button @click="resetQuery(drawerRuleFormRef)" class="default-button"> <SvgIcon name="ele-Refresh" class="mr5" />重置 </el-button>
+			</template>
+		</el-drawer>
 	</div>
 </template>
 <script setup lang="tsx" name="businessSecondHandleAudit">
@@ -140,6 +170,7 @@ import { formatDate } from '@/utils/formatTime';
 import { secondHandleAuditExport, secondHandleAuditList, secondHandleBase } from '@/api/business/secondHandle';
 import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
 import other from '@/utils/other';
+import { orderBaseData } from '@/api/business/order';
 // 引入组件
 const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/index.vue')); // 工单详情
 const SecondHandleReturn = defineAsyncComponent(() => import('@/views/business/secondHandle/components/Second-handle-return.vue')); // 二次办理退回
@@ -148,17 +179,23 @@ const SecondHandleAuditMultiple = defineAsyncComponent(() => import('@/views/bus
 const SecondHandleDetail = defineAsyncComponent(() => import('@/views/business/secondHandle/components/Second-handle-detail.vue')); // 办理明细
 const pagination = defineAsyncComponent(() => import('@/components/ProTable/components/Pagination.vue')); // 分页
 // 定义变量内容
-const ruleFormRef = ref<RefType>(); // 表单ref
 const state = reactive<any>({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
 		PageSize: 20,
-		Keyword: null, // 关键字
 		Status: 1, // 状态
-		crTime: [],
-		CreationTimeStart: null,
-		CreationTimeEnd: null,
+		crTime: [], // 申请时间
+		CreationTimeStart: null, // 申请时间开始
+		CreationTimeEnd: null, // 申请时间结束
+		No:null, // 工单编码
+		Title: null, // 工单标题
+		Channel: null, // 来源渠道
+		SendBack: null, // 重提办理
+		ApplyName: null, // 申请人
+		ApplyOrgName: null, // 申请部门
+		AcceptTypeCode: null, // 受理类型
+		Hotspot: null, // 热点分类
 	},
 	tableData: [], //表单
 	loading: false, // 加载
@@ -198,9 +235,13 @@ const queryList = () => {
 };
 
 /** 重置按钮操作 */
+const drawerRuleFormRef = ref();
+const ruleFormRef = ref<RefType>(); // 表单ref
+const drawer = ref(false);
 const resetQuery = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
+	ruleFormRef.value?.resetFields();
 	queryList();
 };
 // 批量审批
@@ -225,10 +266,16 @@ const onAudit = (row: any) => {
 	secondHandleAuditRef.value.openDialog(row);
 };
 // 获取基础数据
+const channelOptions = ref<EmptyArrayType>([]); // 来源渠道
+const acceptTypeOptions = ref<EmptyArrayType>([]); // 受理类型
 const getBaseData = async () => {
 	try {
-		const { result } = await secondHandleBase();
-		state.statusOptions = result?.status ?? [];
+		const res = await secondHandleBase();
+		state.statusOptions = res.result?.status ?? [];
+
+		const { result } = await orderBaseData();
+		channelOptions.value = result.channelOptions ?? [];
+		acceptTypeOptions.value = result.acceptTypeOptions ?? [];
 	} catch (e) {
 		console.log(e);
 	}
@@ -251,7 +298,7 @@ const selectChangeEvent = ({ checked }) => {
 	}
 };
 const isChecked = computed(() => {
-	return !Boolean(checkTable.value.length);
+	return !checkTable.value.length;
 });
 const toolbarRef = ref<RefType>();
 onMounted(() => {

src/views/business/supervise/index.vue

@@ -408,14 +408,12 @@ const onDetail = (row: any) => {
 const channelOptions = ref<EmptyArrayType>([]); // 来源渠道
 const orderStatusOptions = ref<EmptyArrayType>([]); // 工单状态
 const acceptTypeOptions = ref<EmptyArrayType>([]); // 受理类型
-const currentStepOptions = ref<EmptyArrayType>([]); // 当前节点
 const getBaseData = async () => {
 	try {
 		const { result } = await orderBaseData();
 		channelOptions.value = result.channelOptions ?? [];
 		orderStatusOptions.value = result.orderStatusOptions ?? [];
 		acceptTypeOptions.value = result.acceptTypeOptions ?? [];
-		currentStepOptions.value = result.currentStepOptions ?? [];
 	} catch (e) {
 		console.log(e);
 	}

src/views/business/supervise/todo.vue

@@ -294,14 +294,12 @@ const onReply = (row: any) => {
 const channelOptions = ref<EmptyArrayType>([]); // 来源渠道
 const orderStatusOptions = ref<EmptyArrayType>([]); // 工单状态
 const acceptTypeOptions = ref<EmptyArrayType>([]); // 受理类型
-const currentStepOptions = ref<EmptyArrayType>([]); // 当前节点
 const getBaseData = async () => {
 	try {
 		const { result } = await orderBaseData();
 		channelOptions.value = result.channelOptions ?? [];
 		orderStatusOptions.value = result.orderStatusOptions ?? [];
 		acceptTypeOptions.value = result.acceptTypeOptions ?? [];
-		currentStepOptions.value = result.currentStepOptions ?? [];
 	} catch (e) {
 		console.log(e);
 	}