Merge branch 'dev' into gyj

src/views/caseManagement/caseList.vue

@@ -2,7 +2,7 @@
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
             <el-form-item label="案件状态" prop="caseFlowId">
-                <el-select v-model="queryParams.caseFlowId" placeholder="请选择" @change="columnNameChange(item)" clearable>
+                <el-select v-model="queryParams.caseFlowId" placeholder="请选择" clearable>
                     <el-option v-for="dict in dict.type.case_flow_node" :key="dict.value" :label="dict.label"
                         :value="dict.value" @keyup.enter.native="handleQuery"></el-option>
                 </el-select>
@@ -61,7 +61,7 @@
                 <template slot-scope="scope">
                     <!-- <el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)" v-if="statusRole(scope.row.caseFlowId)">提交</el-button> -->
                     <el-button size="mini" @click="eidtNodeprocess(scope.row,1)" type="text"
-                        icon="el-icon-edit">修改</el-button>
+                        icon="el-icon-edit" v-hasPermi="['caseManagement:list:edit']">修改</el-button>
                     <el-button size="mini" @click="checkDetail(scope.row)" type="text" icon="el-icon-view">查看详情</el-button>
                     <!-- <el-button size="mini" @click="consultantApplica(scope.row)" type="text" icon="el-icon-tickets">法律顾问用印申请</el-button> -->
                     <!-- <el-button size="mini" @click="departmentApplica(scope.row)" type="text" icon="el-icon-edit-outline">部门长用印</el-button> -->
@@ -76,8 +76,8 @@
                     <!-- <el-button size="mini" @click="signMediation(scope.row)" type="text" icon="el-icon-edit-outline">申请人签收</el-button> -->
                     <!-- <el-button size="mini" @click="receivedMediation(scope.row)" type="text" icon="el-icon-edit-outline">被申请人签收</el-button>                 -->
                     <el-button size="mini" type="text" icon="el-icon-edit"
-                        @click="evidenceUpload(scope.row)">证据修改</el-button>
-                    <el-button size="mini" type="text" icon="el-icon-edit" @click="caseFilingDetails(scope.row)">归档详情</el-button>
+                        @click="evidenceUpload(scope.row)" v-hasPermi="['caseManagement:list:evidenceEdit']">证据修改</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="caseFilingDetails(scope.row)">归档详情</el-button>  
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)">缴费</el-button> -->
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="selectMediator(scope.row)">预约时间</el-button> -->
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="secretaryConfirm(scope.row)">秘书审核</el-button> -->

src/views/caseManagement/components/addCase.vue

@@ -265,8 +265,8 @@
                             },
                         ]">
                             <el-radio-group v-model="formData.affiliate.respondentSex">
-                                <el-radio label="0">男</el-radio>
-                                <el-radio label="1">女</el-radio>
+                                <el-radio :label="0">男</el-radio>
+                                <el-radio :label="1">女</el-radio>
                             </el-radio-group>
                         </el-form-item>
                     </el-col>

src/views/caseManagement/components/timeConfirm.vue

@@ -123,7 +123,7 @@ export default {
                 //     Message.error('至少选择一名调解员');
                 //     return
                 // }
-                if (this.formLabelAlign.time.length < 1) {
+                if (this.formLabelAlign.name == '') {
                     Message.error('至少选择一个时间');
                     return
                 }