From 3e7afc72da061db936f5db07ae5f284c1c871009 Mon Sep 17 00:00:00 2001
From: 21819 <tomorasd@foxmail.com>
Date: Wed, 13 Mar 2024 18:24:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=92=8C=E5=B7=B2=E5=8A=9E?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/work/Done.vue | 179 ++++++++++++----------------------------
 src/views/work/Todo.vue |   2 +-
 2 files changed, 53 insertions(+), 128 deletions(-)

diff --git a/src/views/work/Done.vue b/src/views/work/Done.vue
index ae8d4e5..d585bee 100644
--- a/src/views/work/Done.vue
+++ b/src/views/work/Done.vue
@@ -1,71 +1,40 @@
 <template>
     <div class="container">
         <header>
-            <el-form
-                :label-width="120"
-            >
+            <el-form :label-width="120">
                 <el-row>
                     <el-col :span="6">
                         <el-form-item label="来信时间">
-                            <el-date-picker
-                                v-model="query.mailTime"
-                                value-format="YYYY-MM-DD"
-                                type="daterange"
-                                range-separator="~"
-                                start-placeholder="开始日期"
-                                end-placeholder="结束日期"
-                                @change="handleMailTimeQuery"
-                            />
+                            <el-date-picker v-model="query.mailTime" value-format="YYYY-MM-DD" type="daterange"
+                                range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期"
+                                @change="handleMailTimeQuery" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="信件来源">
-                            <el-select
-                                v-model="query.source"
-                                placeholder="请选择信件来源"
-                                clearable
-                            >
-                                <el-option
-                                    v-for="item in dictData.mail_source"
-                                    :key="item.value"
-                                    :label="item.name"
-                                    :value="item.value"
-                                />
+                            <el-select v-model="query.source" placeholder="请选择信件来源" clearable>
+                                <el-option v-for="item in dictData.mail_source" :key="item.value" :label="item.name"
+                                    :value="item.value" />
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="来信人员">
                             <div class="flex gap">
-                                <el-select
-                                    v-model="query.contactField"
-                                    style="width: 180px"
-                                >
+                                <el-select v-model="query.contactField" style="width: 180px">
                                     <el-option label="姓名" value="name" />
                                     <el-option label="身份证" value="idCard" />
                                     <el-option label="联系电话" value="phone" />
                                 </el-select>
-                                <el-input
-                                    v-model="query.contactFieldValue"
-                                    placeholder="请输入"
-                                    clearable
-                                />
+                                <el-input v-model="query.contactFieldValue" placeholder="请输入" clearable />
                             </div>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="信件等级">
-                            <el-select
-                                v-model="query.mailLevel"
-                                placeholder="请选择信件等级"
-                                clearable
-                            >
-                                <el-option
-                                    v-for="item in dictData.mail_level"
-                                    :key="item.value"
-                                    :label="item.name"
-                                    :value="item.value"
-                                />
+                            <el-select v-model="query.mailLevel" placeholder="请选择信件等级" clearable>
+                                <el-option v-for="item in dictData.mail_level" :key="item.value" :label="item.name"
+                                    :value="item.value" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -73,27 +42,15 @@
                 <el-row>
                     <el-col :span="6">
                         <el-form-item label="信件分类">
-                            <el-tree-select
-                                v-model="query.mailCategory"
-                                :data="mailStore.mailCategorys"
-                                check-strictly
-                                filterable
-                            />
+                            <el-tree-select v-model="query.mailCategory" :data="mailStore.mailCategorys" check-strictly
+                                filterable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="信件状态">
-                            <el-select
-                                v-model="query.mailState"
-                                placeholder="请选择信件状态"
-                                clearable
-                            >
-                            <el-option
-                                    v-for="item in dictData.mail_state"
-                                    :key="item.value"
-                                    :label="item.name"
-                                    :value="item.value"
-                                />
+                            <el-select v-model="query.mailState" placeholder="请选择信件状态" clearable>
+                                <el-option v-for="item in dictData.mail_state" :key="item.value" :label="item.name"
+                                    :value="item.value" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -116,7 +73,7 @@
                                     :value="item.key" />
                             </el-select>
                         </el-form-item>
-                    </el-col> 
+                    </el-col>
                 </el-row>
                 <div class="flex end mb-20">
                     <el-button type="primary" @click="getList">查询</el-button>
@@ -127,109 +84,75 @@
         <main>
             <div class="table-container">
                 <el-table :data="dones" style="width: 100%" stripe>
-                    <el-table-column
-                        prop="mailTime"
-                        label="来信时间"
-                        align="center"
-                        width="180"
-                    />
-                    <el-table-column
-                        label="信件来源"
-                        align="center"
-                        width="120"
-                    >
+                    <el-table-column prop="mailTime" label="来信时间" align="center" width="180" />
+                    <el-table-column label="信件来源" align="center" width="120">
                         <template #default="{ row }">
                             <span>{{
-                                dictData.mail_source.filter(
-                                    (item) => item.value === row.source
-                                )[0].name
-                            }}</span>
+                dictData.mail_source.filter(
+                    (item) => item.value === row.source
+                )[0].name
+            }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column
-                        prop="contactName"
-                        label="姓名"
-                        align="center"
-                        width="120"
-                    />
-                    <el-table-column
-                        prop="contactPhone"
-                        label="联系电话"
-                        width="120"
-                    />
+                    <el-table-column prop="contactName" label="姓名" align="center" width="120" />
+                    <el-table-column prop="contactPhone" label="联系电话" width="120" />
                     <el-table-column label="信件等级" width="120">
                         <template #default="{ row }">
-                            <mail-level
-                                :value="row.mailLevel"
-                                :list="dictData.mail_level"
-                            />
+                            <mail-level :value="row.mailLevel" :list="dictData.mail_level" />
                         </template>
                     </el-table-column>
                     <el-table-column prop="mailCategory" label="信件分类" />
-                    
+
                     <el-table-column label="信件状态" width="90">
                         <template #default="{ row }">
                             <span>{{
-                                getDictLable(dictData.mail_state, row.mailState)
-                            }}</span>
+                getDictLable(dictData.mail_state, row.mailState)
+            }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="threeDeptName" label="办理单位" />
                     <el-table-column prop="currentOperator" label="当前处理对象"></el-table-column>
                     <el-table-column label="流程节点" class-name="text-no-ellipsis" align="center">
                         <template #default="{ row }">
-                            <el-tag
-                                :type="getFlowTagType(row.mailFlowName)"
-                                >{{ row.mailFlowName }}</el-tag
-                            >
+                            <el-tag :type="getFlowTagType(row.mailFlowName)">{{ row.mailFlowName }}</el-tag>
                         </template>
                     </el-table-column>
                     <el-table-column label="流程限时" align="center">
                         <template #default="{ row }">
-                            <div
-                                v-if="row.flowLimitedRemainingTime > 0"
-                                class="success"
-                            >
+                            <div v-if="row.flowLimitedRemainingTime > 0" class="success">
                                 <span class="mr-4">剩余</span>
                                 <span class="text">{{
-                                    formatTimeText(row.flowLimitedRemainingTime)
-                                }}</span>
+                formatTimeText(row.flowLimitedRemainingTime)
+            }}</span>
                             </div>
-                            <div
-                                v-if="row.flowLimitedRemainingTime < 0"
-                                class="error"
-                            >
+                            <div v-if="row.flowLimitedRemainingTime < 0" class="error">
                                 <span class="mr-4">超时</span>
                                 <span class="text">{{
-                                    formatTimeText(
-                                        -row.flowLimitedRemainingTime
-                                    )
-                                }}</span>
+                formatTimeText(
+                    -row.flowLimitedRemainingTime
+                )
+            }}</span>
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作" width="100">
+                    <el-table-column label="操作" width="100" fixed="right">
                         <template #default="{ row }">
-                            <el-button
-                                type="primary"
-                                link
-                                @click="handleMail(row)"
-                                >详情</el-button
-                            >
+                            <el-button type="primary" link @click="handleMail(row)">详情</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
             </div>
             <div class="flex mt-4 end">
-                    <el-pagination @size-change="getList" @current-change="getList" :current-page="query.current"
-                        :page-sizes="[10, 20, 50]" :page-size="query.size" v-model:current-page="query.current"
-                        layout="total,sizes, prev, pager, next, jumper" :total="totalSize.total">
-                    </el-pagination>
-                </div>
+                <el-pagination @size-change="getList" @current-change="getList" :current-page="query.current"
+                    :page-sizes="[10, 20, 50]" :page-size="query.size" v-model:current-page="query.current"
+                    layout="total,sizes, prev, pager, next, jumper" :total="totalSize.total">
+                </el-pagination>
+            </div>
         </main>
     </div>
 
-    <MailDialog v-model:show="showModel" :mail-id="activeMailId" :work-id="activeWorkId" :disabled="true" @update="getList" />
+    <MailDialog v-model:show="showModel" :mail-id="activeMailId" :work-id="activeWorkId" :disabled="true"
+        @update="getList" />
 </template>
 <script lang="ts" setup>
 import MailDialog from "./components/MailDialog.vue";
@@ -240,7 +163,7 @@ import { useDictData } from "@/hooks/useDictOptions";
 import { useDictOptions } from '@/hooks/useDictOptions'
 
 import useMailStore from "@/stores/modules/mail";
-import { getDictLable, formatTimeText,getFlowTagType  } from "@/utils/util";
+import { getDictLable, formatTimeText, getFlowTagType } from "@/utils/util";
 import { ref, reactive, watchEffect } from "vue";
 import { deptLists } from '@/api/org/department'
 import { getFlowNodes } from '@/api/org/flowNode'
@@ -297,7 +220,7 @@ function handleMailTimeQuery(val) {
     if (val) {
         query.value.mailTimeStart = val[0];
         query.value.mailTimeEnd = val[1];
-    }else{
+    } else {
         delete query.value.mailTimeStart
         delete query.value.mailTimeEnd
     }
@@ -314,10 +237,12 @@ function handleMailTimeQuery(val) {
     height: 24px;
     line-height: 24px;
     text-align: center;
+
     .text {
         color: #128009;
     }
 }
+
 .error {
     background-color: #ff0000;
     color: #fff;
diff --git a/src/views/work/Todo.vue b/src/views/work/Todo.vue
index 49e072c..9ea1bac 100644
--- a/src/views/work/Todo.vue
+++ b/src/views/work/Todo.vue
@@ -217,7 +217,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作">
+                    <el-table-column label="操作" fixed="right">
                         <template #default="{ row }">
                             <el-button
                                 type="primary"