Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-06 13:46:07
+ * @LastEditTime : 2022-05-06 15:29:21
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/partner/partner-list/components/index/partner-list.component.ts

@@ -1,3 +1,4 @@
+import { async } from '@angular/core/testing';
 import { Component, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
@@ -55,6 +56,8 @@ export class PartnerListComponent {
   loadSelectOptions() {
     this.service.getRebateConfig().subscribe(res => {
       if (res) {
+        console.log(res);
+        
         this.customers = res;
       }
     });
@@ -283,8 +286,10 @@ export class PartnerListComponent {
           title: '认证审核状态',
           enum: [
             { value: '', label: '全部' },
-            { value: 1, label: '企业' },
-            { value: 2, label: '个人' }
+            { value: '-1', label: '未提交' },
+            { value: 10, label: '待审核' },
+            { value: 20, label: '审核通过' },
+            { value: 30, label: '认证驳回' }
           ],
           ui: {
             widget: 'select',
@@ -297,10 +302,16 @@ export class PartnerListComponent {
         signStatus: {
           type: 'string',
           title: '签约状态',
+          enum: [
+            { value: '', label: '全部' },
+            { value: '0', label: '未签约' },
+            { value: 10, label: '待合伙人签约' },
+            { value: 15, label: '签约中' },
+            { value: 20, label: '已签约' },
+            { value: 30, label: '签约失败' }
+          ],
           ui: {
-            widget: 'dict-select',
-            containsAllLabel: true,
-            params: { dictKey: 'pay:mode' },
+            widget: 'select',
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
@@ -310,10 +321,14 @@ export class PartnerListComponent {
         crmStatus: {
           type: 'string',
           title: 'CRM状态',
+          enum: [
+            { value: '', label: '全部' },
+            { value: '0', label: '未同步' },
+            { value: 10, label: '同步失败' },
+            { value: 20, label: '同步成功' },
+          ],
           ui: {
-            widget: 'dict-select',
-            containsAllLabel: true,
-            params: { dictKey: 'pay:mode' },
+            widget: 'select',
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
@@ -343,6 +358,7 @@ export class PartnerListComponent {
           ui: {
             widget: 'select',
             placeholder: '请选择',
+            // async: 
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -415,11 +431,11 @@ export class PartnerListComponent {
         width: 150,
         type: 'badge',
         badge: {
-          0: { text: '未发起', color: 'default' },
+          0: { text: '未签约', color: 'default' },
           10: { text: '待合伙人签约', color: 'default' },
           15: { text: '签约中', color: 'processing' },
-          20: { text: '平台签约完成', color: 'success' },
-          30: { text: '驳回', color: 'error' }
+          20: { text: '已签约', color: 'success' },
+          30: { text: '签约失败', color: 'error' }
         }
       },
       {
@@ -428,9 +444,9 @@ export class PartnerListComponent {
         width: 150,
         type: 'badge',
         badge: {
-          0: { text: '未发起', color: 'default' },
-          10: { text: '审核失败', color: 'error' },
-          20: { text: '审核通过', color: 'success' }
+          0: { text: '未同步', color: 'default' },
+          10: { text: '同步失败', color: 'error' },
+          20: { text: '同步成功', color: 'success' }
         }
       },
       {

src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts

@@ -257,7 +257,7 @@ export class FreightConfigComponent extends BasicTableComponent implements OnIni
         format: item => `${item.contractSurchargeRatio}%`
       },
       {
-        title: '合同单业务量（元）',
+        title: '合同单业务量（万元）',
         index: 'contractQuota',
         width: 170,
         type: 'widget',
@@ -265,7 +265,7 @@ export class FreightConfigComponent extends BasicTableComponent implements OnIni
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) }
       },
       {
-        title: '货源单业务量（元）',
+        title: '货源单业务量（万元）',
         index: 'goodsQuota',
         width: 170,
         type: 'widget',

src/app/routes/vehicle/components/list/list.component.html

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-05-06 11:15:05
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-05-06 15:28:50
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\vehicle\\components\\list\\list.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <!-- <page-header-wrapper></page-header-wrapper>
 <nz-card>
   <div nz-row nzGutter="8">
@@ -34,7 +44,7 @@
     [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
     <ng-template st-row="carLength" let-item let-index="index">
-      <div>{{ item?.carModelLabel }}-{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : '' }}-{{
+      <div>{{ item?.carModel ?  item?.carModel + '-' : ''}}{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : '' }}-{{
         item?.carLoad ? item?.carLoad + '吨' : ''
         }}</div>
     </ng-template>