Your Name 2 лет назад
Родитель
Сommit
23677e626e

+ 35
- 17
src/views/awardManagement/components/expressDeliveryDialog.vue Просмотреть файл

11
         <i class="el-icon-loading"></i>
11
         <i class="el-icon-loading"></i>
12
       </div>
12
       </div>
13
       <div v-else>
13
       <div v-else>
14
-        <div class="deliverName">
15
-          {{ applicantdelivery.company }} {{ applicantdelivery.no }}
14
+        <div class="noData" v-if="noData">暂无快递信息!</div>
15
+        <div v-else>
16
+          <div class="deliverName">
17
+            {{ applicantdelivery.company }} {{ applicantdelivery.no }}
18
+          </div>
19
+          <el-divider></el-divider>
20
+          <el-timeline :reverse="reverse">
21
+            <el-timeline-item
22
+              v-for="(activity, index) in activities"
23
+              :key="index"
24
+              :timestamp="activity.timestamp"
25
+            >
26
+              {{ activity.content }}
27
+            </el-timeline-item>
28
+          </el-timeline>
16
         </div>
29
         </div>
17
-        <el-divider></el-divider>
18
-        <el-timeline :reverse="reverse">
19
-          <el-timeline-item
20
-            v-for="(activity, index) in activities"
21
-            :key="index"
22
-            :timestamp="activity.timestamp"
23
-          >
24
-            {{ activity.content }}
25
-          </el-timeline-item>
26
-        </el-timeline>
27
       </div>
30
       </div>
28
       <div slot="footer" class="dialog-footer">
31
       <div slot="footer" class="dialog-footer">
29
         <el-button @click="cancel" class="endbutton"
32
         <el-button @click="cancel" class="endbutton"
43
       reverse: true,
46
       reverse: true,
44
       applicantdelivery: {}, //申请人物流信息
47
       applicantdelivery: {}, //申请人物流信息
45
       activities: [],
48
       activities: [],
49
+      noData: false,
46
     };
50
     };
47
   },
51
   },
48
   watch: {
52
   watch: {
53
             if (item.identityType == 1) {
57
             if (item.identityType == 1) {
54
               let applicantdata = item.logisticsInfo;
58
               let applicantdata = item.logisticsInfo;
55
               this.applicantdelivery = JSON.parse(applicantdata);
59
               this.applicantdelivery = JSON.parse(applicantdata);
56
-              this.activities = this.applicantdelivery.list
57
-              this.activities.forEach(item=>{
58
-                item.content = item.datetime;
59
-                item.timestamp = item.remark;
60
-              })
60
+              if (this.applicantdelivery.list) {
61
+                this.activities = this.applicantdelivery.list;
62
+                this.activities.forEach((item) => {
63
+                  item.content = item.datetime;
64
+                  item.timestamp = item.remark;
65
+                });
66
+              } else {
67
+                this.noData = true;
68
+                return;
69
+              }
61
             }
70
             }
62
           });
71
           });
63
         }
72
         }
108
     font-size: 50px;
117
     font-size: 50px;
109
   }
118
   }
110
 }
119
 }
120
+.noData {
121
+  width: 100%;
122
+  font-size: 20px;
123
+  font-weight: 700;
124
+  color: #959595;
125
+  display: flex;
126
+  justify-content: center;
127
+  align-items: center;
128
+}
111
 </style>
129
 </style>

+ 7
- 8
src/views/caseManagement/components/formateCourtDialog.vue Просмотреть файл

38
         <el-table-column
38
         <el-table-column
39
           label="仲裁员姓名"
39
           label="仲裁员姓名"
40
           align="center"
40
           align="center"
41
-          prop="arbitratorName"
41
+          prop="nickName"
42
           :show-overflow-tooltip="true"
42
           :show-overflow-tooltip="true"
43
         />
43
         />
44
         <el-table-column
44
         <el-table-column
45
-          label="专业分类"
45
+          label="介绍"
46
           align="center"
46
           align="center"
47
-          prop="professiClassifi"
47
+          prop="remark"
48
           :show-overflow-tooltip="true"
48
           :show-overflow-tooltip="true"
49
         />
49
         />
50
-        <el-table-column
50
+        <!-- <el-table-column
51
           label="当前案件数量"
51
           label="当前案件数量"
52
           align="center"
52
           align="center"
53
           prop="currentCaseNum"
53
           prop="currentCaseNum"
58
           align="center"
58
           align="center"
59
           prop="closedCaseNum"
59
           prop="closedCaseNum"
60
           :show-overflow-tooltip="true"
60
           :show-overflow-tooltip="true"
61
-        />
61
+        /> -->
62
       </el-table>
62
       </el-table>
63
       <pagination
63
       <pagination
64
         v-show="total > 0"
64
         v-show="total > 0"
110
     formateCourtData: {
110
     formateCourtData: {
111
       handler(val) {
111
       handler(val) {
112
         if (val.arbitratorName == null) {
112
         if (val.arbitratorName == null) {
113
-          console.log("无仲裁员", val);
114
           this.noArbitrator = true;
113
           this.noArbitrator = true;
115
         } else {
114
         } else {
116
           this.noArbitrator = false;
115
           this.noArbitrator = false;
131
       this.arbitrators = [];
130
       this.arbitrators = [];
132
       val.forEach((item) => {
131
       val.forEach((item) => {
133
         this.arbitrators.push({
132
         this.arbitrators.push({
134
-          id: item.id,
135
-          arbitratorName: item.arbitratorName,
133
+          id: item.userId,
134
+          arbitratorName: item.nickName,
136
         });
135
         });
137
       });
136
       });
138
     },
137
     },