From 78329f292ccb596af1fad0ea2cb9a9f79aa5daa0 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 6 Jan 2022 10:57:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract-template-detail.component.html   |  6 ++--
 .../contract-template-detail.component.ts     | 28 +++++++++++--------
 .../contract-template.component.html          |  6 ++--
 .../contract-template.component.ts            | 14 +++++-----
 .../services/contract-management.service.ts   | 10 ++++++-
 .../components/vehicle/vehicle.component.ts   | 21 ++++++++++++--
 .../services/order-management.service.ts      |  5 ++--
 .../onecar-publish.component.ts               |  4 +++
 .../release-publish.component.ts              |  4 +++
 .../update-freight.component.ts               |  5 +++-
 .../vehicle-detail.component.html             | 25 ++---------------
 .../vehicle-detail.component.ts               | 11 ++++++--
 12 files changed, 82 insertions(+), 57 deletions(-)

diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html
index 9722a48a..27b03f7b 100644
--- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html
+++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-05 11:01:55
- * @LastEditTime: 2022-01-05 13:47:31
+ * @LastEditTime: 2022-01-06 10:23:19
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-template-detail\contract-template-detail.component.html
@@ -30,14 +30,14 @@
 
 <nz-card>
   <div nz-col nzSpan="20" style="overflow: scroll">
-    <nz-card class="card-height" *ngIf="isUpdate">
+    <nz-card class="card-height" *ngIf="!isUpdate">
       <div class="mb-md">
         <div></div>
       </div>
       <div [innerHTML]="templateHTML | safehtml"></div>
     </nz-card>
 
-    <nz-card class="card-height" *ngIf="!isUpdate">
+    <nz-card class="card-height" *ngIf="isUpdate">
       <div nz-row nzGutter="8">
         <div nz-col nzSpan="24">
           <input nz-input placeholder="请输入合同标题" [(ngModel)]="title" />
diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
index 2ce18fb9..ead1e452 100644
--- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
+++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-05 11:01:55
- * @LastEditTime: 2022-01-05 13:51:44
+ * @LastEditTime: 2022-01-06 10:29:11
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-template-detail\contract-template-detail.component.ts
@@ -47,14 +47,18 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   ngOnInit() {
     this.initSF()
     this.initSF2()
-    if(this.route.snapshot.queryParams.status == 3) {
+    if(this.route.snapshot.queryParams.status == 1) {
       console.log('进来了吗')
       // 新建
-      this.isUpdate = false;
-    } else {
+      this.isUpdate = true;
+    } else  if(this.route.snapshot.queryParams.status == 2) {
       // 编辑
       this.textStatus = '编辑模板';
-      this.isUpdate =true;
+      this.isUpdate =false;
+    }else  if(this.route.snapshot.queryParams.status == 3) {
+      // 编辑
+      this.textStatus = '查看模板';
+      this.isUpdate =false;
     }
 
     console.log(this.route.snapshot.params.id)
@@ -66,13 +70,13 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   initSF() {
     this.schema = {
       properties: {
-        phon: {
+        templateName: {
           type: 'string',
           title: '模版名称',
         },
-        stateReceipt: {
+        templateType: {
           type: 'string',
-          title: '是否回单',
+          title: '模版类型',
           enum: [
             { label: '需要', value: true },
             { label: '不需要', value: false }
@@ -83,14 +87,14 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
             placeholder: '请选择'
           }
         },
-        enterpriseProjectId: {
+        contractType: {
           type: 'string',
-          title: '项目',
+          title: '单据类型',
           ui: {
             widget: 'select',
             placeholder: '请选择',
             visibleIf: {
-              stateReceipt: value => value === true
+              templateType: value => value === true
             }
           } as SFSelectWidgetSchema
         },
@@ -106,7 +110,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   initSF2(data?: any) {
     this.schema2 = {
       properties: {
-        content: {
+        templateContent: {
           type: 'string',
           title: '',
           ui: {
diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.html b/src/app/routes/contract-management/components/contract-template/contract-template.component.html
index 5b9ec49e..69b6ea1d 100644
--- a/src/app/routes/contract-management/components/contract-template/contract-template.component.html
+++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-05 13:38:56
+ * @LastEditTime: 2022-01-06 10:19:10
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@@ -47,7 +47,7 @@
     <st
     #st
     [bordered]="true"
-    [data]="service.$api_get_operate_listPage"
+    [data]="service.$api_get_contractTemplate_page"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
@@ -55,7 +55,7 @@
     [loadingDelay]="500"
     [loading]="service.http.loading"
     >
-    <ng-template st-row="complaintCode" let-item let-index="index">
+    <ng-template st-row="templateName" let-item let-index="index">
       <a (click)="view(item)">{{item.complaintCode}}</a>
     </ng-template>
     </st>
diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
index 31beb7a2..ac7e3186 100644
--- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
+++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
@@ -69,11 +69,11 @@ export class OrderManagementTemplateComponent implements OnInit {
   initSF() {
     this.schema = {
       properties: {
-        complaintCode: {
+        templateName: {
           type: 'string',
           title: '模板名称',
         },
-        serviceType: {
+        templateType: {
           title: '模板类型',
           type: 'string',
           default: '',
@@ -99,23 +99,23 @@ export class OrderManagementTemplateComponent implements OnInit {
       {
         title: '合同模板名称',
         className: 'text-center',
-        render: 'complaintCode'
+        render: 'templateName'
       },
       {
         title: '模板类型',
         className: 'text-center',
-        index: 'wayBillCode'
+        index: 'templateType'
       },
       {
         title: '单据类型',
-        index: 'complainantTime',
+        index: 'contractType',
         className: 'text-center',
       },
-      { title: '创建人', index: 'driverId', width: '120px', className: 'text-center' },
+      { title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' },
       {
         title: '创建时间',
         className: 'text-center',
-        render: 'complainant'
+        index: 'createTime'
       },
       {
         title: '操作',
diff --git a/src/app/routes/contract-management/services/contract-management.service.ts b/src/app/routes/contract-management/services/contract-management.service.ts
index 850d3b98..05abb90b 100644
--- a/src/app/routes/contract-management/services/contract-management.service.ts
+++ b/src/app/routes/contract-management/services/contract-management.service.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-04 21:05:49
- * @LastEditTime: 2022-01-05 09:51:54
+ * @LastEditTime: 2022-01-06 10:15:44
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\contract-management\services\contract-management.service.ts
@@ -17,6 +17,14 @@ export class ContractManagementService extends BaseService {
   $api_get_getPremiumInformationPage = `/api/sdc/billOperate/listPremiumInformationPage`;
      // 查询投诉列表
      $api_get_operate_listPage = `/api/sdc/complaint/operate/listPage`;
+     // 新增/更新信息
+     $api_save_contractTemplate = `/api/sdc/contractTemplate/save`;
+     // 查询合同模板表
+     $api_get_contractTemplate_page = `/api/sdc/contractTemplate/list/page`;
+     // 查询合同模板表详情
+     $api_get_contractTemplate = `/api/sdc/contractTemplate/get`;
+     // 删除合同模板
+     $api_deletebatch_contractTemplate = `/api/sdc/contractTemplate/deletebatch`;
   constructor(public injector: Injector) {
     super(injector);
   }
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 50015f65..d8e6c6b0 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -138,7 +138,24 @@ resourceStatus: any;
         },
         shipperAppUserId: {
           type: 'string',
-          title: '货主'
+          title: '货主',
+          ui: {
+            widget: 'select',
+            serverSearch: true,
+            searchDebounceTime: 300,
+            searchLoadingText: '搜索中...',
+            onSearch: (q: any) => {
+              console.log(q)
+              if (!!q) {
+                return this.service
+                  .request(this.service.$api_enterpriceList, { enterpriseName: q})
+                  .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
+                  .toPromise();
+              } else {
+                return of([]);
+              }
+            },
+          } as SFSelectWidgetSchema,
         },
         loadingPlace: {
           type: 'string',
@@ -272,7 +289,7 @@ resourceStatus: any;
             },
           },
         },
-        enterpriseInfoName: {
+        enterpriseInfoId: {
           type: 'string',
           title: '网络货运人',
           ui: {
diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts
index ec95044e..291d7168 100644
--- a/src/app/routes/order-management/services/order-management.service.ts
+++ b/src/app/routes/order-management/services/order-management.service.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2022-01-05 15:46:04
+ * @LastEditTime: 2022-01-06 09:27:56
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\services\order-management.service.ts
@@ -125,7 +125,8 @@ export class OrderManagementService extends ShipperBaseService {
 
 
 
-
+    // 获取货主企业列表
+    public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
     /**
    * 根据企业ID，获取企业历史网络货运人
    * @returns
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
index 1f480877..cb3e2794 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
@@ -521,6 +521,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
         prePay: {
           type: 'number',
           title: '预付',
+          minimum: 0,
           default: 0,
           ui: {
             prefix: '￥',
@@ -530,18 +531,21 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
         toPay: {
           type: 'number',
           title: '到付',
+          minimum: 0,
           default: 0,
           ui: { prefix: '￥', change: args => this.payChange() } as SFNumberWidgetSchema
         },
         oilCardPay: {
           type: 'number',
           title: '油卡',
+          minimum: 0,
           default: 0,
           ui: { prefix: '￥', change: args => this.payChange() } as SFNumberWidgetSchema
         },
         receiptPay: {
           type: 'number',
           title: '回单付',
+          minimum: 0,
           default: 0,
           ui: { prefix: '￥', change: args => this.payChange() } as SFNumberWidgetSchema
         },
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
index 6a3e4bb1..c40581ba 100644
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
@@ -491,6 +491,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
            type: 'number',
            title: '预付',
            default: 0,
+           minimum: 0,
            ui: {
              prefix: '￥',
              change: args => this.payChange()
@@ -499,18 +500,21 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
          toPay: {
            type: 'number',
            title: '到付',
+           minimum: 0,
            default: 0,
            ui: { prefix: '￥', change: args => this.payChange() } as SFNumberWidgetSchema
          },
          oilCardPay: {
            type: 'number',
            title: '油卡',
+           minimum: 0,
            default: 0,
            ui: { prefix: '￥', change: args => this.payChange() } as SFNumberWidgetSchema
          },
          receiptPay: {
            type: 'number',
            title: '回单付',
+           minimum: 0,
            default: 0,
            ui: { prefix: '￥', change: args => this.payChange() } as SFNumberWidgetSchema
          },
diff --git a/src/app/routes/supply-management/components/update-freight/update-freight.component.ts b/src/app/routes/supply-management/components/update-freight/update-freight.component.ts
index 0c2eed6e..bb5558f0 100644
--- a/src/app/routes/supply-management/components/update-freight/update-freight.component.ts
+++ b/src/app/routes/supply-management/components/update-freight/update-freight.component.ts
@@ -43,6 +43,7 @@ export class SupplyManagementUpdateFreightComponent implements OnInit {
         owner1: {
           type: 'number',
           title: '预付',
+          minimum: 0,
           max: 99999999,
           ui: {
             prefix: '￥',
@@ -54,6 +55,7 @@ export class SupplyManagementUpdateFreightComponent implements OnInit {
         callNo1: {
           type: 'number',
           title: '到付',
+          minimum: 0,
           ui: {
             prefix: '￥',
             widgetWidth: 200,
@@ -64,6 +66,7 @@ export class SupplyManagementUpdateFreightComponent implements OnInit {
         href1: {
           type: 'number',
           title: '油卡',
+          minimum: 0,
           ui: {
             prefix: '￥',
             widgetWidth: 200,
@@ -72,7 +75,7 @@ export class SupplyManagementUpdateFreightComponent implements OnInit {
           } as SFNumberWidgetSchema
         },
         description5: {
-          type: 'number', title: '回单付', maxLength: 140, ui: {
+          type: 'number', title: '回单付',  minimum: 0, maxLength: 140, ui: {
             prefix: '￥',
             widgetWidth: 200,
             precision: 2,
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
index 4baced7c..6c167589 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
@@ -124,36 +124,15 @@
         {{i?.goodsValue}}
       </sv>
       <sv label="保价费金额">
-        {{i?.insuranceAmount |currency}} 元
+        {{i?.insuranceAmount |currency: '￥'}} 元
       </sv>
     </sv-container>
   </nz-card>
-  <!-- <nz-card nzTitle="运费信息（到货后15天内支付运费）">
-    <st [data]="i?.expenseList" [columns]="expenseColumns" [page]="{show:false}">
-      <ng-template st-row="total" let-item>
-        <div>
-          {{(item.price * item.rate) | currency}}
-          <span>(含附加费）</span>
-        </div>
-      </ng-template>
-    </st>
-    <div class="freight-info-box mt-md" nz-row>
-      <div nz-col nzSpan="24">
-        <h3>
-          <label>总计 :</label>
-          <span class="text-error-dark text-xl">
-            {{totalExpensePrice | currency}}
-          </span>
-          <span>（运费￥3500.00含附加运费￥191.98）</span>
-        </h3>
-      </div>
-    </div>
-  </nz-card> -->
   <nz-card [nzTitle]="'运费信息（到货后'+i?.paymentDays+'天内支付运费）'">
     <st [data]="i?.expenseVOList" [columns]="expenseColumns" [page]="{show:false}">
       <ng-template st-row="total" let-item>
         <div>
-          {{(item.price * item.rate) | currency}}
+          {{(item.price * item.rate) | currency: '￥'}}
           <span>(含附加费）</span>
         </div>
       </ng-template>
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
index 7ca0b8d7..da8237a1 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
@@ -63,14 +63,19 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
 
   ngOnInit(): void {
     this.getGoodsSourceDetail()
+    console.log('4444')
   }
 
   getGoodsSourceDetail() {
     this.service.request(this.service.$api_get_getCompleteVehicleDetail, { id: this.id }).subscribe(res => {
-      const expenseList = res?.expenseList || [];
+      console.log('888')
+      console.log(this.i)
+      const expenseList = res?.expenseVOList || [];
       this.totalExpensePrice = 0;
-      this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
-      this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
+      this.attObj = res?.expenseVOList?.filter((data: any) => data.expenseCode === 'ATT')[0];
+      this.totalObj = res?.expenseVOList?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
+      console.log(this.attObj)
+      console.log(this.totalObj)
       expenseList.forEach((e: any) => {
         this.totalExpensePrice += e?.price * e?.rate;
       });