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

2022-01-13 19:23:08 +08:00
parent 872776514e bd88cc2c3e
commit 5d7f49966a
5 changed files with 68 additions and 99 deletions
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@ -469,7 +469,7 @@ tabs = {
        title: '创建时间',
        width: '180px',
        className: 'text-left',
-        index: 'createTime',
+        index: 'creationTime',
      },
      {
        title: '操作',
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2022-01-05 14:43:22
+ * @LastEditTime: 2022-01-13 19:13:46
 * @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
@ -12,71 +12,6 @@
      <i nz-icon nzType="left" nzTheme="outline"></i>
    </button>
  </ng-template>
-  <!-- <ng-template #headerContent>
-
-    <div class="mb-xs" nz-row>
-      <h4 class="ml-md" style="font-size: 18px;">订单号: {{ i?.billCode }}</h4>
-    </div>
-    <div nz-row style="display: flex; justify-content: end;">
-      <div nz-col nzSpan="10">
-        <button nz-button (click)="cancelChange()">取消修改</button>
-        <button nz-button nzType="primary" (click)="save()" nzGhost>保存修改</button>
-      </div>
-    </div>
-   <div>
-     <div style="display: flex; justify-content: space-between;">
-      <div sv-container>
-        <sv label="网络货运人">{{ i?.goodsResource?.[0]?.enterpriseInfoName }} </sv>
-        <sv label="货主">{{ i?.goodsResource?.[0]?.shipperAppUserName }} </sv>
-        <sv label="所属项目">{{i?.goodsResource?.[0]?.enterpriseProjectName}}</sv>
-        <sv label="服务类型">{{i?.goodsResource?.[0]?.serviceTypeLabel}}</sv>
-        <sv label="录单员">{{i?.goodsResource?.[0]?.dispatchName}} 18100000000 </sv>
-        <sv label="调度员">{{i?.goodsResource?.[0]?.dispatchName}} </sv>
-      </div>
-      <div>
-        <div>状态</div>
-        <div style="font-size: 22px;font-weight: 700;">{{i?.billStatusLabel}}</div>
-      </div>
-     </div>
-     <nz-tabset nzType="card" style="margin-top: 15px;">
-      <nz-tab [nzTitle]="tempt" >
-        <ng-template #tempt>
-          <nz-anchor>
-            <nz-link nzHref="#distannce1" nzTitle="装卸货信息"></nz-link>
-          </nz-anchor>
-        </ng-template>
-      </nz-tab>
-      <nz-tab [nzTitle]="tempt2" >
-        <ng-template #tempt2>
-          <nz-anchor>
-            <nz-link nzHref="#distannce2" nzTitle="基本信息"></nz-link>
-          </nz-anchor>
-        </ng-template>
-      </nz-tab>
-      <nz-tab [nzTitle]="tempt3" >
-        <ng-template #tempt3>
-          <nz-anchor>
-            <nz-link nzHref="#distannce3" nzTitle="运费信息"></nz-link>
-          </nz-anchor>
-        </ng-template>
-      </nz-tab>
-      <nz-tab [nzTitle]="tempt4" >
-        <ng-template #tempt4>
-          <nz-anchor>
-            <nz-link nzHref="#distannce4" nzTitle="附件信息"></nz-link>
-          </nz-anchor>
-        </ng-template>
-      </nz-tab>
-      <nz-tab [nzTitle]="tempt5" >
-        <ng-template #tempt5>
-          <nz-anchor>
-            <nz-link nzHref="#distannce5" nzTitle="轨迹信息"></nz-link>
-          </nz-anchor>
-        </ng-template>
-      </nz-tab>
-    </nz-tabset>
-   </div>
-  </ng-template> -->
  <ng-template #headerContent>
    <div class="mb-xs" nz-row>
      <button nz-button nzType="primary" nzSize="small" nzDanger>{{i?.billStatusLabel}}</button>
@ -95,8 +30,8 @@
        <sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
        <sv label="所属项目">{{i?.goodsResource?.enterpriseProjectName}}</sv>
        <sv label="服务类型">{{i?.goodsResource?.serviceTypeLabel}}</sv>
-        <sv label="录单员">{{i?.goodsResource?.dispatchName}} 18100000000 </sv>
-        <sv label="调度员">{{i?.goodsResource?.dispatchName}} </sv>
+        <sv label="录单员">{{i?.goodsResource?.createUserName}} /{{i?.goodsResource?.createUserPhone}} </sv>
+        <sv label="调度员">{{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchName}} </sv>
      </div>

      <nz-tabset style="margin-top: 15px;">
--- 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: 2022-01-13 14:20:49
+ * @LastEditTime: 2022-01-13 19:16: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\order-management\components\vehicle-detail\vehicle-detail.component.html
@ -30,8 +30,8 @@
        <sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
        <sv label="所属项目">{{i?.goodsResource?.enterpriseProjectName}}</sv>
        <sv label="服务类型">{{i?.goodsResource?.serviceTypeLabel}}</sv>
-        <sv label="录单员">{{i?.goodsResource?.dispatchName}} 18100000000 </sv>
-        <sv label="调度员">{{i?.goodsResource?.dispatchName}} </sv>
+        <sv label="录单员">{{i?.goodsResource?.createUserName}} /{{i?.goodsResource?.createUserPhone}} </sv>
+        <sv label="调度员">{{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchPhone}} </sv>
      </div>

      <nz-tabset style="margin-top: 15px;">
--- 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
@ -488,9 +488,11 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
          type: 'number',
          title: '预付',
          minimum: 0,
+          maximum: 999999,
          default: 0,
          ui: {
            prefix: '￥',
+            widgetWidth: 300,
            change: _args => this.payChange()
          } as SFNumberWidgetSchema
        },
@ -498,22 +500,37 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
          type: 'number',
          title: '到付',
          minimum: 0,
+          maximum: 999999,
          default: 0,
-          ui: { prefix: '￥', change: _args => this.payChange() } as SFNumberWidgetSchema
+          ui: { 
+            prefix: '￥',
+            widgetWidth: 300,
+           change: _args => this.payChange()
+           } as SFNumberWidgetSchema
        },
        oilCardPay: {
          type: 'number',
          title: '油卡',
          minimum: 0,
+          maximum: 999999,
          default: 0,
-          ui: { prefix: '￥', change: _args => this.payChange() } as SFNumberWidgetSchema
+          ui: { 
+            prefix: '￥',
+             widgetWidth: 300,
+              change: _args => this.payChange()
+             } as SFNumberWidgetSchema
        },
        receiptPay: {
          type: 'number',
          title: '回单付',
          minimum: 0,
+          maximum: 999999,
          default: 0,
-          ui: { prefix: '￥', change: _args => this.payChange() } as SFNumberWidgetSchema
+          ui: { 
+          prefix: '￥', 
+          widgetWidth: 300,
+          change: _args => this.payChange()
+         } as SFNumberWidgetSchema
        },
        subtotal: { type: 'number', title: '小计', default: 0, ui: { widget: 'custom' } as SFNumberWidgetSchema },
        appendFee: { type: 'number', title: '附加费', default: 0, ui: { widget: 'custom' } as SFNumberWidgetSchema },
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
@ -505,8 +505,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
          title: '预付',
          default: 0,
          minimum: 0,
+          maximum: 999999,
          ui: {
            prefix: '￥',
+            widgetWidth: 300,
            change: _args => this.payChange()
          } as SFNumberWidgetSchema
        },
@ -514,22 +516,37 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
          type: 'number',
          title: '到付',
          minimum: 0,
+          maximum: 999999,
          default: 0,
-          ui: { prefix: '￥', change: _args => this.payChange() } as SFNumberWidgetSchema
+          ui: { 
+            prefix: '￥',
+            widgetWidth: 300,
+             change: _args => this.payChange()
+             } as SFNumberWidgetSchema
        },
        oilCardPay: {
          type: 'number',
          title: '油卡',
+          maximum: 999999,
          minimum: 0,
          default: 0,
-          ui: { prefix: '￥', change: _args => this.payChange() } as SFNumberWidgetSchema
+          ui: { 
+            prefix: '￥',
+             widgetWidth: 300,
+           change: _args => this.payChange()
+           } as SFNumberWidgetSchema
        },
        receiptPay: {
          type: 'number',
          title: '回单付',
+          maximum: 999999,
          minimum: 0,
          default: 0,
-          ui: { prefix: '￥', change: _args => this.payChange() } as SFNumberWidgetSchema
+          ui: { 
+            prefix: '￥',
+            widgetWidth: 300,
+            change: _args => this.payChange()
+           } as SFNumberWidgetSchema
        },
        subtotal: { type: 'number', title: '小计', default: 0, ui: { widget: 'custom' } as SFNumberWidgetSchema },
        appendFee: { type: 'number', title: '附加费', default: 0, ui: { widget: 'custom' } as SFNumberWidgetSchema },