1

src/app/admin/coupon/coupon-edit/coupon-edit.component.html

@@ -37,13 +37,14 @@
                     <nz-form-control  nzErrorTip="请选择卡券来源!">
                         <nz-select nzPlaceHolder="请选择卡券来源"  [formControlName]="'couponSource'">
                             <nz-option nzValue="1" nzLabel="中石化"></nz-option>
+                            <nz-option nzValue="2" nzLabel="消费券"></nz-option>
                         </nz-select>
                     </nz-form-control>
                 </nz-form-item>
             </div>
-            <div nz-col [nzSpan]="8">
+            <div nz-col [nzSpan]="8"  *ngIf="validateForm.value.couponSource !== '2'">
                 <nz-form-item>
-                    <nz-form-label [nzFor]="'displayArea'"  nzRequired>展示区域</nz-form-label>
+                    <nz-form-label [nzFor]="'displayArea'" nzRequired>展示区域</nz-form-label>
                     <nz-form-control  nzErrorTip="请选择展示区域!">
                         <nz-select nzPlaceHolder="请选择展示区域"  [formControlName]="'displayArea'">
                             <nz-option nzValue="1" nzLabel="赠券专区"></nz-option>

src/app/admin/coupon/coupon-edit/coupon-edit.component.ts

@@ -79,8 +79,8 @@ export class CouponEditComponent implements OnInit {
       discountPrice: [null, [Validators.required]],
       merchantId: [null, [Validators.required]],
       isPresent: [false, [Validators.required]],
-      payType: [false, [Validators.required]],
+      payType: [null, [Validators.required]],
-      displayArea: [false, [Validators.required]],
+      displayArea: [null],
       couponSource: [null],
       handselCouponId: [null],
       status: [null],

src/app/admin/discount/discount-list/discount-list.component.html

@@ -157,6 +157,17 @@
                         </nz-form-control>
                     </nz-form-item>
                 </div>
+                <div nz-col nzSpan="6">
+                    <nz-form-item>
+                        <nz-form-label [nzSpan]="6">卡券来源</nz-form-label>
+                        <nz-form-control [nzSpan]="16">
+                            <nz-select [formControlName]="'couponSource'">
+                                <nz-option nzValue="1" nzLabel="中石化"></nz-option>
+                                <nz-option nzValue="2" nzLabel="消费券"></nz-option>
+                            </nz-select>
+                        </nz-form-control>
+                    </nz-form-item>
+                </div>
 
             </div>
 

src/app/admin/discount/discount-list/discount-list.component.ts

@@ -100,6 +100,7 @@ export class DiscountListComponent implements OnInit {
       merchantId: [null],
       couponName: [null],
       couponType: [null],
+      couponSource: [null],
       status: [2],
     });
     this.getRequest(true, this.searchForm.value);