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-03-23 15:21:39
+ * @LastEditTime : 2022-03-31 14:02:38
  * @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-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

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

@@ -188,26 +188,26 @@
   <sf #sf4 [schema]="schema4" [button]="'none'" [ui]="ui4" [formData]="sf4data">
     <ng-template sf-template="weight" let-i let-ui="ui">
       <nz-input-group [nzAddOnAfter]="'吨'">
-        <input nz-input type="number" [ngModel]="i.value" min="0" step="0.01" (ngModelChange)="i.setValue($event)"
+        <nz-input-number [nzMax]="99999" [nzMin] ="0" nzPlaceHolder="总重量，必填" type="number" [ngModel]="i.value"
-          placeholder="总重量，必填" oninput="if(value>99999)value=99999;if(value<0)value=0" />
+        (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]="'方'">
-        <input nz-input type="number" [ngModel]="i.value" min="0" step="0.01" (ngModelChange)="i.setValue($event)"
+          <nz-input-number [nzMax]="99999" [nzMin] ="0" nzPlaceHolder="体积" type="number" [ngModel]="i.value"
-          placeholder="体积" oninput="if(value>99999)value=99999;if(value<0)value=0" />
+        (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]="'件'">
-        <input nz-input type="number" [ngModel]="i.value" min="0" (ngModelChange)="i.setValue($event)" placeholder="件数"
+          <nz-input-number [nzMax]="99999" [nzMin] ="0" nzPlaceHolder="件数" type="number" [ngModel]="i.value"
-          oninput="if(value>99999)value=99999;if(value<0)value=0" />
+          (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]="50000" [nzMax]="2000000" [nzStep]="0.01"
+        <nz-input-number [ngModel]="i.value" [nzMin] = "0" [nzMax]="2000000" [nzStep]="0.01"
-          (ngModelChange)="i.setValue($event);getInsurersPrice()" nzPlaceHolder="请输入50000-2000000之间数值">
+          (ngModelChange)="i.setValue($event);getInsurersPrice()" nzPlaceHolder="请输入0-2000000之间数值">
         </nz-input-number>
       </div>
     </ng-template>
@@ -219,14 +219,22 @@
   <div nz-row>
     <div nz-col nzSpan="16">
       <sf #sf5 [schema]="schema5" [button]="'none'" [ui]="ui5" [formData]="sf5data">
+        <ng-template sf-template="type1" let-i let-ui="ui">
+          <label nz-checkbox [ngModel]="true" nzDisabled></label> &nbsp;货源曝光率 <span class="fc">+10</span>&nbsp;&nbsp;
+          <label nz-checkbox [ngModel]="true" nzDisabled></label>&nbsp;车源匹配率 <span class="fc">+10</span>
+        </ng-template>
+        <ng-template sf-template="type2" let-i let-ui="ui">
+          <label nz-checkbox [ngModel]="true" nzDisabled></label> &nbsp;货源曝光率 <span class="fc">+20</span>&nbsp;&nbsp;
+          <label nz-checkbox [ngModel]="true" nzDisabled></label>&nbsp;车源匹配率 <span class="fc">+20</span>
+        </ng-template>
         <ng-template sf-template="freeInsurance1" let-i let-ui="ui">
           <nz-alert nzType="warning" [nzMessage]="template1" nzShowIcon></nz-alert>
         </ng-template>
         <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" [queryParams]="{ type: 10 }"
-            [routerLink]="['/agreement']">《投保告知》</a></ng-template>
+            [routerLink]="['/agreement']">《保险告知函》</a></ng-template>
       </sf>
     </div>
   </div>
@@ -241,74 +249,41 @@
     </div>
   </div>
 </nz-card>
+
 <nz-card>
   <div class="card-title">运费信息</div>
   <div nz-row>
-    <div nz-col nzSpan="9">
+    <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
+          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2" nzPlaceHolder="请输入0-99999"
-            [ngModel]="i.value"
+            (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb" [nzParser]="parserRmb">
-            [nzMin]="0"
-            [nzMax]="99999"
-            [nzStep]="0.01"
-            [nzPrecision]="2"
-            (ngModelChange)="i.setValue($event); payChange()"
-            [nzFormatter]="formatterRmb"
-            [nzParser]="parserRmb"
-          >
           </nz-input-number>
         </ng-template>
         <ng-template sf-template="toPay" let-i let-ui="ui">
-          <nz-input-number
+          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2" nzPlaceHolder="请输入0-99999"
-            [ngModel]="i.value"
+            (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb" [nzParser]="parserRmb">
-            [nzMin]="0"
-            [nzMax]="99999"
-            [nzStep]="0.01"
-            [nzPrecision]="2"
-            (ngModelChange)="i.setValue($event); payChange()"
-            [nzFormatter]="formatterRmb"
-            [nzParser]="parserRmb"
-          >
           </nz-input-number>
         </ng-template>
         <ng-template sf-template="receiptPay" let-i let-ui="ui">
-          <nz-input-number
+          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2" nzPlaceHolder="请输入0-99999"
-            [ngModel]="i.value"
+            (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb" [nzParser]="parserRmb">
-            [nzMin]="0"
-            [nzMax]="99999"
-            [nzStep]="0.01"
-            [nzPrecision]="2"
-            (ngModelChange)="i.setValue($event); payChange()"
-            [nzFormatter]="formatterRmb"
-            [nzParser]="parserRmb"
-          >
           </nz-input-number>
         </ng-template>
         <ng-template sf-template="subtotal" let-i let-ui="ui">{{ i.value | currency }}</ng-template>
-        <ng-template sf-template="appendFee" let-i let-ui="ui"
+        <ng-template sf-template="appendFee" let-i let-ui="ui">{{ i.value | currency }}（费率：{{ currentRate | number:
-          >{{ i.value | currency }}（费率：{{ currentRate | number: '0.2-4' }}%）</ng-template
+          '0.2-4' }}%）</ng-template>
-        >
         <ng-template sf-template="total" let-i let-ui="ui">{{ i.value | currency }}</ng-template>
         <ng-template sf-template="paymentDays" let-i let-ui="ui">
-          <div nz-row>
+          <div nz-row class="align-center">
-            <div class="align-center">
+              <div nz-col nzSpan="16">
-              <div nz-col nzSpan="12">
+                <nz-input-number [ngModel]="i.value" [nzMin]="1" [nzMax]="30" [nzStep]="1"
-                <nz-input-number
+                  (ngModelChange)="i.setValue($event)" nzPlaceHolder="请输入1-30" [nzPrecision]="0"
-                  [ngModel]="i.value"
+                  [nzPrecisionMode]="'cut'"></nz-input-number>
-                  [nzMin]="1"
-                  [nzMax]="30"
-                  [nzStep]="1"
-                  (ngModelChange)="i.setValue($event)"
-                  nzPlaceHolder="请输入1-30"
-                  [nzPrecision]="0"
-                  [nzPrecisionMode]="'cut'"
-                ></nz-input-number>
               </div>
-              <div nz-col nzSpan="12">
+              <div nz-col nzSpan="8">
                 <span>&nbsp;天内支付运费</span>
               </div>
-            </div>
           </div>
         </ng-template>
       </sf>

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

@@ -448,6 +448,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
     };
   }
 
+
   initSF5() {
     this.schema5 = {
       properties: {
@@ -461,13 +462,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
                 map((res: any) => {
                   return [...res];
                 })
-              );
+              )
             },
             change: (tag: any, org: any) => {
-              if (tag === '3') {
+              if(tag === '3'){
                 this.sf5.setValue('/insurancePremium', null);
                 this.sf5.setValue('/insuranceRate', null);
-              } else {
+              }else {
                 this.getInsurersPrice(tag);
               }
             }
@@ -477,29 +478,23 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
         type1: {
           type: 'string',
           title: '',
-          enum: ['货源曝光率 +10', '车源匹配率 +10'],
-          readOnly: true,
           ui: {
-            widget: 'checkbox',
+            widget: 'custom',
             visibleIf: { insuranceType: (value: string) => value === '0' }
-          } as SFCheckboxWidgetSchema,
+          } ,
-          default: ['货源曝光率 +10', '车源匹配率 +10']
         },
         type2: {
           type: 'string',
           title: '',
-          enum: ['货源曝光率 +20', '车源匹配率 +20'],
-          readOnly: true,
           ui: {
-            widget: 'checkbox',
+            widget: 'custom',
             visibleIf: { insuranceType: (value: string) => value === '1' }
-          } as SFCheckboxWidgetSchema,
+          }
-          default: ['货源曝光率 +20', '车源匹配率 +20']
         },
         insurancePremium: {
           type: 'string',
           title: '服务包费用',
-          readOnly: true,
+          readOnly:true,
           ui: {
             visibleIf: { insuranceType: (value: string) => value !== '3' }
           }
@@ -526,9 +521,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
             widget: 'custom',
             visibleIf: { insuranceType: (value: string) => value === '1' }
           }
-        }
+        },
       },
-      required: ['insurancePremium']
+      required: [ 'insurancePremium']
     };
     this.ui5 = {
       '*': {
@@ -1022,6 +1017,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       paymentDays: this.sf7.value.paymentDays,
       estimatedKilometers: this.totalDistance,
       estimatedTravelTime: this.totalTime,
+      subtotal :this.sf7.value.subtotal,
+      total:this.sf7.value.total,
       insurancePackagedGoods: this.sf4.value.insurancePackagedGoods,
       goodsValue: this.sf4.value.goodsValue
     };
@@ -1419,7 +1416,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
   // 计算保价费金额
   getInsurersPrice(insuranceType = this.sf5.value.insuranceType) {
     console.log(this.totalDistance);
-    if (insuranceType !== '3' && this.sf4.value?.goodsValue >= 50000 && this.totalDistance > 0) {
+    if (insuranceType !== '3' &&  this.totalDistance > 0) {
       const params = {
         insuranceType,
         goodsValue: this.sf4.value.goodsValue,
@@ -1436,4 +1433,14 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       });
     }
   }
+    // 运费信息价格变更
+    priceChange(event:any, i:any){
+      i.setValue(event);
+      if(event>=99999){
+        this.modalService.warning({
+          nzTitle: '可输入的最大金额为99999元',
+        });
+      }
+      this.payChange()
+    }
 }

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

@@ -180,7 +180,6 @@
   </form>
 </nz-card>
 
-
 <nz-card>
   <div class="card-title">货物信息</div>
   <div nz-row>
@@ -191,26 +190,26 @@
   <sf #sf4 [schema]="schema4" [button]="'none'" [ui]="ui4" [formData]="sf4data">
     <ng-template sf-template="weight" let-i let-ui="ui">
       <nz-input-group [nzAddOnAfter]="'吨'">
-        <input nz-input type="number" [ngModel]="i.value" min="0" step="0.01" (ngModelChange)="i.setValue($event)"
+        <nz-input-number [nzMax]="99999" [nzMin] ="0" nzPlaceHolder="总重量，必填" type="number" [ngModel]="i.value"
-          placeholder="总重量，必填" oninput="if(value>99999)value=99999;if(value<0)value=0" />
+        (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]="'方'">
-        <input nz-input type="number" [ngModel]="i.value" min="0" step="0.01" (ngModelChange)="i.setValue($event)"
+          <nz-input-number [nzMax]="99999" [nzMin] ="0" nzPlaceHolder="体积" type="number" [ngModel]="i.value"
-          placeholder="体积" oninput="if(value>99999)value=99999;if(value<0)value=0" />
+        (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]="'件'">
-        <input nz-input type="number" [ngModel]="i.value" min="0" (ngModelChange)="i.setValue($event)" placeholder="件数"
+          <nz-input-number [nzMax]="99999" [nzMin] ="0" nzPlaceHolder="件数" type="number" [ngModel]="i.value"
-          oninput="if(value>99999)value=99999;if(value<0)value=0" />
+          (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]="50000" [nzMax]="2000000" [nzStep]="0.01"
+        <nz-input-number [ngModel]="i.value" [nzMin] = "0" [nzMax]="2000000" [nzStep]="0.01"
-          (ngModelChange)="i.setValue($event);getInsurersPrice()" nzPlaceHolder="请输入50000-2000000之间数值">
+          (ngModelChange)="i.setValue($event);getInsurersPrice()" nzPlaceHolder="请输入0-2000000之间数值">
         </nz-input-number>
       </div>
     </ng-template>
@@ -222,14 +221,22 @@
   <div nz-row>
     <div nz-col nzSpan="16">
       <sf #sf5 [schema]="schema5" [button]="'none'" [ui]="ui5" [formData]="sf5data">
+        <ng-template sf-template="type1" let-i let-ui="ui">
+          <label nz-checkbox [ngModel]="true" nzDisabled></label> &nbsp;货源曝光率 <span class="fc">+10</span>&nbsp;&nbsp;
+          <label nz-checkbox [ngModel]="true" nzDisabled></label>&nbsp;车源匹配率 <span class="fc">+10</span>
+        </ng-template>
+        <ng-template sf-template="type2" let-i let-ui="ui">
+          <label nz-checkbox [ngModel]="true" nzDisabled></label> &nbsp;货源曝光率 <span class="fc">+20</span>&nbsp;&nbsp;
+          <label nz-checkbox [ngModel]="true" nzDisabled></label>&nbsp;车源匹配率 <span class="fc">+20</span>
+        </ng-template>
         <ng-template sf-template="freeInsurance1" let-i let-ui="ui">
           <nz-alert nzType="warning" [nzMessage]="template1" nzShowIcon></nz-alert>
         </ng-template>
         <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" [queryParams]="{ type: 10 }"
-            [routerLink]="['/agreement']">《投保告知》</a></ng-template>
+            [routerLink]="['/agreement']">《保险告知函》</a></ng-template>
       </sf>
     </div>
   </div>
@@ -247,71 +254,37 @@
 <nz-card>
   <div class="card-title">运费信息</div>
   <div nz-row>
-    <div nz-col nzSpan="12">
+    <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
+          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2" nzPlaceHolder="请输入0-99999"
-            [ngModel]="i.value"
+            (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb" [nzParser]="parserRmb">
-            [nzMin]="0"
-            [nzMax]="99999"
-            [nzStep]="0.01"
-            [nzPrecision]="2"
-            (ngModelChange)="i.setValue($event); payChange()"
-            [nzFormatter]="formatterRmb"
-            [nzParser]="parserRmb"
-          >
           </nz-input-number>
         </ng-template>
         <ng-template sf-template="toPay" let-i let-ui="ui">
-          <nz-input-number
+          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2" nzPlaceHolder="请输入0-99999"
-            [ngModel]="i.value"
+            (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb" [nzParser]="parserRmb">
-            [nzMin]="0"
-            [nzMax]="99999"
-            [nzStep]="0.01"
-            [nzPrecision]="2"
-            (ngModelChange)="i.setValue($event); payChange()"
-            [nzFormatter]="formatterRmb"
-            [nzParser]="parserRmb"
-          >
           </nz-input-number>
         </ng-template>
         <ng-template sf-template="receiptPay" let-i let-ui="ui">
-          <nz-input-number
+          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2" nzPlaceHolder="请输入0-99999"
-            [ngModel]="i.value"
+            (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb" [nzParser]="parserRmb">
-            [nzMin]="0"
-            [nzMax]="99999"
-            [nzStep]="0.01"
-            [nzPrecision]="2"
-            (ngModelChange)="i.setValue($event); payChange()"
-            [nzFormatter]="formatterRmb"
-            [nzParser]="parserRmb"
-          >
           </nz-input-number>
         </ng-template>
         <ng-template sf-template="subtotal" let-i let-ui="ui">{{ i.value | currency }}</ng-template>
-        <ng-template sf-template="appendFee" let-i let-ui="ui"
+        <ng-template sf-template="appendFee" let-i let-ui="ui">{{ i.value | currency }}（费率：{{ currentRate | number:
-          >{{ i.value | currency }}（费率：{{ currentRate | number: '0.2-4' }}%）</ng-template
+          '0.2-4' }}%）</ng-template>
-        >
         <ng-template sf-template="total" let-i let-ui="ui">{{ i.value | currency }}</ng-template>
         <ng-template sf-template="paymentDays" let-i let-ui="ui">
-          <div nz-row>
+          <div nz-row class="align-center">
-            <div class="align-center">
+              <div nz-col nzSpan="16">
-              <div nz-col nzSpan="12">
+                <nz-input-number [ngModel]="i.value" [nzMin]="1" [nzMax]="30" [nzStep]="1"
-                <nz-input-number
+                  (ngModelChange)="i.setValue($event)" nzPlaceHolder="请输入1-30" [nzPrecision]="0"
-                  [ngModel]="i.value"
+                  [nzPrecisionMode]="'cut'"></nz-input-number>
-                  [nzMin]="1"
-                  [nzMax]="30"
-                  [nzStep]="1"
-                  (ngModelChange)="i.setValue($event)"
-                  nzPlaceHolder="请输入1-30"
-                  [nzPrecision]="0"
-                  [nzPrecisionMode]="'cut'"
-                ></nz-input-number>
               </div>
-              <div nz-col nzSpan="12">
+              <div nz-col nzSpan="8">
                 <span>&nbsp;天内支付运费</span>
               </div>
-            </div>
           </div>
         </ng-template>
       </sf>

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

@@ -436,14 +436,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
                 map((res: any) => {
                   return [...res];
                 })
-              );
+              )
             },
             change: (tag: any, org: any) => {
-              if (tag === '3') {
+              if(tag === '3'){
                 this.sf5.setValue('/insurancePremium', null);
                 this.sf5.setValue('/insuranceRate', null);
-              } else {
+              }else {
-                console.log(tag);
                 this.getInsurersPrice(tag);
               }
             }
@@ -453,29 +452,23 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
         type1: {
           type: 'string',
           title: '',
-          enum: ['货源曝光率 +10', '车源匹配率 +10'],
-          readOnly: true,
           ui: {
-            widget: 'checkbox',
+            widget: 'custom',
             visibleIf: { insuranceType: (value: string) => value === '0' }
-          } as SFCheckboxWidgetSchema,
+          } ,
-          default: ['货源曝光率 +10', '车源匹配率 +10']
         },
         type2: {
           type: 'string',
           title: '',
-          enum: ['货源曝光率 +20', '车源匹配率 +20'],
-          readOnly: true,
           ui: {
-            widget: 'checkbox',
+            widget: 'custom',
             visibleIf: { insuranceType: (value: string) => value === '1' }
-          } as SFCheckboxWidgetSchema,
+          }
-          default: ['货源曝光率 +20', '车源匹配率 +20']
         },
         insurancePremium: {
           type: 'string',
           title: '服务包费用',
-          readOnly: true,
+          readOnly:true,
           ui: {
             visibleIf: { insuranceType: (value: string) => value !== '3' }
           }
@@ -502,9 +495,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
             widget: 'custom',
             visibleIf: { insuranceType: (value: string) => value === '1' }
           }
-        }
+        },
       },
-      required: ['insurancePremium']
+      required: [ 'insurancePremium']
     };
     this.ui5 = {
       '*': {
@@ -962,6 +955,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
       ...this.sf6.value,
       expenseDTOList: expenseList,
       paymentDays: this.sf7.value.paymentDays,
+      subtotal :this.sf7.value.subtotal,
+      total:this.sf7.value.total,
       estimatedKilometers: this.totalDistance,
       estimatedTravelTime: this.totalTime,
       insurancePackagedGoods: this.sf4.value.insurancePackagedGoods,
@@ -1192,7 +1187,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
   getInsurersPrice(insuranceType = this.sf5.value?.insuranceType) {
     console.log(insuranceType);
     console.log(this.totalDistance);
-    if (insuranceType !== '3' && this.sf4.value?.goodsValue >= 50000 && this.totalDistance > 0) {
+    if (insuranceType !== '3' &&  this.totalDistance > 0) {
       const params = {
         insuranceType,
         goodsValue: this.sf4.value.goodsValue,
@@ -1209,4 +1204,14 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
       });
     }
   }
+      // 运费信息价格变更
+      priceChange(event:any, i:any){
+        i.setValue(event);
+        if(event>=99999){
+          this.modalService.warning({
+            nzTitle: '可输入的最大金额为99999元',
+          });
+        }
+        this.payChange()
+      }
 }

src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html

@@ -159,10 +159,10 @@
       <sv label="服务包">
         {{ i?.insuranceTypeLabel}}
       </sv>
-      <sv label="货物价值">
+      <sv label="货物价值" *ngIf="i?.insuranceType !== '3'">
         {{i?.goodsValue !==null?(i?.goodsValue|currency)+'元':'-'}}
       </sv>
-      <sv label="服务包费用">
+      <sv label="服务包费用" *ngIf="i?.insuranceType !== '3'">
         {{i?.insurancePremium!==null?(i?.insurancePremium |currency)+'元':'-'}}
       </sv>
     </sv-container>

src/app/routes/tax-management/components/individual-collect/individual-collect.component.html

@@ -0,0 +1,80 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-30 14:00:43
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-31 10:31:40
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-collect\\individual-collect.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<page-header-wrapper [title]="''"></page-header-wrapper>
+
+<nz-card>
+  <!-- 搜索表单 -->
+  <div nz-row nzGutter="8">
+    <div nz-col [nzSpan]="_$expand ? 24 : 18">
+      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+    </div>
+    <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+      <button
+        nz-button
+        nzType="primary"
+        [disabled]="!sf.valid"
+        [nzLoading]="false"
+        (click)="search()"
+        acl
+        [acl-ability]="['RiskOrder-Search']"
+        >查询</button
+      >
+      <button nz-button (click)="resetSF()">重置</button>
+      <button nz-button (click)="resetSF()">导出</button>
+      <button nz-button nzType="link" (click)="expandToggle()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
+</nz-card>
+<nz-card>
+  <nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length > 0">
+    <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab>
+  </nz-tabset>
+  <!-- 数据列表 -->
+  <st
+    #st
+    [scroll]="{ x: '1200px' }"
+    [data]="service.$api_order_reporting_page"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }"
+    [loading]="false"
+  >
+    <ng-template st-row="orderStatus" let-item let-index="index">
+      <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
+      <span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>
+      <span style="color: red" (click)="unnormal(item)">异常</span>
+    </ng-template>
+
+    <ng-template st-row="localValid" let-item let-index="index">
+      <a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
+      <span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>
+    </ng-template>
+    <ng-template st-row="amount" let-item let-index="index">
+      <div class="text-right">{{ item?.amount | currency: ' ' }}</div>
+    </ng-template>
+  </st>
+</nz-card>
+<ng-template #extraTemplate>
+  <div class="d-flex align-items-center">
+    <div class="mr-md">
+      已选择
+      <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
+    </div>
+    <button nz-button nzType="primary" (click)="upload()">申报</button>
+    <button nz-button nzType="primary" (click)="recall()">更正</button>
+    <button nz-button nzType="primary" (click)="uploadSetting()">更新数据</button>
+  </div>
+</ng-template>
+

src/app/routes/tax-management/components/individual-collect/individual-collect.component.less

@@ -0,0 +1,5 @@
+:host {
+  .text-black {
+    color: #000;
+  }
+}

src/app/routes/tax-management/components/individual-collect/individual-collect.component.spec.ts

@@ -0,0 +1,34 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-30 14:45:52
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-30 15:33:06
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-income\\individual-income.component.spec.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TaxManagementIndividualCollectComponent } from './individual-collect.component';
+
+describe('TaxManagementIndividualCollectComponent', () => {
+  let component: TaxManagementIndividualCollectComponent;
+  let fixture: ComponentFixture<TaxManagementIndividualCollectComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ TaxManagementIndividualCollectComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TaxManagementIndividualCollectComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts

@@ -0,0 +1,358 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { ShipperBaseService } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { of } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { TaxManagementService } from '../../services/tax-management.service';
+// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
+// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
+
+@Component({
+  selector: 'app-tax-management-individual-collect',
+  templateUrl: './individual-collect.component.html',
+  styleUrls: ['./individual-collect.component.less']
+})
+export class TaxManagementIndividualCollectComponent implements OnInit {
+  _$expand = false;
+  ui!: SFUISchema;
+  schema!: SFSchema;
+  columns!: STColumn[];
+  @ViewChild('st', { static: false }) st!: STComponent;
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  tabType!: string;
+  tabs: any[] = [
+    { name: '待申报', value: '1' },
+    { name: '待审核', value: '2' },
+    { name: '已通过', value: '3' },
+    { name: '不通过', value: '4' },
+    { name: '全部', value: '' }
+  ];
+  selectedIndex = ''; //选择的项目
+  serviceTel = '';
+  constructor(
+    public service: TaxManagementService,
+    private router: Router,
+    private ar: ActivatedRoute,
+    public shipperservice: ShipperBaseService,
+    private modal: NzModalService,
+    public shipperSrv: ShipperBaseService
+  ) {}
+
+  /**
+   * 查询字段个数
+   */
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    const params = Object.assign({}, this.sf?.value || {}, {
+      representationsStatus: this.selectedIndex
+    });
+    delete params._$expand;
+    return { ...params };
+  }
+
+  /**
+   * 选中行
+   */
+  get selectedRows() {
+    return this.st?.list.filter((item: any) => item.checked) || [];
+  }
+
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+  /**
+   * 程序初始化入口
+   */
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+  }
+
+  /**
+   * 初始化查询表单
+   */
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        billCode: { title: '申报状态', type: 'string', ui: { placeholder: '请输入' } },
+        resourceCode: {
+          type: 'string',
+          title: '申报结果',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        serviceType3: {
+          title: '是否逾期',
+          type: 'string',
+          ui: {
+            placeholder: '请选择',
+            widget: 'dict-select',
+            params: { dictKey: 'service:type' },
+            containsAllLabel: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          }
+        },
+        createTime: {
+          title: '税款所属期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        createTime3: {
+          title: '申报日期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        enterpriseInfoId: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+          }
+        }
+      }
+    };
+    this.ui = {
+      '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
+      $time: { grid: { span: 24 } }
+    };
+  }
+
+  /**
+   * 初始化数据列表
+   */
+  initST() {
+    this.columns = [
+      { title: '', type: 'checkbox', className: 'text-center', width: '60px' },
+      { title: '申报状态', render: 'orderStatus', className: 'text-center', width: '120px' },
+      { title: '是否逾期', render: 'localValid', className: 'text-center', width: '120px' },
+      {
+        title: '税款所属期起',
+        render: 'billComplianceVOS',
+        className: 'text-center',
+        width: '150px'
+      },
+      { title: '税款所属期止', render: 'freightDetails', className: 'text-center', width: '150px' },
+      {
+        title: '纳税人名称',
+        render: 'serviceType',
+        className: 'text-center',
+        width: '180px'
+      },
+      { title: '纳税人识别号', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '税率', render: 'transportInfo', className: 'text-center', width: '200px' },
+      { title: '申报人数', render: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '应税收入', render: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '应纳税额', render: 'transportInfo', className: 'text-center', width: '180px' },
+      { title: '累计已缴纳税额', render: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '本期应补退税额', render: 'transportInfo', className: 'text-center', width: '200px' },
+      { title: '申报日期', render: 'payeeName', className: 'text-center', width: '150px' },
+    ];
+  }
+
+  /**
+   *撤销
+   * @param record 记录实例
+   */
+  recall() {
+    if (this.selectedRows.length === 0) {
+      this.openWainingModal('请选择需要撤回的数据');
+      return;
+    }
+    this.modal.confirm({
+      nzTitle: '撤回提示',
+      nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
+      nzOkText: '确定',
+      nzCancelText: '取消',
+      nzOnOk: () => {
+        this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+          if (res) {
+            this.service.msgSrv.success('撤销成功');
+            this.search();
+          }
+        });
+      }
+    });
+  }
+  /**
+   *撤销
+   * @param record 记录实例
+   */
+  unnormal(value: any) {
+    this.modal.confirm({
+      nzTitle: '税务审核结果',
+      nzContent: '订单结算时间所在月份与申报月份不一致',
+      nzOkText: '确定',
+      nzCancelText: '',
+      nzOnOk: () => {
+        this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+          if (res) {
+            this.service.msgSrv.success('撤销成功');
+            this.search();
+          }
+        });
+      }
+    });
+  }
+
+  selectChange(item: any) {
+    this.selectedIndex = item?.representationsStatus || '';
+    setTimeout(() => {
+      this.st.load(1);
+    });
+  }
+
+  /**
+   * 查看当行数据
+   */
+  view(record: STData) {
+    // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar });
+    this.router.navigate(['../detail'], {
+      queryParams: {
+        id: record.id
+      },
+      relativeTo: this.ar
+    });
+  }
+
+  // appeal(item: any) {
+  //   const modalRef = this.modal.create({
+  //     nzTitle: '申诉',
+  //     nzWidth: '40%',
+  //     nzContent: CtcAppealComponent,
+  //     nzComponentParams: {
+  //       i: item,
+  //       status: 'add'
+  //     },
+  //     nzFooter: null
+  //   });
+  //   modalRef.afterClose.subscribe(res => {
+  //     if (res) {
+  //       this.search({ representationsStatus: '' });
+  //     }
+  //   })
+  // }
+
+  /**
+   * 申报
+   */
+  upload() {
+    if (this.selectedRows.length === 0) {
+      this.openWainingModal('请选择需要上传的数据');
+      return;
+    }
+    // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+    //   if (res) {
+    //     this.service.msgSrv.success('申报成功');
+    //     this.search();
+    //   }
+    // })
+  }
+
+  /**
+   *
+   * @param params 更新数据
+   */
+  uploadSetting() {
+    if (this.selectedRows.length === 0) {
+      this.openWainingModal('请选择需要上传的数据');
+      return;
+    }
+    // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+    //   if (res) {
+    //     this.service.msgSrv.success('更新成功');
+    //     this.search();
+    //   }
+    // })
+  }
+
+  /**
+   * 查看校验结果
+   */
+  viewResult(item: any) {
+    // const modalRef = this.modal.create({
+    //   nzTitle: '本地校验结果',
+    //   nzWidth: 1200,
+    //   nzContent: TaxManagementOrderVerifyResultComponent,
+    //   nzComponentParams: {
+    //     record: item
+    //   },
+    //   nzFooter: null
+    // });
+    // modalRef.afterClose.subscribe(res => {
+    // })
+  }
+
+  /**
+   * 查看监管审核结果
+   */
+  viewAuditResult(record: any) {
+    if (record?.billStatus !== '2') {
+      return;
+    }
+    this.openWainingModal('监管审核结果', record?.result);
+  }
+
+  search() {
+    this.st.load(1);
+  }
+
+  /**
+   * 异步导出
+   */
+  export() {
+    this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list);
+  }
+
+  openWainingModal(content: string, title = '提示') {
+    this.modal.warning({
+      nzMask: false,
+      nzTitle: title,
+      nzContent: content
+    });
+  }
+}

src/app/routes/tax-management/components/individual-declare/individual-declare.component.html

@@ -0,0 +1,91 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-30 14:00:43
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-31 10:36:57
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-declare\\individual-declare.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<page-header-wrapper [title]="''"></page-header-wrapper>
+
+<nz-card>
+  <!-- 搜索表单 -->
+  <div nz-row nzGutter="8">
+    <div nz-col [nzSpan]="_$expand ? 24 : 18">
+      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+    </div>
+    <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+      <button
+        nz-button
+        nzType="primary"
+        [disabled]="!sf.valid"
+        [nzLoading]="false"
+        (click)="search()"
+        acl
+        [acl-ability]="['RiskOrder-Search']"
+        >查询</button
+      >
+      <button nz-button (click)="resetSF()">重置</button>
+      <button nz-button (click)="resetSF()">导出</button>
+      <button nz-button nzType="link" (click)="expandToggle()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
+</nz-card>
+<nz-card>
+  <nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length > 0">
+    <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab>
+  </nz-tabset>
+  <!-- 数据列表 -->
+  <st
+    #st
+    [scroll]="{ x: '1200px' }"
+    [data]="service.$api_order_reporting_page"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }"
+    [loading]="false"
+  >
+    <ng-template st-row="orderStatus" let-item let-index="index">
+      <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
+      <span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>
+      <span style="color: red" (click)="unnormal(item)">异常</span>
+    </ng-template>
+
+    <ng-template st-row="localValid" let-item let-index="index">
+      <a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
+      <span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>
+    </ng-template>
+    <ng-template st-row="amount" let-item let-index="index">
+      <div class="text-right">{{ item?.amount | currency: ' ' }}</div>
+    </ng-template>
+  </st>
+</nz-card>
+<ng-template #extraTemplate>
+  <div class="d-flex align-items-center">
+    <div class="mr-md">
+      已选择
+      <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
+    </div>
+    <button nz-button nzType="primary" (click)="upload()">申报</button>
+    <button nz-button nzType="primary" (click)="recall()">更正</button>
+    <button nz-button nzType="primary" (click)="resetData()">修改起征点</button>
+    <button nz-button nzType="primary" (click)="uploadSetting()">更新数据</button>
+  </div>
+</ng-template>
+
+<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+  <ng-container *nzModalContent>
+    <div> 司机姓名：张三/13812345678 </div>
+    <div> 是否确认要将该司机的起征点同步调整为超过15万？ </div>
+  </ng-container>
+  <ng-template #nzModalFooterEvaluate>
+    <button nz-button nzType="default" (click)="handleCancel()">取消</button>
+    <button nz-button nzType="primary" (click)="handleOK()">确定</button>
+  </ng-template>
+</nz-modal>

src/app/routes/tax-management/components/individual-declare/individual-declare.component.less

@@ -0,0 +1,5 @@
+:host {
+  .text-black {
+    color: #000;
+  }
+}

src/app/routes/tax-management/components/individual-declare/individual-declare.component.spec.ts

@@ -0,0 +1,34 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-30 14:45:52
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-31 10:36:54
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-declare\\individual-declare.component.spec.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TaxManagementIndividualDeclareComponent } from './individual-declare.component';
+
+describe('TaxManagementIndividualDeclareComponent', () => {
+  let component: TaxManagementIndividualDeclareComponent;
+  let fixture: ComponentFixture<TaxManagementIndividualDeclareComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ TaxManagementIndividualDeclareComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TaxManagementIndividualDeclareComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts

@@ -0,0 +1,431 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { ShipperBaseService } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { of } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { TaxManagementService } from '../../services/tax-management.service';
+// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
+// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
+
+@Component({
+  selector: 'app-tax-management-individual-declare',
+  templateUrl: './individual-declare.component.html',
+  styleUrls: ['./individual-declare.component.less']
+})
+export class TaxManagementIndividualDeclareComponent implements OnInit {
+  _$expand = false;
+  ui!: SFUISchema;
+  schema!: SFSchema;
+  columns!: STColumn[];
+  @ViewChild('st', { static: false }) st!: STComponent;
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  tabType!: string;
+  tabs: any[] = [
+    { name: '待申报', value: '1' },
+    { name: '待审核', value: '2' },
+    { name: '已通过', value: '3' },
+    { name: '不通过', value: '4' },
+    { name: '全部', value: '' }
+  ];
+  selectedIndex = ''; //选择的项目
+  serviceTel = '';
+  isVisible : boolean = false
+  constructor(
+    public service: TaxManagementService,
+    private router: Router,
+    private ar: ActivatedRoute,
+    public shipperservice: ShipperBaseService,
+    private modal: NzModalService,
+    public shipperSrv: ShipperBaseService
+  ) {}
+
+  /**
+   * 查询字段个数
+   */
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    const params = Object.assign({}, this.sf?.value || {}, {
+      representationsStatus: this.selectedIndex
+    });
+    delete params._$expand;
+    return { ...params };
+  }
+
+  /**
+   * 选中行
+   */
+  get selectedRows() {
+    return this.st?.list.filter((item: any) => item.checked) || [];
+  }
+
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+  /**
+   * 程序初始化入口
+   */
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+    const object1 : any = {};
+    const object2 : any = {};
+    Object.defineProperty(object1, 'name',{  writable: false ,value: 'wang'});
+    Object.defineProperty(object2, 'xxoo',{  writable: false ,value: 'wang'});
+    console.log(object1);
+    console.log(object1.name);
+    console.log(object2);
+    console.log(object2.xxoo);
+    object1.name = 'ming'
+    object2.xxoo = 'ming'
+    console.log(object1);
+    console.log(object2);
+  }
+
+  /**
+   * 初始化查询表单
+   */
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        billCode: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } },
+        resourceCode: {
+          type: 'string',
+          title: '联系电话',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        driverName: {
+          title: '证件号码',
+          type: 'string',
+          ui: {
+            placeholder: '请输入证件号码'
+          }
+        },
+        serviceType2: {
+          title: '申报状态',
+          type: 'string',
+          ui: {
+            placeholder: '请选择',
+            widget: 'dict-select',
+            params: { dictKey: 'service:type' },
+            containsAllLabel: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          }
+        },
+        serviceType3: {
+          title: '申报结果',
+          type: 'string',
+          ui: {
+            placeholder: '请选择',
+            widget: 'dict-select',
+            params: { dictKey: 'service:type' },
+            containsAllLabel: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          }
+        },
+        serviceType1: {
+          title: '是否逾期',
+          type: 'string',
+          ui: {
+            placeholder: '请选择',
+            widget: 'dict-select',
+            params: { dictKey: 'service:type' },
+            containsAllLabel: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          }
+        },
+        createTime: {
+          title: '税款所属期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        createTime3: {
+          title: '申报日期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        enterpriseInfoId: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+          }
+        }
+      }
+    };
+    this.ui = {
+      '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
+      $time: { grid: { span: 24 } }
+    };
+  }
+
+  /**
+   * 初始化数据列表
+   */
+  initST() {
+    this.columns = [
+      { title: '', type: 'checkbox', className: 'text-center', width: '60px' },
+      { title: '申报状态', render: 'orderStatus', className: 'text-center', width: '120px' },
+      { title: '是否逾期', render: 'localValid', className: 'text-center', width: '120px' },
+      {
+        title: '税款所属期起',
+        render: 'billComplianceVOS',
+        className: 'text-center',
+        width: '150px'
+      },
+      { title: '税款所属期止', render: 'freightDetails', className: 'text-center', width: '150px' },
+      {
+        title: '纳税人名称',
+        render: 'serviceType',
+        className: 'text-center',
+        width: '180px'
+      },
+      { title: '纳税人识别号', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '姓名', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '证件类型', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '证件号码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '联系电话', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '国家（地区）', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '所属行业', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '征收项目', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '征收品目', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '计税依据', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '税率', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '应纳税额', render: 'transportInfo', className: 'text-center', width: '180px' },
+      { title: '减免税额', render: 'transportInfo', className: 'text-center', width: '180px' },
+      { title: '已缴纳税额', render: 'transportInfo', className: 'text-center', width: '180px' },
+      { title: '应代征税额', render: 'transportInfo', className: 'text-center', width: '180px' },
+      { title: '已代征税额', render: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '申报日期', render: 'payeeName', className: 'text-center', width: '150px' },
+    ];
+  }
+
+  /**
+   *撤销
+   * @param record 记录实例
+   */
+  recall() {
+    if (this.selectedRows.length === 0) {
+      this.openWainingModal('请选择需要撤回的数据');
+      return;
+    }
+    this.modal.confirm({
+      nzTitle: '撤回提示',
+      nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
+      nzOkText: '确定',
+      nzCancelText: '取消',
+      nzOnOk: () => {
+        this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+          if (res) {
+            this.service.msgSrv.success('撤销成功');
+            this.search();
+          }
+        });
+      }
+    });
+  }
+  /**
+   *撤销
+   * @param record 记录实例
+   */
+  resetData() {
+    if (this.selectedRows.length === 0) {
+      this.openWainingModal('请选择需要更新的数据！');
+      return;
+    }
+    this.isVisible = true
+
+  }
+  /**
+   *撤销
+   * @param record 记录实例
+   */
+  unnormal(value: any) {
+    this.modal.confirm({
+      nzTitle: '税务审核结果',
+      nzContent: '订单结算时间所在月份与申报月份不一致',
+      nzOkText: '确定',
+      nzCancelText: '',
+      nzOnOk: () => {
+        this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+          if (res) {
+            this.service.msgSrv.success('撤销成功');
+            this.search();
+          }
+        });
+      }
+    });
+  }
+
+  selectChange(item: any) {
+    this.selectedIndex = item?.representationsStatus || '';
+    setTimeout(() => {
+      this.st.load(1);
+    });
+  }
+
+  /**
+   * 查看当行数据
+   */
+  view(record: STData) {
+    // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar });
+    this.router.navigate(['../detail'], {
+      queryParams: {
+        id: record.id
+      },
+      relativeTo: this.ar
+    });
+  }
+
+  // appeal(item: any) {
+  //   const modalRef = this.modal.create({
+  //     nzTitle: '申诉',
+  //     nzWidth: '40%',
+  //     nzContent: CtcAppealComponent,
+  //     nzComponentParams: {
+  //       i: item,
+  //       status: 'add'
+  //     },
+  //     nzFooter: null
+  //   });
+  //   modalRef.afterClose.subscribe(res => {
+  //     if (res) {
+  //       this.search({ representationsStatus: '' });
+  //     }
+  //   })
+  // }
+
+  /**
+   * 申报
+   */
+  upload() {
+    if (this.selectedRows.length === 0) {
+      this.openWainingModal('请选择需要上传的数据');
+      return;
+    }
+    // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+    //   if (res) {
+    //     this.service.msgSrv.success('申报成功');
+    //     this.search();
+    //   }
+    // })
+  }
+
+  /**
+   *
+   * @param params 更新数据
+   */
+  uploadSetting() {
+    if (this.selectedRows.length === 0) {
+      this.openWainingModal('请选择需要上传的数据');
+      return;
+    }
+    // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+    //   if (res) {
+    //     this.service.msgSrv.success('更新成功');
+    //     this.search();
+    //   }
+    // })
+  }
+
+  /**
+   * 查看校验结果
+   */
+  viewResult(item: any) {
+    // const modalRef = this.modal.create({
+    //   nzTitle: '本地校验结果',
+    //   nzWidth: 1200,
+    //   nzContent: TaxManagementOrderVerifyResultComponent,
+    //   nzComponentParams: {
+    //     record: item
+    //   },
+    //   nzFooter: null
+    // });
+    // modalRef.afterClose.subscribe(res => {
+    // })
+  }
+
+  /**
+   * 查看监管审核结果
+   */
+  viewAuditResult(record: any) {
+    if (record?.billStatus !== '2') {
+      return;
+    }
+    this.openWainingModal('监管审核结果', record?.result);
+  }
+
+  search() {
+    this.st.load(1);
+  }
+
+  /**
+   * 异步导出
+   */
+  export() {
+    this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list);
+  }
+
+  openWainingModal(content: string, title = '提示') {
+    this.modal.warning({
+      nzMask: false,
+      nzTitle: title,
+      nzContent: content
+    });
+  }
+  handleOK() {
+
+  }
+  handleCancel() {
+      this.isVisible = false;
+  }
+}

src/app/routes/tax-management/tax-management-routing.module.ts

@@ -4,12 +4,14 @@
  * @Author       : Shiming
  * @Date         : 2022-03-30 13:58:28
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-30 15:33:48
+ * @LastEditTime : 2022-03-31 10:37:24
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\tax-management-routing.module.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+import { TaxManagementIndividualCollectComponent } from './components/individual-collect/individual-collect.component';
+import { TaxManagementIndividualDeclareComponent } from './components/individual-declare/individual-declare.component';
 import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component';
 import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component';
 
@@ -17,6 +19,8 @@ import { TaxManagementOrderReportingComponent } from './components/order-reporti
 const routes: Routes = [
   { path: 'orderReport', component: TaxManagementOrderReportingComponent },
   { path: 'income', component: TaxManagementIndividualIncomeComponent },
+  { path: 'collect', component: TaxManagementIndividualCollectComponent },
+  { path: 'declare', component: TaxManagementIndividualDeclareComponent },
 ];
   
 

src/app/routes/tax-management/taxmanagement.module.ts

@@ -10,6 +10,8 @@
  */
 import { NgModule, Type } from '@angular/core';
 import { SharedModule, SHARED_G2_MODULES } from '@shared';
+import { TaxManagementIndividualCollectComponent } from './components/individual-collect/individual-collect.component';
+import { TaxManagementIndividualDeclareComponent } from './components/individual-declare/individual-declare.component';
 import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component';
 import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component';
 import { TaxManagementUploadSettingComponent } from './components/order-reporting/upload-setting/upload-setting.component';
@@ -21,7 +23,9 @@ const COMPONENTS: Type<void>[] = [
   TaxManagementOrderReportingComponent,
   TaxManagementOrderVerifyResultComponent,
   TaxManagementUploadSettingComponent,
-  TaxManagementIndividualIncomeComponent
+  TaxManagementIndividualIncomeComponent,
+  TaxManagementIndividualCollectComponent,
+  TaxManagementIndividualDeclareComponent
 ]
  
 

src/assets/mocks/menu-data.json

@@ -685,6 +685,14 @@
             {
               "text": "个税明细",
               "link": "/tax/income"
+            },
+            {
+              "text": "个税汇总",
+              "link": "/tax/collect"
+            },
+            {
+              "text": "税务申报",
+              "link": "/tax/declare"
             }
         ]
         }