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

src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html

@@ -1,4 +1,4 @@
-<page-header-wrapper [title]="'开票订单明细'" [logo]="logo">
+<page-header-wrapper [title]="'司机账户明细'" [logo]="logo">
     <ng-template #logo>
         <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
             <i nz-icon nzType="left" nzTheme="outline"></i>

src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts

@@ -133,7 +133,7 @@ export class DriverAccountDetailComponent implements OnInit {
             nzShowTime: true
           } as SFDateWidgetSchema
         },
-        transactionNumber: {
+        channelPaySn: {
           type: 'string',
           title: '流水号',
           ui: {
@@ -142,7 +142,7 @@ export class DriverAccountDetailComponent implements OnInit {
         },
         businessNumber: {
           type: 'string',
-          title: '关联单号',
+          title: '交易单号',
           ui: {
             placeholder: '请输入'
           }

src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html

@@ -1,4 +1,14 @@
-<page-header-wrapper [title]="'开票订单明细'" [logo]="logo">
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-06 10:57:56
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-21 09:45:41
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\freight-account\\freight-account-detail\\freight-account-detail.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<page-header-wrapper [title]="'货主账号明细'" [logo]="logo">
     <ng-template #logo>
         <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
             <i nz-icon nzType="left" nzTheme="outline"></i>

src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts

@@ -153,34 +153,45 @@ export class FreightAccountDetailComponent implements OnInit {
             placeholder: '请输入'
           }
         },
+        // tradeType: {
+        //   type: 'string',
+        //   title: '交易类型',
+        //   enum: [
+        //     { label: '全部', value: '' },
+        //     { label: '整车订单退款', value: '1' },
+        //     { label: '整车订单支付', value: '2' },
+        //     { label: '提现失败退回', value: '3' },
+        //     { label: '提现', value: '4' },
+        //     { label: '充值', value: '5' },
+        //     { label: '运货订单结算F', value: '5' }
+        //   ],
+        //   ui: {
+        //     widget: 'select',
+        //     placeholder: '请选择',
+        //     visibleIf: {
+        //       expand: (value: boolean) => value
+        //     }
+        //   },
+        //   default: ''
+        // },
         tradeType: {
           type: 'string',
           title: '交易类型',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '整车订单退款', value: '1' },
-            { label: '整车订单支付', value: '2' },
-            { label: '提现失败退回', value: '3' },
-            { label: '提现', value: '4' },
-            { label: '充值', value: '5' },
-            { label: '运货订单结算F', value: '5' }
-          ],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
-            placeholder: '请选择',
+            params: { dictKey: 'trade:type' },
             visibleIf: {
               expand: (value: boolean) => value
-            }
             },
-          default: ''
+          } as SFSelectWidgetSchema
         },
         incomeType: {
           type: 'string',
           title: '收支类型',
           enum: [
             { label: '全部', value: '' },
-            { label: '收入', value: '1' },
+            { label: '收入', value: '2' },
-            { label: '支出', value: '2' }
+            { label: '支出', value: '1' }
           ],
           ui: {
             widget: 'select',
@@ -191,19 +202,29 @@ export class FreightAccountDetailComponent implements OnInit {
           },
           default: ''
         },
-        projectId: {
+        projectName: {
-          title: '所属项目',
           type: 'string',
-          default: '',
+          title: '所属项目',
           ui: {
-            widget: 'select',
+            placeholder: '请输入',
             visibleIf: {
               expand: (value: boolean) => value
-            },
-            asyncData: () => this.service.getEnterpriseProject()
-          } as SFSelectWidgetSchema
             }
           }
+        }
+        // projectId: {
+        //   title: '所属项目',
+        //   type: 'string',
+        //   default: '',
+        //   ui: {
+        //     widget: 'select',
+        //     visibleIf: {
+        //       expand: (value: boolean) => value
+        //     },
+        //     asyncData: () => this.service.getEnterpriseProject()
+        //   } as SFSelectWidgetSchema
+        // }
+      }
     };
   }
 
@@ -212,6 +233,7 @@ export class FreightAccountDetailComponent implements OnInit {
       { title: '交易时间', index: 'createTime', type: 'date', width: 170 },
       { title: '流水号', index: 'transactionNumber', width: 170 },
       { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 140 },
+      { title: '收支类型', index: 'tradeTypeLabel', className: 'text-center', width: 140 },
       { title: '交易单号', index: 'businessNumber', width: 170 },
       { title: '订单号', index: 'orderSn', width: 170 },
       { title: '运单号', index: 'transportSn', width: 170 },

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-05 20:15:41
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:17:19
+ * @LastEditTime : 2022-04-21 10:15:49
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\withdrawals-record\\withdrawals-detail\\withdrawals-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -16,7 +16,7 @@
     </ng-template>
 </page-header-wrapper>
 
-<nz-card [nzLoading]="service.http.loading">
+<nz-card >
     <nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
     <div se-container [labelWidth]="130">
         <se label="网络货运人">

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

@@ -140,39 +140,41 @@ export class WithdrawalsDetailComponent implements OnInit {
             hidden: true
           }
         },
-        billHCode: {
+        orderPaymentCode: {
           type: 'string',
           title: '支付编号',
           ui: {
             placeholder: '请输入'
           }
         },
-        billHCod1e: {
+        billCode: {
           type: 'string',
           title: '订单号',
           ui: {
             placeholder: '请输入'
           }
         },
-        billHCo1de: {
+        resourceCode: {
           type: 'string',
           title: '货源编号',
           ui: {
             placeholder: '请输入'
           }
         },
-        billHC1ode: {
+        serviceType: {
           type: 'string',
           title: '服务类型',
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'service:type' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
           },
-        billHCo11de: {
+          default: ''
+        },
+        driverName: {
           type: 'string',
           title: '承运司机',
           ui: {
@@ -182,7 +184,7 @@ export class WithdrawalsDetailComponent implements OnInit {
             }
           }
         },
-        billHCo111de: {
+        driverLicensePlate: {
           type: 'string',
           title: '车牌号',
           ui: {
@@ -192,7 +194,7 @@ export class WithdrawalsDetailComponent implements OnInit {
             }
           }
         },
-        billHC1o11de: {
+        captain: {
           type: 'string',
           title: '收款人',
           ui: {
@@ -202,9 +204,14 @@ export class WithdrawalsDetailComponent implements OnInit {
             }
           }
         },
-        billHC1o111de: {
+        isCaptain: {
           type: 'string',
           title: '车队长收款',
+          enum: [
+            {label: '全部', value: ''},
+            {label: '是', value: '1'},
+            {label: '否', value: '2'}
+          ],
           ui: {
             widget: 'select',
             placeholder: '请选择',

src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-15 13:17:42
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-01 15:48:01
+ * @LastEditTime : 2022-04-21 13:29:36
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\audit\\voucher-view\\voucher-view.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->

src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts

@@ -29,7 +29,6 @@ import format from 'date-fns/format';
   providers: [DatePipe]
 })
 export class orderManagementVoucherViewComponent implements OnInit {
-  record: any = {};
   i: any;
   loadPDF: string = '';
   formData: any;
@@ -45,7 +44,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
   constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService, private datePipe: DatePipe, private envSrv: EAEnvironmentService,) { }
 
   ngOnInit(): void {
-    // console.log(this.i)
+    console.log(this.i)
     this.initData()
     this.i.time = this.i.loadingTime;
     this.initSF();
@@ -72,8 +71,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.loadingAddressArr[0]}`,
+                  `上传位置:${this.i?.loadingAddressArr[0]}`,
                   `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
                 ],
                 position: '2',
@@ -117,8 +116,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.loadingAddressArr[0]}`,
+                  `上传位置:${this.i?.loadingAddressArr[0]}`,
                   `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
                 ],
                 position: '2',
@@ -170,8 +169,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.unloadingAddressArr[0]}`,
+                  `上传位置:${this.i?.unloadingAddressArr[0]}`,
                   `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
                 ],
                 position: '2',
@@ -215,8 +214,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.unloadingAddressArr[0]}`,
+                  `上传位置:${this.i?.unloadingAddressArr[0]}`,
                   `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
                 ],
                 position: '2',
@@ -274,8 +273,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.loadingAddressArr[0]}`,
+                  `上传位置:${this.i?.loadingAddressArr[0]}`,
                   `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
                 ],
                 position: '2',
@@ -320,8 +319,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.loadingAddressArr[0]}`,
+                  `上传位置:${this.i?.loadingAddressArr[0]}`,
                   `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
                 ],
                 position: '2',
@@ -382,8 +381,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.unloadingAddressArr[0]}`,
+                  `上传位置:${this.i?.unloadingAddressArr[0]}`,
                   `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
                 ],
                 position: '2',
@@ -428,8 +427,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.unloadingAddressArr[0]}`,
+                  `上传位置:${this.i?.unloadingAddressArr[0]}`,
                   `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
                 ],
                 position: '2',
@@ -560,7 +559,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
     this.modal.destroy(true);
   }
   openlaod(value: any) {
+   
     if (value === 1) {
+      if(this.datas?.esignFlowStatus == '1') {
+        this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe((res) => {
+          console.log(res);
+        })
+      }
       const a = document.createElement('a');
       a.href = this.datas?.loadingElectronicsLadingBillFilePath;
       document.body.appendChild(a);
@@ -568,6 +573,11 @@ export class orderManagementVoucherViewComponent implements OnInit {
       a.click(); //点击下载
       document.body.removeChild(a); //下载完成移除元素
     } else {
+      if(this.datas?.esignFlowStatus == '1') {
+        this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe((res) => {
+          console.log(res);
+        })
+      }
       const a = document.createElement('a');
       a.href = this.datas?.unloadingElectronicsLadingBillFilePath;
       document.body.appendChild(a);

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

@@ -208,6 +208,12 @@ export class OrderManagementService extends ShipperBaseService {
   public $api_get_log_list = `/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList`;
   // 查看补充协议
   public $api_getSupplementaryAgreement = `/api/sdc/billShipper/getSupplementaryAgreement`;
+
+
+  // 获取电子提货单签章附件
+  public $api_getBillTakeEsignFile = `/api/sdc/billOperate/getBillTakeEsignFile`;
+  // 获取电子卸货单签章附件
+  public $api_getBillDischargeEsignFile = `/api/sdc/billOperate/getBillDischargeEsignFile`;
   /**
    * 根据企业ID，获取企业历史网络货运人
    * @returns

src/app/routes/sys-setting/components/role-management/edit/edit.component.ts

@@ -64,6 +64,7 @@ export class SettingRoleEditComponent implements OnInit {
     const params = {
       id: this.params.id
     };
+console.log(this.params.infoUrl)
     this.service.request(this.params.infoUrl, params).subscribe(res => {
       if (res) {
         this.roleInfoData = res;

src/app/routes/sys-setting/components/role-management/menu/menu.component.ts

@@ -57,10 +57,15 @@ export class SettingMenuComponent implements OnInit, OnChanges {
       });
   }
   addAuthority(origin: { id: any; all: any }, node: { buttonInfoList: any[] }, item?: { checked: any; functionButtonId: any }) {
+    console.log(origin,node);
+    
     if (this.authority?.length && this.authority.filter(authItem => authItem.authorityId === origin.id).length) {
       // 判断此菜单权限是否已经存在权限列表中
       // 当前操作菜单id存在权限列表里
       this.authority.forEach(menuItem => {
+        console.log(menuItem);
+        console.log(item);
+        
         if (menuItem.authorityId === origin.id) {
           menuItem.buttonAuthorityIds = menuItem.buttonAuthorityIds || []; // 防止属性不存在，给属性指定数据类型
           if (item) {
@@ -312,6 +317,8 @@ export class SettingMenuComponent implements OnInit, OnChanges {
       if (res) {
         origin.buttonInfoList = res;
         origin.all = false;
+        console.log(origin);
+        
         // 判断此菜单下是否已有此按钮权限
         this.againGetBtn(id, origin);
       }

src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts

@@ -77,23 +77,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
     this.schema = {
       properties: {
         _$expand: { type: 'boolean', ui: { hidden: true } },
-        declareStatus: {
-          title: '申报状态',
-          type: 'string',
-          enum: [
-            { value: '', label: '全部' },
-            { value: '0', label: '待申报' },
-            { value: '1', label: '待审核' },
-            { value: '2', label: '已通过' },
-            { value: '3', label: '不通过' }
-          ],
-          ui: {
-            placeholder: '请选择',
-            widget: 'select',
-            containsAllLabel: true
-          },
-          default: ''
-        },
         overdueStatus: {
           title: '是否逾期',
           type: 'string',

src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html

@@ -19,67 +19,32 @@
 </nz-card>
 <nz-card>
   <nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length>0">
-
     <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)">
     </nz-tab>
   </nz-tabset>
   <!-- 数据列表 -->
-  <st #st [scroll]="{x:'1200px'}" [data]="service.$api_getTaxOrderPage_page" [columns]="columns"
+  <st #st [scroll]="{x:'1200px'}" [data]="service.$api_getInvoiceReport_page" [columns]="columns"
     [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, 50, 100] }" [loading]="service.http.loading">
     <ng-template st-row="putStatus" let-item let-index="index">
       <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
-      <span *ngIf="item?.putStatus == '0'">待上传</span>
+      <span *ngIf="item?.uploadSts == '1'">待上传</span>
-      <span *ngIf="item?.putStatus == '1'">已上传</span>
+      <span *ngIf="item?.uploadSts == '3'">已上传</span>
-      <span *ngIf="item?.putStatus == '3'">上传中</span>
+      <span *ngIf="item?.uploadSts == '2'">上传中</span>
-      <span  *ngIf="item?.putStatus == '2'" style="color: red;" (click)="unnormal(item)">上传异常</span>
+      <span  *ngIf="item?.uploadSts == '4'" style="color: red;" (click)="unnormal(item)">上传异常</span>
     </ng-template>
     <ng-template st-row="invoiceNO" let-item let-index="index">
-      <a href="/">{{item.billCode}}</a>
+      <a href="/">{{item.invoiceno}}</a>
     </ng-template>
-    <ng-template st-row="checkStatus" let-item let-index="index">
+    <ng-template st-row="artoname" let-item let-index="index">
-      <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
+      <a href="/">{{item.artoname}}</a>
-      <span *ngIf="item?.checkStatus == '0'">校验中</span>
-      <span *ngIf="item?.checkStatus == '1'">通过</span>
-      <!-- <span  *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="unnormal(item)">不通过</span> -->
-      <span  *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="viewResult(item)">不通过</span>
-
     </ng-template>
-    <ng-template st-row="driverName" let-item let-index="index">
+    <ng-template st-row="billHCode" let-item let-index="index">
-      <div> {{ item?.driverName }}{{  item?.driverPhone ? "/" + item?.driverPhone : '' }} </div>
+      <a href="/">{{item.billHCode}}</a>
     </ng-template>
-    <!-- <ng-template st-row="localValid" let-item let-index="index">
+    <ng-template st-row="invoiceType" let-item let-index="index">
-      <a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
+      <span>增值税专用发票</span>
-      <span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
-    </ng-template> -->
-    <ng-template st-row="loadingPicture" let-item let-index="index">
-      <div class="imgBox">
-        <div *ngIf="item.loadingPicture">
-          <app-imagelist style="width: 60px" [imgList]="[item.loadingPicture]"> </app-imagelist>
-        </div>
-      </div>
-    </ng-template>
-    <ng-template st-row="unloadPicture" let-item let-index="index">
-      <div class="imgBox">
-        <div *ngIf="item.unloadPicture">
-          <app-imagelist style="width: 40px" [imgList]="[item.unloadPicture]"> </app-imagelist>
-        </div>
-      </div>
-    </ng-template>
-    <ng-template st-row="loadingLadingBill" let-item let-index="index">
-      <div class="imgBox">
-        <div *ngIf="item.loadingLadingBill">
-          <app-imagelist style="width: 40px" [imgList]="[item.loadingLadingBill]"> </app-imagelist>
-        </div>
-      </div>
-    </ng-template>
-    <ng-template st-row="signatureForm" let-item let-index="index">
-      <div class="imgBox">
-        <div *ngIf="item.signatureForm">
-          <app-imagelist style="width: 40px" [imgList]="[item.signatureForm]"> </app-imagelist>
-        </div>
-      </div>
     </ng-template>
     <ng-template st-row="orderAmount" let-item let-index="index">
       <div class="text-right">{{item?.orderAmount | currency }}</div>
@@ -92,7 +57,7 @@
       已选择
       <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
     </div>
-    <button *ngIf="selectedIndex === '0' || selectedIndex === '2'" nz-button nzType="primary" (click)="upload()">上传</button>
+    <button *ngIf="selectedIndex === '1' || selectedIndex === '4'" nz-button nzType="primary" (click)="upload()">上传</button>
-    <button *ngIf="selectedIndex === '1' || selectedIndex === '3'" nz-button nzType="primary" (click)="recall()">撤回</button>
+    <button *ngIf="selectedIndex === '2' || selectedIndex === '3'" nz-button nzType="primary" (click)="recall()">撤回</button>
   </div>
 </ng-template>

src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts

@@ -1,16 +1,10 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STComponent, STData } from '@delon/abc/st';
-import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { of } from 'rxjs';
-import { map } from 'rxjs/operators';
 import { TaxManagementService } from '../../services/tax-management.service';
-import { TaxManagementInvoiceUploadSettingComponent } from './upload-setting/upload-setting.component';
-import { TaxManagementInvoiceVerifyResultComponent } from './verify-result/verify-result.component';
-// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
-// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
 
 @Component({
   selector: 'app-tax-management-invoice-reporting',
@@ -27,13 +21,13 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
   tabType!: string;
   isLoading: boolean = false;
   tabs: any[] = [
-    { name: '待上传', value: '0' },
+    { name: '待上传', value: '1' },
-    { name: '上传中', value: '3' },
+    { name: '上传中', value: '2' },
-    { name: '已上传', value: '1' },
+    { name: '已上传', value: '3' },
-    { name: '异常', value: '2' },
+    { name: '异常', value: '4' },
     { name: '全部', value: '' }
   ];
-  selectedIndex = '0'; //选择的项目
+  selectedIndex = ''; //选择的项目
   serviceTel = '';
   constructor(
     public service: TaxManagementService,
@@ -56,9 +50,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
    * 查询参数
    */
   get reqParams() {
-    const params = Object.assign({}, this.sf?.value || {}, {
+    const params = Object.assign({}, this.sf?.value || {});
-      putStatus: this.selectedIndex,
-    });
     delete params._$expand;
     return { ...params };
   }
@@ -101,25 +93,25 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
     this.schema = {
       properties: {
         _$expand: { type: 'boolean', ui: { hidden: true } },
-        putStatus: {
+        // uploadSts: {
-          title: '上传状态',
+        //   title: '上传状态',
-          type: 'string',
+        //   type: 'string',
-          default: 0,
+        //   default: '1',
-          enum: [
+        //   enum: [
-            { label: '全部', value: 0 },
+        //     { label: '全部', value: '' },
-            { label: '待上传', value: 1 },
+        //     { label: '待上传', value: '1'},
-            { label: '上传中', value: 2 },
+        //     { label: '上传中', value: '2' },
-            { label: '已上传', value: 3 },
+        //     { label: '已上传', value: '3' },
-            { label: '异常', value: 4 }
+        //     { label: '异常', value: '4' }
-          ],
+        //   ],
 
-          ui: {
+        //   ui: {
-            placeholder: '请选择',
+        //     placeholder: '请选择',
-            widget: 'select',
+        //     widget: 'select',
-            allowClear: true
+        //     allowClear: true
-          }
+        //   }
-        },
+        // },
-        networkTransporter: {
+        ltdId: {
           type: 'string',
           title: '网络货运人',
           ui: {
@@ -129,7 +121,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
             asyncData: () => this.shipperservice.getNetworkFreightForwarder()
           }
         },
-        hrto: {
+        arto: {
           type: 'string',
           title: '购买方',
           ui: {
@@ -139,14 +131,13 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
             asyncData: () => this.service.getCRMCustomerId()
           }
         },
-        billCode: {
+        billHCode: {
-          title: '订单号', type: 'string', ui: {
+          title: '订单号', type: 'string',
-            placeholder: '请输入', visibleIf: {
+          ui: {
-              _$expand: (value: boolean) => value
+            placeholder: '请输入'
-            }
           }
         },
-        recentlyPutTime: {
+        invoicedate: {
           title: '开票日期',
           type: 'string',
           ui: {
@@ -158,7 +149,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
             },
           } as SFDateWidgetSchema,
         },
-        orderPayTime: {
+        uoloadDate: {
           title: '上传日期',
           type: 'string',
           ui: {
@@ -170,7 +161,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
             },
           } as SFDateWidgetSchema,
         },
-        wayBillCode: {
+        invoiceno: {
           type: 'string',
           title: '发票号码',
           ui: {
@@ -180,7 +171,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
             }
           },
         },
-        wayBillCode1: {
+        invoiceno2: {
           type: 'string',
           title: '发票代码',
           ui: {
@@ -217,31 +208,31 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
   initST() {
     this.columns = [
       { title: '', type: 'checkbox', className: 'text-center', width: '60px', },
-      { title: '上传状态', render: 'putStatus', className: 'text-center', width: '120px', },
+      { title: '上传状态', render: 'uploadSts', className: 'text-center', width: '120px', },
-      { title: '发票类型', render: 'checkStatus', className: 'text-center', width: '120px', },
+      { title: '发票类型', render: 'invoiceType', className: 'text-center', width: '120px', },
       {
         title: '发票号码',
-        index: 'billCode',
+        index: 'invoiceno',
         render: 'invoiceNO',
         className: 'text-center',
         width: '150px',
       },
-      { title: '发票代码', index: 'wayBillCode', className: 'text-center', width: '150px', },
+      { title: '发票代码', index: 'invoiceno2', className: 'text-center', width: '150px', },
       {
         title: '网络货运人',
-        index: 'networkTransporterName',
+        index: 'ltdName',
         className: 'text-center',
         width: '180px',
       },
-      { title: '购买方企业名称', index: 'loadingAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '购买方企业名称', index: 'artoname', render: 'artoname', className: 'text-center', width: '200px' },
-      { title: '购买方统一社会信用代码', index: 'loadingDetailedAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '购买方统一社会信用代码', index: 'artotaxno', className: 'text-center', width: '200px' },
-      { title: '订单号', index: 'unloadAddress', render: 'dischargePlace', className: 'text-center', width: '120px' },
+      { title: '订单号', index: 'billHCode', render: 'billHCode', className: 'text-center', width: '120px' },
-      { title: '货物名称', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' },
+      { title: '货物名称', index: 'goodsinfo', className: 'text-center', width: '180px' },
-      { title: '价税合计', index: 'shipperName', className: 'text-center', width: '180px' },
+      { title: '价税合计', index: 'vatmoney', className: 'text-center', width: '180px' },
-      { title: '开票日期', index: 'shipperProvinceCode', className: 'text-center', width: '180px' },
+      { title: '开票日期', index: 'invoicedate', className: 'text-center', width: '180px' },
-      { title: '发票所属月份', index: 'recordTime', className: 'text-center', width: '250px' },
+      { title: '发票所属月份', index: 'invoicemonth', className: 'text-center', width: '250px' },
-      { title: '发票状态', index: 'wayBillCreateTime', className: 'text-center', width: '200px' },
+      { title: '发票状态', index: 'sts', className: 'text-center', width: '200px' },
-      { title: '上传日期', index: 'loadTime', className: 'text-center', width: '200px' },
+      { title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '200px' },
     ];
   }
 
@@ -349,24 +340,6 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
     });
   }
 
-  // appeal(item: any) {
-  //   const modalRef = this.modal.create({
-  //     nzTitle: '申诉',
-  //     nzWidth: '40%',
-  //     nzContent: CtcAppealComponent,
-  //     nzComponentParams: {
-  //       i: item,
-  //       status: 'add'
-  //     },
-  //     nzFooter: null
-  //   });
-  //   modalRef.afterClose.subscribe(res => {
-  //     if (res) {
-  //       this.search({ representationsStatus: '' });
-  //     }
-  //   })
-  // }
-
   /**
    * 上传
    */
@@ -388,45 +361,6 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
   }
 
 
-  /**
-   *
-   * @param params 上传设置
-   */
-  uploadSetting() {
-    const modalRef = this.modal.create({
-      nzTitle: '税务上传设置',
-      nzWidth: 600,
-      nzContent: TaxManagementInvoiceUploadSettingComponent,
-      nzComponentParams: {},
-      nzFooter: null
-    });
-    modalRef.afterClose.subscribe(res => {
-      if (res) {
-        this.st.load();
-      }
-    })
-  }
-
-  /**
-   * 查看校验结果
-   */
-  viewResult(item: any) {
-    const modalRef = this.modal.create({
-      nzTitle: '本地校验结果',
-      nzWidth: 1200,
-      nzContent: TaxManagementInvoiceVerifyResultComponent,
-      nzComponentParams: {
-        record: item
-      },
-      nzFooter: null
-    });
-    modalRef.afterClose.subscribe(res => {
-      if (res) {
-        this.st.load();
-      }
-    })
-  }
-
   /**
    * 查看监管审核结果
    */

src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.html

@@ -1,8 +0,0 @@
-<nz-spin [nzSpinning]="!i"></nz-spin>
-<sf *ngIf="i" #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="i" button="none">
-  <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"
-      [nzLoading]="service.http.loading">修改</button>
-  </div>
-</sf>

src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.ts

@@ -1,110 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { SFSchema, SFUISchema } from '@delon/form';
-import { NzModalRef } from 'ng-zorro-antd/modal';
-import { TaxManagementService } from '../../../services/tax-management.service';
-
-
-@Component({
-  selector: 'app-datatable-invoice-upload-setting',
-  templateUrl: './upload-setting.component.html',
-})
-export class TaxManagementInvoiceUploadSettingComponent implements OnInit {
-  record: any = {};
-  i: any = {};
-  schema!: SFSchema;
-  ui!: SFUISchema;
-
-  constructor(
-    private modal: NzModalRef,
-    public service: TaxManagementService
-  ) { }
-
-  ngOnInit(): void {
-    this.initSF();
-    // this.loadData();
-  }
-
-  /**
- * 初始化查询表单
- */
-  initSF() {
-    this.schema = {
-      properties: {
-        no: {
-          type: 'string',
-          title: '订单数据',
-          enum: [
-            {
-              label: '手动上传',
-              value: '1'
-            },
-            {
-              label: '自动上传',
-              value: '2'
-            }
-          ],
-          description: '开启自动上传后，订单将在支付完成且风险单校验通过后自动上传',
-          ui: {
-            widget: 'radio',
-
-          }
-        },
-        owner: {
-          type: 'string',
-          title: '资金数据',
-          enum: [
-            {
-              label: '手动上传',
-              value: '1'
-            },
-            {
-              label: '自动上传',
-              value: '2'
-            }
-          ],
-          description: '开启自动上传后，订单将在支付完成且风险单校验通过后自动上传',
-          ui: {
-            widget: 'radio',
-
-          }
-        },
-      },
-      required: ['owner', 'no'],
-    }
-    this.ui = {
-      '*': {
-        spanLabelFixed: 100,
-        grid: { span: 24 },
-      },
-    };
-  }
-
-  /**
-   * 获取设置数据
-   */
-  loadData() {
-    this.service.request(this.service.$api_get_upload_setting, {}).subscribe(res => {
-      if (res) {
-        this.i = res;
-
-      }
-    })
-  }
-
-  /**
-   * 修改
-   * @param value
-   */
-  save(value: any): void {
-    this.service.request(this.service.$api_upload_setting_save, { ...value }).subscribe(res => {
-      if (res) {
-        this.service.msgSrv.success('保存成功');
-        this.modal.close(true);
-      }
-    })
-  }
-
-  close(): void {
-    this.modal.destroy();
-  }
-}

src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.html

@@ -1,30 +0,0 @@
-<div nz-row>
-  <div style="width: 10%">
-    <nz-tabset [nzTabPosition]="'left'" style="height: 100%">
-      <nz-tab [nzTitle]="item?.name" *ngFor="let item of tabs" (nzSelect)="selectTab(item)"></nz-tab>
-    </nz-tabset>
-  </div>
-  <div style="width: 90%">
-    <st
-      #st
-      [scroll]="{ x: '1000px', y: '600px' }"
-      [data]="service.$api_get_getTaxFieldCheckList"
-      [columns]="columns"
-      [req]="{  process: beforeReq }"
-      [res]="{ reName: { list: 'data', total: 'data' } , process: afterRes}"
-      [page]="{ show: false }"
-      [loading]="false"
-      [bordered]="true"
-    >
-      <ng-template st-row="freightDetails" let-item>
-        <div *ngFor="let item of item.freightDetails">
-          <div>{{ item.expenseName }}:{{ item.price | currency }} </div>
-        </div>
-      </ng-template>
-    </st>
-  </div>
-</div>
-<div class="modal-footer">
-  <button nz-button type="button" (click)="close()">取消</button>
-  <button nz-button type="submit" nzType="primary" (click)="update()" [nzLoading]="service.http.loading">修改</button>
-</div>

src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.ts

@@ -1,139 +0,0 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
-import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
-import { SFSchema } from '@delon/form';
-import { ModalHelper, _HttpClient } from '@delon/theme';
-import { NzModalRef } from 'ng-zorro-antd/modal';
-import { TaxManagementService } from '../../../services/tax-management.service';
-
-@Component({
-  selector: 'app-tax-management-Invoice-reporting-verify-result',
-  templateUrl: './verify-result.component.html',
-})
-export class TaxManagementInvoiceVerifyResultComponent implements OnInit {
-  searchSchema: SFSchema = {
-    properties: {
-      no: {
-        type: 'string',
-        title: '编号'
-      }
-    }
-  };
-  @ViewChild('st') private readonly st!: STComponent;
-  columns: STColumn[] = [];
-  record: any = {}
-  subjectType: string = '0';
-  tabs: any[] = [
-    { name: '平台信息', value: '0' },
-    { name: '货主信息', value: '1' },
-    { name: '司机信息', value: '2' },
-    { name: '订单信息', value: '3' },
-  ];
-
-  // get reqParams() {
-  //   console.log(this.subjectType);
-  //   const params ={
-  //     subjectId: this.record?.shipperId,
-  //     subjectType: this.subjectType,
-  //   }
-  //   return params;
-  // }
-  beforeReq = (requestOptions: STRequestOptions) => {let a: string = '';
-    switch (this.subjectType) {
-      case '0':
-      a = this.record?.networkTransporterId;
-      break
-      case '1':
-      a = this.record?.shipperId;
-      break
-      case '2':
-      a = this.record?.driverId;
-      break
-      case '3':
-      a = this.record?.wayBillId;
-      break
-    }
-      Object.assign(requestOptions.body, {
-            subjectId: a ,
-            subjectType: this.subjectType,
-      });
-    return requestOptions;
-  };
-  afterRes = (data: any[], rawData?: any) => {
-    console.log(data)
-    return data.map(item => ({
-      ...item,
-    }));
-  };
-  constructor(public service: TaxManagementService, private modalRef: NzModalRef, public router: Router) {
-  }
-
-  ngOnInit(): void {
-    console.log(this.record);
-    
-    this.initST();
-  }
-
-  /**
- * 初始化数据列表
- */
-  initST() {
-    this.columns = [
-      { title: '序号', type: 'no', className: 'text-center', width: '60px', },
-      { title: '校验字段', index: 'checkFieldName', className: 'text-center', width: '120px', },
-      {
-        title: '是否必填',
-        index: 'requiredStatus',
-        className: 'text-center',
-        width: '100px',
-        type: 'enum',
-        enum: {
-          0: '否',
-          1: '是'
-        }
-      },
-      { title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', },
-      {
-        title: '本地校验', index: 'checkStatus', className: 'text-center', width: '100px',
-        type: 'enum',
-        enum: {
-          0: '校验中',
-          1: '通过',
-          2: '不通过'
-        }
-      },
-      { title: '错误内容', index: 'remark', className: 'text-center', width: '150px', },
-    ]
-  }
-
-
-  add(): void {
-    // this.modal
-    //   .createStatic(FormEditComponent, { i: { id: 0 } })
-    //   .subscribe(() => this.st.reload());
-  }
-
-  selectTab(e: any) {
-    setTimeout(() => {
-      console.log(e?.value);
-      
-      this.subjectType = e?.value;
-      console.log(this.subjectType);
-      this.st.load(1);
-    })
-  }
-
-  update() {
-    if (this.record?.billType === '1') {
-      window.open(location.origin + `/#/order-management/vehicle-detailChange/${this.record?.id}`)
-
-    } else if (this.record.billType === '2') {
-      window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`);
-    }
-  }
-  close(): void {
-    this.modalRef.destroy();
-  }
-
-
-}

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

@@ -56,6 +56,7 @@ export class TaxManagementService extends ShipperBaseService {
   $api_async_export_order_reporting_list = ``; // 导出订单上报
   $api_get_upload_setting = ``; // 修改上传设置
   $api_upload_setting_save = ``; // 修改上传设置
+  $api_getInvoiceReport_page = '/api/sdc/invoiceUploadInfo/list/page';
   constructor(public injector: Injector) {
     super(injector);
   }

src/app/routes/tax-management/taxmanagement.module.ts

@@ -14,8 +14,6 @@ import { TaxManagementIndividualCollectComponent } from './components/individual
 import { TaxManagementIndividualDeclareComponent } from './components/individual-declare/individual-declare.component';
 import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component';
 import { TaxManagementInvoiceReportingComponent } from './components/invoice-reporting/invoice-reporting.component';
-import { TaxManagementInvoiceUploadSettingComponent } from './components/invoice-reporting/upload-setting/upload-setting.component';
-import { TaxManagementInvoiceVerifyResultComponent } from './components/invoice-reporting/verify-result/verify-result.component';
 import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component';
 import { TaxManagementUploadSettingComponent } from './components/order-reporting/upload-setting/upload-setting.component';
 import { TaxManagementOrderVerifyResultComponent } from './components/order-reporting/verify-result/verify-result.component';
@@ -29,9 +27,7 @@ const COMPONENTS: Type<void>[] = [
   TaxManagementIndividualIncomeComponent,
   TaxManagementIndividualCollectComponent,
   TaxManagementIndividualDeclareComponent,
-  TaxManagementInvoiceReportingComponent,
+  TaxManagementInvoiceReportingComponent
-  TaxManagementInvoiceUploadSettingComponent,
-  TaxManagementInvoiceVerifyResultComponent
 ]
 
 

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

@@ -153,7 +153,7 @@
       </ng-template>
     </sv>
     <sv label="统一社会信用代码">
-      <ng-container *ngIf="detailData?.approvalStatus===10; else unifiedSocialCreditCodeelseTemplate">
+      <ng-container *ngIf="isEdit; else unifiedSocialCreditCodeelseTemplate">
         <input nz-input type="text" [(ngModel)]="detailData.unifiedSocialCreditCode" [readonly]="!isEdit"
           [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
       </ng-container>

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

@@ -197,6 +197,8 @@ export class FreightComponentsUserComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
+      { title: '企业名称', className: 'text-center', index: 'enterpriseName' },
+      { title: '项目名称', className: 'text-center', index: 'projectName' },
       { title: '用户姓名', className: 'text-center', index: 'name' },
       { title: '手机号', className: 'text-center', index: 'telephone' },
       { title: '身份证件号', className: 'text-center', index: 'certificateNumber' },

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

@@ -48,7 +48,7 @@ export class UsermanageService extends ShipperBaseService {
   $api_update_enter_newowork_batch = '/api/mdc/cuc/enterpriseInfo/operate/updatnNetworkTransporter';
 
   // 货主员工列表(运营后台)
-  $api_get_user_list = '/api/mdc/cuc/userApp/getShipperUserList';
+  $api_get_user_list = '/api/mdc/cuc/userApp/getShipperUserInfoList';
   // 冻结或恢复员工
   $api_lock_staff = '/api/mdc/cuc/userApp/freezeOrResumeStaff';
   // 冻结或恢复应用用户