Pārlūkot izejas kodu

搜索选项调整

JXDS18FUJT 2 gadi atpakaļ
vecāks
revīzija
145364406e
2 mainītis faili ar 113 papildinājumiem un 89 dzēšanām
  1. 59 47
      src/views/price/manage/index.vue
  2. 54 42
      src/views/price/query/index.vue

+ 59 - 47
src/views/price/manage/index.vue

@@ -2,53 +2,65 @@
   <div class="app-container">
     <el-form :rules="queryRules" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"
       label-width="68px">
-      <el-form-item label="品牌" prop="brand">
-        <el-select v-model="queryParams.brand" placeholder="请选择品牌" clearable size="small"
-          @keyup.enter.native="handleQuery">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="控制器" prop="controllerPrice">
+            <el-select @clear="() => {
+              controllerPrice = 0
+            }" v-model="queryParams.controllerPrice" placeholder="请选择控制器" clearable size="small">
+              <el-option v-for="(item, index) in controllerList" @click.native="() => {
+                queryParams.controllerModel = item.controllerModel
+              }" :label="item.controllerModel" :value="item.controllerPrice" :key="index"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="品牌" prop="brand">
+            <el-select v-model="queryParams.brand" placeholder="请选择品牌" clearable size="small"
+              @keyup.enter.native="handleQuery">
+
+            </el-select>
+          </el-form-item>
+          <el-form-item label="频率" prop="rate">
+            <el-select v-model="queryParams.rate" placeholder="请选择频率" clearable size="small"
+              @keyup.enter.native="handleQuery">
+              <el-option v-for="(item, index) in searchOption[3]" :value="item" :key="index">{{ item }}</el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label-width="auto" label="机组功率(kw)区间" prop="unitPowerKwMin">
+            <el-input v-model.number="queryParams.unitPowerKwMin" placeholder="请选择机组功率(kw)" clearable size="small"
+              @keyup.enter.native="handleQuery">
+
+            </el-input>
+          </el-form-item>
+          <el-form-item label-width="auto" label="到" prop="unitPowerKwMax">
+            <el-input v-model.number="queryParams.unitPowerKwMax" placeholder="请选择机组功率(kw)" clearable size="small"
+              @keyup.enter.native="handleQuery">
+
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label-width="auto" label="机组功率(kva)区间" prop="unitPowerKvaMin">
+            <el-input v-model.number="queryParams.unitPowerKvaMin" placeholder="请选择机组功率(kva)" clearable size="small"
+              @keyup.enter.native="handleQuery">
+
+            </el-input>
+          </el-form-item>
+          <el-form-item label-width="auto" label="到" prop="unitPowerKvaMax">
+            <el-input v-model.number="queryParams.unitPowerKvaMax" placeholder="请选择机组功率(kva)" clearable size="small"
+              @keyup.enter.native="handleQuery">
+
+            </el-input>
+          </el-form-item></el-col>
+      </el-row>
 
-        </el-select>
-      </el-form-item>
-      <el-form-item label-width="auto" label="机组功率(kw)区间" prop="unitPowerKwMin">
-        <el-input v-model.number="queryParams.unitPowerKwMin" placeholder="请选择机组功率(kw)" clearable size="small"
-          @keyup.enter.native="handleQuery">
 
-        </el-input>
-      </el-form-item>
-      <el-form-item label-width="auto" label="到" prop="unitPowerKwMax">
-        <el-input v-model.number="queryParams.unitPowerKwMax" placeholder="请选择机组功率(kw)" clearable size="small"
-          @keyup.enter.native="handleQuery">
 
-        </el-input>
-      </el-form-item>
-      <el-form-item label-width="auto" label="机组功率(kva)区间" prop="unitPowerKvaMin">
-        <el-input v-model.number="queryParams.unitPowerKvaMin" placeholder="请选择机组功率(kva)" clearable size="small"
-          @keyup.enter.native="handleQuery">
 
-        </el-input>
-      </el-form-item>
-      <el-form-item label-width="auto" label="到" prop="unitPowerKvaMax">
-        <el-input v-model.number="queryParams.unitPowerKvaMax" placeholder="请选择机组功率(kva)" clearable size="small"
-          @keyup.enter.native="handleQuery">
 
-        </el-input>
-      </el-form-item>
 
-      <el-form-item label="频率" prop="rate">
-        <el-select v-model="queryParams.rate" placeholder="请选择频率" clearable size="small"
-          @keyup.enter.native="handleQuery">
-          <el-option v-for="(item, index) in searchOption[3]" :value="item" :key="index">{{ item }}</el-option>
-        </el-select>
-      </el-form-item>
 
-      <el-form-item label="控制器" prop="controllerPrice">
-        <el-select @clear="() => {
-          controllerPrice = 0
-        }" v-model="queryParams.controllerPrice" placeholder="请选择控制器" clearable size="small">
-          <el-option v-for="(item, index) in controllerList" @click.native="() => {
-            queryParams.controllerModel = item.controllerModel
-          }" :label="item.controllerModel" :value="item.controllerPrice" :key="index"></el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -90,7 +102,7 @@
     <el-table fit :row-style="{ height: '35px' }" v-loading="loading" :data="infoList"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="品牌" align="center" prop="brand" />
+      <el-table-column label="品牌" width="180px" align="center" prop="brand" />
       <el-table-column width="180px" label="机组型号" align="center" prop="unitModel" />
       <el-table-column label="机组功率(kw)" align="center" prop="unitPowerKw" />
       <el-table-column label="机组功率(kva)" align="center" prop="unitPowerKva" />
@@ -116,13 +128,13 @@
       <el-table-column label="ATS价格" align="center" prop="atsPrice" />
       <el-table-column label="电瓶型号" align="center" prop="batteryModel" />
       <el-table-column label="电瓶价格" align="center" prop="batteryPrice" />
-      <el-table-column v-if="controllerModel" label="控制器型号" align="center" prop="controllerModel">
+      <el-table-column label="控制器型号" align="center" prop="controllerModel">
         <template>
           {{ controllerModel }}
 
         </template>
       </el-table-column>
-      <el-table-column v-if="controllerPrice" label="控制器价格" align="center" prop="controllerPrice">
+      <el-table-column label="控制器价格" align="center" prop="controllerPrice">
         <template>
           {{ controllerPrice }}
 
@@ -438,7 +450,7 @@ export default {
   },
   created() {
     this.getControllerList()
-   
+
     this.getSearchOption()
   },
   methods: {
@@ -531,7 +543,7 @@ export default {
     handleQuery() {
       this.$refs['queryForm'].validate((valid) => {
         if (valid) {
-          this.controllerModel = this.queryParams.controllerModel||''
+          this.controllerModel = this.queryParams.controllerModel || ''
           this.controllerPrice = this.queryParams.controllerPrice || 0
           this.queryParams.pageNum = 1;
           this.getList();
@@ -546,10 +558,10 @@ export default {
     resetQuery() {
       this.controllerPrice = 0
       this.controllerModel = ''
-      
+
       this.resetForm("queryForm");
       this.handleQuery();
-     
+
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

+ 54 - 42
src/views/price/query/index.vue

@@ -2,53 +2,65 @@
   <div class="app-container">
     <el-form :rules="queryRules" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"
       label-width="68px">
-      <el-form-item label="品牌" prop="brand">
-        <el-select v-model="queryParams.brand" placeholder="请选择品牌" clearable size="small"
-          @keyup.enter.native="handleQuery">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="控制器" prop="controllerPrice">
+            <el-select @clear="() => {
+              controllerPrice = 0
+            }" v-model="queryParams.controllerPrice" placeholder="请选择控制器" clearable size="small">
+              <el-option v-for="(item, index) in controllerList" @click.native="() => {
+                queryParams.controllerModel = item.controllerModel
+              }" :label="item.controllerModel" :value="item.controllerPrice" :key="index"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="品牌" prop="brand">
+            <el-select v-model="queryParams.brand" placeholder="请选择品牌" clearable size="small"
+              @keyup.enter.native="handleQuery">
+
+            </el-select>
+          </el-form-item>
+          <el-form-item label="频率" prop="rate">
+            <el-select v-model="queryParams.rate" placeholder="请选择频率" clearable size="small"
+              @keyup.enter.native="handleQuery">
+              <el-option v-for="(item, index) in searchOption[3]" :value="item" :key="index">{{ item }}</el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label-width="auto" label="机组功率(kw)区间" prop="unitPowerKwMin">
+            <el-input v-model.number="queryParams.unitPowerKwMin" placeholder="请选择机组功率(kw)" clearable size="small"
+              @keyup.enter.native="handleQuery">
+
+            </el-input>
+          </el-form-item>
+          <el-form-item label-width="auto" label="到" prop="unitPowerKwMax">
+            <el-input v-model.number="queryParams.unitPowerKwMax" placeholder="请选择机组功率(kw)" clearable size="small"
+              @keyup.enter.native="handleQuery">
+
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label-width="auto" label="机组功率(kva)区间" prop="unitPowerKvaMin">
+            <el-input v-model.number="queryParams.unitPowerKvaMin" placeholder="请选择机组功率(kva)" clearable size="small"
+              @keyup.enter.native="handleQuery">
+
+            </el-input>
+          </el-form-item>
+          <el-form-item label-width="auto" label="到" prop="unitPowerKvaMax">
+            <el-input v-model.number="queryParams.unitPowerKvaMax" placeholder="请选择机组功率(kva)" clearable size="small"
+              @keyup.enter.native="handleQuery">
+
+            </el-input>
+          </el-form-item></el-col>
+      </el-row>
 
-        </el-select>
-      </el-form-item>
-      <el-form-item label-width="auto" label="机组功率(kw)区间" prop="unitPowerKwMin">
-        <el-input v-model.number="queryParams.unitPowerKwMin" placeholder="请选择机组功率(kw)" clearable size="small"
-          @keyup.enter.native="handleQuery">
 
-        </el-input>
-      </el-form-item>
-      <el-form-item label-width="auto" label="到" prop="unitPowerKwMax">
-        <el-input v-model.number="queryParams.unitPowerKwMax" placeholder="请选择机组功率(kw)" clearable size="small"
-          @keyup.enter.native="handleQuery">
 
-        </el-input>
-      </el-form-item>
-      <el-form-item label-width="auto" label="机组功率(kva)区间" prop="unitPowerKvaMin">
-        <el-input v-model.number="queryParams.unitPowerKvaMin" placeholder="请选择机组功率(kva)" clearable size="small"
-          @keyup.enter.native="handleQuery">
 
-        </el-input>
-      </el-form-item>
-      <el-form-item label-width="auto" label="到" prop="unitPowerKvaMax">
-        <el-input v-model.number="queryParams.unitPowerKvaMax" placeholder="请选择机组功率(kva)" clearable size="small"
-          @keyup.enter.native="handleQuery">
 
-        </el-input>
-      </el-form-item>
 
-      <el-form-item label="频率" prop="rate">
-        <el-select v-model="queryParams.rate" placeholder="请选择频率" clearable size="small"
-          @keyup.enter.native="handleQuery">
-          <el-option v-for="(item, index) in searchOption[3]" :value="item" :key="index">{{ item }}</el-option>
-        </el-select>
-      </el-form-item>
 
-      <el-form-item label="控制器" prop="controllerPrice">
-        <el-select @clear="() => {
-          controllerPrice = 0
-        }" v-model="queryParams.controllerPrice" placeholder="请选择控制器" clearable size="small">
-          <el-option v-for="(item, index) in controllerList" @click.native="() => {
-            queryParams.controllerModel = item.controllerModel
-          }" :label="item.controllerModel" :value="item.controllerPrice" :key="index"></el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -78,7 +90,7 @@
     <el-table fit :row-style="{ height: '35px' }" v-loading="loading" :data="infoList"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="品牌" align="center" prop="brand" />
+      <el-table-column label="品牌" width="180px" align="center" prop="brand" />
       <el-table-column width="180px" label="机组型号" align="center" prop="unitModel" />
       <el-table-column label="机组功率(kw)" align="center" prop="unitPowerKw" />
       <el-table-column label="机组功率(kva)" align="center" prop="unitPowerKva" />
@@ -109,7 +121,7 @@
       <!-- <el-table-column label="ATS价格" align="center" prop="atsPrice" /> -->
       <el-table-column label="电瓶型号" align="center" prop="batteryModel" />
       <!-- <el-table-column label="电瓶价格" align="center" prop="batteryPrice" /> -->
-      <el-table-column v-if="controllerModel" label="控制器型号" align="center" prop="controllerModel">
+      <el-table-column  label="控制器型号" align="center" prop="controllerModel">
         <template>
           {{ controllerModel }}