From b513099359c0080de353c95a9aa5de2e3c159c55 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 9 Dec 2021 19:21:22 +0800
Subject: [PATCH] fix bug

---
 .../onecar-publish.component.html             |   3 +-
 .../onecar-publish.component.ts               | 196 ++++++++++++------
 .../components/vehicle/vehicle.component.html |  11 +-
 .../components/vehicle/vehicle.component.ts   |   7 +-
 .../services/supply-management.service.ts     |   8 +-
 .../list/detail/detail.component.ts           |   4 +-
 .../components/list/edit/edit.component.ts    |   4 +-
 .../list/img-view/img-view.component.spec.ts  |  20 +-
 .../components/list/list.component.html       |   4 +-
 .../vehicle/components/list/list.component.ts |   4 +-
 .../vehicle/services/vehicle.service.ts       |  76 +------
 11 files changed, 177 insertions(+), 160 deletions(-)

diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
index df423fdf..e7c8b588 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
@@ -24,7 +24,7 @@
                   <input nz-input [(ngModel)]="data.detailedAddress" [ngModelOptions]="{ standalone: true }"  />
                 </nz-input-group>
                 <span style="padding: 0 10px"
-                  ><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap()"></i
+                  ><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap('start', idx)"></i
                 ></span>
                 <span *ngIf="idx !== 0"
                   ><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx)">X</i
@@ -178,6 +178,7 @@
         <ng-template sf-template="name5" let-i let-ui="ui">￥0.00</ng-template>
         <ng-template sf-template="name6" let-i let-ui="ui">￥0.00</ng-template>
         <ng-template sf-template="name7" let-i let-ui="ui">￥0.00</ng-template>
+        <ng-template sf-template="totalFee" let-i let-ui="ui" >{{totalFees | currency: '￥'}}</ng-template>
         <ng-template sf-template="name8" let-i let-ui="ui">
           <div nz-row>
             <div class="align-center">
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
index fc91d884..c15f01d6 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
@@ -30,6 +30,7 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
   sf7data: any; // 货源单设置回显
   creatTime: any; // 货源单设置回显
   modifyTime: any; // 货源单设置回显
+  totalFees: any; // 总数信息
   id = this.route.snapshot.params.id;
   // // 单位
   unit1 = '吨';
@@ -44,7 +45,6 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
       modifyTime: [null, []],
     });
   }
-
   @ViewChild('sf1', { static: false }) sf1!: SFComponent;
   schema1: SFSchema = {};
   ui1!: SFUISchema;
@@ -81,25 +81,26 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
     this.initSF6();
     this.initSF7();
     this.initdata();
+    console.log( this.route.snapshot?.queryParams)
   }
 
   initSF1() {
     this.schema1 = {
       properties: {
-        shipperAppUserNmae: {
-          type: 'string',
-          title: '货主',
-          maxLength: 30,
-          ui: {
-            placeholder: '请输入'
-          }
-        },
+        // shipperAppUserName: {
+        //   type: 'string',
+        //   title: '货主',
+        //   maxLength: 30,
+        //   ui: {
+        //     placeholder: '请输入'
+        //   }
+        // },
         enterpriseProjectName: {
           type: 'string',
           title: '项目',
           enum: [
-            { label: '1', value: '1' },
-            { label: '2', value: '2' }
+            { label: '项目1', value: '1' },
+            { label: '项目2', value: '2' }
           ],
           ui: {
             widget: 'select',
@@ -131,12 +132,12 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        dispatchName2: {
+        dispatchId: {
           type: 'string',
           title: '调度员',
           enum: [
-            { label: '1', value: '1' },
-            { label: '2', value: '2' }
+            { label: '调度员1', value: '1' },
+            { label: '调度员2', value: '2' }
           ],
           ui: {
             widget: 'select',
@@ -190,8 +191,9 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
           type: 'string',
           title: '货物名称',
           enum: [
-            { label: '1', value: '1' },
-            { label: '2', value: '2' }
+            { label: '真实货物', value: '1' },
+            { label: '远程货物', value: '2' },
+            { label: '其他', value: '3' }
           ],
           ui: {
             widget: 'select',
@@ -207,12 +209,12 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
             // change: (i) => this.updateCategory(i, '/categoryId2'),
           } as SFSelectWidgetSchema
         },
-        name2: {
+        qita: {
           type: 'string',
           title: '',
           ui: {
             visibleIf: {
-              name1: value => value === '1'
+              goodsNameId: value => value === '3'
             }
           }
         }
@@ -223,10 +225,10 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
         spanLabelFixed: 90,
         grid: { span: 12 }
       },
-      $name1: {
+      $goodsNameId: {
         grid: { span: 12 }
       },
-      $name2: {
+      $qita: {
         grid: { span: 12 }
       }
     };
@@ -377,14 +379,24 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
       }
     };
   }
-
+  changeValue() {
+    this.totalFees = this.sf7?.value?.appendFee + this.sf7?.value?.oilCardPay + this.sf7?.value?.prePay +this.sf7?.value?.receiptPay + this.sf7?.value?.toPay
+  }
   initSF7() {
     this.schema7 = {
       properties: {
-        prePay: { type: 'number', title: '预付', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema },
-        toPay: { type: 'number', title: '到付', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema },
-        oilCardPay: { type: 'number', title: '油卡', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema },
-        receiptPay: { type: 'number', title: '回单付', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema },
+        prePay: { type: 'number', title: '预付', default: 0, ui: { prefix: '￥', change: ()=> {
+          this.changeValue();
+        } } as SFNumberWidgetSchema },
+        toPay: { type: 'number', title: '到付', default: 0, ui: { prefix: '￥',change: ()=> {
+          this.changeValue();
+        } } as SFNumberWidgetSchema },
+        oilCardPay: { type: 'number', title: '油卡', default: 0, ui: { prefix: '￥',change: ()=> {
+          this.changeValue();
+        } } as SFNumberWidgetSchema },
+        receiptPay: { type: 'number', title: '回单付', default: 0, ui: { prefix: '￥',change: ()=> {
+          this.changeValue();
+        } } as SFNumberWidgetSchema },
         oilCardPay2: {
           type: 'string',
           title: '小计',
@@ -431,7 +443,8 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
     this.startInfo.push({
       detailedAddress: '',
       appUserName: '',
-      contractTelephone: ''
+      contractTelephone: '',
+      type: 1
     });
   }
   subStartInfo(event: any, index: number) {
@@ -442,7 +455,8 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
     this.endInfo.push({
       detailedAddress: '',
       appUserName: '',
-      contractTelephone: ''
+      contractTelephone: '',
+      type: 2
     });
   }
   subEndInfo(event: any, index: number) {
@@ -463,13 +477,34 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
       this.validateForm1.controls[key].updateValueAndValidity();
     });
     console.log(this.validateForm1);
-    var d = new Date(this.validateForm1.value.createTime);  
-    console.log(d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate() + ' ' + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds())
- 
+
+    if(typeof(this.validateForm1.value.modifyTime) !== 'string' ) {
+      var c = new Date(this.validateForm1.value.modifyTime);  
+      this.validateForm1.value.modifyTime = c.getFullYear() + '-' + (c.getMonth() + 1) + '-' + c.getDate() + ' ' + c.getHours() + ':' + c.getMinutes() + ':' + c.getSeconds()
+    }
+    if(typeof(this.validateForm1.value.createTime) !== 'string' ) {
+      var c = new Date(this.validateForm1.value.createTime);  
+      this.validateForm1.value.createTime = c.getFullYear() + '-' + (c.getMonth() + 1) + '-' + c.getDate() + ' ' + c.getHours() + ':' + c.getMinutes() + ':' + c.getSeconds()
+    }
+    console.log(typeof(this.validateForm1.value.createTime) === 'string')
     if (this.validateForm1.invalid) {
       return;
     }
-    console.log(this.sf1.value)
+    console.log({...this.sf4.value, ...this.sf3.value})
+    this.startInfo.createTime = this.validateForm1.value.createTime
+    this.startInfo.modifyTime = this.validateForm1.value.modifyTime
+    const params = {
+      ...this.sf1.value,
+      ...this.sf5.value,
+      shippingInformationDTO: {
+        ...this.sf7.value
+      },
+      unLoadingPlaceList: [...this.startInfo, ...this.endInfo,], 
+      goodsInfoList: [
+        {...this.sf4.value, ...this.sf3.value}
+      ]
+    }
+    console.log(params)
     console.log(this.startInfo)
     console.log(this.endInfo)
     console.log(this.validateForm1.value)
@@ -478,22 +513,35 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
     console.log(this.sf5.value)
     console.log(this.sf6.value)
     console.log(this.sf7.value)
-    // const data = this.form.value;
-    // this.http.post('/register', data).subscribe(() => {
-    //   this.router.navigateByUrl('/passport/register-result', {
-    //     // queryParams: { email: data.mail },
-    //   });
-    // });
-    // this.router.navigateByUrl('/passport/register-result', {
-    //   // queryParams: { email: data.mail },
-    // });
+   this.service.request(this.service.$api_set_saveAnotherWholeOrder, params).subscribe((res: any) => {
+     console.log(res)
+   })
   }
 
-  openMap() {
-    this.modalService.create({
+  openMap(type: string, index: number) {
+    const modalRef = this.modalService.create({
       nzTitle: '',
       nzContent: AmapPoiPickerComponent,
-      nzWidth: 848
+      nzWidth: 900,
+      nzOnOk: item => {
+        const poi = item.poi;
+        console.log(item)
+        const locList = poi.location.toString().split(',');
+        switch (type) {
+          case 'start':
+            this.startInfo[index].detailedAddress = poi.district + poi.name;
+            this.startInfo[index].longitude = locList[0];
+            this.startInfo[index].latitude = locList[1];
+            break;
+          case 'end':
+            this.endInfo[index].detailedAddress = poi.district + poi.name;
+            this.endInfo[index].longitude = locList[0];
+            this.endInfo[index].latitude = locList[1];
+            break;
+          default:
+            break;
+        }
+      }
     });
   }
   goBack() {
@@ -502,12 +550,11 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
   // 初始化信息
   initdata() {
     console.log(this.id)
-    // this.service.request(`${this.service.$api_get_getCompleteVehicleDetail}`, {id:this.id}).subscribe((res) => {
-    this.service.request(`${this.service.$api_get_getBulkDetail}`, {id:this.id}).subscribe((res) => {
+    this.service.request(`${this.service.$api_get_getCompleteVehicleDetail}`, {id:this.id}).subscribe((res) => {
       console.log(res)
       // this.dataList = res;
       this.sf1data = {
-        shipperAppUserNmae: res?.shipperAppUserNmae || '',
+        // shipperAppUserName: res?.shipperAppUserName || '',
         enterpriseProjectName: res?.enterpriseProjectName  || '',
         enterpriseInfoName: res?.enterpriseInfoName  || '',
         externalResourceCode: res?.externalResourceCode  || '',
@@ -515,43 +562,52 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
       }
       res.unLoadingPlaceList.forEach((element: any) => {
         if(element.type === 1) {
-          this.startInfo.push({
-            detailedAddress: element.detailedAddress,
-            appUserName: element.appUserName,
-            contractTelephone: element.contractTelephone,
-          })
-          console.log(element)
+          if(this.id) {
+            this.startInfo.push({
+              detailedAddress: element.detailedAddress,
+              appUserName: element.appUserName,
+              contractTelephone: element.contractTelephone,
+              type: element.type
+            })
+          } else {
+            this.startInfo.push({
+              detailedAddress: element.detailedAddress,
+              appUserName: element.appUserName,
+              contractTelephone: element.contractTelephone,
+              type: element.type,
+              id: element.id
+            })
+          }
           if(element.createTime) {
-            this.creatTime = element.createTime
-            this.creatTime = element.modifyTime
+            this.creatTime = element?.createTime
+            this.modifyTime = element?.modifyTime
           }
         } else if(element.type === 2) {
           this.endInfo.push({
-            detailedAddress: element.detailedAddress,
-            appUserName: element.appUserName,
-            contractTelephone: element.contractTelephone,
+            detailedAddress: element?.detailedAddress,
+            appUserName: element?.appUserName,
+            contractTelephone: element?.contractTelephone,
+            type: element.type
           })
         }
       });
       this.sf3data = {
-        goodsNameId: res?.goodsInfoList.goodsNameId || '',
-        weight:  res?.goodsInfoList.weight   || '',
-        volume:  res?.goodsInfoList.volume   || '',
-        externalResourceCode:  res?.goodsInfoList.goodsNameId   || '',
+        goodsNameId: res?.goodsInfoList[0]?.goodsNameId || '',
       }
       this.sf4data = {
-        goodsNameId: res?.goodsInfoList.goodsNameId || '',
-        weight:  res?.goodsInfoList.weight   || '',
-        volume:  res?.goodsInfoList.volume   || '',
-        externalResourceCode:  res?.goodsInfoList.goodsNameId   || '',
+        weight:  res?.goodsInfoList[0]?.weight   || '',
+        volume:  res?.goodsInfoList[0]?.volume   || '',
+        vehicleDemand:  res?.goodsInfoList[0]?.vehicleDemand   || '',
       }
       this.sf5data = {
         goodsValue: res?.goodsValue || '',
       }
       this.sf6data = {
-        stateReceipt: res?.supplementaryInformationVO.stateReceipt || '',
-        remarks: res?.supplementaryInformationVO.remarks || '',
+        stateReceipt: res?.supplementaryInformationVO?.stateReceipt || '',
+        remarks: res?.supplementaryInformationVO?.remarks || '',
       }
+      console.log('99999')
+      console.log(res?.shippingInformationVO)
       this.sf7data = {
         prePay: res?.shippingInformationVO?.prePay || '',
         toPay: res?.shippingInformationVO?.toPay || '',
@@ -559,9 +615,9 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
         receiptPay: res?.shippingInformationVO?.receiptPay || '',
         oilCardPay2: res?.shippingInformationVO?.oilCardPay || '',
         appendFee: res?.shippingInformationVO?.appendFee || '',
-        totalFee: res?.shippingInformationVO?.totalFee || '',
         name8: res?.shippingInformationVO?.appendFee || '',
       }
+      this.totalFees = res?.shippingInformationVO?.totalFee || '0';
       // <p>预付：{{dataList?.shippingInformationVO?.prePay | currency: '￥' }}</p>
       // <p>油卡：{{dataList?.shippingInformationVO?.oilCardPay | currency: '￥'}}</p>
       // <p>到付：{{dataList?.shippingInformationVO?.toPay | currency: '￥'}}</p>
@@ -579,4 +635,8 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
  
     })
   }
+  asds(i: any) {
+    console.log(i)
+  }
+  // const data = 
 }
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
index 9b6deaec..a69ef0a6 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-08 09:57:47
+ * @LastEditTime: 2021-12-09 10:59:41
  * @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\vehicle\vehicle.component.html
@@ -67,9 +67,16 @@ size="small"
       <ng-template st-row="resourceCode" let-item let-index="index">
         <a [routerLink]="'/supply-management/vehicle-detail/'+item.id">{{item.resourceCode}}</a>
       </ng-template>
+      <ng-template st-row="vehicleDemand" let-item let-index="index">
+     
+        <div *ngFor="let i of item?.vehicleDemand">
+          <span>{{item?.vehicleDemand.i}}66{{i}}</span>
+        </div>
+      </ng-template>
       <ng-template st-row="LoadingAddressArr" let-item let-index="index">
         <div *ngFor="let i of item?.LoadingAddressArr">
-          <span>{{item?.LoadingAddressArr[i]}}</span>
+          <span>{{i?.maxCube}}</span>
+          <span>{{i?.maxWeight}}</span>
         </div>
       </ng-template>
       <ng-template st-row="serviceType" let-item let-index="index">
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index 043faa50..d462dcdc 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -238,6 +238,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
         index: 'vehicleDemand',
         className: 'text-center',
         width: '120px',
+        render: 'vehicleDemand'
       },
       {
         title: '总费用',
@@ -448,8 +449,10 @@ export class SupplyManagementVehicleComponent implements OnInit {
     })
   }
   nextOrder(item: any) {
-    this.router.navigate(['/supply-management/vehicle-amend', item.id], {
-      relativeTo: this.ar
+    this.router.navigate(['/supply-management/vehicle-amend', item.id,],{
+      queryParams: {
+        sta: 2
+      },
     })
   }
 }
diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts
index 40d863c1..d0c43f27 100644
--- a/src/app/routes/supply-management/services/supply-management.service.ts
+++ b/src/app/routes/supply-management/services/supply-management.service.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-08 16:55:10
+ * @LastEditTime: 2021-12-09 10:56:28
  * @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\services\supply-management.service.ts
@@ -14,13 +14,17 @@ import { BaseService } from 'src/app/shared/services';
 })
 export class SupplyManagementService extends BaseService {
   // 整车获取货源表详情
-  $api_get_getCompleteVehicleDetail = `/api/sdc/goodsResourceOperate/getCompleteVehicleDetail`;
+  $api_get_getCompleteVehicleDetail = `/api/sdc/goodsResourceOperate/getWholeDetail`;
   // 大宗获取货源表详情
   $api_get_getBulkDetail = `/api/sdc/goodsResourceOperate/getBulkDetail`;
   // 查询运营后台大宗货源列表
   $api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/list/bulkPage`;
   // 查询运营后台整车货源列表
   $api_get_wholePage_list = `/api/sdc/goodsResourceOperate/list/wholePage`;
+  // 整车再下一单
+  $api_set_saveAnotherWholeOrder = `/api/sdc/goodsResourceOperate/saveAnotherWholeOrder`;
+  // 大宗再下一单
+  $api_set_saveAnotherBulkOrder = `/api/sdc/goodsResourceOperate/saveAnotherBulkOrder`;
 
   constructor(public injector: Injector) {
     super(injector)
diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts
index 594ff321..b729b8f2 100644
--- a/src/app/routes/vehicle/components/list/detail/detail.component.ts
+++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts
@@ -4,7 +4,7 @@ import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzMessageService } from 'ng-zorro-antd/message';
-import { UsermanageService } from '../../../services/vehicle.service';
+import { VehicleService } from '../../../services/vehicle.service';
 import { VehicleComponentsListEditComponent } from '../edit/edit.component';
 import { VehicleImgViewComponent } from '../img-view/img-view.component';
 
@@ -68,7 +68,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
   constructor(
     private http: _HttpClient,
     private modal: ModalHelper,
-    public service: UsermanageService,
+    public service: VehicleService,
     private route: ActivatedRoute,
     private modalHelper: ModalHelper,
     private msgSrv: NzMessageService,
diff --git a/src/app/routes/vehicle/components/list/edit/edit.component.ts b/src/app/routes/vehicle/components/list/edit/edit.component.ts
index 0859c1c2..626d3980 100644
--- a/src/app/routes/vehicle/components/list/edit/edit.component.ts
+++ b/src/app/routes/vehicle/components/list/edit/edit.component.ts
@@ -4,7 +4,7 @@ import { EAEnvironmentService, CaptchaComponent, EAUserService } from '@shared';
 import { Observable, Observer } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalRef } from 'ng-zorro-antd/modal';
-import { UsermanageService } from '../../../services/vehicle.service';
+import { VehicleService } from '../../../services/vehicle.service';
 @Component({
   selector: 'app-setting-components-info-edit',
   templateUrl: './edit.component.html',
@@ -23,7 +23,7 @@ export class VehicleComponentsListEditComponent implements OnInit {
   constructor(
     private modal: NzModalRef,
     public msgSrv: NzMessageService,
-    public service: UsermanageService,
+    public service: VehicleService,
     private envSrv: EAEnvironmentService,
   ) {}
 
diff --git a/src/app/routes/vehicle/components/list/img-view/img-view.component.spec.ts b/src/app/routes/vehicle/components/list/img-view/img-view.component.spec.ts
index 419a51ce..014df68a 100644
--- a/src/app/routes/vehicle/components/list/img-view/img-view.component.spec.ts
+++ b/src/app/routes/vehicle/components/list/img-view/img-view.component.spec.ts
@@ -1,18 +1,26 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-07 17:30:18
+ * @LastEditTime: 2021-12-09 17:47:33
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\img-view\img-view.component.spec.ts
+ */
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SettingComponentsInfoImgViewComponent } from './img-view.component';
+import { VehicleImgViewComponent } from './img-view.component';
 
-describe('SettingComponentsInfoImgViewComponent', () => {
-  let component: SettingComponentsInfoImgViewComponent;
-  let fixture: ComponentFixture<SettingComponentsInfoImgViewComponent>;
+describe('VehicleImgViewComponent', () => {
+  let component: VehicleImgViewComponent;
+  let fixture: ComponentFixture<VehicleImgViewComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [SettingComponentsInfoImgViewComponent],
+      declarations: [VehicleImgViewComponent],
     }).compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SettingComponentsInfoImgViewComponent);
+    fixture = TestBed.createComponent(VehicleImgViewComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html
index 3d688f79..83769452 100644
--- a/src/app/routes/vehicle/components/list/list.component.html
+++ b/src/app/routes/vehicle/components/list/list.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-12-01 20:58:57
+ * @LastEditTime: 2021-12-09 17:56:02
  * @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\usercenter\components\freight\list\list.component.html
@@ -52,7 +52,7 @@
     #st
     [bordered]="true"
     [columns]="columns"
-    [data]='datalist'
+    [data]='service.$api_get_operate_list'
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index 4ac469a4..29140f63 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { UsermanageService } from '../../../vehicle/services/vehicle.service';
+import { VehicleService } from '../../../vehicle/services/vehicle.service';
 @Component({
   selector: 'app-Freight-components-list',
   templateUrl: './list.component.html',
@@ -46,7 +46,7 @@ export class VehicleComponentsListComponent implements OnInit {
   @ViewChild('st', { static: false }) st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
 
-  constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
+  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
   /**
    * 查询字段个数navigate
    */
diff --git a/src/app/routes/vehicle/services/vehicle.service.ts b/src/app/routes/vehicle/services/vehicle.service.ts
index f73600a1..573bfa96 100644
--- a/src/app/routes/vehicle/services/vehicle.service.ts
+++ b/src/app/routes/vehicle/services/vehicle.service.ts
@@ -1,8 +1,8 @@
 /*
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-11-29 15:43:42
- * @LastEditors: your name
+ * @LastEditTime: 2021-12-09 17:55:37
+ * @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\usercenter\services\usercenter.service.ts
  */
@@ -15,75 +15,9 @@ import { EAFileUtil } from 'src/app/shared/utils/file.util';
 @Injectable({
   providedIn: 'root',
 })
-export class UsermanageService extends BaseService {
-  public $api_add_one!: string;
-  public $api_add_many!: string;
-  public $api_edit_one!: string;
-  public $api_edit_many!: string;
-  public $api_del_one!: string;
-  public $api_del_many!: string;
-  public $api_get_many!: string;
-  public $api_get_one!: string;
-  public $api_get_page!: string;
-  public $api_export!: string;
-  public $api_import!: string;
-  public $api_import_download_tpl!: string;
-  // 平台用户列表
-  $api_get_page_user = '/cuc/userApp/getOperatorUserList?_allow_anonymous=true';
-  // 获取供应商采购商应用
-  $api_get_supplier_purchaserApp = '/cuc/appInfo/getSupplierPurchaserApp?_allow_anonymous=true';
-
-  // 供应商列表
-  $api_get_supplier_page = '/cuc/operator/list/listSupplierPage?_allow_anonymous=true';
-  // 供应商详情
-  $api_get_supplier_info = '/cuc/operator/selectSupplierDetailInfo?_allow_anonymous=true';
-  // 用户冻结或恢复应用用户
-  $api_set_freezeOrResume = '/cuc/operator/updateSupplierInfo?_allow_anonymous=true';
-  // 获取一、二、三级地区详情
-  $api_getRegionToThree = '/cms/region/getRegionToThree?_allow_anonymous=true';
-  // 根据地区code查询列表
-  $api_getRegionByCode = '/cms/region/getRegionByCode?_allow_anonymous=true';
-
-  // 根据地区code查询地区详情
-  $api_get_region_detailByCode = '/cms/region/getRegionDetailByCode?_allow_anonymous=true';
-  // 查询供应商申请列表分页
-  $api_get_supplier_audit_page = `/cuc/operator/audit/listSupplierPage?_allow_anonymous=true`;
-  // 查询供应商入驻详情
-  $api_get_supplier_entryInfo = `/cuc/operator/selectSupplierEntryDetailInfo?_allow_anonymous=true`;
-  // 审核供应商
-  $api_auditSupplier = `/cuc/operator/auditSupplier?_allow_anonymous=true`;
-  // 查询采购商列表分页
-  $api_get_purchaserList = `/cuc/operator/list/queryPurchaserPage`;
-  // 查询采购商申请列表分页
-  $api_get_purchaserAudit = `/cuc/operator/audit/queryPurchaserPage`;
-  // 查询采购商认证详情
-  $api_get_purchaser_detailInfo = `/cuc/operator/selectPurchaserDetailInfo`;
-
-  // 查询采购商审核总数
-  $api_query_purchaser_count = `/cuc/operator/queryPurchaserCount`;
-  // 获取供应商审核总数
-  $api_query_supplier_count = `/cuc/operator/querySupplierCount`;
-
-  // 审核企业详情
-  $api_get_cache_enterprise_info = '';
-  // 获取审核进度
-  $api_get_progress = '/cuc/reviewRecordInfo/getReviewProgress';
-  // 查询流程信息列表
-  $api_get_progressInfoList = '/cuc/processInfo/getProcessInfoList';
-  // 审核通过
-  $api_set_audit_pass = '/cuc/reviewRecordInfo/reviewPassed';
-  // 审核拒绝
-  $api_set_audit_reject = '/cuc/reviewRecordInfo/reviewRejected';
-
-  // 发起签约 //撤回签约
-  $api_get_startSigning = `/cuc/operator/startSigning?_allow_badcode=true`;
-
-  // 发起续约 //撤回续约
-  $api_get_startRenewalContract = `/cuc/operator/startRenewalContract?_allow_badcode=true`;
-  // 获取审核记录
-  $api_get_reviewRecordInfoList = '/cuc/reviewRecordInfo/getReviewRecordInfoList';
-  // 查看合同详情
-  $api_get_contract_detail = `/scce/etc/etc/contractDetail/getContractByContractNo`;
+export class VehicleService extends BaseService {
+  // 查询车辆认证表
+  $api_get_operate_list = `/api/mdc/cuc/carLicense/operate/list/page`;
 
   constructor(public injector: Injector) {
     super(injector);