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

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

@@ -172,6 +172,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
   查看评价： 3
   */
   handleCancel(type: string) {
+    if(!this.sfView.valid) {
+      this.service.msgSrv.error('请填写处理结果！')
+      return
+    }
     const paramsa = {
       ...this.sfView.value,
       handleStatus: 0,
@@ -193,6 +197,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
     this.isVisibleRE = false
   }
   handleCancel2() {
+    if(!this.sfView.valid) {
+      this.service.msgSrv.error('请填写处理结果！')
+      return
+    }
     const paramsa = {
       id: this.channelId
     }
@@ -212,6 +220,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
   * 审核通过按钮
   */
   handleOK() {
+    if(!this.sfView.valid) {
+      this.service.msgSrv.error('请填写处理结果！')
+      return
+    }
     const paramsa = {
       ...this.sfView.value,
       handleStatus: 1,

src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts

@@ -375,13 +375,13 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
         title: '审核人',
         width: '180px',
         className: 'text-left',
-        index: 'loadingLadingBillFilePath'
+        index: 'complianceName'
       },
       {
         title: '审核时间',
         width: '180px',
         className: 'text-left',
-        index: 'loadingLadingBillFilePath'
+        index: 'complianceTime'
       },
       {
         title: '状态',

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

@@ -466,8 +466,26 @@ export class NetworkFreightComponent implements OnInit {
         }
       });
     }
+    if(this.NCStatus) {
+      this.getNcSetData()
+    }
     this.isVisibleTicket = true;
   }
+  getNcSetData() {
+    const List: any = [];
+    console.log(99999);
+    this.service.request(this.service.$api_get_crmCustomer, { id: this.ticketItem.crmCustomerId }).subscribe((res: any) => {
+      console.log(res);
+      if (res) {
+          List.push({ label: res.customerName, value: res.id });
+          console.log(List);
+          
+          this.sfNC.getProperty('/crmCustomerId')!.schema.enum = List;
+          this.sfNC.getProperty('/crmCustomerId')!.widget.reset(List);
+          this.sfNC.setValue('/crmCustomerId', res?.id);
+      }
+    });
+  }
   getProvinceData(value: any) {
     this.service.http.post(this.service.$api_getRegionDetailByCode, { regionCode: value }).subscribe(res => {
       let enterpriseAddressCode: any = [];
@@ -661,10 +679,10 @@ export class NetworkFreightComponent implements OnInit {
       this.NCStatus = false;
       this.taxStatus = false;
     } else if (value.name === 'NC设置'){
+      this.getNcSetData()
       this.NCStatus = true;
       this.TicketStatus = false;
       this.taxStatus = false;
-
     }
   }
   // 新增

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

@@ -45,12 +45,11 @@
     </ng-template>
 
 
-    <st #st [scroll]="{ x: '2000px' }" [data]="service.$api_ficoVatinvHList" [columns]="columns" [page]="{}" 
+    <st #st [scroll]="{ x: '2000px' }" [data]="service.$api_ficoVatinvHList" [columns]="columns" [page]="{}"
-        [req]="{process: beforeReq }" [res]="{process:afterRes }" [loading]="false"
+        [req]="{process: beforeReq }" [res]="{process:afterRes }" [loading]="false" (change)="stChange($event)">
-        (change)="stChange($event)">
         <ng-template st-row="vatinvcode" let-item let-index="index" let-column="column">
             {{ item.vatinvcode }} <br>
-            <label class="text-primary" >{{item.stsLabel}}</label>
+            <label class="text-primary">{{item.stsLabel}}</label>
         </ng-template>
     </st>
 </nz-card>
@@ -58,6 +57,28 @@
 <ng-template #requestedModal>
     <div nz-row nzGutter="8">
         <div nz-col nzSpan="24" se-container [labelWidth]="100">
+            <se [col]="1" label="开票信息" class="mb-sm">
+                <p style="margin: 0;">公司名： {{openInfo?.artoname}}</p>
+                <p style="margin: 0;">税号： {{openInfo?.artotaxno}}</p>
+                <p style="margin: 0;">注册地址： {{openInfo?.artoadd}}</p>
+                <p style="margin: 0;">注册电话： {{openInfo?.artotel}}</p>
+                <p style="margin: 0;">开户行： {{openInfo?.artobank}}</p>
+            </se>
+            <se [col]="1" label="服务名称" class="mb-sm">
+                {{openInfo?.vatname}}
+            </se>
+            <se [col]="1" label="发票备注栏" class="mb-sm">
+                {{openInfo?.vatremarks}}
+            </se>
+            <se [col]="1" label="其它要求" class="mb-sm">
+                {{openInfo?.otherremarks}}
+            </se>
+            <se [col]="1" label="销货清单" class="mb-sm">
+                {{openInfo?.isdetail?'需要':'不需要'}}
+            </se>
+            <se [col]="1" label="开票金额" class="mb-sm">
+                {{openInfo?.vatnotax | currency}}
+            </se>
             <se [col]="1" label="开票日期" required>
                 <nz-date-picker [(ngModel)]="openInfo.invoicedate" nzPlaceHolder="请选择" style=" width: 100%;">
                 </nz-date-picker>

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

@@ -79,34 +79,40 @@ export class CancellationInvoiceComponent implements OnInit {
    */
   requestedAction(item: any) {
     this.openInfo = { invoicedate: null, invoiceno: null, invoiceno2: null };
-    const modal = this.nzModalService.create({
+    this.service.request(this.service.$api_get_apply_fico_info, { id: item.vatappHId }).subscribe(info => {
-      nzTitle: '发票确认',
+      if (info) {
-      nzContent: this.requestedModal,
+        console.log(info);
-      nzOnOk: () => {
+        Object.assign(this.openInfo, { ...info });
-        if (!this.openInfo?.invoicedate || !this.openInfo?.invoiceno) {
+        const modal = this.nzModalService.create({
-          this.service.msgSrv.warning('请填开票信息');
+          nzTitle: '发票确认',
-          return false;
+          nzContent: this.requestedModal,
-        }
+          nzOnOk: () => {
-        const params = {
+            if (!this.openInfo?.invoicedate || !this.openInfo?.invoiceno) {
-          invoiceno: this.openInfo.invoiceno,
+              this.service.msgSrv.warning('请填开票信息');
-          invoicedate: dateTimePickerUtil.format(this.openInfo.invoicedate),
+              return false;
-          invoiceno2: this.openInfo.invoiceno2
-        };
-        this.service
-          .request(this.service.$api_apply_fico_invoic, {
-            id: item.id,
-            vatinvcode: item.vatinvcode,
-            ...params
-          })
-          .subscribe(res => {
-            if (res) {
-              this.service.msgSrv.success('开票成功');
-              this.st.load(1);
-              modal.destroy();
             }
-          });
+            const params = {
+              invoiceno: this.openInfo.invoiceno,
+              invoicedate: dateTimePickerUtil.format(this.openInfo.invoicedate),
+              invoiceno2: this.openInfo.invoiceno2
+            };
+            this.service
+              .request(this.service.$api_apply_fico_invoic, {
+                id: item.id,
+                vatinvcode: item.vatinvcode,
+                ...params
+              })
+              .subscribe(res => {
+                if (res) {
+                  this.service.msgSrv.success('开票成功');
+                  this.st.load(1);
+                  modal.destroy();
+                }
+              });
 
-        return false;
+            return false;
+          }
+        });
       }
     });
   }

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

@@ -45,7 +45,7 @@
         <strong class="text-red">{{ totalCallNo }}</strong>
         <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
       </div>
-      <button nz-button *ngIf="resourceStatus==='1' || !resourceStatus" (click)="this.batchRequested()">开票</button>
+      <button nz-button *ngIf="resourceStatus==='1' || !resourceStatus" (click)="this.batchRequested()">开票审核</button>
       <!-- <button nz-button (click)="this.rejectAction(selectedRows)">驳回</button>
             <button nz-button (click)="changePice(selectedRows)">修改地址</button>-->
       <button nz-button *ngIf="resourceStatus==='3' || !resourceStatus" (click)="printOrder(selectedRows)">打印面单</button>

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

@@ -32,5 +32,5 @@
 <div class="modal-footer text-center">
   <button nz-button type="button">移除</button>
   <button nz-button type="button" (click)="saveManage()">手工处理</button>
-  <button nz-button type="submit" nzType="primary" [nzLoading]="false" (click)="saveManage()">自动开票</button>
+  <!-- <button nz-button type="submit" nzType="primary" [nzLoading]="false" (click)="saveManage()">自动开票</button> -->
 </div>

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

@@ -7,6 +7,7 @@
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\requested-invoice-modal\\requested-invoice-modal.component.ts
  */
 import { Component, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
 import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
 import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
 
@@ -23,7 +24,7 @@ export class RequestedInvoiceModalComponent {
   columns: STColumn[] = this.initST();
   id: any;
   selectedRows: any[] = [];
-  constructor(public service: TicketService, private nzModalService: NzModalService, private modal: NzModalRef) {}
+  constructor(public service: TicketService, private nzModalService: NzModalService, private modal: NzModalRef, private router: Router) {}
 
   beforeReq = (requestOptions: STRequestOptions) => {
     Object.assign(requestOptions.body, { vatappHId: this.id });
@@ -127,8 +128,17 @@ export class RequestedInvoiceModalComponent {
     };
     this.service.request(this.service.$api_get_applyFicoVatinv, params).subscribe((res: any) => {
       if (res) {
-        this.service.msgSrv.success('开票成功');
+        this.nzModalService.confirm({
-        this.modal.destroy(true);
+          nzTitle: '是否进入销票处理页面完成开票',
+          nzOnOk: () => {
+            this.service.msgSrv.success('开票成功');
+            this.modal.destroy(true);
+            this.router.navigate(['/ticket/cancellation-invoice']);
+          },
+          nzOnCancel: () => {
+            this.modal.destroy(true);
+          }
+        });
       }
     });
   }

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

@@ -32,6 +32,8 @@ export class TicketService extends ShipperBaseService {
   $api_ficoVatinv_Detail = '/api/fcc/ficoVatinvL/getDetailByVatinvHId';
   // 运营端订单明细开票处理
   $api_apply_fico = '/api/fcc/ficoVatinvH/crmPushInvo';
+  // 手工开票获取开票申请信息展示
+  $api_get_apply_fico_info = '/api/fcc/ficoVatappH/get';
   // 运营端手工开票/确认/E税云开票成功后的回调
   $api_apply_fico_invoic = '/api/fcc/ficoVatinvH/operateAffirmVatinv';
   // 运营端推送开票-E税云开票

src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-24 15:38:08
- * @LastEditTime : 2022-02-23 15:43:24
+ * @LastEditTime : 2022-03-24 15:19:49
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\abnormal-appear\\abnormal-appear.component.html
@@ -43,7 +43,7 @@
 
 <nz-card class="content-box">
   <nz-tabset [(nzSelectedIndex)]="selectedIndex">
-    <nz-tab nzTitle="待回复">
+    <nz-tab [nzTitle]="'待回复(' + tabs?.stayQuantity + ')'">
       <st
         #st
         [data]="service.$api_get_listOperatePage"
@@ -69,10 +69,10 @@
         </ng-template>
       </st>
     </nz-tab>
-    <nz-tab nzTitle="已回复">
+    <nz-tab  [nzTitle]="'已回复(' + tabs?.receivedQuantity + ')'">
       <st
         #st2
-        [data]="service.$api_get_listOperateReplyPage"
+        [data]="service.$api_get_listOperatePage"
         [columns]="columns2"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"

src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts

@@ -37,6 +37,10 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
   edit = false;
   editId = false;
   selectedIndex = 0;
+  tabs = {
+    stayQuantity: 0,
+    receivedQuantity: 0
+  };
 
   columns: STColumn[] = [
     { title: '异常编号', index: 'exceptionCode', width: '180px', className: 'text-left' },
@@ -68,12 +72,14 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
 
   get reqParams() {
     return {
-      ...this.sf?.value
+      ...this.sf?.value,
+      replyStatus: 0
     };
   }
   get reqParams2() {
     return {
-      ...this.sf?.value
+      ...this.sf?.value,
+      replyStatus: 1
     };
   }
 
@@ -81,6 +87,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
 
   ngOnInit(): void {
     this.initSF();
+    this.getGoodsSourceStatistical();
   }
 
   /**
@@ -205,14 +212,31 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
     };
     this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
   }
-
+  getGoodsSourceStatistical() {
+    this.tabs = {
+      stayQuantity: 0,
+      receivedQuantity: 0
+    };
+    const params: any = Object.assign({}, this.reqParams || {});
+    this.service.request(this.service.$api_get_listOperateStatus, params).subscribe(res => {
+      if (res) {
+        res.forEach((element: any) => {
+          if (element.replyStatus === '1') {
+            this.tabs.receivedQuantity = element.quantity;
+          } else if (element.replyStatus === '0') {
+            this.tabs.stayQuantity = element.quantity;
+          }
+        });
+      }
+    });
+  }
   search() {
-    console.log(this.selectedIndex);
     if (this.selectedIndex === 0) {
       this.st?.load(1);
     } else {
       this.st2?.load(1);
     }
+    this.getGoodsSourceStatistical();
   }
   /**
    * 重置表单

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime : 2022-03-21 14:53:06
+ * @LastEditTime : 2022-03-24 17:32:49
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html
@@ -77,8 +77,8 @@
         <div> {{ item?.payeeName }}/{{ item?.payeePhone }} </div>
       </ng-template>
       <ng-template st-row="billExpenseDetailVOList2" let-item let-index="index">
-        <div *ngIf="item?.billExpenseDetailVOList?.length > 0">
+        <div *ngIf="item?.mybidInfo?.length > 0">
-          <p *ngFor="let data of item?.billExpenseDetailVOList"> {{ data?.costName }}：{{ data?.price | currency }} </p>
+          <p *ngFor="let data of item?.mybidInfo"> {{ data?.expenseName }}：{{ data?.price | currency }} </p>
         </div>
       </ng-template>
       <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">

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

@@ -2,7 +2,7 @@ import { WaybillManagementBulkComponent } from './../components/bulk/bulk.compon
 /*
  * @Author: your name
  * @Date: 2021-12-07 14:52:29
- * @LastEditTime : 2022-03-11 17:26:20
+ * @LastEditTime : 2022-03-24 15:17:57
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\services\\waybill-management.service.ts
@@ -49,10 +49,12 @@ export class WaybillManagementServe extends BaseService {
   // 查询CRM客户信息表
   $api_get_crmCustomer_page = '/api/mdc/cuc/crmCustomer/list/page';
 
-  // 查询运营端未回复异常上报
+  // 查询运营端异常上报
-  $api_get_listOperatePage = '/api/sdc/exceptionReport/listOperateUnReplyPage';
+  $api_get_listOperatePage = '/api/sdc/exceptionReport/listOperatePage';
-  // 查询运营端已回复异常上报
+  // 查询运营端异常上报数据统计
-  $api_get_listOperateReplyPage = '/api/sdc/exceptionReport/listOperateReplyPage';
+  $api_get_listOperateStatus = '/api/sdc/exceptionReport/listOperateStatus';
+  // // 查询运营端已回复异常上报
+  // $api_get_listOperateReplyPage = '/api/sdc/exceptionReport/listOperateReplyPage';
  // 获取轨迹
  $api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`;
  //  获取订单司机轨迹