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-02-25 17:52:10
+ * @LastEditTime : 2022-03-02 14:52:07
  * @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-test.eascs.com',
+      host: 'tms-api-dev.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/order-management/components/bulk/bulk.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-01 13:26:59
+ * @LastEditTime : 2022-03-02 14:56:27
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -81,6 +81,9 @@
       <ng-template st-row="payeeName" let-item let-index="index">
         <div> {{ item?.payeeName }}/{{ item?.payeePhone }} </div>
       </ng-template>
+      <ng-template st-row="createUserName" let-item let-index="index">
+        <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
+      </ng-template>
       <ng-template st-row="billCode" let-item let-index="index">
         <a [routerLink]="'bulk-detail/' + item.id">{{ item.billCode }}</a>
         <div>

src/app/routes/order-management/components/bulk/bulk.component.ts

@@ -429,6 +429,7 @@ export class OrderManagementBulkComponent implements OnInit {
         className: 'text-right',
         render: 'mybidDetailInfo'
       },
+      { title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' },
       { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
       { title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' },
       { title: '所属项目', index: 'enterpriseProjectName', width: '250px', className: 'text-left' },

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 13:59:54
+ * @LastEditTime : 2022-03-02 14:57:31
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -83,6 +83,9 @@
           <span>{{ item?.goodsNumber ? item?.goodsNumber + '件' : '' }}</span>
         </div>
       </ng-template>
+      <ng-template st-row="createUserName" let-item let-index="index">
+        <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
+      </ng-template>
       <ng-template st-row="mybidDetailInfo" let-item let-index="index">
         <div *ngIf="item.mybidDetailInfo.length > 0">
           <p *ngFor="let data of item.mybidDetailInfo">

src/app/routes/order-management/components/vehicle/vehicle.component.ts

@@ -390,6 +390,7 @@ resourceStatus: any;
         className: 'text-right',
         render: 'mybidDetailInfo',
       },
+      { title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' },
       { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
       { title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' },
       { title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-left' },

src/app/routes/supply-management/components/bulk/bulk.component.html

@@ -75,6 +75,9 @@
       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
       [loading]="loading"
     >
+    <ng-template st-row="createUserName" let-item let-index="index">
+      <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
+    </ng-template>
       <!--运费单价  -->
       <ng-template st-row="freightPrice" let-item let-index="index">
         <div class="mr-xs">{{ item?.freightPrice | currency }} </div>

src/app/routes/supply-management/components/bulk/bulk.component.ts

@@ -255,6 +255,7 @@ export class SupplyManagementBulkComponent implements OnInit {
         className: 'text-left',
         render: 'resourceCode'
       },
+      { title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' },
       { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
       { title: '项目名称', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
       { title: '关联订单', render: 'orderSn', width: '200px', className: 'text-left' },

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

@@ -71,6 +71,9 @@
       [loading]="loading"
       [scroll]="{ x: '1200px', y: '500px' }"
     >
+    <ng-template st-row="createUserName" let-item let-index="index">
+      <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
+    </ng-template>
       <ng-template st-row="resourceCode" let-item let-index="index">
         <a [routerLink]="'vehicle-detail/' + item?.id">{{ item?.resourceCode }}</a>
         <p>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</p>

src/app/routes/supply-management/components/vehicle/vehicle.component.ts

@@ -21,7 +21,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
   @ViewChild('st') private readonly st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   @ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
-  loading:boolean =  true;
+  loading: boolean = true;
   schema: SFSchema = this.initSF();
   columns: STColumn[] = this.initST();
   _$expand = false;
@@ -58,7 +58,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
     if (this.resourceStatus) {
       a.resourceStatus = this.resourceStatus;
     }
-    this.loading = true
+    this.loading = true;
     return {
       ...a
     };
@@ -81,10 +81,10 @@ export class SupplyManagementVehicleComponent implements OnInit {
     return requestOptions;
   };
   afterRes = (data: any[], rawData?: any) => {
-    this.loading = false
+    this.loading = false;
     return data.map(item => ({
       ...item,
-      disabled: item.auditStatus !== '1',
+      disabled: item.auditStatus !== '1'
     }));
   };
 
@@ -362,7 +362,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
             },
             allowClear: true,
             onSearch: (q: any) => {
-              let str =q.replace(/^\s+|\s+$/g,"");
+              let str = q.replace(/^\s+|\s+$/g, '');
               if (str) {
                 return this.service
                   .request(this.service.$api_enterpriceList, { enterpriseName: str })
@@ -477,12 +477,14 @@ export class SupplyManagementVehicleComponent implements OnInit {
         className: 'text-left',
         render: 'resourceCode'
       },
+      { title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' },
       {
         title: '货主',
         index: 'shipperAppUserName',
         width: '180px',
         className: 'text-left'
       },
+  
       {
         title: '项目名称',
         index: 'enterpriseProjectName',
@@ -606,8 +608,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
             iif: item => item.resourceStatus === '1' && item.serviceType === '2',
             acl: { ability: ['SUPPLY-INDEX-vehicleReassign'] }
           },
-          {type: 'divider'},
+          { type: 'divider' }
-
         ]
       }
     ];

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

@@ -63,6 +63,12 @@
       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
       [loading]="service.http.loading"
     >
+    <ng-template st-row="createUserName" let-item let-index="index">
+      <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
+    </ng-template>
+    <ng-template st-row="createUserName" let-item let-index="index">
+      <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
+    </ng-template>
       <ng-template st-row="driverName" let-item let-index="index">
         <div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.driverLicenseCarNo }} </div>
       </ng-template>

src/app/routes/waybill-management/components/bulk/bulk.component.ts

@@ -247,6 +247,7 @@ tabs = {
         className: 'text-right',
         render: 'billExpenseDetailVOList'
       },
+      { title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' },
       { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
       { title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' },
       { title: '关联订单号', index: 'billCode', width: '180px', className: 'text-left' },

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-02-23 15:39:15
+ * @LastEditTime : 2022-03-02 14:59:17
  * @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
@@ -64,6 +64,12 @@
       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
       [loading]="service.http.loading"
     >
+    <ng-template st-row="createUserName" let-item let-index="index">
+      <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
+    </ng-template>
+    <ng-template st-row="createUserName" let-item let-index="index">
+      <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
+    </ng-template>
       <ng-template st-row="driverName" let-item let-index="index">
         <div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.driverLicenseCarNo }} </div>
       </ng-template>

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

@@ -291,6 +291,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
         className: 'text-right',
         render: 'billExpenseDetailVOList'
       },
+      { title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' },
       { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
       { title: '货主', index: 'shipperAppUserName', width: '200px', className: 'text-left' },
       { title: '关联订单号', index: 'billCode', width: '180px', className: 'text-left' },