Merge branch 'hcb' of SH-Arbitrate/Arbitrate-Frontend into dev

src/views/caseManagement/caseList.vue

@@ -1,41 +1,22 @@
 <template>
   <div class="app-container">
-    <el-form
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="98px">
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      label-width="98px"
-    >
       <el-form-item label="案件编号" prop="caseNum">
-        <el-input
+        <el-input v-model="queryParams.caseNum" placeholder="请输入案件编号" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.caseNum"
-          placeholder="请输入案件编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="申请人(机构)" prop="applicantName">
-        <el-input
+        <!-- <el-input
           v-model="queryParams.applicantName"
           placeholder="请输入机构名称"
           clearable
           @keyup.enter.native="handleQuery"
-        />
+        /> -->
+        <el-cascader :options="options" @change="changeDept" :props="{ checkStrictly: true }" clearable></el-cascader>
       </el-form-item>
       <el-form-item label="案件状态" prop="caseStatus">
-        <el-select
+        <el-select v-model="queryParams.caseStatus" placeholder="请选择案件状态" clearable @keyup.enter.native="handleQuery">
-          v-model="queryParams.caseStatus"
+          <el-option v-for="dict in dict.type.case_status" :key="dict.value" :label="dict.label"
-          placeholder="请选择案件状态"
+            :value="dict.value"></el-option>
-          clearable
-          @keyup.enter.native="handleQuery"
-        >
-          <el-option
-            v-for="dict in dict.type.case_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          ></el-option>
         </el-select>
       </el-form-item>
       <!-- <el-form-item label="开庭日期" prop="hearDate">
@@ -49,38 +30,16 @@
         </el-date-picker>
       </el-form-item> -->
       <el-form-item>
-        <el-button
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          type="primary"
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="filingApplication"
-          type="primary"
+          v-hasPermi="['caseManagement:list:add']">案件录入</el-button>
-          plain
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="batchApplication"
-          icon="el-icon-plus"
+          v-hasPermi="['caseManagement:list:import']">案件批量导入</el-button>
-          size="mini"
-          @click="filingApplication"
-          v-hasPermi="['caseManagement:list:add']"
-          >案件录入</el-button
-        >
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="batchApplication"
-          v-hasPermi="['caseManagement:list:import']"
-          >案件批量导入</el-button
-        >
       </el-col>
     </el-row>
     <el-table v-loading="loading" :data="dataList" style="width: 100%">
@@ -91,111 +50,36 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="案件编号" align="center" prop="caseNum" :show-overflow-tooltip="true" />
-        label="案件编号"
+      <el-table-column label="申请人(机构)" align="center" prop="applicantName" :show-overflow-tooltip="true" />
-        align="center"
+      <el-table-column label="案件标的" align="center" prop="caseSubjectAmount" />
-        prop="caseNum"
+      <el-table-column label="仲裁方式" align="center" prop="arbitratMethodName" :show-overflow-tooltip="true" />
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="申请人(机构)"
-        align="center"
-        prop="applicantName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="案件标的"
-        align="center"
-        prop="caseSubjectAmount"
-      />
-      <el-table-column
-        label="仲裁方式"
-        align="center"
-        prop="arbitratMethodName"
-        :show-overflow-tooltip="true"
-      />
       <!-- 仲裁员 -->
       <el-table-column label="仲裁员" align="center" prop="arbitratorName" />
       <!-- 开庭日期 -->
-      <el-table-column
+      <el-table-column label="开庭日期" align="center" prop="hearDate" :show-overflow-tooltip="true" />
-        label="开庭日期"
-        align="center"
-        prop="hearDate"
-        :show-overflow-tooltip="true"
-      />
       <el-table-column label="案件状态" align="center" prop="caseStatusName">
         <template slot-scope="scope">
           <el-tag type="success">{{ scope.row.caseStatusName }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
         <template slot-scope="scope">
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-zoom-in" @click="detailRow(scope.row)"
-            size="mini"
+            v-hasPermi="['caseManagement:list:detail']">详情</el-button>
-            type="text"
-            icon="el-icon-zoom-in"
-            @click="detailRow(scope.row)"
-            v-hasPermi="['caseManagement:list:detail']"
-            >详情</el-button
-          >
           <!-- 案件日志 -->
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-notebook-2" @click="caselogRow(scope.row)"
-            size="mini"
+            v-hasPermi="['caseLog:list:detail']">案件日志</el-button>
-            type="text"
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="editRow(scope.row)"
-            icon="el-icon-notebook-2"
+            v-if="scope.row.caseStatus == 0" v-hasPermi="['caseManagement:list:update']">修改</el-button>
-            @click="caselogRow(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)"
-            v-hasPermi="['caseLog:list:detail']"
+            v-if="scope.row.caseStatus == 0" v-hasPermi="['caseManagement:list:submit']">提交</el-button>
-            >案件日志</el-button
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="deleteRow(scope.row)"
-          >
+            v-if="scope.row.caseStatus == 0" v-hasPermi="['caseManagement:list:delete']">删除</el-button>
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-view" @click="filingreviewRow(scope.row)"
-            size="mini"
+            v-if="scope.row.caseStatus == 1" v-hasPermi="['caseManagement:list:check']">立案审查</el-button>
-            type="text"
+          <el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)"
-            icon="el-icon-edit"
+            v-if="scope.row.caseStatus == 2" v-hasPermi="['caseManagement:list:pay']">缴费</el-button>
-            @click="editRow(scope.row)"
-            v-if="scope.row.caseStatus == 0"
-            v-hasPermi="['caseManagement:list:update']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-check"
-            @click="onsubmitRow(scope.row)"
-            v-if="scope.row.caseStatus == 0"
-            v-hasPermi="['caseManagement:list:submit']"
-            >提交</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="deleteRow(scope.row)"
-            v-if="scope.row.caseStatus == 0"
-            v-hasPermi="['caseManagement:list:delete']"
-            >删除</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="filingreviewRow(scope.row)"
-            v-if="scope.row.caseStatus == 1"
-            v-hasPermi="['caseManagement:list:check']"
-            >立案审查</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-tickets"
-            @click="payStatus(scope.row)"
-            v-if="scope.row.caseStatus == 2"
-            v-hasPermi="['caseManagement:list:pay']"
-            >缴费</el-button
-          >
 
           <!-- <el-button
             size="mini"
@@ -205,60 +89,20 @@
             v-hasPermi="['monitor:online:forceLogout']"
             >组庭</el-button
           > -->
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-s-check" @click="courtconfirmationRow(scope.row)"
-            size="mini"
+            v-if="scope.row.caseStatus == 6" v-hasPermi="['caseManagement:list:confirmgroup']">组庭确认</el-button>
-            type="text"
+          <el-button size="mini" type="text" icon="el-icon-check" @click="courtreviewRow(scope.row)"
-            icon="el-icon-s-check"
+            v-if="scope.row.caseStatus == 5" v-hasPermi="['caseManagement:list:checkgroup']">组庭审核</el-button>
-            @click="courtconfirmationRow(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-sort" @click="choosetrialmethodRow(scope.row)"
-            v-if="scope.row.caseStatus == 6"
+            v-if="scope.row.caseStatus == 7" v-hasPermi="['caseManagement:list:checkarbitrationway']">审核仲裁方式</el-button>
-            v-hasPermi="['caseManagement:list:confirmgroup']"
+          <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="adjudicaterecordRow(scope.row)"
-            >组庭确认</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-check"
-            @click="courtreviewRow(scope.row)"
-            v-if="scope.row.caseStatus == 5"
-            v-hasPermi="['caseManagement:list:checkgroup']"
-            >组庭审核</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-sort"
-            @click="choosetrialmethodRow(scope.row)"
-            v-if="scope.row.caseStatus == 7"
-            v-hasPermi="['caseManagement:list:checkarbitrationway']"
-            >审核仲裁方式</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit-outline"
-            @click="adjudicaterecordRow(scope.row)"
             v-if="scope.row.caseStatus == 9 && scope.row.arbitratMethod == 2"
-            v-hasPermi="['caseManagement:list:hear']"
+            v-hasPermi="['caseManagement:list:hear']">书面审理</el-button>
-            >书面审理</el-button
+          <el-button size="mini" type="text" icon="el-icon-service" @click="trialcourtRow(scope.row)"
-          >
+            v-if="scope.row.caseStatus == 8 && scope.row.arbitratMethod == 1"
-          <el-button
+            v-hasPermi="['caseManagement:list:hear']">开庭审理</el-button>
-            size="mini"
+          <el-button size="mini" type="text" icon="el-icon-document" @click="generateawardRow(scope.row)"
-            type="text"
+            v-if="scope.row.caseStatus == 10" v-hasPermi="['caseManagement:list:createaward']">生成裁决书</el-button>
-            icon="el-icon-service"
-            @click="trialcourtRow(scope.row)"
-            v-if="scope.row.caseStatus == 8 && scope.row.arbitratMethod == 1 "
-            v-hasPermi="['caseManagement:list:hear']"
-            >开庭审理</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-document"
-            @click="generateawardRow(scope.row)"
-            v-if="scope.row.caseStatus == 10"
-            v-hasPermi="['caseManagement:list:createaward']"
-            >生成裁决书</el-button
-          >
           <!-- <el-button
             size="mini"
             type="text"
@@ -271,101 +115,44 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      v-show="total > 0"
+      @pagination="getcaseApply(queryParams)" />
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getcaseApply(queryParams)"
-    />
 
     <!-- 立案申请弹框 -->
-    <caseentryDialog
+    <caseentryDialog :visible="visible" @cancel="cancel" :form="form" :queryParams="queryParams"
-      :visible="visible"
+      :dialogtitle="dialogtitle" :getcaseApply="getcaseApply" :flag="flag" :caseAttachList="caseAttachList"
-      @cancel="cancel"
+      :initpaymentArr="initpaymentArr" :initpaymentArr1="initpaymentArr1"></caseentryDialog>
-      :form="form"
-      :queryParams="queryParams"
-      :dialogtitle="dialogtitle"
-      :getcaseApply="getcaseApply"
-      :flag="flag"
-      :caseAttachList="caseAttachList"
-      :initpaymentArr="initpaymentArr"
-      :initpaymentArr1="initpaymentArr1"
-    ></caseentryDialog>
     <!-- 批量申请弹框 openbatch-->
-    <batchDialog
+    <batchDialog :openbatch="openbatch" :queryParams="queryParams" @cancelBatch="cancelBatch"
-      :openbatch="openbatch"
+      :getcaseApply="getcaseApply"></batchDialog>
-      :queryParams="queryParams"
-      @cancelBatch="cancelBatch"
-      :getcaseApply="getcaseApply"
-    ></batchDialog>
     <!-- 立案审查页面 -->
-    <filingreviewDialog
+    <filingreviewDialog :showfilingreview="showfilingreview" :filingreviewdata="filingreviewdata"
-      :showfilingreview="showfilingreview"
+      :queryParams="queryParams" @getcaseApply="getcaseApply" @cancelFilingreview="cancelFilingreview">
-      :filingreviewdata="filingreviewdata"
+    </filingreviewDialog>
-      :queryParams="queryParams"
-      @getcaseApply="getcaseApply"
-      @cancelFilingreview="cancelFilingreview"
-    ></filingreviewDialog>
     <!-- 组庭页面---改为组庭审核 -->
-    <formateCourtDialog
+    <formateCourtDialog :showformateCourt="showformateCourt" @cancelcourtDialog="cancelcourtDialog"
-      :showformateCourt="showformateCourt"
+      :queryParams="queryParams" :formateCourtData="formateCourtData" @getcaseApply="getcaseApply"></formateCourtDialog>
-      @cancelcourtDialog="cancelcourtDialog"
-      :queryParams="queryParams"
-      :formateCourtData="formateCourtData"
-      @getcaseApply="getcaseApply"
-    ></formateCourtDialog>
     <!-- 组庭审核--改组庭确认 -->
-    <courtReviewDialog
+    <courtReviewDialog :showcourtReview="showcourtReview" :form="form" :queryParams="queryParams"
-      :showcourtReview="showcourtReview"
+      @cancelcourtReview="cancelcourtReview" @getcaseApply="getcaseApply"></courtReviewDialog>
-      :form="form"
-      :queryParams="queryParams"
-      @cancelcourtReview="cancelcourtReview"
-      @getcaseApply="getcaseApply"
-    ></courtReviewDialog>
     <!-- 审核仲裁方式 -->
-    <choosetrialmethodDaiog
+    <choosetrialmethodDaiog :showchoosetrialmethod="showchoosetrialmethod" :choosetrialmethodata="choosetrialmethodata"
-      :showchoosetrialmethod="showchoosetrialmethod"
+      :queryParams="queryParams" @getcaseApply="getcaseApply" @cancelshowchoosetrialMethod="cancelshowchoosetrialMethod">
-      :choosetrialmethodata="choosetrialmethodata"
+    </choosetrialmethodDaiog>
-      :queryParams="queryParams"
-      @getcaseApply="getcaseApply"
-      @cancelshowchoosetrialMethod="cancelshowchoosetrialMethod"
-    ></choosetrialmethodDaiog>
     <!-- 书面审理 -->
-    <adjudicaterecordDialog
+    <adjudicaterecordDialog :showadjudicaterecord="showadjudicaterecord" :form="form" :adjudicatename="adjudicatename"
-      :showadjudicaterecord="showadjudicaterecord"
+      :queryParams="queryParams" @canceladjudicaterecord="canceladjudicaterecord" @getcaseApply="getcaseApply">
-      :form="form"
+    </adjudicaterecordDialog>
-      :adjudicatename="adjudicatename"
-      :queryParams="queryParams"
-      @canceladjudicaterecord="canceladjudicaterecord"
-      @getcaseApply="getcaseApply"
-    ></adjudicaterecordDialog>
     <!-- 开庭审理 -->
-    <trialincourtDialog
+    <trialincourtDialog :showtrialincourt="showtrialincourt" :adjudicatename="adjudicatename" :form="form"
-      :showtrialincourt="showtrialincourt"
+      :queryParams="queryParams" @getcaseApply="getcaseApply" @canceltrialincourt="canceltrialincourt">
-      :adjudicatename="adjudicatename"
+    </trialincourtDialog>
-      :form="form"
-      :queryParams="queryParams"
-      @getcaseApply="getcaseApply"
-      @canceltrialincourt="canceltrialincourt"
-    ></trialincourtDialog>
     <!-- 缴费 -->
-    <payDialog
+    <payDialog :openPay="openPay" :payTitle="payTitle" :form="form" :payForm="payForm" :queryParams="queryParams"
-      :openPay="openPay"
+      @getcaseApply="getcaseApply" @paycancelRow="paycancelRow"></payDialog>
-      :payTitle="payTitle"
-      :form="form"
-      :payForm="payForm"
-      :queryParams="queryParams"
-      @getcaseApply="getcaseApply"
-      @paycancelRow="paycancelRow"
-    ></payDialog>
     <!-- 案件日志 -->
-    <caselogDialog
+    <caselogDialog :showcaseLog="showcaseLog" @cancelcaseLog="cancelcaseLog" :flagLoading="flagLoading"
-    :showcaseLog="showcaseLog"
+      :caselogDataArr="caselogDataArr"></caselogDialog>
-    @cancelcaseLog="cancelcaseLog"
-    :flagLoading="flagLoading"
-    :caselogDataArr="caselogDataArr"
-    ></caselogDialog>
   </div>
 </template>
 
@@ -388,6 +175,7 @@ import {
   submitCaseApply,
   selectCaseApply,
 } from "@/api/caseAccess/caseEntry";
+import { listDept } from "@/api/system/dept";
 import { document, caseLogRecordList } from "@/api/caseManagement/caseManagement";
 
 export default {
@@ -451,11 +239,13 @@ export default {
       caseAttachList: [], //案件质证资料
       showcaseLog: false, //案件日志弹框显示
       flagLoading: true, //案件日志弹框loading
-      caselogDataArr: []
+      caselogDataArr: [],
+      options:[]//机构数据
     };
   },
   created() {
     this.getcaseApply(this.queryParams);
+    this.getInstitution()
   },
   methods: {
     cancel() {
@@ -464,6 +254,20 @@ export default {
     cancelBatch() {
       this.openbatch = false;
     },
+    // 机构发生变化
+    changeDept(data){
+      this.queryParams.nameId = data[0]
+    },
+    // 获取机构数据
+    getInstitution(){
+      listDept().then(res=>{
+        res.data.forEach(item=>{
+          item.value = item.deptId;
+          item.label = item.deptName
+        })
+        this.options = this.handleTree(res.data, "deptId");
+      })
+    },
     /** 查询列表 */
     getcaseApply(val) {
       this.loading = true;
@@ -580,7 +384,7 @@ export default {
           this.getcaseApply(this.queryParams);
           this.$modal.msgSuccess("立案申请成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 立案审查
     filingreviewRow(row) {
@@ -681,7 +485,7 @@ export default {
             this.$modal.msgSuccess("裁决书生成成功");
           }
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 归档
     fileRow(row) {
@@ -724,13 +528,12 @@ export default {
           this.getcaseApply(this.queryParams);
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-#formContainer {
+#formContainer {}
-}
 </style>