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

2021-12-07 14:14:06 +08:00
parent 141345b1d6 ffbacadff4
commit 9167bb35f4
5 changed files with 80 additions and 117 deletions
--- a/src/app/routes/order-management/components/additionalc/additionalc.component.html
+++ b/src/app/routes/order-management/components/additionalc/additionalc.component.html
@ -57,40 +57,7 @@
 </nz-card>


-<nz-modal [(nzVisible)]="isVisibleView"  [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
-  <ng-container *nzModalContent>
-    <sv-container labelWidth="160" class="apply-sv">
-      <sv label="车牌号" col="1">{{ infoData1?.enterpriseName }}</sv>
-      <sv label="车型" col="1">{{ infoData1?.unifiedSocialCreditCode }}</sv>
-      <sv label="车长" col="1">{{ infoData1?.enterpriseType }}</sv>
-      <sv label="载重" col="1">{{ infoData1?.registrationCapital }} 万元</sv>
-      <sv label="备注" col="1">{{ infoData1?.enterpriseRegistrationTime }}</sv>
-      <sv label=" 行驶证" col="1">
-        <!-- <span class="sv-img"
-          ><img
-            [src]="infoData1?.enterpriseQualificationCertificateurl"
-            (click)="viewImg(infoData1?.enterpriseQualificationCertificateurl)"
-        /></span> -->
-      </sv>
-      <sv label="行驶证过期时间" col="1">{{ infoData1?.enterpriseAddress }}</sv>
-      <sv label="道运证" col="1">
-        <!-- <span class="sv-img"
-          ><img
-            [src]="infoData1?.enterpriseQualificationCertificateurl"
-            (click)="viewImg(infoData1?.enterpriseQualificationCertificateurl)"
-        /></span> -->
-      </sv>
-      <sv label="道运证过期时间" col="1">{{ infoData1?.businessScope }}</sv>
-    </sv-container>
-  </ng-container>
-  <ng-template #nzModalFooterview>
-    <button  *ngIf="!auditstatus" nz-button nzType="default" (click)="Reject()">驳回</button>
-    <button  *ngIf="!auditstatus" nz-button nzType="primary" (click)="handleOK()">通过</button>
-    <button *ngIf="auditstatus" nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
-  </ng-template>
-</nz-modal>
-
-<nz-modal [(nzVisible)]="isVisibleRE"  [nzWidth]="600" [nzFooter]="nzModalFooterview2"  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
+<nz-modal [(nzVisible)]="isVisibleRE"  [nzWidth]="600" [nzFooter]="nzModalFooterview2"  nzTitle="审核" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
  <ng-container *nzModalContent>
    <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'">
    </sf>
--- a/src/app/routes/order-management/components/additionalc/additionalc.component.ts
+++ b/src/app/routes/order-management/components/additionalc/additionalc.component.ts
@ -43,23 +43,33 @@ export class OrderManagementAdditionalcComponent implements OnInit {
    id: 2
   },
 ];
-  tabs = [  {
+  tabs = [ {
    name: '全部',
    type: 5,
    count: 0,
  },
  {
-    name: '待审核',
+    name: '检测中',
    type: 5,
    count: 0,
  },
  {
-    name: '已审核',
+    name: '不合格',
    type: 5,
    count: 0,
  },
  {
-    name: '驳回',
+    name: '合格',
+    type: 5,
+    count: 0,
+  },
+  {
+    name: '申诉中',
+    type: 5,
+    count: 0,
+  },
+  {
+    name: '已取消',
    type: 5,
    count: 0,
  }
@ -107,11 +117,11 @@ export class OrderManagementAdditionalcComponent implements OnInit {
    this.schemaView = {
      properties: {
        roleDescription: {
-          title: '驳回原因',
+          title: '备注',
          type: 'string',
          maxLength: 50,
          ui: {
-            placeholder: '请输入驳回原因，最多不超过50字',
+            placeholder: '请输入备注，最多不超过50字',
            widget: 'textarea',
            autosize: { minRows: 2, maxRows: 6 }
          },
@ -124,59 +134,64 @@ export class OrderManagementAdditionalcComponent implements OnInit {
  /**
   * 初始化数据列表
   */
-  initST() {
+   initST() {
    this.columns = [
      {
-        title: '公司名称',
+        title: '运单号',
        width: '100px',
        className: 'text-center',
        render: 'goodsId'
      },
      {
-        title: '车牌号',
+        title: '检测状态',
        width: '100px',
        className: 'text-center',
      },
-      { title: '车型', index: 'externalSn', width: '120px', className: 'text-center' },
-      { title: '车长(m)', index: 'linkUrl', width: '120px', className: 'text-center' },
+      { title: '异常原因', index: 'externalSn', width: '120px', className: 'text-center' },
+      { title: '驳回原因', index: 'linkUrl', width: '120px', className: 'text-center' },
      {
-        title: '载重(吨)',
+        title: '托运公司',
        className: 'text-center',
        width: '120px',
      },
      {
-        title: '行驶证',
+        title: '发货省/市/区',
        className: 'text-center',
        width: '120px',
      }, 
      {
-        title: '道运证',
+        title: '收货省/市/区',
        className: 'text-center',
        width: '120px',
      },
      {
-        title: '审核状态',
+        title: '运单费用',
        className: 'text-center',
        width: '120px',
      },
      {
-        title: '驳回原因',
+        title: '司机手机号',
        className: 'text-center',
        width: '120px',
      },
      {
-        title: '添加时间',
+        title: '车牌号',
        className: 'text-center',
        width: '120px',
      },
      {
-        title: '驳回原因',
+        title: '交易时间',
        className: 'text-center',
        width: '120px',
        render: 'feiong'
      },
      {
-        title: '添加人',
+        title: '创建时间',
+        className: 'text-center',
+        width: '120px',
+      },
+      {
+        title: '创建人',
        className: 'text-center',
        width: '120px',
      },
@ -190,15 +205,10 @@ export class OrderManagementAdditionalcComponent implements OnInit {
            text: '审核',
            click: (_record) => this.viewAudit(_record),
          },
-          {
-            text: '查看详情',
-            click: (_record) => this.viewDetail(_record),
-          },
        ],
      },
    ];
  }
-
  /**
   * 查询字段个数
   */
@ -255,11 +265,7 @@ export class OrderManagementAdditionalcComponent implements OnInit {
  * 审核关闭弹窗
  */
  handleCancel(item: string) {
-    if(item === '0') {
-      this.isVisibleView = false
-    } else{
      this.isVisibleRE = false
-    }
  }
    /**
  * 审核通过按钮
@ -267,23 +273,8 @@ export class OrderManagementAdditionalcComponent implements OnInit {
  handleOK() {
    
  }
-   /**
-  *查看评价
-  */
-  viewDetail(item: any) {
-    console.log(item)
-    this.auditstatus = true;
-    this.isVisibleView = true
-  }
+
  viewAudit(item: any) {
-    console.log(item)
-    this.auditstatus = false;
-    this.isVisibleView = true
-  }
-  /**
-  *驳回
-  */
-  Reject() {
    this.isVisibleRE = true;
  }
 }
--- a/src/app/routes/order-management/components/car-manage/car-manage.component.html
+++ b/src/app/routes/order-management/components/car-manage/car-manage.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-07 11:16:41
+ * @LastEditTime: 2021-12-07 14:03:28
 * @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
@ -90,7 +90,7 @@
  </ng-template>
 </nz-modal>

-<nz-modal [(nzVisible)]="isVisibleRE"  [nzWidth]="600" [nzFooter]="nzModalFooterview2"  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
+<nz-modal [(nzVisible)]="isVisibleRE"  [nzWidth]="600" [nzFooter]="nzModalFooterview2"  (nzOnOk)="handleOK()" nzTitle="驳回" (nzOnCancel)="handleCancel('1')">
  <ng-container *nzModalContent>
    <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'">
    </sf>
--- a/src/app/routes/order-management/components/car-manage/car-manage.component.ts
+++ b/src/app/routes/order-management/components/car-manage/car-manage.component.ts
@ -43,33 +43,23 @@ export class OrderManagementCarManageComponent implements OnInit {
    id: 2
   },
 ];
-  tabs = [  {
+  tabs = [ {
    name: '全部',
    type: 5,
    count: 0,
  },
  {
-    name: '检测中',
+    name: '待审核',
    type: 5,
    count: 0,
  },
  {
-    name: '不合格',
+    name: '已审核',
    type: 5,
    count: 0,
  },
  {
-    name: '合格',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '申诉中',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '已取消',
+    name: '驳回',
    type: 5,
    count: 0,
  }
@ -103,15 +93,15 @@ export class OrderManagementCarManageComponent implements OnInit {
      properties: {
        no: {
          type: 'string',
-          title: '运单号',
+          title: '公司名称',
        },
        no2: {
          type: 'string',
-          title: '托运公司'
+          title: '姓名'
        },
        no3: {
          type: 'string',
-          title: '车牌号'
+          title: '手机号'
        },
      },
    };
@ -138,64 +128,64 @@ export class OrderManagementCarManageComponent implements OnInit {
  /**
   * 初始化数据列表
   */
-  initST() {
+   initST() {
    this.columns = [
      {
-        title: '运单号',
+        title: '公司名称',
        width: '100px',
        className: 'text-center',
        render: 'goodsId'
      },
      {
-        title: '检测状态',
+        title: '姓名',
        width: '100px',
        className: 'text-center',
      },
-      { title: '异常原因', index: 'externalSn', width: '120px', className: 'text-center' },
-      { title: '驳回原因', index: 'linkUrl', width: '120px', className: 'text-center' },
+      { title: '身份证号', index: 'externalSn', width: '120px', className: 'text-center' },
+      { title: '手机号', index: 'linkUrl', width: '120px', className: 'text-center' },
      {
-        title: '托运公司',
+        title: '身份证',
        className: 'text-center',
        width: '120px',
      },
      {
-        title: '发货省/市/区',
+        title: '驾驶证',
        className: 'text-center',
        width: '120px',
      }, 
      {
-        title: '收货省/市/区',
+        title: '从业资格证',
        className: 'text-center',
        width: '120px',
      },
      {
-        title: '运单费用',
+        title: '平台认证状态',
        className: 'text-center',
        width: '120px',
      },
      {
-        title: '司机手机号',
+        title: '银行卡',
        className: 'text-center',
        width: '120px',
      },
      {
-        title: '车牌号',
+        title: '审核状态',
        className: 'text-center',
        width: '120px',
      },
      {
-        title: '交易时间',
+        title: '驳回原因',
        className: 'text-center',
        width: '120px',
        render: 'feiong'
      },
      {
-        title: '创建时间',
+        title: '添加时间',
        className: 'text-center',
        width: '120px',
      },
      {
-        title: '创建人',
+        title: '添加人',
        className: 'text-center',
        width: '120px',
      },
@ -209,11 +199,14 @@ export class OrderManagementCarManageComponent implements OnInit {
            text: '审核',
            click: (_record) => this.viewAudit(_record),
          },
+          {
+            text: '查看详情',
+            click: (_record) => this.viewDetail(_record),
+          },
        ],
      },
    ];
  }
-
  /**
   * 查询字段个数
   */
@ -281,12 +274,24 @@ export class OrderManagementCarManageComponent implements OnInit {
  */
  handleOK() {
    
+  }
+   /**
+  *查看评价
+  */
+  viewDetail(item: any) {
+    console.log(item)
+    this.auditstatus = true;
+    this.isVisibleView = true
  }
  viewAudit(item: any) {
    console.log(item)
+    this.auditstatus = false;
+    this.isVisibleView = true
+  }
+  /**
+  *驳回
+  */
+  Reject() {
    this.isVisibleRE = true;
  }
-  Reject() {
-
-  }
 }
--- a/src/index.html
+++ b/src/index.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-11-29 10:04:12
- * @LastEditTime: 2021-12-07 13:23:49
+ * @LastEditTime: 2021-12-07 13:24:56
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \tms-obc-web\src\index.html
@ -15,7 +15,7 @@
  <base href="/" />
  <meta name="viewport" content="width=device-width, initial-scale=1" />
  <meta http-equiv="x-ua-compatible" content="ie=edge" />
-  <link rel="icon" type="image/x-icon" href="./favicon.ico" />
+  <link rel="icon" type="image/x-icon" href="favicon.ico" />
  <!-- Apple Touch Icon -->
  <!-- <link rel="apple-touch-icon" href="custom-icon.png"> -->
  <style type="text/css">