合同

2021-12-08 15:40:46 +08:00
parent a299e56181
commit a6b9c6b07f
6 changed files with 78 additions and 60 deletions
--- 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
@ -1,25 +1,17 @@
-<page-header-wrapper [title]="''"></page-header-wrapper>
+<page-header-wrapper [title]="'整车发货'" [logo]="logo">
+  <ng-template #logo>
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button>
+  </ng-template>
+</page-header-wrapper>
 <nz-card>
  <div class="card-title">货源单设置</div>
-  <sf #sf1 [schema]="schema1" [button]="'none'" [ui]="ui1"></sf>
+  <sf #sf1 [schema]="schema1"  [formData]="dataList" [button]="'none'" [ui]="ui1"></sf>
 </nz-card>

 <nz-card>
  <div class="card-title">装卸货信息<span class="tip-font">预计公里数：-km，预计行程耗时：-小时</span></div>
-  <!-- <sf #sf2 [schema]="schema2" [button]="'none'" [ui]="ui2">
-    <ng-template sf-template="name1" let-i let-ui="ui">
-      <div nz-row class="align-center">
-        <div nz-col nzSpan="16">
-          <input nz-input [ngModel]="i.value" (ngModelChange)="i.setValue($event)" />
-        </div>
-        <div nz-col nzSpan="8">
-          <span style="padding: 0 10px"><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff"></i></span>
-          <label nz-checkbox [(ngModel)]="newTempchecked" [ngModelOptions]="{ standalone: true }"></label>
-          <span style="padding-left: 10px">发布后存入新模板</span>
-        </div>
-      </div>
-    </ng-template>
-  </sf> -->
  <form nz-form [formGroup]="validateForm1" role="form">
    <div nz-row [nzGutter]="24">
      <div nz-col [nzSpan]="8">
--- 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
@ -1,8 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { Router } from '@angular/router';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { ActivatedRoute, Router } from '@angular/router';
 import {
-  SFArrayWidgetSchema,
  SFComponent,
  SFNumberWidgetSchema,
  SFSchema,
@ -12,10 +11,9 @@ import {
 } from '@delon/form';
 import { _HttpClient } from '@delon/theme';
 import { AmapPoiPickerComponent } from '@shared';
-import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
-
+import { NzModalService } from 'ng-zorro-antd/modal';
 import { PublishGoodsChooseFamifiarComponent } from '../choose-famifiar/choose-famifiar.component';
-import { GaodeMapComponent } from '../gaode-map/gaode-map.component';
+import { SupplyManagementService } from '../../services/supply-management.service';
@Component({
  selector: 'app-publish-goods-onecar-publish',
  templateUrl: './onecar-publish.component.html',
@ -24,7 +22,7 @@ import { GaodeMapComponent } from '../gaode-map/gaode-map.component';
 export class  SupplyManagementOnecarPublishComponent implements OnInit {
  validateForm1: FormGroup;
  newTempchecked = false; //是否存入新模板
-
+  id = this.route.snapshot.params.id;
  // // 单位
  unit1 = '吨';
  unit2 = '方';
@ -43,10 +41,8 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
      phone: '18888888888'
    }
  ];
-
-  // formatterRmb = (value: number): string => `￥ ${value}`;
-  // parserRmb = (value: string): string => value.replace('￥ ', '');
-  constructor(private http: _HttpClient, fb: FormBuilder, private router: Router, private modalService: NzModalService) {
+  dataList: any;
+  constructor(private http: _HttpClient, fb: FormBuilder, private router: Router, private route: ActivatedRoute, private modalService: NzModalService, public service: SupplyManagementService) {
    this.validateForm1 = fb.group({
      name1: [null, []],
      name2: [null, []],
@ -89,12 +85,13 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
    this.initSF5();
    this.initSF6();
    this.initSF7();
+    this.initdata();
  }

  initSF1() {
    this.schema1 = {
      properties: {
-        name3: {
+        shipperAdispatchNameppUserNmae: {
          type: 'string',
          title: '货主',
          maxLength: 30,
@ -102,7 +99,7 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
            placeholder: '请输入'
          }
        },
-        name4: {
+        enterpriseProjectName: {
          type: 'string',
          title: '项目',
          enum: [
@ -124,7 +121,7 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
            // change: (i) => this.updateCategory(i, '/categoryId2'),
          } as SFSelectWidgetSchema
        },
-        no1: {
+        enterpriseInfoName: {
          type: 'string',
          title: '网络货运人',
          ui: {
@ -132,7 +129,7 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
          },
          default: 0
        },
-        name8: {
+        externalResourceCode: {
          type: 'string',
          title: '外部货源号',
          maxLength: 30,
@ -140,7 +137,7 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
            placeholder: '请输入'
          }
        },
-        name2: {
+        dispatchName: {
          type: 'string',
          title: '调度员',
          enum: [
@ -494,4 +491,15 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
      nzWidth: 848
    });
  }
+  goBack() {
+    window.history.go(-1);
+  }
+  // 初始化信息
+  initdata() {
+    console.log(this.id)
+    this.service.request(`${this.service.$api_get_getCompleteVehicleDetail}`, {id:this.id}).subscribe((res) => {
+      console.log(res)
+      this.dataList = res;
+    })
+  }
 }
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
@ -7,19 +7,19 @@
 </page-header-wrapper>
 <nz-card>
  <div nz-row>
-    <div nz-col nzSpan="4">
+    <div nz-col nzSpan="6">
      <sv-container class="bdr">
        <sv label="货源编号" col="1">{{ dataList?.resourceCode }}</sv>
        <sv-title class="text-center text-lg">
-          <span *ngIf="dataList?.resourceStatus === 1">待接单</span>
-          <span *ngIf="dataList?.resourceStatus === 2">已接单</span>
-          <span *ngIf="dataList?.resourceStatus === 3">已取消</span>
+          <span *ngIf="dataList?.resourceType === 1">待接单</span>
+          <span *ngIf="dataList?.resourceType === 2">已接单</span>
+          <span *ngIf="dataList?.resourceType === 3">已取消</span>
        </sv-title>
        <sv-title>
          <div class="">
-            <a class="btn-size">修改单价</a>
+            <a class="btn-size" (click)="modification()">修改货源</a>
            <a class="btn-size m-lg mr-lg">取消货源</a>
-            <a class="btn-size">再下一单</a>
+            <a class="btn-size" (click)="nextOrder()">再下一单</a>
          </div>
        </sv-title>
      </sv-container>
@ -99,17 +99,18 @@
    <div class="freight-info-box">
      <h3 style="font-weight: 700;">运费信息</h3>
      <div class="text-right">
-        <div *ngFor="let item of dataList?.expenseList; let i = index">
-        <p *ngIf="i === 0"><label class="freigth-label"></label><span style="color: #fad786;">{{'到货后15天内支付运费' }}</span></p>
-        <p><label class="freigth-label">{{item?.expenseName}}:</label><span>{{item.price | currency:'￥' }}</span></p>
-        <p><label class="freigth-label">附加费:</label><span>{{400 | currency:'￥' }}</span></p>
-        </div>
+        <p>预付：{{dataList?.expenseList?.prePay | currency: '￥' }}</p>
+        <p>油卡：{{dataList?.expenseList?.oilCardPay | currency: '￥'}}</p>
+        <p>到付：{{dataList?.expenseList?.toPay | currency: '￥'}}</p>
+        <p>回单付：{{dataList?.expenseList?.receiptPay | currency: '￥'}}</p>
+        <p>保险费：{{dataList?.expenseList?.insuranceFee | currency: '￥'}}</p>
+        <p>附加费保险费：{{dataList?.expenseList?.appendFee | currency: '￥'}}</p>
      </div>
    </div>
    <nz-divider></nz-divider>
    <div class="freight-info-box" nz-row>
      <div nz-col nzSpan="24">
-        <h3 class="text-right"><label>总计 :</label> <span class="text-error-dark text-xl">{{400 | currency }}</span></h3>
+        <h3 class="text-right"><label>总计 :</label> <span class="text-error-dark text-xl">{{dataList?.expenseList?.totalFee |  currency: '￥' }}</span></h3>
      </div>

    </div>
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
@ -1,13 +1,13 @@
 /*
 * @Author: your name
 * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-08 10:21:11
+ * @LastEditTime: 2021-12-08 14:35:47
 * @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-detail\vehicle-detail.component.ts
 */
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn } from '@delon/abc/st';
 import { _HttpClient } from '@delon/theme';
 import { NzMessageService } from 'ng-zorro-antd/message';
@ -33,6 +33,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
    private route: ActivatedRoute,
    private msgSrv: NzMessageService,
    private service: SupplyManagementService,
+    private router: Router,private ar: ActivatedRoute
  ) {

  }
@ -54,7 +55,18 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
      this.dataList = res
    })
  }
-
+  // 修改货源 
+  modification() {
+    this.router.navigate(['/supply-management/vehicle-amend', this.id], {
+      relativeTo: this.ar
+    })
+  }
+  //  再下一单
+  nextOrder() {
+    this.router.navigate(['/supply-management/vehicle-amend', this.id], {
+      relativeTo: this.ar
+    })
+  }



--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@ -121,7 +121,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
            },
          }
        },
-        no1: {
+        dischargePlace: {
          type: 'string',
          title: '卸货地',
          ui: {
@ -130,7 +130,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
            },
          }
        },
-        no4: {
+        shipperAppUserName: {
          type: 'string',
          title: '货主',
          ui: {
@ -139,7 +139,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
            },
          }
        },
-        sex: {
+        auditStatus: {
          title: '审核状态',
          type: 'string',
          enum: [
@ -155,7 +155,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
            },
          } as SFSelectWidgetSchema,
        },
-        appId: {
+        enterpriseInfoName: {
          type: 'string',
          title: '网络货运人',
          ui: {
@ -292,12 +292,12 @@ export class SupplyManagementVehicleComponent implements OnInit {
          {
            text: '货源审核',
            click: (_record) => this.audit(_record, 1),
-            iif: item => item.status === 1,
+            // iif: item => item.auditStatus === 1,
          },
          {
            text: '修改货源',
            click: (_record) => this.amend(_record),
-            iif: item => item.status === 1 || item.status === 2,
+            // iif: item => item.auditStatus === 1 || item.auditStatus === 2,
          },
          {
            text: '修改运费',
@ -305,17 +305,17 @@ export class SupplyManagementVehicleComponent implements OnInit {
          },
          {
            text: '取消货源',
-            iif: item => item.status === 1 || item.status === 2,
+            // iif: item => item.auditStatus === 1 || item.auditStatus === 2,
            // click: (_record) => this.delOne(_record),
          },
          {
            text: '再下一单',
-            // click: (_record) => this.editOne(_record),
+            click: (_record) => this.nextOrder(_record),
          },
          {
            text: '重新指派',
            click: (_record) => this.assignedCar(_record),
-            iif: item =>  item.status === 2,
+            // iif: item =>  item.auditStatus === 2,
          },
        ],
      },
@ -448,4 +448,9 @@ export class SupplyManagementVehicleComponent implements OnInit {
      relativeTo: this.ar
    })
  }
+  nextOrder(item: any) {
+    this.router.navigate(['/supply-management/vehicle-amend', item.id], {
+      relativeTo: this.ar
+    })
+  }
 }
--- a/src/app/shared/services/business/user.service.ts
+++ b/src/app/shared/services/business/user.service.ts
@ -2,8 +2,8 @@
 * @Description:
 * @Author: wsm
 * @Date: 2021-06-22 10:25:33
- * @LastEditTime: 2021-06-23 20:25:05
- * @LastEditors: Do not edit
+ * @LastEditTime: 2021-12-08 15:40:21
+ * @LastEditors: Please set LastEditors
 * @Reference:
 */
 import { Inject, Injectable, Injector } from '@angular/core';
@ -25,11 +25,11 @@ export class EAUserService extends BaseService {
  /**
   * 账号密码登录
   */
-  $api_login_by_account = `/api/mdc/cuc/user/login?_allow_anonymous=true`;
+  $api_login_by_account = `api/mdc/cuc/user/login?_allow_anonymous=true`;
  /**
   * 手机号登录
   */
-  $api_login_by_mobile = `/api/mdc/cuc/user/sms/login?_allow_anonymous=true`;
+  $api_login_by_mobile = `api/mdc/cuc/user/sms/login?_allow_anonymous=true`;
  // 登录路径
  private $api_login = `/scce/cuc/cuc/user/login?_allow_anonymous=true`;
  private $api_captcha_login = `/scce/cuc/cuc/user/sms/login?_allow_anonymous=true`;