货源

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-25 14:29:55
+ * @LastEditTime : 2022-01-25 15:20:08
  * @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
     },

src/app/routes/order-management/components/bulk/bulk.component.ts

@@ -624,8 +624,8 @@ export class OrderManagementBulkComponent implements OnInit {
    */
   viewEvaluate(item: any) {
     this.isVisibleEvaluate = true;
-    this.service.request(this.service.$api_getChangeRecordBulkDetail, { id: item.id }).subscribe(res => {
-      this.ViewCause = res;
+    this.service.request(this.service.$api_get_billEvaluate, { id: item.id }).subscribe(res => {
+      console.log(res)
     });
   }
   /**

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

@@ -588,6 +588,9 @@ resourceStatus: any;
   viewEvaluate(item: any) {
     console.log(item)
     this.isVisibleEvaluate = true
+    this.service.request(this.service.$api_get_billEvaluate, { id: item.id }).subscribe(res => {
+      console.log(res)
+    });
   }
       /**
    *变更运费

src/app/routes/order-management/services/order-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 15:31:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-24 16:39:11
+ * @LastEditTime : 2022-01-25 15:09:06
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -144,6 +144,14 @@ export class OrderManagementService extends ShipperBaseService {
     // 获取规则抽查分类统计
   public $api_get_getComplianceStatisticalStatus = '/api/sdc/billOperate/getComplianceStatisticalStatus';
 
+    // 查询订单评价表
+  // public $api_get_billEvaluate = '/api/sdc/billEvaluate/list/page';
+    // 查询订单评价表
+  public $api_get_billEvaluate = '/api/sdc/billEvaluate/get';
+
+
+
+
   getDictByKey(dictKey: string) {
     const params = { dictKey: dictKey };
     return this.request(this.$api_getDictValue, params);

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts

@@ -1099,7 +1099,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       goodsValue: res?.goodsValue
     };
     this.sf55data = {
-      insuranceType: res?.serviceInformationVO?.insuranceType || ''
+      insuranceType: res?.insuranceType || ''
     };
     this.sf6data = {
       stateReceipt: res?.stateReceipt,

src/app/routes/supply-management/components/release-publish/release-publish.component.html

@@ -223,6 +223,11 @@
 
 <nz-card>
   <div class="card-title">服务信息</div>
+  <div nz-row>
+    <div nz-col nzSpan="12">
+      <sf #sf55 [schema]="schema55" [button]="'none'" [ui]="ui55" [formData]="sf55data"></sf>
+    </div>
+  </div>
   <div nz-row [nzGutter]="24" style="margin: 24px 0">
     <div nz-col [nzSpan]="10">
       <div class="align-center">

src/app/routes/supply-management/components/release-publish/release-publish.component.ts

@@ -3,6 +3,7 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
 import { ActivatedRoute, Router } from '@angular/router';
 import { cacheConf } from '@conf/cache.conf';
 import {
+  SFCheckboxWidgetSchema,
   SFComponent,
   SFNumberWidgetSchema,
   SFSchema,
@@ -37,6 +38,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
   sf3data: any; // 货源单设置回显
   sf4data: any; // 货源单设置回显
   sf5data: any; // 货源单设置回显
+  sf55data: any; // 货源单设置回显
   sf6data: any; // 货源单设置回显
   sf7data: any; // 货源单设置回显
   id = '';
@@ -86,6 +88,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
   @ViewChild('sf5', { static: false }) sf5!: SFComponent;
   schema5: SFSchema = {};
   ui5!: SFUISchema;
+  
+  @ViewChild('sf55', { static: false }) sf55!: SFComponent;
+  schema55: SFSchema = {};
+  ui55!: SFUISchema;
 
   @ViewChild('sf6', { static: false }) sf6!: SFComponent;
   schema6: SFSchema = {};
@@ -100,6 +106,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
     this.initSF3();
     this.initSF4();
     this.initSF5();
+    this.initSF55();
     this.initSF6();
     this.initSF7();
     this.addStartInfo();
@@ -400,6 +407,56 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
       }
     };
   }
+  initSF55() {
+    this.schema55 = {
+      properties: {
+        insuranceType: {
+          type: 'string',
+          title: '增值服务套餐',
+          enum: [
+            { label: '不购买', value: '0' },
+            { label: '套餐一', value: '1' },
+            { label: '套餐二', value: '2' }
+          ],
+          ui: {
+            widget: 'select'
+          },
+          default:'0'
+        },
+        type1: {
+          type: 'string',
+          title: '',
+          enum: ['车辆实时定位', '轨迹查询', '数据保护','赠送基本险'],
+          readOnly: true,
+          ui: {
+            widget: 'checkbox',
+            visibleIf: {insuranceType: (value: string) => value ==='1'},
+          } as SFCheckboxWidgetSchema,
+          default: ['车辆实时定位', '轨迹查询', '数据保护','赠送基本险'],
+        },
+        type2: {
+          type: 'string',
+          title: '',
+          enum: ['车辆实时定位', '轨迹查询', '数据保护','专属技术服务','赠送综合险'],
+          readOnly: true,
+          ui: {
+            widget: 'checkbox',
+            visibleIf: {insuranceType: (value: string) => value ==='2'},
+          } as SFCheckboxWidgetSchema,
+          default: ['车辆实时定位', '轨迹查询', '数据保护','专属技术服务','赠送综合险'],
+        }
+      }
+    };
+    this.ui55 = {
+      '*': {
+        spanLabelFixed: 100,
+        grid: { span: 24 }
+      },
+      $insuranceType: {
+        grid: { span: 12 }
+      }
+    };
+  }
   initSF6() {
     this.schema6 = {
       properties: {
@@ -755,7 +812,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
       ...this.sf5.value,
       ...this.sf6.value,
       expenseDTOList: expenseList,
-      paymentDays: this.sf7.value.paymentDays
+      paymentDays: this.sf7.value.paymentDays,
+      insuranceType:this.sf55.value.insuranceType,
     };
 
     let reqUrl = this.service.$api_consignWhole;