From d37b3d0e7a4f983cd3766369a712d9e737979fe9 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 30 Jul 2024 18:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=B8=8B=E8=BD=BD=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/Delivery/index.vue |  2 +-
 .../modules/shequzhili/eventHandling/index.vue  |  9 +++++++--
 src/views/modules/shequzhili/timeOut/index.vue  | 17 ++++++++++-------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/shequzhili/Delivery/index.vue b/src/views/modules/shequzhili/Delivery/index.vue
index 66e060119..7a2b0ef0b 100644
--- a/src/views/modules/shequzhili/Delivery/index.vue
+++ b/src/views/modules/shequzhili/Delivery/index.vue
@@ -85,7 +85,7 @@
                     @command="(command) => importTypeChange(command)">
                         导入
                         <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item command="1">下载模板</el-dropdown-item>
+                            <el-dropdown-item command="0" @click.native="handleExportModule">下载模板</el-dropdown-item>
                             <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
                                      :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false"
                                      :auto-upload="true" :on-progress="handleProgress" :on-success="handleExcelSuccess"
diff --git a/src/views/modules/shequzhili/eventHandling/index.vue b/src/views/modules/shequzhili/eventHandling/index.vue
index 4ed0db682..e53746b54 100644
--- a/src/views/modules/shequzhili/eventHandling/index.vue
+++ b/src/views/modules/shequzhili/eventHandling/index.vue
@@ -74,8 +74,13 @@
                         @command="(command) => handleMarkDiffcult(command)">
                         导入
                         <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item command="1">下载模板</el-dropdown-item>
-                            <el-dropdown-item command="2">上传导入</el-dropdown-item>
+                            <el-dropdown-item command="0" @click.native="handleExportModule">下载模板</el-dropdown-item>
+                            <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
+                                     :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false"
+                                     :auto-upload="true" :on-progress="handleProgress" :on-success="handleExcelSuccess"
+                                     :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
+                          <el-dropdown-item command="1">上传导入</el-dropdown-item>
+                        </el-upload>
                         </el-dropdown-menu>
                     </el-dropdown>
                 </div>
diff --git a/src/views/modules/shequzhili/timeOut/index.vue b/src/views/modules/shequzhili/timeOut/index.vue
index f3df32826..04694479c 100644
--- a/src/views/modules/shequzhili/timeOut/index.vue
+++ b/src/views/modules/shequzhili/timeOut/index.vue
@@ -41,11 +41,11 @@
                                     value: 'id',
                                 }"   />
                         </el-form-item>
-                        <el-form-item label="办理状态" prop="resolveStatus">
+                        <el-form-item label="办理状态" prop="operationType">
                             <el-cascader class="u-item-width-normal"
                                 size="small"
                                 ref="myCascader"
-                                v-model.trim="formData.resolveStatus"
+                                v-model.trim="formData.operationType"
                                :options="ProcessingList"
                                 :show-all-levels="false"
                                 clearable></el-cascader>
@@ -277,7 +277,6 @@ export default {
                 }
             ],
 
-
             formData: {
                 agencyId: "",
                 sourceType: "",
@@ -293,7 +292,8 @@ export default {
                 firstIdList: [],
                 secondIdList: [],
                 workOrderNum: "",
-                limitStatus:""
+                limitStatus:"",
+                operationType:""
             },
             cateOptions: [],
             eventTypeCheck: [],
@@ -650,11 +650,13 @@ export default {
             if (this.eventTypeCheck) {
                 this.formData.secondIdList = this.eventTypeCheck
             }
-
+           
             const { pageSize, pageNo, formData } = this;
             // 创建新的 formData 对象，保留原始值
-            const newFormData = { ...formData };
-
+            let newFormData = { ...formData };
+            if(!this.formData.limitStatus){
+                newFormData.limitStatus = '3'
+            }
             // 处理 agencyId
             if (Array.isArray(newFormData.agencyId) && newFormData.agencyId.length) {
                 if (this.level == "grid") {
@@ -761,6 +763,7 @@ export default {
                 endTime: "",
                 limitStartTime: "",
                 limitEndTime: "",
+                operationType:'',
                 status: "",
                 firstIdList: [],
                 secondIdList: [],