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

src/views/caseManagement/caseList.vue

@@ -3,7 +3,7 @@
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
             <el-form-item label="案件状态" prop="caseFlowId">
                 <el-select v-model="queryParams.caseFlowId" placeholder="请选择" clearable>
-                    <el-option v-for="dict in buttonList" :key="dict.id" :label="dict.caseStatusName"
+                    <el-option v-for="dict in caseStausArr" :key="dict.id" :label="dict.caseStatusName"
                         :value="dict.id" @keyup.enter.native="handleQuery"></el-option>
                 </el-select>
             </el-form-item>
@@ -251,6 +251,7 @@ export default {
             timeConfirmData: {},
             confirmTionData:{},
             buttonList: [],
+            caseStausArr: [],//案件状态
             isapplicant: true, //判断角色申请人或非申请人
         };
     },
@@ -328,6 +329,7 @@ export default {
                     if(item.id !=17){
                         this.buttonList.push(item)
                     }
+                    this.caseStausArr.push(item)
                 });               
             })
         },

src/views/caseManagement/components/addCase.vue

@@ -106,7 +106,7 @@
               </div>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="modelFlag">
+          <el-col :span="24" v-if="modelFlag && showmediate">
             <el-form-item label="调解书:">
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 7">
                 <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
@@ -500,7 +500,8 @@ export default {
       respondentEvidence: [], //被申请人证据
       buttonFlag: true,
       getUserInfoList: {},
-      applicationFlag: null
+      applicationFlag: null,
+      showmediate: false
     };
   },
   watch: {
@@ -531,6 +532,7 @@ export default {
     addVisable(val) {
       if (val) {
         this.activeName = "first";
+        this.showmediate = false;
         this.getTemplateFn();
         if (this.addModifyData != 1) {
           this.caseApplicationSelectByIdFn(this.caseData.id);
@@ -570,6 +572,8 @@ export default {
             this.applicantEvidence.push(item);
           } else if (item.annexType == 6) {
             this.respondentEvidence.push(item);
+          } else if (item.annexType == 7) {
+            this.showmediate = true
           }
         });
       });