hurui
/
high-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
pull/1/head
袁野 4 years ago
parent c640afd895
commit 122fd27857
7 changed files with 69 additions and 65 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      src/app/admin/company/company-edit/company-edit.component.ts
  2. 2
      src/app/admin/coupon/coupon-edit/coupon-edit.component.html
  3. 4
      src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
  4. 112
      src/app/admin/system/system-organization/system-organization.component.html
  5. 10
      src/app/admin/system/system-organization/system-organization.component.ts
  6. 2
      src/app/services/order.service.ts
  7. 2
      src/assets/node_modules/@notadd/neditor/neditor.service.js

2
src/app/admin/company/company-edit/company-edit.component.ts
Unescape View File

@ -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)]],

2
src/app/admin/coupon/coupon-edit/coupon-edit.component.html
Unescape View File

@ -124,7 +124,7 @@
<nz-form-item>
<nz-form-label [nzFor]="'recycleDay'" nzRequired>归库天数</nz-form-label>
<nz-form-control nzErrorTip="请输入归库天数!">
<nz-input-number [formControlName]="'recycleDay'" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
<nz-input-number [formControlName]="'recycleDay'" [nzMin]="1" [nzMax]="100" [nzStep]="1"></nz-input-number>
</nz-form-control>
</nz-form-item>
</div>

4
src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
Unescape View File

@ -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

112
src/app/admin/system/system-organization/system-organization.component.html
Unescape View File

@ -71,12 +71,12 @@
<nz-modal [(nzVisible)]="isVisible" nzTitle="添加" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk(validateForm.value)" [nzOkLoading]="isOkLoading">
<form nz-form [formGroup]="validateForm" style="margin-left: 5%;">
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="province" nzRequired>地区</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<app-region-selector [selectLevel]="2" (selectedRegionIdChange)="regionChange($event)"></app-region-selector>
</nz-form-control>
</nz-form-item>
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="province" nzRequired>地区</nz-form-label>-->
<!-- <nz-form-control [nzSm]="14" [nzXs]="24">-->
<!-- <app-region-selector [selectLevel]="2" (selectedRegionIdChange)="regionChange($event)"></app-region-selector>-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- <nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>地区简称</nz-form-label>
@ -99,12 +99,12 @@
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="province" nzRequired>部门地址</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="address" placeholder="请输入部门地址" />
</nz-form-control>
</nz-form-item>
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="province" nzRequired>部门地址</nz-form-label>-->
<!-- <nz-form-control [nzSm]="14" [nzXs]="24">-->
<!-- <input nz-input formControlName="address" placeholder="请输入部门地址" />-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="province">logo</nz-form-label>-->
@ -149,12 +149,12 @@
<nz-modal [(nzVisible)]="isVisibleEdit" nzTitle="修改" nzWidth="40%" (nzOnCancel)="handleCancelEdit()" (nzOnOk)="handleOkEdit(validateForm.value)">
<form nz-form [formGroup]="validateForm">
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="province" nzRequired>地区</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<app-region-selector [selectLevel]="2" [selectedRegionId]="regionId" (selectedRegionIdChange)="regionChange($event)"></app-region-selector>
</nz-form-control>
</nz-form-item>
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="province" nzRequired>地区</nz-form-label>-->
<!-- <nz-form-control [nzSm]="14" [nzXs]="24">-->
<!-- <app-region-selector [selectLevel]="2" [selectedRegionId]="regionId" (selectedRegionIdChange)="regionChange($event)"></app-region-selector>-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </nz-form-item><nz-form-item>
@ -193,48 +193,48 @@
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="province" nzRequired>部门地址</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="address" [(ngModel)]="organizationArr.address" placeholder="请输入部门地址" />
</nz-form-control>
</nz-form-item>
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="province" nzRequired>部门地址</nz-form-label>-->
<!-- <nz-form-control [nzSm]="14" [nzXs]="24">-->
<!-- <input nz-input formControlName="address" [(ngModel)]="organizationArr.address" placeholder="请输入部门地址" />-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="province">logo</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<nz-upload
nzAction="{{WEB_SERVE_URL}}/fileUpload/uploadfile"
nzListType="picture-card"
[(nzFileList)]="orgLogo"
[nzShowButton]="orgLogo.length < 1"
>
<i nz-icon nzType="plus"></i>
<div class="ant-upload-text">上传</div>
</nz-upload>
</nz-form-control>
</nz-form-item>
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="province">logo</nz-form-label>-->
<!-- <nz-form-control [nzSm]="14" [nzXs]="24">-->
<!-- <nz-upload-->
<!-- nzAction="{{WEB_SERVE_URL}}/fileUpload/uploadfile"-->
<!-- nzListType="picture-card"-->
<!-- [(nzFileList)]="orgLogo"-->
<!-- [nzShowButton]="orgLogo.length < 1"-->
<!-- >-->
<!-- <i nz-icon nzType="plus"></i>-->
<!-- <div class="ant-upload-text">上传</div>-->
<!-- </nz-upload>-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24">邮箱</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="email" [(ngModel)]="organizationArr.email" placeholder="请输入邮箱" />
</nz-form-control>
</nz-form-item>
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSm]="6" [nzXs]="24">邮箱</nz-form-label>-->
<!-- <nz-form-control [nzSm]="14" [nzXs]="24">-->
<!-- <input nz-input formControlName="email" [(ngModel)]="organizationArr.email" placeholder="请输入邮箱" />-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24">网站</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="siteUrl" [(ngModel)]="organizationArr.siteUrl" placeholder="请输入网站" />
</nz-form-control>
</nz-form-item>
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSm]="6" [nzXs]="24">网站</nz-form-label>-->
<!-- <nz-form-control [nzSm]="14" [nzXs]="24">-->
<!-- <input nz-input formControlName="siteUrl" [(ngModel)]="organizationArr.siteUrl" placeholder="请输入网站" />-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24">备注</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<textarea nz-input [rows]="4" formControlName="remark" [(ngModel)]="organizationArr.remark" placeholder="请输入备注" ></textarea>
</nz-form-control>
</nz-form-item>
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSm]="6" [nzXs]="24">备注</nz-form-label>-->
<!-- <nz-form-control [nzSm]="14" [nzXs]="24">-->
<!-- <textarea nz-input [rows]="4" formControlName="remark" [(ngModel)]="organizationArr.remark" placeholder="请输入备注" ></textarea>-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
</form>
</nz-modal>

10
src/app/admin/system/system-organization/system-organization.component.ts
Unescape View File

@ -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: '有未填写的必填项',

2
src/app/services/order.service.ts
Unescape View File

@ -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);
});
}

2
src/assets/node_modules/@notadd/neditor/neditor.service.js generated vendored
Unescape View File

@ -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) {

Write Preview
Loading…
Cancel
Save