修改报修

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1764,9 +1764,9 @@
                           <th nzWidth="7%">序号</th>
                           <th nzWidth="16%">报修内容</th>
                           <th nzWidth="16%">报修时间</th>
-                          <th nzWidth="16%">报修人</th>
-                          <th nzWidth="15%">状态</th>
-                          <th nzWidth="15%">处理人</th>
+                          <th nzWidth="16%">报修科室</th>
+                          <th nzWidth="10%">状态</th>
+                          <th nzWidth="20%">维修人</th>
                           <th nzWidth="15%"></th>
                         </tr>
                       </thead>
@@ -1778,18 +1778,17 @@
                             {{ data.createTime | date: "MM-dd HH:mm" }}
                           </td>
                           <td>
-                            {{ data.requester ? data.requester.name : "无" }}
+                            {{ data.departmentDTO ? data.departmentDTO.dept : "无" }}
                           </td>
                           <td>{{ data.state?data.state.name:'无' }}</td>
                           <td>
-                            无
-                            <!-- {{
+                            {{
                               data.incident
-                                ? data.incident.contacts
-                                  ? data.incident.contacts
+                                ? data.incident.handlingPersonnelUser
+                                  ? data.incident.handlingPersonnelUser.name + (data.incident.handlingPersonnelUser.phone?'('+ data.incident.handlingPersonnelUser.phone +')':'')
                                   : "无"
                                 : "无"
-                            }} -->
+                            }}
                           </td>
                           <td>
                             <!-- <button (click)="viewBx(data)">查看</button> -->

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -883,8 +883,9 @@ export class HushijiandanComponent implements OnInit {
         let postData: any = {
           verification: "true",
           incident: {
-            contacts: this.loginUser.name,
-            contactsInformation: this.loginUser.phone,
+            deptId:this.loginUser.dept.id,
+            // contacts: this.loginUser.name,
+            // contactsInformation: this.loginUser.phone,
             description: this.coopBx.content,
             requester: { account: this.loginUser.account },
             sourceType: "wechatUserIncident",
@@ -2584,8 +2585,9 @@ export class HushijiandanComponent implements OnInit {
         let postData = {
           verification: "true",
           incident: {
-            contacts: this.loginUser.name,
-            contactsInformation: this.loginUser.phone,
+            // contacts: this.loginUser.name,
+            deptId:this.loginUser.dept.id,
+            // contactsInformation: this.loginUser.phone,
             // address: this.bxForm.controls.address.value,
             // areaId: this.bxForm.controls.hospital.value,
             // contacts: this.bxForm.controls.name.value,