diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index 5ba369fa..46b8fcef 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -179,28 +179,6 @@ -
diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts index ad3f9ac3..fe50066b 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts @@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core'; /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-24 17:49:31 + * @LastEditTime: 2021-12-24 17:55:35 * @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\components\vehicle-detail\vehicle-detail.component.ts @@ -11,7 +11,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STComponent } from '@delon/abc/st'; -import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form'; +import { SFComponent, SFNumberWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form'; import { _HttpClient } from '@delon/theme'; import { AmapPoiPickerComponent, AmapService, EAEnvironmentService, ShipperBaseService } from '@shared'; import { NzMessageService } from 'ng-zorro-antd/message'; @@ -652,7 +652,54 @@ initSF4() { placeholder: '请输入' } }, - + acceptWeight: { + type: 'number', + title: '装货重量', + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true, + } as SFNumberWidgetSchema + }, + acceptVolume: { + type: 'number', + title: '装货体积', + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true, + } as SFNumberWidgetSchema + }, + settlementWeight: { + type: 'number', + title: '卸货重量', + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true, + } as SFNumberWidgetSchema + }, + settlementVolume: { + type: 'number', + title: '卸货体积', + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true, + } as SFNumberWidgetSchema + } }, required: ['weight','loadTime','unloadTime'] }; diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index a1652609..86b433c7 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -158,6 +158,7 @@ [res]="{ reName: { list: 'data.list', total: 'data.total' } }" [loadingDelay]="500" > +
变更原因：{{ViewCause?.changeCause}}
拒绝原因：{{ViewCause?.refuseCause}}
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 8c0cc3d7..7c7bee51 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -22,7 +22,6 @@ import { OrderManagementService } from '../../services/order-management.service' styleUrls: ['./vehicle.component.less'] }) export class OrderManagementVehicleComponent implements OnInit { - url = `/user?_allow_anonymous=true`; ui: SFUISchema = {}; schema: SFSchema = {}; auditMany = false; diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts index 15e1f9d6..390785cb 100644 --- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-14 14:03:07 - * @LastEditTime: 2021-12-22 20:08:13 + * @LastEditTime: 2021-12-24 17:58:45 * @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 @@ -119,7 +119,7 @@ export class UpdateFreightComponent implements OnInit { title: '装货体积', default: data.acceptVolume, ui: { - unit: '吨', + unit: '方', placeholder: '请输入', grid: { span: 12 @@ -147,7 +147,7 @@ export class UpdateFreightComponent implements OnInit { title: '卸货体积', default: data.settlementVolume, ui: { - unit: '吨', + unit: '方', placeholder: '请输入', grid: { span: 12 diff --git a/src/app/routes/sys-setting/components/crm-management/crm-management.component.html b/src/app/routes/sys-setting/components/crm-management/crm-management.component.html index 30e7fdf7..b128f2f0 100644 --- a/src/app/routes/sys-setting/components/crm-management/crm-management.component.html +++ b/src/app/routes/sys-setting/components/crm-management/crm-management.component.html @@ -1,37 +1,70 @@ - +
-
- + +
+
-
- + + + +
+ +
+
+ + -
-
+ +
+ +
- +
- - \ No newline at end of file + [loading]="service.http.loading" [scroll]="{ y: '370px' }" (change)="stChange($event)"> + +
+ 客户 + 供应商 +
+ + + + + + + + + + + + + + diff --git a/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts b/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts index 74cbbd04..f939b383 100644 --- a/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts +++ b/src/app/routes/sys-setting/components/crm-management/crm-management.component.ts @@ -1,6 +1,6 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnInit, ViewChild, Type } from '@angular/core'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; -import { SFComponent, SFSchema } from '@delon/form'; +import { SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { SystemService } from '../../services/system.service'; @@ -12,52 +12,48 @@ import { SystemService } from '../../services/system.service'; export class CrmManagementComponent implements OnInit { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; - - url = `/rule?_allow_anonymous=true`; - - searchSchema: SFSchema = { - properties: { - receiveName: { - type: 'string', - title: '角色名称', - ui: { placeholder: '请输入' } - } - } - }; + @ViewChild('sf', { static: false }) sf!: SFComponent; + @ViewChild('sfFre', { static: false }) sfFre!: SFComponent; + ui: SFUISchema = {}; + ui2: SFUISchema = {}; + schema: SFSchema = {}; + addSchema: SFSchema = {}; + _$expand = false; + editText = ''; + formData :any; + isVisible = false; + edit = false; + editId = false; columns: STColumn[] = [ - { title: '角色名称', index: 'no' }, - { title: '角色描述', index: 'description' }, - { title: '创建人手机号', index: 'description' }, - { - title: '创建时间', - index: 'updatedAt', - type: 'date' - }, + { title: '客户名称', index: 'customerName' }, + { title: '客户简称', index: 'customerShortName' }, + { title: '客户编码', index: 'customerCode' }, + { title: '客户类型', render: 'customerType' }, { title: '操作', buttons: [ { text: '编辑', - click: item => this.roleAction(item) + click: item => this.roleAction(item, 2) }, - { - text: '删除', - click: item => this.deleteAction(item) - } ] } ]; selectedRows: any[] = []; - reqParams = { pageIndex: 1, pageSize: 10 }; + get reqParams (){ + return { + ...this.sf?.value, + }}; constructor(public service: SystemService, private nzModalService: NzModalService) {} - ngOnInit(): void {} + ngOnInit(): void { + this.initSF() + this.initSFFre() + } stChange(e: STChange): void { switch (e.type) { @@ -69,17 +65,108 @@ export class CrmManagementComponent implements OnInit { break; } } - - roleAction(item?: any) { - const modal = this.nzModalService.create({ - // nzContent: SettingRoleEditComponent, - nzWidth: 900, - nzComponentParams: item ? { i: { ...item } } : { i: { id: 0 } }, - nzFooter: null - }); - modal.afterClose.subscribe(res => { - this.st.load(); - }); + /** + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } + /** + * 查询字段个数 + */ + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + initSF(){ + this.schema = { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + customerName: { + type: 'string', + title: '客户名称', + ui: { placeholder: '请输入' } + }, + customerShortName: { + type: 'string', + title: '客户简称', + ui: { placeholder: '请输入' } + }, + customerType: { + type: 'string', + title: '客户类型', + enum: [ + { label: '客户', value: 1 }, + { label: '供应商', value: 2 }, + ], + ui: { + widget: 'select' + } + }, + customerCode: { + type: 'string', + title: '客户编码', + ui: { placeholder: '请输入', + visibleIf: { + _$expand: (value: boolean) => value + } } + }, + } + + }; + this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; + } + initSFFre() { + this.addSchema = { + properties: { + customerName: { + type: 'string', + title: '客户名称', + ui: { placeholder: '请输入' } + }, + customerShortName: { + type: 'string', + title: '客户简称', + ui: { placeholder: '请输入' } + }, + customerCode: { + type: 'string', + title: '客户编码', + ui: { placeholder: '请输入' } + }, + customerType: { + type: 'string', + title: '客户类型', + enum: [ + { label: '客户', value: 1 }, + { label: '供应商', value: 2 }, + ], + ui: { + widget: 'radio', + } as SFRadioWidgetSchema, + default: 1, + }, + }, + required: ['customerName', 'customerShortName', 'customerType', 'customerCode'] + }; +this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; +} + roleAction(value: any,item?: any) { + if(item === 1) { + this.edit = false; + this.editText = '新增'; + } else { + this.service.request(this.service.$api_get_crmCustomer, {id: value.id}).subscribe((res: any) => { + console.log(res) + if(res) { + this.formData = res; + } + }) + this.edit = true; + this.editId = value.id; + this.editText = '编辑'; + } + this.isVisible = true; } deleteAction(item?: any) { @@ -97,4 +184,31 @@ export class CrmManagementComponent implements OnInit { resetSF() { this.sf.reset(); } + handleCancel() { + this.isVisible = false + } + + handleOK() { + console.log(this.sfFre.value) + if(!this.sfFre.valid) { + this.service.msgSrv.warning('请正确填写完整！') + return + } + const params ={ + ...this.sfFre.value + } + if(this.editId) { + params.id = this.editId + } + this.service.request(this.service.$api_save_crmCustomer, params).subscribe((res:any) => { + if(res) { + this.service.msgSrv.success('保存成功！') + this.isVisible = false + this.st.reload(); + } else { + this.service.msgSrv.warning(res?.msg) + + } + }) + } } diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index 193d58dc..a0ee5aa2 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -1,3 +1,11 @@ +/* + * @Author: your name + * @Date: 2021-12-20 17:18:43 + * @LastEditTime: 2021-12-27 09:30:39 + * @LastEditors: your name + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + * @FilePath: \tms-obc-web\src\app\routes\sys-setting\services\system.service.ts + */ import { Injectable, Injector } from '@angular/core'; import { BaseService } from 'src/app/shared/services'; @@ -28,6 +36,16 @@ export class SystemService extends BaseService { $api_update_dict = '/api/mdc/pbc/dictItems/update'; + // 获取CRM客户信息表 + $api_get_crmCustomer = '/api/mdc/crmCustomer/get'; + // 查询CRM客户信息表 + $api_get_crmCustomer_page = '/api/mdc/crmCustomer/list/page'; + // 保存CRM客户信息表 + $api_save_crmCustomer = '/api/mdc/crmCustomer/save'; + // 删除CRM客户信息表 + $api_deletebatch_crmCustomer = '/api/mdc/crmCustomer/deletebatch'; + + $api_getAllFunctionInfoByAppId: string = ''; $api_getRoleTemplateInfo: string = ''; $api_getFunctionButtonInfo: string = '';