JXDS18FUJT 2 жил өмнө
parent
commit
cfcd79997e

+ 8 - 0
src/api/price/engine.js

@@ -50,4 +50,12 @@ export function exportInfo(query) {
     method: 'get',
     params: query
   })
+}
+
+//查询枚举值
+export function getFieldName(name){
+  return request({
+    url: `/engine/info/field/${name}`,
+    method: 'get'
+  })
 }

+ 0 - 1
src/assets/icons/svg/table.svg

@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M.006.064h127.988v31.104H.006V.064zm0 38.016h38.396v41.472H.006V38.08zm0 48.384h38.396v41.472H.006V86.464zM44.802 38.08h38.396v41.472H44.802V38.08zm0 48.384h38.396v41.472H44.802V86.464zM89.598 38.08h38.396v41.472H89.598zm0 48.384h38.396v41.472H89.598z"/><path d="M.006.064h127.988v31.104H.006V.064zm0 38.016h38.396v41.472H.006V38.08zm0 48.384h38.396v41.472H.006V86.464zM44.802 38.08h38.396v41.472H44.802V38.08zm0 48.384h38.396v41.472H44.802V86.464zM89.598 38.08h38.396v41.472H89.598zm0 48.384h38.396v41.472H89.598z"/></svg>

+ 0 - 1
src/assets/icons/svg/textarea.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575802855098" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2984" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M896 160H128c-35.2 0-64 28.8-64 64v576c0 35.2 28.8 64 64 64h768c35.2 0 64-28.8 64-64V224c0-35.2-28.8-64-64-64z m0 608c0 16-12.8 32-32 32H160c-19.2 0-32-12.8-32-32V256c0-16 12.8-32 32-32h704c19.2 0 32 12.8 32 32v512z" p-id="2985"></path><path d="M224 288c-19.2 0-32 12.8-32 32v256c0 16 12.8 32 32 32s32-12.8 32-32V320c0-16-12.8-32-32-32z m608 480c19.2 0 32-12.8 32-32V608L704 768h128z" p-id="2986"></path></svg>

+ 0 - 1
src/assets/icons/svg/theme.svg

@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M125.5 36.984L95.336 2.83C93.735 1.018 91.565 0 89.3 0c-2.263 0-4.433 1.018-6.033 2.83l-3.786 4.286c-1.6 1.812-3.77 2.83-6.032 2.831H54.553c-2.263 0-4.434-1.018-6.033-2.83L44.734 2.83C43.134 1.018 40.964 0 38.701 0c-2.263 0-4.434 1.018-6.034 2.83L2.5 36.984C.9 38.796 0 41.254 0 43.815c0 2.562.899 5.02 2.5 6.831L14.565 64.31c2.178 2.468 5.367 3.403 8.33 2.444 1.35-.435 2.709.592 2.709 2.18v49.407c0 5.313 3.84 9.66 8.532 9.66h59.726c4.693 0 8.532-4.347 8.532-9.66V68.934c0-1.59 1.36-2.616 2.71-2.181 2.962.96 6.15.024 8.329-2.444L125.5 50.646c1.6-1.811 2.499-4.269 2.499-6.83 0-2.563-.899-5.02-2.5-6.832z"/></svg>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
src/assets/icons/svg/time-range.svg


+ 0 - 1
src/assets/icons/svg/time.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577099827399" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1008" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M520 559h204c17.673 0 32 14.327 32 32 0 17.673-14.327 32-32 32H488c-17.673 0-32-14.327-32-32 0-0.167 0.001-0.334 0.004-0.5a32.65 32.65 0 0 1-0.004-0.5V277c0-17.673 14.327-32 32-32 17.673 0 32 14.327 32 32v282z m-8 401C264.576 960 64 759.424 64 512S264.576 64 512 64s448 200.576 448 448-200.576 448-448 448z m0-64c212.077 0 384-171.923 384-384S724.077 128 512 128 128 299.923 128 512s171.923 384 384 384z" p-id="1009"></path></svg>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
src/assets/icons/svg/tool.svg


+ 0 - 1
src/assets/icons/svg/tree-table.svg

@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M44.8 0h79.543C126.78 0 128 1.422 128 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H44.8c-2.438 0-3.657-1.422-3.657-4.267V4.267C41.143 1.422 42.362 0 44.8 0zm22.857 48h56.686c2.438 0 3.657 1.422 3.657 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H67.657C65.22 80 64 78.578 64 75.733V52.267C64 49.422 65.219 48 67.657 48zm0 48h56.686c2.438 0 3.657 1.422 3.657 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H67.657C65.22 128 64 126.578 64 123.733v-23.466C64 97.422 65.219 96 67.657 96zM50.286 68.267c2.02 0 3.657-1.91 3.657-4.267 0-2.356-1.638-4.267-3.657-4.267H17.37V32h6.4c2.02 0 3.658-1.91 3.658-4.267V4.267C27.429 1.91 25.79 0 23.77 0H3.657C1.637 0 0 1.91 0 4.267v23.466C0 30.09 1.637 32 3.657 32h6.4v80c0 2.356 1.638 4.267 3.657 4.267h36.572c2.02 0 3.657-1.91 3.657-4.267 0-2.356-1.638-4.267-3.657-4.267H17.37V68.267h32.915z"/></svg>

+ 0 - 1
src/assets/icons/svg/tree.svg

@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M126.713 90.023c.858.985 1.287 2.134 1.287 3.447v29.553c0 1.423-.429 2.6-1.287 3.53-.858.93-1.907 1.395-3.146 1.395H97.824c-1.145 0-2.146-.465-3.004-1.395-.858-.93-1.287-2.107-1.287-3.53V93.47c0-.875.19-1.696.572-2.462.382-.766.906-1.368 1.573-1.806a3.84 3.84 0 0 1 2.146-.657h9.725V69.007a3.84 3.84 0 0 0-.43-1.806 3.569 3.569 0 0 0-1.143-1.313 2.714 2.714 0 0 0-1.573-.492h-36.47v23.149h9.725c1.144 0 2.145.492 3.004 1.478.858.985 1.287 2.134 1.287 3.447v29.553c0 .876-.191 1.696-.573 2.463-.38.766-.905 1.368-1.573 1.806a3.84 3.84 0 0 1-2.145.656H51.915a3.84 3.84 0 0 1-2.145-.656c-.668-.438-1.216-1.04-1.645-1.806a4.96 4.96 0 0 1-.644-2.463V93.47c0-1.313.43-2.462 1.288-3.447.858-.986 1.907-1.478 3.146-1.478h9.582v-23.15h-37.9c-.953 0-1.74.356-2.359 1.068-.62.711-.93 1.56-.93 2.544v19.538h9.726c1.239 0 2.264.492 3.074 1.478.81.985 1.216 2.134 1.216 3.447v29.553c0 1.423-.405 2.6-1.216 3.53-.81.93-1.835 1.395-3.074 1.395H4.29c-.476 0-.93-.082-1.358-.246a4.1 4.1 0 0 1-1.144-.657 4.658 4.658 0 0 1-.93-1.067 5.186 5.186 0 0 1-.643-1.395 5.566 5.566 0 0 1-.215-1.56V93.47c0-.437.048-.875.143-1.313a3.95 3.95 0 0 1 .429-1.15c.19-.328.429-.656.715-.984.286-.329.572-.602.858-.821.286-.22.62-.383 1.001-.493.382-.11.763-.164 1.144-.164h9.726V61.619c0-.985.31-1.833.93-2.544.619-.712 1.358-1.068 2.216-1.068h44.335V39.62h-9.582c-1.24 0-2.288-.492-3.146-1.477a5.09 5.09 0 0 1-1.287-3.448V5.14c0-1.423.429-2.627 1.287-3.612.858-.985 1.907-1.477 3.146-1.477h25.743c.763 0 1.478.246 2.145.739a5.17 5.17 0 0 1 1.573 1.888c.382.766.573 1.587.573 2.462v29.553c0 1.313-.43 2.463-1.287 3.448-.859.985-1.86 1.477-3.004 1.477h-9.725v18.389h42.762c.954 0 1.74.355 2.36 1.067.62.711.93 1.56.93 2.545v26.925h9.582c1.239 0 2.288.492 3.146 1.478z"/></svg>

+ 0 - 1
src/assets/icons/svg/upload.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577540289643" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7922" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M530.944 458.24l4.8 3.456 122.176 106.816a32 32 0 0 1-37.44 51.584l-4.672-3.392L546.56 556.16v280.704a32 32 0 0 1-26.24 31.488l-5.76 0.512a32 32 0 0 1-31.424-26.24l-0.512-5.76-0.064-280.704-69.12 60.48a32 32 0 0 1-40.96 0.896l-4.16-3.968a32 32 0 0 1-0.96-40.96l4.032-4.16 122.176-106.816a32 32 0 0 1 37.312-3.456zM497.92 128c128.128 0 239.168 82.304 275.52 199.04 123.968 11.264 221.312 113.088 221.312 237.44 0 128.128-103.68 232.96-234.88 238.272h-5.888l-35.52 0.192a32 32 0 0 1-0.192-64l35.264-0.128 4.672-0.064c96.384-3.84 172.544-80.896 172.544-174.272 0-96.128-80.512-174.464-179.584-174.464h-1.984a32 32 0 0 1-32-25.28C695.872 264.96 604.736 192 497.92 192 381.824 192 285.44 277.76 274.816 388.48a32 32 0 0 1-28.352 28.8c-83.968 9.152-147.84 78.208-147.84 159.552l0.192 7.936c3.84 85.76 77.056 154.112 166.592 154.112h45.632a32 32 0 0 1 0 64h-45.632C142.016 802.944 40.32 708.032 34.88 586.88l-0.192-9.28c0-106.88 76.352-197.184 179.968-219.904C239.488 226.112 357.76 128 497.856 128z" p-id="7923"></path></svg>

+ 0 - 1
src/assets/icons/svg/user.svg

@@ -1 +0,0 @@
-<svg width="130" height="130" xmlns="http://www.w3.org/2000/svg"><path d="M63.444 64.996c20.633 0 37.359-14.308 37.359-31.953 0-17.649-16.726-31.952-37.359-31.952-20.631 0-37.36 14.303-37.358 31.952 0 17.645 16.727 31.953 37.359 31.953zM80.57 75.65H49.434c-26.652 0-48.26 18.477-48.26 41.27v2.664c0 9.316 21.608 9.325 48.26 9.325H80.57c26.649 0 48.256-.344 48.256-9.325v-2.663c0-22.794-21.605-41.271-48.256-41.271z" stroke="#979797"/></svg>

+ 0 - 1
src/assets/icons/svg/validCode.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569580729849" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1939" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M513.3 958.5c-142.2 0-397.9-222.1-401.6-440.5V268c1.7-39.6 31.7-72.3 71.1-77.3 49-4.6 97.1-16.5 142.7-35.3 47.8-14 91.9-38.3 129.4-71.1 30.3-24.4 72.9-26.3 105.3-4.6 39.9 30.7 83.8 55.9 130.5 74.6 48.6 14.7 98.2 25.9 148.4 33.7 38.5 7.6 67.1 40.3 69.5 79.5 3.3 84.9 2.5 169.9-2.6 254.7-33.7 281.6-253.7 436.4-392.7 436.3z m-0.1-813.7c-7.2-0.2-14.3 2-20 6.4-39.7 35.2-86.8 61.1-137.7 75.7-46.8 19.2-96.2 31-146.6 35.2-11 3.2-18.8 13-19.5 24.4v230.1c3.5 180.3 223.3 361 323.9 361s287.3-120.2 317.6-360.5c7.3-142.7 0-228.6 0-229.6-1.3-13.3-11-24.3-24-27.3-49.6-7.7-98.6-19-146.5-33.7-46.3-19.5-89.7-45.3-129-76.7-5.8-3.8-12.7-5.5-19.5-4.9l1.3-0.1z" fill="#C6CCDA" p-id="1940"></path><path d="M750.1 428L490.7 673.2c-11.7 11.1-29.5 12.9-43.1 4.2l-6.8-5.8-141.2-149.4c-9.3-9.3-12.7-22.9-9-35.5 3.8-12.6 14.1-22.1 27-24.8 12.9-2.7 26.1 1.9 34.6 11.9L469 597.5l233.7-221c14.6-12.8 36.8-11.6 49.9 2.7 13.2 14.2 11.5 35.3-2.5 48.8" fill="#C6CCDA" p-id="1941"></path></svg>

+ 0 - 1
src/assets/icons/svg/wechat.svg

@@ -1 +0,0 @@
-<svg width="128" height="110" xmlns="http://www.w3.org/2000/svg"><path d="M86.635 33.334c1.467 0 2.917.113 4.358.283C87.078 14.392 67.58.111 45.321.111 20.44.111.055 17.987.055 40.687c0 13.104 6.781 23.863 18.115 32.209l-4.527 14.352 15.82-8.364c5.666 1.182 10.207 2.395 15.858 2.395 1.42 0 2.829-.073 4.227-.189-.886-3.19-1.398-6.53-1.398-9.996 0-20.845 16.98-37.76 38.485-37.76zm-24.34-12.936c3.407 0 5.665 2.363 5.665 5.954 0 3.576-2.258 5.97-5.666 5.97-3.392 0-6.795-2.395-6.795-5.97 0-3.591 3.403-5.954 6.795-5.954zM30.616 32.323c-3.393 0-6.818-2.395-6.818-5.971 0-3.591 3.425-5.954 6.818-5.954 3.392 0 5.65 2.363 5.65 5.954 0 3.576-2.258 5.97-5.65 5.97z"/><path d="M127.945 70.52c0-19.075-18.108-34.623-38.448-34.623-21.537 0-38.5 15.548-38.5 34.623 0 19.108 16.963 34.622 38.5 34.622 4.508 0 9.058-1.2 13.584-2.395l12.414 7.167-3.404-11.923c9.087-7.184 15.854-16.712 15.854-27.471zm-50.928-5.97c-2.254 0-4.53-2.362-4.53-4.773 0-2.378 2.276-4.771 4.53-4.771 3.422 0 5.665 2.393 5.665 4.771 0 2.41-2.243 4.773-5.665 4.773zm24.897 0c-2.24 0-4.498-2.362-4.498-4.773 0-2.378 2.258-4.771 4.498-4.771 3.392 0 5.665 2.393 5.665 4.771 0 2.41-2.273 4.773-5.665 4.773z"/></svg>

+ 0 - 1
src/assets/icons/svg/zip.svg

@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.527 116.793c.178.008.348.024.527.024h40.233c4.711-.005 8.53-3.677 8.534-8.21V18.895c-.004-4.532-3.823-8.204-8.534-8.209H79.054c-.179 0-.353.016-.527.024V0L0 10.082v107.406l78.527 10.342v-11.037zm0-101.362c.174-.024.348-.052.527-.052h40.233c2.018 0 3.659 1.578 3.659 3.52v89.713c-.003 1.942-1.64 3.517-3.659 3.519H79.054c-.179 0-.353-.028-.527-.052V15.431zM30.262 75.757l-18.721-.46V72.37l11.3-16.673v-.148l-10.266.164v-4.51l17.504-.44v3.264L18.696 70.76v.144l11.566.176v4.678zm9.419.231l-5.823-.144V50.671l5.823-.144v25.461zm22.255-11.632c-2.168 1.922-5.353 2.76-9.02 2.736-.702.004-1.402-.04-2.097-.131v9.303l-5.997-.148V50.743c1.852-.352 4.473-.647 8.218-.743 3.838-.096 6.608.539 8.48 1.913 1.807 1.306 3.032 3.5 3.032 6.112s-.926 4.833-2.612 6.331h-.004zM53.36 54.45c-.856-.01-1.71.083-2.541.275v7.682c.523.116 1.167.152 2.06.152 3.301-.004 5.36-1.614 5.36-4.314 0-2.425-1.772-3.843-4.875-3.791l-.004-.004zm39.847-37.066h9.564v3.795h-9.564v-3.795zm-9.568 5.68h9.564v3.8h-9.564v-3.8zm9.568 6.216h9.564v3.799h-9.564V29.28zm0 12h9.564v3.794h-9.564V41.28zm-9.568-6.096h9.564v3.795h-9.564v-3.795zm9.472 47.064c2.512 0 4.921-.96 6.697-2.67 1.776-1.708 2.773-4.026 2.772-6.442l-1.748-15.263c0-5.033-2.492-9.112-7.725-9.112-5.232 0-7.72 4.079-7.72 9.112l-1.752 15.263c-.001 2.417.996 4.735 2.773 6.444 1.777 1.71 4.187 2.669 6.7 2.668h.003zm-3.135-16.75h6.27v12.743h-6.27V65.5z"/></svg>

+ 1 - 18
src/views/price/controller/index.vue

@@ -1,23 +1,6 @@
 <template>
     <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="品牌" prop="brand">
-                <el-input v-model="queryParams.brand" placeholder="请输入品牌" clearable size="small"
-                    @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item label="控制器型号" prop="controllerModel">
-                <el-input v-model="queryParams.controllerModel" placeholder="请输入控制器型号" clearable size="small"
-                    @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item label="控制器价格" prop="controllerPrice">
-                <el-input v-model="queryParams.controllerPrice" placeholder="请输入控制器价格" clearable size="small"
-                    @keyup.enter.native="handleQuery" />
-            </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>
-            </el-form-item>
-        </el-form>
+
 
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">

+ 494 - 528
src/views/price/engine/index.vue

@@ -1,580 +1,546 @@
 <template>
-    <div class="app-container">
-      <el-form :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"
-          >
+  <div class="app-container">
+    <el-form :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-option v-for="(item, index) in searchOption[0]" :key="index" :value="item" :label="item"></el-option>
         </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="型号" prop="model">
+        <el-input
+          v-model="queryParams.model"
+          placeholder="请输入型号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="发动机主要功率(1500RPM  50HZ)" prop="enginePowerMajor1500rpm">
+        <el-input
+          v-model="queryParams.enginePowerMajor1500rpm"
+          placeholder="请输入发动机主要功率(1500RPM  50HZ)"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="发动机备用功率(1500RPM  50HZ)" prop="enginePowerMinor1500rpm">
+        <el-input
+          v-model="queryParams.enginePowerMinor1500rpm"
+          placeholder="请输入发动机备用功率(1500RPM  50HZ)"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="推荐机组主要功率(1500RPM  50HZ)" prop="unitPowerMajor1500rpm">
+        <el-input
+          v-model="queryParams.unitPowerMajor1500rpm"
+          placeholder="请输入推荐机组主要功率(1500RPM  50HZ)"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="推荐机组备用功率(1500RPM  50HZ)" prop="unitPowerMinor1500rpm">
+        <el-input
+          v-model="queryParams.unitPowerMinor1500rpm"
+          placeholder="请输入推荐机组备用功率(1500RPM  50HZ)"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="发动机主要功率(1800RPM  60HZ)" prop="enginePowerMajor1800rpm">
+        <el-input
+          v-model="queryParams.enginePowerMajor1800rpm"
+          placeholder="请输入发动机主要功率(1800RPM  60HZ)"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="发动机备用功率(1800RPM  60HZ)" prop="enginePowerMinor1800rpm">
+        <el-input
+          v-model="queryParams.enginePowerMinor1800rpm"
+          placeholder="请输入发动机备用功率(1800RPM  60HZ)"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="推荐机组主要功率(1800RPM  60HZ)" prop="unitPowerMajor1800rpm">
+        <el-input
+          v-model="queryParams.unitPowerMajor1800rpm"
+          placeholder="请输入推荐机组主要功率(1800RPM  60HZ)"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="推荐机组备用功率(1800RPM  60HZ)" prop="unitPowerMinor1800rpm">
+        <el-input
+          v-model="queryParams.unitPowerMinor1800rpm"
+          placeholder="请输入推荐机组备用功率(1800RPM  60HZ)"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="油泵形式" prop="oilForm">
+        <el-input
+          v-model="queryParams.oilForm"
+          placeholder="请输入油泵形式"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="进气方式" prop="airIntakeMode">
+        <el-input
+          v-model="queryParams.airIntakeMode"
+          placeholder="请输入进气方式"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="电压" prop="voltage">
+        <el-input
+          v-model="queryParams.voltage"
+          placeholder="请输入电压"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="排量 " prop="displacement">
+        <el-input
+          v-model="queryParams.displacement"
+          placeholder="请输入排量 "
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="油耗" prop="oilConsumption">
+        <el-input
+          v-model="queryParams.oilConsumption"
+          placeholder="请输入油耗"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="水箱重量(Kg)" prop="tankWeight">
+        <el-input
+          v-model="queryParams.tankWeight"
+          placeholder="请输入水箱重量(Kg)"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="动力尺寸L*W*H(mm)" prop="powerSize">
+        <el-input
+          v-model="queryParams.powerSize"
+          placeholder="请输入动力尺寸L*W*H(mm)"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="水箱尺寸L*W*H(mm)" prop="tankSize">
+        <el-input
+          v-model="queryParams.tankSize"
+          placeholder="请输入水箱尺寸L*W*H(mm)"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="排放标准" prop="
+emissionStandard">
+        <el-input
+          v-model="queryParams.emissionStandard"
+          placeholder="请输入排放标准"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="配置说明" prop="configurationDescription">
+        <el-input
+          v-model="queryParams.configurationDescription"
+          placeholder="请输入配置说明"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="价格" prop="price">
+        <el-input
+          v-model="queryParams.price"
+          placeholder="请输入价格"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="水箱价格" prop="tankPrice">
+        <el-input
+          v-model="queryParams.tankPrice"
+          placeholder="请输入水箱价格"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single"
+          @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple"
+          @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+
+      <el-table-column label="动力品牌" width="180px" align="center" prop="brand" />
+      <el-table-column label="型号" align="center" prop="model" />
+      <el-table-column label="发动机主要功率(1500RPM  50HZ)" align="center" prop="enginePowerMajor1500rpm" />
+      <el-table-column label="发动机备用功率(1500RPM  50HZ)" align="center" prop="enginePowerMinor1500rpm" />
+      <el-table-column label="推荐机组主要功率(1500RPM  50HZ)" align="center" prop="unitPowerMajor1500rpm" />
+      <el-table-column label="推荐机组备用功率(1500RPM  50HZ)" align="center" prop="unitPowerMinor1500rpm" />
+      <el-table-column label="发动机主要功率(1800RPM  60HZ)" align="center" prop="enginePowerMajor1800rpm" />
+      <el-table-column label="发动机备用功率(1800RPM  60HZ)" align="center" prop="enginePowerMinor1800rpm" />
+      <el-table-column label="推荐机组主要功率(1800RPM  60HZ)" align="center" prop="unitPowerMajor1800rpm" />
+      <el-table-column label="推荐机组备用功率(1800RPM  60HZ)" align="center" prop="unitPowerMinor1800rpm" />
+      <el-table-column label="油泵形式" align="center" prop="oilForm" />
+      <el-table-column label="进气方式" align="center" prop="airIntakeMode" />
+      <el-table-column label="电压" align="center" prop="voltage" />
+      <el-table-column label="排量 " align="center" prop="displacement" />
+      <el-table-column label="油耗" align="center" prop="oilConsumption" />
+      <el-table-column label="水箱重量(Kg)" align="center" prop="tankWeight" />
+      <el-table-column label="动力尺寸L*W*H(mm)" align="center" prop="powerSize" />
+      <el-table-column label="水箱尺寸L*W*H(mm)" align="center" prop="tankSize" />
+      <el-table-column label="排放标准" align="center" prop="emissionStandard" />
+      <el-table-column label="配置说明" align="center" prop="configurationDescription" />
+      <el-table-column label="价格" align="center" prop="price" />
+      <el-table-column label="水箱价格" align="center" prop="tankPrice" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+          <el-button @click="() => {
+            $router.push('/gallery?id=' + scope.row.id + '&type=2')
+          
+          }" size="mini" type="text" icon="el-icon-picture-outline">图片</el-button>
+        </template>
+
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改报价对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="动力品牌" prop="brand">
+          <el-input v-model="form.brand" placeholder="请输入动力品牌" />
         </el-form-item>
         <el-form-item label="型号" prop="model">
-          <el-input
-            v-model="queryParams.model"
-            placeholder="请输入型号"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.model" placeholder="请输入型号" />
         </el-form-item>
-        <!-- <el-form-item label="发动机主要功率(1500RPM  50HZ)" prop="enginePowerMajor1500rpm">
-          <el-input
-            v-model="queryParams.enginePowerMajor1500rpm"
-            placeholder="请输入发动机主要功率(1500RPM  50HZ)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+        <el-form-item label="发动机主要功率(1500RPM  50HZ)" prop="enginePowerMajor1500rpm">
+          <el-input v-model="form.enginePowerMajor1500rpm" placeholder="请输入发动机主要功率(1500RPM  50HZ)" />
         </el-form-item>
         <el-form-item label="发动机备用功率(1500RPM  50HZ)" prop="enginePowerMinor1500rpm">
-          <el-input
-            v-model="queryParams.enginePowerMinor1500rpm"
-            placeholder="请输入发动机备用功率(1500RPM  50HZ)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.enginePowerMinor1500rpm" placeholder="请输入发动机备用功率(1500RPM  50HZ)" />
         </el-form-item>
         <el-form-item label="推荐机组主要功率(1500RPM  50HZ)" prop="unitPowerMajor1500rpm">
-          <el-input
-            v-model="queryParams.unitPowerMajor1500rpm"
-            placeholder="请输入推荐机组主要功率(1500RPM  50HZ)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.unitPowerMajor1500rpm" placeholder="请输入推荐机组主要功率(1500RPM  50HZ)" />
         </el-form-item>
         <el-form-item label="推荐机组备用功率(1500RPM  50HZ)" prop="unitPowerMinor1500rpm">
-          <el-input
-            v-model="queryParams.unitPowerMinor1500rpm"
-            placeholder="请输入推荐机组备用功率(1500RPM  50HZ)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.unitPowerMinor1500rpm" placeholder="请输入推荐机组备用功率(1500RPM  50HZ)" />
         </el-form-item>
         <el-form-item label="发动机主要功率(1800RPM  60HZ)" prop="enginePowerMajor1800rpm">
-          <el-input
-            v-model="queryParams.enginePowerMajor1800rpm"
-            placeholder="请输入发动机主要功率(1800RPM  60HZ)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.enginePowerMajor1800rpm" placeholder="请输入发动机主要功率(1800RPM  60HZ)" />
         </el-form-item>
         <el-form-item label="发动机备用功率(1800RPM  60HZ)" prop="enginePowerMinor1800rpm">
-          <el-input
-            v-model="queryParams.enginePowerMinor1800rpm"
-            placeholder="请输入发动机备用功率(1800RPM  60HZ)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.enginePowerMinor1800rpm" placeholder="请输入发动机备用功率(1800RPM  60HZ)" />
         </el-form-item>
         <el-form-item label="推荐机组主要功率(1800RPM  60HZ)" prop="unitPowerMajor1800rpm">
-          <el-input
-            v-model="queryParams.unitPowerMajor1800rpm"
-            placeholder="请输入推荐机组主要功率(1800RPM  60HZ)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.unitPowerMajor1800rpm" placeholder="请输入推荐机组主要功率(1800RPM  60HZ)" />
         </el-form-item>
         <el-form-item label="推荐机组备用功率(1800RPM  60HZ)" prop="unitPowerMinor1800rpm">
-          <el-input
-            v-model="queryParams.unitPowerMinor1800rpm"
-            placeholder="请输入推荐机组备用功率(1800RPM  60HZ)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.unitPowerMinor1800rpm" placeholder="请输入推荐机组备用功率(1800RPM  60HZ)" />
         </el-form-item>
         <el-form-item label="油泵形式" prop="oilForm">
-          <el-input
-            v-model="queryParams.oilForm"
-            placeholder="请输入油泵形式"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.oilForm" placeholder="请输入油泵形式" />
         </el-form-item>
         <el-form-item label="进气方式" prop="airIntakeMode">
-          <el-input
-            v-model="queryParams.airIntakeMode"
-            placeholder="请输入进气方式"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.airIntakeMode" placeholder="请输入进气方式" />
         </el-form-item>
         <el-form-item label="电压" prop="voltage">
-          <el-input
-            v-model="queryParams.voltage"
-            placeholder="请输入电压"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.voltage" placeholder="请输入电压" />
         </el-form-item>
         <el-form-item label="排量 " prop="displacement">
-          <el-input
-            v-model="queryParams.displacement"
-            placeholder="请输入排量 "
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.displacement" placeholder="请输入排量 " />
         </el-form-item>
         <el-form-item label="油耗" prop="oilConsumption">
-          <el-input
-            v-model="queryParams.oilConsumption"
-            placeholder="请输入油耗"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.oilConsumption" placeholder="请输入油耗" />
         </el-form-item>
         <el-form-item label="水箱重量(Kg)" prop="tankWeight">
-          <el-input
-            v-model="queryParams.tankWeight"
-            placeholder="请输入水箱重量(Kg)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.tankWeight" placeholder="请输入水箱重量(Kg)" />
         </el-form-item>
         <el-form-item label="动力尺寸L*W*H(mm)" prop="powerSize">
-          <el-input
-            v-model="queryParams.powerSize"
-            placeholder="请输入动力尺寸L*W*H(mm)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.powerSize" placeholder="请输入动力尺寸L*W*H(mm)" />
         </el-form-item>
         <el-form-item label="水箱尺寸L*W*H(mm)" prop="tankSize">
-          <el-input
-            v-model="queryParams.tankSize"
-            placeholder="请输入水箱尺寸L*W*H(mm)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.tankSize" placeholder="请输入水箱尺寸L*W*H(mm)" />
         </el-form-item>
-        <el-form-item label="排放标准" prop="
-  emissionStandard">
-          <el-input
-            v-model="queryParams.emissionStandard"
-            placeholder="请输入排放标准"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+        <el-form-item label="排放标准" prop="emissionStandard">
+          <el-input v-model="form.emissionStandard" placeholder="请输入排放标准" />
         </el-form-item>
         <el-form-item label="配置说明" prop="configurationDescription">
-          <el-input
-            v-model="queryParams.configurationDescription"
-            placeholder="请输入配置说明"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.configurationDescription" placeholder="请输入配置说明" />
         </el-form-item>
         <el-form-item label="价格" prop="price">
-          <el-input
-            v-model="queryParams.price"
-            placeholder="请输入价格"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="form.price" placeholder="请输入价格" />
         </el-form-item>
         <el-form-item label="水箱价格" prop="tankPrice">
-          <el-input
-            v-model="queryParams.tankPrice"
-            placeholder="请输入水箱价格"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </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>
+          <el-input v-model="form.tankPrice" placeholder="请输入水箱价格" />
         </el-form-item>
       </el-form>
-  
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-        
-          >新增</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="success"
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-        
-          >修改</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="danger"
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-     
-          >删除</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-       
-          >导出</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-  
-      <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
 
-        <el-table-column label="动力品牌" width="180px" align="center" prop="brand" />
-        <el-table-column label="型号" align="center" prop="model" />
-        <el-table-column label="发动机主要功率(1500RPM  50HZ)" align="center" prop="enginePowerMajor1500rpm" />
-        <el-table-column label="发动机备用功率(1500RPM  50HZ)" align="center" prop="enginePowerMinor1500rpm" />
-        <el-table-column label="推荐机组主要功率(1500RPM  50HZ)" align="center" prop="unitPowerMajor1500rpm" />
-        <el-table-column label="推荐机组备用功率(1500RPM  50HZ)" align="center" prop="unitPowerMinor1500rpm" />
-        <el-table-column label="发动机主要功率(1800RPM  60HZ)" align="center" prop="enginePowerMajor1800rpm" />
-        <el-table-column label="发动机备用功率(1800RPM  60HZ)" align="center" prop="enginePowerMinor1800rpm" />
-        <el-table-column label="推荐机组主要功率(1800RPM  60HZ)" align="center" prop="unitPowerMajor1800rpm" />
-        <el-table-column label="推荐机组备用功率(1800RPM  60HZ)" align="center" prop="unitPowerMinor1800rpm" />
-        <el-table-column label="油泵形式" align="center" prop="oilForm" />
-        <el-table-column label="进气方式" align="center" prop="airIntakeMode" />
-        <el-table-column label="电压" align="center" prop="voltage" />
-        <el-table-column label="排量 " align="center" prop="displacement" />
-        <el-table-column label="油耗" align="center" prop="oilConsumption" />
-        <el-table-column label="水箱重量(Kg)" align="center" prop="tankWeight" />
-        <el-table-column label="动力尺寸L*W*H(mm)" align="center" prop="powerSize" />
-        <el-table-column label="水箱尺寸L*W*H(mm)" align="center" prop="tankSize" />
-        <el-table-column label="排放标准" align="center" prop="emissionStandard" />
-        <el-table-column label="配置说明" align="center" prop="configurationDescription" />
-        <el-table-column label="价格" align="center" prop="price" />
-        <el-table-column label="水箱价格" align="center" prop="tankPrice" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-            
-            >修改</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-             
-            >删除</el-button>
-            <el-button @click="() => {
-            $router.push('/gallery?id=' + scope.row.id+'&type=2')
-          
-          }" size="mini" type="text" icon="el-icon-picture-outline">图片</el-button>
-          </template>
-          
-        </el-table-column>
-      </el-table>
-  
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-  
-      <!-- 添加或修改报价对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-form-item label="动力品牌" prop="brand">
-            <el-input v-model="form.brand" placeholder="请输入动力品牌" />
-          </el-form-item>
-          <el-form-item label="型号" prop="model">
-            <el-input v-model="form.model" placeholder="请输入型号" />
-          </el-form-item>
-          <el-form-item label="发动机主要功率(1500RPM  50HZ)" prop="enginePowerMajor1500rpm">
-            <el-input v-model="form.enginePowerMajor1500rpm" placeholder="请输入发动机主要功率(1500RPM  50HZ)" />
-          </el-form-item>
-          <el-form-item label="发动机备用功率(1500RPM  50HZ)" prop="enginePowerMinor1500rpm">
-            <el-input v-model="form.enginePowerMinor1500rpm" placeholder="请输入发动机备用功率(1500RPM  50HZ)" />
-          </el-form-item>
-          <el-form-item label="推荐机组主要功率(1500RPM  50HZ)" prop="unitPowerMajor1500rpm">
-            <el-input v-model="form.unitPowerMajor1500rpm" placeholder="请输入推荐机组主要功率(1500RPM  50HZ)" />
-          </el-form-item>
-          <el-form-item label="推荐机组备用功率(1500RPM  50HZ)" prop="unitPowerMinor1500rpm">
-            <el-input v-model="form.unitPowerMinor1500rpm" placeholder="请输入推荐机组备用功率(1500RPM  50HZ)" />
-          </el-form-item>
-          <el-form-item label="发动机主要功率(1800RPM  60HZ)" prop="enginePowerMajor1800rpm">
-            <el-input v-model="form.enginePowerMajor1800rpm" placeholder="请输入发动机主要功率(1800RPM  60HZ)" />
-          </el-form-item>
-          <el-form-item label="发动机备用功率(1800RPM  60HZ)" prop="enginePowerMinor1800rpm">
-            <el-input v-model="form.enginePowerMinor1800rpm" placeholder="请输入发动机备用功率(1800RPM  60HZ)" />
-          </el-form-item>
-          <el-form-item label="推荐机组主要功率(1800RPM  60HZ)" prop="unitPowerMajor1800rpm">
-            <el-input v-model="form.unitPowerMajor1800rpm" placeholder="请输入推荐机组主要功率(1800RPM  60HZ)" />
-          </el-form-item>
-          <el-form-item label="推荐机组备用功率(1800RPM  60HZ)" prop="unitPowerMinor1800rpm">
-            <el-input v-model="form.unitPowerMinor1800rpm" placeholder="请输入推荐机组备用功率(1800RPM  60HZ)" />
-          </el-form-item>
-          <el-form-item label="油泵形式" prop="oilForm">
-            <el-input v-model="form.oilForm" placeholder="请输入油泵形式" />
-          </el-form-item>
-          <el-form-item label="进气方式" prop="airIntakeMode">
-            <el-input v-model="form.airIntakeMode" placeholder="请输入进气方式" />
-          </el-form-item>
-          <el-form-item label="电压" prop="voltage">
-            <el-input v-model="form.voltage" placeholder="请输入电压" />
-          </el-form-item>
-          <el-form-item label="排量 " prop="displacement">
-            <el-input v-model="form.displacement" placeholder="请输入排量 " />
-          </el-form-item>
-          <el-form-item label="油耗" prop="oilConsumption">
-            <el-input v-model="form.oilConsumption" placeholder="请输入油耗" />
-          </el-form-item>
-          <el-form-item label="水箱重量(Kg)" prop="tankWeight">
-            <el-input v-model="form.tankWeight" placeholder="请输入水箱重量(Kg)" />
-          </el-form-item>
-          <el-form-item label="动力尺寸L*W*H(mm)" prop="powerSize">
-            <el-input v-model="form.powerSize" placeholder="请输入动力尺寸L*W*H(mm)" />
-          </el-form-item>
-          <el-form-item label="水箱尺寸L*W*H(mm)" prop="tankSize">
-            <el-input v-model="form.tankSize" placeholder="请输入水箱尺寸L*W*H(mm)" />
-          </el-form-item>
-          <el-form-item label="排放标准" prop="emissionStandard">
-            <el-input v-model="form.emissionStandard" placeholder="请输入排放标准" />
-          </el-form-item>
-          <el-form-item label="配置说明" prop="configurationDescription">
-            <el-input v-model="form.configurationDescription" placeholder="请输入配置说明" />
-          </el-form-item>
-          <el-form-item label="价格" prop="price">
-            <el-input v-model="form.price" placeholder="请输入价格" />
-          </el-form-item>
-          <el-form-item label="水箱价格" prop="tankPrice">
-            <el-input v-model="form.tankPrice" placeholder="请输入水箱价格" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </template>
-  
-  <script>
-  import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/price/engine";
-  
-  export default {
-    name: "Info",
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 报价表格数据
-        infoList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          brand: null,
-          model: null,
-          enginePowerMajor1500rpm: null,
-          enginePowerMinor1500rpm: null,
-          unitPowerMajor1500rpm: null,
-          unitPowerMinor1500rpm: null,
-          enginePowerMajor1800rpm: null,
-          enginePowerMinor1800rpm: null,
-          unitPowerMajor1800rpm: null,
-          unitPowerMinor1800rpm: null,
-          oilForm: null,
-          airIntakeMode: null,
-          voltage: null,
-          displacement: null,
-          oilConsumption: null,
-          tankWeight: null,
-          powerSize: null,
-          tankSize: null,
-          
-  emissionStandard: null,
-          configurationDescription: null,
-          price: null,
-          tankPrice: null,
-        },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-        }
+<script>
+import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo,getFieldName } from "@/api/price/engine";
+
+export default {
+  name: "Info",
+  data() {
+    return {
+      searchOption: [[], [], [], []],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 报价表格数据
+      infoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        brand: null,
+        model: null,
+        enginePowerMajor1500rpm: null,
+        enginePowerMinor1500rpm: null,
+        unitPowerMajor1500rpm: null,
+        unitPowerMinor1500rpm: null,
+        enginePowerMajor1800rpm: null,
+        enginePowerMinor1800rpm: null,
+        unitPowerMajor1800rpm: null,
+        unitPowerMinor1800rpm: null,
+        oilForm: null,
+        airIntakeMode: null,
+        voltage: null,
+        displacement: null,
+        oilConsumption: null,
+        tankWeight: null,
+        powerSize: null,
+        tankSize: null,
+
+        emissionStandard: null,
+        configurationDescription: null,
+        price: null,
+        tankPrice: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getSearchOption()
+    this.getList();
+  },
+  methods: {
+    getSearchOption() {
+      getFieldName('brand').then(response => {
+        this.$set(this.searchOption, 0, response.data);
+
+      })
+ 
+
+    },
+
+    /** 查询报价列表 */
+    getList() {
+      this.loading = true;
+      listInfo(this.queryParams).then(response => {
+        this.infoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        brand: null,
+        model: null,
+        enginePowerMajor1500rpm: null,
+        enginePowerMinor1500rpm: null,
+        unitPowerMajor1500rpm: null,
+        unitPowerMinor1500rpm: null,
+        enginePowerMajor1800rpm: null,
+        enginePowerMinor1800rpm: null,
+        unitPowerMajor1800rpm: null,
+        unitPowerMinor1800rpm: null,
+        oilForm: null,
+        airIntakeMode: null,
+        voltage: null,
+        displacement: null,
+        oilConsumption: null,
+        tankWeight: null,
+        powerSize: null,
+        tankSize: null,
+
+        emissionStandard: null,
+        configurationDescription: null,
+        price: null,
+        tankPrice: null,
+        createTime: null,
+        updateTime: null
       };
+      this.resetForm("form");
     },
-    created() {
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
       this.getList();
     },
-    methods: {
-      /** 查询报价列表 */
-      getList() {
-        this.loading = true;
-        listInfo(this.queryParams).then(response => {
-          this.infoList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          brand: null,
-          model: null,
-          enginePowerMajor1500rpm: null,
-          enginePowerMinor1500rpm: null,
-          unitPowerMajor1500rpm: null,
-          unitPowerMinor1500rpm: null,
-          enginePowerMajor1800rpm: null,
-          enginePowerMinor1800rpm: null,
-          unitPowerMajor1800rpm: null,
-          unitPowerMinor1800rpm: null,
-          oilForm: null,
-          airIntakeMode: null,
-          voltage: null,
-          displacement: null,
-          oilConsumption: null,
-          tankWeight: null,
-          powerSize: null,
-          tankSize: null,
-          
-  emissionStandard: null,
-          configurationDescription: null,
-          price: null,
-          tankPrice: null,
-          createTime: null,
-          updateTime: null
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加报价";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getInfo(id).then(response => {
+        this.form = response.data;
         this.open = true;
-        this.title = "添加报价";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        getInfo(id).then(response => {
-          this.form = response.data;
-          this.open = true;
-          this.title = "修改报价";
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.id != null) {
-              updateInfo(this.form).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              addInfo(this.form).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-            }
+        this.title = "修改报价";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateInfo(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addInfo(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
           }
-        });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$confirm('是否确认删除报价编号为"' + ids + '"的数据项?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-            return delInfo(ids);
-          }).then(() => {
-            this.getList();
-            this.msgSuccess("删除成功");
-          })
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有报价数据项?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-            return exportInfo(queryParams);
-          }).then(response => {
-            this.download(response.data);
-          })
-      }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除报价编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delInfo(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有报价数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportInfo(queryParams);
+      }).then(response => {
+        this.download(response.data);
+      })
     }
-  };
-  </script>
+  }
+};
+</script>

+ 48 - 51
src/views/price/manage/index.vue

@@ -3,29 +3,7 @@
     <el-form :rules="queryRules" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"
       label-width="68px">
       <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"
@@ -39,8 +17,6 @@
 
             </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">
@@ -52,19 +28,40 @@
               @keyup.enter.native="handleQuery">
 
             </el-input>
-          </el-form-item></el-col>
-      </el-row>
-
-
-
-
-
+          </el-form-item>
+        </el-col>
+        <!-- <el-col :span="12">
+</el-col> -->
+        <el-col :span="24">
 
+          <el-form-item label="品牌" prop="brand">
+            <el-select v-model="queryParams.brand" placeholder="请选择品牌" clearable size="small"
+              @keyup.enter.native="handleQuery">
+              <el-option v-for="(item, index) in searchOption[0]" :key="index" :value="item" :label="item"></el-option>
 
-      <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>
-      </el-form-item>
+            </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 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>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -99,29 +96,29 @@
       <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 size="mini"  :row-style="{ height: '25px' }" v-loading="loading" :data="infoList"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 
-      <el-table-column width="180px" label="机组型号" align="center" prop="unitModel" />
+      <el-table-column width="100px" label="机组型号" align="center" prop="unitModel" />
       <el-table-column label="机组功率(kw)" align="center" prop="unitPowerKw" />
       <el-table-column label="机组功率(kva)" align="center" prop="unitPowerKva" />
       <el-table-column label="频率(Hz)" align="center" prop="rate" />
-      <el-table-column width="180px" label="柴油机型号" align="center" prop="dieselEngineModel" />
-      <el-table-column label="品牌" width="180px" align="center" prop="brand" />
+      <el-table-column width="100px" label="柴油机型号" align="center" prop="dieselEngineModel" />
+      <el-table-column label="品牌" align="center" prop="brand" />
       <el-table-column label="转速" align="center" prop="speed" />
       <el-table-column label="动力价格" align="center" prop="powerPrice" />
 
-      <el-table-column width="180px" label="发电机型号(仿斯坦福)" align="center" prop="generatorModelFstf" />
-      <el-table-column width="180px" label="发电机价格(仿斯坦福)" align="center" prop="generatorPriceFstf" />
-      <el-table-column width="180px" label="发电机型号(利来森马)" align="center" prop="generatorModelLlsm" />
-      <el-table-column width="180px" label="发电机价格(利来森马)" align="center" prop="generatorPriceLlsm" />
-      <el-table-column width="180px" label="发电机型号(美迪奥)" align="center" prop="generatorModelMda" />
-      <el-table-column width="180px" label="发电机价格(美迪奥)" align="center" prop="generatorPriceMda" />
-      <el-table-column width="180px" label="发电机型号(马拉松)" align="center" prop="generatorModelMls" />
-      <el-table-column width="180px" label="发电机价格(马拉松)" align="center" prop="generatorPriceMls" />
-      <el-table-column width="180px" label="发电机型号(斯坦福)" align="center" prop="generatorModelStf" />
-      <el-table-column width="180px" label="发电机价格(斯坦福)" align="center" prop="generatorPriceStf" />
+      <el-table-column label="发电机型号(仿斯坦福)" align="center" prop="generatorModelFstf" />
+      <el-table-column label="发电机价格(仿斯坦福)" align="center" prop="generatorPriceFstf" />
+      <el-table-column label="发电机型号(利来森马)" align="center" prop="generatorModelLlsm" />
+      <el-table-column label="发电机价格(利来森马)" align="center" prop="generatorPriceLlsm" />
+      <el-table-column label="发电机型号(美迪奥)" align="center" prop="generatorModelMda" />
+      <el-table-column label="发电机价格(美迪奥)" align="center" prop="generatorPriceMda" />
+      <el-table-column label="发电机型号(马拉松)" align="center" prop="generatorModelMls" />
+      <el-table-column label="发电机价格(马拉松)" align="center" prop="generatorPriceMls" />
+      <el-table-column label="发电机型号(斯坦福)" align="center" prop="generatorModelStf" />
+      <el-table-column label="发电机价格(斯坦福)" align="center" prop="generatorPriceStf" />
 
       <el-table-column label="静音机壳价格" align="center" prop="mutePrice" />
       <el-table-column label="开架价格" align="center" prop="openPrice" />
@@ -204,7 +201,7 @@
       <el-table-column label="CKD尺寸" align="center" prop="ckdLong" />
       <el-table-column label="CKD尺寸" align="center" prop="ckdWidth" />
       <el-table-column label="CKD尺寸" align="center" prop="ckdHigh" /> -->
-      <el-table-column fixed="right" width="180px" label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['price:info:edit']">修改</el-button>
@@ -231,7 +228,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="品牌" prop="brand">
           <el-select v-model="form.brand" placeholder="请选择品牌" clearable size="small" @keyup.enter.native="handleQuery">
-            <el-option v-for="(item, index) in searchOption[0]" :value="item" :key="index">{{ item }}</el-option>
+            <el-option v-for="(item, index) in searchOption[0]" :value="item" :key="index" :label="item"></el-option>
           </el-select>
 
         </el-form-item>

+ 38 - 33
src/views/price/query/index.vue

@@ -3,29 +3,7 @@
     <el-form :rules="queryRules" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"
       label-width="68px">
       <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"
@@ -39,8 +17,6 @@
 
             </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">
@@ -52,7 +28,39 @@
               @keyup.enter.native="handleQuery">
 
             </el-input>
-          </el-form-item></el-col>
+          </el-form-item>
+        </el-col>
+        <!-- <el-col :span="12">
+        </el-col> -->
+        <el-col :span="24">
+
+          <el-form-item label="品牌" prop="brand">
+            <el-select v-model="queryParams.brand" placeholder="请选择品牌" clearable size="small"
+              @keyup.enter.native="handleQuery">
+              <el-option v-for="(item, index) in searchOption[0]" :key="index" :value="item" :label="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 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>
+          </el-form-item>
+        </el-col>
       </el-row>
 
 
@@ -61,10 +69,7 @@
 
 
 
-      <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>
-      </el-form-item>
+
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -122,7 +127,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  label="控制器型号" align="center" prop="controllerModel">
+      <el-table-column label="控制器型号" align="center" prop="controllerModel">
         <template>
           {{ controllerModel }}
 
@@ -189,7 +194,7 @@
             v-hasPermi="['price:info:edit']">修改</el-button> -->
 
           <el-button @click="() => {
-            $router.push('/gallery?id=' + scope.row.id+'&type=1')
+            $router.push('/gallery?id=' + scope.row.id + '&type=1')
           
           }" size="mini" type="text" icon="el-icon-picture-outline">图片</el-button>
 
@@ -400,7 +405,7 @@ export default {
   },
   created() {
     this.getControllerList()
-  
+
     this.getSearchOption()
   },
   methods: {
@@ -492,7 +497,7 @@ export default {
       this.queryParams.pageNum = 1;
       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();

+ 0 - 442
src/views/tool/price/manage.vue

@@ -1,442 +0,0 @@
-<template>
-    <div class="app-container">
-      <el-form :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-form-item>
-
-        <el-form-item label="机组功率(kw)" prop="unitPowerKw">
-          <el-select
-            v-model="queryParams.unitPowerKw"
-            placeholder="请输入机组功率(kw)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="机组功率(kva)" prop="unitPowerKva">
-          <el-select
-            v-model="queryParams.unitPowerKva"
-            placeholder="请输入机组功率(kva)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </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>
-        </el-form-item>
-      </el-form>
-  
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermi="['price:info:add']"
-          >新增</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="success"
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['price:info:edit']"
-          >修改</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="danger"
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['price:info:remove']"
-          >删除</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['price:info:export']"
-          >导出</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-  
-      <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键" align="center" prop="id" />
-        <el-table-column label="品牌" align="center" prop="brand" />
-        <el-table-column label="机组型号" align="center" prop="unitModel" />
-        <el-table-column label="机组功率(kw)" align="center" prop="unitPowerKw" />
-        <el-table-column label="机组功率(kva)" align="center" prop="unitPowerKva" />
-        <el-table-column label="频率(Hz)" align="center" prop="rate" />
-        <el-table-column label="柴油机型号" align="center" prop="dieselEngineModel" />
-        <el-table-column label="转速" align="center" prop="speed" />
-        <el-table-column label="动力价格" align="center" prop="powerPrice" />
-        <el-table-column label="发电机型号" align="center" prop="generatorModel" />
-        <el-table-column label="发电机价格" align="center" prop="generatorPrice" />
-        <el-table-column label="静音机壳价格" align="center" prop="mutePrice" />
-        <el-table-column label="开架价格" align="center" prop="openPrice" />
-        <el-table-column label="ATS型号" align="center" prop="atsModel" />
-        <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 label="控制器铭贝" align="center" prop="controllerMinbei" />
-        <el-table-column label="控制器价格" align="center" prop="controllerPrice" />
-        <el-table-column label="合计含税成本(静音)" align="center" prop="totalCostMute" />
-        <el-table-column label="合计含税成本(开架)" align="center" prop="totalCostOpen" />
-        <el-table-column label="静音尺寸" align="center" prop="muteLong" />
-        <el-table-column label="静音尺寸" align="center" prop="muteWidth" />
-        <el-table-column label="静音尺寸" align="center" prop="muteHigh" />
-        <el-table-column label="开架尺寸" align="center" prop="openLong" />
-        <el-table-column label="开架尺寸" align="center" prop="openWidth" />
-        <el-table-column label="开架尺寸" align="center" prop="openHigh" />
-        <el-table-column label="CKD尺寸" align="center" prop="ckdLong" />
-        <el-table-column label="CKD尺寸" align="center" prop="ckdWidth" />
-        <el-table-column label="CKD尺寸" align="center" prop="ckdHigh" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['price:info:edit']"
-            >修改</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['price:info:remove']"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-  
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-  
-      <!-- 添加或修改报价对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-form-item label="品牌" prop="brand">
-            <el-input v-model="form.brand" placeholder="请输入品牌" />
-          </el-form-item>
-          <el-form-item label="机组型号" prop="unitModel">
-            <el-input v-model="form.unitModel" placeholder="请输入机组型号" />
-          </el-form-item>
-          <el-form-item label="机组功率(kw)" prop="unitPowerKw">
-            <el-input v-model="form.unitPowerKw" placeholder="请输入机组功率(kw)" />
-          </el-form-item>
-          <el-form-item label="机组功率(kva)" prop="unitPowerKva">
-            <el-input v-model="form.unitPowerKva" placeholder="请输入机组功率(kva)" />
-          </el-form-item>
-          <el-form-item label="频率(Hz)" prop="rate">
-            <el-input v-model="form.rate" placeholder="请输入频率(Hz)" />
-          </el-form-item>
-          <el-form-item label="柴油机型号" prop="dieselEngineModel">
-            <el-input v-model="form.dieselEngineModel" placeholder="请输入柴油机型号" />
-          </el-form-item>
-          <el-form-item label="转速" prop="speed">
-            <el-input v-model="form.speed" placeholder="请输入转速" />
-          </el-form-item>
-          <el-form-item label="动力价格" prop="powerPrice">
-            <el-input v-model="form.powerPrice" placeholder="请输入动力价格" />
-          </el-form-item>
-          <el-form-item label="发电机型号" prop="generatorModel">
-            <el-input v-model="form.generatorModel" placeholder="请输入发电机型号" />
-          </el-form-item>
-          <el-form-item label="发电机价格" prop="generatorPrice">
-            <el-input v-model="form.generatorPrice" placeholder="请输入发电机价格" />
-          </el-form-item>
-          <el-form-item label="静音机壳价格" prop="mutePrice">
-            <el-input v-model="form.mutePrice" placeholder="请输入静音机壳价格" />
-          </el-form-item>
-          <el-form-item label="开架价格" prop="openPrice">
-            <el-input v-model="form.openPrice" placeholder="请输入开架价格" />
-          </el-form-item>
-          <el-form-item label="ATS型号" prop="atsModel">
-            <el-input v-model="form.atsModel" placeholder="请输入ATS型号" />
-          </el-form-item>
-          <el-form-item label="ATS价格" prop="atsPrice">
-            <el-input v-model="form.atsPrice" placeholder="请输入ATS价格" />
-          </el-form-item>
-          <el-form-item label="电瓶型号" prop="batteryModel">
-            <el-input v-model="form.batteryModel" placeholder="请输入电瓶型号" />
-          </el-form-item>
-          <el-form-item label="电瓶价格" prop="batteryPrice">
-            <el-input v-model="form.batteryPrice" placeholder="请输入电瓶价格" />
-          </el-form-item>
-          <el-form-item label="控制器铭贝" prop="controllerMinbei">
-            <el-input v-model="form.controllerMinbei" placeholder="请输入控制器铭贝" />
-          </el-form-item>
-          <el-form-item label="控制器价格" prop="controllerPrice">
-            <el-input v-model="form.controllerPrice" placeholder="请输入控制器价格" />
-          </el-form-item>
-          <el-form-item label="合计含税成本(静音)" prop="totalCostMute">
-            <el-input v-model="form.totalCostMute" placeholder="请输入合计含税成本(静音)" />
-          </el-form-item>
-          <el-form-item label="合计含税成本(开架)" prop="totalCostOpen">
-            <el-input v-model="form.totalCostOpen" placeholder="请输入合计含税成本(开架)" />
-          </el-form-item>
-          <el-form-item label="静音尺寸" prop="muteLong">
-            <el-input v-model="form.muteLong" placeholder="请输入静音尺寸" />
-          </el-form-item>
-          <el-form-item label="静音尺寸" prop="muteWidth">
-            <el-input v-model="form.muteWidth" placeholder="请输入静音尺寸" />
-          </el-form-item>
-          <el-form-item label="静音尺寸" prop="muteHigh">
-            <el-input v-model="form.muteHigh" placeholder="请输入静音尺寸" />
-          </el-form-item>
-          <el-form-item label="开架尺寸" prop="openLong">
-            <el-input v-model="form.openLong" placeholder="请输入开架尺寸" />
-          </el-form-item>
-          <el-form-item label="开架尺寸" prop="openWidth">
-            <el-input v-model="form.openWidth" placeholder="请输入开架尺寸" />
-          </el-form-item>
-          <el-form-item label="开架尺寸" prop="openHigh">
-            <el-input v-model="form.openHigh" placeholder="请输入开架尺寸" />
-          </el-form-item>
-          <el-form-item label="CKD尺寸" prop="ckdLong">
-            <el-input v-model="form.ckdLong" placeholder="请输入CKD尺寸" />
-          </el-form-item>
-          <el-form-item label="CKD尺寸" prop="ckdWidth">
-            <el-input v-model="form.ckdWidth" placeholder="请输入CKD尺寸" />
-          </el-form-item>
-          <el-form-item label="CKD尺寸" prop="ckdHigh">
-            <el-input v-model="form.ckdHigh" placeholder="请输入CKD尺寸" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </template>
-  
-  <script>
-  import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/price/manage";
-  
-  export default {
-    name: "Info",
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 报价表格数据
-        infoList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          brand: null,
-          unitModel: null,
-          unitPowerKw: null,
-          unitPowerKva: null,
-          rate: null,
-          dieselEngineModel: null,
-          speed: null,
-          powerPrice: null,
-          generatorModel: null,
-          generatorPrice: null,
-          mutePrice: null,
-          openPrice: null,
-          atsModel: null,
-          atsPrice: null,
-          batteryModel: null,
-          batteryPrice: null,
-          controllerMinbei: null,
-          controllerPrice: null,
-          totalCostMute: null,
-          totalCostOpen: null,
-          muteLong: null,
-          muteWidth: null,
-          muteHigh: null,
-          openLong: null,
-          openWidth: null,
-          openHigh: null,
-          ckdLong: null,
-          ckdWidth: null,
-          ckdHigh: null,
-        },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-        }
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 查询报价列表 */
-      getList() {
-        this.loading = true;
-        listInfo(this.queryParams).then(response => {
-          this.infoList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          brand: null,
-          unitModel: null,
-          unitPowerKw: null,
-          unitPowerKva: null,
-          rate: null,
-          dieselEngineModel: null,
-          speed: null,
-          powerPrice: null,
-          generatorModel: null,
-          generatorPrice: null,
-          mutePrice: null,
-          openPrice: null,
-          atsModel: null,
-          atsPrice: null,
-          batteryModel: null,
-          batteryPrice: null,
-          controllerMinbei: null,
-          controllerPrice: null,
-          totalCostMute: null,
-          totalCostOpen: null,
-          muteLong: null,
-          muteWidth: null,
-          muteHigh: null,
-          openLong: null,
-          openWidth: null,
-          openHigh: null,
-          ckdLong: null,
-          ckdWidth: null,
-          ckdHigh: null,
-          createTime: null,
-          updateTime: null
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "添加报价";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        getInfo(id).then(response => {
-          this.form = response.data;
-          this.open = true;
-          this.title = "修改报价";
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.id != null) {
-              updateInfo(this.form).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              addInfo(this.form).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-            }
-          }
-        });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$confirm('是否确认删除报价编号为"' + ids + '"的数据项?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-            return delInfo(ids);
-          }).then(() => {
-            this.getList();
-            this.msgSuccess("删除成功");
-          })
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有报价数据项?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-            return exportInfo(queryParams);
-          }).then(response => {
-            this.download(response.data);
-          })
-      }
-    }
-  };
-  </script>

+ 0 - 675
src/views/tool/price/query.vue

@@ -1,675 +0,0 @@
-<template>
-    <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="品牌" prop="brand">
-          <el-input
-            v-model="queryParams.brand"
-            placeholder="请输入品牌"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="机组型号" prop="unitModel">
-          <el-input
-            v-model="queryParams.unitModel"
-            placeholder="请输入机组型号"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="机组功率(kw)" prop="unitPowerKw">
-          <el-input
-            v-model="queryParams.unitPowerKw"
-            placeholder="请输入机组功率(kw)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="机组功率(kva)" prop="unitPowerKva">
-          <el-input
-            v-model="queryParams.unitPowerKva"
-            placeholder="请输入机组功率(kva)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="频率(Hz)" prop="rate">
-          <el-input
-            v-model="queryParams.rate"
-            placeholder="请输入频率(Hz)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="柴油机型号" prop="dieselEngineModel">
-          <el-input
-            v-model="queryParams.dieselEngineModel"
-            placeholder="请输入柴油机型号"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="转速" prop="speed">
-          <el-input
-            v-model="queryParams.speed"
-            placeholder="请输入转速"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="动力价格" prop="powerPrice">
-          <el-input
-            v-model="queryParams.powerPrice"
-            placeholder="请输入动力价格"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="发电机型号" prop="generatorModel">
-          <el-input
-            v-model="queryParams.generatorModel"
-            placeholder="请输入发电机型号"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="发电机价格" prop="generatorPrice">
-          <el-input
-            v-model="queryParams.generatorPrice"
-            placeholder="请输入发电机价格"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="静音机壳价格" prop="mutePrice">
-          <el-input
-            v-model="queryParams.mutePrice"
-            placeholder="请输入静音机壳价格"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="开架价格" prop="openPrice">
-          <el-input
-            v-model="queryParams.openPrice"
-            placeholder="请输入开架价格"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="ATS型号" prop="atsModel">
-          <el-input
-            v-model="queryParams.atsModel"
-            placeholder="请输入ATS型号"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="ATS价格" prop="atsPrice">
-          <el-input
-            v-model="queryParams.atsPrice"
-            placeholder="请输入ATS价格"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="电瓶型号" prop="batteryModel">
-          <el-input
-            v-model="queryParams.batteryModel"
-            placeholder="请输入电瓶型号"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="电瓶价格" prop="batteryPrice">
-          <el-input
-            v-model="queryParams.batteryPrice"
-            placeholder="请输入电瓶价格"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="控制器铭贝" prop="controllerMinbei">
-          <el-input
-            v-model="queryParams.controllerMinbei"
-            placeholder="请输入控制器铭贝"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="控制器价格" prop="controllerPrice">
-          <el-input
-            v-model="queryParams.controllerPrice"
-            placeholder="请输入控制器价格"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="合计含税成本(静音)" prop="totalCostMute">
-          <el-input
-            v-model="queryParams.totalCostMute"
-            placeholder="请输入合计含税成本(静音)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="合计含税成本(开架)" prop="totalCostOpen">
-          <el-input
-            v-model="queryParams.totalCostOpen"
-            placeholder="请输入合计含税成本(开架)"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="静音尺寸" prop="muteLong">
-          <el-input
-            v-model="queryParams.muteLong"
-            placeholder="请输入静音尺寸"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="静音尺寸" prop="muteWidth">
-          <el-input
-            v-model="queryParams.muteWidth"
-            placeholder="请输入静音尺寸"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="静音尺寸" prop="muteHigh">
-          <el-input
-            v-model="queryParams.muteHigh"
-            placeholder="请输入静音尺寸"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="开架尺寸" prop="openLong">
-          <el-input
-            v-model="queryParams.openLong"
-            placeholder="请输入开架尺寸"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="开架尺寸" prop="openWidth">
-          <el-input
-            v-model="queryParams.openWidth"
-            placeholder="请输入开架尺寸"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="开架尺寸" prop="openHigh">
-          <el-input
-            v-model="queryParams.openHigh"
-            placeholder="请输入开架尺寸"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="CKD尺寸" prop="ckdLong">
-          <el-input
-            v-model="queryParams.ckdLong"
-            placeholder="请输入CKD尺寸"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="CKD尺寸" prop="ckdWidth">
-          <el-input
-            v-model="queryParams.ckdWidth"
-            placeholder="请输入CKD尺寸"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="CKD尺寸" prop="ckdHigh">
-          <el-input
-            v-model="queryParams.ckdHigh"
-            placeholder="请输入CKD尺寸"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </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>
-        </el-form-item>
-      </el-form>
-  
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermi="['price:info:add']"
-          >新增</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="success"
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['price:info:edit']"
-          >修改</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="danger"
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['price:info:remove']"
-          >删除</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['price:info:export']"
-          >导出</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-  
-      <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键" align="center" prop="id" />
-        <el-table-column label="品牌" align="center" prop="brand" />
-        <el-table-column label="机组型号" align="center" prop="unitModel" />
-        <el-table-column label="机组功率(kw)" align="center" prop="unitPowerKw" />
-        <el-table-column label="机组功率(kva)" align="center" prop="unitPowerKva" />
-        <el-table-column label="频率(Hz)" align="center" prop="rate" />
-        <el-table-column label="柴油机型号" align="center" prop="dieselEngineModel" />
-        <el-table-column label="转速" align="center" prop="speed" />
-        <el-table-column label="动力价格" align="center" prop="powerPrice" />
-        <el-table-column label="发电机型号" align="center" prop="generatorModel" />
-        <el-table-column label="发电机价格" align="center" prop="generatorPrice" />
-        <el-table-column label="静音机壳价格" align="center" prop="mutePrice" />
-        <el-table-column label="开架价格" align="center" prop="openPrice" />
-        <el-table-column label="ATS型号" align="center" prop="atsModel" />
-        <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 label="控制器铭贝" align="center" prop="controllerMinbei" />
-        <el-table-column label="控制器价格" align="center" prop="controllerPrice" />
-        <el-table-column label="合计含税成本(静音)" align="center" prop="totalCostMute" />
-        <el-table-column label="合计含税成本(开架)" align="center" prop="totalCostOpen" />
-        <el-table-column label="静音尺寸" align="center" prop="muteLong" />
-        <el-table-column label="静音尺寸" align="center" prop="muteWidth" />
-        <el-table-column label="静音尺寸" align="center" prop="muteHigh" />
-        <el-table-column label="开架尺寸" align="center" prop="openLong" />
-        <el-table-column label="开架尺寸" align="center" prop="openWidth" />
-        <el-table-column label="开架尺寸" align="center" prop="openHigh" />
-        <el-table-column label="CKD尺寸" align="center" prop="ckdLong" />
-        <el-table-column label="CKD尺寸" align="center" prop="ckdWidth" />
-        <el-table-column label="CKD尺寸" align="center" prop="ckdHigh" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['price:info:edit']"
-            >修改</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['price:info:remove']"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-  
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-  
-      <!-- 添加或修改报价对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-form-item label="品牌" prop="brand">
-            <el-input v-model="form.brand" placeholder="请输入品牌" />
-          </el-form-item>
-          <el-form-item label="机组型号" prop="unitModel">
-            <el-input v-model="form.unitModel" placeholder="请输入机组型号" />
-          </el-form-item>
-          <el-form-item label="机组功率(kw)" prop="unitPowerKw">
-            <el-input v-model="form.unitPowerKw" placeholder="请输入机组功率(kw)" />
-          </el-form-item>
-          <el-form-item label="机组功率(kva)" prop="unitPowerKva">
-            <el-input v-model="form.unitPowerKva" placeholder="请输入机组功率(kva)" />
-          </el-form-item>
-          <el-form-item label="频率(Hz)" prop="rate">
-            <el-input v-model="form.rate" placeholder="请输入频率(Hz)" />
-          </el-form-item>
-          <el-form-item label="柴油机型号" prop="dieselEngineModel">
-            <el-input v-model="form.dieselEngineModel" placeholder="请输入柴油机型号" />
-          </el-form-item>
-          <el-form-item label="转速" prop="speed">
-            <el-input v-model="form.speed" placeholder="请输入转速" />
-          </el-form-item>
-          <el-form-item label="动力价格" prop="powerPrice">
-            <el-input v-model="form.powerPrice" placeholder="请输入动力价格" />
-          </el-form-item>
-          <el-form-item label="发电机型号" prop="generatorModel">
-            <el-input v-model="form.generatorModel" placeholder="请输入发电机型号" />
-          </el-form-item>
-          <el-form-item label="发电机价格" prop="generatorPrice">
-            <el-input v-model="form.generatorPrice" placeholder="请输入发电机价格" />
-          </el-form-item>
-          <el-form-item label="静音机壳价格" prop="mutePrice">
-            <el-input v-model="form.mutePrice" placeholder="请输入静音机壳价格" />
-          </el-form-item>
-          <el-form-item label="开架价格" prop="openPrice">
-            <el-input v-model="form.openPrice" placeholder="请输入开架价格" />
-          </el-form-item>
-          <el-form-item label="ATS型号" prop="atsModel">
-            <el-input v-model="form.atsModel" placeholder="请输入ATS型号" />
-          </el-form-item>
-          <el-form-item label="ATS价格" prop="atsPrice">
-            <el-input v-model="form.atsPrice" placeholder="请输入ATS价格" />
-          </el-form-item>
-          <el-form-item label="电瓶型号" prop="batteryModel">
-            <el-input v-model="form.batteryModel" placeholder="请输入电瓶型号" />
-          </el-form-item>
-          <el-form-item label="电瓶价格" prop="batteryPrice">
-            <el-input v-model="form.batteryPrice" placeholder="请输入电瓶价格" />
-          </el-form-item>
-          <el-form-item label="控制器铭贝" prop="controllerMinbei">
-            <el-input v-model="form.controllerMinbei" placeholder="请输入控制器铭贝" />
-          </el-form-item>
-          <el-form-item label="控制器价格" prop="controllerPrice">
-            <el-input v-model="form.controllerPrice" placeholder="请输入控制器价格" />
-          </el-form-item>
-          <el-form-item label="合计含税成本(静音)" prop="totalCostMute">
-            <el-input v-model="form.totalCostMute" placeholder="请输入合计含税成本(静音)" />
-          </el-form-item>
-          <el-form-item label="合计含税成本(开架)" prop="totalCostOpen">
-            <el-input v-model="form.totalCostOpen" placeholder="请输入合计含税成本(开架)" />
-          </el-form-item>
-          <el-form-item label="静音尺寸" prop="muteLong">
-            <el-input v-model="form.muteLong" placeholder="请输入静音尺寸" />
-          </el-form-item>
-          <el-form-item label="静音尺寸" prop="muteWidth">
-            <el-input v-model="form.muteWidth" placeholder="请输入静音尺寸" />
-          </el-form-item>
-          <el-form-item label="静音尺寸" prop="muteHigh">
-            <el-input v-model="form.muteHigh" placeholder="请输入静音尺寸" />
-          </el-form-item>
-          <el-form-item label="开架尺寸" prop="openLong">
-            <el-input v-model="form.openLong" placeholder="请输入开架尺寸" />
-          </el-form-item>
-          <el-form-item label="开架尺寸" prop="openWidth">
-            <el-input v-model="form.openWidth" placeholder="请输入开架尺寸" />
-          </el-form-item>
-          <el-form-item label="开架尺寸" prop="openHigh">
-            <el-input v-model="form.openHigh" placeholder="请输入开架尺寸" />
-          </el-form-item>
-          <el-form-item label="CKD尺寸" prop="ckdLong">
-            <el-input v-model="form.ckdLong" placeholder="请输入CKD尺寸" />
-          </el-form-item>
-          <el-form-item label="CKD尺寸" prop="ckdWidth">
-            <el-input v-model="form.ckdWidth" placeholder="请输入CKD尺寸" />
-          </el-form-item>
-          <el-form-item label="CKD尺寸" prop="ckdHigh">
-            <el-input v-model="form.ckdHigh" placeholder="请输入CKD尺寸" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </template>
-  
-  <script>
-  import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/price/query";
-  
-  export default {
-    name: "Info",
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 报价表格数据
-        infoList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          brand: null,
-          unitModel: null,
-          unitPowerKw: null,
-          unitPowerKva: null,
-          rate: null,
-          dieselEngineModel: null,
-          speed: null,
-          powerPrice: null,
-          generatorModel: null,
-          generatorPrice: null,
-          mutePrice: null,
-          openPrice: null,
-          atsModel: null,
-          atsPrice: null,
-          batteryModel: null,
-          batteryPrice: null,
-          controllerMinbei: null,
-          controllerPrice: null,
-          totalCostMute: null,
-          totalCostOpen: null,
-          muteLong: null,
-          muteWidth: null,
-          muteHigh: null,
-          openLong: null,
-          openWidth: null,
-          openHigh: null,
-          ckdLong: null,
-          ckdWidth: null,
-          ckdHigh: null,
-        },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-        }
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 查询报价列表 */
-      getList() {
-        this.loading = true;
-        listInfo(this.queryParams).then(response => {
-          this.infoList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          brand: null,
-          unitModel: null,
-          unitPowerKw: null,
-          unitPowerKva: null,
-          rate: null,
-          dieselEngineModel: null,
-          speed: null,
-          powerPrice: null,
-          generatorModel: null,
-          generatorPrice: null,
-          mutePrice: null,
-          openPrice: null,
-          atsModel: null,
-          atsPrice: null,
-          batteryModel: null,
-          batteryPrice: null,
-          controllerMinbei: null,
-          controllerPrice: null,
-          totalCostMute: null,
-          totalCostOpen: null,
-          muteLong: null,
-          muteWidth: null,
-          muteHigh: null,
-          openLong: null,
-          openWidth: null,
-          openHigh: null,
-          ckdLong: null,
-          ckdWidth: null,
-          ckdHigh: null,
-          createTime: null,
-          updateTime: null
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "添加报价";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        getInfo(id).then(response => {
-          this.form = response.data;
-          this.open = true;
-          this.title = "修改报价";
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.id != null) {
-              updateInfo(this.form).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              addInfo(this.form).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-            }
-          }
-        });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$confirm('是否确认删除报价编号为"' + ids + '"的数据项?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-            return delInfo(ids);
-          }).then(() => {
-            this.getList();
-            this.msgSuccess("删除成功");
-          })
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有报价数据项?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-            return exportInfo(queryParams);
-          }).then(response => {
-            this.download(response.data);
-          })
-      }
-    }
-  };
-  </script>

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно