新增了控制器和动力价格报价页面以及报价新字段接入,功率区间改为输入方式

src/api/price/controller.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询控制器报价列表
+export function listInfo(query) {
+  return request({
+    url: '/controller/info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询控制器报价详细
+export function getInfo(id) {
+  return request({
+    url: '/controller/info/' + id,
+    method: 'get'
+  })
+}
+
+// 新增控制器报价
+export function addInfo(data) {
+  return request({
+    url: '/controller/info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改控制器报价
+export function updateInfo(data) {
+  return request({
+    url: '/controller/info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除控制器报价
+export function delInfo(id) {
+  return request({
+    url: '/controller/info/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出控制器报价
+export function exportInfo(query) {
+  return request({
+    url: '/controller/info/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/price/engine.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询报价列表
+export function listInfo(query) {
+  return request({
+    url: '/engine/info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询报价详细
+export function getInfo(id) {
+  return request({
+    url: '/engine/info/' + id,
+    method: 'get'
+  })
+}
+
+// 新增报价
+export function addInfo(data) {
+  return request({
+    url: '/engine/info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改报价
+export function updateInfo(data) {
+  return request({
+    url: '/engine/info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除报价
+export function delInfo(id) {
+  return request({
+    url: '/engine/info/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出报价
+export function exportInfo(query) {
+  return request({
+    url: '/engine/info/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/price/controller/index.vue

@@ -0,0 +1,285 @@
+<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">
+          <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="品牌" align="center" prop="brand" />
+        <el-table-column label="控制器型号" align="center" prop="controllerModel" />
+        <el-table-column label="控制器价格" align="center" prop="controllerPrice" />
+        <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>
+          </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="controllerModel">
+            <el-input v-model="form.controllerModel" placeholder="请输入控制器型号" />
+          </el-form-item>
+          <el-form-item label="控制器价格" prop="controllerPrice">
+            <el-input v-model="form.controllerPrice" 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/controller";
+  
+  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,
+          controllerModel: null,
+          controllerPrice: 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,
+          controllerModel: null,
+          controllerPrice: null,
+          updateTime: null,
+          createTime: 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>

src/views/price/engine/index.vue

@@ -0,0 +1,580 @@
+<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-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="动力品牌" 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)
+          
+          }" 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: {
+        }
+      };
+    },
+    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,
+          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();
+        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>

src/views/price/manage/index.vue

@@ -4,34 +4,34 @@
       <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]" :value="item" :key="index">{{ item }}</el-option>
+        
         </el-select>
       </el-form-item>
       <el-form-item label-width="auto" label="机组功率(kw)区间" prop="unitPowerKwMin">
-        <el-select v-model="queryParams.unitPowerKwMin" placeholder="请选择机组功率(kw)" clearable size="small"
+        <el-input v-model="queryParams.unitPowerKwMin" placeholder="请选择机组功率(kw)" clearable size="small"
           @keyup.enter.native="handleQuery">
-          <el-option v-for="(item, index) in searchOption[1]" :value="item" :key="index">{{ item }}</el-option>
-        </el-select>
+        
+        </el-input>
       </el-form-item>
       <el-form-item label-width="auto" label="到" prop="unitPowerKwMax">
-        <el-select v-model="queryParams.unitPowerKwMax" placeholder="请选择机组功率(kw)" clearable size="small"
+        <el-input v-model="queryParams.unitPowerKwMax" placeholder="请选择机组功率(kw)" clearable size="small"
           @keyup.enter.native="handleQuery">
-          <el-option v-for="(item, index) in searchOption[1]" :value="item" :key="index">{{ item }}</el-option>
-        </el-select>
+         
+        </el-input>
       </el-form-item>
-      <el-form-item label-width="auto"  label="机组功率(kva)区间" prop="unitPowerKvaMin">
-        <el-select v-model="queryParams.unitPowerKvaMin" placeholder="请选择机组功率(kva)" clearable size="small"
+      <el-form-item label-width="auto" label="机组功率(kva)区间" prop="unitPowerKvaMin">
+        <el-input v-model="queryParams.unitPowerKvaMin" placeholder="请选择机组功率(kva)" clearable size="small"
           @keyup.enter.native="handleQuery">
-          <el-option v-for="(item, index) in searchOption[2]" :value="item" :key="index">{{ item }}</el-option>
-        </el-select>
+        
+        </el-input>
       </el-form-item>
       <el-form-item label-width="auto" label="到" prop="unitPowerKvaMax">
-        <el-select v-model="queryParams.unitPowerKvaMax" placeholder="请选择机组功率(kva)" clearable size="small"
+        <el-input v-model="queryParams.unitPowerKvaMax" placeholder="请选择机组功率(kva)" clearable size="small"
           @keyup.enter.native="handleQuery">
-          <el-option v-for="(item, index) in searchOption[2]" :value="item" :key="index">{{ item }}</el-option>
-        </el-select>
+        
+        </el-input>
       </el-form-item>
- 
+
       <el-form-item label="频率" prop="rate">
         <el-select v-model="queryParams.rate" placeholder="请选择频率" clearable size="small"
           @keyup.enter.native="handleQuery">
@@ -87,19 +87,40 @@
       <el-table-column width="180px" label="柴油机型号" align="center" prop="dieselEngineModel" />
       <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="generatorModel" />
-      <el-table-column label="发电机价格" align="center" prop="generatorPrice" />
+
+      <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="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="controllerMinbei" />
+      <el-table-column label="控制器价格" align="center" prop="controllerPrice" /> -->
+
+      <el-table-column label="合计含税成本(静音配仿斯坦福)" align="center" prop="totalCostMuteFstf" />
+      <el-table-column label="合计含税成本(静音配利来森马)" align="center" prop="totalCostMuteLlsm" />
+      <el-table-column label="合计含税成本(静音配美迪奥)" align="center" prop="totalCostMuteMda" />
+      <el-table-column label="合计含税成本(静音配马拉松)" align="center" prop="totalCostMuteMls" />
+      <el-table-column label="合计含税成本(静音配斯坦福)" align="center" prop="totalCostMuteStf" />
+
+      <el-table-column label="合计含税成本(开架配仿斯坦福)" align="center" prop="totalCostOpenFstf" />
+      <el-table-column label="合计含税成本(开架配利来森马)" align="center" prop="totalCostOpenLlsm" />
+      <el-table-column label="合计含税成本(开架配美迪奥)" align="center" prop="totalCostOpenMda" />
+      <el-table-column label="合计含税成本(开架配马拉松)" align="center" prop="totalCostOpenMls" />
+      <el-table-column label="合计含税成本(开架配斯坦福)" align="center" prop="totalCostOpenStf" />
+
+      <!-- <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" />
@@ -107,7 +128,7 @@
       <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="CKD尺寸" align="center" prop="ckdHigh" /> -->
       <el-table-column fixed="right" width="180px" 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)"
@@ -134,10 +155,10 @@
     <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-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-select>
+
         </el-form-item>
         <el-form-item label="机组功率(kw)" prop="unitPowerKw">
           <el-input v-model="form.unitPowerKw" placeholder="请输入机组功率(kw)" />
@@ -148,6 +169,9 @@
         <el-form-item label="频率(Hz)" prop="rate">
           <el-input v-model="form.rate" placeholder="请输入频率(Hz)" />
         </el-form-item>
+        <el-form-item label="动力品牌" prop="brand">
+          <el-input v-model="form.brand" placeholder="请输入动力品牌" />
+        </el-form-item>
         <el-form-item label="柴油机型号" prop="dieselEngineModel">
           <el-input v-model="form.dieselEngineModel" placeholder="请输入柴油机型号" />
         </el-form-item>
@@ -157,11 +181,35 @@
         <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 label="发电机型号(仿斯坦福)" prop="generatorModelFstf">
+          <el-input v-model="form.generatorModelFstf" placeholder="请输入发电机型号(仿斯坦福)" />
+        </el-form-item>
+        <el-form-item label="发电机价格(仿斯坦福)" prop="generatorPriceFstf">
+          <el-input v-model="form.generatorPriceFstf" placeholder="请输入发电机价格(仿斯坦福)" />
+        </el-form-item>
+        <el-form-item label="发电机型号(斯坦福)" prop="generatorModelStf">
+          <el-input v-model="form.generatorModelStf" placeholder="请输入发电机型号(斯坦福)" />
+        </el-form-item>
+        <el-form-item label="发电机价格(斯坦福)" prop="generatorPriceStf">
+          <el-input v-model="form.generatorPriceStf" placeholder="请输入发电机价格(斯坦福)" />
+        </el-form-item>
+        <el-form-item label="发电机型号(利来森马)" prop="generatorModelLlsm">
+          <el-input v-model="form.generatorModelLlsm" placeholder="请输入发电机型号(利来森马)" />
+        </el-form-item>
+        <el-form-item label="发电机价格(利来森马)" prop="generatorPriceLlsm">
+          <el-input v-model="form.generatorPriceLlsm" placeholder="请输入发电机价格(利来森马)" />
         </el-form-item>
-        <el-form-item label="发电机价格" prop="generatorPrice">
-          <el-input v-model="form.generatorPrice" placeholder="请输入发电机价格" />
+        <el-form-item label="发电机型号(马拉松)" prop="generatorModelMls">
+          <el-input v-model="form.generatorModelMls" placeholder="请输入发电机型号(马拉松)" />
+        </el-form-item>
+        <el-form-item label="发电机价格(马拉松)" prop="generatorPriceMls">
+          <el-input v-model="form.generatorPriceMls" placeholder="请输入发电机价格(马拉松)" />
+        </el-form-item>
+        <el-form-item label="发电机型号(美迪奥)" prop="generatorModelMda">
+          <el-input v-model="form.generatorModelMda" placeholder="请输入发电机型号(美迪奥)" />
+        </el-form-item>
+        <el-form-item label="发电机价格(美迪奥)" prop="generatorPriceMda">
+          <el-input v-model="form.generatorPriceMda" placeholder="请输入发电机价格(美迪奥)" />
         </el-form-item>
         <el-form-item label="静音机壳价格" prop="mutePrice">
           <el-input v-model="form.mutePrice" placeholder="请输入静音机壳价格" />
@@ -181,45 +229,43 @@
         <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 label="合计含税成本(静音配仿斯坦福)" prop="totalCostMuteFstf">
+          <el-input v-model="form.totalCostMuteFstf" placeholder="请输入合计含税成本(静音配仿斯坦福)" />
         </el-form-item>
-        <el-form-item label="控制器价格" prop="controllerPrice">
-          <el-input v-model="form.controllerPrice" placeholder="请输入控制器价格" />
+        <el-form-item label="合计含税成本(开架配仿斯坦福)" prop="totalCostOpenFstf">
+          <el-input v-model="form.totalCostOpenFstf" placeholder="请输入合计含税成本(开架配仿斯坦福)" />
         </el-form-item>
-        <el-form-item label="合计含税成本(静音)" prop="totalCostMute">
-          <el-input v-model="form.totalCostMute" placeholder="请输入合计含税成本(静音)" />
+        <el-form-item label="合计含税成本(静音配斯坦福)" prop="totalCostMuteStf">
+          <el-input v-model="form.totalCostMuteStf" placeholder="请输入合计含税成本(静音配斯坦福)" />
         </el-form-item>
-        <el-form-item label="合计含税成本(开架)" prop="totalCostOpen">
-          <el-input v-model="form.totalCostOpen" placeholder="请输入合计含税成本(开架)" />
+        <el-form-item label="合计含税成本(开架配斯坦福)" prop="totalCostOpenStf">
+          <el-input v-model="form.totalCostOpenStf" placeholder="请输入合计含税成本(开架配斯坦福)" />
         </el-form-item>
-        <el-form-item label="静音尺寸" prop="muteLong">
-          <el-input v-model="form.muteLong" placeholder="请输入静音尺寸" />
+        <el-form-item label="合计含税成本(静音配利来森马)" prop="totalCostMuteLlsm">
+          <el-input v-model="form.totalCostMuteLlsm" placeholder="请输入合计含税成本(静音配利来森马)" />
         </el-form-item>
-        <el-form-item label="静音尺寸" prop="muteWidth">
-          <el-input v-model="form.muteWidth" placeholder="请输入静音尺寸" />
+        <el-form-item label="合计含税成本(开架配利来森马)" prop="totalCostOpenLlsm">
+          <el-input v-model="form.totalCostOpenLlsm" placeholder="请输入合计含税成本(开架配利来森马)" />
         </el-form-item>
-        <el-form-item label="静音尺寸" prop="muteHigh">
-          <el-input v-model="form.muteHigh" placeholder="请输入静音尺寸" />
+        <el-form-item label="合计含税成本(静音配马拉松)" prop="totalCostMuteMls">
+          <el-input v-model="form.totalCostMuteMls" placeholder="请输入合计含税成本(静音配马拉松)" />
         </el-form-item>
-        <el-form-item label="开架尺寸" prop="openLong">
-          <el-input v-model="form.openLong" placeholder="请输入开架尺寸" />
+        <el-form-item label="合计含税成本(开架配马拉松)" prop="totalCostOpenMls">
+          <el-input v-model="form.totalCostOpenMls" placeholder="请输入合计含税成本(开架配马拉松)" />
         </el-form-item>
-        <el-form-item label="开架尺寸" prop="openWidth">
-          <el-input v-model="form.openWidth" placeholder="请输入开架尺寸" />
+        <el-form-item label="合计含税成本(静音配美迪奥)" prop="totalCostMuteMda">
+          <el-input v-model="form.totalCostMuteMda" placeholder="请输入合计含税成本(静音配美迪奥)" />
         </el-form-item>
-        <el-form-item label="开架尺寸" prop="openHigh">
-          <el-input v-model="form.openHigh" placeholder="请输入开架尺寸" />
+        <el-form-item label="合计含税成本(开架配美迪奥)" prop="totalCostOpenMda">
+          <el-input v-model="form.totalCostOpenMda" placeholder="请输入合计含税成本(开架配美迪奥)" />
         </el-form-item>
-        <el-form-item label="CKD尺寸" prop="ckdLong">
-          <el-input v-model="form.ckdLong" placeholder="请输入CKD尺寸" />
+        <el-form-item label="静音尺寸" prop="muteParms">
+          <el-input v-model="form.muteParms" placeholder="请输入静音尺寸" />
         </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 label="静音尺寸" prop="openParms">
+          <el-input v-model="form.openParms" placeholder="请输入静音尺寸" />
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

src/views/price/query/index.vue

@@ -66,7 +66,6 @@
 
     <el-table fit :row-style="{ height: '35px' }" v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-
       <el-table-column label="品牌" align="center" prop="brand" />
       <el-table-column width="180px" label="机组型号" align="center" prop="unitModel" />
       <el-table-column label="机组功率(kw)" align="center" prop="unitPowerKw" />
@@ -75,27 +74,43 @@
       <el-table-column width="180px" label="柴油机型号" align="center" prop="dieselEngineModel" />
       <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="generatorModel" />
-      <!-- <el-table-column label="发电机价格" align="center" prop="generatorPrice" /> -->
+
+      <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="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" prop="totalCostMuteFstf" />
+      <el-table-column label="合计含税成本(静音配利来森马)" align="center" prop="totalCostMuteLlsm" />
+      <el-table-column label="合计含税成本(静音配美迪奥)" align="center" prop="totalCostMuteMda" />
+      <el-table-column label="合计含税成本(静音配马拉松)" align="center" prop="totalCostMuteMls" />
+      <el-table-column label="合计含税成本(静音配斯坦福)" align="center" prop="totalCostMuteStf" />
+
+      <el-table-column label="合计含税成本(开架配仿斯坦福)" align="center" prop="totalCostOpenFstf" />
+      <el-table-column label="合计含税成本(开架配利来森马)" align="center" prop="totalCostOpenLlsm" />
+      <el-table-column label="合计含税成本(开架配美迪奥)" align="center" prop="totalCostOpenMda" />
+      <el-table-column label="合计含税成本(开架配马拉松)" align="center" prop="totalCostOpenMls" />
+      <el-table-column label="合计含税成本(开架配斯坦福)" align="center" prop="totalCostOpenStf" />
+    
       <el-table-column width="180px" 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)"