reactor:工单待办字段调整;通知公告审批新增查看详情按钮;

src/views/auxiliary/noticeAudit/index.vue

@@ -99,9 +99,10 @@
           </el-table-column>
           <el-table-column prop="creatorOrgName" label="来源单位" show-overflow-tooltip></el-table-column>
         </template>
-        <el-table-column label="操作" width="120" fixed="right" align="center">
+        <el-table-column label="操作" width="140" fixed="right" align="center">
           <template #default="{ row }">
             <el-button link type="primary" @click="onAudit(row)" v-auth="'auxiliary:noticeAudit:audit'" title="审批通知公告"> 审批 </el-button>
+            <el-button link type="primary" @click="onDetail(row)"> 查看详情 </el-button>
           </template>
         </el-table-column>
         <template #empty>
@@ -128,6 +129,7 @@ import {shortcuts} from '/@/utils/constants';
 import {formatDate} from '/@/utils/formatTime';
 import {auth} from '/@/utils/authFunction';
 import {bulletinBaseData, bulletinList, circularBaseData, circularList} from '/@/api/auxiliary/notice';
+import {useRouter} from "vue-router";
 
 // 引入组件
 const ProcessAudit = defineAsyncComponent(() => import('/@/components/ProcessAudit/index.vue')); // 流程审批
@@ -246,6 +248,19 @@ const multipleSelection = ref<any>([]);
 const handleSelectionChange = (val: any[]) => {
   multipleSelection.value = val;
 };
+// 查看详情
+const router = useRouter();
+const onDetail = (row: any) => {
+  const tagsViewName = listType.value === '0' ? '通知详情' : '公告详情';
+  router.push({
+    name: 'auxiliaryNoticeDetail',
+    params: {
+      id: row.id,
+      isRead: 0,
+      tagsViewName,
+    },
+  });
+};
 // 审批
 const processAuditRef = ref<RefType>(); // 处理流程
 const onAudit = (row:any)=>{

src/views/home/component/ToDo.vue

@@ -30,7 +30,7 @@
 				</el-table-column>
 				<el-table-column label="节点期满时间" show-overflow-tooltip width="170">
 					<template #default="{ row }">
-						<span>{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
+						<span>{{ formatDate(row.stepExpiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="工单期满时间" show-overflow-tooltip width="170">
@@ -338,7 +338,7 @@ const handleChange = async (tab: any) => {
 	switch (tab) {
 		case '0': // 工单待办
 			try {
-				const res: any = await orderListTodo(state.queryParams);
+				const res: any = await orderListTodo({...state.queryParams,IsApply:'false'});
 				state.tableList = res.result?.items ?? [];
 				state.tableLoading = false;
 			} catch (error) {

src/views/query/end/index.vue

@@ -30,7 +30,7 @@
         <el-table-column type="selection" width="55" />
         <el-table-column prop="order.no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
         <el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="order.currentStepName" label="当前节点" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="order.currentStepName" label="当前节点" show-overflow-tooltip width="120"></el-table-column>
         <el-table-column width="100" label="省/市工单" prop="isProvince" >
           <template #default="{ row }">
             <span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>

src/views/query/observe/index.vue

@@ -31,7 +31,7 @@
 			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
 				<el-table-column type="selection" width="55" />
         <el-table-column prop="order.no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-        <el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip width="120"></el-table-column>
         <el-table-column prop="order.currentStepName" label="当前节点" show-overflow-tooltip></el-table-column>
         <el-table-column width="100" label="省/市工单" prop="isProvince" >
           <template #default="{ row }">

src/views/todo/order/index.vue

@@ -1,16 +1,24 @@
 <template>
 	<div class="todo-order-container layout-pd">
 		<el-card shadow="never">
-			<el-tabs v-model="state.queryParams.Status" class="demo-tabs" @tab-change="queryList">
-				<el-tab-pane name="0" label="工单待办"></el-tab-pane>
-				<el-tab-pane name="1" label="工单已办"></el-tab-pane>
+			<el-tabs v-model="state.queryParams.IsHandled" class="demo-tabs" @tab-change="queryList">
+				<el-tab-pane name="false" label="工单待办"></el-tab-pane>
+				<el-tab-pane name="true" label="工单已办"></el-tab-pane>
 			</el-tabs>
 			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent class="mt15" label-width="100px">
 				<el-row :gutter="10">
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="8">
+            <el-form-item label="关键字" prop="Keyword">
+              <el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="queryList" />
+            </el-form-item>
+          </el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="8">
-						<el-form-item label="关键字" prop="Keyword">
-							<el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="queryList" />
-						</el-form-item>
+            <el-form-item label="是否省工单" prop="IsProvince">
+              <el-select v-model="state.queryParams.IsProvince" placeholder="请选择是否省工单" class="w100">
+                <el-option label="是" value="true" />
+                <el-option label="否" value="false" />
+              </el-select>
+            </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="8">
 						<el-form-item label=" ">
@@ -32,7 +40,7 @@
 			<!-- 表格 -->
 			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
 				<el-table-column type="selection" width="40" />
-				<template v-if="state.queryParams.Status === '0'">
+				<template v-if="state.queryParams.IsHandled === 'false'">
 					<el-table-column prop="no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
 					<el-table-column width="100" label="省/市工单" prop="isProvince">
 						<template #default="{ row }">
@@ -40,7 +48,7 @@
 						</template>
 					</el-table-column>
 					<el-table-column prop="currentStepName" label="当前办理节点" show-overflow-tooltip width="150"></el-table-column>
-					<template v-if="state.queryParams.Status === '0'">
+					<template v-if="state.queryParams.Status === 'false'">
 						<el-table-column prop="creationTime" label="节点签收时间" show-overflow-tooltip width="170">
 							<template #default="{ row }">
 								<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
@@ -65,7 +73,7 @@
 					</el-table-column>
 					<el-table-column label="节点期满时间" show-overflow-tooltip width="170">
 						<template #default="{ row }">
-							<span>{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
+							<span>{{ formatDate(row.stepExpiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="工单期满时间" show-overflow-tooltip width="170">
@@ -85,7 +93,7 @@
 						</template>
 					</el-table-column>
 				</template>
-				<template v-if="state.queryParams.Status === '1'">
+				<template v-if="state.queryParams.IsHandled === 'true'">
 					<el-table-column prop="no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
 					<el-table-column width="100" label="省/市工单" prop="isProvince">
 						<template #default="{ row }">
@@ -118,7 +126,7 @@
 					</el-table-column>
 					<el-table-column label="节点期满时间" show-overflow-tooltip width="170">
 						<template #default="{ row }">
-							<span>{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
+							<span>{{ formatDate(row.stepExpiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="工单期满时间" show-overflow-tooltip width="170">
@@ -178,8 +186,9 @@ const state = reactive(<any>{
 		// 查询条件
 		PageIndex: 1, // 当前页
 		PageSize: 10, // 每页条数
-		Status: '0', // 工单状态
+    IsHandled: 'false', // 工单状态
 		Keyword: null, // 关键字
+    IsProvince: null, // 是否省工单
 	},
 	tableData: [], //表单
 	loading: false, // 加载