Merge branch 'develop'

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-06 16:57:23
+ * @LastEditTime : 2022-05-06 17:09:51
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-test.eascs.com',
+      host: 'tms-api-dev.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts

@@ -83,6 +83,12 @@ export class WithdrawalsRecordComponent extends BasicTableComponent {
     if (item) {
       params = [item.id];
     } else {
+      console.log(this.selectedRows);
+      
+      if (this.selectedRows.length <= 0) {
+        this.service.msgSrv.error('请选择提现单！');
+        return;
+      }
       params = this.selectedRows.map(node => node.id);
     }
     const modal = this.nzModalService.create({

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

@@ -297,7 +297,7 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            asyncData: () => this.shipperservice.getNetworkEnterpriseName()
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
           }
         },
         serviceType: {

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

@@ -304,7 +304,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            asyncData: () => this.shipperservice.getNetworkEnterpriseName()
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
           }
         },
         // goodsNameId: {

src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-29 17:28:23
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-05-06 17:38:09
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\account-management\\components\\withdrawals-record\\withdrawals-record.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header-wrapper [title]="''"></page-header-wrapper>
 <nz-card class="search-box" nzBordered>
   <div nz-row nzGutter="8">
@@ -34,7 +44,7 @@
       <div class="mr-md">
         已选择
         <strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 累计提现 <strong class="text-red">{{
-          totalCallNo }}</strong>
+          totalCallNo | currency }}</strong>
         <!-- <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a> -->
       </div>
       <button nz-button (click)="this.auditAction(null)"  acl  [acl-ability]="['AM-WITHDRAW-RECORD-audit']">审核</button>

src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts

@@ -107,6 +107,11 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
     if (item) {
       params = [item.id];
     } else {
+        
+      if (this.selectedRows.length <= 0) {
+        this.service.msgSrv.error('请选择提现单！');
+        return;
+      }
       params = this.selectedRows.map(node => node.id);
     }
     const modal = this.nzModalService.create({
@@ -117,6 +122,10 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
           label: '拒绝',
           type: 'default',
           onClick: () => {
+            if (!this.msg || this.msg.trim().length === 0) {
+              this.service.msgSrv.warning('请填写拒绝原因 ');
+              return false;
+            }
             this.service
               .request(this.service.$api_disagree_refund, {
                 refundApplicationId: params,
@@ -129,6 +138,8 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
                   this.st.load(1);
                 }
               });
+            return false;
+
           }
         },
         {
@@ -236,18 +247,14 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
         accountType: {
           type: 'string',
           title: '账户类型',
-          enum: [
+            ui: {
-            {label: '全部', value: ''},
+              widget: 'dict-select',
-            {label: '个人合伙人', value: '4'},
+              params: { dictKey: 'bank:type' },
-            {label: '企业合伙人', value: '5'}
+              placeholder: '请选择',
-          ],
+              visibleIf: {
-          ui: {
+                expand: (value: boolean) => value
-            widget: 'select',
+              }
-            placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
             }
-          }
         },
         ltdId: {
           type: 'string',

src/app/routes/sys-setting/components/network-freight/new/new.component.ts

@@ -354,9 +354,7 @@ export class NetworkFreightNewComponent implements OnInit {
           type: 'string',
           title: '行业',
           enum: [
-            { label: '大陆身份证', value: 0 },
+            { label: '道路运输业', value: 54},
-            { label: '港澳居民通行证', value: 1 },
-            { label: '香港居民通行证', value: 2 }
           ],
           default: 0,
           ui: {