seimin 1 gadu atpakaļ
vecāks
revīzija
d02512996c

+ 1 - 1
src/app/share/order-detail/order-detail.component.ts

@@ -133,7 +133,7 @@ export class OrderDetailComponent implements OnInit {
133
     this.isPreview = false;
133
     this.isPreview = false;
134
     this.mainService.getPreviewImage(data.bindType,data.bindId).subscribe((result:any)=>{
134
     this.mainService.getPreviewImage(data.bindType,data.bindId).subscribe((result:any)=>{
135
       if (result.status == 200) {
135
       if (result.status == 200) {
136
-        this.imgs = result.data.map((v) => v.previewUrl);
136
+        this.imgs = result.data.map((v) => location.origin + '/file' + v.relativeFilePath);
137
         this.isPreview = true;
137
         this.isPreview = true;
138
       } else {
138
       } else {
139
         this.imgs = [];
139
         this.imgs = [];

+ 3 - 1
src/app/views/work-order-log/work-order-log.component.html

@@ -28,19 +28,21 @@
28
         [nzLoading]="loading1">
28
         [nzLoading]="loading1">
29
         <thead>
29
         <thead>
30
           <tr class="thead">
30
           <tr class="thead">
31
+            <th nzWidth="5%">序号</th>
31
             <th nzWidth="10%">工单号</th>
32
             <th nzWidth="10%">工单号</th>
32
             <th nzWidth="10%">申请科室</th>
33
             <th nzWidth="10%">申请科室</th>
33
             <th nzWidth="10%">操作类型</th>
34
             <th nzWidth="10%">操作类型</th>
34
             <th nzWidth="10%">操作人</th>
35
             <th nzWidth="10%">操作人</th>
35
             <th nzWidth="10%">交接人</th>
36
             <th nzWidth="10%">交接人</th>
36
             <th nzWidth="10%">操作时间</th>
37
             <th nzWidth="10%">操作时间</th>
37
-            <th nzWidth="20%">备注</th>
38
+            <th nzWidth="15%">备注</th>
38
             <th nzWidth="10%">图片</th>
39
             <th nzWidth="10%">图片</th>
39
             <th nzWidth="10%">操作</th>
40
             <th nzWidth="10%">操作</th>
40
           </tr>
41
           </tr>
41
         </thead>
42
         </thead>
42
         <tbody>
43
         <tbody>
43
           <tr *ngFor="let data of listOfData;let index=index;">
44
           <tr *ngFor="let data of listOfData;let index=index;">
45
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
44
             <td>{{ data.gdcode }}</td>
46
             <td>{{ data.gdcode }}</td>
45
             <td>{{ data.createDept?.dept }}</td>
47
             <td>{{ data.createDept?.dept }}</td>
46
             <td>{{ data.operation?.name }}</td>
48
             <td>{{ data.operation?.name }}</td>