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

src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html

@@ -59,4 +59,17 @@
     <nz-tag [nzColor]="'#2db7f5'" class="ml-md">已签收</nz-tag>
   </p>
   <app-logistics-time-line [data]="routesInfo?.routes"></app-logistics-time-line>
+</ng-template>
+
+<ng-template #requestedModal>
+  <div nz-row nzGutter="8">
+      <div nz-col nzSpan="24" se-container [labelWidth]="100">
+          <se [col]="1" label="快递公司" required>
+              <input nz-input [(ngModel)]="openInfo.expresscompany" placeholder="请输入" />
+          </se>
+          <se [col]="1" label="快递单号" required>
+              <input nz-input [(ngModel)]="openInfo.expressno" placeholder="请输入" />
+          </se>
+      </div>
+  </div>
 </ng-template>

src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts

@@ -30,6 +30,10 @@ export class InvoicedListComponent implements OnInit {
     mailNo: '',
     routes: []
   };
+
+  @ViewChild('requestedModal', { static: false })
+  requestedModal!: any;
+  openInfo: any = { expresscompany: null, expressno: null };
   constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
 
   ngOnInit(): void {}
@@ -77,6 +81,42 @@ export class InvoicedListComponent implements OnInit {
     });
   }
 
+  /**
+   * 填写物流/修改物流
+   * @param item
+   */
+  requestedAction(item: any) {
+    this.openInfo = { expresscompany: item.expresscompany || null, expressno: item.expressno || null };
+    const modal = this.nzModalService.create({
+      nzTitle: item.expresscompany ? '修改物流' : '填写物流',
+      nzContent: this.requestedModal,
+      nzOnOk: () => {
+        if (!this.openInfo?.expresscompany || !this.openInfo?.expressno) {
+          this.service.msgSrv.warning('请填快递信息');
+          return false;
+        }
+        const params = {
+          expresscompany: this.openInfo.expresscompany,
+          expressno: this.openInfo.expressno
+        };
+        this.service
+          .request(this.service.$api_update_Express, {
+            id: item.id,
+            ...params
+          })
+          .subscribe(res => {
+            if (res) {
+              this.service.msgSrv.success(item.expresscompany ? '修改成功' : '填写成功');
+              this.st.load(1);
+              modal.destroy();
+            }
+          });
+
+        return false;
+      }
+    });
+  }
+
   invoiceHongChong() {
     if (this.selectedRows?.length <= 0) {
       this.service.msgSrv.warning('请选择发票');
@@ -266,7 +306,7 @@ export class InvoicedListComponent implements OnInit {
         className: 'text-center',
         width: 120,
         buttons: [
-          {type:'divider'},
+          { type: 'divider' },
           {
             text: '查看明细<br>',
             click: item =>
@@ -283,6 +323,16 @@ export class InvoicedListComponent implements OnInit {
             text: '查看物流<br>',
             click: item => this.showlogosticsLogs(item),
             iif: item => item.expresscompany
+          },
+          {
+            text: '填写物流<br>',
+            click: item => this.requestedAction(item),
+            iif: item => !item.expresscompany
+          },
+          {
+            text: '修改物流<br>',
+            click: item => this.requestedAction(item),
+            iif: item => item.expresscompany
           }
         ]
       }

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

@@ -55,6 +55,9 @@ export class TicketService extends ShipperBaseService {
   // 已开发票查询
   $api_get_invoice_page = '/api/fcc/ficoVatinvH/list/page';
 
+  // 更新快递信息
+  $api_update_Express= '/api/fcc/ficoVatinvH/updateExpress';
+
   // 发票作废
   $api_cancel_invoice = '/api/fcc/ficoVatinvH/inpinvHCancel';
   // 获取销项发票抬头