|
|
@ -14,17 +14,6 @@ |
|
|
|
</nz-form-control> |
|
|
|
</nz-form-control> |
|
|
|
</nz-form-item> |
|
|
|
</nz-form-item> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<!-- <div nz-col nzSpan="8">--> |
|
|
|
|
|
|
|
<!-- <nz-form-item>--> |
|
|
|
|
|
|
|
<!-- <nz-form-label [nzSpan]="6">产品类型</nz-form-label>--> |
|
|
|
|
|
|
|
<!-- <nz-form-control [nzSpan]="16">--> |
|
|
|
|
|
|
|
<!-- <nz-select nzShowSearch nzAllowClear formControlName="productType" nzPlaceHolder="请选择价格状态">--> |
|
|
|
|
|
|
|
<!-- <nz-option nzLabel="星巴克" [nzValue]="1"></nz-option>--> |
|
|
|
|
|
|
|
<!-- <nz-option nzLabel="肯德基" [nzValue]="2"></nz-option>--> |
|
|
|
|
|
|
|
<!-- </nz-select>--> |
|
|
|
|
|
|
|
<!-- </nz-form-control>--> |
|
|
|
|
|
|
|
<!-- </nz-form-item>--> |
|
|
|
|
|
|
|
<!-- </div>--> |
|
|
|
|
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -61,7 +50,6 @@ |
|
|
|
<thead nzSingleSort> |
|
|
|
<thead nzSingleSort> |
|
|
|
<tr> |
|
|
|
<tr> |
|
|
|
<th nzWidth="60px">编号</th> |
|
|
|
<th nzWidth="60px">编号</th> |
|
|
|
<!-- <th nzWidth="90px">产品类型</th>--> |
|
|
|
|
|
|
|
<th nzWidth="90px">产品类型</th> |
|
|
|
<th nzWidth="90px">产品类型</th> |
|
|
|
<th nzWidth="90px">产品名称</th> |
|
|
|
<th nzWidth="90px">产品名称</th> |
|
|
|
<th nzWidth="90px">利润比例</th> |
|
|
|
<th nzWidth="90px">利润比例</th> |
|
|
@ -75,9 +63,8 @@ |
|
|
|
<tbody> |
|
|
|
<tbody> |
|
|
|
<tr *ngFor="let data of ajaxTable.data; let i = index"> |
|
|
|
<tr *ngFor="let data of ajaxTable.data; let i = index"> |
|
|
|
<td>{{i + 1}}</td> |
|
|
|
<td>{{i + 1}}</td> |
|
|
|
<!-- <td>{{data.productType == 1 ? '星巴克' : '肯德基'}}</td>--> |
|
|
|
|
|
|
|
<td>{{data.productName}}</td> |
|
|
|
<td>{{data.productName}}</td> |
|
|
|
<!-- <td>{{data.productType | productType : data.productId}}</td>--> |
|
|
|
<td>{{data.productType | productType : data.productId}}</td> |
|
|
|
<td>{{data.discount == null ? '暂未配置' : data.discount + "%"}}</td> |
|
|
|
<td>{{data.discount == null ? '暂未配置' : data.discount + "%"}}</td> |
|
|
|
<td>{{data.integralDiscount == null ? '0' : data.integralDiscount + "%"}}</td> |
|
|
|
<td>{{data.integralDiscount == null ? '0' : data.integralDiscount + "%"}}</td> |
|
|
|
<td>{{data.productPayTypeString.substring(0 , data.productPayTypeString.length - 1)}}</td> |
|
|
|
<td>{{data.productPayTypeString.substring(0 , data.productPayTypeString.length - 1)}}</td> |
|
|
@ -104,13 +91,14 @@ |
|
|
|
<nz-select nzShowSearch nzAllowClear formControlName="productType" nzPlaceHolder="请选择产品类型"> |
|
|
|
<nz-select nzShowSearch nzAllowClear formControlName="productType" nzPlaceHolder="请选择产品类型"> |
|
|
|
<nz-option nzLabel="星巴克" [nzValue]="1"></nz-option> |
|
|
|
<nz-option nzLabel="星巴克" [nzValue]="1"></nz-option> |
|
|
|
<nz-option nzLabel="肯德基" [nzValue]="2"></nz-option> |
|
|
|
<nz-option nzLabel="肯德基" [nzValue]="2"></nz-option> |
|
|
|
<nz-option nzLabel="充值产品" [nzValue]="3"></nz-option> |
|
|
|
<nz-option nzLabel="第三方会员充值" [nzValue]="3"></nz-option> |
|
|
|
<nz-option nzLabel="卡券" [nzValue]="4"></nz-option> |
|
|
|
<nz-option nzLabel="购买卡券" [nzValue]="5"></nz-option> |
|
|
|
<nz-option nzLabel="在线加油" [nzValue]="5"></nz-option> |
|
|
|
<nz-option nzLabel="加油服务" [nzValue]="6"></nz-option> |
|
|
|
|
|
|
|
<nz-option nzLabel="优惠券包" [nzValue]="7"></nz-option> |
|
|
|
</nz-select> |
|
|
|
</nz-select> |
|
|
|
</nz-form-control> |
|
|
|
</nz-form-control> |
|
|
|
</nz-form-item> |
|
|
|
</nz-form-item> |
|
|
|
<nz-form-item *ngIf="validateForm.value['productType'] == 4"> |
|
|
|
<nz-form-item *ngIf="validateForm.value['productType'] == 5"> |
|
|
|
<nz-form-label [nzSpan]="6" nzRequired>卡券来源</nz-form-label> |
|
|
|
<nz-form-label [nzSpan]="6" nzRequired>卡券来源</nz-form-label> |
|
|
|
<nz-form-control [nzSpan]="16" nzErrorTip="请选择卡券来源!"> |
|
|
|
<nz-form-control [nzSpan]="16" nzErrorTip="请选择卡券来源!"> |
|
|
|
<nz-select nzShowSearch nzAllowClear formControlName="productId" nzPlaceHolder="请选择卡券来源!"> |
|
|
|
<nz-select nzShowSearch nzAllowClear formControlName="productId" nzPlaceHolder="请选择卡券来源!"> |
|
|
|