From 463e31ab37170070a6127728a57a33b118fd24b2 Mon Sep 17 00:00:00 2001
From: gyj <gaoyj@aliyun.com>
Date: Mon, 27 Nov 2023 18:00:53 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=EF=BC=8C=E7=94=A8=E5=8D=B0?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=A1=88=E4=BB=B6?=
 =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E5=8C=85=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/paymentdetailsDialog.vue       |  10 +-
 src/views/caseManagement/caseList.vue         |  35 ++-
 .../components/caseCompressionPackage.vue     | 199 ++++++++++++++++++
 3 files changed, 238 insertions(+), 6 deletions(-)
 create mode 100644 src/views/caseManagement/components/caseCompressionPackage.vue

diff --git a/src/views/awardManagement/components/paymentdetailsDialog.vue b/src/views/awardManagement/components/paymentdetailsDialog.vue
index fa24bd1..9de44d8 100644
--- a/src/views/awardManagement/components/paymentdetailsDialog.vue
+++ b/src/views/awardManagement/components/paymentdetailsDialog.vue
@@ -76,7 +76,7 @@
         <el-form-item label="笔录内容：" prop="responCrossOpin">
             <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecord.responCrossOpin" placeholder="请输入" />
           </el-form-item>
-        <el-form-item label="审核裁决书意见：" prop="checkOpinion" v-if="flag == 2">
+        <el-form-item label="审核意见：" prop="checkOpinion" v-if="flag == 2">
           <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.checkOpinion" />
         </el-form-item>
       </el-form>
@@ -112,7 +112,9 @@ export default {
     return {
       // key: value
       form: {},
-      arbitrateRecord: {},
+      arbitrateRecord: {
+        checkOpinion:"同意"
+      },
       // 表单校验
       rules: {
         evidenDetermi: [
@@ -187,6 +189,10 @@ export default {
             (this.awardPathArr = []), //裁决书
             setTimeout(() => {
               this.form = this.detailform;
+              console.log(this.detailform)
+              if(this.form.arbitrateRecord.checkOpinion == null ){
+                this.form.arbitrateRecord.checkOpinion = '同意'
+              }
               this.arbitrateRecord = this.form.arbitrateRecord;
               this.evidenceFile(this.form);
             }, 1000);
diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue
index 6523782..a121f71 100644
--- a/src/views/caseManagement/caseList.vue
+++ b/src/views/caseManagement/caseList.vue
@@ -46,6 +46,8 @@
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="filingApplication"
           v-hasPermi="['caseManagement:list:add']">案件录入</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="compressedPackages"
+          >案件压缩包导入</el-button>
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="batchApplication"
           v-hasPermi="['caseManagement:list:import']">案件批量导入</el-button>
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="operateClick(0)"
@@ -60,7 +62,7 @@
           v-hasPermi="['caseManagement:list:pay']">批量缴费</el-button>
       </el-col>
     </el-row>
-    <el-table v-loading="loading" :data="dataList" style="width: 100%">
+    <el-table v-loading="loading" :data="dataList" style="width: 100%" :row-class-name="tableRowClassName" class="pendingTrial">
       <el-table-column type="selection">
       </el-table-column>
       <el-table-column label="序号" type="index" align="center">
@@ -231,6 +233,10 @@
     <caseentryExamineDialog :dialogtitle="dialogtitle" :caseentryExamineVisible="caseentryExamineVisible" :queryParams="queryParams"
     :getcaseApply="getcaseApply"
     @caseentryExamineCancel="caseentryExamineCancel" :caseentryExamineData="caseentryExamineData" :caseentryExamineDataAll="caseentryExamineDataAll"></caseentryExamineDialog>
+    <caseCompressionPackage :openCompressedPackages="openCompressedPackages" :queryParams="queryParams" @cancelCompreess="cancelCompreess"
+      :getcaseApply="getcaseApply">
+    </caseCompressionPackage>
+    
   </div>
 </template>
 
@@ -250,6 +256,7 @@ import evidenceDialog from './components/evidenceDialog.vue';
 import timeDialog from './components/timeDialog.vue';
 import operateDialog from './components/operateDialog.vue';
 import uploadCaseDialog from './components/uploadCaseDialog.vue';
+import caseCompressionPackage from './components/caseCompressionPackage.vue'
 // 秘书审核页面
 import caseentryExamineDialog from './components/caseentryExamine.vue';
 import { caseApplicationDetail } from "@/api/pay/pay";
@@ -288,7 +295,8 @@ export default {
     timeDialog,
     operateDialog,
     uploadCaseDialog,
-    caseentryExamineDialog
+    caseentryExamineDialog,
+    caseCompressionPackage
   },
   data() {
     return {
@@ -323,6 +331,7 @@ export default {
       showfilingreview: false, //立案申查弹框控制
       filingreviewdata: {}, //立案审查传输数据
       openbatch: false, // 批量申请弹框
+      openCompressedPackages:false,//案件压缩包导入
       formateCourtData: {}, //组庭
       showformateCourt: false, //组庭界面显示
       showcourtReview: false, //组庭审核页面
@@ -388,6 +397,10 @@ export default {
     },
     cancelBatch() {
       this.openbatch = false;
+      
+    },
+    cancelCompreess(){
+      this.openCompressedPackages = false;
     },
     cancelTime() {
       this.timeVisable = false;
@@ -557,6 +570,10 @@ export default {
     batchApplication() {
       this.openbatch = true;
     },
+    //案件导入压缩包
+    compressedPackages(){
+      this.openCompressedPackages = true;
+    },
     // 详情
     detailRow(row) {
       this.flag = "0";
@@ -815,11 +832,21 @@ export default {
         .catch(() => { });
       }
       
+    },
+    // 表格显示高亮
+    tableRowClassName(row){
+      if(row.row.caseStatus==8){
+        return 'pendingTrial'
+      }
+      
     }
   },
 };
 </script>
 
-<style lang="scss" scoped>
-#formContainer {}
+<style>
+/* // #formContainer {} */
+.el-table .pendingTrial {
+    background:oldlace;
+  }
 </style>
diff --git a/src/views/caseManagement/components/caseCompressionPackage.vue b/src/views/caseManagement/components/caseCompressionPackage.vue
new file mode 100644
index 0000000..3a76a4e
--- /dev/null
+++ b/src/views/caseManagement/components/caseCompressionPackage.vue
@@ -0,0 +1,199 @@
+<template>
+  <div>
+    <!-- 立案申请弹框 -->
+    <el-dialog
+      title="案件压缩"
+      :visible="openCompressedPackages"
+      width="600px"
+      append-to-body
+      @close="cancel"
+      center
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-row>
+          <!-- <el-col :span="16">
+            <el-form-item label="申请人姓名：" prop="applyName">
+              <el-input v-model="form.jobName" placeholder="请输入姓名" />
+            </el-form-item>
+          </el-col>-->
+          <el-col :span="15">
+            <div class="download" style="">
+              <span> 下载： </span>
+              <a href="#">
+                <el-button class="uploadlink" @click="downloadTemplate">案件压缩导入模板</el-button>
+              </a>
+            </div>
+          </el-col>
+          <el-col :span="15">
+           <div style="margin:10px 0;font-size:12px;color:grey">
+               <span>
+                    提示：请将多个excel文件压缩后上传
+               </span>
+           </div>
+          </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="立案申请书：" prop="applybook"> </el-form-item>
+          </el-col>
+          <el-col :span="12"> </el-col> -->
+        </el-row>
+        <el-row>
+          <el-form-item :span="24" label="案件压缩包上传：" prop="upload">
+            <el-upload
+              class="upload-demo"
+              ref="uploadZipBatch"
+              :limit="1"
+              accept=".zip, .rar"
+              :headers="upload.headers"
+              :action="upload.url + '?updateSupport=' + upload.updateSupport"
+              :disabled="upload.isUploading"
+              :on-progress="handleFileUploadProgress"
+              :on-success="handleFileSuccess"
+              :auto-upload="false"
+              drag
+            >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+              <!-- <el-button size="small" type="primary">点击上传</el-button> -->
+              <div slot="tip" class="el-upload__tip">
+                支持rar或zip格式文件
+              </div>
+            </el-upload>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" class="endbutton"><span>确 定</span></el-button>
+        <el-button @click="cancel" class="endbutton1"><span>取 消</span></el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { importTemplate } from "@/api/caseAccess/caseEntry";
+import { getToken } from "@/utils/auth";
+export default {
+  props: ["openCompressedPackages","getcaseApply","queryParams"],
+  data() {
+    return {
+      //   key: value,
+      form: {},
+      fileList: [],
+      rules: {
+        upload: [
+          { required: true, message: "案件压缩包不能为空", trigger: "blur" },
+        ],
+      },
+      // 案件压缩导入
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/caseApplication/uploadCaseZipFile",
+      },
+    };
+  },
+  methods: {
+    submitForm() {
+        this.$refs.uploadZipBatch.submit();
+    },
+    // 取消
+    cancel() {
+      this.$emit("cancelCompreess");
+    },
+    handleRemove(file, fileList) {},
+    handlePreview(file) {},
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    // 下载模板 importTemplate
+    downloadTemplate() {
+    //   console.log("下载模板");
+      this.download(
+        "caseApplication/uploadCaseZipFile",
+        {},
+        `case_batch_${new Date().getTime()}.xlsx`
+      );
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+    //   this.upload.open = false;
+      this.$emit("cancelCompreess");
+      this.upload.isUploading = false;
+      this.$refs.uploadZipBatch.clearFiles();
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      );
+      this.getcaseApply(this.queryParams);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.download {
+  a {
+    .uploadlink{
+        border: none;
+        color: #2092c7;
+    }
+  }
+}
+::v-deep .el-dialog {
+  width: 800px;
+  background: #ffffff;
+  border-radius: 20px;
+}
+.endbutton {
+  width: 154px;
+  height: 37px;
+  background: #0072ff;
+  border-radius: 19px;
+  span {
+    width: 96px;
+    height: 15px;
+    font-size: 16px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    color: #ffffff;
+  }
+}
+.endbutton1 {
+  width: 154px;
+  height: 37px;
+  background: #ffffff;
+  border: 1px solid #d0d0d0;
+  border-radius: 19px;
+  span {
+    width: 31px;
+    height: 13px;
+    font-size: 16px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    color: #959595;
+  }
+}
+</style>
\ No newline at end of file

From 9b90c332f3491f715f808aa80a5c05e77d9817a7 Mon Sep 17 00:00:00 2001
From: gyj <gaoyj@aliyun.com>
Date: Tue, 28 Nov 2023 17:56:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A1=88?=
 =?UTF-8?q?=E4=BB=B6=E5=8E=8B=E7=BC=A9=E5=8C=85=E9=99=90=E5=88=B6=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/caseFiling/archiveList.vue                   |  3 +++
 .../components/caseCompressionPackage.vue              | 10 ++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/caseFiling/archiveList.vue b/src/views/caseFiling/archiveList.vue
index 6bd5874..23929e2 100644
--- a/src/views/caseFiling/archiveList.vue
+++ b/src/views/caseFiling/archiveList.vue
@@ -34,6 +34,9 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+    <!-- <el-row>
+         <el-button  size="mini">案件归档</el-button>
+    </el-row> -->
     <el-table v-loading="loading" :data="dataList" style="width: 100%">
       <el-table-column label="序号" type="index" align="center">
         <template slot-scope="scope">
diff --git a/src/views/caseManagement/components/caseCompressionPackage.vue b/src/views/caseManagement/components/caseCompressionPackage.vue
index 3a76a4e..dcf12e8 100644
--- a/src/views/caseManagement/components/caseCompressionPackage.vue
+++ b/src/views/caseManagement/components/caseCompressionPackage.vue
@@ -27,7 +27,7 @@
           <el-col :span="15">
            <div style="margin:10px 0;font-size:12px;color:grey">
                <span>
-                    提示：请将多个excel文件压缩后上传
+                    提示：请将多个excel文件压缩成zip格式后上传
                </span>
            </div>
           </el-col>
@@ -42,7 +42,7 @@
               class="upload-demo"
               ref="uploadZipBatch"
               :limit="1"
-              accept=".zip, .rar"
+              accept=".zip"
               :headers="upload.headers"
               :action="upload.url + '?updateSupport=' + upload.updateSupport"
               :disabled="upload.isUploading"
@@ -55,7 +55,7 @@
             <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
               <!-- <el-button size="small" type="primary">点击上传</el-button> -->
               <div slot="tip" class="el-upload__tip">
-                支持rar或zip格式文件
+                支持zip格式文件
               </div>
             </el-upload>
           </el-form-item>
@@ -113,9 +113,7 @@ export default {
     handlePreview(file) {},
     handleExceed(files, fileList) {
       this.$message.warning(
-        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
-          files.length + fileList.length
-        } 个文件`
+        `当前限制选择 1个文件，本次选择了 ${files.length} `
       );
     },
     beforeRemove(file, fileList) {

From e405b3c94c1fbb376dc73b723606077bd7d69ab1 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 29 Nov 2023 15:03:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=85=E4=BA=A4=E8=B4=B9=E6=97=B6?=
 =?UTF-8?q?=E6=A1=88=E4=BB=B6=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/caseManagement/caseList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue
index a121f71..f5ef13d 100644
--- a/src/views/caseManagement/caseList.vue
+++ b/src/views/caseManagement/caseList.vue
@@ -91,7 +91,7 @@
           <el-button size="mini" type="text" icon="el-icon-zoom-in" @click="viewProcess(scope.row)">查看流程</el-button>
           <!-- 案件日志 -->
           <el-button size="mini" type="text" icon="el-icon-notebook-2" @click="caselogRow(scope.row)">案件日志</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="editRow(scope.row)" v-if="(scope.row.caseStatus < 10 && scope.row.caseStatus != 2 && scope.row.updateSubmitStatus !== 1) &&
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="editRow(scope.row)" v-if="(scope.row.caseStatus < 10 && scope.row.updateSubmitStatus !== 1) &&
             checkPermi(['caseManagement:list:update']) && btnStatus
             ">修改</el-button>
           <!-- 撤销修改 -->