From b9234642021946b3bf46f86899579b08974a0d70 Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Thu, 28 Aug 2025 16:30:38 +0800
Subject: [PATCH] 20250828

---
 package.json                               |  2 +-
 src/components/FileList.vue                |  2 +-
 src/views/work/Query.vue                   |  8 ++++++++
 src/views/work/components/MailDialog.vue   | 14 +++++++++++---
 src/views/work/components/ReportLeader.vue | 15 ++++++++++++---
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 6a58cfa..713aaac 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build --mode dev",
-    "build:prod": "vite build --mode prod",
+    "build:prod": "vite build --mode prod && WinRAR a -r dist.zip ./dist/",
     "preview": "vite preview"
   },
   "dependencies": {
diff --git a/src/components/FileList.vue b/src/components/FileList.vue
index c94d3bb..2984b1a 100644
--- a/src/components/FileList.vue
+++ b/src/components/FileList.vue
@@ -50,7 +50,7 @@
                     @click="filePreview(item)"
                 >
                     <icon :name="getIconName(item.type)" :size="24" />
-                    <span>{{ item.fileName }}</span>
+                    <span>{{ item.orgiinFilename }}</span>
                 </section>
             </div>
         </el-scrollbar>
diff --git a/src/views/work/Query.vue b/src/views/work/Query.vue
index d7523c6..fc3c09f 100644
--- a/src/views/work/Query.vue
+++ b/src/views/work/Query.vue
@@ -189,6 +189,14 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="退回整改" prop="returnRectification">
+                            <el-select v-model="query.returnRectification" multiple>
+                                <el-option label="市局退回整改" value="1" />
+                                <el-option label="二级机构退回整改" value="2" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
                 </el-row>
                 <div style="display: flex; justify-content: space-between; margin-bottom: 20px;">
                     <div>
diff --git a/src/views/work/components/MailDialog.vue b/src/views/work/components/MailDialog.vue
index 3903942..ca3c8c8 100644
--- a/src/views/work/components/MailDialog.vue
+++ b/src/views/work/components/MailDialog.vue
@@ -545,6 +545,14 @@
                 <Print />
             </div>
             <div v-if="!disabled && !completionBtnFlag">
+                <el-button
+                    type="danger"
+                    :plain="true"
+                    size="large"
+                    @click="handleAction('return')"
+                    v-if="flowNode.key === 'first_sign' && mail.source === '厅长信箱'"
+                    >信件退回</el-button
+                >
                 <template
                     v-if="
                         workType === 'processing' ||
@@ -999,14 +1007,14 @@ async function handleAction(key) {
         reportLeaderShow.value = true;
         return;
     }
-    if (mailTypeFormRef.value && key !== "mail110RejectSubmit") {
-        await mailTypeFormRef.value.validate();
-    }
     if (coHandlingRef.value) {
         await coHandlingRef.value.validate();
         requestData.value.workId = props.workId;
     }
     if (key !== "returnSubmit") {
+        if (mailTypeFormRef.value && key !== "mail110RejectSubmit") {
+            await mailTypeFormRef.value.validate();
+        }
         if (deptSelectFormRef.value) {
             await deptSelectFormRef.value.validate();
         }
diff --git a/src/views/work/components/ReportLeader.vue b/src/views/work/components/ReportLeader.vue
index 2201396..223ab1d 100644
--- a/src/views/work/components/ReportLeader.vue
+++ b/src/views/work/components/ReportLeader.vue
@@ -5,7 +5,7 @@
             :model="form"
             :rules="rules"
             ref="formRef"
-            style="height: 20vh"
+            style="height: 40vh"
         >
             <el-form-item
                 label="选择呈报领导"
@@ -16,6 +16,9 @@
                     <el-option v-for="item in leaders" :value="item.empNo" :label="item.postTitle + '-' + item.name" :key="item.id"></el-option>
                 </el-select>
             </el-form-item>
+            <el-form-item label="审批意见" prop="approvalComment">
+                <el-input v-model="form.approvalComment" type="textarea" :rows="3" placeholder="请输入审批意见"></el-input>
+            </el-form-item>
         </el-form>
         <footer class="flex end">
             <el-button type="primary" size="large" @click="submit"
@@ -29,13 +32,19 @@ import { listByMunicipalDeptLeader } from "@/api/perms/admin";
 
 const form = reactive({})
 const formRef =  ref()
-const leaderEmpNo = {
-    reason: [
+const rules = {
+    leaderEmpNo: [
         {
             required: true,
             message: "请选择呈报的领导",
         },
     ],
+    approvalComment: [
+        {
+            required: true,
+            message: "请填写审批意见",
+        },
+    ],
 }
 const leaders = ref([])
 const emits = defineEmits(["update:data", "submit", "close"])