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

src/app/routes/account/components/center/center.component.ts

@@ -135,19 +135,7 @@ export class AccountComponentsCenterComponent implements OnInit {
   }
   getInfo() {
     this.service.http.post(this.service.$api_get_current_user_info).subscribe((res) => {
-      console.log(res)
       this.infoData = res.data;
-      // this.infoData.avatar = [
-      //   {
-      //     uid: -1,
-      //     name: 'LOGO',
-      //     status: 'done',
-      //     url: res.data.avatar,
-      //     response: {
-      //       url: res.data.avatar,
-      //     },
-      //   },
-      // ];
     });
   }
 

src/app/routes/account/components/edit-name/edit-name.component.ts

@@ -39,7 +39,6 @@ export class AccountComponentsEditNameComponent implements OnInit, AfterViewInit
   }
 
   ngOnInit() {
-    console.log(this.i)
     this.codeTips = '为了账户安全，需您的手机验证（' + this.i?.phone + '）';
     this.formData.oldName = this.i?.phone;
     this.initSF();
@@ -140,7 +139,6 @@ export class AccountComponentsEditNameComponent implements OnInit, AfterViewInit
       // phoneNumber: phone
     };
     this.service.request(this.service.$api_get_current_user_smVerification, params, 'POST', true, 'FORM').subscribe((res) => {
-      console.log(res);
       // code==503046 弹出网易盾
       if (res && res.code === '1') {
         this.service.msgSrv.success('发送成功');
@@ -158,7 +156,6 @@ export class AccountComponentsEditNameComponent implements OnInit, AfterViewInit
       phoneNumber: this.sfView.value.phone
     };
     this.service.request(this.service.$api_get_getSMVerificationCode, params, 'POST', true, 'FORM').subscribe((res) => {
-      console.log(res);
       // code==503046 弹出网易盾
       if (res && res.code === '1') {
         this.service.msgSrv.success('发送成功');
@@ -210,27 +207,22 @@ export class AccountComponentsEditNameComponent implements OnInit, AfterViewInit
     this.modal.destroy();
   }
   submitForm() {
-    console.log(this.sf.value, 'this.sf.value');
     const params = {
       smsVerifyCode: this.sf.value.smsVerifyCode,
     };
 
     this.service.http.post(this.service.$api_get_verifyPhone, params).subscribe((res) => {
-      console.log(res, 'submitForm');
       if (res.success) {
         this.service.msgSrv.success(res.msg);
         // this.modal.close(true);
         this.voucher = res.data.voucher
          this.isVisibleView = true
         
-      } else {
-        this.service.msgSrv.warning(res.msg);
       }
     });
   }
   handleCancel(type: string) {
      if(type === '1') {
-    console.log(type)
       this.isVisibleView = false
     } else if(type === '2') {
     console.log(type)
@@ -242,18 +234,14 @@ export class AccountComponentsEditNameComponent implements OnInit, AfterViewInit
     
   }
   handleNew() {
-    console.log(this.voucher)
     const params = {
       voucher: this.voucher,
       ...this.sfView.value,
     }
     this.service.http.post(this.service.$api_set_voucherUpdatePhone, params).subscribe((res) => {
-      console.log(res);
       if (res.success) {
         this.service.msgSrv.success(res.msg);
         this.isVisibleOk = true;
-      } else {
-        this.service.msgSrv.warning(res.msg);
       }
     });
   }

src/app/routes/account/components/edit-password/edit-password.component.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-29 13:50:46
- * @LastEditTime: 2021-12-28 14:19:32
+ * @LastEditTime: 2022-01-18 16:37:42
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\account\components\edit\edit.component.ts
@@ -57,7 +57,6 @@ export class AccountComponentsCenterEditComponent implements OnInit {
 
   ngOnInit() {
     this.initForm();
-    console.log(this.record.phone)
   }
   initForm () {
   this.validateForm = this.fb.group({
@@ -77,7 +76,6 @@ export class AccountComponentsCenterEditComponent implements OnInit {
   }
   getCaptcha(e: MouseEvent): void {
     this.service.request(this.service.$api_get_current_user_smVerification).subscribe(res => {
-      console.log(res);
       // code==503046 弹出网易盾
       if (res && res.code === '1') {
         this.service.msgSrv.success('发送成功');
@@ -93,13 +91,9 @@ export class AccountComponentsCenterEditComponent implements OnInit {
       this.service.msgSrv.warning('必填项为空或格式错误，请检查！')
       return;
     }
-    console.log(this.validateForm)
-    console.log(this.validateForm.value)
     const params = {  
       ...this.validateForm.value
     };
-    console.log(params)
-
     this.service.request(this.service.$api_set_phoneUpdatePassword, params).subscribe((res) => {
       if (res) {
         this.service.msgSrv.success('修改密码成功！');
@@ -109,8 +103,6 @@ export class AccountComponentsCenterEditComponent implements OnInit {
           this.router.navigate(['/passport/login'])
           this.modalRef.close()
         }, 3000)
-      } else {
-        this.service.msgSrv.error(res.msg);
       }
     });
   }

src/app/routes/contract-management/components/contract-detail/contract-detail.component.ts

@@ -2,7 +2,7 @@ import { Router } from '@angular/router';
 /*
  * @Author: your name
  * @Date: 2022-01-05 11:01:55
- * @LastEditTime: 2022-01-10 15:56:26
+ * @LastEditTime: 2022-01-18 16:37:53
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-template-detail\contract-template-detail.component.ts
@@ -52,13 +52,10 @@ export class ContractManagementDetailComponent implements OnInit {
 
   initData(url: string) {
     this.service.request(url, {id: this.route.snapshot.params.id}).subscribe((res) => {
-      console.log(res)
       if(res) {
         this.detailList = res;
         this.detailList = res;
         let value :any= JSON.parse(res.contractParameter)
-        console.log(value['${code}'])
-        console.log(value['${name}'])
         this.code = value['${code}']
         this.name =value['${name}']
       }

src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts

@@ -2,7 +2,7 @@ import { Router } from '@angular/router';
 /*
  * @Author: your name
  * @Date: 2022-01-05 11:01:55
- * @LastEditTime: 2022-01-10 14:48:32
+ * @LastEditTime: 2022-01-18 16:38:01
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-template-detail\contract-template-detail.component.ts
@@ -67,9 +67,6 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
       this.isUpdate =false;
       this.initData(this.service.$api_get_contractTemplate)
     }
-
-    console.log(this.route.snapshot.params.id)
-    console.log(this.route.snapshot.queryParams.status)
   }
   goBack() {
     window.history.go(-1)
@@ -137,7 +134,6 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
   }
   initData(url: string) {
     this.service.request(url, {id: this.route.snapshot.params.id}).subscribe((res) => {
-      console.log(res)
       if(res) {
         this.detailList = res;
         this.sfdata = res;
@@ -150,28 +146,22 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
   }
 
   save () {
-    console.log(this.sf.value);
     if( !this.sf.value.templateName || !this.sf.value.templateType || !this.sf2.value.templateContent || !this.title) {
       this.service.msgSrv.error("必填参数为空，请检查再重新保存！");
       return;
     }
     if(this.sf.value.templateType  == 'MX' ) {
-      console.log(this.sf.value.contractType)
       if(this.sf.value.contractType == '') {
         this.service.msgSrv.error("必填参数为空，请检查再重新保存！");
         return;
       }
     }
-    console.log(this.sfdata);
-    console.log(this.sf2.value);
-    console.log(this.title);
     const params = {
       ...this.sf.value,
       ...this.sf2.value,
       templateTitle: this.title
     }
     this.service.request(this.service.$api_save_contractTemplate, params).subscribe((res: any) => {
-      console.log(res)
       if(res) {
         this.service.msgSrv.success("保存成功！")
         this.router.navigate(['/contract-management/template'])

src/app/routes/contract-management/components/contract-template/contract-template.component.ts

@@ -166,7 +166,6 @@ export class ContractManagementTemplateComponent implements OnInit {
     this.sf?.setValue('/_$expand', this._$expand);
   }
   tabChange(item: any) {
-    console.log(item)
   }
   /**
    * 重置表单

src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts

@@ -44,8 +44,6 @@ export class AbnormalGoldComponent implements OnInit {
       nzTitle: '清分',
       nzContent: ClearingModalComponent,
       nzOnOk: com => {
-        console.log(com.sf.value);
-
         return false;
       }
     });

src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts

@@ -25,8 +25,6 @@ export class CostManagementDetailComponent implements OnInit {
 
   loadDetail(id: any) {
     this.service.request(this.service.$api_get_cost_detail, { id }).subscribe(res => {
-      console.log(res);
-
       if (res) {
         this.costInfo = res;
       }

src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.ts

@@ -139,7 +139,6 @@ export class ExpensesPayableComponent implements OnInit {
             click: item => {
               this.st.removeRow(item);
               this.data = this.data.filter(i => i.id !== item.id);
-              console.log(this.st.data, this.st._data);
             }
           }
         ]

src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.ts

@@ -138,7 +138,6 @@ export class ExpensesReceivableComponent implements OnInit {
             click: item => {
               this.st.removeRow(item);
               this.data = this.data.filter(i => i.id !== item.id);
-              console.log(this.st.data, this.st._data);
             }
           }
         ]

src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts

@@ -72,7 +72,6 @@ export class DriverAccountDetailComponent implements OnInit {
   }
 
   stChange(e: STChange): void {
-    console.log(e);
   }
 
   exportList() {

src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts

@@ -72,7 +72,6 @@ export class FreightAccountDetailComponent implements OnInit {
   }
 
   stChange(e: STChange): void {
-    console.log(e);
   }
 
   exportList() {

src/app/routes/financial-management/components/main-account/setting-financial/setting-financial.component.ts

@@ -26,7 +26,6 @@ export class SettingFinancialComponent implements OnInit {
     this.initSF(this.i);
   }
   initSF(staff: any) {
-    console.log(staff);
     this.schema = {
       properties: {
         name: {
@@ -90,7 +89,6 @@ export class SettingFinancialComponent implements OnInit {
         staffName: this.sf.value.name
       };
       // this.service.request(this.service.$api_addStaff, params).subscribe((res) => {
-      //   console.log(res);
       //   if (res) {
       //     this.service.msgSrv.success('保存成功！');
       //     this.modal.close(true);

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

@@ -34,7 +34,6 @@ export class PayableOrderDetailComponent implements OnInit {
 
   loadHeadInfo() {
     this.service.request(this.service.$api_get_fico_ph_header, { id: this.id }).subscribe(res => {
-      console.log(res);
       if (res) {
         this.headerInfo = res;
       }

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

@@ -30,7 +30,6 @@ export class PaymentOrderDetailComponent implements OnInit {
 
   loadHeadInfo() {
     // this.service.request(this.service.$api_get_input_invoice_header, { id: this.id }).subscribe(res => {
-    //   console.log(res);
     //   if (res) {
     //     this.headerInfo = res;
     //   }

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

@@ -35,7 +35,6 @@ export class ReceivableOrderDetailComponent implements OnInit {
 
   loadHeadInfo() {
     this.service.request(this.service.$api_get_fico_header, { id: this.id }).subscribe(res => {
-      console.log(res);
       if (res) {
         this.headerInfo = res;
       }

src/app/routes/menu-manager/components/index/index.component.ts

@@ -51,7 +51,6 @@ export class MenuManagerComponentsIndexComponent implements OnInit {
   }
 
   editValueChange(event: any) {
-    console.log('editChanged', event);
   }
 
   menuImport(index: number) {
@@ -104,7 +103,6 @@ export class MenuManagerComponentsIndexComponent implements OnInit {
 
   getMenuByAppID(appId: string) {
     this.service.request(this.service.$api_get_one, { appId }, 'POST', false).subscribe(res => {
-      console.log(res);
       if (res) {
         const menus = res.data;
         if (res.data?.length > 0) {

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

@@ -85,7 +85,6 @@ loadTime: any; // 货源单设置回显
   }
 
   ngOnInit(): void {
-    console.log(this.id)
     this.initST();
     this.initSF();
     this.initSF3();
@@ -288,13 +287,11 @@ loadTime: any; // 货源单设置回显
   }
   initData() {
     this.service.request(this.service.$api_set_getBulkOrderDetail, {id: this.id}).subscribe(res => {
-      console.log(res)
       if (res) {
         this.i = res;
         // 对装货凭证进行初始化
         let arr : any= []
         res?.receiptFilePath.forEach((element: any, index: any) => {
-          console.log(index)
          arr.push(  {
           url: element,
           status: 'done',
@@ -458,9 +455,7 @@ loadTime: any; // 货源单设置回显
 
       unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data ? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath : this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url,
     }
-    console.log(params)
     this.service.request(this.service.$api_set_modifyBulkOrder, params).subscribe((res: any) => {
-      console.log(res)
       if(res) {
         this.service.msgSrv.success('修改成功！');
         this.router.navigate(['/order-management/bulk']);
@@ -765,7 +760,6 @@ handleChange1(info: NzUploadChangeParam): void {
     case 'done':
       let fileList = [...info.fileList];
       // 2. Read from response and show file link
-      console.log(fileList)
       fileList = fileList.map((file: any) => {
         if (file.response) {
           file.url = file.response.data.fullFilePath;

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

@@ -60,13 +60,11 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    console.log(this.id)
     this.initData()
   }
 
   initData() {
     this.service.request(this.service.$api_getBulkBillDetail, {id: this.id}).subscribe(res => {
-      console.log(res)
       if (res) {
         this.i =res;
         this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
@@ -81,7 +79,6 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
   }
     // 修改订单
   changeOrder() {
-      console.log(this.id)
       this.router.navigate(['order-management/bulk-detailChange', this.id])
   }
   agreement(value: any) {

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

@@ -138,7 +138,6 @@ tabs = {
     })
   }
   selectChange(e: number) {
-    console.log(e);
     this.resourceStatus = e;
     this.initST();
     setTimeout(() => {
@@ -181,7 +180,6 @@ tabs = {
             searchDebounceTime: 300,
             searchLoadingText: '搜索中...',
             onSearch: (q: any) => {
-              console.log(q)
               if (!!q) {
                 return this.service
                   .request(this.service.$api_enterpriceList, { enterpriseName: q})
@@ -211,78 +209,32 @@ tabs = {
             }
           }
         },
-        driverId: {
+        driverName: {
           title: '承运司机',
           type: 'string',
           ui: {
-            widget: 'select',
-            serverSearch: true,
-            searchDebounceTime: 300,
-            searchLoadingText: '搜索中...',
-            onSearch: (q: any) => {
-              if (!!q) {
-                return this.service
-                  .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
-                  .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.appUserId } as SFSchemaEnum))))
-                  .toPromise();
-              } else {
-                return of([]);
-              }
-            },
             visibleIf: {
               _$expand: (value: boolean) => value
             }
-          } as SFSelectWidgetSchema
+          }
         },
-
         carNo: {
           title: '车牌号',
           type: 'string',
           ui: {
-            widget: 'select',
-            serverSearch: true,
-            searchDebounceTime: 300,
-            searchLoadingText: '搜索中...',
-            onSearch: (q: any) => {
-              if (!!q) {
-                return this.service
-                  .request(this.service.$api_get_getCarLicenseListByCarNo, {
-                    carNo: q
-                  })
-                  .pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.appUserId } as SFSchemaEnum))))
-                  .toPromise();
-              } else {
-                return of([]);
-              }
-            },
             visibleIf: {
               _$expand: (value: boolean) => value
             }
-          } as SFSelectWidgetSchema
+          }
         },
-         payeeId: {
+        captainName: {
           title: '车队长',
           type: 'string',
           ui: {
-            widget: 'select',
-            serverSearch: true,
-            searchDebounceTime: 300,
-            searchLoadingText: '搜索中...',
-            onSearch: (q: any) => {
-              if (!!q) {
-                return this.service
-                  .request(this.service.$api_get_getDriverInfo, { keyword: q,
-                  model: 1, type: 2 })
-                  .pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.userId } as SFSchemaEnum))))
-                  .toPromise();
-              } else {
-                return of([]);
-              }
-            },
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
-          } as SFSelectWidgetSchema,
+          }
         }, 
         paymentstatus: {
           title: '支付状态',
@@ -337,19 +289,6 @@ tabs = {
             asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
           },
         },
-        // goodsName: {
-        //   type: 'string',
-        //   title: '货物名称',
-        //   ui: {
-        //     widget: 'select',
-        //     placeholder: '请选择',
-        //     visibleIf: {
-        //       _$expand: (value: boolean) => value,
-        //     },
-        //     allowClear: true,
-        //     asyncData: () => this.getCatalogueMember(),
-        //   },
-        // },
         goodsNameId: {
           type: 'string',
           title: '货物名称',
@@ -632,7 +571,6 @@ tabs = {
     this.sf?.setValue('/_$expand', this._$expand);
   }
   tabChange(item: any) {
-    console.log(item)
   }
   /**
    * 重置表单
@@ -642,20 +580,6 @@ tabs = {
     this._$expand = false;
   }
 
-
-
-  getCatalogueMember() {
-    const params = {
-    };
-    return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe(
-      map((res) => {
-        if (res) {
-          console.log(res)
-        }
-      }),
-    );
-  }
-
   /**
    * 导入货源
    */
@@ -663,7 +587,6 @@ tabs = {
 
   }
   audit(item: any) {
-    console.log(item)
   }
 
  /*
@@ -673,14 +596,12 @@ tabs = {
   查看评价： 3
   */
   handleCancel(type: string) {
-    console.log(type)
     if(type === '0') {
       this.isVisible = false
     } else if(type === '1') {
     console.log(type)
       this.isVisibleView = false
     } else if(type === '2') {
-    console.log(type)
       this.isVisibleEvaluate = false
     }
   }
@@ -698,7 +619,6 @@ tabs = {
   * 浮动费用查看
   */
   FloatView(item: any) {
-    console.log(item)
     this.changeViewId = item.id;
     this.service.request(this.service.$api_getChangeRecordBulkDetail, {id: this.changeViewId}).subscribe((res) => {
       this.ViewCause = res;
@@ -709,7 +629,6 @@ tabs = {
   *查看评价
   */
   viewEvaluate(item: any) {
-    console.log(item)
     this.isVisibleEvaluate = true
   }
     /**
@@ -759,14 +678,10 @@ tabs = {
     this.selectedRows.forEach(item => {
       params.push(item.id);
     });
-    console.log(this.selectedRows)
-    console.log(params)
     this.service.request(this.service.$api_get_batchSignBulkOrder, params).subscribe(res => {
       if (res) {
         this.st.load(1);
         this.getGoodsSourceStatistical()
-      } else {
-        this.service.msgSrv.error(res.msg);
       }
     });
   }
@@ -794,15 +709,12 @@ tabs = {
           nzTitle: '是否确定立即撤销费用变更！</i>',
           nzOnOk: () => 
           this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => {
-            console.log(res)
             if(res) {
               this.service.msgSrv.success('撤销成功！')
               this.stFloat.reload()
               this.st?.reload(1);
               this.getGoodsSourceStatistical()
-            } else {
+            } 
-              this.service.msgSrv.error(res.msg)
-            }
           })
         });
       }

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

@@ -142,7 +142,6 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
         this.complaint = JSON.parse(this.ar.snapshot.queryParams.detail)
         this.datailList.complainantName = this.complaint?.shipperAppUserName
         this.datailList.complainantPartyLabel = this.complaint?.driverIdLabel
-        console.log(this.datailList)
       }
     })
   }
@@ -163,9 +162,6 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
       }
     })
   }
-  kkk(value: any) {
-    console.log(value)
-  }
   goBack() {
     window.history.go(-1)
   }
@@ -182,7 +178,6 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
       id: this.channelId
     }
     this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{
-      console.log(res)
       if(res) {
         this.service.msgSrv.success('已拒绝！')
         this.isVisibleRE = false
@@ -202,7 +197,6 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
       id: this.channelId
     }
     this.service.request(this.service.$api_get_canelComplaint, paramsa).subscribe((res: any) =>{
-      console.log(res)
       if(res) {
         this.service.msgSrv.success('已拒绝！')
         this.isVisibleRE = false
@@ -224,7 +218,6 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
       id: this.channelId
     }
     this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{
-      console.log(res)
       if(res) {
         this.service.msgSrv.success('已通过！')
         this.isVisibleRE = false

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

@@ -217,7 +217,6 @@ export class OrderManagementComplaintComponent implements OnInit {
     this.sf?.setValue('/_$expand', this._$expand);
   }
   tabChange(item: any) {
-    console.log(item)
   }
   /**
    * 重置表单
@@ -226,24 +225,7 @@ export class OrderManagementComplaintComponent implements OnInit {
     this.sf.reset();
     this._$expand = false;
   }
-
-
-
-  // 获取录单员 
-  getCatalogueMember() {
-    const params = {
-    };
-    return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe(
-      map((res) => {
-        if (res) {
-          console.log(res)
-        }
-      }),
-    );
-  }
-
   selectChange(e: number) {
-    console.log(e);
     this.resourceStatus = e;
     this.initST();
     setTimeout(() => {
@@ -257,7 +239,6 @@ export class OrderManagementComplaintComponent implements OnInit {
 
   }
   audit(item: any) {
-    console.log(item)
   }
 
  /*
@@ -273,7 +254,6 @@ export class OrderManagementComplaintComponent implements OnInit {
       id: this.channelId
     }
     this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{
-      console.log(res)
       if(res) {
         this.service.msgSrv.success('已拒绝！')
         this.isVisibleRE = false
@@ -292,7 +272,6 @@ export class OrderManagementComplaintComponent implements OnInit {
       id: this.channelId
     }
     this.service.request(this.service.$api_get_canelComplaint, paramsa).subscribe((res: any) =>{
-      console.log(res)
       if(res) {
         this.service.msgSrv.success('已拒绝！')
         this.isVisibleRE = false
@@ -313,7 +292,6 @@ export class OrderManagementComplaintComponent implements OnInit {
       id: this.channelId
     }
     this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{
-      console.log(res)
       if(res) {
         this.service.msgSrv.success('已通过！')
         this.isVisibleRE = false

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

@@ -120,9 +120,6 @@ export class OrderManagementRiskDetailComponent implements OnInit {
       }
     })
   }
-  kkk(value: any) {
-    console.log(value)
-  }
   goBack() {
     window.history.go(-1)
   }

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

@@ -391,7 +391,6 @@ export class OrderManagementRiskComponent implements OnInit {
 
 
   selectChange(e: number) {
-    console.log(e);
     this.resourceStatus = e;
     this.initST();
     setTimeout(() => {
@@ -427,7 +426,6 @@ export class OrderManagementRiskComponent implements OnInit {
       representationsStatus: 3,
     };
     this.service.request(this.service.$api_get_listRisk_audit, parms).subscribe(res => {
-      console.log(res);
       if (res) {
         this.service.msgSrv.success('审核通过成功！');
         this.isVisibleRE = false;
@@ -441,7 +439,6 @@ export class OrderManagementRiskComponent implements OnInit {
    * 审核拒绝按钮
    */
   reject() {
-    console.log(this.sfView.value);
     let idList: any[] = [];
     if(this.selectedRows.length > 0) {
       this.selectedRows.forEach(item => {
@@ -456,7 +453,6 @@ export class OrderManagementRiskComponent implements OnInit {
       representationsStatus: 4,
     };
     this.service.request(this.service.$api_get_listRisk_audit, parms).subscribe(res => {
-      console.log(res);
       if (res) {
         this.service.msgSrv.success('审核拒绝成功！');
         this.isVisibleRE = false;
@@ -477,13 +473,11 @@ export class OrderManagementRiskComponent implements OnInit {
     } else {
       this.initSTAudit(2);
     }
-    console.log(item);
   }
   /**
    *查看详情
    */
   viewEvaluate(item: any) {
-    console.log(item);
     this.router.navigate(['/order-management/risk-detail', item.id]);
   }
 }

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

@@ -127,7 +127,6 @@ resourceStatus: any;
       GoingQuantity: 0,
       totalCount: 0
     };
-    console.log(this.tabs)
     this.service.request(this.service.$api_statisticalStatus,{...this.reqParams}).subscribe(res => {
       if (res) {
         let totalCount = 0;
@@ -177,7 +176,6 @@ resourceStatus: any;
             searchDebounceTime: 300,
             searchLoadingText: '搜索中...',
             onSearch: (q: any) => {
-              console.log(q)
               if (!!q) {
                 return this.service
                   .request(this.service.$api_enterpriceList, { enterpriseName: q})
@@ -207,78 +205,56 @@ resourceStatus: any;
             }
           }
         },
-        driverId: {
+        // driverId: {
+        //   title: '承运司机',
+        //   type: 'string',
+        //   ui: {
+        //     widget: 'select',
+        //     serverSearch: true,
+        //     searchDebounceTime: 300,
+        //     searchLoadingText: '搜索中...',
+        //     onSearch: (q: any) => {
+        //       if (!!q) {
+        //         return this.service
+        //           .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
+        //           .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.appUserId } as SFSchemaEnum))))
+        //           .toPromise();
+        //       } else {
+        //         return of([]);
+        //       }
+        //     },
+        //     visibleIf: {
+        //       _$expand: (value: boolean) => value
+        //     }
+        //   } as SFSelectWidgetSchema
+        // },
+        driverName: {
           title: '承运司机',
           type: 'string',
           ui: {
-            widget: 'select',
-            serverSearch: true,
-            searchDebounceTime: 300,
-            searchLoadingText: '搜索中...',
-            onSearch: (q: any) => {
-              if (!!q) {
-                return this.service
-                  .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
-                  .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.appUserId } as SFSchemaEnum))))
-                  .toPromise();
-              } else {
-                return of([]);
-              }
-            },
             visibleIf: {
               _$expand: (value: boolean) => value
             }
-          } as SFSelectWidgetSchema
+          }
         },
 
-        CarNo: {
+        carNo: {
           title: '车牌号',
           type: 'string',
           ui: {
-            widget: 'select',
-            serverSearch: true,
-            searchDebounceTime: 300,
-            searchLoadingText: '搜索中...',
-            onSearch: (q: any) => {
-              if (!!q) {
-                return this.service
-                  .request(this.service.$api_get_getCarLicenseListByCarNo, {
-                    carNo: q
-                  })
-                  .pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.id } as SFSchemaEnum))))
-                  .toPromise();
-              } else {
-                return of([]);
-              }
-            },
             visibleIf: {
               _$expand: (value: boolean) => value
             }
-          } as SFSelectWidgetSchema
+          }
         },
-         payeeId: {
+        captainName: {
           title: '车队长',
           type: 'string',
           ui: {
-            widget: 'select',
-            serverSearch: true,
-            searchDebounceTime: 300,
-            searchLoadingText: '搜索中...',
-            onSearch: (q: any) => {
-              if (!!q) {
-                return this.service
-                  .request(this.service.$api_get_getDriverInfo, { keyword: q,
-                  model: 1, type: 2 })
-                  .pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.userId } as SFSchemaEnum))))
-                  .toPromise();
-              } else {
-                return of([]);
-              }
-            },
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
-          } as SFSelectWidgetSchema,
+          }
         }, 
         paymentStatus: {
           title: '支付状态',
@@ -582,28 +558,11 @@ resourceStatus: any;
     this.sf.reset();
     this._$expand = false;
   }
-
-
-
-  // 获取录单员 
-  getCatalogueMember() {
-    const params = {
-    };
-    return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe(
-      map((res) => {
-        if (res) {
-          console.log(res)
-        }
-      }),
-    );
-  }
-
   selectChange(e: number) {
-    console.log(e);
     this.resourceStatus = e;
     this.initST();
     setTimeout(() => {
-      this.st.load();
+      this.st.load(1);
       this.getGoodsSourceStatistical()
     }, 500);
   }
@@ -614,7 +573,6 @@ resourceStatus: any;
 
   }
   audit(item: any) {
-    console.log(item)
   }
 
  /*
@@ -680,7 +638,10 @@ resourceStatus: any;
           //   return false;
           // }
         });
-        modal.afterClose.subscribe(_ => this.st.reload(1));
+        modal.afterClose.subscribe(_ => {  
+          this.st.load(1);
+          this.getGoodsSourceStatistical()
+        });
       }
     });
   }
@@ -706,6 +667,7 @@ resourceStatus: any;
         modal.afterClose.subscribe((result) => {
           if (result) {
             this.st.load(1);
+            this.getGoodsSourceStatistical()
           }
         });
   }
@@ -745,6 +707,7 @@ resourceStatus: any;
         modal.afterClose.subscribe((result) => {
           if (result) {
             this.st.load(1);
+            this.getGoodsSourceStatistical()
           }
         });
   }
@@ -780,6 +743,7 @@ resourceStatus: any;
         modal.afterClose.subscribe((result) => {
           if (result) {
             this.st.load(1);
+            this.getGoodsSourceStatistical()
           }
         });
   }
@@ -807,8 +771,6 @@ resourceStatus: any;
           if(res) {
             this.service.msgSrv.success('撤销成功！')
             this.stFloat.reload()
-          } else {
-            this.service.msgSrv.error(res.msg)
           }
         })
       });
@@ -823,7 +785,8 @@ resourceStatus: any;
           this.service.request(this.service.$api_get_cancelAnOrder, {id: item.id}).subscribe((res) => {
             if (res === true) {
               this.service.msgSrv.success('操作成功！');
-              this.st?.reload(1);
+              this.st.load(1);
+              this.getGoodsSourceStatistical()
               this.initST();
             }
           }),
@@ -841,9 +804,8 @@ resourceStatus: any;
       this.service.request(this.service.$api_get_batchSignWholeOrder, params).subscribe(res => {
         if (res) {
           console.log(res);
-          this.st?.reload(1);
+          this.st.load(1);
-        } else {
+          this.getGoodsSourceStatistical()
-          this.service.msgSrv.error(res.msg);
         }
       });
     }

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

@@ -2,7 +2,7 @@ import { preloaderFinished } from '@delon/theme';
 /*
  * @Author: your name
  * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2022-01-13 16:19:28
+ * @LastEditTime: 2022-01-18 16:34:59
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\bulk\update-freight\update-freight.component.ts
@@ -76,8 +76,6 @@ export class ConfirReceiptComponent implements OnInit {
       if(res) {
         this.service.msgSrv.success('确认签收成功！')
         this.modal.destroy(true);
-      } else {
-        this.service.msgSrv.error(res.msg)
       }
     })
   }

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-21 10:14:52
- * @LastEditTime: 2021-12-21 10:17:02
+ * @LastEditTime: 2022-01-18 16:35:03
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\vehicle\cancel\cancel.component.ts
@@ -68,8 +68,6 @@ export class OneCarOrderCancelComponent implements OnInit {
           this.service.request(this.service.$api_get_cancelAnOrder, { id: this.i?.id, ...this.sf.value }).subscribe(res => {
             if (res) {
               this.modalRef.close(true);
-            } else {
-              this.service.msgSrv.error(res.msg);
             }
           }),
         nzOnCancel: () => this.modalRef.destroy()
@@ -78,8 +76,6 @@ export class OneCarOrderCancelComponent implements OnInit {
       this.service.request(this.service.$api_get_cancelAnOrder, { id: this.i?.id, ...this.sf.value }).subscribe(res => {
         if (res) {
           this.modalRef.close(true);
-        } else {
-          this.service.msgSrv.error(res.msg);
         }
       });
     }

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-15 13:17:42
- * @LastEditTime: 2022-01-12 14:01:00
+ * @LastEditTime: 2022-01-18 16:35:11
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\vehicle\confir-receipt\confir-receipt.component.ts
@@ -79,8 +79,6 @@ export class VehicleConfirReceiptComponent implements OnInit {
       if(res) {
         this.service.msgSrv.success('确认签收成功！')
         this.modal.destroy();
-      } else {
-        this.service.msgSrv.error(res.msg)
       }
     })
   }

src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts

@@ -438,8 +438,6 @@ export class VehicleSureArriveComponent implements OnInit {
         if(res) {
           this.service.msgSrv.success('确认到车成功！')
            this.modal.destroy(true);
-        } else{
-          this.service.msgSrv.error(res.msg)
         }
       })
     } else {
@@ -463,8 +461,6 @@ export class VehicleSureArriveComponent implements OnInit {
           if(res) {
             this.service.msgSrv.success('确认到车成功！')
              this.modal.destroy(true);
-          } else{
-            this.service.msgSrv.error(res.msg)
           }
         })
     }

src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts

@@ -283,8 +283,6 @@ export class VehicleSureDepartComponent implements OnInit {
         if(res) {
           this.service.msgSrv.success('确认发车成功！')
            this.modal.destroy(true);
-        } else{
-          this.service.msgSrv.error(res.msg)
         }
       })
     } else {
@@ -306,8 +304,6 @@ export class VehicleSureDepartComponent implements OnInit {
           if(res) {
             this.service.msgSrv.success('确认发车成功！')
              this.modal.destroy(true);
-          } else{
-            this.service.msgSrv.error(res.msg)
           }
         })
     }

src/app/routes/passport/components/retrieve-password/retrieve-password.component.ts

@@ -163,8 +163,6 @@ export class UserRetrievePasswordComponent implements OnInit, AfterViewInit {
             } else {
               this.service.msgSrv.error('获取验证码失败!');
             }
-          } else {
-            this.service.msgSrv.error(res.msg);
           }
         });
     }

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

@@ -672,8 +672,6 @@ export class  SupplyManagementBulkPublishComponent implements OnInit {
           nzFooter: null,
           nzComponentParams: { type: 'onecar', change: change }
         });
-      } else {
-        this.service.msgSrv.error(res.msg);
       }
     });
   }
@@ -700,8 +698,6 @@ export class  SupplyManagementBulkPublishComponent implements OnInit {
           if(this.sf3data.goodsNameId){
             this.sf3.setValue('/goodsNameId',this.sf3data.goodsNameId);
           }
-        } else {
-          this.service.msgSrv.error(res.msg);
         }
       });
   }

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

@@ -748,8 +748,6 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
           if (this.sf3data?.goodsNameId) {
             this.sf3.setValue('/goodsNameId', this.sf3data.goodsNameId);
           }
-        } else {
-          this.service.msgSrv.error(res.msg);
         }
       });
   }

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

@@ -563,8 +563,6 @@ export class SupplyManagementBulkComponent implements OnInit {
             this.service.msgSrv.success('已取消货源！')
             this.st?.reload();
             this.getGoodsSourceStatistical();
-          } else {
-            this.service.msgSrv.error(res.msg)
           }
         })
     })

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

@@ -608,12 +608,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
             .subscribe(res => {
               if (res) {
                 this.currentRate = res.rate * 100;
-              } else {
-                this.service.msgSrv.error(res.msg);
               }
             });
-        } else {
-          this.service.msgSrv.error(res.msg);
         }
       });
   }
@@ -706,8 +702,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
           if (this.sf3data.goodsNameId) {
             this.sf3.setValue('/goodsNameId', this.sf3data.goodsNameId);
           }
-        } else {
-          this.service.msgSrv.error(res.msg);
         }
       });
   }
@@ -854,8 +848,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
           nzFooter: null,
           nzComponentParams: { type: 'onecar', change: change }
         });
-      } else {
-        this.service.msgSrv.error(res.msg);
       }
     });
   }

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

@@ -603,12 +603,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
             .subscribe((res: any) => {
               if (res) {
                 this.currentRate = res.rate;
-              } else {
-                this.service.msgSrv.error(res.msg);
               }
             });
-        } else {
-          this.service.msgSrv.error(res.msg);
         }
       });
   }
@@ -767,8 +763,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
     this.service.request(reqUrl, params).subscribe((res: any) => {
       if (res) {
         this.openFinishPage();
-      } else {
-        this.service.msgSrv.error(res.msg);
       }
     });
   }
@@ -907,8 +901,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
           if (this.sf3data.goodsNameId) {
             this.sf3.setValue('/goodsNameId', this.sf3data.goodsNameId);
           }
-        } else {
-          this.service.msgSrv.error(res.msg);
         }
       });
   }

src/app/routes/vehicle/components/list/edit/edit.component.ts

@@ -118,8 +118,6 @@ export class VehicleComponentsListEditComponent implements OnInit {
      if(res) {
       this.modal.destroy(true);
       this.service.msgSrv.success('上传协议成功！')
-     } else {
-      this.service.msgSrv.error(res.msg)
      }
    })
   }

src/app/routes/vehicle/components/list/img-view/img-view.component.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-07 17:30:18
- * @LastEditTime: 2022-01-13 11:27:12
+ * @LastEditTime: 2022-01-18 16:36:27
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\img-view\img-view.component.ts
@@ -39,8 +39,6 @@ export class VehicleImgViewComponent implements OnInit {
       if(res) {
         this.modal.destroy(true);
         this.service.msgSrv.success('已驳回')
-      } else {
-        this.service.msgSrv.error(res.msg)
       }
     })
   }
@@ -54,8 +52,6 @@ export class VehicleImgViewComponent implements OnInit {
         if(res) {
           this.modal.destroy(true);
         this.service.msgSrv.success('已通过')
-        } else {
-          this.service.msgSrv.error(res.msg)
         }
     })
   }

src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-24 15:38:08
- * @LastEditTime: 2022-01-18 14:25:49
+ * @LastEditTime: 2022-01-18 15:50:21
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\sys-setting\components\crm-management\crm-management.component.html
@@ -72,7 +72,7 @@
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
         [loading]="service.http.loading"
-        [scroll]="{ y: '370px' }"
+        [scroll]="{ x: '2000px' }"
       >
       <ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
         <div>

src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts

@@ -43,19 +43,19 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
     { title: '上报时间', index: 'createTime',width: '180px' ,className: 'text-left',},
   ];
   columns2: STColumn[] = [
-    { title: '异常编号', index: 'exceptionCode',width: '180px' },
+    { title: '异常编号', index: 'exceptionCode',width: '180px',className: 'text-left' },
-    { title: '关联运单号', index: 'wayBillCode',width: '180px' },
+    { title: '关联运单号', index: 'wayBillCode',width: '180px' ,className: 'text-left'},
-    { title: '网络货运人', index: 'enterpriseInfoName',width: '180px' },
+    { title: '网络货运人', index: 'enterpriseInfoName',width: '180px',className: 'text-left' },
-    { title: '货主', index: 'shipperAppUserName' ,width: '180px'},
+    { title: '货主', index: 'shipperAppUserName' ,width: '180px',className: 'text-left'},
-    { title: '装货地', index: 'loadingPlace' ,width: '180px'},
+    { title: '装货地', index: 'loadingPlace' ,width: '180px',className: 'text-left'},
-    { title: '卸货地', index: 'dischargePlace' ,width: '180px'},
+    { title: '卸货地', index: 'dischargePlace' ,width: '180px',className: 'text-left'},
-    { title: '承运司机', index: 'driver' ,width: '90px'},
+    { title: '承运司机', index: 'driver' ,width: '90px',className: 'text-left'},
-    { title: '异常信息', index: 'exceptionContent',width: '250px' },
+    { title: '异常信息', index: 'exceptionContent',width: '250px' ,className: 'text-left'},
-    { title: '异常图片', render: 'exceptionCertificateFirstFilePath' ,width: '220px'},
+    { title: '异常图片', render: 'exceptionCertificateFirstFilePath' ,width: '220px',className: 'text-left'},
-    { title: '上报时间', index: 'reportingTime',width: '180px' },
+    { title: '上报时间', index: 'reportingTime',width: '180px' ,className: 'text-left'},
-    { title: '回复内容', index: 'replyContent',width: '180px' },
+    { title: '回复内容', index: 'replyContent',width: '180px' ,className: 'text-left'},
-    { title: '回复人', index: 'replyAppUserName',width: '180px' },
+    { title: '回复人', index: 'replyAppUserName',width: '180px' ,className: 'text-left'},
-    { title: '回复时间', index: 'replyTime',width: '180px' },
+    { title: '回复时间', index: 'replyTime',width: '180px' ,className: 'text-left'},
   ];
 
   get reqParams (){ 

src/app/routes/waybill-management/components/bulk/bulk.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-18 14:29:44
+ * @LastEditTime: 2022-01-18 16:50:23
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@@ -90,103 +90,6 @@
         <div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div>
         <div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div>
       </ng-template>
-      <ng-template st-row="enStatusStr27878" let-item let-index="index">
-        <div class="mr-xs" nzPopoverTitle="Title" nz-popover [nzPopoverContent]="contentTemplate">{{item.no}}</div>
-      </ng-template>
-      <ng-template st-row="feiong" let-item let-index="index">
-        <div style="color: aqua;" (click)="OpenPrice()">
-          {{item.no}}
-        </div>
-      </ng-template>
-      <ng-template #contentTemplate>
-        <div>
-          <p>预付：¥200.00</p>
-          <p>到付：¥200.00</p>
-          <p>油卡：¥200.00</p>
-          <p>回单付：¥200.00</p>
-          <p>小计：¥200.00</p>
-          <p>附加费：¥200.00</p>
-        </div>
-      </ng-template>
     </st>
   </div>
 </nz-card>
-
-
-<nz-modal [(nzVisible)]="isVisible"  [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="浮动费用" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
-  <ng-container *nzModalContent>
-    <st
-    #stFloat
-    multiSort
-    size="small"
-    [bordered]="true"
-    [data]="datass"
-    [columns]="columnsFloat"
-    [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, 30, 50, 100, 200, 300, 500, 1000] }"
-    [loadingDelay]="500"
-  >
-  </st>
-  </ng-container>
-  <ng-template #nzModalFooter>
-    <button nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
-    <button nz-button nzType="default" (click)="handleOK()">确定</button>
-  </ng-template>
-</nz-modal>
-
-
-<nz-modal [(nzVisible)]="isVisibleView"  [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
-  <ng-container *nzModalContent>
-    <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'">
-      <ng-template sf-template="no" let-me let-ui="uiView" let-schema="schemaView">
-       <div style="display: flex;">
-        <nz-input-number [(ngModel)]="demoValue" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
-        <div class="left_btn">元/吨</div>
-       </div>
-      </ng-template>
-    </sf>
-    <st
-    #stFloatView
-    multiSort
-    size="small"
-    [bordered]="true"
-    [data]="datass"
-    [columns]="columnsFloatView"
-    [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, 30, 50, 100, 200, 300, 500, 1000] }"
-    [loadingDelay]="500"
-  >
-  </st>
-  <div><span>变更原因：</span></div>
-  <div><span>拒绝原因：</span></div>
-  <div><span>注：</span></div>
-  </ng-container>
-  <ng-template #nzModalFooterview>
-    <button nz-button nzType="default" (click)="handleCancel('1')">取消</button>
-    <button nz-button nzType="primary" (click)="handleOK()">确定</button>
-  </ng-template>
-</nz-modal>
-
-<nz-modal [(nzVisible)]="isVisibleEvaluate"  [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate"  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('2')">
-  <ng-container *nzModalContent>
-    <nz-tabset>
-      <nz-tab nzTitle="我的评价">
-      <div>
-        评分: <nz-rate [ngModel]="2.5" nzAllowHalf></nz-rate>
-        <div><span>评价内容：</span></div>
-      </div>
-      </nz-tab>
-      <nz-tab nzTitle="司机评价">
-      <div>
-        暂无评价内容
-      </div>
-      </nz-tab>
-    </nz-tabset>
-  </ng-container>
-  <ng-template #nzModalFooterEvaluate>
-    <button nz-button nzType="default" (click)="handleCancel('2')">取消</button>
-    <button nz-button nzType="primary" (click)="handleOK()">确定</button>
-  </ng-template>
-</nz-modal>

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

@@ -21,36 +21,12 @@ export class WaybillManagementBulkComponent implements OnInit {
   uiView: SFUISchema = {};
   schema: SFSchema = {};
   schemaView: SFSchema = {};
-  auditMany = false;
-  isVisibleView = false;
   isVisibleEvaluate = false;
-  isVisible = false;
   _$expand = false;
   @ViewChild('st') private readonly st!: STComponent;
-  @ViewChild('stFloat') private readonly stFloat!: STComponent;
-  @ViewChild('stFloatView') private readonly stFloatView!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
-  @ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
-  @ViewChild('sfView', { static: false }) sfView!: SFComponent;
   columns: STColumn[] = [];
-  columnsFloat: STColumn[] = [];
-  columnsFloatView: STColumn[] = [];
-  demoValue: any;
   resourceStatus: any;
-  datass: any = [
-    {
-    one: '1',
-    two: '1',
-    three: '1',
-    id: 1
-   },
-    {
-    one: '2',
-    two: '2',
-    three: '2',
-    id: 2
-   },
-];
 tabs = {
   signQuantity: 0,
   cancelQuantity: 0,
@@ -83,9 +59,6 @@ tabs = {
     this.initSF();
     this.initST();
     this.getGoodsSourceStatistical()
-    this.initSTFloat();
-    this.initSTFloatView();
-    this.initSFView();
   }
 
 
@@ -144,78 +117,32 @@ tabs = {
             },
           }
         },
-        driverId: {
+        driverName: {
           title: '承运司机',
           type: 'string',
           ui: {
-            widget: 'select',
-            serverSearch: true,
-            searchDebounceTime: 300,
-            searchLoadingText: '搜索中...',
-            onSearch: (q: any) => {
-              if (!!q) {
-                return this.service
-                  .request(this.service.$api_get_getDriverInfo, { keyword: q,
-                  model: 1, type: 1 })
-                  .pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum))))
-                  .toPromise();
-              } else {
-                return of([]);
-              }
-            },
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
-          } as SFSelectWidgetSchema,
+          }
         },
         carNo: {
           title: '车牌号',
           type: 'string',
           ui: {
-            widget: 'select',
-            serverSearch: true,
-            searchDebounceTime: 300,
-            searchLoadingText: '搜索中...',
-            onSearch: (q: any) => {
-              if (!!q) {
-                return this.service
-                  .request(this.service.$api_get_getCarLicenseListByCarNo, {
-                    carNo: q
-                  })
-                  .pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))
-                  .toPromise();
-              } else {
-                return of([]);
-              }
-            },
             visibleIf: {
               _$expand: (value: boolean) => value
             }
-          } as SFSelectWidgetSchema
+          }
         },
-         payeeId: {
+        captainName: {
           title: '车队长',
           type: 'string',
           ui: {
-            widget: 'select',
-            serverSearch: true,
-            searchDebounceTime: 300,
-            searchLoadingText: '搜索中...',
-            onSearch: (q: any) => {
-              if (!!q) {
-                return this.service
-                  .request(this.service.$api_get_getDriverInfo, { keyword: q,
-                  model: 1, type: 2 })
-                  .pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum))))
-                  .toPromise();
-              } else {
-                return of([]);
-              }
-            },
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
-          } as SFSelectWidgetSchema,
+          }
         }, 
         paymentstatus: {
           title: '支付状态',
@@ -320,48 +247,6 @@ tabs = {
     };
     this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
   }
-  /**
- * 初始化查询表单
- */
-  initSFView() {
-    this.schemaView = {
-      properties: {
-        no: {
-          type: 'string',
-          title: '运费单价',
-         ui: {
-          widget: 'custom',
-         }
-        },
-        sex: {
-          title: '',
-          type: 'string',
-          default: 0,
-          enum: [
-            { label: '保留小数', value: 0 },
-            { label: '男', value: 1 },
-            { label: '女', value: 2 },
-            { label: '保密', value: 3 },
-          ],
-          ui: {
-            widget: 'select',
-          } as SFSelectWidgetSchema,
-        },
-        appId: {
-          type: 'string',
-          title: '结算重量',
-          ui: {
-            widget: 'select',
-            placeholder: '请选择',
-            allowClear: true,
-            asyncData: () => this.getCatalogueMember(),
-          },
-        },
-      },
-      type: 'object',
-    };
-    this.uiView = { '*': { spanLabelFixed: 80, grid: { span: 12, gutter: 4 } } };
-  }
 
   /**
    * 初始化数据列表
@@ -467,59 +352,6 @@ tabs = {
       },
     ];
   }
-  initSTFloat() {
-    this.columnsFloat = [
-      {
-        title: '序号',
-        className: 'text-center',
-        index: 'one', 
-      },
-      {
-        title: '操作时间',
-        className: 'text-center',
-        index: 'two', 
-      },
-      {
-        title: '操作人',
-        className: 'text-center',
-        index: 'three', 
-      },
-      { title: '状态', index: 'externalSn',  className: 'text-center' },
-      {
-        title: '操作',
-        fixed: 'right',
-        width: '80px',
-        className: 'text-left',
-        buttons: [
-          {
-            text: '查看',
-            click: (_record) => this.FloatView(_record),
-          },
-          {
-            text: '撤销',
-            click: (_record) => this.audit(_record),
-          },
-        ],
-      },
-    ];
-  }
-  initSTFloatView() {
-    this.columnsFloatView = [
-      {
-        title: '费用名称',
-        width: '100px',
-        className: 'text-center',
-        render: 'goodsId'
-      },
-      {
-        title: '变更前',
-        width: '100px',
-        className: 'text-center',
-      },
-      { title: '变更值', index: 'externalSn', width: '120px', className: 'text-center' },
-      { title: '变更后', index: 'externalSn', width: '120px', className: 'text-center' }
-    ];
-  }
   search() {
     this.st?.load(1);
     this.getGoodsSourceStatistical()
@@ -547,22 +379,6 @@ tabs = {
     this.sf.reset();
     this._$expand = false;
   }
-
-
-
-  // 获取录单员 
-  getCatalogueMember() {
-    const params = {
-    };
-    return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe(
-      map((res) => {
-        if (res) {
-          console.log(res)
-        }
-      }),
-    );
-  }
-
   selectChange(e: number) {
     console.log(e);
     if(e>=1) {
@@ -582,41 +398,12 @@ tabs = {
   }
   audit(item: any) {
     console.log(item)
-  }
-
- /*
-  * 审核关闭弹窗
-  view: 1
-  浮动费用： 0
-  查看评价： 3
-  */
-  handleCancel(type: string) {
-    console.log(type)
-    if(type === '0') {
-      this.isVisible = false
-    } else if(type === '1') {
-    console.log(type)
-      this.isVisibleView = false
-    } else if(type === '2') {
-    console.log(type)
-      this.isVisibleEvaluate = false
-    }
   }
     /**
   * 审核通过按钮
   */
   handleOK() {
     
-  }
-  OpenPrice() {
-    this.isVisible = true
-  }
-   /**
-  * 浮动费用查看
-  */
-  FloatView(item: any) {
-    console.log(item)
-    this.isVisibleView = true
   }
    /**
   *查看评价
@@ -626,7 +413,7 @@ tabs = {
     this.isVisibleEvaluate = true
   }
   getGoodsSourceStatistical() {
-    this.service.request(this.service.$api_get_getBulkStatistics).subscribe(res => {
+    this.service.request(this.service.$api_get_getBulkStatistics, this.reqParams).subscribe(res => {
       if (res) {
         let totalCount = 0;
         res.forEach((ele: any) => {

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-17 20:13:41
+ * @LastEditTime: 2022-01-18 16:55:43
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@@ -94,84 +94,6 @@
         <div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div>
         <div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div>
       </ng-template>
-      <ng-template st-row="enStatusStr27878" let-item let-index="index">
-        <div class="mr-xs" nzPopoverTitle="Title" nz-popover [nzPopoverContent]="contentTemplate">{{item.no}}</div>
-      </ng-template>
-      <ng-template st-row="feiong" let-item let-index="index">
-        <div style="color: aqua;" (click)="OpenPrice()">
-          {{item.no}}
-        </div>
-      </ng-template>
-      <ng-template #contentTemplate>
-        <div>
-          <p>预付：¥200.00</p>
-          <p>到付：¥200.00</p>
-          <p>油卡：¥200.00</p>
-          <p>回单付：¥200.00</p>
-          <p>小计：¥200.00</p>
-          <p>附加费：¥200.00</p>
-        </div>
-      </ng-template>
     </st>
   </div>
-</nz-card>
+</nz-card>
-
-
-<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="浮动费用" (nzOnOk)="handleOK()"
-  (nzOnCancel)="handleCancel('0')">
-  <ng-container *nzModalContent>
-    <st #stFloat multiSort size="small" [bordered]="true" [data]="datass" [columns]="columnsFloat"
-      [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, 30, 50, 100, 200, 300, 500, 1000] }"
-      [loadingDelay]="500">
-    </st>
-  </ng-container>
-  <ng-template #nzModalFooter>
-    <button nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
-    <button nz-button nzType="default" (click)="handleOK()">确定</button>
-  </ng-template>
-</nz-modal>
-
-
-<nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看"
-  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
-  <ng-container *nzModalContent>
-    <st #stFloatView multiSort size="small" [bordered]="true" [data]="datass" [columns]="columnsFloatView"
-      [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, 30, 50, 100, 200, 300, 500, 1000] }"
-      [loadingDelay]="500">
-    </st>
-    <div><span>变更原因2：</span></div>
-    <div><span>拒绝原因：</span></div>
-    <div><span>注：</span></div>
-  </ng-container>
-  <ng-template #nzModalFooterview>
-    <button nz-button nzType="default" (click)="handleCancel('1')">取消</button>
-    <button nz-button nzType="primary" (click)="handleOK()">确定</button>
-  </ng-template>
-</nz-modal>
-
-<nz-modal [(nzVisible)]="isVisibleEvaluate" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate" (nzOnOk)="handleOK()"
-  (nzOnCancel)="handleCancel('2')">
-  <ng-container *nzModalContent>
-    <nz-tabset>
-      <nz-tab nzTitle="我的评价">
-        <div>
-          评分: <nz-rate [ngModel]="2.5" nzAllowHalf></nz-rate>
-          <div><span>评价内容：</span></div>
-        </div>
-      </nz-tab>
-      <nz-tab nzTitle="司机评价">
-        <div>
-          暂无评价内容
-        </div>
-      </nz-tab>
-    </nz-tabset>
-  </ng-container>
-  <ng-template #nzModalFooterEvaluate>
-    <button nz-button nzType="default" (click)="handleCancel('2')">取消</button>
-    <button nz-button nzType="primary" (click)="handleOK()">确定</button>
-  </ng-template>
-</nz-modal>

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

@@ -19,34 +19,13 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic
 export class WaybillManagementVehicleComponent implements OnInit {
   ui: SFUISchema = {};
   schema: SFSchema = {};
-  auditMany = false;
-  isVisibleView = false;
   isVisibleEvaluate = false;
   isVisible = false;
   _$expand = false;
   resourceStatus: any;
   @ViewChild('st') private readonly st!: STComponent;
-  @ViewChild('stFloat') private readonly stFloat!: STComponent;
-  @ViewChild('stFloatView') private readonly stFloatView!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
-  @ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
   columns: STColumn[] = [];
-  columnsFloat: STColumn[] = [];
-  columnsFloatView: STColumn[] = [];
-  datass: any = [
-    {
-      one: '1',
-      two: '1',
-      three: '1',
-      id: 1
-    },
-    {
-      one: '2',
-      two: '2',
-      three: '2',
-      id: 2
-    }
-  ];
   tabs = {
     signQuantity: 0,
     cancelQuantity: 0,
@@ -86,8 +65,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
     this.initSF();
     this.initST();
     this.getGoodsSourceStatistical();
-    this.initSTFloat();
-    this.initSTFloatView();
   }
 
   /**
@@ -144,77 +121,33 @@ export class WaybillManagementVehicleComponent implements OnInit {
             }
           }
         },
-        driverId: {
+        driverName: {
           title: '承运司机',
           type: 'string',
           ui: {
-            widget: 'select',
-            serverSearch: true,
-            searchDebounceTime: 300,
-            searchLoadingText: '搜索中...',
-            onSearch: (q: any) => {
-              if (!!q) {
-                return this.service
-                  .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
-                  .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.appUserId } as SFSchemaEnum))))
-                  .toPromise();
-              } else {
-                return of([]);
-              }
-            },
             visibleIf: {
               _$expand: (value: boolean) => value
             }
-          } as SFSelectWidgetSchema
+          }
         },
         carNo: {
           title: '车牌号',
           type: 'string',
           ui: {
-            widget: 'select',
-            serverSearch: true,
-            searchDebounceTime: 300,
-            searchLoadingText: '搜索中...',
-            onSearch: (q: any) => {
-              if (!!q) {
-                return this.service
-                  .request(this.service.$api_get_getCarLicenseListByCarNo, {
-                    carNo: q
-                  })
-                  .pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.id } as SFSchemaEnum))))
-                  .toPromise();
-              } else {
-                return of([]);
-              }
-            },
             visibleIf: {
               _$expand: (value: boolean) => value
             }
-          } as SFSelectWidgetSchema
+          }
         },
-        payeeId: {
+        captainName: {
           title: '车队长',
           type: 'string',
           ui: {
-            widget: 'select',
-            serverSearch: true,
-            searchDebounceTime: 300,
-            searchLoadingText: '搜索中...',
-            onSearch: (q: any) => {
-              if (!!q) {
-                return this.service
-                  .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 2 })
-                  .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.userId } as SFSchemaEnum))))
-                  .toPromise();
-              } else {
-                return of([]);
-              }
-            },
             visibleIf: {
-              _$expand: (value: boolean) => value
+              _$expand: (value: boolean) => value,
-            }
+            },
-          } as SFSelectWidgetSchema
+          }
-        },
+        }, 
         paymentstatus: {
           title: '支付状态',
           type: 'string',
@@ -399,58 +332,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
       }
     ];
   }
-  initSTFloat() {
-    this.columnsFloat = [
-      {
-        title: '序号',
-        className: 'text-center',
-        index: 'one'
-      },
-      {
-        title: '操作时间',
-        className: 'text-center',
-        index: 'two'
-      },
-      {
-        title: '操作人',
-        className: 'text-center',
-        index: 'three'
-      },
-      { title: '状态', index: 'externalSn', className: 'text-center' },
-      {
-        title: '操作',
-        fixed: 'right',
-        className: 'text-left',
-        buttons: [
-          {
-            text: '查看',
-            click: _record => this.FloatView(_record)
-          },
-          {
-            text: '撤销',
-            click: _record => this.audit(_record)
-          }
-        ]
-      }
-    ];
-  }
-  initSTFloatView() {
-    this.columnsFloatView = [
-      {
-        title: '费用名称',
-        width: '100px',
-        className: 'text-center',
-        render: 'goodsId'
-      },
-      {
-        title: '变更前',
-        width: '100px',
-        className: 'text-center'
-      },
-      { title: '变更值', index: 'externalSn', width: '120px', className: 'text-center' },
-      { title: '变更后', index: 'externalSn', width: '120px', className: 'text-center' }
-    ];
-  }
   /**
    * 查询字段个数
    */
@@ -478,18 +359,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
     this.st?.load(1);
     this.getGoodsSourceStatistical()
   }
-  // 获取录单员
-  getCatalogueMember() {
-    const params = {};
-    return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe(
-      map(res => {
-        if (res) {
-          console.log(res);
-        }
-      })
-    );
-  }
-
   selectChange(e: number) {
     console.log(e);
     this.resourceStatus = e;
@@ -503,42 +372,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
    * 导入货源
    */
   importGoodsSource() {}
-  audit(item: any) {
-    console.log(item);
-  }
-
-  /*
-  * 审核关闭弹窗
-  view: 1
-  浮动费用： 0
-  查看评价： 3
-  */
-  handleCancel(type: string) {
-    console.log(type);
-    if (type === '0') {
-      this.isVisible = false;
-    } else if (type === '1') {
-      console.log(type);
-      this.isVisibleView = false;
-    } else if (type === '2') {
-      console.log(type);
-      this.isVisibleEvaluate = false;
-    }
-  }
-  /**
-   * 审核通过按钮
-   */
-  handleOK() {}
-  OpenPrice() {
-    this.isVisible = true;
-  }
-  /**
-   * 浮动费用查看
-   */
-  FloatView(item: any) {
-    console.log(item);
-    this.isVisibleView = true;
-  }
   /**
    *查看评价
    */