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

src/views/caseManagement/caseList.vue

@@ -47,6 +47,7 @@
         <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"
+        v-hasPermi="['caseManagement:list:zip']"
           >案件压缩包导入</el-button>
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="batchApplication"
           v-hasPermi="['caseManagement:list:import']">案件批量导入</el-button>
@@ -789,6 +790,7 @@ export default {
           }
         });
         this.caseAttachList = res.data.caseAttachList;
+        console.log(this.caseAttachList,"caseAttachList")
         this.form.requestRule = res.data.requestRule;
         this.form.properPreser = res.data.properPreser;
       });

src/views/caseManagement/components/caseentryDialog.vue

@@ -16,8 +16,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <!-- :disabled="flag == '1'" -->
             <el-form-item label="案件名称：" prop="caseName">
-              <el-input v-model="formData.caseName" placeholder="请输入案件名称" :disabled="flag == '1'" />
+              <el-input v-model="formData.caseName" placeholder="请输入案件名称"  />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -877,6 +878,10 @@ export default {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
     handleRemove(file, fileList) {
+      console.log(file)
+      console.log(fileList)
+      console.log(this.caseAttachListArr)
+      this.caseAttachListArr = this.caseAttachListArr.filter(item => item.annexId != file.annexId)
       // (this.caseAttachListArr = []),
         // fileList.forEach((item) => {
         //   this.caseAttachListArr.push( item.response.data );

src/views/caseManagement/components/formateCourtDialog.vue

@@ -16,7 +16,7 @@
         label-position="left"
       >
         <el-form-item label="是否同意组庭：">
-          <el-radio-group v-model="isAgreePendTral">
+          <el-radio-group v-model="isAgreePendTral" @change="radioValue">
             <el-radio :label="1">是</el-radio>
             <el-radio :label="0">否</el-radio>
           </el-radio-group>
@@ -161,9 +161,12 @@ export default {
       this.$refs["formateCourtform"].validate((valid) => {
         if (valid) {
           pendTralCheck(this.paramsdata).then((res) => {
+            
             this.cancel();
             this.$modal.msgSuccess("组庭成功");
             this.$emit("getcaseApply", this.queryParams);
+            // 初始化页面
+            this.formateCourtform={}
           });
         }
       });
@@ -173,6 +176,13 @@ export default {
       this.$emit("cancelcourtDialog");
       this.arbitrators = [];
     },
+    radioValue(val){
+      if(val==1){
+        this.formateCourtform={}
+      }else if(val==0){
+        this.formateCourtform={}
+      }
+    }
   },
 };
 </script>

src/views/caseManagement/components/operateDialog.vue

@@ -21,9 +21,9 @@
                     <el-descriptions-item label="被申请人">{{
                         item.caseResName
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="申请人仲裁诉求">{{
+                    <!-- <el-descriptions-item label="申请人仲裁诉求">{{
                         item.arbitratClaims
-                    }}</el-descriptions-item>
+                    }}</el-descriptions-item> -->
                 </el-descriptions>
                 <div class="paySelectType">
                     <el-radio-group v-model="paySelect" @input="changPayType">

src/views/caseManagement/components/viewprocessDialog.vue

@@ -2,7 +2,7 @@
     <div>
         <el-dialog title="案件流程" :visible="processVisable" @close="cancel" center :distroy-on-close="true">
             <div>
-                <el-steps class="steps" :active="pageData.caseStatus">
+                <el-steps class="steps" :active="caseStatus">
                     <el-step :title="item.caseNodeName || item.content" v-for="(item,index) in pageData.allCasenode" :description="(item.createNickName || '') + (item.caseNodeTime || '')"></el-step>
                    
                 </el-steps>
@@ -21,7 +21,8 @@ export default {
     data() {
         return {
             processId:null,
-            pageData:{}
+            pageData:{},
+            caseStatus:0
         };
     },
     watch: {
@@ -38,8 +39,13 @@ export default {
         },
         selectCaseProgressFn(data){
             selectCaseProgress(data).then(res=>{
-                console.log(res,"请求成功");
+                 this.pageData = res.data.data; 
-                this.pageData = res.data.data;
+                let allCasenode = res.data.data.allCasenode;
+                allCasenode.forEach((item,index) => {
+                    if(item.caseNode==res.data.data.caseStatus){
+                        this.caseStatus = index
+                    }
+                });
             })
         }
     },