Merge branch 'develop' of 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-03-08 14:53:01
+ * @LastEditTime : 2022-03-09 13:48:59
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -46,6 +46,10 @@
         <sv label="服务类型">{{ i?.goodsResource?.serviceTypeLabel }}</sv>
         <sv label="录单员">{{ i?.createUserName }} /{{ i?.createUserPhone }} </sv>
         <sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv>
+        <sv label="外部订单号">{{ i?.externalBillCode }}</sv>
+        <sv label="货源编号">{{ i?.goodsResource?.resourceCode }} </sv>
+        <sv label="运单号">{{ i?.wayBillCode }}</sv>
+        <sv label="承诺付款天数">{{ i?.goodsResource?.paymentDays }}</sv>
       </div>
       <nz-tabset style="margin-top: 15px">
         <nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)"> </nz-tab>
@@ -220,6 +224,30 @@
     </ng-template>
   </div>
 </nz-card>
+<nz-card>
+  <nz-tabset >
+    <nz-tab nzTitle="风险异常检测">
+      <button nz-button nzType="primary"[disabled]="">申 诉</button>
+      <div>
+        您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
+      </div>
+      <div>如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈</div>
+      <ul>
+        <li>系统识别:司机装货轨迹异常</li>
+        <li>司机装货轨迹异常，您可在企业端提交申诉材料或联系客服。</li>
+        <li>2021-11-07 03:20:15</li>
+      </ul>
+    </nz-tab>
+    <nz-tab nzTitle="异常预警">
+      <st  #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
+      </st>
+    </nz-tab>
+    <nz-tab nzTitle="操作日志">
+      <st  #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
+      </st>
+    </nz-tab>
+  </nz-tabset>
+</nz-card>
 
 <nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
   <ng-container *nzModalContent>

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-03-02 11:15:45
+ * @LastEditTime : 2022-03-09 14:31:47
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -81,6 +81,12 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
         this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE");
       }
     });
+    this.service.request(this.service.$api_get_getRiskDetail, { id: this.id }).subscribe(res => {
+      if (res) {
+      console.log('风险详情')
+      console.log(res)
+      }
+    });
   }
 
   goBack() {

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-03-09 10:33:44
+ * @LastEditTime : 2022-03-09 13:38:21
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -48,8 +48,8 @@
         <sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv>
         <sv label="外部订单号">{{ i?.externalBillCode }}</sv>
         <sv label="货源编号">{{ i?.resourceCode }} </sv>
-        <sv label="运单号">{{ i?.wayBillId }}</sv>
+        <sv label="运单号">{{ i?.wayBillCode }}</sv>
-        <sv label="承诺付款天数">{{ i?.goodsResource?.dispatchName }}</sv>
+        <sv label="承诺付款天数">{{ i?.paymentDays }}</sv>
       </div>
 
       <nz-tabset style="margin-top: 15px">

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

@@ -135,7 +135,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
         let list :any[] = [];
         points?.forEach((item: any) => {
           list.push({
-            name: item.hgt,
+            name: `${item.spd}km/h`,
             lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
           });
         });

src/app/routes/sys-setting/components/note-management/note-management.component.html

@@ -0,0 +1,29 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-09 14:05:33
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-09 14:26:29
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\note-management\\note-management.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<page-header-wrapper [title]="'短信管理'">
+</page-header-wrapper>
+
+<nz-card class="search-box">
+    <div nz-row nzGutter="8">
+        <div nz-col [nzSpan]="6">
+            <sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90,grid: { span: 24 } }}" [compact]="true"
+                [button]="'none'"></sf>
+        </div>
+        <div nz-col [nzSpan]="8" nzOffset="1">
+            <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl  [acl-ability]="['NOTE-MANAGEMENT-search']">查询</button>
+            <button nz-button (click)="resetSF()">重置</button>
+        </div>
+    </div>
+</nz-card>
+
+<nz-card>
+    <st #st [data]="this.service.$api_listSmsSendLog" [columns]="columns" [req]="{ process: beforeReq }" [loading]="service.http.loading" [page]="{}" ></st>
+</nz-card>

src/app/routes/sys-setting/components/note-management/note-management.component.less

@@ -0,0 +1,13 @@
+:host::ng-deep{
+    .search-box{
+        .ant-card-body{
+            padding-bottom: 18px;
+        }
+    }
+
+    .content-box{
+        .ant-card-body{
+            padding-top: 14px;
+        }
+    }
+}

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

@@ -0,0 +1,75 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-09 14:05:33
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-09 15:18:38
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\note-management\\note-management.component.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFSchema } from '@delon/form';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { SystemService } from '../../services/system.service';
+
+@Component({
+  selector: 'app-note-management',
+  templateUrl: './note-management.component.html',
+  styleUrls: ['../../../commom/less/box.less']
+})
+export class NoTeManagementComponent implements OnInit {
+  @ViewChild('st', { static: true })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+
+  searchSchema: SFSchema = {
+    properties: {
+      cellphone: {
+        type: 'string',
+        title: '手机号',
+        maxLength: 11,
+        ui: { placeholder: '请输入' }
+      }
+    }
+  };
+
+  columns: STColumn[] = [
+    { title: '手机号', className: 'text-center', index: 'cellphone' },
+    {
+      title: '发送时间',
+      index: 'createTime',
+      type: 'date',
+      className: 'text-center'
+    },
+    { title: '短信内容', className: 'text-center', index: 'content',
+    // format: (value) => {
+    //   return JSON.parse(value?.templateParam)?.code
+    // }
+  },
+  ];
+
+  constructor(public service: SystemService, private nzModalService: NzModalService, private route: ActivatedRoute) {
+  }
+
+  ngOnInit(): void {}
+
+  beforeReq = (requestOptions: STRequestOptions) => {
+    if (this.sf) {
+      Object.assign(requestOptions.body, { ...this.sf.value });
+    }
+    return requestOptions;
+  };
+
+
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+  }
+}

src/app/routes/sys-setting/services/system.service.ts

@@ -167,6 +167,8 @@ export class SystemService extends BaseService {
  
  // 营业执照识别
  $api_ocr_recognize_business_license = '/api/mdc/pbc/hwc/ocr/recognizeBusinessLicense';
+ // 短信发送列表
+ $api_listSmsSendLog = '/api/mdc/pbc/smsSend/listSmsSendLog';
  // 身份证识别
  $api_ocr_recognize_id_card = '/api/mdc/pbc/hwc/ocr/recognizeIdCard';
  // 获取字典

src/app/routes/sys-setting/sys-setting-routing.module.ts

@@ -24,12 +24,14 @@ import { SystemConfigComponent } from './components/system-config/system-config.
 import { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component';
 import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component';
 import { NetworkFreightNewComponent } from './components/network-freight/new/new.component';
+import { NoTeManagementComponent } from './components/note-management/note-management.component';
 
 const routes: Routes = [
   { path: 'staff-management', component: StaffManagementComponent },
   { path: 'role-management/user/:type', component: RoleManagementComponent },
   { path: 'role-management/freight/:type', component: RoleManagementComponent },
   { path: 'basic-setting', component: BasicSettingComponent },
+  { path: 'note-management', component: NoTeManagementComponent },
   { path: 'basic-config', component: BasicConfigComponent },
   { path: 'audit-reason-config', component: AuditReasonConfigComponent },
   { path: 'cart-config', component: CartConfigComponent },

src/app/routes/sys-setting/sys-setting.module.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:23:05
- * @LastEditTime : 2022-02-17 15:03:19
+ * @LastEditTime : 2022-03-09 14:08:38
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting.module.ts
@@ -32,6 +32,7 @@ import { CloseAccountComponent } from './components/close-account/close-account.
 import { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component';
 import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component';
 import { NetworkFreightNewComponent } from './components/network-freight/new/new.component';
+import { NoTeManagementComponent } from './components/note-management/note-management.component';
 
 const COMPONENTS = [
   StaffManagementComponent,
@@ -48,7 +49,8 @@ const COMPONENTS = [
   CloseAccountComponent,
   NetworkFreightNewComponent,
   AnnouncementMessageComponent,
-  InsuranceSetComponent
+  InsuranceSetComponent,
+  NoTeManagementComponent
 ];
 const NOTROUTECOMPONENTS = [
   BuyerTranspowerComponent,

src/app/routes/ticket-management/components/express-info/express-info.component.html

@@ -19,11 +19,6 @@
     <div class="mt-md mb-sm">
         <button nz-button nzType="primary" (click)="printOrder()">打印面单</button>
     </div>
-<<<<<<< HEAD
-    <st #st [data]="url" [columns]="columns" [req]="{  process:beforeReq }" [loading]="service.http.loading" [page]="{}" 
-        (change)="stChange($event)" [scroll]="{ x: '1200px' }" ></st>
-=======
     <st #st [data]="url" [columns]="columns" [req]="{  process:beforeReq }" [loading]="service.http.loading" [page]="{}" [scroll]="{x:'1200px'}"
         (change)="stChange($event)"></st>
->>>>>>> 9894aafcc1c3326f1d6dcb9a0c3eb42079a623a9
 </nz-card>

src/app/routes/ticket-management/components/express-info/express-info.component.ts

@@ -40,7 +40,7 @@ export class ExpressInfoComponent implements OnInit {
 
   columns: STColumn[] = [
     { title: '', index: 'key', type: 'checkbox', width: 50 },
-    { title: '快递单号', index: 'expressCode', width: 150 },
+    { title: '快递单号', index: 'expressCode', width: 170 },
     { title: '快递公司', index: 'expresscompany', width: 120 },
     { title: '快递费用', index: 'description', width: 120 },
     {

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

@@ -1,6 +1,5 @@
 @import '../../../../less/edit.less';
 
-
 .user-info {
   font-size: 16px;
 
@@ -9,9 +8,9 @@
   }
 
   img {
-    width        : 64px;
+    width: 64px;
-    height       : 64px;
+    height: 64px;
-    margin-right : 15px;
+    margin-right: 15px;
     border-radius: 50%;
   }
 
@@ -21,22 +20,21 @@
 }
 
 ::ng-deep {
-
   .affix {
     position: fixed;
-    top     : 20px !important;
+    top: 20px !important;
-    z-index : 999 !important;
+    right: 25px;
-    right   : 25px;
+    left: 25px;
-    left    : 25px;
+    z-index: 999 !important;
   }
 
   .alain-pro__menu-side .alain-pro__main {
     .affix {
       position: fixed;
-      top     : 20px !important;
+      top: 20px !important;
-      z-index : 999 !important;
+      right: 25px;
-      right   : 25px;
+      left: 250px;
-      left    : 250px;
+      z-index: 999 !important;
     }
   }
 

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

@@ -31,6 +31,10 @@
         <sv label="所属项目">{{i?.enterpriseProject}}</sv>
         <sv label="服务类型">{{i?.serviceTypeLabel}}</sv>
         <sv label="调度员">{{i?.dispatch?.name}} /{{i?.dispatch?.phone}}</sv>
+        <sv label="外部订单号">{{ i?.externalBillCode }}</sv>
+        <sv label="货源编号">{{ i?.resourceCode }} </sv>
+        <sv label="运单号">{{ i?.wayBillCode }}</sv>
+        <sv label="承诺付款天数">{{ i?.paymentDays }}</sv>
      </div>
      <nz-tabset style="margin-top: 15px;">
       <nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)">

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-02-22 14:30:18
+ * @LastEditTime : 2022-03-09 13:40:42
  * @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-detail\\vehicle-detail.component.html
@@ -31,6 +31,10 @@
         <sv label="所属项目">{{i?.enterpriseProject}}</sv>
         <sv label="服务类型">{{i?.serviceTypeLabel}}</sv>
         <sv label="调度员">{{i?.dispatch?.name}} /{{i?.dispatch?.phone}}</sv>
+        <sv label="外部订单号">{{ i?.externalBillCode }}</sv>
+        <sv label="货源编号">{{ i?.resourceCode }} </sv>
+        <sv label="运单号">{{ i?.wayBillCode }}</sv>
+        <sv label="承诺付款天数">{{ i?.paymentDays }}</sv>
      </div>
      <nz-tabset style="margin-top: 15px;">
       <nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)">

src/app/shared/components/account-detail/account-detail.component.ts

@@ -24,7 +24,7 @@ export class AccountDetailComponent implements OnInit {
 
   ngOnInit(): void {}
   createAccount(item: any, type: '1' | '2') {
-    if (item.pfAccount) {
+    if ((type === '1' && item.paAccount) || (type === '2' && item.pfAccount)) {
       return;
     }
     const params = {

src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts

@@ -30,6 +30,42 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
   @Output()
   clcikPointEvent = new EventEmitter<any>();
 
+  @Input()
+  pois: any = [
+    {
+      id: 'A',
+      position: [116.020764, 39.904989],
+      markerLabel: 'X_A',
+      infoWinContent: 'Hello! A',
+      listDesc: '起',
+      color: '#F5222D'
+    },
+    {
+      id: 'B',
+      position: [116.405285, 39.904989],
+      markerLabel: 'X_B',
+      infoWinContent: 'Hello! B',
+      listDesc: '终',
+      color: '#1890ff'
+    },
+    {
+      id: 'C',
+      position: [116.789806, 39.904989],
+      markerLabel: 'X_C',
+      infoWinContent: 'Hello! C',
+      listDesc: '卸',
+      color: '#1890ff'
+    },
+    {
+      id: 'C',
+      position: [116.789806, 39.904989],
+      markerLabel: 'X_C',
+      infoWinContent: 'Hello! C',
+      listDesc: '装',
+      color: '#F5222D'
+    }
+  ];
+
   constructor(public service: BaseService) {}
   ngOnChanges(changes: SimpleChanges): void {
     if (changes?.pathList?.currentValue && this?.pathSimplifierIns) {
@@ -79,6 +115,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
           // this.service.msgSrv.info('地图加载完成 !');
           this.pathInit();
           // this.setPOIS();
+          // this.loadPOIS();
         });
       })
       .catch(e => {
@@ -86,6 +123,88 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
       });
   }
 
+  loadPOIS() {
+    AMapUI.loadUI(['overlay/SvgMarker'], (SvgMarker: any) => {
+      if (!SvgMarker.supportSvg) {
+        //当前环境并不支持SVG，此时SvgMarker会回退到父类，即SimpleMarker
+        alert('当前环境不支持SVG');
+      }
+
+      //just some colors
+      var colors = ['#F5222D', '#1890ff'];
+
+      //SvgMarker.Shape下的Shape
+      var shapeKeys = ['WaterDrop'];
+
+      var colNum = 2,
+        rowNum = shapeKeys.length;
+      const markers: any[] = [];
+
+      this.pois.forEach((d: any) => {
+        //创建shape
+        const shape = new SvgMarker.Shape['WaterDrop']({
+          height: 40,
+          strokeWidth: 1,
+          strokeColor: '#ccc',
+          fillColor: '#F5222D'
+        });
+
+        markers.push(
+          new SvgMarker(shape, {
+            map: this.aMap,
+            position: d.position,
+            containerClassNames: 'shape-' + 'WaterDrop',
+            iconLabel: {
+              innerHTML: d.listDesc,
+              style: {
+                top: 7 + 'px'
+              }
+            },
+            showPositionPoint: true
+          })
+        );
+      });
+      console.log(markers);
+
+      // var pxCenter = this.aMap.lnglatToPixel(this.aMap.getCenter());
+
+      // var startX = pxCenter.getX(),
+      //   startY = pxCenter.getY();
+
+      // for (var c = 0; c < colNum; c++) {
+      //   for (var r = 0; r < rowNum; r++) {
+      //     var idx = r * colNum + c;
+
+      //     if (!colors[idx]) {
+      //       continue;
+      //     }
+
+      //     var x = startX + (c - colNum / 2) * 70;
+      //     var y = startY + 50 + (r - rowNum / 2) * 80;
+
+      //     var labelCenter = shape.getCenter();
+
+      //     var position = this.aMap.pixelToLngLat(new AMap.Pixel(x, y));
+
+      //     markers.push(
+      //       new SvgMarker(shape, {
+      //         map: this.aMap,
+      //         position: position,
+      //         containerClassNames: 'shape-' + shapeKeys[r],
+      //         iconLabel: {
+      //           innerHTML: String.fromCharCode('A'.charCodeAt(0) + c),
+      //           style: {
+      //             top: labelCenter[1] - 9 + 'px'
+      //           }
+      //         },
+      //         showPositionPoint: true
+      //       })
+      //     );
+      //   }
+      // }
+    });
+  }
+
   pathInit() {
     this.pathSimplifierIns = new AMapUI.PathSimplifier({
       zIndex: 100,
@@ -103,6 +222,8 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
         return lnglatList;
       },
       getHoverTitle: function (pathData: any, pathIndex: any, pointIndex: any) {
+        console.log(pathData, pointIndex);
+
         if (pointIndex >= 0) {
           //point
           return pathData.name + '，' + pathData.points[pointIndex].name;
@@ -256,7 +377,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
 
   setPathIndex(index: number) {
     this.pathSimplifierIns.setSelectedPathIndex(index);
-    this.startNav();
+    // this.startNav();
   }
 
   startNav() {

src/assets/mocks/menu-data.json

@@ -474,6 +474,10 @@
                 "text": "CRM客户管理",
                 "link": "/system/crm-management"
               },
+              {
+                "text": "短信管理",
+                "link": "/system/note-management"
+              },
               {
                 "text": "结算客户管理",
                 "link": "/system/close-account"