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

src/views/awardManagement/components/paymentdetailsDialog.vue

@@ -74,7 +74,8 @@
             v-model="arbitrateRecord.verificaOpinion" />
         </el-form-item> -->
         <el-form-item label="笔录内容：" prop="responCrossOpin">
-            <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecord.responCrossOpin" placeholder="请输入" />
+            <!-- <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecord.responCrossOpin" placeholder="请输入" /> -->
+            <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecordt.responCrossOpin" placeholder="请输入" />
           </el-form-item>
         <el-form-item label="审核意见：" prop="checkOpinion" v-if="flag == 2">
           <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.checkOpinion" />
@@ -111,9 +112,11 @@ export default {
   data() {
     return {
       // key: value
+      arbitrateRecordt: {},
       form: {},
       arbitrateRecord: {
-        checkOpinion:"同意"
+        // checkOpinion:"同意"
+        checkOpinion:""
       },
       // 表单校验
       rules: {
@@ -187,15 +190,15 @@ export default {
             (this.respondenPathArr = []), //被申请人
             (this.awardFileArr = []), //裁决书
             (this.awardPathArr = []), //裁决书
-            setTimeout(() => {
+            // setTimeout(() => {
               this.form = this.detailform;
-              console.log(this.detailform)
-              if(this.form.arbitrateRecord.checkOpinion == null ){
-                this.form.arbitrateRecord.checkOpinion = '同意'
-              }
-              this.arbitrateRecord = this.form.arbitrateRecord;
+              // if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){
+                // this.form.arbitrateRecord.checkOpinion = '同意';
+                this.arbitrateRecord.checkOpinion = '';
+              // }
+              // this.arbitrateRecord = this.form.arbitrateRecord;
               this.evidenceFile(this.form);
-            }, 1000);
+            // }, 1000);
         }
       },
     },
@@ -204,6 +207,12 @@ export default {
     // 申请人裁决书
     evidenceFile(val) {
       if (val) {
+        this.applicantFileArr = [];
+        this.applicantPathArr = [];
+        this.respondentFileArr = [];
+        this.respondenPathArr = [];        
+        this.awardFileArr = [];
+        this.awardPathArr = [];
         this.bookFileArr = [];
         this.bookPathArr = [];
         val.caseAttachList.forEach((item) => {
@@ -214,8 +223,6 @@ export default {
             this.respondentFileArr.push(item.annexName);
             this.respondenPathArr.push(item.annexPath);
           } else if (item.annexType == 3) {
-            this.awardFileArr = [];
-            this.awardPathArr = [];
             this.awardFileArr.push(item.annexName);
             this.awardPathArr.push(item.annexPath);
           } else if (item.annexType == 7) {

src/views/caseFiling/components/archiveDetailsDialog.vue

@@ -16,11 +16,11 @@
           <!-- <el-tab-pane label="快递信息" name="third" v-if="false">
             <expressDeliveryInfo :deliveryDataArr="detailform"></expressDeliveryInfo>
           </el-tab-pane> -->
-          <!-- <el-tab-pane label="案件视频" name="fourth"> -->
+          <el-tab-pane label="案件视频" name="fourth" v-if="caseDetail.arbitratMethodName=='开庭审理'?true:false">
             <!-- <div @click="getVideo">chakanshipin</div> -->
-            <!-- <el-empty description="暂无视频" v-if="!videoFlag"></el-empty>
+            <el-empty description="暂无视频" v-if="!videoFlag"></el-empty>
             <video style="background-color: #181717;width: 400px;height: 200px;margin: 30px;" v-if="videoFlag" :src="headPath + item.annexPath" controls="controls" v-for="(item,index) in videoUrl" :key="index"></video>
-          </el-tab-pane> -->
+          </el-tab-pane>
         </el-tabs>
       </div>
       <div slot="footer" class="dialog-footer">

src/views/caseManagement/caseList.vue

@@ -837,7 +837,7 @@ export default {
     },
     // 表格显示高亮
     tableRowClassName(row){
-      if(row.row.caseStatus==8){
+      if(row.row.arbitratMethodName=="开庭审理"){
         return 'pendingTrial'
       }
       

src/views/caseManagement/components/caseCompressionPackage.vue

@@ -138,13 +138,24 @@ export default {
       this.$emit("cancelCompreess");
       this.upload.isUploading = false;
       this.$refs.uploadZipBatch.clearFiles();
-      this.$alert(
+      if(response.code ==200){
+        this.$alert(
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
           response.msg +
           "</div>",
         "导入结果",
         { dangerouslyUseHTMLString: true }
-      );
+      )
+      }else{
+        this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          "导入压缩失败" +
+          "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      )
+      }
+      
       this.getcaseApply(this.queryParams);
     },
   },

src/views/caseManagement/components/caseentryDialog.vue

@@ -163,7 +163,7 @@
                   message: '申请人不能为空',
                   trigger: 'blur',
                 },
-                { max: 20, message: '长度应小于20个字符', trigger: 'blur' }
+                { max: 50, message: '长度应小于50个字符', trigger: 'blur' }
               ]">
                 <el-input v-model="item.name" placeholder="请输入" />
               </el-form-item>

src/views/caseManagement/components/caseentryExamine.vue

@@ -165,7 +165,7 @@
               </div>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item
               label="被申请人案件证据资料："
               prop="respondentEvidence"
@@ -176,7 +176,7 @@
                 </a>
               </div>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-form>
       <!-- 申请人主体信息 -->