From 122fd27857064cb973c958d9feca6604ea6e2612 Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Sun, 4 Apr 2021 11:08:31 +0800 Subject: [PATCH] 1 --- .../company-edit/company-edit.component.ts | 2 +- .../coupon-edit/coupon-edit.component.html | 2 +- .../coupon-edit/coupon-edit.component.ts | 4 +- .../system-organization.component.html | 112 +++++++++--------- .../system-organization.component.ts | 10 +- src/app/services/order.service.ts | 2 +- .../@notadd/neditor/neditor.service.js | 2 +- 7 files changed, 69 insertions(+), 65 deletions(-) diff --git a/src/app/admin/company/company-edit/company-edit.component.ts b/src/app/admin/company/company-edit/company-edit.component.ts index 9572b03..5c19fdf 100644 --- a/src/app/admin/company/company-edit/company-edit.component.ts +++ b/src/app/admin/company/company-edit/company-edit.component.ts @@ -54,7 +54,7 @@ export class CompanyEditComponent implements OnInit { this.validateForm = this.fb.group({ loginName: [null, [Validators.required, ValidatorsService.maxLength(20)]], password: [null, [Validators.required]], - phone: [null, [Validators.required, ValidatorsService.mobile]], + phone: [null, [Validators.required]], regionId: [null], name: [null, [Validators.required, ValidatorsService.maxLength(50)]], address: [null, [Validators.required, ValidatorsService.maxLength(80)]], diff --git a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html index 3ebb5d1..cb95a5e 100644 --- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html +++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html @@ -124,7 +124,7 @@ 归库天数 - + diff --git a/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts b/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts index a857fe5..328fc42 100644 --- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts +++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts @@ -294,7 +294,7 @@ export class CouponEditComponent implements OnInit { for (const i of couponCarouselImg) { couponCarouselArray.push( { - uid: 1, + uid: i, name: i, status: 'done', url: environment.imageUrl + i @@ -308,7 +308,7 @@ export class CouponEditComponent implements OnInit { for (const i of couponDescImg) { couponDescArray.push( { - uid: 1, + uid: i, name: i, status: 'done', url: environment.imageUrl + i diff --git a/src/app/admin/system/system-organization/system-organization.component.html b/src/app/admin/system/system-organization/system-organization.component.html index 19bbb3a..c198290 100644 --- a/src/app/admin/system/system-organization/system-organization.component.html +++ b/src/app/admin/system/system-organization/system-organization.component.html @@ -71,12 +71,12 @@
- - 地区 - - - - + + + + + + + + + + + @@ -149,12 +149,12 @@ - - 地区 - - - - + + + + + + + + + + + - - logo - - - -
上传
- - - + + + + + + + + + + + + + + - - 邮箱 - - - - + + + + + + - - 网站 - - - - + + + + + + - - 备注 - - - - + + + + + +
diff --git a/src/app/admin/system/system-organization/system-organization.component.ts b/src/app/admin/system/system-organization/system-organization.component.ts index f46b128..f58c395 100644 --- a/src/app/admin/system/system-organization/system-organization.component.ts +++ b/src/app/admin/system/system-organization/system-organization.component.ts @@ -126,7 +126,7 @@ export class SystemOrganizationComponent implements OnInit { this.validateForm = this.fb.group({ // regionAbbreviate: [null, [Validators.required, ValidatorsService.maxLength(10)]], name: [null, [Validators.required]], - address: [null, [Validators.required]], + // address: [null, [Validators.required]], phone: [null, [Validators.required]], siteUrl: [null], email: [null], @@ -272,12 +272,16 @@ export class SystemOrganizationComponent implements OnInit { } // 确定添加按钮 handleOk(value: any): void { + if (this.orgId == null || this.orgId === '') { + this.message.error('请选择上级部门'); + return; + } // tslint:disable-next-line:forin for (const i in this.validateForm.controls) { this.validateForm.controls[i].markAsDirty(); this.validateForm.controls[i].updateValueAndValidity(); } - if (this.validateForm.status == null || this.validateForm.status !== 'VALID' || this.regionId == null) { + if (this.validateForm.status == null || this.validateForm.status !== 'VALID') { this.modalService.info({ nzTitle: '提示', nzContent: '有未填写的必填项', @@ -360,7 +364,7 @@ export class SystemOrganizationComponent implements OnInit { this.validateForm.controls[i].markAsDirty(); this.validateForm.controls[i].updateValueAndValidity(); } - if (this.validateForm.status == null || this.validateForm.status !== 'VALID' || this.regionId == null) { + if (this.validateForm.status == null || this.validateForm.status !== 'VALID') { this.modalService.info({ nzTitle: '提示', nzContent: '有未填写的必填项', diff --git a/src/app/services/order.service.ts b/src/app/services/order.service.ts index 49898c2..f42ed2f 100644 --- a/src/app/services/order.service.ts +++ b/src/app/services/order.service.ts @@ -20,7 +20,7 @@ export class OrderService { * @param callBack 回调 */ public getOrderCouponList(paramsObject: object, callBack) { - this.http.get(environment.baseUrl + 'highOrder/getOrderList?' + this.common.getWhereCondition(paramsObject)).subscribe(data => { + this.http.get(environment.baseUrl + 'highOrder/getOrderBList?' + this.common.getWhereCondition(paramsObject)).subscribe(data => { callBack(data); }); } diff --git a/src/assets/node_modules/@notadd/neditor/neditor.service.js b/src/assets/node_modules/@notadd/neditor/neditor.service.js index 28062e5..75a5fe9 100644 --- a/src/assets/node_modules/@notadd/neditor/neditor.service.js +++ b/src/assets/node_modules/@notadd/neditor/neditor.service.js @@ -5,7 +5,7 @@ * @returns 返回自定义的上传接口 */ -let UPLOADFILE = 'https://hsgcs.dctpay.com/brest//fileUpload/uploadfile'; +let UPLOADFILE = 'https://·/brest//fileUpload/uploadfile'; UE.Editor.prototype._bkGetActionUrl = UE.Editor.prototype.getActionUrl; UE.Editor.prototype.getActionUrl = function(action) {