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

2022-04-27 19:15:51 +08:00
parent 3063478d69 2a412159bd
commit 368e402286
11 changed files with 76 additions and 46 deletions
--- a/src/app/routes/contract-management/components/index/index.component.html
+++ b/src/app/routes/contract-management/components/index/index.component.html
@ -9,15 +9,16 @@
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->

+
 <page-header-wrapper title="合同管理" [tab]="tpTab">
 </page-header-wrapper>
 <ng-template #tpTab>
  <nz-tabset [(nzSelectedIndex)]="selectedIndex">
-    <nz-tab nzTitle="明细合同">
+    <nz-tab nzTitle="明细合同" *ngIf="isShowDetail">
      <app-contract-management-contract-list></app-contract-management-contract-list>
    </nz-tab>
-    <nz-tab nzTitle="框架合同">
-      <app-contract-management-contract-frame></app-contract-management-contract-frame>
+    <nz-tab nzTitle="框架合同"*ngIf="isShowFrame">
+        <app-contract-management-contract-frame ></app-contract-management-contract-frame>
    </nz-tab>
    <nz-tab nzTitle="合伙人合同">
      <app-contract-management-contract-partner></app-contract-management-contract-partner>
--- a/src/app/routes/contract-management/components/index/index.component.ts
+++ b/src/app/routes/contract-management/components/index/index.component.ts
@ -10,18 +10,25 @@
 */

 import { Component, OnInit } from '@angular/core';
+import { ACLService } from '@delon/acl';
 import { ModalHelper, _HttpClient } from '@delon/theme';

@Component({
  selector: 'app-supply-management-index',
-  templateUrl: './index.component.html',
+  templateUrl: './index.component.html'
 })
 export class ContractManagementIndexComponent implements OnInit {
  selectedIndex = 0;
+  isShowDetail = false;
+  isShowFrame = false;

-  constructor(private http: _HttpClient, private modal: ModalHelper) { }
-
-  ngOnInit(): void { }
+  constructor(private http: _HttpClient, private modal: ModalHelper, private acl: ACLService) {
+    const acls = acl.data.abilities || [];
+    this.isShowDetail = !!acls.find(acl => acl === 'CONTRACT-INDEX-searchDetail');
+    this.isShowFrame = !!acls.find(acl => acl === 'CONTRACT-INDEX-listFrame');
+    console.log(this.isShowFrame);
    
+  }

+  ngOnInit(): void {}
 }
--- a/src/app/routes/contract-management/contract-management-routing.module.ts
+++ b/src/app/routes/contract-management/contract-management-routing.module.ts
@ -19,12 +19,16 @@ import { ContractManagementIndexComponent } from './components/index/index.compo
 import { ContractManagementPolicyComponent } from './components/policy/policy.component';
 import { ContractManagementTemplateComponent } from './components/template/template.component';
 const routes: Routes = [
-  { path: 'index', component: ContractManagementIndexComponent },
+  { path: 'index', component: ContractManagementIndexComponent, data: { guard: { ability: ['CONTRACT-INDEX-searchDetail'] } } },
  { path: 'index/detail/:id', component: ContractManagementDetailComponent },
-  { path: 'template', component: ContractManagementTemplateComponent },
-  { path: 'template/text/:id', component: ContractManagementTemplateTextComponent },
-  { path: 'policy', component: ContractManagementPolicyComponent },
-  { path: 'partner', component: ContractManagementPartnerComponent },
+  { path: 'template', component: ContractManagementTemplateComponent, data: { guard: { ability: ['CONTRACT-TEMPLATE-search'] } } },
+  {
+    path: 'template/text/:id',
+    component: ContractManagementTemplateTextComponent,
+    data: { guard: { ability: ['CONTRACT-TEMPLATE-detail'] } }
+  },
+  { path: 'policy', component: ContractManagementPolicyComponent, data: { guard: { ability: ['CONTRACT-POLICY-search'] } } },
+  { path: 'partner', component: ContractManagementPartnerComponent }
 ];

@NgModule({
--- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
+++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
@ -224,6 +224,7 @@ export class PaymentOrderComponent extends BasicTableComponent implements OnInit
        buttons: [
          {
            text: '浏览',
+            acl: { ability: ['FINANCIAL-PAYMENT-ORDER-view'] },
            click: item => this.router.navigate(['/financial-management/payment-order/detail/' + item.id])
          }
          // {
--- a/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.html
+++ b/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.html
@ -7,7 +7,7 @@
    </div>
    <div class="rightBox">
        <nz-tabset [nzSize]="'small'">
-            <nz-tab nzTitle="操作权限">
+            <nz-tab nzTitle="操作权限(查询权限必须勾选)">
                <div *ngIf="origin.buttonInfoList && origin.buttonInfoList.length">
                    <label style="width: 100%" nz-checkbox [ngModel]="_apiAuthSet.has(item.functionButtonId)"
                        *ngFor="let item of origin.buttonInfoList"
--- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts
+++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts
@ -209,12 +209,12 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
    this.columns = [
      { title: '', type: 'checkbox', className: 'text-center', width: '60px', },
      { title: '上传状态', render: 'uploadSts', className: 'text-center', width: '120px', },
-      { title: '发票类型', render: 'invoiceType', className: 'text-center', width: '120px', },
+      { title: '发票类型', render: 'invoiceType', className: 'text-center', width: '180px', },
      {
        title: '发票号码',
        index: 'invoiceno',
        className: 'text-center',
-        width: '150px',
+        width: '120px',
        type: 'link',
        click: item => {
          window.open(`/#/ticket/invoice-list/detail/${item.vatinvHId}?type=${item.invoiceType}`, '_blank', 'noopener')
@ -235,17 +235,17 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
      },
      { title: '购买方统一社会信用代码', index: 'artotaxno', className: 'text-center', width: '200px' },
      {
-        title: '订单号', index: 'billHCode', className: 'text-center', width: '120px', type: 'link',
+        title: '订单号', index: 'billHCode', className: 'text-center', width: '180px', type: 'link',
        click: item => {
          window.open(`/#/order-management/vehicle/vehicle-detail/${item.ltdId}`, '_blank', 'noopener')
        }
      },
-      { title: '货物名称', index: 'goodsinfo', className: 'text-center', width: '180px' },
-      { title: '价税合计', index: 'vatmoney', className: 'text-center', width: '180px' },
+      { title: '货物名称', index: 'goodsinfo', className: 'text-center', width: '120px' },
+      { title: '价税合计', index: 'vatmoney', className: 'text-center', width: '120px' },
      { title: '开票日期', index: 'invoicedate', className: 'text-center', width: '180px' },
-      { title: '发票所属月份', index: 'invoicemonth', className: 'text-center', width: '250px' },
-      { title: '发票状态', index: 'sts', render: 'sts', className: 'text-center', width: '200px' },
-      { title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '200px' },
+      { title: '发票所属月份', index: 'invoicemonth', className: 'text-center', width: '140px' },
+      { title: '发票状态', index: 'sts', render: 'sts', className: 'text-center', width: '120px' },
+      { title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '180px' },
    ];
  }

--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
@ -33,7 +33,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
    { name: '异常', value: '2' },
    { name: '全部', value: '' }
  ];
-  selectedIndex = ''; //选择的项目
+  selectedIndex = '0'; //选择的项目
  serviceTel = '';
  constructor(
    public service: TaxManagementService,
--- a/src/app/routes/tax-management/services/tax-management.service.ts
+++ b/src/app/routes/tax-management/services/tax-management.service.ts
@ -42,7 +42,7 @@ export class TaxManagementService extends ShipperBaseService {
  // 撤回税务订单
  $api_get_recessionTaxOrder = `/api/sdc/tax/recessionTaxOrder`;
  // 上传税务订单
-  $api_get_uploadingTaxOrder = `/api/sdc/tax/uploadingTaxOrder`;
+  $api_get_uploadingTaxOrder = `/api/sdc/taxOrder/orderUploadDJtax`;
  // 上传税务订单
  $api_get_getTaxFieldCheckList = `/api/sdc/taxFieldCheck/getTaxFieldCheckList`;

--- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html
+++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html
@ -33,5 +33,8 @@
            <span *ngIf="item.sts === '6'">已撤销</span>
            <span *ngIf="item.sts === '7'">已作废</span>
        </ng-template>
+        <ng-template st-row="serviceType" let-item let-index="index">
+            <span>{{item.billTypeLabel + item.serviceTypeLabel}}</span>
+        </ng-template>
    </st>
 </nz-card>
--- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
+++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
@ -77,14 +77,28 @@ export class BillingOrderComponent implements OnInit {
        serviceType: {
          title: '服务类型',
          type: 'string',
+          enum: [{
+            label: '全部',
+            value: ''
+          },{
+            label: '整车抢单',
+            value: 1
+          },{
+            label: '整车指派',
+            value: 2
+          },{
+            label: '大宗抢单',
+            value: 3
+          },{
+            label: '大宗指派',
+            value: 4
+          },{
+            label: '结算单',
+            value: 5
+          }],
          ui: {
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
-            containsAllLabel: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
+            widget: 'select',
          }
-          } as SFSelectWidgetSchema
        },
        shipperAppUserName: {
          type: 'string',
@ -179,7 +193,7 @@ export class BillingOrderComponent implements OnInit {

  private initST(): STColumn[] {
    return [
-      { title: '订单号', index: 'billCode', type:'link', className: 'text-center', width: 180, click: _record => this.routeTo(_record) },
+      { title: '订单号', index: 'billCode', type: 'link', className: 'text-center', width: 180, click: _record => this.routeTo(_record) },
      { title: '运单号', index: 'wayBillCode', width: 180, className: 'text-center' },
      { title: '银行类型', index: 'bankTypeLabel', render: 'bankType', width: 100, className: 'text-center' },
      { title: '网络货运人', index: 'enterpriseInfoName', width: 220, className: 'text-center' },
@ -234,24 +248,24 @@ export class BillingOrderComponent implements OnInit {
      { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center', },
      {
        title: '服务类型',
-        index: 'serviceTypeLabel',
-        width: '180px',
+        render: 'serviceType',
+        width: '120px',
        className: 'text-center'
      },
      { title: '装货地', index: 'consignor', width: '180px', className: 'text-center' },
      { title: '卸货地', index: 'consignee', width: '180px', className: 'text-center' },
-      { title: '货物信息', index: 'goodsName', className: 'text-center', width: '180px' },
-      { title: '车牌号', index: 'carNo', className: 'text-center', width: '180px' },
+      { title: '货物信息', index: 'goodsName', className: 'text-center', width: '140px' },
+      { title: '车牌号', index: 'carNo', className: 'text-center', width: '120px' },
      {
        title: '承运司机',
-        index:'driverName',
+        index: 'driverName',
        className: 'text-center',
-        width: '180px',
+        width: '120px',
      },
      {
        title: '车队长',
        className: 'text-center',
-        width: '180px',
+        width: '120px',
        index: 'carCaptainName',
      },
      { title: '业务员', width: '100px', index: 'salesmanName', className: 'text-center', },
@ -260,16 +274,16 @@ export class BillingOrderComponent implements OnInit {
      { title: '卸货时间', index: 'unloadTime', type: 'date', width: '150px', className: 'text-center', },
      { title: '订单完成时间', index: 'orderReceivingTime', type: 'date', width: 150, className: 'text-center', },
      { title: '支付完成时间', index: 'overallPaymentTime', type: 'date', width: 150, className: 'text-center', },
-      { title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 180 },
+      { title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 120 },
      { title: '申请开票时间', index: 'vatappdate', type: 'date', className: 'text-center', width: 180 },
-      { title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 180 },
-      { title: '分票编号', index: 'vatinvcode', width: '180px', className: 'text-center', },
+      { title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 190 },
+      { title: '分票编号', index: 'vatinvcode', width: '200px', className: 'text-center', },
      { title: '发票号码', index: 'invoiceno', width: 130, className: 'text-center', },
      { title: '发票代码', index: 'invoiceno2', width: 130, className: 'text-center' },
      { title: '开票日期', index: 'invoicedate', type: 'date', width: 150, className: 'text-center' },
      // { title: '作废日期', index: 'invalidTime', type: 'date', width: 150 }, // TODO
      {
-        title: 'ETC开票金额', index: 'etcInvoiceMoney', className: 'text-center', width: 200, type: 'widget',
+        title: 'ETC开票金额', index: 'etcInvoiceMoney', className: 'text-center', width: 120, type: 'widget',
        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.etcInvoiceMoney }) }
      }
    ];
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
@ -36,7 +36,7 @@
                <strong class="text-red">{{totalCallNo }}</strong>
                <a *ngIf="totalCallNo > 0" (click)="st.clearCheck();totalCallNo=0" class="ml-lg">清空</a>
            </div>
-            <button nz-button *ngIf="resourceStatus===1 || !resourceStatus" (click)="this.batchPush()">推送开票</button>
+            <!-- <button nz-button *ngIf="resourceStatus===1 || !resourceStatus" (click)="this.batchPush()">推送开票</button> -->
            <!-- <button nz-button *ngIf="resourceStatus===1 || !resourceStatus"
                (click)="this.batchRemove(selectedRows)">移除</button>
            <button nz-button *ngIf="resourceStatus===2 || !resourceStatus"