zhengkaixin 4 years ago
parent
commit
bedab99bf7

+ 2 - 1
src/views/base/parkingCoupon-detail.vue

@@ -58,7 +58,8 @@ export default {
   props: [ "title", "reduce","merchantName"],
   data() {
 	  let Capitalization = (rule, value, callback) => {
-	  		  this.formModel.carNumber=value.toUpperCase()
+	  	this.formModel[rule.field]=value.toUpperCase()
+			 
 	     callback();
 	  };
     return {

+ 10 - 17
src/views/base/parkingCoupon-list.vue

@@ -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="折扣卷金额(元)"

+ 2 - 1
src/views/base/parkingWhite-detail.vue

@@ -135,7 +135,8 @@ export default {
   props: [ "title", "businessKey","memberLeaveTime","merchantName"],
   data() {
 	  let Capitalization = (rule, value, callback) => {
-		  this.formModel.memberCarNum=value.toUpperCase()
+		
+		  this.formModel[rule.field]=value.toUpperCase()
 	     callback();
 	  };
 	  let checkPhone = (rule, value, callback) => {

+ 1 - 0
src/views/base/parkingWhite-list.vue

@@ -134,6 +134,7 @@
         prop="merchantName"
         label="所属商户"
         width="180"
+		v-if="!detail.enableMember"
       ></el-table-column>
  
       <el-table-column prop="statusName" label="当前状态" width="90">