From ec51030da06e89274cf129cf47f231ca96b53806 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 28 Dec 2021 10:51:30 +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

---
 .../bulk-detail/bulk-detail.component.html    |  4 +-
 .../bulk-detail/bulk-detail.component.less    | 30 ++++----
 .../bulk-detail/bulk-detail.component.html    | 20 ++---
 .../bulk-publish/bulk-publish.component.ts    | 41 ++--------
 .../onecar-publish.component.ts               | 77 ++++++++-----------
 .../vehicle-detail.component.html             | 72 +++++++++--------
 .../close-account/close-account.component.ts  |  1 +
 .../crm-management.component.ts               |  1 +
 8 files changed, 111 insertions(+), 135 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
index 2780e2eb..b9d5900b 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-28 09:54:53
+ * @LastEditTime: 2021-12-28 10:46:37
  * @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\components\vehicle-detail\vehicle-detail.component.html
@@ -35,7 +35,7 @@
         <sv label="录单员">{{i?.goodsResource?.[0]?.dispatchName}} 18100000000 </sv>
         <sv label="调度员">{{i?.goodsResource?.[0]?.dispatchName}} </sv>
      </div>
-     <nz-tabset nzType="card" style="margin-top: 15px;">
+     <nz-tabset style="margin-top: 15px;">
       <nz-tab [nzTitle]="tempt" >
         <ng-template #tempt>
           <nz-anchor>
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less
index 351913ec..1d17aeb7 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less
@@ -35,23 +35,23 @@
             }
         }
 
-        .ant-tabs-top>.ant-tabs-nav,
-        .ant-tabs-bottom>.ant-tabs-nav,
-        .ant-tabs-top>div>.ant-tabs-nav,
-        .ant-tabs-bottom>div>.ant-tabs-nav {
-            margin: 0;
-        }
+        // .ant-tabs-top>.ant-tabs-nav,
+        // .ant-tabs-bottom>.ant-tabs-nav,
+        // .ant-tabs-top>div>.ant-tabs-nav,
+        // .ant-tabs-bottom>div>.ant-tabs-nav {
+        //     margin: 0;
+        // }
 
-        .ant-anchor-ink::before {
-            width: 0;
-        }
+        // .ant-anchor-ink::before {
+        //     width: 0;
+        // }
 
-        .ant-tabs-card.ant-tabs-top>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
-        .ant-tabs-card.ant-tabs-bottom>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
-        .ant-tabs-card.ant-tabs-top>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
-        .ant-tabs-card.ant-tabs-bottom>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab {
-            margin-left: 40px
-        }
+        // .ant-tabs-card.ant-tabs-top>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
+        // .ant-tabs-card.ant-tabs-bottom>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
+        // .ant-tabs-card.ant-tabs-top>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
+        // .ant-tabs-card.ant-tabs-bottom>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab {
+        //     margin-left: 40px
+        // }
     }
 
     .leftPadding {
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 1a3c6aa9..1fbf408f 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
@@ -56,16 +56,16 @@
       <sv-title>货物信息</sv-title>
       <ng-container *ngFor="let item of i?.goodsInfoList">
         <sv label="货物名称">
-          {{item.goodsName}}
+          {{item?.goodsName}}
         </sv>
         <sv label="货物数量">
-          {{item.weight}}顿 | {{item.volume}}方
+          {{item?.weight}}顿 | {{item?.volume}}方
         </sv>
         <sv label="剩余">
           {{10}}顿 | {{10}}方
         </sv>
         <sv label="用车需求">
-          {{item.maxWeight}} | {{item.maxCube}}米
+          {{item?.maxWeight}} | {{item?.maxCube}}米
         </sv>
         <sv label="承运信息">
           {{i?.carrierInformationVO?.driverName}} / {{i?.carrierInformationVO?.driverTelephone}} /
@@ -88,11 +88,11 @@
         <div nz-col [nzSpan]="12">
           <div class="handling-info p-md">
             <div class="flex" *ngFor="let item of i?.unLoadingPlaceVOList">
-              <div *ngIf="item.type === '1'" class="loading-row">
+              <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>
@@ -102,11 +102,11 @@
         <div nz-col [nzSpan]="12">
           <div class="handling-info p-md">
             <div class="flex" *ngFor="let item of i?.unLoadingPlaceVOList">
-              <div *ngIf="item.type === '2'" class="loading-row">
+              <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>
@@ -138,7 +138,7 @@
   </nz-card>
   <nz-card nzTitle="关联运单">
     <sv-container col="5">
-      <sv [label]="item.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList">
+      <sv [label]="item?.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList">
         (<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span>)
       </sv>
       <!-- <sv label="运输中">
diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
index 5c9a1d21..3f8a4ccb 100644
--- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
+++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
@@ -328,49 +328,24 @@ export class  SupplyManagementBulkPublishComponent implements OnInit {
         maxWeight: {
           type: 'string',
           title: '车型/车长',
-
-          enum: [
-            { label: '1', value: '1' },
-            { label: '2', value: '2' }
-          ],
           ui: {
-            widget: 'select',
-            placeholder: '请选择车型',
+            widget: 'dict-select',
+            params: { dictKey: 'car:model' },
             mode: 'multiple',
+            placeholder: '请选择车型',
             errors: { required: '请选择车型' }
-            // asyncData: () =>
-            //   this.categoryService.loadChildData2('0', '2').pipe(
-            //     map((data: any) => {
-            //       return data.map((m: any) => {
-            //         return { label: m.name, value: m.id };
-            //       });
-            //     }),
-            //   ),
-            // change: (i) => this.updateCategory(i, '/categoryId2'),
-          } as SFSelectWidgetSchema
+          }
         },
         maxCube: {
           type: 'string',
           title: '',
-          enum: [
-            { label: '1', value: '1' },
-            { label: '2', value: '2' }
-          ],
           ui: {
-            widget: 'select',
-            placeholder: '请选择车长',
+            widget: 'dict-select',
+            params: { dictKey: 'car:length' },
             mode: 'multiple',
+            placeholder: '请选择车长',
             errors: { required: '请选择车长' }
-            // asyncData: () =>
-            //   this.categoryService.loadChildData2('0', '2').pipe(
-            //     map((data: any) => {
-            //       return data.map((m: any) => {
-            //         return { label: m.name, value: m.id };
-            //       });
-            //     }),
-            //   ),
-            // change: (i) => this.updateCategory(i, '/categoryId2'),
-          } as SFSelectWidgetSchema
+          }
         }
       },
       required: ['weight', 'maxWeight', 'maxCube', 'freightPrice', 'rule', 'settlementBasis']
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 93a9437f..178dc06b 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
@@ -135,23 +135,22 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
                 return of([]);
               }
             },
+            change: (q: any) => {
+              this.getRegionCode(q)
+            },
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
           } as SFSelectWidgetSchema,
         }, 
         enterpriseProjectId: {
-          title: '项目',
           type: 'string',
-          default: '',
+          title: '项目',
           ui: {
             widget: 'select',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-            asyncData: () =>
-              this.shipperSrv.getEnterpriseProject()
-          } as SFSelectWidgetSchema,
+            placeholder: '请选择',
+            allowClear: true,
+          } as SFSelectWidgetSchema
         },
         enterpriseInfoName: {
           type: 'string',
@@ -288,49 +287,24 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
         maxWeight: {
           type: 'string',
           title: '车型/车长',
-
-          enum: [
-            { label: '1', value: '1' },
-            { label: '2', value: '2' }
-          ],
           ui: {
-            widget: 'select',
-            placeholder: '请选择车型',
+            widget: 'dict-select',
+            params: { dictKey: 'car:model' },
             mode: 'multiple',
+            placeholder: '请选择车型',
             errors: { required: '请选择车型' }
-            // asyncData: () =>
-            //   this.categoryService.loadChildData2('0', '2').pipe(
-            //     map((data: any) => {
-            //       return data.map((m: any) => {
-            //         return { label: m.name, value: m.id };
-            //       });
-            //     }),
-            //   ),
-            // change: (i) => this.updateCategory(i, '/categoryId2'),
-          } as SFSelectWidgetSchema
+          }
         },
         maxCube: {
           type: 'string',
           title: '',
-          enum: [
-            { label: '1', value: '1' },
-            { label: '2', value: '2' }
-          ],
           ui: {
-            widget: 'select',
-            placeholder: '请选择车长',
+            widget: 'dict-select',
+            params: { dictKey: 'car:length' },
             mode: 'multiple',
+            placeholder: '请选择车长',
             errors: { required: '请选择车长' }
-            // asyncData: () =>
-            //   this.categoryService.loadChildData2('0', '2').pipe(
-            //     map((data: any) => {
-            //       return data.map((m: any) => {
-            //         return { label: m.name, value: m.id };
-            //       });
-            //     }),
-            //   ),
-            // change: (i) => this.updateCategory(i, '/categoryId2'),
-          } as SFSelectWidgetSchema
+          }
         }
       },
       required: ['weight', 'maxWeight', 'maxCube']
@@ -357,7 +331,24 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
       }
     };
   }
-
+  // 获取城市列表
+  getRegionCode(regionCode: any) {
+    console.log(regionCode)
+    return this.service
+      .request(this.service.$api_get_enterprise_project, { id: regionCode })
+      .pipe(
+        map((res) =>
+          res.map((item: any) => ({
+            label: item.projectName,
+            value: item.id,
+          })),
+        ),
+      )
+      .subscribe((res) => {
+        this.sf1.getProperty('/enterpriseProjectId')!.schema.enum = res;
+        this.sf1.getProperty('/enterpriseProjectId')!.widget.reset(res);
+      });
+  }
   initSF5() {
     this.schema5 = {
       properties: {
@@ -835,7 +826,7 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
       volume:  res?.goodsInfoVOList[0]?.volume   ,
       vehicleDemand:  res?.goodsInfoVOList[0]?.vehicleDemand   ,
       maxCube: res?.goodsInfoVOList[0]?.maxCube?.split(',') ,
-      maxWeight: res?.goodsInfoVOList[0]?.maxWeight?.split(',') ,
+      maxWeight: res?.goodsInfoVOList[0]?.maxWeight?.split(',') || '',
       number:  res?.goodsInfoVOList[0]?.number   ,
       goodsTypeName:  res?.goodsInfoVOList[0]?.goodsTypeName   ,
       modifyUserId:  res?.goodsInfoVOList[0]?.modifyUserId   ,
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 fcf5f65f..ee4a79d5 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
@@ -49,38 +49,7 @@
       </div>
     </div>
   </nz-card>
-  <nz-card nzTitle="装货卸货信息 （一装一卸）">
-    <div nz-row [nzGutter]="24">
-      <div nz-col [nzSpan]="12">
-        <div class="handling-info p-md">
-          <div class="flex" *ngFor="let item of i?.unLoadingPlaceVOList">
-            <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>
-              </div>
-            </div>
-          </div>
-          <p class="time-info">装货时间：{{i?.loadingTime}}</p>
-        </div>
-      </div>
-      <div nz-col [nzSpan]="12">
-        <div class="handling-info p-md">
-          <div class="flex" *ngFor="let item of i?.unLoadingPlaceVOList">
-            <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>
-              </div>
-            </div>
-          </div>
-          <p class="time-info">卸货时间：{{i?.unloadingTime}}</p>
-        </div>
-      </div>
-    </div>
-  </nz-card>
+
 
   <nz-card nzTitle="基本信息">
     <sv-container col="2">
@@ -106,6 +75,45 @@
         {{i?.carrierInformationVO?.driverLicensePlate}}
       </sv>
     </sv-container>
+    <div class="mt-md">
+      <h4 class="text-md">装货卸货信息
+        <span class="ml-sm text-sm">(
+          <label>{{i?.loadingCount}}装</label>
+          <label>{{i?.unloadingCount}}卸</label>
+          )
+        </span>
+      </h4>
+      <div nz-row [nzGutter]="24">
+        <div nz-col [nzSpan]="12">
+          <div class="handling-info p-md">
+            <div class="flex" *ngFor="let item of i?.unLoadingPlaceVOList">
+              <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>
+                </div>
+              </div>
+            </div>
+            <p class="time-info">装货时间：{{i?.loadingTime}}</p>
+          </div>
+        </div>
+        <div nz-col [nzSpan]="12">
+          <div class="handling-info p-md">
+            <div class="flex" *ngFor="let item of i?.unLoadingPlaceVOList">
+              <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>
+                </div>
+              </div>
+            </div>
+            <p class="time-info">卸货时间：{{i?.unloadingTime}}</p>
+          </div>
+        </div>
+      </div>
+    </div>
   </nz-card>
 
   <nz-card nzTitle="服务信息">
diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.ts b/src/app/routes/sys-setting/components/close-account/close-account.component.ts
index 9bba5e3d..ea6b7fc0 100644
--- a/src/app/routes/sys-setting/components/close-account/close-account.component.ts
+++ b/src/app/routes/sys-setting/components/close-account/close-account.component.ts
@@ -190,6 +190,7 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
     if(item === 1) {
       this.edit = false;
       this.editText = '新增';
+      this.formData = {};
     } else {
       this.service.request(this.service.$api_settlementCustomer_get, {id: value.id}).subscribe((res: any) => {
         console.log(res)
diff --git a/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts b/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts
index f939b383..b64cc8b8 100644
--- a/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts
+++ b/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts
@@ -155,6 +155,7 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
     if(item === 1) {
       this.edit = false;
       this.editText = '新增';
+      this.formData = {};
     } else {
       this.service.request(this.service.$api_get_crmCustomer, {id: value.id}).subscribe((res: any) => {
         console.log(res)