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

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-15 14:52:18
+ * @LastEditTime : 2022-03-02 11:14:37
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -62,17 +62,13 @@
     <div style="width: 60%; margin: 0 auto">
        
       <nz-steps [nzCurrent]="i?.scheduleVOList?.length + 1" nzLabelPlacement="vertical">
-         
         <nz-step
           *ngFor="let item of i?.scheduleVOList"
           [nzTitle]="item.state"
           [nzSubtitle]="item.stateTime"
           [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"
-        >
+        ></nz-step>
-           
+      </nz-steps>
-        </nz-step>
-         </nz-steps
-      >
     </div>
   </div>
 </nz-card>
@@ -95,8 +91,8 @@
       {{ i?.unloadPlanTime }}
     </sv>
     <sv label="接单数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 </sv>
-    <sv label="装货数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 </sv>
+    <sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 </sv>
-    <sv label="卸货数量"> {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件 </sv>
+    <sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量"> {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件 </sv>
   </sv-container>
   <div class="mt-md">
     <h4 class="text-md"
@@ -140,7 +136,8 @@
 </nz-card>
 <nz-card nzTitle="运费信息" #distannce3>
   <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）</h2>
-  <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+  <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+    <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
     <ng-template st-row="price" let-item let-index="index">
       {{ item.price | currency }}
     </ng-template>
@@ -209,7 +206,7 @@
     </st>
         </div>
         <div nz-col [nzSpan]="12">
-          <amap-path-simplifier [MapList]="MapList"></amap-path-simplifier>
+          <amap-path-simplifier [mapWidth]="'100%'"  [MapList]="MapList"></amap-path-simplifier>
         </div>
       </div>
     </nz-card>

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 19:47:14
+ * @LastEditTime : 2022-03-02 11:15:45
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -25,15 +25,16 @@ import format from 'date-fns/format';
   styleUrls: ['./bulk-detail.component.less']
 })
 export class OrderManagementBulkeDetailComponent implements OnInit {
-  MapList: any;
+  MapList: any[]=[];
   id = this.route.snapshot.params.id;
+  billExpenses: any[] = []; //运费信息表格信息
   i: any;
   imges: any;
   totalObj: any;
   attObj: any;
   isVisible = false;
   logColumns: STColumn[] = [
-    { title: '款项', index: 'expenseName' },
+    { title: '款项', index: 'costName', render: 'PriceType' },
     { title: '运输费（元）', render: 'price' },
     { title: '附加费（元）', render: 'surcharge' },
     { title: '支付时间', index: 'paymentTime' },
@@ -70,8 +71,10 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
     this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => {
       if (res) {
         this.i = res;
-        this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
+        console.log(this.i.billExpenseDetails )
-        this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
+        this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA');
+        console.log(this.billExpenses )
+        this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE");
       }
     });
   }

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 13:40:31
+ * @LastEditTime : 2022-03-02 11:11:04
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -62,18 +62,11 @@
   <div class="approval-status">
     <div style="width: 60%; margin: 0 auto">
        
-      <nz-steps [nzCurrent]="approvalLsit?.length + 1" nzLabelPlacement="vertical">
+      <nz-steps [nzCurrent]="i?.scheduleVOList?.length + 1" nzLabelPlacement="vertical">
-         
+        <nz-step *ngFor="let item of i?.scheduleVOList" [nzTitle]="item.state" [nzSubtitle]="item.stateTime"
-        <nz-step
+          [nzDescription]="item.cancelReason ? '取消原因：' + item.cancelReason : ''"
-          *ngFor="let item of approvalLsit"
+          [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"></nz-step>
-          [nzTitle]="item?.state"
+      </nz-steps>
-          [nzSubtitle]="item?.stateTime"
-          [nzStatus]="item?.displayStatus === 'SHOW' ? 'finish' : 'wait'"
-        >
-           
-        </nz-step>
-         </nz-steps
-      >
     </div>
   </div>
 </nz-card>
@@ -139,7 +132,7 @@
 <nz-card nzTitle="保险待定"> </nz-card>
 
 <nz-card nzTitle="运费信息" #distannce3>
-  <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+  <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
     <ng-template st-row="price" let-item let-index="index">
       {{ item.price | currency }}
     </ng-template>
@@ -206,7 +199,7 @@
     </st>
         </div>
         <div nz-col [nzSpan]="12">
-          <amap-path-simplifier [MapList]="MapList"></amap-path-simplifier>
+          <amap-path-simplifier [mapWidth]="'100%'" [MapList]="MapList"></amap-path-simplifier>
         </div>
       </div>
     </nz-card>

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 11:45:39
+ * @LastEditTime : 2022-03-02 11:11:05
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -23,13 +23,14 @@ import { OrderManagementService } from '../../services/order-management.service'
 })
 export class OrderManagementVehicleDetailComponent implements OnInit {
   id = this.route.snapshot.params.id;
-  MapList: any;
+  MapList: any[]=[];
   i: any = {
     unLoadingPlaceList: [],
     billExpenseDetails: [],
     goodsInfoList: [],
     goodsResource: []
   };
+  billExpenses: any[] = []; //运费信息表格信息
   imges: any;
   attObj: any;
   totalObj: any;
@@ -75,14 +76,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
     this.service.request(this.service.$api_get_getWholeBillDetail, { id: this.id }).subscribe(res => {
       if (res) {
         this.i = res;
-        this.approvalLsit = res.scheduleVOList;
+        this.billExpenses = this.i?.billExpenseDetails?.filter((data:any)=>data.expenseCode ==="PRE" || data.expenseCode ==="RECE" ||data.expenseCode ==="BACK" )
-        this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
+        this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE");
-        this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
-        this.approvalLsit.map((item: any, key: any) => {
-          if (item.displayStatus === 'HIDE') {
-            delete this.approvalLsit[key];
-          }
-        });
       }
     });
   }

src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-14 15:02:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:20:49
+ * @LastEditTime : 2022-03-02 13:43:55
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\confir-receipt\\confir-receipt.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -18,7 +18,7 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误
 <sv-container col="1">
   <sv label="货物单价">
     <span>
-      {{detailList?.goodsInfoVO?.freightPrice}} {{detailList?.goodsInfoVO?.freightType}}
+      {{detailList?.goodsInfoVO?.freightPrice}} {{detailList?.goodsInfoVO?.freightTypeLabel}}
      </span>
   </sv>
   <sv label="结算依据">
@@ -37,7 +37,7 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误
         <div>{{detailList?.goodsInfoVO?.weight}}吨</div>
     </sv>
     <sv label="装货体积">
-        <div>{{detailList?.goodsInfoVO?.volume}}吨</div>
+        <div>{{detailList?.goodsInfoVO?.volume}}方</div>
     </sv>
   </sv-container>
   <sv-container col="2">
@@ -50,7 +50,7 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误
   </sv-container>
   <sv-container col="1">
     <sv label="总运费">
-      <div>{{detailList?.price}} 元</div>
+      <div>{{detailList?.price | currency}} 元</div>
   </sv>
   <sv label="司机车辆">
     <div>{{detailList?.driverName}} / {{detailList?.driverPhone}}/ {{detailList?.carNo}}</div>
@@ -69,7 +69,7 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误
     [nzPreview]="handlePreview1"
     [nzBeforeUpload]="beforeUpload"
     (nzChange)="handleChange1($event)"
-  >beforeUpload
+  >
     <div>
       <i nz-icon nzType="plus"></i>
       <div style="margin-top: 8px">请上传图片</div>

src/app/routes/supply-management/model/import-supply/import-supply.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-01 15:13:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-02 09:52:53
+ * @LastEditTime : 2022-03-02 10:32:15
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -78,9 +78,9 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
           type: 'string',
           title: '网络货运人',
           ui: {
-            widget: 'text'
+            widget: 'select',
-          },
+            placeholder: '请选择'
-          default: '确认货主后带出'
+          } as SFSelectWidgetSchema
         },
         enterpriseProjectId: {
           type: 'string',
@@ -131,6 +131,23 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
         this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
       });
   }
+  getRegionCode2(regionCode: any) {
+    console.log(regionCode);
+    return this.service
+      .request(this.service.$api_getNetworkTransporter, { id: regionCode })
+      .pipe(
+        map(res =>
+          res.map((item: any) => ({
+            label: item.projectName,
+            value: item.id
+          }))
+        )
+      )
+      .subscribe(res => {
+        // this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
+        // this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
+      });
+  }
   save(): void {
     console.log(this.files)
     // this.service.request(this.service.$api_update_price, { id, freightType, freightPrice, resourceCode, rule, resourceId }).subscribe(res => {
@@ -184,36 +201,6 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
     });
   };
   downFile() {
-    console.log('78')
-    // this.service.request(this.service.$api_exportGoodsResourceOperateTemplate).subscribe((res: any)=> {
-    // console.log('66')
-    //   console.log(res)
-    //     let aLink = document.createElement('a');
-    //     const content = res;
-    //     let blob = this.base64ToBlob(content); //new Blob([content]);
-    //     let evt = document.createEvent("HTMLEvents");
-    //     evt.initEvent("click", true, true);//initEvent 不加后两个参数在IE下会报错  事件类型，是否冒泡，是否阻止浏览器的默认行为
-    //     aLink.download = '模板';
-    //     aLink.href = URL.createObjectURL(blob);
-    //     // aLink.dispatchEvent(evt);
-    //     aLink.click();
-    //     this.status = false
-    // })
    this.service.downloadFile(this.service.$api_exportGoodsResourceOperateTemplate);
-
-    
-    // window.location.href('')
   }
-    //base64转blob
-    base64ToBlob(code: any) {
-      let parts = code.split(';base64,');
-      let contentType = parts[0].split(':')[1];
-      let raw = window.atob(parts[1]);
-      let rawLength = raw.length;
-      let uInt8Array = new Uint8Array(rawLength);
-      for (let i = 0; i < rawLength; ++i) {
-        uInt8Array[i] = raw.charCodeAt(i);
-      }
-      return new Blob([uInt8Array], { type: contentType });
-    }
 }

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 11:10:14
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-01 14:08:30
+ * @LastEditTime : 2022-03-02 10:10:18
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -159,4 +159,8 @@ export class SupplyManagementService extends BaseService {
   public $api_getWholeInsuranceInfo = '/api/sdc/goodsResourceShipper/getWholeInsuranceInfo';
   // 下载导入货源模板-运营后台
   public $api_exportGoodsResourceOperateTemplate = '/api/sdc/uploadGoodsResource/exportGoodsResourceOperateTemplate';
+  // 导入货源-运营后台
+  public $api_goodsResourceOperateImport = '/api/sdc/uploadGoodsResource/goodsResourceOperateImport';
+  // 根据货主ID查询网络货运人信息
+  public $api_getNetworkTransporter = '/api/mdc/cuc/enterpriseInfo/operate/getNetworkTransporter';
 }

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

@@ -91,10 +91,10 @@
     <sv label="接单数量">
       {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
     </sv>
-    <sv label="装货数量">
+    <sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量">
       {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
     </sv>
-    <sv label="卸货数量">
+    <sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量">
       {{i?.settlementWeight}}吨,{{i?.settlementVolume}}方,{{i?.acceptNumber}}件
     </sv>
 </sv-container>