From 10d2fc015016903b7ec32fbdbe5f01fa0bcc8d6a Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 20 Jan 2022 10:44:35 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bulk/bulk.component.ts                 | 10 +++++-----
 .../components/vehicle/vehicle.component.ts           | 11 ++++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts
index 62c9c0d0..6921d239 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -457,17 +457,17 @@ export class OrderManagementBulkComponent implements OnInit {
         width: '120px',
         className: 'text-left',
         buttons: [
-          {
-            text: '查看评价　',
-            click: _record => this.viewEvaluate(_record),
-            iif: item => item.billStatus == '5'
-          },
           {
             text: '运费变更记录',
             click: _record => this.OpenPrice(_record),
             iif: item =>
               item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6'
           },
+          {
+            text: '查看评价　',
+            click: _record => this.viewEvaluate(_record),
+            iif: item => item.billStatus == '5'
+          },
           {
             text: '变更运费　',
             click: _record => this.updateFreight(_record),
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
index 3f39db6c..6552d953 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -413,16 +413,17 @@ resourceStatus: any;
         width: '120px',
         className: 'text-left',
         buttons: [
-          {
-            text: '查看评价　',
-            click: (_record) => this.viewEvaluate(_record),
-            iif: item => item.billStatus == '5',
-          },
+         
           {
             text: '运费变更记录',
             click: (_record) => this.OpenPrice(_record),
             iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', 
           },
+          {
+            text: '查看评价　',
+            click: (_record) => this.viewEvaluate(_record),
+            iif: item => item.billStatus == '5',
+          },
           {
             text: '变更运费　',
             click: (_record) => this.updateFreight(_record),

From 2d3d12bdacfa3f44de266d0d4b8d5fef31d85c24 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 20 Jan 2022 10:56:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/mocks/menu-data.json | 36 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 50ee786e..e8c10f01 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -263,6 +263,24 @@
                 "text": "收款单",
                 "link": "/financial-management/receipt-order"
               },
+              {
+                "text": "应收核销",
+                "link": "/financial-management/receivable-order"
+              },
+              {
+                "text": "应收核销详情",
+                "hide": true,
+                "link": "/financial-management/receivable-order/detail/:id"
+              },
+              {
+                "text": "应付核销",
+                "link": "/financial-management/payable-order"
+              },
+              {
+                "text": "应收核销详情",
+                "hide": true,
+                "link": "/financial-management/payable-order/detail/:id"
+              },
               {
                 "text": "货主账户",
                 "link": "/financial-management/freight-account"
@@ -305,24 +323,6 @@
               {
                 "text": "交易流水",
                 "link": "/financial-management/transaction-flow"
-              },
-              {
-                "text": "应收核销",
-                "link": "/financial-management/receivable-order"
-              },
-              {
-                "text": "应收核销详情",
-                "hide": true,
-                "link": "/financial-management/receivable-order/detail/:id"
-              },
-              {
-                "text": "应付核销",
-                "link": "/financial-management/payable-order"
-              },
-              {
-                "text": "应收核销详情",
-                "hide": true,
-                "link": "/financial-management/payable-order/detail/:id"
               }
             ]
           },

From 6bfc7192451dcf1f4d96bea08cc3ae58e52bda28 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 20 Jan 2022 13:34:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 proxy.conf.js                                 |   4 +-
 .../receipt-order/receipt-order.component.ts  |   2 +-
 .../bulk-detail/bulk-detail.component.html    | 107 ++++++++++--------
 .../bulk-detail/bulk-detail.component.ts      |  15 ++-
 .../components/bulk/bulk.component.ts         |  13 ---
 .../services/supply-management.service.ts     |   6 +-
 6 files changed, 76 insertions(+), 71 deletions(-)

diff --git a/proxy.conf.js b/proxy.conf.js
index eeaa5ac8..60203285 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-19 20:50:35
+ * @LastEditTime : 2022-01-20 11:12:31
  * @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
     },
diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
index 7c3a1882..e0eac603 100644
--- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
+++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
@@ -257,7 +257,7 @@ export class ReceiptOrderComponent implements OnInit {
       { title: '银行水单', index: 'bankreceipt', width: 200, className: 'text-left' },
       { title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-left' },
       { title: '创建人', index: 'createUserId', width: 150, className: 'text-left' },
-      { title: '收款状态', index: 'sts', width: 200, className: 'text-left' },
+      { title: '收款状态', index: 'stsLabel', width: 200, className: 'text-left' },
       { title: '收款备注', index: 'remarks', width: 200, className: 'text-left' },
       {
         title: '操作',
diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
index 55d8005d..7189e67c 100644
--- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
@@ -7,31 +7,32 @@
     </ng-template>
     <ng-template #headerContent>
       <div class="mb-xs" nz-row>
-        <button nz-button nzType="primary" nzSize="small" nzDanger>{{i?.resourceStatusLabel}}</button>
+        <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
         <h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
       </div>
       <div nz-row>
-        <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{i?.shipperAppUserName}}</div>
+        <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div>
         <div nz-col nzSpan="10">
-          <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus  === '1'">取消货源</button>
-          <button nz-button (click)="assignedCar(i)"
-            *ngIf="i?.resourceStatus  === '1' && i?.serviceType === '2'">重新指派</button>
+          <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'">取消货源</button>
+          <button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'">重新指派</button>
           <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'">修改单价</button>
           <button nz-button nzType="primary" nzGhost (click)="placeOrder(i)">再下一单</button>
         </div>
       </div>
       <div class="mt-sm mb-sm" nz-row>
         <div>
-          <b>总费用：<span class="text-red-light text-md">{{i?.totalAmount | currency: '¥'}}</span></b>
+          <b
+            >总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b
+          >
         </div>
       </div>
       <nz-divider></nz-divider>
       <div sv-container *ngIf="i">
-        <sv label="项目">{{i?.enterpriseProjectId}}</sv>
-        <sv label="截止时间">{{i?.deadlineTime}}</sv>
-        <sv label="录单员">{{i?.createUserName}}/{{i?.createUserPhone}}</sv>
-        <sv label="调度员">{{i?.dispatchName}}/{{i?.dispatchPhone}} </sv>
-        <sv label="服务类型">{{i?.serviceTypeLabel}} </sv>
+        <sv label="项目">{{ i?.enterpriseProjectId }}</sv>
+        <sv label="截止时间">{{ i?.deadlineTime }}</sv>
+        <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
+        <sv label="调度员">{{ i?.dispatchName }}/{{ i?.dispatchPhone }} </sv>
+        <sv label="服务类型">{{ i?.serviceTypeLabel }} </sv>
       </div>
     </ng-template>
   </page-header-wrapper>
@@ -39,13 +40,19 @@
     <div class="approval-status">
       <div style="width: 60%; margin: 0 auto">
         <nz-steps style="width: 70%; margin: 0 auto" [nzLabelPlacement]="'vertical'">
-          <nz-step [nzStatus]="i?.resourceStatus !== '1'?'finish':'process'" nzIcon="solution"
-            [nzDescription]="i?.createAt" nzTitle="下单"></nz-step>
-          <nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2' "
-            [nzStatus]="i?.resourceStatus=== '1'? 'wait':'finish'" nzIcon="file-done"
-            [nzTitle]="i?.resourceStatus === '2'?'已完结':'完结'"></nz-step>
+          <nz-step
+            [nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'"
+            nzIcon="solution"
+            [nzDescription]="i?.createAt"
+            nzTitle="下单"
+          ></nz-step>
+          <nz-step
+            *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
+            [nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'"
+            nzIcon="file-done"
+            [nzTitle]="i?.resourceStatus === '2' ? '已完结' : '完结'"
+          ></nz-step>
           <nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
-
         </nz-steps>
       </div>
     </div>
@@ -56,20 +63,14 @@
       <sv-title>货物信息</sv-title>
       <ng-container *ngFor="let item of i?.goodsInfoList">
         <sv label="货物名称">
-          {{item?.goodsName}}
-        </sv>
-        <sv label="货物数量">
-          {{item?.weight}}顿 | {{item?.volume}}方
-        </sv>
-        <sv label="剩余">
-          {{10}}顿 | {{10}}方
-        </sv>
-        <sv label="用车需求">
-          {{item?.maxWeight}} | {{item?.maxCube}}米
+          {{ item?.goodsName }}
         </sv>
+        <sv label="货物数量"> {{ item?.weight }}顿 | {{ item?.volume }}方 </sv>
+        <sv label="剩余"> {{ 10 }}顿 | {{ 10 }}方 </sv>
+        <sv label="用车需求"> {{ item?.maxWeight }} | {{ item?.maxCube }}米 </sv>
         <sv label="承运信息">
-          {{i?.carrierInformationVO?.driverName}} / {{i?.carrierInformationVO?.driverTelephone}} /
-          {{i?.carrierInformationVO?.driverLicensePlate}}
+          {{ i?.carrierInformationVO?.driverName }} / {{ i?.carrierInformationVO?.driverTelephone }} /
+          {{ i?.carrierInformationVO?.driverLicensePlate }}
         </sv>
         <!-- <sv label="当前指派">
           <a (click)="viewCurrentAssign(i)">查看</a>
@@ -77,10 +78,12 @@
       </ng-container>
     </sv-container>
     <div class="mt-md">
-      <h4 class="text-md">装货卸货信息
-        <span class="ml-sm text-sm">(
-          <label>{{i?.loadingCount || '一'}}装</label>
-          <label>{{i?.unloadingCount || '一'}}卸</label>
+      <h4 class="text-md"
+        >装货卸货信息
+        <span class="ml-sm text-sm"
+          >(
+          <label>{{ i?.loadingCount || '一' }}装</label>
+          <label>{{ i?.unloadingCount || '一' }}卸</label>
           )
         </span>
       </h4>
@@ -91,8 +94,8 @@
               <div *ngIf="item?.type === '1'" class="loading-row">
                 <div class="handling-info-icon loading-bg">装</div>
                 <div class="info">
-                  <h4>装货地：{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}</h4>
-                  <p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
+                  <h4>装货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4>
+                  <p>联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}</p>
                 </div>
               </div>
             </div>
@@ -105,8 +108,8 @@
               <div *ngIf="item?.type === '2'" class="loading-row">
                 <div class="handling-info-icon unloaing-bg">卸</div>
                 <div class="info">
-                  <h4>卸货地：{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}</h4>
-                  <p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
+                  <h4>卸货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4>
+                  <p>联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}</p>
                 </div>
               </div>
             </div>
@@ -122,15 +125,13 @@
       <div nz-row>
         <div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24">
           <div>
-            <p class="text-warning-light mb-xs text-right">到货后{{i?.paymentDays}}天内支付运费</p>
-            <p class="mb-xs text-right">
-              {{settlementBasis[item?.settlementBasis]}}，{{rule[item?.rule]}}</p>
+            <p class="text-warning-light mb-xs text-right">到货后{{ i?.paymentDays }}天内支付运费</p>
+            <p class="mb-xs text-right"> {{ settlementBasis[item?.settlementBasis] }}，{{ rule[item?.rule] }}</p>
           </div>
           <nz-divider class="mb-xs mt-xs"></nz-divider>
           <div class="text-right">
             <label>单价：</label>
-            <span class="text-error-dark text-xxl">{{item?.freightPrice | currency: '￥'}}
-              {{freightType[item?.freightType]}}</span>
+            <span class="text-error-dark text-xxl">{{ item?.freightPrice | currency: '￥' }} {{ freightType[item?.freightType] }}</span>
           </div>
         </div>
       </div>
@@ -139,7 +140,8 @@
   <nz-card nzTitle="关联运单">
     <sv-container col="5">
       <sv [label]="item?.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList">
-        (<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span>)
+        (<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span
+        >)
       </sv>
       <!-- <sv label="运输中">
         (<span [ngClass]="{ 'text-primary': i?.id > 0 }">{{ i?.id }}</span>)
@@ -158,24 +160,31 @@
   <nz-card nzTitle="补充信息">
     <sv-container>
       <sv label="是否回单">
-        {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}}
+        {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
       </sv>
       <sv label="回单类型">
-        {{i?.supplementaryInformationVO?.receiptTypeLabel}}
+        {{ i?.supplementaryInformationVO?.receiptTypeLabel }}
       </sv>
       <sv label="所在地区">
-        {{i?.supplementaryInformationVO?.area}}
+        {{ i?.supplementaryInformationVO?.area }}
       </sv>
       <sv label="详细地址">
-        {{i?.supplementaryInformationVO?.address}}
+        {{ i?.supplementaryInformationVO?.address }}
       </sv>
       <sv label="备注">
-        {{i?.supplementaryInformationVO?.remarks}}
+        {{ i?.supplementaryInformationVO?.remarks }}
       </sv>
     </sv-container>
   </nz-card>
   <nz-card nzTitle="操作日志">
-    <st #st [data]="i?.auditRecordList" [columns]="logColumns" [page]="{ show: false, showSize: false }">
+    <st
+      #st
+      [data]="service.$api_getOperationLogRecordsList"
+      [columns]="logColumns"
+      [page]="{ show: false, showSize: false }"
+      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    >
     </st>
   </nz-card>
 </div>
diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts
index 27ba1d8a..ac6c1bb2 100644
--- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts
@@ -18,9 +18,9 @@ export class SupplyManagementBulkDetailComponent implements OnInit {
   id = this.route.snapshot.params.id;
   i: any;
   logColumns: STColumn[] = [
-    { title: '内容', index: 'theme' },
-    { title: '操作人', index: 'operationUserPhone' },
-    { title: '操作时间', index: ' createTime' },
+    { title: '内容', index: 'operationContent' },
+    { title: '操作人', index: 'operator' },
+    { title: '操作时间', index: ' operatorTimestamp' },
   ];
   driverColums: STColumn[] = [
     { title: '司机姓名', index: 'theme' },
@@ -62,13 +62,18 @@ export class SupplyManagementBulkDetailComponent implements OnInit {
     2: '抹除小数',
     3: '抹除个数'
   } // 取整规则
-
+  get reqParams() {
+    return { 
+      operateObject: this.i?.resourceCode,
+      operateType: 4,
+     };
+  }
   currentStatus = 0;
 
   constructor(
     private route: ActivatedRoute,
     private msgSrv: NzMessageService,
-    private service: SupplyManagementService,
+    public service: SupplyManagementService,
     private modal: NzModalService,
     private router: Router
   ) {
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts
index 163459f6..cd9b82ee 100644
--- a/src/app/routes/supply-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts
@@ -72,19 +72,6 @@ export class SupplyManagementBulkComponent implements OnInit {
         end: this.sf?.value?.deadlineTime?.[1] || '',
       },
      };
-
-    // const a:any = {};
-    // if(this.resourceStatus) {
-    //   a.resourceStatus = this.resourceStatus 
-    // }
-    // return {
-    //   ...a,
-    //   ...this.sf?.value,
-    //   createTime: {
-    //     start: this.sf.value.createTime?.[0] || null,
-    //     end: this.sf.value.createTime?.[1] || null,
-    //   }
-    // };
   }
   search() {
     this.st?.load(1);
diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts
index 994dcb65..84938452 100644
--- a/src/app/routes/supply-management/services/supply-management.service.ts
+++ b/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-01-18 17:29:25
+ * @LastEditTime : 2022-01-20 10:57:13
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -102,6 +102,10 @@ export class SupplyManagementService extends BaseService {
   // 货源审核【批量】
   public $api_batchGoodsResourceAudit = '/api/sdc/goodsResourceOperate/batchGoodsResourceAudit';
 
+
+  // 获取操作日志列表
+  public $api_getOperationLogRecordsList = '/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList';
+
   constructor(public injector: Injector) {
     super(injector);
   }