From fb71a1a066979839c61207feb90d6c778239fb6a Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 6 Dec 2021 21:06:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bulk-detail/bulk-detail.component.html    |  3 +-
 .../components/bulk/bulk.component.html       | 10 +++-
 .../components/bulk/bulk.component.less       |  9 +++-
 .../components/bulk/bulk.component.ts         | 47 +++++++++++++++++++
 .../vehicle-detail.component.html             |  3 +-
 .../components/vehicle/vehicle.component.html |  4 +-
 6 files changed, 67 insertions(+), 9 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 d226599c..8c2e348d 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-06 19:35:17
+ * @LastEditTime: 2021-12-06 20:38:55
  * @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
@@ -141,7 +141,6 @@
    </div>
    <div>
      <!-- <app-ordermanage-map></app-ordermanage-map> -->
-     <div id="container" style="width: 800px; height: 500px"></div>
    </div>
     </nz-card>
   </div>
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html
index 5d909589..620c3b61 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-06 20:22:49
+ * @LastEditTime: 2021-12-06 21:03:59
  * @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
@@ -101,6 +101,14 @@
 
 <nz-modal [(nzVisible)]="isVisibleView"  [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
   <ng-container *nzModalContent>
+    <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'">
+      <ng-template sf-template="no" let-me let-ui="uiView" let-schema="schemaView">
+       <div style="display: flex;">
+        <nz-input-number [(ngModel)]="demoValue" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
+        <div class="left_btn">元/吨</div>
+       </div>
+      </ng-template>
+    </sf>
     <st
     #stFloatView
     multiSort
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.less b/src/app/routes/order-management/components/bulk/bulk.component.less
index 29a5e65b..30444d6b 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.less
+++ b/src/app/routes/order-management/components/bulk/bulk.component.less
@@ -1,2 +1,7 @@
-:host {
-}
\ No newline at end of file
+    .left_btn {
+         width: 50px;
+        height: 32px; 
+         padding-left: 8px;
+         line-height:32px; 
+         background-color: #d7d7d7;
+    }
\ No newline at end of file
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 5e0c0b35..be9887ca 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -15,7 +15,9 @@ import { SupplyManagementService } from '../../services/order-management.service
 export class OrderManagementBulkComponent implements OnInit {
   url = `/user?_allow_anonymous=true`;
   ui: SFUISchema = {};
+  uiView: SFUISchema = {};
   schema: SFSchema = {};
+  schemaView: SFSchema = {};
   auditMany = false;
   isVisibleView = false;
   isVisibleEvaluate = false;
@@ -26,9 +28,11 @@ export class OrderManagementBulkComponent implements OnInit {
   @ViewChild('stFloatView') private readonly stFloatView!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   @ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
+  @ViewChild('sfView', { static: false }) sfView!: SFComponent;
   columns: STColumn[] = [];
   columnsFloat: STColumn[] = [];
   columnsFloatView: STColumn[] = [];
+  demoValue: any;
   datass: any = [
     {
     one: '1',
@@ -92,6 +96,7 @@ export class OrderManagementBulkComponent implements OnInit {
     this.initST();
     this.initSTFloat();
     this.initSTFloatView();
+    this.initSFView();
   }
 
 
@@ -207,6 +212,48 @@ export class OrderManagementBulkComponent implements OnInit {
     };
     this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
   }
+  /**
+ * 初始化查询表单
+ */
+  initSFView() {
+    this.schemaView = {
+      properties: {
+        no: {
+          type: 'string',
+          title: '运费单价',
+         ui: {
+          widget: 'custom',
+         }
+        },
+        sex: {
+          title: '',
+          type: 'string',
+          default: 0,
+          enum: [
+            { label: '保留小数', value: 0 },
+            { label: '男', value: 1 },
+            { label: '女', value: 2 },
+            { label: '保密', value: 3 },
+          ],
+          ui: {
+            widget: 'select',
+          } as SFSelectWidgetSchema,
+        },
+        appId: {
+          type: 'string',
+          title: '结算重量',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.getCatalogueMember(),
+          },
+        },
+      },
+      type: 'object',
+    };
+    this.uiView = { '*': { spanLabelFixed: 80, grid: { span: 12, gutter: 4 } } };
+  }
 
   /**
    * 初始化数据列表
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
index d226599c..7a64cad1 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-06 19:35:17
+ * @LastEditTime: 2021-12-06 20:39:18
  * @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
@@ -141,7 +141,6 @@
    </div>
    <div>
      <!-- <app-ordermanage-map></app-ordermanage-map> -->
-     <div id="container" style="width: 800px; height: 500px"></div>
    </div>
     </nz-card>
   </div>
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html
index fe67124f..4d9b4ffe 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-06 19:06:12
+ * @LastEditTime: 2021-12-06 20:40:22
  * @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
@@ -114,7 +114,7 @@
     [loadingDelay]="500"
   >
   </st>
-  <div><span>变更原因：</span></div>
+  <div><span>变更原因2：</span></div>
   <div><span>拒绝原因：</span></div>
   <div><span>注：</span></div>
   </ng-container>