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

src/views/awardManagement/components/expressDeliveryDialog.vue

@@ -11,19 +11,22 @@
         <i class="el-icon-loading"></i>
       </div>
       <div v-else>
-        <div class="deliverName">
-          {{ applicantdelivery.company }} {{ applicantdelivery.no }}
+        <div class="noData" v-if="noData">暂无快递信息！</div>
+        <div v-else>
+          <div class="deliverName">
+            {{ applicantdelivery.company }} {{ applicantdelivery.no }}
+          </div>
+          <el-divider></el-divider>
+          <el-timeline :reverse="reverse">
+            <el-timeline-item
+              v-for="(activity, index) in activities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              {{ activity.content }}
+            </el-timeline-item>
+          </el-timeline>
         </div>
-        <el-divider></el-divider>
-        <el-timeline :reverse="reverse">
-          <el-timeline-item
-            v-for="(activity, index) in activities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            {{ activity.content }}
-          </el-timeline-item>
-        </el-timeline>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel" class="endbutton"
@@ -43,6 +46,7 @@ export default {
       reverse: true,
       applicantdelivery: {}, //申请人物流信息
       activities: [],
+      noData: false,
     };
   },
   watch: {
@@ -53,11 +57,16 @@ export default {
             if (item.identityType == 1) {
               let applicantdata = item.logisticsInfo;
               this.applicantdelivery = JSON.parse(applicantdata);
-              this.activities = this.applicantdelivery.list
-              this.activities.forEach(item=>{
-                item.content = item.datetime;
-                item.timestamp = item.remark;
-              })
+              if (this.applicantdelivery.list) {
+                this.activities = this.applicantdelivery.list;
+                this.activities.forEach((item) => {
+                  item.content = item.datetime;
+                  item.timestamp = item.remark;
+                });
+              } else {
+                this.noData = true;
+                return;
+              }
             }
           });
         }
@@ -108,4 +117,13 @@ export default {
     font-size: 50px;
   }
 }
+.noData {
+  width: 100%;
+  font-size: 20px;
+  font-weight: 700;
+  color: #959595;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 </style>

src/views/caseManagement/components/formateCourtDialog.vue

@@ -38,16 +38,16 @@
         <el-table-column
           label="仲裁员姓名"
           align="center"
-          prop="arbitratorName"
+          prop="nickName"
           :show-overflow-tooltip="true"
         />
         <el-table-column
-          label="专业分类"
+          label="介绍"
           align="center"
-          prop="professiClassifi"
+          prop="remark"
           :show-overflow-tooltip="true"
         />
-        <el-table-column
+        <!-- <el-table-column
           label="当前案件数量"
           align="center"
           prop="currentCaseNum"
@@ -58,7 +58,7 @@
           align="center"
           prop="closedCaseNum"
           :show-overflow-tooltip="true"
-        />
+        /> -->
       </el-table>
       <pagination
         v-show="total > 0"
@@ -110,7 +110,6 @@ export default {
     formateCourtData: {
       handler(val) {
         if (val.arbitratorName == null) {
-          console.log("无仲裁员", val);
           this.noArbitrator = true;
         } else {
           this.noArbitrator = false;
@@ -131,8 +130,8 @@ export default {
       this.arbitrators = [];
       val.forEach((item) => {
         this.arbitrators.push({
-          id: item.id,
-          arbitratorName: item.arbitratorName,
+          id: item.userId,
+          arbitratorName: item.nickName,
         });
       });
     },