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

src/views/awardManagement/listofAwards.vue

@@ -11,11 +11,11 @@
                         :value="dict.value"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="开庭日期" prop="hearDate">
+            <!-- <el-form-item label="开庭日期" prop="hearDate">
                 <el-date-picker v-model="queryParams.hearDate" type="daterange" range-separator="至" start-placeholder="开始日期"
                     end-placeholder="结束日期">
                 </el-date-picker>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -31,13 +31,13 @@
             </el-table-column>
             <el-table-column label="案件编号" align="center" prop="caseNum" :show-overflow-tooltip="true" />
             <el-table-column label="案件标的" align="center" prop="caseSubjectAmount" />
-            <el-table-column label="立案日期" align="center" prop="registerDate" :show-overflow-tooltip="true" />
+            <el-table-column label="开庭日期" align="center" prop="hearDate" :show-overflow-tooltip="true" />
             <!-- 缴费人 -->
             <el-table-column label="案件状态" align="center" prop="caseStatusName" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                    <el-button size="mini" type="text" icon="el-icon-reading" v-if="scope.row.caseStatus == 10" @click="showModel(scope.row, 0)"
+                    <!-- <el-button size="mini" type="text" icon="el-icon-reading" v-if="scope.row.caseStatus == 10" @click="showModel(scope.row, 0)"
-                        v-hasPermi="['monitor:online:forceLogout']">生成裁决书</el-button>
+                        v-hasPermi="['monitor:online:forceLogout']">生成裁决书</el-button> -->
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 11" @click="showModel(scope.row, 1)"
                         v-hasPermi="['monitor:online:forceLogout']">核查</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 12" @click="showModel(scope.row, 2)"
@@ -116,7 +116,9 @@ export default {
         };
     },
     created() {
-        this.queryParams.caseStatusList = [10, 11, 12, 13, 14, 15, 16]
+        // 裁决书列表不显示 生成裁决书
+        // this.queryParams.caseStatusList = [10, 11, 12, 13, 14, 15, 16]
+        this.queryParams.caseStatusList = [11, 12, 13, 14, 15, 16]
         this.getList(this.queryParams);
     },
     methods: {

src/views/caseManagement/caseList.vue

@@ -30,7 +30,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="开庭日期" prop="hearDate">
+      <!-- <el-form-item label="开庭日期" prop="hearDate">
         <el-date-picker
           v-model="queryParams.hearDate"
           type="daterange"
@@ -39,7 +39,7 @@
           end-placeholder="结束日期"
         >
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           type="primary"
@@ -230,7 +230,7 @@
             type="text"
             icon="el-icon-edit-outline"
             @click="adjudicaterecordRow(scope.row)"
-            v-if="scope.row.caseStatus == 9"
+            v-if="scope.row.caseStatus == 9 && scope.row.arbitratMethod == 2"
             v-hasPermi="['monitor:online:forceLogout']"
             >书面审理</el-button
           >
@@ -239,7 +239,7 @@
             type="text"
             icon="el-icon-service"
             @click="trialcourtRow(scope.row)"
-            v-if="scope.row.caseStatus == 8"
+            v-if="scope.row.caseStatus == 8 && scope.row.arbitratMethod == 1 "
             v-hasPermi="['monitor:online:forceLogout']"
             >开庭审理</el-button
           >
@@ -659,6 +659,7 @@ export default {
           respondentName: res.data.respondentName,
           feePayable: res.data.feePayable,
           hearDate: res.data.hearDate,
+          arbitratorName: res.data.arbitratorName
         };
         this.initpaymentArr = [];
         this.initpaymentArr1 = [];

src/views/caseManagement/components/adjudicaterecordDialog.vue

@@ -102,7 +102,7 @@
           <el-col :span="12">
             <el-form-item label="仲裁员：" prop="arbitratorName">
               <el-input
-                v-model="formData.arbitratorName"
+                v-model="adjudicatename.arbitratorName"
                 placeholder="请输入"
               />
             </el-form-item>

src/views/caseManagement/components/trialincourtDialog.vue

@@ -101,7 +101,7 @@
           <el-col :span="12">
             <el-form-item label="仲裁员：" prop="arbitratorName">
               <el-input
-                v-model="formData.arbitratorName"
+                v-model="adjudicatename.arbitratorName"
                 placeholder="请输入"
               />
             </el-form-item>

src/views/paymentManagement/paymentList.vue

@@ -15,7 +15,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="案件状态" prop="caseStatus">
+      <el-form-item label="案件状态" prop="caseStatus">
         <el-select
           v-model="queryParams.caseStatus"
           placeholder="请选择案件状态"
@@ -29,8 +29,8 @@
             :value="dict.value"
           ></el-option>
         </el-select>
-      </el-form-item> -->
+      </el-form-item>
-      <el-form-item label="立案日期" prop="registerDate">
+      <!-- <el-form-item label="立案日期" prop="registerDate">
         <el-date-picker
           v-model="queryParams.registerDate"
           type="daterange"
@@ -39,7 +39,7 @@
           end-placeholder="结束日期"
         >
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           type="primary"