瀏覽代碼

修改了搜索选项,新增频率和最大最小频率

JXDS18FUJT 2 年之前
父節點
當前提交
8e251bcfba
共有 2 個文件被更改,包括 76 次插入21 次删除
  1. 41 13
      src/views/price/manage/index.vue
  2. 35 8
      src/views/price/query/index.vue

+ 41 - 13
src/views/price/manage/index.vue

@@ -7,19 +7,37 @@
           <el-option v-for="(item, index) in searchOption[0]" :value="item" :key="index">{{ item }}</el-option>
         </el-select>
       </el-form-item>
-
-      <el-form-item label="机组功率(kw)" prop="unitPowerKw">
-        <el-select v-model="queryParams.unitPowerKw" placeholder="请输入机组功率(kw)" clearable size="small"
+      <el-form-item label-width="auto" label="最小机组功率(kw)" prop="unitPowerKwMin">
+        <el-select v-model="queryParams.unitPowerKwMin" placeholder="请输入机组功率(kw)" clearable size="small"
+          @keyup.enter.native="handleQuery">
+          <el-option v-for="(item, index) in searchOption[1]" :value="item" :key="index">{{ item }}</el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label-width="auto" label="最大机组功率(kw)" prop="unitPowerKwMax">
+        <el-select v-model="queryParams.unitPowerKwMax" placeholder="请输入机组功率(kw)" clearable size="small"
           @keyup.enter.native="handleQuery">
           <el-option v-for="(item, index) in searchOption[1]" :value="item" :key="index">{{ item }}</el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="机组功率(kva)" prop="unitPowerKva">
-        <el-select v-model="queryParams.unitPowerKva" placeholder="请输入机组功率(kva)" clearable size="small"
+      <el-form-item label-width="auto"  label="最小机组功率(kva)" prop="unitPowerKvaMin">
+        <el-select v-model="queryParams.unitPowerKvaMin" placeholder="请输入机组功率(kva)" clearable size="small"
           @keyup.enter.native="handleQuery">
           <el-option v-for="(item, index) in searchOption[2]" :value="item" :key="index">{{ item }}</el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label-width="auto" label="最大机组功率(kva)" prop="unitPowerKvaMax">
+        <el-select v-model="queryParams.unitPowerKvaMax" placeholder="请输入机组功率(kva)" clearable size="small"
+          @keyup.enter.native="handleQuery">
+          <el-option v-for="(item, index) in searchOption[2]" :value="item" :key="index">{{ item }}</el-option>
+        </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-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>
@@ -44,9 +62,10 @@
           v-hasPermi="['price:info:export']">导出</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-upload v-hasPermi="['price:info:import']" :show-file-list="false" class="upload-demo" with-credentials :headers="{
-          'Authorization': 'Bearer ' + token
-        }" action="http://xxgl.zzxcx.net/xxgl-admin/price/info/import" :on-success="handleSuccess" multiple
+        <el-upload v-hasPermi="['price:info:import']" :show-file-list="false" class="upload-demo" with-credentials
+          :headers="{
+            'Authorization': 'Bearer ' + token
+          }" action="http://xxgl.zzxcx.net/xxgl-admin/price/info/import" :on-success="handleSuccess" multiple
           accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
           :file-list="fileList">
           <el-button type="warning" icon="el-icon-bottom" size="mini" v-hasPermi="['price:info:export']">导入</el-button>
@@ -57,7 +76,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table fit :row-style="{ height: '35px' }"  v-loading="loading" :data="infoList"
+    <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" />
@@ -97,7 +116,7 @@
           <el-button @click="() => {
             $router.push('/gallery?id=' + scope.row.id)
           
-          }" size="mini" type="text" icon="el-icon-picture-outline" >图片</el-button>
+          }" size="mini" type="text" icon="el-icon-picture-outline">图片</el-button>
 
 
 
@@ -220,7 +239,7 @@ export default {
       token: getToken(),
       fileList: [],
       //搜索下拉选项
-      searchOption: [[], [], []],
+      searchOption: [[], [], [], []],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -245,8 +264,13 @@ export default {
         pageSize: 10,
         brand: null,
         unitModel: null,
-        unitPowerKw: null,
-        unitPowerKva: null,
+        unitPowerKwMax: null,
+        unitPowerKwMin: null,
+
+
+        unitPowerKvaMax: null,
+        unitPowerKvaMin: null,
+
         rate: null,
         dieselEngineModel: null,
         speed: null,
@@ -305,6 +329,10 @@ export default {
         this.$set(this.searchOption, 2, response.data);
 
       })
+      getFieldName('rate').then(response => {
+        this.$set(this.searchOption, 3, response.data);
+
+      })
 
     },
     /** 查询报价列表 */

+ 35 - 8
src/views/price/query/index.vue

@@ -7,19 +7,37 @@
           <el-option v-for="(item, index) in searchOption[0]" :value="item" :key="index">{{ item }}</el-option>
         </el-select>
       </el-form-item>
-
-      <el-form-item label="机组功率(kw)" prop="unitPowerKw">
-        <el-select v-model="queryParams.unitPowerKw" placeholder="请输入机组功率(kw)" clearable size="small"
+      <el-form-item label-width="auto" label="最小机组功率(kw)" prop="unitPowerKwMin">
+        <el-select v-model="queryParams.unitPowerKwMin" placeholder="请输入机组功率(kw)" clearable size="small"
+          @keyup.enter.native="handleQuery">
+          <el-option v-for="(item, index) in searchOption[1]" :value="item" :key="index">{{ item }}</el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label-width="auto" label="最大机组功率(kw)" prop="unitPowerKwMax">
+        <el-select v-model="queryParams.unitPowerKwMax" placeholder="请输入机组功率(kw)" clearable size="small"
           @keyup.enter.native="handleQuery">
           <el-option v-for="(item, index) in searchOption[1]" :value="item" :key="index">{{ item }}</el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="机组功率(kva)" prop="unitPowerKva">
-        <el-select v-model="queryParams.unitPowerKva" placeholder="请输入机组功率(kva)" clearable size="small"
+      <el-form-item label-width="auto"  label="最小机组功率(kva)" prop="unitPowerKvaMin">
+        <el-select v-model="queryParams.unitPowerKvaMin" placeholder="请输入机组功率(kva)" clearable size="small"
           @keyup.enter.native="handleQuery">
           <el-option v-for="(item, index) in searchOption[2]" :value="item" :key="index">{{ item }}</el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label-width="auto" label="最大机组功率(kva)" prop="unitPowerKvaMax">
+        <el-select v-model="queryParams.unitPowerKvaMax" placeholder="请输入机组功率(kva)" clearable size="small"
+          @keyup.enter.native="handleQuery">
+          <el-option v-for="(item, index) in searchOption[2]" :value="item" :key="index">{{ item }}</el-option>
+        </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-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>
@@ -208,7 +226,7 @@ export default {
   data() {
     return {
       //搜索下拉选项
-      searchOption: [[], [], []],
+      searchOption: [[], [], [],[]],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -233,8 +251,13 @@ export default {
         pageSize: 10,
         brand: null,
         unitModel: null,
-        unitPowerKw: null,
-        unitPowerKva: null,
+        unitPowerKwMax: null,
+        unitPowerKwMin: null,
+
+
+        unitPowerKvaMax: null,
+        unitPowerKvaMin: null,
+
         rate: null,
         dieselEngineModel: null,
         speed: null,
@@ -289,6 +312,10 @@ export default {
         this.$set(this.searchOption, 2, response.data);
 
       })
+      getFieldName('rate').then(response => {
+        this.$set(this.searchOption, 3, response.data);
+
+      })
 
     },
     /** 查询报价列表 */