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

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

@@ -218,7 +218,7 @@
     <button   nz-button nzType="primary"(click)="modifyFreightPeople()">
 修改网络货运人
 </button> 
-    <button  nz-button nzType="primary"(click)="modifyRate()">
+    <button  nz-button nzType="primary"(click)="modifycaptain()">
 修改车队长
 </button> 
     <button  nz-button nzType="primary" nzGhost nz-popconfirm

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

@@ -16,6 +16,7 @@ import { VehicleUpdateFreightComponent } from '../../modal/vehicle/update-freigh
 import { OrderManagementService } from '../../services/order-management.service';
 import { VehicleModifyRateComponent } from '../../modal/vehicle/modify-rate/modify-rate.component';
 import { VehicleFreightPeopleComponent } from '../../modal/vehicle/freight-people/freight-people.component';
+import { VehicleModifyCaptainComponent } from '../../modal/vehicle/modify-captain/modify-captain.component';
 
 
 @Component({
@@ -654,7 +655,37 @@ resourceStatus: any;
           nzTitle: '修改网络货运人',
           nzWidth: 600,
           nzContent: VehicleFreightPeopleComponent,
-          nzComponentParams: { data: { ids: params } },
+          nzComponentParams: { data: { ids: params,  } },
+          nzFooter: null,
+          // nzOnOk: sin => {
+          //   this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
+          //     if (res) {
+          //       this.service.msgSrv.success('变更运费成功');
+          //       modal.destroy();
+          //       this.st.reload();
+          //     }
+          //   });
+          //   return false;
+          // }
+        });
+  }
+      /**
+   *修改网络货运人
+   */
+   modifycaptain() {
+    let params: any[] = [];
+    this.selectedRows.forEach(item => {
+      params.push(item.id);
+    });
+    if(params.length  === 0) {
+      this.service.msgSrv.error('请先选择订单！')
+      return
+    }
+        const modal = this.modal.create({
+          nzTitle: '修改车队长',
+          nzWidth: 600,
+          nzContent: VehicleModifyCaptainComponent,
+          nzComponentParams: { data: { ids: params,  } },
           nzFooter: null,
           // nzOnOk: sin => {
           //   this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {

src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts

@@ -1,17 +1,17 @@
 /*
  * @Author: your name
  * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2021-12-29 20:23:48
+ * @LastEditTime: 2021-12-29 20:48:59
  * @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\order-management\modal\bulk\update-freight\update-freight.component.ts
  */
 import { Component, Input, OnInit, ViewChild } from '@angular/core';
-import {SFComponent, SFSchema, SFUISchema} from '@delon/form';
+import {SFComponent, SFNumberWidgetSchema, SFSchema, SFUISchema} from '@delon/form';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalRef } from 'ng-zorro-antd/modal';
 import { OrderManagementService } from '../../../services/order-management.service';
-import { ShipperBaseService } from './../../../../../shared/services/business/shipper-base.service';
+
 
 @Component({
   selector: 'app-order-management-vehicle-freight-people',
@@ -27,22 +27,27 @@ export class VehicleFreightPeopleComponent implements OnInit {
 
   data: any;
 
-  constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService, private service2: ShipperBaseService) {}
+  constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService, ) {}
 
   ngOnInit(): void {
     console.log(this.data)
-    this.initSF(this.data);
+    this.initSF();
   }
-  initSF(data: any) {
+  initSF() {
     this.schema = {
-      enterpriseInfoName: {
+      properties: {
-        type: 'string',
+        enterpriseInfoName: {
-        title: '网络货运人',
+          type: 'string',
-        ui: {
+          title: '网络货运人',
-          widget: 'select',
+          ui: {
-          placeholder: '请选择',
+            widget: 'select',
-          allowClear: true,
+            placeholder: '请选择',
-          asyncData: () => this.service2.getNetworkFreightForwarder(),
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+            allowClear: true,
+            asyncData: () => this.service.getNetworkFreightForwarderHistory(this.data),
+          },
         },
       },
       required: ['enterpriseInfoName']

src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html

@@ -1,13 +1,15 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-15 13:17:42
- * @LastEditTime: 2021-12-29 15:12:09
+ * @LastEditTime: 2021-12-30 11:11: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\order-management\modal\vehicle\update-freight\update-freight.component.html
 -->
 <nz-alert nzType="info" [nzMessage]="'已选择' + data?.ids?.length + '已选择条订单'" nzShowIcon></nz-alert>
-<sf style="margin-top: 15px;" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
+<sf style="margin-top: 15px;" #sf mode="edit" [schema]="schema" [ui]="ui" >
+  <button class="but_rigth" nz-button nzSize="large" nzType="primary" (click)="search(sf.value)">搜索</button>
+</sf>
 <div class="modal-footer">
   <button nz-button type="button" (click)="close()">关闭</button>
   <button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="sf.valid">确定</button>

src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2021-12-29 20:07:40
+ * @LastEditTime: 2021-12-30 11:13:09
  * @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\order-management\modal\bulk\update-freight\update-freight.component.ts
@@ -13,7 +13,7 @@ import {
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalRef } from 'ng-zorro-antd/modal';
 import { OrderManagementService } from '../../../services/order-management.service';
-import { ShipperBaseService } from '../../../../../shared/services/business/shipper-base.service';
+import { ShipperBaseService } from '@shared';
 
 @Component({
   selector: 'app-order-management-vehicle-modify-captain',
@@ -34,9 +34,9 @@ export class VehicleModifyCaptainComponent implements OnInit {
 
   ngOnInit(): void {
     console.log(this.data)
-    this.initSF(this.data);
+    this.initSF();
   }
-  initSF(data: any) {
+  initSF() {
     this.schema = {
       enterpriseInfoName: {
         type: 'string',
@@ -77,5 +77,7 @@ export class VehicleModifyCaptainComponent implements OnInit {
   close(): void {
     this.modal.destroy();
   }
-
+  search(value: any) {
+    console.log(value)
+  }
 }

src/app/routes/order-management/services/order-management.service.ts

@@ -1,12 +1,13 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-24 14:43:00
+ * @LastEditTime: 2021-12-29 20:44:48
  * @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\order-management\services\order-management.service.ts
  */
 import { Injectable, Injector } from '@angular/core';
+import { map } from 'rxjs/operators';
 import { BaseService } from 'src/app/shared/services';
 
 @Injectable({
@@ -14,6 +15,7 @@ import { BaseService } from 'src/app/shared/services';
 })
 export class OrderManagementService extends BaseService {
 
+  $api_get_getEnterpriseNetTransHis = `/api/mdc/enterpriseNetTransHis/getEnterpriseNetTransHis`;
   $api_get_catalogue_member = `/user?_allow_anonymous=true`;
   $api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/listBulkPage`;
   // 据 手机号/姓名 查询 车队长/司机
@@ -99,6 +101,29 @@ export class OrderManagementService extends BaseService {
   $api_set_getWholeOrderDetail = `/api/sdc/billOperate/getWholeOrderDetail`;
      // 修改--大宗订单详情
   $api_set_getBulkOrderDetail = `/api/sdc/billOperate/getBulkOrderDetail`;
+
+
+
+
+
+    /**
+   * 根据企业ID，获取企业历史网络货运人
+   * @returns
+   */
+     getNetworkFreightForwarderHistory(params: any) {
+      return this.request(this.$api_get_getEnterpriseNetTransHis, params).pipe(
+        map((res: any) => {
+          if (!res) {
+            return [];
+          }
+          const list = res.map((item: any) => ({
+            label: item.enterpriseName,
+            value: item.id
+          }));
+          return [{ value: '', label: '全部' }, ...list];
+        })
+      );
+    }
   constructor(public injector: Injector) {
     super(injector)
   }

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

@@ -52,6 +52,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
   endInfo: any = [];
   PageStatus = '';
   dataList: any;
+  enterpriseProjectIds: any;
   constructor(
     private http: _HttpClient,
     fb: FormBuilder,
@@ -140,9 +141,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
             change: (q: any) => {
               this.getRegionCode(q);
             },
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
           } as SFSelectWidgetSchema
         },
         enterpriseProjectId: {
@@ -151,7 +149,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            allowClear: true
           } as SFSelectWidgetSchema
         },
         enterpriseInfoName: {
@@ -349,6 +346,12 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       .subscribe(res => {
         this.sf1.getProperty('/enterpriseProjectId')!.schema.enum = res;
         this.sf1.getProperty('/enterpriseProjectId')!.widget.reset(res);
+        console.log('12345645454545454=============')
+        console.log(this.enterpriseProjectIds)
+        console.log(res)
+        if(this.enterpriseProjectIds) {
+          this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
+        }
       });
   }
   initSF5() {
@@ -800,9 +803,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
         }
       });
     }
-   
+    if(res?.enterpriseProjectId) {
+      this.enterpriseProjectIds = res.enterpriseProjectId
+    }
     this.sf1data = {
-      // enterpriseProjectId: res?.enterpriseProjectId,
       enterpriseInfoName: res?.enterpriseInfoName,
       externalResourceCode: res?.externalResourceCode,
       dispatchId: res?.dispatchId

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

@@ -1,3 +1,11 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-12-27 14:08:49
+ * @LastEditTime: 2021-12-30 14:15:22
+ * @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\ticket-management\components\cancellation-invoice\cancellation-invoice.component.html
+-->
 <page-header-wrapper [title]="'销票处理'">
 </page-header-wrapper>
 
@@ -42,13 +50,16 @@
     </ng-template>
 
 
-    <st #st [data]="service.$mock_url" [columns]="columns"
+    <st #st [data]="service.$api_ficoVatinvHList" [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' },  process: beforeReq }"
         [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" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
-        <ng-template st-row="no" let-item let-index="index" let-column="column">
+        <ng-template st-row="vatinvcode" let-item let-index="index" let-column="column">
-            {{ item.no }} <br> <label class="text-primary">待受理</label>
+            {{ item.vatinvcode }} <br> 
+            <label class="text-primary" *ngIf="item.sts == '1'">待处理</label>
+            <label class="text-primary" *ngIf="item.sts == '2'">待确认</label>
+            <label class="text-primary" *ngIf="item.sts == '3'">已确认</label>
         </ng-template>
         <ng-template st-row="description" let-item let-index="index" let-column="column">
             起运地: 广东省深圳市南山区 <br>

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

@@ -186,16 +186,16 @@ export class CancellationInvoiceComponent implements OnInit {
             }
           }
         },
-        or2derSn: {
+        // or2derSn: {
-          type: 'string',
+        //   type: 'string',
-          title: '订单号',
+        //   title: '订单号',
-          ui: {
+        //   ui: {
-            placeholder: '请输入',
+        //     placeholder: '请输入',
-            visibleIf: {
+        //     visibleIf: {
-              expand: (value: boolean) => value
+        //       expand: (value: boolean) => value
-            }
+        //     }
-          }
+        //   }
-        },
+        // },
         createTime: {
           title: '申请时间',
           type: 'string',
@@ -215,20 +215,20 @@ export class CancellationInvoiceComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox' },
-      { title: '分票编号', render: 'no', width: 150 },
+      { title: '分票编号', render: 'vatinvcode', width: 150 },
       { title: '申请编号', index: 'callNo', width: 120 },
-      { title: '申请时间', index: 'updatedAt', type: 'date', width: 150 },
+      { title: '申请时间', index: 'createTime', type: 'date', width: 150 },
-      { title: '网络货运人', index: 'callNo', width: 120 },
+      { title: '网络货运人', index: 'ltdName', width: 120 },
-      { title: '购买方', index: 'callNo', width: 90 },
+      { title: '购买人', index: 'artoName', width: 90 },
-      { title: '订单数', index: 'callNo', width: 90 },
+      { title: '订单数', index: 'ordlines', width: 90 },
-      { title: '价税合计', index: 'callNo', width: 90 },
+      { title: '价税合计', index: 'disvatmoney', width: 90 },
-      { title: '金额', index: 'callNo', width: 100 },
+      { title: '金额', index: 'vatnotax', width: 100 },
-      { title: '税率', index: 'callNo', width: 90 },
+      { title: '税率', index: 'billvatrate', width: 90 },
-      { title: '税额', index: 'callNo', width: 90 },
+      { title: '税额', index: 'disvattax', width: 90 },
-      { title: '服务名称', index: 'callNo', width: 100 },
+      { title: '服务名称', index: 'vatname', width: 100 },
-      { title: '销货清单', index: 'callNo', width: 90 },
+      { title: '销货清单', index: 'isdetail', width: 90 },
-      { title: '票面备注', render: 'description', width: 250 },
+      { title: '票面备注', render: 'vatremarks', width: 250 },
-      { title: '其他要求', index: 'callNo', width: 100 },
+      { title: '其他要求', index: 'otherremarks', width: 100 },
       {
         title: '操作',
         width: 150,

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

@@ -26,7 +26,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
   totalCallNo = 0;
   _$expand = false;
 
-  vatappHId = null;
+  id = null;
   headerInfo: any = {};
   constructor(
     public service: TicketService,
@@ -34,7 +34,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
     private route: ActivatedRoute,
     private router: Router
   ) {
-    this.vatappHId = route.snapshot.params.id;
+    this.id = route.snapshot.params.id;
     this.loadHeadInfo();
   }
 
@@ -43,7 +43,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
   }
 
   loadHeadInfo() {
-    this.service.request(this.service.$api_get_invoice_requested_header_detail, { vatappHId: this.vatappHId }).subscribe(res => {
+    this.service.request(this.service.$api_get_invoice_requested_header_detail, { id: this.id }).subscribe(res => {
       console.log(res);
       if (res) {
         this.headerInfo = res;

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

@@ -359,7 +359,7 @@ export class InvoiceRequestedComponent implements OnInit {
     console.log(item)
     this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id,
     {
-      queryParams: { vatappHId : item?.id }
+      queryParams: { id : item?.id }
     }
   ])
   }

src/app/routes/ticket-management/services/ticket.service.ts

@@ -1,8 +1,8 @@
 /*
  * @Author: your name
  * @Date: 2021-12-29 13:12:35
- * @LastEditTime: 2021-12-29 15:44:27
+ * @LastEditTime: 2021-12-30 13:57:19
- * @LastEditors: your name
+ * @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\ticket-management\services\ticket.service.ts
  */
@@ -23,6 +23,8 @@ export class TicketService extends ShipperBaseService {
   $api_get_invoice_requested_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatapp';
   // 删除开票申请订单明细
   $api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch';
+  // 删除开票申请订单明细
+  $api_ficoVatinvHList = '/api/fcc/ficoVatinvH/ficoVatinvHList';
 
   // 已开发票查询
   $api_get_invoice_page = '/api/fcc/ficoVatinvH/list/page';

src/app/shared/services/business/shipper-base.service.ts

@@ -1,3 +1,11 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-29 17:20:03
+ * @LastEditTime: 2021-12-29 20:43:13
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\shared\services\business\shipper-base.service.ts
+ */
 import { Injectable, Injector } from '@angular/core';
 import { BaseService } from '../core/base.service';
 import { map } from 'rxjs/operators';
@@ -89,4 +97,5 @@ export class ShipperBaseService extends BaseService {
       })
     );
   }
+
 }