Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/order-management/components/bulk/bulk.component.ts

@@ -261,9 +261,8 @@ tabs = {
         isRiskSheet: {
           type: 'string',
           title: '是否风险单',
-          default: '0',
           enum: [
-            { label: '全部', value: '0' },
+            { label: '全部', value: '' },
             { label: '是', value: '1' },
             { label: '否', value: '2' }
           ],

src/app/routes/order-management/components/vehicle/vehicle.component.ts

@@ -275,9 +275,8 @@ resourceStatus: any;
         isRiskSheet: {
           type: 'string',
           title: '是否风险单',
-          default: '0',
           enum: [
-            { label: '全部', value: '0' },
+            { label: '全部', value: '' },
             { label: '是', value: '1' },
             { label: '否', value: '2' }
           ],

src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts

@@ -657,12 +657,12 @@ export class  SupplyManagementBulkPublishComponent implements OnInit {
       }
     }
     if(this.PageStatus === '大宗修改') {
-      this.requests(this.service.$api_set_bulkModify, params);
+      this.requests(this.service.$api_set_bulkModify, params, 1);
     }  else if(this.PageStatus === '大宗下一单') {
-      this.requests(this.service.$api_set_saveAnotherBulkOrder, params);
+      this.requests(this.service.$api_set_saveAnotherBulkOrder, params, 2);
     }
   }
-  requests(url: any, params: any) {
+  requests(url: any, params: any, change?: any) {
     this.service.request(url, params).subscribe((res: any) => {
       if (res) {
         this.modalService.create({
@@ -670,7 +670,7 @@ export class  SupplyManagementBulkPublishComponent implements OnInit {
           nzContent: PublishSuccessComponent,
           nzWidth: 900,
           nzFooter: null,
-          nzComponentParams: { type: 'onecar' }
+          nzComponentParams: { type: 'onecar', change: change }
         });
       } else {
         this.service.msgSrv.error(res.msg);

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts

@@ -710,13 +710,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
     });
   }
   // 打开下单完成页面
-  openFinishPage(resourceObj: any = null) {
+  openFinishPage(resourceObj: any = null, change?: any) {
     this.modalService.create({
       nzTitle: '',
       nzContent: PublishSuccessComponent,
       nzWidth: 900,
       nzFooter: null,
-      nzComponentParams: { type: 'onecar', resourceObj }
+      nzComponentParams: { type: 'onecar', resourceObj , change: change}
     });
   }
   // 提交前确认，委托运输协议弹窗
@@ -808,9 +808,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       }
     }
     if (this.PageStatus === '整车修改') {
-      this.requests(this.service.$api_set_WholeModify, params);
+      this.requests(this.service.$api_set_WholeModify, params, 1);
     } else if (this.PageStatus === '整车下一单') {
-      this.requests(this.service.$api_set_saveAnotherWholeOrder, params);
+      this.requests(this.service.$api_set_saveAnotherWholeOrder, params,2);
     }
   }
   addPreZero(num: any) {
@@ -821,7 +821,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
     }
   }
   // 下单成功提示弹窗
-  requests(url: any, params: any) {
+  requests(url: any, params: any, change?: any) {
     this.service.request(url, params).subscribe((res: any) => {
       if (res) {
         this.modalService.create({
@@ -829,7 +829,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
           nzContent: PublishSuccessComponent,
           nzWidth: 900,
           nzFooter: null,
-          nzComponentParams: { type: 'onecar' }
+          nzComponentParams: { type: 'onecar', change: change }
         });
       } else {
         this.service.msgSrv.error(res.msg);

src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.html

@@ -7,7 +7,7 @@
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\onecar-publish\publish-success\publish-success.component.html
 -->
 <div style="margin-top: 64px">
-  <nz-result nzStatus="success" nzTitle="下单成功！">
+  <nz-result nzStatus="success" [nzTitle]="title">
     <div nz-result-extra>
       <button nz-button nzSize="large" [nzType]="'primary'" (click)="continue()"> 继续下单</button>
       <button nz-button nzSize="large" (click)="view()"> 查看货源</button>

src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.ts

@@ -1,4 +1,12 @@
-import { Component } from '@angular/core';
+/*
+ * @Author: your name
+ * @Date: 2021-12-14 20:39:34
+ * @LastEditTime: 2022-01-12 11:24:07
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\onecar-publish\publish-success\publish-success.component.ts
+ */
+import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NzMessageService } from 'ng-zorro-antd/message';
 
@@ -9,11 +17,20 @@ import { NzMessageService } from 'ng-zorro-antd/message';
 })
 export class PublishSuccessComponent {
   type = 'onecar';
+  title = '下单成功！';
+  change: any = 0;
   resourceObj: any = null;
   constructor(private route: ActivatedRoute, private router: Router, public msg: NzMessageService) {
     this.type = route.snapshot.queryParams.type || 'onecar';
   }
-
+  ngOnInit() {
+    console.log(this.change)
+    if(this.change == 1) {
+      this.title = '保存成功！';
+    } else if(this.change == 2) {
+      this.title = '下单成功！';
+    }
+  }
   continue() {
     window.location.reload();
   }

src/app/routes/waybill-management/components/bulk/bulk.component.ts

@@ -223,9 +223,8 @@ tabs = {
         isRiskSheet: {
           type: 'string',
           title: '是否风险单',
-          default: '0',
           enum: [
-            { label: '全部', value: '0' },
+            { label: '全部', value: '' },
             { label: '是', value: '1' },
             { label: '否', value: '2' }
           ],

src/app/routes/waybill-management/components/vehicle/vehicle.component.ts

@@ -214,9 +214,8 @@ export class WaybillManagementVehicleComponent implements OnInit {
         isRiskSheet: {
           type: 'string',
           title: '是否风险单',
-          default: '0',
           enum: [
-            { label: '全部', value: '0' },
+            { label: '全部', value: '' },
             { label: '是', value: '1' },
             { label: '否', value: '2' }
           ],