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

src/views/caseManagement/components/formateCourtDialog.vue

@@ -22,19 +22,33 @@
       <p></p>
       <!-- <el-form ref="form"> -->
       <!-- v-if="isAgreePendTral == 0 || noArbitrator" -->
-      <div
+      <div style="display: inline-flex; margin-bottom: 8px">
-        style="display: inline-flex; margin-bottom: 8px"
-      >
         <div class="infoIcon"></div>
-        <div><span v-if="isAgreePendTral == 1">当前案件</span>仲裁员信息列表</div>
+        <div>
+          <span v-if="isAgreePendTral == 1">当前案件</span>仲裁员<span
+            v-if="isAgreePendTral !== 1"
+            >信息列表</span
+          >
         </div>
+      </div>
+      <div v-if="isAgreePendTral == 1" class="nowarbitrator">
+        <el-tag size="medium">
+          {{ formateCourtData.arbitratorName }}
+        </el-tag>
+      </div>
+      <div v-if="isAgreePendTral !== 1">
         <el-table
           :data="dataList"
           style="width: 100%"
           @selection-change="handleSelectionChange"
         >
           <!-- v-if="isAgreePendTral == 0 || noArbitrator" -->
-        <el-table-column type="selection" width="55" v-if="isAgreePendTral == 0"> </el-table-column>
+          <el-table-column
+            type="selection"
+            width="55"
+            v-if="isAgreePendTral == 0"
+          >
+          </el-table-column>
           <el-table-column
             label="仲裁员姓名"
             align="center"
@@ -68,6 +82,7 @@
           @pagination="getarbitrAtor"
           v-if="isAgreePendTral == 0"
         />
+      </div>
       <!-- </el-form> -->
       <div slot="footer" class="dialog-footer">
         <el-button
@@ -213,4 +228,7 @@ export default {
   background-color: #0072ff;
   margin-right: 5px;
 }
+.nowarbitrator {
+  margin-left: 4%;
+}
 </style>