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

src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts

@@ -23,10 +23,10 @@ export class DatatableOrderReportingComponent implements OnInit {
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   tabType!: string;
   tabs: any[] = [
-    { name: '待上传', value: '1' },
+    { name: '待上传', value: '0' },
-    { name: '上传中', value: '2' },
+    { name: '上传中', value: '3' },
-    { name: '已上传', value: '3' },
+    { name: '已上传', value: '1' },
-    { name: '异常', value: '4' },
+    { name: '异常', value: '2' },
     { name: '全部', value: '' }
   ];
   selectedIndex = '1';
@@ -53,7 +53,7 @@ export class DatatableOrderReportingComponent implements OnInit {
    */
   get reqParams() {
     const params = Object.assign({}, this.sf?.value || {}, {
-      putStatus: this.selectedIndex,
+      billPutStatus: this.selectedIndex,
     });
     delete params._$expand;
     return { ...params };

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

@@ -90,7 +90,7 @@
           <nz-alert class="goods_tips" nzType="warning" [nzMessage]="tpl" nzShowIcon></nz-alert>
         </ng-template>
         <ng-template #tpl>
-          <span> 国家法规及行政命令禁限运货物不能托运
+          <span style="font-size: 12px;"> 国家法规及行政命令禁限运货物不能托运
             <a target="_blank" [queryParams]="{ type: 15 }" [routerLink]="['/agreement']">《禁运物品说明》</a>
           </span>
         </ng-template>

src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less

@@ -11,10 +11,10 @@
     .sf3 {
       .goods_Tips_item {
         .goods_tips {
-          width: calc(50% - 60px);
+          width: calc(50% - 45px);
 
           .ant-alert {
-            padding: 4px;
+            padding: 0 0 0 2px;
           }
 
         }

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

@@ -139,7 +139,7 @@
           <nz-alert class="goods_tips" nzType="warning" [nzMessage]="tpl" nzShowIcon></nz-alert>
         </ng-template>
         <ng-template #tpl>
-          <span> 国家法规及行政命令禁限运货物不能托运
+          <span style="font-size: 12px;"> 国家法规及行政命令禁限运货物不能托运
             <a target="_blank" [queryParams]="{ type: 15 }" [routerLink]="['/agreement']">《禁运物品说明》</a>
           </span>
         </ng-template>

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

@@ -11,10 +11,10 @@
     .sf3 {
       .goods_Tips_item {
         .goods_tips {
-          width: calc(50% - 60px);
+          width: calc(50% - 45px);
 
           .ant-alert {
-            padding: 4px;
+            padding: 0 0 0 2px;
           }
 
         }

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

@@ -13,9 +13,7 @@
 </nz-card>
 
 <nz-card>
-  <div class="card-title"
+  <div class="card-title">装卸货信息<span class="tip-font">预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时</span></div>
-    >装卸货信息<span class="tip-font">预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时</span></div
-  >
 
   <form nz-form [formGroup]="validateForm1" role="form">
     <div nz-row [nzGutter]="24">
@@ -26,21 +24,13 @@
             <nz-form-control [nzErrorTip]="'请输入装货地'">
               <div class="align-center">
                 <nz-input-group [nzSuffix]="endInconTemp1">
-                  <input
+                  <input nz-input [(ngModel)]="data1.detailedAddress" (click)="openMap('start', idx)"
-                    nz-input
+                    formControlName="loadAddress{{ idx }}" placeholder="请输入装货地" readonly="true" />
-                    [(ngModel)]="data1.detailedAddress"
-                    (click)="openMap('start', idx)"
-                    formControlName="loadAddress{{ idx }}"
-                    placeholder="请输入装货地"
-                    readonly="true"
-                  />
                 </nz-input-group>
-                <span *ngIf="idx !== 0" style="padding: 0 10px"
+                <span *ngIf="idx !== 0" style="padding: 0 10px"><i nz-icon nzType="minus-circle" nzTheme="outline"
-                  ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i
+                    style="color: #d9001b" (click)="subStartInfo($event, idx)"></i></span>
-                ></span>
+                <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"><i nz-icon nzType="minus-circle"
-                <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"
+                    nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i></span>
-                ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i
-              ></span>
               </div>
             </nz-form-control>
           </nz-form-item>
@@ -48,25 +38,12 @@
             <nz-form-label nzRequired>联系人</nz-form-label>
             <div style="display: flex; width: 80.7%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
-                <input
+                <input nz-input [(ngModel)]="data1.appUserName" formControlName="loadName{{ idx }}"
-                  nz-input
+                  name="loadName{{ idx }}" maxlength="30" placeholder="请输入联系人姓名" />
-                  [(ngModel)]="data1.appUserName"
-                  formControlName="loadName{{ idx }}"
-                  name="loadName{{ idx }}"
-                  maxlength="30"
-                  placeholder="请输入联系人姓名"
-                />
               </nz-form-control>
               <nz-form-control [nzErrorTip]="'请输入联系人电话'">
-                <input
+                <input style="margin-left: 12px" nz-input [(ngModel)]="data1.contractTelephone" maxlength="11"
-                  style="margin-left: 12px"
+                  formControlName="loadPhone{{ idx }}" name="loadPhone{{ idx }}" placeholder="请输入联系人电话" />
-                  nz-input
-                  [(ngModel)]="data1.contractTelephone"
-                  maxlength="11"
-                  formControlName="loadPhone{{ idx }}"
-                  name="loadPhone{{ idx }}"
-                  placeholder="请输入联系人电话"
-                />
               </nz-form-control>
             </div>
           </nz-form-item>
@@ -83,8 +60,7 @@
       </div>
       <div nz-col [nzSpan]="4">
         <div style="display: flex; justify-content: center">
-          <span class="swap-icon" (click)="swapAddress()"><i nz-icon nzType="swap"
+          <span class="swap-icon" (click)="swapAddress()"><i nz-icon nzType="swap" nzTheme="outline"></i></span>
-              nzTheme="outline"></i></span>
         </div>
       </div>
       <div nz-col [nzSpan]="10">
@@ -94,22 +70,14 @@
             <nz-form-control [nzErrorTip]="'请输入卸货地'">
               <div class="align-center">
                 <nz-input-group [nzSuffix]="endInconTemp1">
-                  <input
+                  <input nz-input [(ngModel)]="data2.detailedAddress" (click)="openMap('end', idx)"
-                    nz-input
+                    formControlName="unloadAddress{{ idx }}" placeholder="请输入卸货地" name="unloadAddress{{ idx }}"
-                    [(ngModel)]="data2.detailedAddress"
+                    readonly="true" />
-                    (click)="openMap('end', idx)"
-                    formControlName="unloadAddress{{ idx }}"
-                    placeholder="请输入卸货地"
-                    name="unloadAddress{{ idx }}"
-                    readonly="true"
-                  />
                 </nz-input-group>
-                <span *ngIf="idx !== 0" style="padding: 0 10px"
+                <span *ngIf="idx !== 0" style="padding: 0 10px"><i nz-icon nzType="minus-circle" nzTheme="outline"
-                  ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i
+                    style="color: #d9001b" (click)="subEndInfo($event, idx)"></i></span>
-                ></span>
+                <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"><i nz-icon nzType="minus-circle"
-                <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"
+                    nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i></span>
-                ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i
-              ></span>
               </div>
             </nz-form-control>
           </nz-form-item>
@@ -117,25 +85,13 @@
             <nz-form-label nzRequired>联系人</nz-form-label>
             <div style="display: flex; width: 80.7%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
-                <input
+                <input nz-input [(ngModel)]="data2.appUserName" maxlength="30" formControlName="unloadName{{ idx }}"
-                  nz-input
+                  name="unloadAddress{{ idx }}" placeholder="请输入联系人姓名" />
-                  [(ngModel)]="data2.appUserName"
-                  maxlength="30"
-                  formControlName="unloadName{{ idx }}"
-                  name="unloadAddress{{ idx }}"
-                  placeholder="请输入联系人姓名"
-                />
               </nz-form-control>
               <nz-form-control [nzErrorTip]="'请输入联系人电话'">
-                <input
+                <input style="margin-left: 12px" nz-input [(ngModel)]="data2.contractTelephone"
-                  style="margin-left: 12px"
+                  formControlName="unloadPhone{{ idx }}" name="unloadAddress{{ idx }}" maxlength="11"
-                  nz-input
+                  placeholder="请输入联系人电话" />
-                  [(ngModel)]="data2.contractTelephone"
-                  formControlName="unloadPhone{{ idx }}"
-                  name="unloadAddress{{ idx }}"
-                  maxlength="11"
-                  placeholder="请输入联系人电话"
-                />
               </nz-form-control>
             </div>
           </nz-form-item>
@@ -156,12 +112,8 @@
         <nz-form-item>
           <nz-form-label nzRequired>装货时间</nz-form-label>
           <nz-form-control [nzErrorTip]="'请输入装货时间'">
-            <nz-date-picker
+            <nz-date-picker [nzShowTime]="{ nzFormat: 'HH' }" nzFormat="yyyy-MM-dd HH:00前" formControlName="loadingTime"
-                [nzShowTime]="{ nzFormat: 'HH' }"
+              [nzDisabledDate]="disabledDateStart"></nz-date-picker>
-                nzFormat="yyyy-MM-dd HH:00前"
-                formControlName="loadingTime"
-                [nzDisabledDate]="disabledDateStart"
-              ></nz-date-picker>
           </nz-form-control>
         </nz-form-item>
       </div>
@@ -170,8 +122,8 @@
         <nz-form-item>
           <nz-form-label nzRequired>卸货时间</nz-form-label>
           <nz-form-control [nzErrorTip]="'请输入卸货时间'">
-            <nz-date-picker [nzShowTime]="{ nzFormat: 'HH' }"
+            <nz-date-picker [nzShowTime]="{ nzFormat: 'HH' }" nzFormat="yyyy-MM-dd HH:00前"
-              nzFormat="yyyy-MM-dd HH:00前" formControlName="unloadingTime"></nz-date-picker>
+              formControlName="unloadingTime"></nz-date-picker>
           </nz-form-control>
         </nz-form-item>
       </div>
@@ -184,31 +136,40 @@
   <div class="card-title">货物信息</div>
   <div nz-row>
     <div nz-col nzSpan="16">
-      <sf #sf3 [schema]="schema3" [button]="'none'" [ui]="ui3" [formData]="sf3data"></sf>
+      <sf #sf3 class="sf3" [schema]="schema3" [button]="'none'" [ui]="ui3" [formData]="sf3data">
+        <ng-template class="1" sf-template="goodsTips" let-i let-ui="ui">
+          <nz-alert class="goods_tips" nzType="warning" [nzMessage]="tpl" nzShowIcon></nz-alert>
+        </ng-template>
+        <ng-template #tpl>
+          <span style="font-size: 12px;"> 国家法规及行政命令禁限运货物不能托运
+            <a target="_blank" [queryParams]="{ type: 15 }" [routerLink]="['/agreement']">《禁运物品说明》</a>
+          </span>
+        </ng-template>
+      </sf>
     </div>
   </div>
   <sf #sf4 [schema]="schema4" [button]="'none'" [ui]="ui4" [formData]="sf4data">
     <ng-template sf-template="weight" let-i let-ui="ui">
       <nz-input-group [nzAddOnAfter]="'吨'">
-        <nz-input-number [nzMax]="99999" [nzMin] ="0" nzPlaceHolder="总重量，必填" type="number" [ngModel]="i.value"
+        <nz-input-number [nzMax]="99999" [nzMin]="0" nzPlaceHolder="总重量，必填" type="number" [ngModel]="i.value"
           (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;"></nz-input-number>
       </nz-input-group>
     </ng-template>
     <ng-template sf-template="volume" let-i let-ui="ui">
       <nz-input-group [nzAddOnAfter]="'方'">
-          <nz-input-number [nzMax]="99999" [nzMin] ="0" nzPlaceHolder="体积" type="number" [ngModel]="i.value"
+        <nz-input-number [nzMax]="99999" [nzMin]="0" nzPlaceHolder="体积" type="number" [ngModel]="i.value"
           (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;"></nz-input-number>
       </nz-input-group>
     </ng-template>
     <ng-template sf-template="number" let-i let-ui="ui">
       <nz-input-group [nzAddOnAfter]="'件'">
-          <nz-input-number [nzMax]="99999" [nzMin] ="0" nzPlaceHolder="件数" type="number" [ngModel]="i.value"
+        <nz-input-number [nzMax]="99999" [nzMin]="0" nzPlaceHolder="件数" type="number" [ngModel]="i.value"
           (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;"></nz-input-number>
       </nz-input-group>
     </ng-template>
     <ng-template sf-template="goodsValue" let-i let-ui="ui">
       <div class="align-center">
-        <nz-input-number [ngModel]="i.value" [nzMin] = "0" [nzMax]="2000000" [nzStep]="0.01"
+        <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="2000000" [nzStep]="0.01"
           (ngModelChange)="i.setValue($event);getInsurersPrice()" nzPlaceHolder="请输入0-2000000之间数值">
         </nz-input-number>
       </div>
@@ -235,8 +196,8 @@
         <ng-template sf-template="freeInsurance2" let-i let-ui="ui">
           <nz-alert nzType="warning" [nzMessage]="template1" nzShowIcon></nz-alert>
         </ng-template>
-        <ng-template #template1>①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见<a target="_blank" [queryParams]="{ type: 10 }"
+        <ng-template #template1>①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见<a target="_blank"
-            [routerLink]="['/agreement']">《保险告知函》</a></ng-template>
+            [queryParams]="{ type: 10 }" [routerLink]="['/agreement']">《保险告知函》</a></ng-template>
       </sf>
     </div>
   </div>
@@ -257,18 +218,21 @@
     <div nz-col nzSpan="8">
       <sf #sf7 [schema]="schema7" [button]="'none'" [ui]="ui7" [formData]="sf7data">
         <ng-template sf-template="prePay" let-i let-ui="ui">
-          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2" nzPlaceHolder="请输入0-99999"
+          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2"
-            (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb" [nzParser]="parserRmb">
+            nzPlaceHolder="请输入0-99999" (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb"
+            [nzParser]="parserRmb">
           </nz-input-number>
         </ng-template>
         <ng-template sf-template="toPay" let-i let-ui="ui">
-          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2" nzPlaceHolder="请输入0-99999"
+          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2"
-            (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb" [nzParser]="parserRmb">
+            nzPlaceHolder="请输入0-99999" (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb"
+            [nzParser]="parserRmb">
           </nz-input-number>
         </ng-template>
         <ng-template sf-template="receiptPay" let-i let-ui="ui">
-          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2" nzPlaceHolder="请输入0-99999"
+          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2"
-            (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb" [nzParser]="parserRmb">
+            nzPlaceHolder="请输入0-99999" (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb"
+            [nzParser]="parserRmb">
           </nz-input-number>
         </ng-template>
         <ng-template sf-template="subtotal" let-i let-ui="ui">{{ i.value | currency }}</ng-template>
@@ -293,7 +257,9 @@
 </nz-card>
 <nz-card>
   <div class="align-center">
-    <button nz-button nzType="primary" (click)="submitConfirm('assign')"  acl  [acl-ability]="['SUPPLY-VEHICLE-RELEASE-bulkDesignate']">指派熟车</button>
+    <button nz-button nzType="primary" (click)="submitConfirm('assign')" acl
-    <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')" *ngIf="type === 'add'"  acl  [acl-ability]="['SUPPLY-VEHICLE-RELEASE-bulkDriverOrder']">司机抢单</button>
+      [acl-ability]="['SUPPLY-VEHICLE-RELEASE-bulkDesignate']">指派熟车</button>
+    <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')"
+      *ngIf="type === 'add'" acl [acl-ability]="['SUPPLY-VEHICLE-RELEASE-bulkDriverOrder']">司机抢单</button>
   </div>
 </nz-card>

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

@@ -3,10 +3,34 @@
     nz-input-number {
       width: 100%;
     }
+
     nz-date-picker {
       width: 94.3%;
     }
+
+    .sf3 {
+      .goods_Tips_item {
+        .goods_tips {
+          width: calc(50% - 45px);
+
+          .ant-alert {
+            padding: 0 0 0 2px;
           }
+
+        }
+
+        nz-form-item {
+          margin-bottom: 8px;
+        }
+
+        // .ant-form-item-control-input-content {
+        //   display: flex;
+        //   justify-content: end;
+        // }
+      }
+    }
+  }
+
   i {
     cursor: pointer;
   }
@@ -34,7 +58,10 @@
   padding: 24px;
   color: #7d7d7d;
   font-size: 30px;
-  :hover{color: #52acff;}
+
+  :hover {
+    color: #52acff;
+  }
 }
 
 #container {
@@ -45,6 +72,7 @@
 input[type='number'] {
   -moz-appearance: textfield;
 }
+
 input[type='number']::-webkit-inner-spin-button,
 input[type='number']::-webkit-outer-spin-button {
   margin: 0;

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

@@ -237,6 +237,17 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
   initSF3() {
     this.schema3 = {
       properties: {
+        goodsTips: {
+          type: 'string',
+          title: '',
+          ui: {
+            widget: 'custom',
+            class: 'goods_Tips_item',
+            // visibleIf: {
+            //   goodsTypeName: (value: any) => value && value === '其它'
+            // }
+          }
+        },
         goodsTypeId: {
           type: 'string',
           title: '货物名称',
@@ -308,6 +319,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
       '*': {
         spanLabelFixed: 115,
         grid: { span: 12 }
+      },
+      $goodsTips: {
+        grid: { span: 24 }
       }
     };
   }
@@ -745,8 +759,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
         this.service
           .request(
             this.service.$api_getAdditionalRate +
-              `?shipperId=${this?.sf1.value?.shipperAppUserId || ''}&enterpriseInfoId=${
+            `?shipperId=${this?.sf1.value?.shipperAppUserId || ''}&enterpriseInfoId=${this?.sf1.value?.enterpriseInfoName || ''
-                this?.sf1.value?.enterpriseInfoName || ''
             }&resourcetype='1'`
           )
           .subscribe(res => {