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

src/views/caseManagement/components/formateCourtDialog.vue

@@ -21,33 +21,47 @@
       >
       <p></p>
       <!-- <el-form ref="form"> -->
-        <!-- v-if="isAgreePendTral == 0 || noArbitrator" -->
+      <!-- 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>
-      <el-table
+      <div v-if="isAgreePendTral == 1" class="nowarbitrator">
-        :data="dataList"
+        <el-tag size="medium">
-        style="width: 100%"
+          {{ formateCourtData.arbitratorName }}
-        @selection-change="handleSelectionChange"
+        </el-tag>
-      >
+      </div>
-        <!-- v-if="isAgreePendTral == 0 || noArbitrator" -->
+      <div v-if="isAgreePendTral !== 1">
-        <el-table-column type="selection" width="55" v-if="isAgreePendTral == 0"> </el-table-column>
+        <el-table
-        <el-table-column
+          :data="dataList"
-          label="仲裁员姓名"
+          style="width: 100%"
-          align="center"
+          @selection-change="handleSelectionChange"
-          prop="nickName"
+        >
-          :show-overflow-tooltip="true"
+          <!-- v-if="isAgreePendTral == 0 || noArbitrator" -->
-        />
+          <el-table-column
-        <el-table-column
+            type="selection"
-          label="介绍"
+            width="55"
-          align="center"
+            v-if="isAgreePendTral == 0"
-          prop="remark"
+          >
-          :show-overflow-tooltip="true"
+          </el-table-column>
-        />
+          <el-table-column
-        <!-- <el-table-column
+            label="仲裁员姓名"
+            align="center"
+            prop="nickName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="介绍"
+            align="center"
+            prop="remark"
+            :show-overflow-tooltip="true"
+          />
+          <!-- <el-table-column
           label="当前案件数量"
           align="center"
           prop="currentCaseNum"
@@ -59,15 +73,16 @@
           prop="closedCaseNum"
           :show-overflow-tooltip="true"
         /> -->
-      </el-table>
+        </el-table>
-      <pagination
+        <pagination
-        v-show="total > 0"
+          v-show="total > 0"
-        :total="total"
+          :total="total"
-        :page.sync="queryParams1.pageNum"
+          :page.sync="queryParams1.pageNum"
-        :limit.sync="queryParams1.pageSize"
+          :limit.sync="queryParams1.pageSize"
-        @pagination="getarbitrAtor"
+          @pagination="getarbitrAtor"
-        v-if="isAgreePendTral == 0"
+          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>