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

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-19 13:56:39
+ * @LastEditTime : 2022-01-19 20:50:35
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

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

@@ -12,7 +12,7 @@
       <se-container col="3" labelWidth="100" *ngIf="!textStatus">
         <se-title class="mb-md" style="font-size: 18px">基本信息（应收费用）</se-title>
         <se label="网络货运人" required>
-          {{ costInfo?.ltdid }}
+          {{ costInfo?.ltdName }}
         </se>
         <se label="费用类型" required col="2">
           {{ costInfo?.feetype }}
@@ -39,7 +39,7 @@
       <se-container col="3" labelWidth="100" *ngIf="textStatus" class="mt-md">
         <se-title class="mb-md" style="font-size: 18px">基本信息（应付费用）</se-title>
         <se label="网络货运人" required>
-          {{ costInfo?.ltdid }}
+          {{ costInfo?.ltdName }}
         </se>
         <se label="费用类型" required>
           {{ costInfo?.feetype }}
@@ -80,6 +80,9 @@
         [loading]="service.http.loading"
         [scroll]="{ x: '1200px', y: '370px' }"
       >
+      <ng-template st-row="artocode" let-item let-index="index">
+        {{ costInfo?.artocode}}/{{ costInfo?.artonames}}
+      </ng-template>
       <ng-template st-row="hrvatmoney" let-item let-index="index">
         {{ item.hrvatmoney | currency}}
       </ng-template>

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

@@ -53,11 +53,11 @@ export class CostManagementDetailComponent implements OnInit {
       cost: [
         { title: '序号', render: 'no', width: 70, className: 'text-left' },
         { title: '费用明细号', index: 'feeHId', className: 'text-left', width: 200 },
-        { title: '订单号', index: 'billHId', className: 'text-left', width: 200 },
+        { title: '订单号', index: 'billHCode', className: 'text-left', width: 200 },
         { title: '订单日期', index: 'callNo', className: 'text-left', width: 200 },
-        { title: '运单号', index: 'waybillHId', className: 'text-left', width: 200 },
+        { title: '运单号', index: 'waybillHCode', className: 'text-left', width: 200 },
         { title: '运单日期', index: 'waybillDate', className: 'text-left', width: 200 },
-        { title: '结算客户', index: 'callNo', className: 'text-left', width: 200 },
+        { title: '结算客户', render: 'artocode', className: 'text-left', width: 200 },
         { title: '订单费用类型', index: 'billLType', className: 'text-left', width: 200 },
         { title: '费用科目', index: 'feeSubId', className: 'text-left', width: 200 },
         { title: '税率', index: 'hrvatrate', className: 'text-right', width: 200 },

src/app/routes/financial-management/components/cost-management/cost-management.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-30 19:36:30
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-19 13:49:42
+ * @LastEditTime : 2022-01-20 10:20:32
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -32,11 +32,11 @@
 <nz-card class="content-box">
   <div nz-row class="mb-sm">
     <div nz-col nzSpan="24">
-      <button nz-button nzType="primary" [nzLoading]="service.http.loading"
+      <!-- <button nz-button nzType="primary" [nzLoading]="service.http.loading"
         (click)="routeTo('/financial-management/cost-management/expenses-receivable/1')">添加应收费用</button>
       <button nz-button nzType="primary" [nzLoading]="service.http.loading"
         (click)="routeTo('/financial-management/cost-management/expenses-payable/1')">添加应付费用</button>
-      <button nz-button nzType="primary" [nzLoading]="service.http.loading">导入费用</button>
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading">导入费用</button> -->
     </div>
   </div>
   <st #st [data]="service.$api_get_cost_page" [columns]="columns"
@@ -50,6 +50,9 @@
     <ng-template st-row="hrmoney" let-item let-index="index">
       {{ item.hrmoney | currency}}
     </ng-template>
+    <ng-template st-row="artocode" let-item let-index="index">
+      {{ item.artocode}}/{{ item.artonames}}
+    </ng-template>
     <ng-template st-row="hrpaymoney" let-item let-index="index">
       {{ item.hrpaymoney | currency}}
     </ng-template>

src/app/routes/financial-management/components/cost-management/cost-management.component.ts

@@ -249,13 +249,13 @@ export class CostManagementComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '费用单号', fixed: 'left', index: 'feecode', width: 200 ,className: 'text-left',},
-      { title: '网络货运人', index: 'ltdId', width: 200 ,className: 'text-left',},
+      { title: '网络货运人', index: 'ltdName', width: 220 ,className: 'text-left',},
-      { title: '订单号', index: 'billHId', width: 200,className: 'text-left', },
+      { title: '订单号', index: 'billHCode', width: 200,className: 'text-left', },
-      { title: '运单号', index: 'waybillHId', width: 200 ,className: 'text-left',},
+      { title: '运单号', index: 'waybillHCode', width: 200 ,className: 'text-left',},
       { title: '费用日期', index: 'feedate', width: 200 ,className: 'text-left',},
       { title: '费用类型', index: 'feetypeLabel', width: 150,className: 'text-center', },
       { title: '应付核销', index: 'ishrhx', width: 200, type: 'enum', enum: { 0: '否', 1: '是' } ,className: 'text-left',},
-      { title: '结算客户', index: 'cno', width: 200 ,className: 'text-left',},
+      { title: '结算客户', render: 'artocode', width: 200 ,className: 'text-left',},
       { title: '应收对象', index: 'artoname', width: 200 ,className: 'text-left',},
       { title: '应付对象', index: 'hrtoname', width: 200 ,className: 'text-left',},
       { title: '应收金额', render: 'armoeny', width: 100 ,className: 'text-right',},
@@ -279,10 +279,10 @@ export class CostManagementComponent implements OnInit {
             click: item => this.auditAction(item),
             iif: item => item.sts === 2
           },
-          {
+          // {
-            text: '修改',
+          //   text: '修改',
-            click: item => this.router.navigate(['/financial-management/cost-management/expenses-receivable/1'], { queryParams: { id: 1 } })
+          //   click: item => this.router.navigate(['/financial-management/cost-management/expenses-receivable/1'], { queryParams: { id: 1 } })
-          }
+          // }
         ]
       }
     ];

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

@@ -216,7 +216,6 @@ export class NetworkFreightComponent implements OnInit {
           type: 'number',
           title: '营业执照所在地',
           ui: {
-            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
             widget: 'cascader',
             valueProperty: 'regionCode',
             labelProperty: 'name',
@@ -317,6 +316,8 @@ export class NetworkFreightComponent implements OnInit {
       regioin?.forEach((element: any) => {
            enterpriseAddressCode.push(Number(element))
       });
+      console.log(enterpriseAddressCode)
+      this.sfTicket.setValue('/senderRegionCode', enterpriseAddressCode);
      return enterpriseAddressCode;
     });
   }