|
@@ -26,21 +26,15 @@
|
|
|
v-model="queryModel.carNum"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="所属物业公司" prop="companyId">
|
|
|
- <el-select-tree
|
|
|
- :props="props"
|
|
|
- :options="companyResult"
|
|
|
- v-model="queryModel.companyId"
|
|
|
- height="200"
|
|
|
- style="width: 230px"
|
|
|
- size="mini"
|
|
|
- ></el-select-tree>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="商户名称" prop="merchantName">
|
|
|
+
|
|
|
+
|
|
|
+ <el-form-item label="商户名称" v-show="!detail.enableCoupon" prop="merchantName">
|
|
|
<el-input
|
|
|
type="text"
|
|
|
size="mini"
|
|
|
v-model="queryModel.merchantName"
|
|
|
+
|
|
|
+
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="使用状态" prop="useStatus">
|
|
@@ -121,22 +115,21 @@
|
|
|
label="车牌号码"
|
|
|
width="130"
|
|
|
></el-table-column>
|
|
|
+
|
|
|
+
|
|
|
<el-table-column
|
|
|
- prop="companyName"
|
|
|
- label="所属物业"
|
|
|
- width="150"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
+ v-if="!detail.enableCoupon"
|
|
|
prop="merchantName"
|
|
|
label="登记商户"
|
|
|
width="150"
|
|
|
></el-table-column>
|
|
|
+ <!--
|
|
|
<el-table-column prop="useStatus" label="使用状态" width="90">
|
|
|
<template slot-scope="{ row }">
|
|
|
<span v-if="row.useStatus">使用</span>
|
|
|
<span v-else>未使用</span>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column> -->
|
|
|
<el-table-column
|
|
|
prop="reduce"
|
|
|
label="折扣卷金额(元)"
|