Hwt 2 years ago
parent
commit
8f3d5121b5

+ 2 - 0
smart/src/views/vehicleInformation/index.vue

@@ -25,6 +25,7 @@
       <el-select
         placeholder="状态"
         clearable
+        v-model="mixins_query.carStatus"
       >
         <el-option
           label="正常"
@@ -271,6 +272,7 @@ export default {
           title: '充值操作'
         });
       }).then(() => {
+        debugger
         this.mixins_search();
       });
     },

+ 62 - 54
smart/src/views/vehicleInformation/setpPage/details.vue

@@ -147,7 +147,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="9">
-          <el-form-item label="充值规则">
+          <el-form-item
+            label="充值规则"
+            prop="ruleId"
+          >
             <el-select
               placeholder="请选择充值规则"
               clearable
@@ -180,64 +183,62 @@
           </el-form-item>
         </el-col> -->
       </el-row>
-      <div class="formContent-item_title">
-        <el-row>
-          <el-col :span="2">车位设置</el-col>
-          <el-col
-            :span="8"
-            style="margin-top: -5px;"
-          >
-            <!-- <el-select
-              placeholder="请选择停车场"
-              clearable
-              v-model="formDate.parkId"
-            >
-
-              <el-option
-                v-for="(item,index) in nameParkingLot"
-                :key="index"
-                :value="item.label"
-                :label="item.name"
-                @click.native="parkingLot(item.name)"
-              ></el-option>
-            </el-select> -->
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col-2>
-            <el-button
-              type="primary"
-              @click="addTime"
-            >新增</el-button>
-          </el-col-2>
-        </el-row>
+    </el-form>
 
+    <div class="formContent-item_title">
+      <el-row>
+        <el-col :span="2">车位设置</el-col>
+        <el-col
+          :span="8"
+          style="margin-top: -5px;"
+        >
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col-2>
+          <el-button
+            type="primary"
+            @click="addTime"
+          >新增</el-button>
+        </el-col-2>
+      </el-row>
+      <el-form
+        ref="tableData"
+        :rules="ruled"
+        :model="tableData"
+      >
         <el-table
           :data="tableData"
           border
           style="width: 100%"
           :cell-style="{'text-align':'center'}"
         >
-          <el-table-column
-            label="可停区域"
-            align="center"
-          >
-            <template slot-scope="scope">
-              <el-select
-                placeholder="请选择"
-                v-model="tableData[scope.$index].parkingArea"
-                @click.native="parking"
-              >
-                <el-option
-                  v-for="(item,index) in eloption"
-                  :key="index"
-                  :value='item.value'
-                  :label="item.label"
-                  @click.native="parked(item)"
-                ></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
+          <el-form-item prop="parkingArea">
+            <el-table-column
+              label="可停区域"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <el-form-item prop="parkingArea">
+                  <el-select
+                    placeholder="请选择"
+                    v-model="tableData[scope.$index].parkingArea"
+                    @click.native="parking"
+                  >
+                    <el-option
+                      v-for="(item,index) in eloption"
+                      :key="index"
+                      :value='item.value'
+                      :label="item.label"
+                      @click.native="parked(item)"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+          </el-form-item>
+
           <el-table-column
             label="占用车位"
             align="center"
@@ -282,9 +283,11 @@
 
           </el-table-column>
         </el-table>
+      </el-form>
 
-      </div>
+    </div>
 
+    <el-form>
       <div class="formContent-item_title">
         <el-row>
           <el-col :span="2">车位设置</el-col>
@@ -413,6 +416,8 @@
         </el-table>
       </div>
     </el-form>
+
+    <!-- </el-form> -->
   </div>
 </template>
 
@@ -443,7 +448,7 @@ export default {
         sort: '',
         areaName: '',
         idName: '',
-        res: ''
+        res: '',
       },
       tableData: [
         {
@@ -610,6 +615,9 @@ export default {
         carTypes: [
           { required: true, message: '请选择车牌类型', trigger: 'change' }
         ],
+        ruleId: [
+          { required: true, message: '请选择充值规则', trigger: 'change' }
+        ]
 
       },
 

+ 3 - 2
smart/src/views/vehicleInformation/setpPage/recharge.vue

@@ -324,6 +324,7 @@ export default {
           this.$message.success('成功');
         }
       })
+      this.params.callback();
       this.$emit('close');
     },
   },
@@ -350,8 +351,8 @@ export default {
 <style scoped>
 h3 {
     margin-bottom: 15px;
-    text-align: center !important;
-    font-size: 22px !important;
+    /* text-align: center !important; */
+    font-size: 16px !important;
 }
 .el-col {
     margin-top: 10px !important;