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

src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts

@@ -34,7 +34,6 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
   }
 
   ngOnInit(): void {
- 
     if (this.id)
     {
       this.getDetail(this.id);

src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts

@@ -532,13 +532,13 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
   }
   // 批量生成电子单据
   sign1(item?: any) {
-    if (this.selectedRows.length <= 0) {
+    if (this.selectedRows?.length <= 0) {
       this.service.msgSrv.error('请选择订单！')
       return
     }
     let params: any[] = [];
     this.selectedRows.forEach(item => {
-      params.push(item.id);
+      params.push(item?.id);
     });
     this.modal.confirm({
       nzTitle: `<b>已选择${this.selectedRows.length}条订单，确认批量生成电子单据吗？</b>`,
@@ -555,10 +555,10 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
         //   this.getGoodsSourceStatistical();
         // })
     {   
-       this.service.downloadFile(this.service.$api_createBillTakeGoods,{billIds: params})
+       this.service.downloadFile(this.service.$api_createBillTakeGoods,{billIds: params.join(',')})
 
        
-       this.service.downloadFile(this.service.$api_createBillDischargeGoods,{billIds: params})}
+       this.service.downloadFile(this.service.$api_createBillDischargeGoods,{billIds: params.join(',')})}
         
     });
   }

src/app/routes/order-management/components/vehicle/vehicle.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-28 11:10:20
+ * @LastEditTime : 2022-03-31 16:05:06
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -82,7 +82,7 @@
       <ng-template st-row="mybidDetailInfo" let-item let-index="index">
         <div *ngIf="item.mybidDetailInfo.length > 0">
           <div *ngFor="let data of item.mybidDetailInfo">
-            {{ data.expenseName }}：{{ data.price | currency }}
+            {{ data.expenseName }}：{{ data?.expenseCode === 'FL' ? (data.price * 100 + '%' ) : (data.price | currency) }}
             <span *ngIf="data.paymentStatus && data.paymentStatus === '1' && data.price>0"
               style="color: #f59a63">待申请</span>
             <span *ngIf="data.paymentStatus && data.paymentStatus === '2'" style="color: #f59a63">已支付</span>

src/app/routes/order-management/components/vehicle/vehicle.component.ts

@@ -761,6 +761,12 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
       },
       nzFooter: null
     });
+    modalRef.afterClose.subscribe((res: boolean) => {
+      if (res) {
+        this.resetSF;
+        this.st.load();
+      }
+    });
   }
   revoke(item: any) {
     this.modal.confirm({

src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-15 13:17:42
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-31 14:21:48
+ * @LastEditTime : 2022-03-31 17:36:46
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -74,7 +74,7 @@ export class VehicleConfirReceiptComponent implements OnInit {
       console.log(res);
       if (res) {
         this.service.msgSrv.success('确认签收成功！');
-        this.modal.destroy();
+        this.modal.destroy(true);
       }
     });
   }

src/app/routes/partner/partner-list/components/index/partner-list.component.ts

@@ -398,6 +398,7 @@ export class PartnerListComponent {
         width: 150,
         type: 'badge',
         badge: {
+          0: { text: '未发起', color: 'default' },
           10: { text: '待合伙人签约', color: 'default' },
           15: { text: '签约中', color: 'processing' },
           20: { text: '平台签约完成', color: 'success' },
@@ -411,9 +412,8 @@ export class PartnerListComponent {
         type: 'badge',
         badge: {
           0: { text: '未发起', color: 'default' },
-          10: { text: '待审核', color: 'processing' },
+          10: { text: '审核失败', color: 'error' },
-          20: { text: '审核通过', color: 'success' },
+          20: { text: '审核通过', color: 'success' }
-          30: { text: '驳回', color: 'error' }
         }
       },
       {

src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts

@@ -81,6 +81,13 @@ export class PersonalPartnerDetailComponent implements OnInit {
               ...new Set<string>((this.detailData?.cityCodesList as any[]).map(city => city.provinceCode))
             ];
           }
+          if (this.detailData?.channelIdLabel) {
+            const channel = (this.detailData.channelIdLabel as string).split('/');
+            Object.assign(this.detailData, {
+              channelName: channel[0],
+              channelMobile: channel[1]
+            });
+          }
         }
       });
   }
@@ -285,7 +292,7 @@ export class PersonalPartnerDetailComponent implements OnInit {
         buttons: [
           {
             text: '详情',
-            click: (item) => this.service.showChangeDetail(item.id)
+            click: item => this.service.showChangeDetail(item.id)
           }
         ]
       }

src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts

@@ -123,7 +123,7 @@ export class InputInvoiceComponent implements OnInit {
           title: '发票类型',
           ui: {
             widget: 'dict-select',
-            params: { dictKey: 'refund:apply:status' },
+            params: { dictKey: 'DictConstants.INVOICE_TYPE' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
@@ -154,14 +154,19 @@ export class InputInvoiceComponent implements OnInit {
         sts: {
           type: 'string',
           title: '收票状态',
+          enum: [
+            { value: '', label: '全部' },
+            { value: 1, label: '是' },
+            { value: 0, label: '否' }
+          ],
           ui: {
-            widget: 'dict-select',
+            widget: 'select',
-            params: { dictKey: 'refund:apply:status' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
+          },
+          default: ''
         },
         invdate: {
           type: 'string',

src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html

@@ -25,7 +25,7 @@
                 {{headerInfo?.vatinvHNum}}
             </se>
             <se label="收件人">
-                {{headerInfo?.reciname}}
+                {{headerInfo?.reciname}}/{{headerInfo?.recitel}}
             </se>
             <se label="收件地址">
                 {{headerInfo?.provinceName}}{{headerInfo?.cityName}}{{headerInfo?.areaName}}{{headerInfo?.reciaddr}}