车辆对接

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

@@ -521,6 +521,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
         prePay: {
           type: 'number',
           title: '预付',
+          minimum: 0,
           default: 0,
           ui: {
             prefix: '￥',
@@ -530,18 +531,21 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
         toPay: {
           type: 'number',
           title: '到付',
+          minimum: 0,
           default: 0,
           ui: { prefix: '￥', change: args => this.payChange() } as SFNumberWidgetSchema
         },
         oilCardPay: {
           type: 'number',
           title: '油卡',
+          minimum: 0,
           default: 0,
           ui: { prefix: '￥', change: args => this.payChange() } as SFNumberWidgetSchema
         },
         receiptPay: {
           type: 'number',
           title: '回单付',
+          minimum: 0,
           default: 0,
           ui: { prefix: '￥', change: args => this.payChange() } as SFNumberWidgetSchema
         },

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

@@ -491,6 +491,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
            type: 'number',
            title: '预付',
            default: 0,
+           minimum: 0,
            ui: {
              prefix: '￥',
              change: args => this.payChange()
@@ -499,18 +500,21 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
          toPay: {
            type: 'number',
            title: '到付',
+           minimum: 0,
            default: 0,
            ui: { prefix: '￥', change: args => this.payChange() } as SFNumberWidgetSchema
          },
          oilCardPay: {
            type: 'number',
            title: '油卡',
+           minimum: 0,
            default: 0,
            ui: { prefix: '￥', change: args => this.payChange() } as SFNumberWidgetSchema
          },
          receiptPay: {
            type: 'number',
            title: '回单付',
+           minimum: 0,
            default: 0,
            ui: { prefix: '￥', change: args => this.payChange() } as SFNumberWidgetSchema
          },

src/app/routes/supply-management/components/update-freight/update-freight.component.ts

@@ -43,6 +43,7 @@ export class SupplyManagementUpdateFreightComponent implements OnInit {
         owner1: {
           type: 'number',
           title: '预付',
+          minimum: 0,
           max: 99999999,
           ui: {
             prefix: '￥',
@@ -54,6 +55,7 @@ export class SupplyManagementUpdateFreightComponent implements OnInit {
         callNo1: {
           type: 'number',
           title: '到付',
+          minimum: 0,
           ui: {
             prefix: '￥',
             widgetWidth: 200,
@@ -64,6 +66,7 @@ export class SupplyManagementUpdateFreightComponent implements OnInit {
         href1: {
           type: 'number',
           title: '油卡',
+          minimum: 0,
           ui: {
             prefix: '￥',
             widgetWidth: 200,
@@ -72,7 +75,7 @@ export class SupplyManagementUpdateFreightComponent implements OnInit {
           } as SFNumberWidgetSchema
         },
         description5: {
-          type: 'number', title: '回单付', maxLength: 140, ui: {
+          type: 'number', title: '回单付',  minimum: 0, maxLength: 140, ui: {
             prefix: '￥',
             widgetWidth: 200,
             precision: 2,

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

@@ -124,36 +124,15 @@
         {{i?.goodsValue}}
       </sv>
       <sv label="保价费金额">
-        {{i?.insuranceAmount |currency}} 元
+        {{i?.insuranceAmount |currency: '￥'}} 元
       </sv>
     </sv-container>
   </nz-card>
-  <!-- <nz-card nzTitle="运费信息（到货后15天内支付运费）">
-    <st [data]="i?.expenseList" [columns]="expenseColumns" [page]="{show:false}">
-      <ng-template st-row="total" let-item>
-        <div>
-          {{(item.price * item.rate) | currency}}
-          <span>(含附加费）</span>
-        </div>
-      </ng-template>
-    </st>
-    <div class="freight-info-box mt-md" nz-row>
-      <div nz-col nzSpan="24">
-        <h3>
-          <label>总计 :</label>
-          <span class="text-error-dark text-xl">
-            {{totalExpensePrice | currency}}
-          </span>
-          <span>（运费￥3500.00含附加运费￥191.98）</span>
-        </h3>
-      </div>
-    </div>
-  </nz-card> -->
   <nz-card [nzTitle]="'运费信息（到货后'+i?.paymentDays+'天内支付运费）'">
     <st [data]="i?.expenseVOList" [columns]="expenseColumns" [page]="{show:false}">
       <ng-template st-row="total" let-item>
         <div>
-          {{(item.price * item.rate) | currency}}
+          {{(item.price * item.rate) | currency: '￥'}}
           <span>(含附加费）</span>
         </div>
       </ng-template>

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

@@ -63,14 +63,19 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
 
   ngOnInit(): void {
     this.getGoodsSourceDetail()
+    console.log('4444')
   }
 
   getGoodsSourceDetail() {
     this.service.request(this.service.$api_get_getCompleteVehicleDetail, { id: this.id }).subscribe(res => {
-      const expenseList = res?.expenseList || [];
+      console.log('888')
+      console.log(this.i)
+      const expenseList = res?.expenseVOList || [];
       this.totalExpensePrice = 0;
-      this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
-      this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
+      this.attObj = res?.expenseVOList?.filter((data: any) => data.expenseCode === 'ATT')[0];
+      this.totalObj = res?.expenseVOList?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
+      console.log(this.attObj)
+      console.log(this.totalObj)
       expenseList.forEach((e: any) => {
         this.totalExpensePrice += e?.price * e?.rate;
       });