bugfix

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.240",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/views/form-management/form-management.component.html

@@ -72,6 +72,12 @@
             </nz-radio-group>
           </div>
         </div>
+        <div nz-row>
+          <div nz-col nzSpan="5">楼栋选择：</div>
+          <div nz-col nzSpan="19">
+            <nz-checkbox-group [(ngModel)]="buildings"></nz-checkbox-group>
+          </div>
+        </div>
       </overlay-scrollbars>
     </div>
     <div class="btns display_flex justify-content_flex-center align-items_center">
@@ -118,7 +124,7 @@
         <tr *ngFor="let data of formManagementList;let i = index;">
             <td>{{ i + (formManagementListPageIndex - 1) * formManagementListPageSize + 1}}</td>
             <td>{{ data.gdcode || '无' }}</td>
-            <td>{{ data.createDeptDTO ? data.createDeptDTO.dept : '无' }}</td>
+            <td>{{ data.createDeptDTO ? (data.createDeptDTO.building ? data.createDeptDTO.building.buildingName + " - " : '') + data.createDeptDTO.dept : '无' }}</td>
             <td>{{ data.taskType.taskName }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container></td>
             <td>{{ data.startTime | date:'yyyy-MM-dd HH:mm'}}</td>
         </tr>

src/app/views/form-management/form-management.component.ts

@@ -34,6 +34,7 @@ export class FormManagementComponent implements OnInit {
     this.getList();
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.getTaskTypes();
+    this.getBuildings();
   }
 
   // 初始化权限按钮
@@ -52,6 +53,7 @@ export class FormManagementComponent implements OnInit {
       idx: this.formManagementListPageIndex - 1,
       sum: this.formManagementListPageSize,
       workOrder: {
+        buildingIds: this.buildings.filter(v => v.checked).map(v => v.value).toString() || undefined,
         hosId: this.hosId,
         gdState: {id: "433"},
         serTaskTypes: this.tasktypeId,
@@ -114,11 +116,40 @@ export class FormManagementComponent implements OnInit {
       });
   }
 
+  //获取楼栋
+  buildings:any[] = [];
+  getBuildings() {
+    let postData:any = {
+      idx: 0,
+      sum: 9999,
+      building: {
+        hosId: this.hosId
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "building", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          let buildings = result.list || [];
+          this.buildings = buildings.map(v => ({
+            value: v.id,
+            label: v.buildingName,
+            checked: false,
+          }))
+        }
+      });
+  }
+
   // 切换右侧菜单Tab
   fixedTab: string = "";
   checkFixedTab(type: string) {
     this.dateRange = [startOfHour(subDays(new Date().setHours(9), 1)), startOfHour(new Date().setHours(9))];
     this.tasktypeId = undefined;
+    this.buildings.forEach(v => {
+      v.checked = false;
+    });
     this.fixedTab = type;
   }