reactor:【二次办理】新增审批状态选项卡等需求;

src/views/business/order/copy-index.vue

@@ -1001,6 +1001,7 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 	fastSearch.value = 'all';
 	checkList.value = [];
 	queryIndex.value = 0;
+	currentPage.value = 1;
 	queryList(true);
 };
 // 设置终结件

src/views/business/secondHandle/index.vue

@@ -36,9 +36,9 @@
               </el-col>
               <transition name="el-zoom-in-top">
                 <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
-                  <el-form-item label="申请时间" prop="slTime">
+                  <el-form-item label="申请时间" prop="crTime">
                     <el-date-picker
-                        v-model="state.queryParams.slTime"
+                        v-model="state.queryParams.crTime"
                         type="datetimerange"
                         unlink-panels
                         range-separator="至"
@@ -76,7 +76,7 @@
 				</template>
 				<!-- 表格操作 -->
 				<template #operation="{ row }">
-					<el-button link type="primary" @click="onDetail(row)" title="办理明细" v-if="row.secondaryHandling"> 办理明细 </el-button>
+					<el-button link type="primary" @click="onDetail(row)" title="办理明细"> 办理明细 </el-button>
 				</template>
 			</ProTable>
 		</div>
@@ -89,7 +89,7 @@ import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { FormInstance } from 'element-plus';
 import { formatDate } from '@/utils/formatTime';
 import { useRouter } from 'vue-router';
-import { secondHandleBase, secondHandleExport, secondHandleList } from '@/api/business/secondHandle';
+import { secondHandleAuditList, secondHandleBase, secondHandleExport, secondHandleList } from '@/api/business/secondHandle';
 import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
 import other from '@/utils/other';
 // 引入组件
@@ -103,16 +103,17 @@ const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
 	{ prop: 'order.expiredStatusText', label: '超期状态', align: 'center', width: 80 },
+	{ prop: 'stateText', label: '办理状态', minWidth: 100 },
 	{ prop: 'order.no', label: '工单编码', minWidth: 140 },
 	{ prop: 'order.title', label: '工单标题', minWidth: 200 },
-	{ prop: 'order.currentHandleOrgName', label: '申请人', minWidth: 140 },
-  { prop: 'order.currentHandleOrgName', label: '申请部门', minWidth: 120 },
+	{ prop: 'creatorName', label: '申请人', minWidth: 140 },
+  { prop: 'creatorOrgName', label: '申请部门', minWidth: 120 },
   {
-    prop: 'order.startTime',
+    prop: 'creationTime',
     label: '申请时间',
     minWidth: 160,
     render: (scope: any) => {
-      return <span>{formatDate(scope.row.order?.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+      return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
     },
   },
 	{ prop: 'order.acceptType', label: '受理类型', minWidth: 100 },
@@ -123,10 +124,12 @@ const state = reactive<any>({
 	queryParams: {
 		PageIndex: 1,
 		PageSize: 20,
-		Keyword: null, // 关键字
-		slTime: [], // 受理时间
-		CreationTime: null, // 受理时间开始
-		EndCreationTime: null, // 受理时间结束
+		Status: null, //
+		crTime: [], // 申请时间
+		CreationTimeStart: null, // 受理时间开始
+		CreationTimeEnd: null, // 受理时间结束
+		No:null,
+		Title:null
 	},
 	tableData: [], //表单
 	loading: false, // 加载
@@ -173,11 +176,11 @@ const getBaseData = async () => {
 const requestParams = ref({});
 const queryList = () => {
 	requestParams.value = other.deepClone(state.queryParams);
-	requestParams.value.CreationTime = state.queryParams.slTime === null ? null : state.queryParams.slTime[0];
-	requestParams.value.EndCreationTime = state.queryParams.slTime === null ? null : state.queryParams.slTime[1];
-	Reflect.deleteProperty(requestParams.value, 'slTime'); // 受理时间
+	requestParams.value.CreationTimeStart = state.queryParams.crTime === null ? null : state.queryParams.crTime[0];
+	requestParams.value.CreationTimeEnd = state.queryParams.crTime === null ? null : state.queryParams.crTime[1];
+	Reflect.deleteProperty(requestParams.value, 'crTime'); // 受理时间
 	state.loading = true;
-	secondHandleList(requestParams.value)
+	secondHandleAuditList(requestParams.value)
 		.then((res) => {
 			state.tableData = res?.result.items ?? [];
 			state.total = res?.result.total;
@@ -207,7 +210,7 @@ const onApply = (row: any) => {
 // 办理明细
 const secondHandleDetailRef = ref<RefType>();
 const onDetail = (row: any) => {
-	secondHandleDetailRef.value.openDialog(row.secondaryHandling?.id);
+	secondHandleDetailRef.value.openDialog(row.id);
 };
 onMounted(() => {
 	getBaseData();

src/views/tels/callLog/zgCallLog.vue

@@ -377,6 +377,7 @@ const changeTba = () => {
 const handleQuery = () => {
 	state.queryParams.PageIndex = 1;
 	queryIndex.value = 0;
+	currentPage.value = 1;
 	queryList(true);
 };
 // 改变页码
@@ -431,6 +432,7 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
 	queryIndex.value = 0;
+	currentPage.value = 1;
 	queryList(true);
 };
 // 播放录音

src/views/tels/phoneAction.vue

@@ -7,7 +7,6 @@
 				:data="state.tableData"
 				@updateTable="queryList"
 				:loading="state.loading"
-				:key="Math.random()"
 				:pagination="false"
 			>
 				<template #table-search>
@@ -125,6 +124,7 @@ const closeSearch = () => {
 const handleQuery = () => {
 	state.queryParams.PageIndex = 1;
 	queryIndex.value = 0;
+	currentPage.value = 1;
 	queryList(true);
 };
 // 改变页码
@@ -174,6 +174,7 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
 	queryIndex.value = 0;
+	currentPage.value = 1;
 	queryList(true);
 };
 // 基础信息