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

src/app/routes/financial-management/components/cost-management/cost-management.component.ts

@@ -268,19 +268,19 @@ export class CostManagementComponent implements OnInit {
         title: '操作',
         fixed: 'right',
         className: 'text-center',
-        width: 90,
+        width: '90px',
         buttons: [
           {
             text: '浏览',
             click: item => this.routeTo('/financial-management/cost-management/detail/' + item.id)
           },
           {
-            text: '审核',
+            text: '审核　',
             click: item => this.auditAction(item),
             iif: item => item.sts === 2
           },
           {
-            text: '修改',
+            text: '修改　',
             click: item => this.router.navigate(['/financial-management/cost-management/expenses-receivable/1'], { queryParams: { id: 1 } })
           }
         ]

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

@@ -241,6 +241,7 @@ export class PaymentOrderComponent implements OnInit {
       { title: '付款备注', index: 'callNo' },
       {
         title: '操作',
+        width: '90px',
         buttons: [
           {
             text: '浏览',

src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts

@@ -296,6 +296,7 @@ export class VoucherManagementComponent implements OnInit {
       { title: '创建人', index: 'sts' },
       {
         title: '操作',
+        width: '90px',
         buttons: [
           {
             text: '浏览'

src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.less

@@ -16,8 +16,8 @@
     }
 
     .ant-tabs-tab-btn {
-        padding-left : 16px;
         padding-right: 16px;
+        padding-left : 16px;
     }
 
     .text-truncate {
@@ -26,16 +26,16 @@
 }
 
 .expend-options {
-    margin-top: 0px;
+    margin-top: 0;
 }
 
 
 @media (min-width: 1200px) {
     .expend-options {
-        max-width: 400px;
         position : absolute;
         right    : 0;
         bottom   : 25px;
+        max-width: 400px;
     }
 
 }

src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts

@@ -254,10 +254,10 @@ export class WithdrawalsRecordComponent implements OnInit {
       { title: '失败原因', index: 'failCause', width: 150 },
       {
         title: '操作',
-        width: 120,
+        width: '110px',
         buttons: [
           {
-            text: '审核',
+            text: '审核　　',
             iif: item => item.refundStatus === '1',
             click: item => this.auditAction(item)
           },
@@ -267,7 +267,7 @@ export class WithdrawalsRecordComponent implements OnInit {
             // click: item => this.auditAction(item)
           },
           {
-            text: '详情',
+            text: '详情　　',
             click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/' + item.id])
           }
         ]

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

@@ -99,7 +99,16 @@ tabs = {
     this.getGoodsSourceStatistical()
   }
   getGoodsSourceStatistical() {
-    this.service.request(this.service.$api_getBulkStatistical).subscribe(res => {
+    this.tabs = {
+      cancelQuantity: 0,
+      receivedQuantity: 0,
+      stayQuantity: 0,
+      signQuantity: 0,
+      compolatelQuantity: 0,
+      GoingQuantity: 0,
+      totalCount: 0
+    };
+    this.service.request(this.service.$api_getBulkStatistical, {...this.reqParams}).subscribe(res => {
       if (res) {
         let totalCount = 0;
        res.forEach((element: any) => {
@@ -129,7 +138,6 @@ tabs = {
     setTimeout(() => {
       this.st.load();
       this.getGoodsSourceStatistical()
-
     }, 500);
   }
   ngOnInit(): void {
@@ -474,11 +482,11 @@ tabs = {
       {
         title: '操作',
         fixed: 'right',
-        width: '200px',
+        width: '120px',
         className: 'text-left',
         buttons: [
           {
-            text: '查看评价',
+            text: '查看评价　',
             click: (_record) => this.viewEvaluate(_record),
             iif: item => item.billStatus == '5',
           },
@@ -488,22 +496,22 @@ tabs = {
             iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', 
           },
           {
-            text: '变更运费',
+            text: '变更运费　',
             click: (_record) => this.updateFreight(_record),
             iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
           },
           {
-            text: '确认签收',
+            text: '确认签收　',
             click: (_record) => this.confirmReceipt(_record),
             iif: item => item.billStatus == '4',
           },
           {
-            text: '取消订单',
+            text: '取消订单　',
             click: (_record) => this.cancellation(_record),
             iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1',
           },
           {
-            text: '修改订单',
+            text: '修改订单　',
             click: (_record) => this.changeOrder(_record),
             iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
           },

src/app/routes/order-management/components/complaint/complaint.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-12 10:50:31
+ * @LastEditTime: 2022-01-13 20:59:08
  * @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
@@ -55,7 +55,7 @@
     [loading]="service.http.loading"
     >
     <ng-template st-row="complaintCode" let-item let-index="index">
-      <a [routerLink]="'/order-management/complaint-detail/'+item.id">{{item.complaintCode}}</a>
+      <a href="javascript:;" (click)="view(item)">{{item.complaintCode}}</a>
     </ng-template>
     </st>
   </div>

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-13 14:14:33
+ * @LastEditTime: 2022-01-14 14:11:40
  * @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
@@ -117,25 +117,6 @@
       <div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div>
       <div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div>
     </ng-template>
-      <!-- <ng-template st-row="externalSn" let-item let-index="index">
-        <span class="mr-xs">{{111111}}</span>
-        <a (click)="editEnternalSn(item)">编辑</a>
-      </ng-template> -->
-      <!-- <ng-template st-row="feiong" let-item let-index="index">
-        <div style="color: aqua;" (click)="OpenPrice()">
-          {{item.no}}
-        </div>
-      </ng-template> -->
-      <!-- <ng-template #contentTemplate>
-        <div>
-          <p>预付：¥200.00</p>
-          <p>到付：¥200.00</p>
-          <p>油卡：¥200.00</p>
-          <p>回单付：¥200.00</p>
-          <p>小计：¥200.00</p>
-          <p>附加费：¥200.00</p>
-        </div>
-      </ng-template> -->
     </st>
   </div>
 </nz-card>

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

@@ -112,7 +112,17 @@ resourceStatus: any;
   this.getGoodsSourceStatistical()
   }
   getGoodsSourceStatistical() {
-    this.service.request(this.service.$api_statisticalStatus).subscribe(res => {
+    this.tabs = {
+      cancelQuantity: 0,
+      receivedQuantity: 0,
+      stayQuantity: 0,
+      signQuantity: 0,
+      compolatelQuantity: 0,
+      GoingQuantity: 0,
+      totalCount: 0
+    };
+    console.log(this.tabs)
+    this.service.request(this.service.$api_statisticalStatus,{...this.reqParams}).subscribe(res => {
       if (res) {
         let totalCount = 0;
        res.forEach((element: any) => {
@@ -414,11 +424,11 @@ resourceStatus: any;
       {
         title: '操作',
         fixed: 'right',
-        width: '200px',
+        width: '120px',
         className: 'text-left',
         buttons: [
           {
-            text: '查看评价',
+            text: '查看评价　',
             click: (_record) => this.viewEvaluate(_record),
             iif: item => item.billStatus == '5',
           },
@@ -428,27 +438,27 @@ resourceStatus: any;
             iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', 
           },
           {
-            text: '变更运费',
+            text: '变更运费　',
             click: (_record) => this.updateFreight(_record),
             iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
           },
           {
-            text: '确认签收',
+            text: '确认签收　',
             click: (_record) => this.confirmReceipt(_record),
             iif: item => item.billStatus == '4',
           },
           {
-            text: '取消订单',
+            text: '取消订单　',
             click: (_record) => this.cancellation(_record),
             iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1',
           },
           {
-            text: '修改订单',
+            text: '修改订单　',
             click: (_record) => this.changeOrder(_record),
             iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
           },
           {
-            text: '查看轨迹',
+            text: '查看轨迹　',
             click: (_record) => this.cancellation(_record),
             iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
           },
@@ -556,6 +566,7 @@ resourceStatus: any;
     this.initST();
     setTimeout(() => {
       this.st.load();
+      this.getGoodsSourceStatistical()
     }, 500);
   }
   /**

src/app/routes/supply-management/components/bulk/bulk.component.html

@@ -22,7 +22,7 @@
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
         <button nz-button nzType="primary"  [nzLoading]="service.http.loading"
-          (click)="st?.load(1)">查询</button>
+        (click)="search()">查询</button>
           <button nz-button nzType="primary" [disabled]="service.http.loading"
           >导入</button>
         <button nz-button  [disabled]="service.http.loading" (click)="resetSF()">重置</button>

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

@@ -57,6 +57,10 @@ export class SupplyManagementBulkComponent implements OnInit {
       ...this.sf?.value,
     };
   }
+  search() {
+    this.st?.load(1);
+    this.getGoodsSourceStatistical()
+  }
   /**
  * 初始化查询表单
  */
@@ -272,7 +276,7 @@ export class SupplyManagementBulkComponent implements OnInit {
       {
         title: '操作',
         fixed: 'right',
-        width: '200px',
+        width: '110px',
         className: 'text-left',
         buttons: [
           {
@@ -281,7 +285,7 @@ export class SupplyManagementBulkComponent implements OnInit {
              iif: item => item.auditStatus == 1,
           },
           {
-            text: '二维码',
+            text: '二维码　',
             click: (_record) => this.assignedQrcode(_record),
             iif: item => item.auditStatus == 1 || item.auditStatus == 2,
           },
@@ -364,6 +368,7 @@ export class SupplyManagementBulkComponent implements OnInit {
     this.initST();
     setTimeout(() => {
       this.st.load();
+      this.getGoodsSourceStatistical();
     }, 500);
   }
 
@@ -488,7 +493,13 @@ export class SupplyManagementBulkComponent implements OnInit {
   }
     // 获取货源状态统计
     getGoodsSourceStatistical() {
-      this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 2 }).subscribe(res => {
+      this.tabs = {
+        totalQuantity: 0,
+        cancelQuantity: 0,
+        receivedQuantity: 0,
+        stayQuantity: 0
+      };
+      this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 2, ...this.reqParams }).subscribe(res => {
         if (res) {
           console.log(res)
           this.tabs = res;

src/app/routes/supply-management/components/vehicle/vehicle.component.html

@@ -19,7 +19,7 @@
       ></sf>
     </div>
     <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
-      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button>
       <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
       <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">

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

@@ -95,6 +95,10 @@ export class SupplyManagementVehicleComponent implements OnInit {
     //   .subscribe(() => this.st.reload());
   }
 
+  search() {
+    this.st?.load(1);
+    this.getGoodsSourceStatistical()
+  }
   /**
    * 伸缩查询条件
    */
@@ -114,6 +118,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
     this.resourceStatus = e;
     setTimeout(() => {
       this.st.load();
+      this.getGoodsSourceStatistical();
     }, 500);
   }
 
@@ -245,7 +250,13 @@ export class SupplyManagementVehicleComponent implements OnInit {
   }
   // 获取货源状态统计
   getGoodsSourceStatistical() {
-    this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 1 }).subscribe(res => {
+    this.tabs = {
+      totalQuantity: 0,
+      cancelQuantity: 0,
+      receivedQuantity: 0,
+      stayQuantity: 0
+    };
+    this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 1, ...this.reqParams }).subscribe(res => {
       if (res) {
         console.log(res);
         this.tabs = res;
@@ -487,7 +498,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
             click: _record => this.nextOrder(_record)
           },
           {
-            text: '重新指派',
+            text: '重新指派　',
             click: _record => this.assignedCar(_record),
             iif: item => item.resourceStatus === '1' && item.serviceType === '2'
           }

src/app/routes/sys-setting/components/close-account/close-account.component.ts

@@ -34,7 +34,6 @@ export class CloseAccountComponent implements OnInit {
     { title: '网络货运人', index: 'networkTransporterName' },
     { title: '货主名称', index: 'enterpriseName' },
     { title: '客户编码', index: 'crmCustomerCode' },
-    { title: '供应商编码', index: 'crmSupplierCode' },
     {
       title: '操作',
       buttons: [
@@ -121,14 +120,6 @@ export class CloseAccountComponent implements OnInit {
           _$expand: (value: boolean) => value
         } }
       },
-      crmSupplierCode: {
-        type: 'string',
-        title: '供应商编码',
-        ui: { placeholder: '请输入',
-        visibleIf: {
-          _$expand: (value: boolean) => value
-        } }
-      },
     }
     
   };

src/app/routes/sys-setting/components/network-freight/network-freight.component.html

@@ -1,58 +1,78 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-24 15:38:08
- * @LastEditTime: 2021-12-27 10:46:43
+ * @LastEditTime: 2022-01-14 14:40:25
  * @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\sys-setting\components\crm-management\crm-management.component.html
 -->
-<page-header-wrapper title="网络货运人">
+<page-header-wrapper title="网络货运人"> </page-header-wrapper>
-</page-header-wrapper>
 
-<nz-card >
+<nz-card>
-    <div nz-row nzGutter="8">
+  <div nz-row nzGutter="8">
-        <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
-        <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
+    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-          <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
+      <sf
-            (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
+        #sf
-        </div>
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        [loading]="service.http.loading"
+        (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"
+      ></sf>
+    </div>
 
-        <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
-        <ng-container *ngIf="queryFieldCount > 4">
+    <ng-container *ngIf="queryFieldCount > 4">
-          <div nz-col [nzSpan]="_$expand ? 24 : 18">
+      <div nz-col [nzSpan]="_$expand ? 24 : 18">
-            <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
-          </div>
-          <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-            <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
-              (click)="st?.load(1)">查询</button>
-            <button nz-button nzType="primary" 
-             >导出</button>
-            <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button nzType="link" (click)="expandToggle()">
-              {{ !_$expand ? '展开' : '收起' }}
-              <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-            </button>
-          </div>
-        </ng-container>
       </div>
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button nzType="primary">导出</button>
+        <button nz-button (click)="resetSF()">重置</button>
+        <button nz-button nzType="link" (click)="expandToggle()">
+          {{ !_$expand ? '展开' : '收起' }}
+          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+        </button>
+      </div>
+    </ng-container>
+  </div>
 </nz-card>
 
 <nz-card class="content-box">
-    <st #st [data]="service.$api_networkTransporter_page" [columns]="columns"
+  <st
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    #st
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [scroll]="{ x: '2000px' }"
-        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [data]="service.$api_networkTransporter_page"
-        [loading]="service.http.loading" [scroll]="{ y: '370px' }" (change)="stChange($event)">
+    [columns]="columns"
-    </st>
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loading]="service.http.loading"
+    (change)="stChange($event)"
+  >
+  </st>
 </nz-card>
 
-<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" nzTitle="财务设置" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="财务设置" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
-    <ng-container *nzModalContent>
+  <ng-container *nzModalContent>
-      <sf #sfFre [schema]="addSchema" [ui]="ui2" [formData]="formData" [compact]="false" [button]="'none'">
+    <sf #sfFre [schema]="addSchema" [ui]="ui2" [formData]="formData" [compact]="false" [button]="'none'"> </sf>
-      </sf>
+  </ng-container>
-    </ng-container>
+  <ng-template #nzModalFooter>
-    <ng-template #nzModalFooter>
+    <button nz-button nzType="primary" (click)="handleCancel()" [disabled]="">取消</button>
-      <button nz-button nzType="primary" (click)="handleCancel()" [disabled]="">取消</button>
+    <button nz-button nzType="default" (click)="handleOK()">确 定</button>
-      <button nz-button nzType="default" (click)="handleOK()">确 定</button>
+  </ng-template>
-    </ng-template>
+</nz-modal>
+
+<nz-modal [(nzVisible)]="isVisibleTicket" [nzFooter]="nzModalFooterTiket" nzTitle="票务设置" (nzOnCancel)="handleCancelTicket()">
+  <ng-container *nzModalContent>
+    <sf #sfTicket [schema]="ticketSchema" [ui]="ui3" [formData]="formDataTicket" [compact]="false" [button]="'none'"> </sf>
+  </ng-container>
+  <ng-template #nzModalFooterTiket>
+    <button nz-button nzType="primary" (click)="handleCancelTicket()" [disabled]="">取消</button>
+    <button nz-button nzType="default" (click)="handleOKTicket()">确 定</button>
+  </ng-template>
 </nz-modal>

src/app/routes/sys-setting/components/network-freight/network-freight.component.ts

@@ -1,8 +1,9 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { STComponent, STColumn, STChange } from '@delon/abc/st';
-import { SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { SFCascaderWidgetSchema, SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
 import { DynamicSettingModalComponent } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { takeLast } from 'rxjs/operators';
 import { SystemService } from '../../services/system.service';
 
 @Component({
@@ -15,39 +16,84 @@ export class NetworkFreightComponent implements OnInit {
   st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   @ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
+  @ViewChild('sfTicket', { static: false }) sfTicket!: SFComponent;
   ui: SFUISchema = {};
   ui2: SFUISchema = {};
+  ui3: SFUISchema = {};
   schema: SFSchema = {};
   addSchema: SFSchema = {};
+  ticketSchema: SFSchema = {};
   _$expand = false;
   formData: any;
+  ticketId: any;
+  ticketItem: any;
+  formDataTicket: any
   isVisible = false;
+  isVisibleTicket = false;
   edit = false;
   editId = false;
 
   columns: STColumn[] = [
-    { title: '公司名称', index: 'enterpriseName' },
+    { 
-    { title: '纳税人识别号', index: 'taxCode' },
+     title: '公司名称',
-    { title: '发票税率', index: 'invoiceTaxRate' },
+     width: '180px',
-    { title: '电子发票账号', index: 'electronicInvoiceAccount' },
+     index: 'enterpriseName'
-    { title: 'ETC账号', index: 'etcAccount' },
+     },
-    { title: '电子合同账号', index: 'electronicContractAccount' },
+    { 
-    { title: '开户行', index: 'bankName' },
+      title: '纳税人识别号',
-    { title: '虚拟账户', index: 'virtualAccount' },
+      width: '180px',
+
+      index: 'taxCode' },
+    { 
+      title: '发票税率',
+      width: '150px',
+
+      index: 'invoiceTaxRate' },
+    { 
+      title: '电子发票账号',
+      width: '150px',
+
+
+      index: 'electronicInvoiceAccount' },
+    { 
+      title: 'ETC账号',
+      width: '150px',
+
+      index: 'etcAccount' },
+    { 
+      title: '电子合同账号',
+      width: '150px',
+      index: 'electronicContractAccount' },
+    { 
+      title: '开户行',
+      width: '150px',
+      index: 'bankName' },
+    { 
+      title: '虚拟账户',
+      width: '150px',
+      index: 'virtualAccount' },
     {
       title: '附加费比例',
       index: 'surchargeRate',
+      width: '150px',
       format: (item: any) => {
         return item.surchargeRate + '%';
       }
     },
     {
       title: '操作',
+      width: '80px',
+      fixed: 'right',
+      className: 'text-left',
       buttons: [
         {
           text: '财务设置',
           click: item => this.roleAction(item, 2)
         },
+        {
+          text: '票务设置',
+          click: item => this.ticket(item)
+        },
         {
           text: '合同设置',
           click: item => this.roleAction(item, 2)
@@ -73,6 +119,7 @@ export class NetworkFreightComponent implements OnInit {
   ngOnInit(): void {
     this.initSF();
     this.initSFFre();
+    // this.initSFTicket();
   }
 
   stChange(e: STChange): void {
@@ -116,6 +163,88 @@ export class NetworkFreightComponent implements OnInit {
     };
     this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
   }
+  initSFTicket() {
+    this.ticketSchema = {
+      properties: {
+        enterpriseName1: {
+          type: 'string',
+          title: '公司名称',
+          ui: {
+            widget: 'text',
+           },
+           default: this.ticketItem?.enterpriseName,
+        },
+        taxCode2: {
+          type: 'string',
+          title: '纳税人识别号',
+          ui: {
+            widget: 'text',
+           },
+           default: this.ticketItem?.taxCode,
+        },
+        bankName: {
+          type: 'string',
+          title: '开户银行',
+          ui: { placeholder: '请输入' }
+        },
+        bankAccount: {
+          type: 'string',
+          title: '银行账号',
+          ui: { placeholder: '请输入' }
+        },
+        registerAddress: {
+          type: 'string',
+          title: '注册地址',
+          ui: { placeholder: '请输入' }
+        },
+        registerPhone: {
+          type: 'string',
+          title: '注册电话',
+          ui: { placeholder: '请输入' }
+        },
+        senderName: {
+          type: 'string',
+          title: '寄件人姓名',
+          ui: { placeholder: '请输入' }
+        },
+        senderPhone: {
+          type: 'string',
+          title: '寄件人电话',
+          ui: { placeholder: '请输入' }
+        },
+        senderRegionCode: {
+          type: 'number',
+          title: '营业执照所在地',
+          ui: {
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            widget: 'cascader',
+            valueProperty: 'regionCode',
+            labelProperty: 'name',
+            asyncData: (node: any, index: any) => {
+              return new Promise(resolve => {
+                this.getRegionDetailByCode(node?.regionCode || '').subscribe(
+                  res => {
+                    node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1 }));
+                  },
+                  _ => {},
+                  () => {
+                    resolve();
+                  }
+                );
+              });
+            }
+          } as SFCascaderWidgetSchema
+        },
+        senderAddress: {
+          type: 'string',
+          title: '详细地址',
+          ui: { placeholder: '请输入' }
+        },
+      },
+      required: ['enterpriseName', 'taxCode', 'bankName', 'bankAccount', 'registerAddress','registerPhone', 'senderName','senderRegionCode','senderPhone', 'senderAddress']
+    };
+    this.ui3 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
+  }
   initSFFre() {
     this.addSchema = {
       properties: {
@@ -160,7 +289,37 @@ export class NetworkFreightComponent implements OnInit {
     this.editId = value.id;
     this.isVisible = true;
   }
-
+  ticket(value: any) {
+    this.formDataTicket = [];
+    this.ticketItem  = value;
+      this.initSFTicket();
+    this.service.request(this.service.$api_getTicketByNetworkTransporterId, { id: value.id }).subscribe((res: any) => {
+      console.log(res);
+      if (res) {
+        let List = {
+          ...res
+        };
+        delete List.senderRegionCode;
+        List.senderRegionCode = this.getProvinceData(res?.senderRegionCode),
+        this.formDataTicket = List;
+        this.ticketId  = res.id;
+      }
+    });
+    this.isVisibleTicket = true;
+  }
+  getProvinceData(value: any) {
+    this.service.http.post(this.service.$api_getRegionDetailByCode, { regionCode: value}).subscribe(res => {
+      console.log(res.data)
+      console.log(this.formDataTicket)
+      let enterpriseAddressCode : any= [];
+      let regioin = res?.data?.regionFullCodes.split(',');
+      console.log(regioin)
+      regioin?.forEach((element: any) => {
+           enterpriseAddressCode.push(Number(element))
+      });
+     return enterpriseAddressCode;
+    });
+  }
   deleteAction(item?: any) {
     this.nzModalService.error({
       nzTitle: '确认删除？',
@@ -192,6 +351,32 @@ export class NetworkFreightComponent implements OnInit {
   handleCancel() {
     this.isVisible = false;
   }
+  handleCancelTicket() {
+    this.isVisibleTicket = false;
+  }
+  handleOKTicket() {
+    console.log(this.sfTicket.valid)
+    console.log(this.sfTicket.value)
+    if (!this.sfTicket.valid) {
+      this.service.msgSrv.warning('请正确填写完整！');
+      return;
+    }
+    const params = {
+      ...this.sfTicket.value
+    };
+    if (this.ticketId) {
+      params.id = this.ticketId;
+    }
+    params.senderRegionCode = this.sfTicket.value.senderRegionCode[2]
+    console.log(params)
+    this.service.request(this.service.$api_networkTransporterTicket_save, params).subscribe((res: any) => {
+      if (res) {
+        this.service.msgSrv.success('保存成功！');
+        this.isVisibleTicket = false;
+        this.st.reload(1);
+      }
+    });
+  }
 
   handleOK() {
     console.log(this.sfFre.value);
@@ -215,4 +400,11 @@ export class NetworkFreightComponent implements OnInit {
       }
     });
   }
+  
+  /*
+   * 根据地区code查询地区列表
+   */
+  getRegionDetailByCode(regionCode: any) {
+    return this.service.request(this.service.$api_get_region_by_code, { regionCode });
+  }
 }

src/app/routes/sys-setting/services/system.service.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-20 17:18:43
- * @LastEditTime: 2021-12-29 16:53:47
+ * @LastEditTime: 2022-01-14 10:57:58
  * @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\sys-setting\services\system.service.ts
@@ -124,6 +124,16 @@ export class SystemService extends BaseService {
   // 删除系统配置项
   public $api_remove_config_item = '/api/mdc/pbc/sysConfigItem/deletebatch';
 
+
+  // 根据网络货运人ID获取票务信息
+  public $api_getTicketByNetworkTransporterId = '/api/mdc/cuc/networkTransporterTicket/getTicketByNetworkTransporterId';
+  // 保存票务信息
+  public $api_networkTransporterTicket_save = '/api/mdc/cuc/networkTransporterTicket/save';
+ // 根据地区code查询列表
+ $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode';
+  // 根据地区code查询地区详情
+  $api_getRegionDetailByCode = '/api/mdc/pbc/region/getRegionDetailByCode';
+ 
   $api_getRoleTemplateInfo: string = '';
   $api_getFunctionButtonInfo: string = '';
   $api_getFunctionDataInfo: string = '';

src/app/routes/usercenter/components/driver/detail/detail.component.ts

@@ -115,6 +115,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
     this.service.request(this.service.$api_get_driver_practice_seniority, { appUserId: this.route.snapshot.params.id }).subscribe(res => {
       if (res?.id) {
         this.licenseDetail = res;
+        console.log(res)
         this.tempalateLicenseDetail = { ...this.licenseDetail };
       }
     });

src/app/routes/usercenter/components/driver/driver.component.ts

@@ -296,11 +296,11 @@ export class UserCenterComponentsDriverComponent implements OnInit {
       { title: '注册时间', className: 'text-center', index: 'createTime' },
       {
         title: '操作',
-        width: '170px',
+        width: '110px',
         className: 'text-center',
         buttons: [
           {
-            text: '查看',
+            text: '查看　　',
             click: item => {
               this.router.navigate(['./detail', item.appUserId], { relativeTo: this.ar });
               // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
@@ -311,7 +311,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
             click: item => this.settingAction(item)
           },
           {
-            text: '资金账户',
+            text: '资金账户　',
             click: item => this.showAccountDetail(item)
           }
         ]

src/app/routes/usercenter/components/freight/list/detail/detail.component.ts

@@ -68,6 +68,7 @@ export class FreightComponentsListDetailComponent implements OnInit {
             Number(this.detailData.fullRegionVO?.cityCode),
             Number(this.detailData.fullRegionVO?.areaCode)
           ];
+          console.log(this.enterpriseAddressCode)
         }
         console.log(res);
       });

src/app/routes/usercenter/components/freight/list/list.component.ts

@@ -202,11 +202,11 @@ export class FreightComponentsListComponent implements OnInit {
       },
       {
         title: '操作',
-        width: '170px',
+        width: '110px',
         className: 'text-center',
         buttons: [
           {
-            text: '查看',
+            text: '查看　　',
             click: item => {
               this.router.navigate(['./detail', item.id], { relativeTo: this.ar });
               // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
@@ -217,7 +217,7 @@ export class FreightComponentsListComponent implements OnInit {
             click: item => this.settingAction(item)
           },
           {
-            text: '资金账户',
+            text: '资金账户　',
             click: item => this.showAccountDetail(item)
           }
         ]

src/app/routes/vehicle/components/audit/audit.component.ts

@@ -83,7 +83,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
             onSearch: (q: any) => {
               if (!!q) {
                 return this.service
-                  .request(this.service.$api_get_getCarLicenseListByCarNo, {
+                  .request(this.service.$api_get_getCarLicenseListByCarNo_audit, {
                     carNo: q
                   })
                   .pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))

src/app/routes/vehicle/services/vehicle.service.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2022-01-13 15:56:57
+ * @LastEditTime: 2022-01-14 15:02:51
  * @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
@@ -45,8 +45,8 @@ export class VehicleService extends BaseService {
   $api_get_upLoadCarProtocal= `/api/mdc/cuc/carLicenseAudit/operate/upLoadCarProtocal`;
 
   // 根据车牌号查询车辆信息（车辆认证表）
-  $api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicense/operate/findCarLicenseListByCarNo`;
+  $api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicense/findCarLicenseByCarNo`;
-
+  // /api/mdc/cuc/carLicense/findCarLicenseByCarNo
   // 根据车牌号查询车辆信息（车辆审核认证表）
   $api_get_getCarLicenseListByCarNo_audit= `/api/mdc/cuc/carLicenseAudit/operate/findCarLicenseAuditListByCarNo`;
 

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

@@ -428,7 +428,7 @@ tabs = {
       {
         title: '操作',
         fixed: 'right',
-        width: '200px',
+        width: '110px',
         className: 'text-left',
         buttons: [
           {
@@ -470,6 +470,7 @@ tabs = {
       {
         title: '操作',
         fixed: 'right',
+        width: '80px',
         className: 'text-left',
         buttons: [
           {
@@ -552,6 +553,7 @@ tabs = {
     this.initST();
     setTimeout(() => {
       this.st.load();
+      this.getGoodsSourceStatistical();
     }, 500);
   }
   /**

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

@@ -372,7 +372,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
       {
         title: '操作',
         fixed: 'right',
-        width: '200px',
+        width: '110px',
         className: 'text-left',
         buttons: [
           {
@@ -490,6 +490,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
     this.initST();
     setTimeout(() => {
       this.st.load();
+      this.getGoodsSourceStatistical();
     }, 500);
   }
   /**

src/assets/mocks/menu-data.json

@@ -183,7 +183,7 @@
                 "hide": true
               },
               {
-                "text": "货源详情",
+                "text": "整车订单详情",
                 "icon": "anticon anticon-dashboard",
                 "link": "/order-management/vehicle-detail",
                 "hide": true
@@ -438,6 +438,28 @@
                   }
                 ]
               },
+              {
+                "text": "操作日志",
+                "group": true,
+                "children": [
+                  {
+                    "text": "系统操作日志",
+                    "link": "/system/system-logs"
+                  },
+                  {
+                    "text": "货源操作日志",
+                    "link": "/system/system-supply-logs"
+                  },
+                  {
+                    "text": "订单操作日志",
+                    "link": "/system/system-waybill-logs"
+                  },
+                  {
+                    "text": "用户登录日志",
+                    "link": "/system/user-logs"
+                  }
+                ]
+              },
               {
                 "text": "CRM客户管理",
                 "link": "/system/crm-management"
@@ -462,22 +484,7 @@
                 "text": "基础配置",
                 "link": "/system/basic-config"
               },
-              {
+            
-                "text": "系统操作日志",
-                "link": "/system/system-logs"
-              },
-              {
-                "text": "货源操作日志",
-                "link": "/system/system-supply-logs"
-              },
-              {
-                "text": "订单操作日志",
-                "link": "/system/system-waybill-logs"
-              },
-              {
-                "text": "用户登录日志",
-                "link": "/system/user-logs"
-              },
               {
                 "text": "版本发布记录",
                 "link": "/system/version-logs"