Просмотр исходного кода

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Frontend into hcb

fz 2 лет назад
Родитель
Сommit
09e3e5d600

+ 8
- 2
src/views/awardManagement/components/paymentdetailsDialog.vue Просмотреть файл

@@ -76,7 +76,7 @@
76 76
         <el-form-item label="笔录内容:" prop="responCrossOpin">
77 77
             <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecord.responCrossOpin" placeholder="请输入" />
78 78
           </el-form-item>
79
-        <el-form-item label="审核裁决书意见:" prop="checkOpinion" v-if="flag == 2">
79
+        <el-form-item label="审核意见:" prop="checkOpinion" v-if="flag == 2">
80 80
           <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.checkOpinion" />
81 81
         </el-form-item>
82 82
       </el-form>
@@ -112,7 +112,9 @@ export default {
112 112
     return {
113 113
       // key: value
114 114
       form: {},
115
-      arbitrateRecord: {},
115
+      arbitrateRecord: {
116
+        checkOpinion:"同意"
117
+      },
116 118
       // 表单校验
117 119
       rules: {
118 120
         evidenDetermi: [
@@ -187,6 +189,10 @@ export default {
187 189
             (this.awardPathArr = []), //裁决书
188 190
             setTimeout(() => {
189 191
               this.form = this.detailform;
192
+              console.log(this.detailform)
193
+              if(this.form.arbitrateRecord.checkOpinion == null ){
194
+                this.form.arbitrateRecord.checkOpinion = '同意'
195
+              }
190 196
               this.arbitrateRecord = this.form.arbitrateRecord;
191 197
               this.evidenceFile(this.form);
192 198
             }, 1000);

+ 3
- 0
src/views/caseFiling/archiveList.vue Просмотреть файл

@@ -34,6 +34,9 @@
34 34
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
35 35
       </el-form-item>
36 36
     </el-form>
37
+    <!-- <el-row>
38
+         <el-button  size="mini">案件归档</el-button>
39
+    </el-row> -->
37 40
     <el-table v-loading="loading" :data="dataList" style="width: 100%">
38 41
       <el-table-column label="序号" type="index" align="center">
39 42
         <template slot-scope="scope">

+ 32
- 5
src/views/caseManagement/caseList.vue Просмотреть файл

@@ -46,6 +46,8 @@
46 46
       <el-col :span="1.5">
47 47
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="filingApplication"
48 48
           v-hasPermi="['caseManagement:list:add']">案件录入</el-button>
49
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="compressedPackages"
50
+          >案件压缩包导入</el-button>
49 51
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="batchApplication"
50 52
           v-hasPermi="['caseManagement:list:import']">案件批量导入</el-button>
51 53
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="operateClick(0)"
@@ -60,7 +62,7 @@
60 62
           v-hasPermi="['caseManagement:list:pay']">批量缴费</el-button>
61 63
       </el-col>
62 64
     </el-row>
63
-    <el-table v-loading="loading" :data="dataList" style="width: 100%">
65
+    <el-table v-loading="loading" :data="dataList" style="width: 100%" :row-class-name="tableRowClassName" class="pendingTrial">
64 66
       <el-table-column type="selection">
65 67
       </el-table-column>
66 68
       <el-table-column label="序号" type="index" align="center">
@@ -89,7 +91,7 @@
89 91
           <el-button size="mini" type="text" icon="el-icon-zoom-in" @click="viewProcess(scope.row)">查看流程</el-button>
90 92
           <!-- 案件日志 -->
91 93
           <el-button size="mini" type="text" icon="el-icon-notebook-2" @click="caselogRow(scope.row)">案件日志</el-button>
92
-          <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) &&
94
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="editRow(scope.row)" v-if="(scope.row.caseStatus < 10 && scope.row.updateSubmitStatus !== 1) &&
93 95
             checkPermi(['caseManagement:list:update']) && btnStatus
94 96
             ">修改</el-button>
95 97
           <!-- 撤销修改 -->
@@ -231,6 +233,10 @@
231 233
     <caseentryExamineDialog :dialogtitle="dialogtitle" :caseentryExamineVisible="caseentryExamineVisible" :queryParams="queryParams"
232 234
     :getcaseApply="getcaseApply"
233 235
     @caseentryExamineCancel="caseentryExamineCancel" :caseentryExamineData="caseentryExamineData" :caseentryExamineDataAll="caseentryExamineDataAll"></caseentryExamineDialog>
236
+    <caseCompressionPackage :openCompressedPackages="openCompressedPackages" :queryParams="queryParams" @cancelCompreess="cancelCompreess"
237
+      :getcaseApply="getcaseApply">
238
+    </caseCompressionPackage>
239
+    
234 240
   </div>
235 241
 </template>
236 242
 
@@ -250,6 +256,7 @@ import evidenceDialog from './components/evidenceDialog.vue';
250 256
 import timeDialog from './components/timeDialog.vue';
251 257
 import operateDialog from './components/operateDialog.vue';
252 258
 import uploadCaseDialog from './components/uploadCaseDialog.vue';
259
+import caseCompressionPackage from './components/caseCompressionPackage.vue'
253 260
 // 秘书审核页面
254 261
 import caseentryExamineDialog from './components/caseentryExamine.vue';
255 262
 import { caseApplicationDetail } from "@/api/pay/pay";
@@ -288,7 +295,8 @@ export default {
288 295
     timeDialog,
289 296
     operateDialog,
290 297
     uploadCaseDialog,
291
-    caseentryExamineDialog
298
+    caseentryExamineDialog,
299
+    caseCompressionPackage
292 300
   },
293 301
   data() {
294 302
     return {
@@ -323,6 +331,7 @@ export default {
323 331
       showfilingreview: false, //立案申查弹框控制
324 332
       filingreviewdata: {}, //立案审查传输数据
325 333
       openbatch: false, // 批量申请弹框
334
+      openCompressedPackages:false,//案件压缩包导入
326 335
       formateCourtData: {}, //组庭
327 336
       showformateCourt: false, //组庭界面显示
328 337
       showcourtReview: false, //组庭审核页面
@@ -388,6 +397,10 @@ export default {
388 397
     },
389 398
     cancelBatch() {
390 399
       this.openbatch = false;
400
+      
401
+    },
402
+    cancelCompreess(){
403
+      this.openCompressedPackages = false;
391 404
     },
392 405
     cancelTime() {
393 406
       this.timeVisable = false;
@@ -557,6 +570,10 @@ export default {
557 570
     batchApplication() {
558 571
       this.openbatch = true;
559 572
     },
573
+    //案件导入压缩包
574
+    compressedPackages(){
575
+      this.openCompressedPackages = true;
576
+    },
560 577
     // 详情
561 578
     detailRow(row) {
562 579
       this.flag = "0";
@@ -815,11 +832,21 @@ export default {
815 832
         .catch(() => { });
816 833
       }
817 834
       
835
+    },
836
+    // 表格显示高亮
837
+    tableRowClassName(row){
838
+      if(row.row.caseStatus==8){
839
+        return 'pendingTrial'
840
+      }
841
+      
818 842
     }
819 843
   },
820 844
 };
821 845
 </script>
822 846
 
823
-<style lang="scss" scoped>
824
-#formContainer {}
847
+<style>
848
+/* // #formContainer {} */
849
+.el-table .pendingTrial {
850
+    background:oldlace;
851
+  }
825 852
 </style>

+ 197
- 0
src/views/caseManagement/components/caseCompressionPackage.vue Просмотреть файл

@@ -0,0 +1,197 @@
1
+<template>
2
+  <div>
3
+    <!-- 立案申请弹框 -->
4
+    <el-dialog
5
+      title="案件压缩"
6
+      :visible="openCompressedPackages"
7
+      width="600px"
8
+      append-to-body
9
+      @close="cancel"
10
+      center
11
+    >
12
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
13
+        <el-row>
14
+          <!-- <el-col :span="16">
15
+            <el-form-item label="申请人姓名:" prop="applyName">
16
+              <el-input v-model="form.jobName" placeholder="请输入姓名" />
17
+            </el-form-item>
18
+          </el-col>-->
19
+          <el-col :span="15">
20
+            <div class="download" style="">
21
+              <span> 下载: </span>
22
+              <a href="#">
23
+                <el-button class="uploadlink" @click="downloadTemplate">案件压缩导入模板</el-button>
24
+              </a>
25
+            </div>
26
+          </el-col>
27
+          <el-col :span="15">
28
+           <div style="margin:10px 0;font-size:12px;color:grey">
29
+               <span>
30
+                    提示:请将多个excel文件压缩成zip格式后上传
31
+               </span>
32
+           </div>
33
+          </el-col>
34
+          <!-- <el-col :span="12">
35
+            <el-form-item label="立案申请书:" prop="applybook"> </el-form-item>
36
+          </el-col>
37
+          <el-col :span="12"> </el-col> -->
38
+        </el-row>
39
+        <el-row>
40
+          <el-form-item :span="24" label="案件压缩包上传:" prop="upload">
41
+            <el-upload
42
+              class="upload-demo"
43
+              ref="uploadZipBatch"
44
+              :limit="1"
45
+              accept=".zip"
46
+              :headers="upload.headers"
47
+              :action="upload.url + '?updateSupport=' + upload.updateSupport"
48
+              :disabled="upload.isUploading"
49
+              :on-progress="handleFileUploadProgress"
50
+              :on-success="handleFileSuccess"
51
+              :auto-upload="false"
52
+              drag
53
+            >
54
+            <i class="el-icon-upload"></i>
55
+            <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
56
+              <!-- <el-button size="small" type="primary">点击上传</el-button> -->
57
+              <div slot="tip" class="el-upload__tip">
58
+                支持zip格式文件
59
+              </div>
60
+            </el-upload>
61
+          </el-form-item>
62
+        </el-row>
63
+      </el-form>
64
+      <div slot="footer" class="dialog-footer">
65
+        <el-button type="primary" @click="submitForm" class="endbutton"><span>确 定</span></el-button>
66
+        <el-button @click="cancel" class="endbutton1"><span>取 消</span></el-button>
67
+      </div>
68
+    </el-dialog>
69
+  </div>
70
+</template>
71
+
72
+<script>
73
+import { importTemplate } from "@/api/caseAccess/caseEntry";
74
+import { getToken } from "@/utils/auth";
75
+export default {
76
+  props: ["openCompressedPackages","getcaseApply","queryParams"],
77
+  data() {
78
+    return {
79
+      //   key: value,
80
+      form: {},
81
+      fileList: [],
82
+      rules: {
83
+        upload: [
84
+          { required: true, message: "案件压缩包不能为空", trigger: "blur" },
85
+        ],
86
+      },
87
+      // 案件压缩导入
88
+      upload: {
89
+        // 是否显示弹出层(用户导入)
90
+        open: false,
91
+        // 弹出层标题(用户导入)
92
+        title: "",
93
+        // 是否禁用上传
94
+        isUploading: false,
95
+        // 是否更新已经存在的用户数据
96
+        updateSupport: 0,
97
+        // 设置上传的请求头部
98
+        headers: { Authorization: "Bearer " + getToken() },
99
+        // 上传的地址
100
+        url: process.env.VUE_APP_BASE_API + "/caseApplication/uploadCaseZipFile",
101
+      },
102
+    };
103
+  },
104
+  methods: {
105
+    submitForm() {
106
+        this.$refs.uploadZipBatch.submit();
107
+    },
108
+    // 取消
109
+    cancel() {
110
+      this.$emit("cancelCompreess");
111
+    },
112
+    handleRemove(file, fileList) {},
113
+    handlePreview(file) {},
114
+    handleExceed(files, fileList) {
115
+      this.$message.warning(
116
+        `当前限制选择 1个文件,本次选择了 ${files.length} `
117
+      );
118
+    },
119
+    beforeRemove(file, fileList) {
120
+      return this.$confirm(`确定移除 ${file.name}?`);
121
+    },
122
+    // 下载模板 importTemplate
123
+    downloadTemplate() {
124
+    //   console.log("下载模板");
125
+      this.download(
126
+        "caseApplication/uploadCaseZipFile",
127
+        {},
128
+        `case_batch_${new Date().getTime()}.xlsx`
129
+      );
130
+    },
131
+    // 文件上传中处理
132
+    handleFileUploadProgress(event, file, fileList) {
133
+      this.upload.isUploading = true;
134
+    },
135
+    // 文件上传成功处理
136
+    handleFileSuccess(response, file, fileList) {
137
+    //   this.upload.open = false;
138
+      this.$emit("cancelCompreess");
139
+      this.upload.isUploading = false;
140
+      this.$refs.uploadZipBatch.clearFiles();
141
+      this.$alert(
142
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
143
+          response.msg +
144
+          "</div>",
145
+        "导入结果",
146
+        { dangerouslyUseHTMLString: true }
147
+      );
148
+      this.getcaseApply(this.queryParams);
149
+    },
150
+  },
151
+};
152
+</script>
153
+
154
+<style lang="scss" scoped>
155
+.download {
156
+  a {
157
+    .uploadlink{
158
+        border: none;
159
+        color: #2092c7;
160
+    }
161
+  }
162
+}
163
+::v-deep .el-dialog {
164
+  width: 800px;
165
+  background: #ffffff;
166
+  border-radius: 20px;
167
+}
168
+.endbutton {
169
+  width: 154px;
170
+  height: 37px;
171
+  background: #0072ff;
172
+  border-radius: 19px;
173
+  span {
174
+    width: 96px;
175
+    height: 15px;
176
+    font-size: 16px;
177
+    font-family: Microsoft YaHei;
178
+    font-weight: 400;
179
+    color: #ffffff;
180
+  }
181
+}
182
+.endbutton1 {
183
+  width: 154px;
184
+  height: 37px;
185
+  background: #ffffff;
186
+  border: 1px solid #d0d0d0;
187
+  border-radius: 19px;
188
+  span {
189
+    width: 31px;
190
+    height: 13px;
191
+    font-size: 16px;
192
+    font-family: Microsoft YaHei;
193
+    font-weight: 400;
194
+    color: #959595;
195
+  }
196
+}
197
+</style>