车辆接口更新

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-25 15:20:08
+ * @LastEditTime : 2022-01-25 15:35:06
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.ts

@@ -1,3 +1,13 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-20 10:00:39
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-25 15:40:10
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\receipt-order\\receipt-order-detail\\receipt-order-detail.component.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st';
@@ -63,7 +73,7 @@ export class ReceiptOrderDetailComponent implements OnInit {
       ],
       requested: [
         { title: '序号', render: 'no', width: 70, className: 'text-left' },
-        { title: '结算客户', index: 'cno', className: 'text-left', width: 200 },
+        { title: '结算客户', index: 'cnoName', className: 'text-left', width: 200 },
         {
           title: '预收金额',
           index: 'yskmoney',

src/app/routes/financial-management/components/receipt-order/receipt-order.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 18:43:42
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 18:58:32
+ * @LastEditTime : 2022-01-25 15:38:21
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\receipt-order\\receipt-order.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->

src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts

@@ -236,11 +236,11 @@ export class ReceiptOrderComponent implements OnInit {
       },
       {
         title: '核销金额',
-        index: 'armoney',
+        index: 'brmmoney',
         width: 200,
         type: 'widget',
         className: 'text-right',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.armoney }) }
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.brmmoney }) }
       },
       {
         title: '预收金额',
@@ -252,7 +252,7 @@ export class ReceiptOrderComponent implements OnInit {
       },
       { title: '银行类型', index: 'banktypeLabel', width: 200, className: 'text-left' },
       { title: '收款类型', index: 'brmtypeLabel', width: 150, className: 'text-left' },
-      { title: '收款方式', index: 'brmmode', width: 150, className: 'text-left' },
+      { title: '收款方式', index: 'brmmodeLabel', width: 150, className: 'text-left' },
       { title: '付款人', index: 'artoname', width: 200, className: 'text-left' },
       { title: '银行水单', index: 'bankreceipt', width: 200, className: 'text-left' },
       { title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-left' },

src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts

@@ -279,7 +279,7 @@ export class CancellationInvoiceComponent implements OnInit {
       },
       { title: '申请时间', index: 'createTime', type: 'date', width: 150 },
       { title: '网络货运人', index: 'ltdName', width: 120 },
-      { title: '购买人', index: 'artoName', width: 90 },
+      { title: '购买人', index: 'artoname', width: 90 },
       { title: '订单数', index: 'ordlines', width: 90, className: 'text-right' },
       {
         title: '价税合计',

src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html

@@ -1,154 +1,179 @@
 <page-header-wrapper [title]="'开票信息'" [logo]="logo">
-    <ng-template #logo>
+  <ng-template #logo>
-        <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
-            <i nz-icon nzType="left" nzTheme="outline"></i>
+      <i nz-icon nzType="left" nzTheme="outline"></i>
-        </button>
+    </button>
-    </ng-template>
+  </ng-template>
 </page-header-wrapper>
 
 <nz-card class="statistics-box">
-    <div nz-row nzGutter="8">
+  <div nz-row nzGutter="8">
-        <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
+    <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
-            <se label="销售方">
+      <se label="销售方">
-                {{headerInfo?.ltdId}}
+        {{ headerInfo?.ltdName }}
-            </se>
+      </se>
-            <se label="申请编号">
+      <se label="申请编号">
-                {{headerInfo?.vatappHCode}}
+        {{ headerInfo?.vatappHCode }}
-            </se>
+      </se>
-            <se label="发票号码">
+      <se label="发票号码">
-                {{headerInfo?.invoiceno}}
+        {{ headerInfo?.invoiceno }}
-            </se>
+      </se>
-            <se label="发票代码">
+      <se label="发票代码">
-                {{headerInfo?.invoiceno2}}
+        {{ headerInfo?.invoiceno2 }}
-            </se>
+      </se>
-            <se label="开票日期">
+      <se label="开票日期">
-                {{headerInfo?.invoicedate}}
+        {{ headerInfo?.invoicedate }}
-            </se>
+      </se>
-            <se label="价税合计">
+      <se label="价税合计">
-                {{headerInfo?.vatmoney}}
+        {{ headerInfo?.vatmoney }}
-            </se>
+      </se>
-            <se label="税额">
+      <se label="税额">
-                {{headerInfo?.vattax}}
+        {{ headerInfo?.vattax }}
-            </se>
+      </se>
-        </div>
+    </div>
-        <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
+    <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
-            <se label="购买方">
+      <se label="购买方">
-                {{headerInfo?.artoname}}
+        {{ headerInfo?.artoname }}
-            </se>
+      </se>
-            <se label="纳税号">
+      <se label="纳税号">
-                {{headerInfo?.artotaxno}}
+        {{ headerInfo?.artotaxno }}
-            </se>
+      </se>
-            <se label="地址">
+      <se label="地址">
-                {{headerInfo?.artoadd}}
+        {{ headerInfo?.artoadd }}
-            </se>
+      </se>
-            <se label="电话">
+      <se label="电话">
-                {{headerInfo?.artotel}}
+        {{ headerInfo?.artotel }}
-            </se>
+      </se>
-            <se label="开户行">
+      <se label="开户行">
-                {{headerInfo?.artobank}}
+        {{ headerInfo?.artobank }}
-            </se>
+      </se>
-            <se label="银行账户">
+      <se label="银行账户">
-                {{headerInfo?.artoacc}}
+        {{ headerInfo?.artoacc }}
-            </se>
+      </se>
-            <se label="票面备注">
+      <se label="票面备注">
-                {{headerInfo?.remarks}}
+        {{ headerInfo?.remarks }}
-            </se>
+      </se>
-            <!-- <se label="其他要求">
+      <!-- <se label="其他要求">
                 {{headerInfo?.otherremarks}}
             </se> -->
-        </div>
-        <div *ngIf="isCanEdit" nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" class="text-right">
-            <ng-container *ngIf="isEdit; else elseTemplate">
-                <button nz-button (click)="isEdit = false;invoiceST?.load(1)">取消</button>
-                <button nz-button nzType="primary" (click)="saveInvoices()">保 存</button>
-            </ng-container>
-            <ng-template #elseTemplate>
-                <!-- <button nz-button nzType="primary" (click)="isEdit = true">修改</button> -->
-            </ng-template>
-        </div>
     </div>
+    <div *ngIf="isCanEdit" nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" class="text-right">
+      <ng-container *ngIf="isEdit; else elseTemplate">
+        <button nz-button (click)="isEdit = false; invoiceST?.load(1)">取消</button>
+        <button nz-button nzType="primary" (click)="saveInvoices()">保 存</button>
+      </ng-container>
+      <ng-template #elseTemplate>
+        <!-- <button nz-button nzType="primary" (click)="isEdit = true">修改</button> -->
+      </ng-template>
+    </div>
+  </div>
 </nz-card>
 
 <nz-card class="search-box" nzBordered>
+  <nz-tabset>
+    <nz-tab nzTitle="订单明细">
+      <div nz-row nzGutter="8" class="mb-md">
+        <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+          <sf
+            #orderSf
+            [schema]="orderSchema"
+            [ui]="{ '*': { spanLabelFixed: 90, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
+            [compact]="true"
+            [button]="'none'"
+          ></sf>
+        </div>
+        <div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
+          <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="orderST?.load(1)">查询</button>
+          <button nz-button (click)="resetSF(1)">重置</button>
+          <!-- <button nz-button> 导出</button> -->
+        </div>
+      </div>
 
-    <nz-tabset>
+      <st
-        <nz-tab nzTitle="订单明细">
+        #orderST
-            <div nz-row nzGutter="8" class="mb-md">
+        [scroll]="{ x: '1200px' }"
-                <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+        [data]="service.$api_get_invoice_order_detail"
-                    <sf #orderSf [schema]="orderSchema"
+        [columns]="orderColumns"
-                        [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
+        size="small"
-                        [button]="'none'"></sf>
+        bordered="true"
-                </div>
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
-                <div nz-col [nzXl]=" 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
+        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-                    <button nz-button nzType="primary" [nzLoading]="service.http.loading"
+        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-                        (click)="orderST?.load(1)">查询</button>
+        [loading]="service.http.loading"
-                    <button nz-button (click)="resetSF(1)">重置</button>
+        [scroll]="{ x: '1200px', y: '250px' }"
-                    <!-- <button nz-button> 导出</button> -->
+      ></st>
-                </div>
+    </nz-tab>
-            </div>
+    <nz-tab nzTitle="费用明细">
+      <div nz-row nzGutter="8" class="mb-md">
+        <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+          <sf
+            #costSf
+            [schema]="costSchema"
+            [ui]="{ '*': { spanLabelFixed: 90, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
+            [compact]="true"
+            [button]="'none'"
+          ></sf>
+        </div>
+        <div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
+          <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="costST?.load(1)">查询</button>
+          <button nz-button (click)="resetSF(2)">重置</button>
+          <button nz-button> 导出</button>
+        </div>
+      </div>
 
-            <st #orderST [data]="service.$api_get_invoice_order_detail" [columns]="orderColumns" size="small" bordered="true"
+      <st
-                [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' },  process: beforeReq }"
+        #costST
-                [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+        [data]="service.$api_get_invoice_cost_detail"
-                [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+        [columns]="costColumns"
-                [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '250px' }"></st>
+        size="small"
-        </nz-tab>
+        bordered="true"
-        <nz-tab nzTitle="费用明细">
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
-            <div nz-row nzGutter="8" class="mb-md">
+        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-                <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-                    <sf #costSf [schema]="costSchema"
+        [loading]="service.http.loading"
-                        [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
+        [scroll]="{ x: '1200px', y: '250px' }"
-                        [button]="'none'"></sf>
+      ></st>
-                </div>
+    </nz-tab>
-                <div nz-col [nzXl]=" 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
+    <nz-tab nzTitle="发票明细">
-                    <button nz-button nzType="primary" [nzLoading]="service.http.loading"
+      <st
-                        (click)="costST?.load(1)">查询</button>
+        #invoiceST
-                    <button nz-button (click)="resetSF(2)">重置</button>
+        [data]="service.$api_get_invoice_details"
-                    <button nz-button> 导出</button>
+        [columns]="invoiceColumns"
-                </div>
+        size="small"
-            </div>
+        bordered="true"
-
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
-            <st #costST [data]="service.$api_get_invoice_cost_detail" [columns]="costColumns" size="small" bordered="true"
+        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-                [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
+        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-                [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+        [loading]="service.http.loading"
-                [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+        [scroll]="{ x: '1200px', y: '250px' }"
-                [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '250px' }"></st>
+      >
-        </nz-tab>
+        <ng-template st-row="vatname" let-item let-index="index">
-        <nz-tab nzTitle="发票明细">
+          <nz-select
-            <st #invoiceST [data]="service.$api_get_invoice_details" [columns]="invoiceColumns" size="small" bordered="true"
+            *ngIf="isEdit"
-                [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' },  process: beforeReq }"
+            [ngModel]="item.owner"
-                [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+            (ngModelChange)="invoiceST.setRow(index, { vatname: $event })"
-                [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+            style="width: 100%"
-                [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '250px' }">
+          >
-                <ng-template st-row="vatname" let-item let-index="index">
+          </nz-select>
-                    <nz-select *ngIf="isEdit" [ngModel]="item.owner"
+          <ng-container *ngIf="!isEdit">{{ item.vatname }}</ng-container>
-                        (ngModelChange)="invoiceST.setRow(index, { vatname: $event })" style="width: 100%;">
+        </ng-template>
-                    </nz-select>
+        <ng-template st-row="vatmodel" let-item let-index="index">
-                    <ng-container *ngIf="!isEdit">{{ item.vatname }}</ng-container>
+          <input *ngIf="isEdit" nz-input [ngModel]="item.vatmodel" (ngModelChange)="invoiceST.setRow(index, { vatmodel: $event })" />
-                </ng-template>
+          <ng-container *ngIf="!isEdit">{{ item.vatmodel }}</ng-container>
-                <ng-template st-row="vatmodel" let-item let-index="index">
+        </ng-template>
-                    <input *ngIf="isEdit" nz-input [ngModel]="item.vatmodel"
+        <ng-template st-row="vatunit" let-item let-index="index">
-                        (ngModelChange)="invoiceST.setRow(index, { vatmodel: $event })" />
+          <input *ngIf="isEdit" nz-input [ngModel]="item.vatunit" (ngModelChange)="invoiceST.setRow(index, { vatunit: $event })" />
-                    <ng-container *ngIf="!isEdit">{{ item.vatmodel }}</ng-container>
+          <ng-container *ngIf="!isEdit">{{ item.vatunit }}</ng-container>
-                </ng-template>
+        </ng-template>
-                <ng-template st-row="vatunit" let-item let-index="index">
+        <ng-template st-row="vatqty" let-item let-index="index">
-                    <input *ngIf="isEdit" nz-input [ngModel]="item.vatunit"
+          <input *ngIf="isEdit" nz-input [ngModel]="item.vatqty" (ngModelChange)="invoiceST.setRow(index, { vatqty: $event })" />
-                        (ngModelChange)="invoiceST.setRow(index, { vatunit: $event })" />
+          <ng-container *ngIf="!isEdit">{{ item.vatqty }}</ng-container>
-                    <ng-container *ngIf="!isEdit">{{ item.vatunit }}</ng-container>
+        </ng-template>
-                </ng-template>
+      </st>
-                <ng-template st-row="vatqty" let-item let-index="index">
+    </nz-tab>
-                    <input *ngIf="isEdit" nz-input [ngModel]="item.vatqty"
+    <nz-tab nzTitle="快递轨迹">
-                        (ngModelChange)="invoiceST.setRow(index, { vatqty: $event })" />
+      <p style="font-weight: 600">顺丰快递: {{ routesInfo?.mailNo }} <nz-tag [nzColor]="'#2db7f5'" class="ml-md">已签收</nz-tag> </p>
-                    <ng-container *ngIf="!isEdit">{{ item.vatqty }}</ng-container>
+      <app-logistics-time-line [data]="routesInfo?.routes"></app-logistics-time-line>
-                </ng-template>
+    </nz-tab>
-            </st>
+  </nz-tabset>
-        </nz-tab>
+</nz-card>
-        <nz-tab nzTitle="快递轨迹">
-            <p style="font-weight: 600;">顺丰快递: {{routesInfo?.mailNo}} <nz-tag [nzColor]="'#2db7f5'" class="ml-md">已签收</nz-tag>
-            </p>
-            <app-logistics-time-line [data]="routesInfo?.routes"></app-logistics-time-line>
-        </nz-tab>
-    </nz-tabset>
-
-
-</nz-card>

src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts

@@ -108,7 +108,7 @@ export class InvoiceDetailComponent implements OnInit {
   private initOrderSF(): SFSchema {
     return {
       properties: {
-        billHId: {
+        billHCode: {
           type: 'string',
           title: '订单号',
           ui: {
@@ -146,14 +146,14 @@ export class InvoiceDetailComponent implements OnInit {
 
   private initOrderST(): STColumn[] {
     return [
-      { title: '订单号', index: 'billHId', width: 140 },
+      { title: '订单号', index: 'billHCode', width: 180 },
       { title: '订单完成日期', index: 'billTime', type: 'date', width: 150 },
-      { title: '所属项目', index: 'projectId', width: 140 },
+      { title: '所属项目', index: 'projectId', width: 180 },
-      { title: '订单类型', index: 'billType', width: 120 },
+      { title: '订单类型', index: 'billTypeLabel', width: 120 },
       { title: '装货地', index: 'loadingfrom', width: 200 },
-      { title: '卸货地', index: 'loadingto', width: 200 },
+      { title: '卸货地', index: 'loadingto', width: 220 },
       { title: '货物信息', index: 'goodsinfo', width: 140 },
-      { title: '承运司机', index: 'driverinfo', width: 140 },
+      { title: '承运司机', index: 'driverinfo', width: 280 },
       {
         title: '申请金额',
         index: 'billkpnotax',

src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts

@@ -1,10 +1,10 @@
 /*
  * @Author: your name
  * @Date: 2021-12-23 16:50:17
- * @LastEditTime: 2021-12-31 13:35:22
+ * @LastEditTime : 2022-01-25 15:53:13
- * @LastEditors: Please set LastEditors
+ * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \tms-obc-web\src\app\routes\ticket-management\components\invoice-requested\requested-invoice-modal\requested-invoice-modal.component.ts
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\requested-invoice-modal\\requested-invoice-modal.component.ts
  */
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
@@ -66,12 +66,12 @@ export class RequestedInvoiceModalComponent implements OnInit {
       { title: '', index: 'key', type: 'checkbox' },
       { title: '订单号', index: 'billHCode', width: 150 },
       { title: '订单完成日期', index: 'billTime', type: 'date', width: 150 },
-      { title: '所属项目', index: 'projectIdName', width: 160 },
+      { title: '所属项目', index: 'projectIdName', width: 250 },
       { title: '订单类型', index: 'billTypeName', width: 90 },
       { title: '装货地', index: 'loadingfrom', width: 250 },
       { title: '卸货地', index: 'loadingto', width: 250 },
       { title: '货物信息', index: 'goodsinfo', width: 170 },
-      { title: '承运司机', index: 'driverinfo', width: 170 },
+      { title: '承运司机', index: 'driverinfo', width: 280 },
       {
         title: '总费用',
         index: 'billkpmoney',