seimin 1 jaar geleden
bovenliggende
commit
d72b7a1912
1 gewijzigde bestanden met toevoegingen van 41 en 20 verwijderingen
  1. 41 20
      src/app/views/form-management/form-management.component.ts

+ 41 - 20
src/app/views/form-management/form-management.component.ts

@@ -179,28 +179,49 @@ export class FormManagementComponent implements OnInit {
179 179
   // 确认生成
180 180
   isOkLoading:boolean = false;
181 181
   formManagementOk(){
182
-    let postData:any = {
183
-      taskType: this.tasktypeId,
184
-      hosId: this.hosId,
185
-      deleteFlag: 0,
186
-      startTime: this.dateRange[0] ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
187
-      endTime:  this.dateRange[1] ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
188
-      workOrderIds: this.formManagementList.map(v => v.id).toString(),
182
+    let postData = {
183
+      idx: 0,
184
+      sum: 9999,
185
+      workOrder: {
186
+        exportQuery: true,
187
+        buildingIds: this.buildings.filter(v => v.checked).map(v => v.value).toString() || undefined,
188
+        hosId: this.hosId,
189
+        gdState: {id: "433"},
190
+        serTaskTypes: this.tasktypeId,
191
+        time: 0,
192
+        reserveDate: format(new Date(), 'yyyy-MM-dd HH:mm:ss'),
193
+        startTime1: this.dateRange[0] ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
194
+        endTime1:  this.dateRange[1] ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
195
+      },
189 196
     };
190 197
     this.isOkLoading = true;
191
-    this.mainService
192
-      .simplePost("addData", "reserveForm", postData)
193
-      .subscribe((result) => {
194
-        this.isOkLoading = false;
195
-        if (result.status == 200) {
196
-          this.formManagementCancel();
197
-          this.pageIndex = 1;
198
-          this.getList();
199
-          this.msg.success('生成表单成功!');
200
-        }else{
201
-          this.msg.error('生成表单失败!');
202
-        }
203
-      });
198
+    this.mainService.getFetchDataList("simple/data", "workOrder", postData).subscribe((data:any) => {
199
+      // 获取所有的工单
200
+      let formManagementList = data.list || [];
201
+
202
+      let postData:any = {
203
+        taskType: this.tasktypeId,
204
+        hosId: this.hosId,
205
+        deleteFlag: 0,
206
+        startTime: this.dateRange[0] ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
207
+        endTime:  this.dateRange[1] ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
208
+        workOrderIds: formManagementList.map(v => v.id).toString(),
209
+      };
210
+
211
+      this.mainService
212
+        .simplePost("addData", "reserveForm", postData)
213
+        .subscribe((result) => {
214
+          this.isOkLoading = false;
215
+          if (result.status == 200) {
216
+            this.formManagementCancel();
217
+            this.pageIndex = 1;
218
+            this.getList();
219
+            this.msg.success('生成表单成功!');
220
+          }else{
221
+            this.msg.error('生成表单失败!');
222
+          }
223
+        });
224
+    })
204 225
   }
205 226
 
206 227
   // 查看视图