Merge branch 'dev' of http://139.159.177.244:3000/yuanye/high-web into dev

* 'dev' of http://139.159.177.244:3000/yuanye/high-web:
  提交代码
  提交代码

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

@@ -203,9 +203,18 @@
                 </nz-form-control>
             </nz-form-item>
             <nz-form-item>
-                <nz-form-label [nzSpan]="6" nzRequired>分发卡券数量</nz-form-label>
-                <nz-form-control [nzSpan]="16" nzErrorTip="分发卡券数量!">
-                    <input [type]="'number'" nz-input formControlName="stockCount"/>
+                <nz-form-label [nzSpan]="6" nzRequired>类型</nz-form-label>
+                <nz-form-control [nzSpan]="16" nzErrorTip="请选择卡券!">
+                    <nz-select nzShowSearch nzAllowClear formControlName="type" nzPlaceHolder="请选择卡券">
+                        <nz-option nzLabel="销售码" nzValue="1"></nz-option>
+                        <nz-option nzLabel="兑换码" nzValue="2"></nz-option>
+                    </nz-select>
+                </nz-form-control>
+            </nz-form-item>
+            <nz-form-item>
+                <nz-form-label [nzSpan]="6" nzRequired>数量</nz-form-label>
+                <nz-form-control [nzSpan]="16" nzErrorTip="分发数量!">
+                    <input [type]="'number'" nz-input formControlName="stockCount" nzPlaceHolder="请填写分发数量" />
                 </nz-form-control>
             </nz-form-item>
         </form>

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

@@ -79,6 +79,7 @@ export class AgentListComponent implements OnInit {
         });
         this.validateFormDistribute = this.form.group({
             couponId: [null, [Validators.required]],
+            type: [null, [Validators.required]],
             stockCount: [null, [Validators.required]],
         });
         this.getRequest(true, this.searchForm.value);