From c07e56183c5c953701dd8f9cbd79a4376ade91cb Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Mon, 13 Feb 2023 10:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/product.js                      |  43 ++++
 src/components/pagination/index.vue     |  46 ++++
 src/main.js                             |  17 ++
 src/router/index.js                     |   2 +-
 src/views/product/components/add.vue    | 142 ++++++++----
 src/views/product/components/adjust.vue |  84 +++++++
 src/views/product/components/batch.vue  |  85 +++++++
 src/views/product/components/create.vue | 180 +++++++++++++++
 src/views/product/components/record.vue | 287 ++++++++++++++++++++++++
 src/views/product/index.vue             | 272 +++++++++++++---------
 src/views/refineryInfo/index.vue        |  42 ++--
 11 files changed, 1031 insertions(+), 169 deletions(-)
 create mode 100644 src/api/product.js
 create mode 100644 src/components/pagination/index.vue
 create mode 100644 src/views/product/components/adjust.vue
 create mode 100644 src/views/product/components/batch.vue
 create mode 100644 src/views/product/components/create.vue
 create mode 100644 src/views/product/components/record.vue

diff --git a/src/api/product.js b/src/api/product.js
new file mode 100644
index 0000000..59a448c
--- /dev/null
+++ b/src/api/product.js
@@ -0,0 +1,43 @@
+import request from "utils/axios.js";
+// table
+const getByPage = (params) => {
+  return request.postJson("/oil-refinery/oilRefineryProduct/getByPage", params);
+};
+// 新增
+const save = (params) => {
+  return request.postJson("/oil-refinery/oilRefineryProduct/save", params);
+};
+// 修改
+const update = (params) => {
+  return request.postJson("/oil-refinery/oilRefineryProduct/update", params);
+};
+// 调价记录table
+const getByPageRecord = (params) => {
+  return request.postJson(
+    "/oil-refinery/oilRefineryPriceChangelog/getByPage",
+    params
+  );
+};
+// 批量修改
+const updateBatchEnable = (params) => {
+  return request.postJson(
+    "/oil-refinery/oilRefineryProduct/updateBatchEnable",
+    params
+  );
+};
+// 调价
+const modifyPrice = (params) => {
+  return request.postJson(
+    "/oil-refinery/oilRefineryProduct/modifyPrice",
+    params
+  );
+};
+
+export default {
+  getByPage,
+  save,
+  update,
+  getByPageRecord,
+  updateBatchEnable,
+  modifyPrice,
+};
diff --git a/src/components/pagination/index.vue b/src/components/pagination/index.vue
new file mode 100644
index 0000000..21733fc
--- /dev/null
+++ b/src/components/pagination/index.vue
@@ -0,0 +1,46 @@
+<template>
+  <div class="pagination">
+    <el-pagination
+      background
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="parameter.currentPage"
+      :page-size="parameter.pageSize"
+      :popper-append-to-body="false"
+      :page-sizes="[10, 20, 30, 50]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="parameter.total"
+    >
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    parameter: Object,
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    // currentPage change
+    handleCurrentChange(page) {
+      this.parameter.currentPage = page;
+      this.$emit("searchAgain");
+    },
+    // pageSize change
+    handleSizeChange(size) {
+      this.parameter.currentPage = 1;
+      this.parameter.pageSize = size;
+      this.$emit("searchAgain");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.pagination {
+  text-align: center;
+}
+</style>
diff --git a/src/main.js b/src/main.js
index 5ad04cf..3f08acb 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,6 +21,23 @@ Vue.use(ElementUI, { language, size: "medium" });
 Vue.config.productionTip = false;
 Vue.prototype.$utils = utils;
 
+Vue.directive("checkNum", {
+  update(el, binding, vNode) {
+    if (el.children.length) {
+      let val = el.children[0].value;
+      let qualifiedNum = val
+        .replace(/[^\d.]/g, "")
+        .replace(/^\./g, "")
+        .replace(/\.{2,}/g, ".")
+        .replace(/^0{2,}/g, "0")
+        .replace(".", "$#$")
+        .replace(/\./g, "")
+        .replace("$#$", ".");
+      vNode.componentInstance.$emit("input", qualifiedNum);
+    }
+  },
+});
+
 new Vue({
   el: "#app",
   router,
diff --git a/src/router/index.js b/src/router/index.js
index 6df9d21..f2bb743 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,7 +6,7 @@ Vue.use(Router);
 export const constantRoutes = [
   {
     path: "/",
-    redirect: "/refineryInfo",
+    redirect: "/product",
   },
   {
     path: "/login",
diff --git a/src/views/product/components/add.vue b/src/views/product/components/add.vue
index 3b9d363..62d26e0 100644
--- a/src/views/product/components/add.vue
+++ b/src/views/product/components/add.vue
@@ -8,48 +8,73 @@
     :before-close="closeWindow"
   >
     <div class="add">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="炼厂名称" prop="refineryName">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="产品名称" prop="productName">
           <el-input
             maxlength="50"
-            v-model="form.refineryName"
-            placeholder="请输入炼厂名称"
+            v-model="form.productName"
+            placeholder="请输入产品名称"
           ></el-input>
         </el-form-item>
-        <el-form-item label="炼厂类型" prop="refineryType">
-          <el-select v-model="form.refineryType" placeholder="请选择炼厂类型">
+        <el-form-item label="产品类型" prop="productType">
+          <el-select v-model="form.productType" placeholder="请选择产品类型">
             <el-option
-              v-for="(item, index) in refineryTypeEnum"
+              v-for="(item, index) in productTypeList"
               :key="index"
               :label="item.label"
               :value="item.value"
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="炼厂名称" prop="refineryId">
+          <el-select v-model="form.refineryId" placeholder="请选择炼厂">
+            <el-option
+              v-for="(item, index) in refineryList"
+              :key="index"
+              :label="item.refineryName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属炼厂库名" prop="belongLibrary">
+          <el-input
+            v-model="form.belongLibrary"
+            placeholder="请输入内容"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="成本价" prop="floorPrice">
+          <el-input
+            v-checkNum
+            v-model="form.floorPrice"
+            placeholder="请输入内容"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="企业销售价" prop="salePrice2company">
+          <el-input
+            v-checkNum
+            v-model="form.salePrice2company"
+            placeholder="请输入内容"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="个人销售价" prop="salePrice2personal">
+          <el-input
+            v-checkNum
+            v-model="form.salePrice2personal"
+            placeholder="请输入内容"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="计量单位" prop="measurement">
+          <el-input
+            v-model="form.measurement"
+            placeholder="请输入内容"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="启用状态" prop="enableMark">
           <el-radio-group v-model="form.enableMark">
             <el-radio label="ENABLE">启用</el-radio>
             <el-radio label="DISABLE">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="炼厂等级" prop="refineryLevel">
-          <el-select v-model="form.refineryLevel" placeholder="请选择炼厂等级">
-            <el-option label="A" value="A"></el-option>
-            <el-option label="B" value="B"></el-option>
-            <el-option label="C" value="C"></el-option>
-            <el-option label="D" value="D"></el-option>
-            <el-option label="E" value="E"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="炼厂地址" prop="address">
-          <el-input
-            type="textarea"
-            :rows="5"
-            maxlength="255"
-            placeholder="请输入炼厂地址"
-            v-model="form.address"
-          ></el-input>
-        </el-form-item>
       </el-form>
     </div>
     <div class="buttons">
@@ -60,34 +85,69 @@
 </template>
 
 <script>
-import serve from "api/refineryInfo.js";
+import serve from "api/product.js";
+import refineryServe from "api/refineryInfo.js";
 export default {
   props: {
     controlWindows: Object,
-    refineryTypeEnum: Array,
+    // refineryTypeEnum: Array,
   },
   data() {
     return {
-      form: {},
+      form: { name: "" },
+      refineryList: [],
+      productTypeList: [
+        {
+          label: "0#柴",
+          value: "0#",
+        },
+        {
+          label: "-10#柴",
+          value: "-10#",
+        },
+        {
+          label: "92#汽",
+          value: "92#",
+        },
+        {
+          label: "95#汽",
+          value: "95#",
+        },
+      ],
       rules: {
-        refineryName: [
-          { required: true, message: "请输入炼厂名称", trigger: "blur" },
+        productName: [
+          { required: true, message: "请输入产品名称", trigger: "blur" },
         ],
-        refineryType: [
-          { required: true, message: "请选择炼厂类型", trigger: "blur" },
+        productType: [
+          { required: true, message: "请选择产品类型", trigger: "blur" },
         ],
-        enableMark: [
-          { required: true, message: "请选择启用状态", trigger: "blur" },
+        refineryId: [
+          { required: true, message: "请选择炼厂", trigger: "blur" },
         ],
-        refineryLevel: [
-          { required: true, message: "请选择炼厂等级", trigger: "blur" },
+        belongLibrary: [
+          { required: true, message: "请输入所属炼厂库名", trigger: "blur" },
         ],
-        address: [
-          { required: true, message: "请输入炼厂地址", trigger: "blur" },
+        floorPrice: [
+          { required: true, message: "请输入所属炼厂库名", trigger: "blur" },
+        ],
+        salePrice2company: [
+          { required: true, message: "请输入所属炼厂库名", trigger: "blur" },
+        ],
+        salePrice2personal: [
+          { required: true, message: "请输入所属炼厂库名", trigger: "blur" },
+        ],
+        measurement: [
+          { required: true, message: "请输入计量单位", trigger: "blur" },
+        ],
+        enableMark: [
+          { required: true, message: "请选择启用状态", trigger: "blur" },
         ],
       },
     };
   },
+  created() {
+    this.findByEntity();
+  },
   methods: {
     openDrawer() {
       let { id } = this.controlWindows.addInfo;
@@ -113,6 +173,12 @@ export default {
       if (id) return serve.update(form);
       else return serve.save(form);
     },
+    //炼厂list
+    findByEntity() {
+      refineryServe.findByEntity().then((res) => {
+        this.refineryList = res.data;
+      });
+    },
     closeWindow() {
       this.$emit("closeWindow");
       this.$refs.form.clearValidate();
diff --git a/src/views/product/components/adjust.vue b/src/views/product/components/adjust.vue
new file mode 100644
index 0000000..4836a46
--- /dev/null
+++ b/src/views/product/components/adjust.vue
@@ -0,0 +1,84 @@
+<template>
+  <el-dialog
+    title="调价"
+    :visible="controlWindows.adjust"
+    width="30%"
+    :before-close="closeWindow"
+    @opened="openDrawer"
+  >
+    <div class="adjust">
+      <el-form ref="form" :rules="rules" :model="form" label-width="120px">
+        <el-form-item label="成本价" prop="floorPrice">
+          <el-input
+            maxlength="50"
+            v-checkNum
+            v-model="form.floorPrice"
+            placeholder="请输入成本价"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="企业销售价" prop="salePrice2company">
+          <el-input
+            maxlength="50"
+            v-checkNum
+            v-model="form.salePrice2company"
+            placeholder="请输入企业销售价"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="controlWindows.adjust = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import serve from "api/product.js";
+
+export default {
+  props: {
+    controlWindows: Object,
+  },
+  data() {
+    return {
+      form: {},
+      rules: {
+        floorPrice: [
+          { required: true, message: "请输入成本价", trigger: "blur" },
+        ],
+        salePrice2company: [
+          { required: true, message: "请选择修改状态", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  methods: {
+    openDrawer() {},
+    submit() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          Object.assign(this.form, this.controlWindows.addInfo);
+          serve.modifyPrice(this.form).then((res) => {
+            this.$message.success(res.msg);
+            this.closeWindow();
+          });
+        }
+      });
+    },
+    closeWindow() {
+      this.form = {};
+      this.$emit("closeWindow");
+      this.controlWindows.adjust = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.adjust {
+  .el-input {
+    width: 200px;
+  }
+}
+</style>
diff --git a/src/views/product/components/batch.vue b/src/views/product/components/batch.vue
new file mode 100644
index 0000000..ca9b3ec
--- /dev/null
+++ b/src/views/product/components/batch.vue
@@ -0,0 +1,85 @@
+<template>
+  <el-dialog
+    title="批量修改"
+    :visible="controlWindows.batch"
+    width="30%"
+    :before-close="closeWindow"
+    @opened="openDrawer"
+  >
+    <div class="batch">
+      <el-form ref="form" :rules="rules" :model="form" label-width="120px">
+        <el-form-item>
+          <p class="tip">
+            已选择 <span>{{ multipleRowList.length }}</span> 条数据
+          </p>
+        </el-form-item>
+        <el-form-item label="状态" prop="enableMark">
+          <el-radio-group v-model="form.enableMark">
+            <el-radio label="ENABLE">启用</el-radio>
+            <el-radio label="DISABLE">禁用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="controlWindows.batch = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import serve from "api/product.js";
+
+export default {
+  props: {
+    controlWindows: Object,
+    multipleRowList: Array,
+  },
+  data() {
+    return {
+      list: [],
+      form: {},
+      rules: {
+        enableMark: [
+          { required: true, message: "请选择修改状态", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  methods: {
+    openDrawer() {
+      this.list = JSON.parse(JSON.stringify(this.multipleRowList));
+    },
+    submit() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.list.map((item) => {
+            item.enableMark = this.form.enableMark;
+          });
+          serve.updateBatchEnable(this.list).then((res) => {
+            this.$message.success(res.msg);
+            this.closeWindow();
+          });
+        }
+      });
+    },
+    closeWindow() {
+      this.list = [];
+      this.form = {};
+      this.$emit("closeWindow");
+      this.controlWindows.batch = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.batch {
+  .tip {
+    span {
+      color: orange;
+    }
+  }
+}
+</style>
diff --git a/src/views/product/components/create.vue b/src/views/product/components/create.vue
new file mode 100644
index 0000000..37d103c
--- /dev/null
+++ b/src/views/product/components/create.vue
@@ -0,0 +1,180 @@
+<template>
+  <el-drawer
+    title="创建订单"
+    direction="rtl"
+    size="40%"
+    :visible="controlWindows.create"
+    @opened="openDrawer"
+    :before-close="closeWindow"
+  >
+    <div class="create">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="客户名称" prop="productName">
+          <el-input
+            maxlength="50"
+            v-model="form.productName"
+            placeholder="请输入客户名称"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="炼厂名称" prop="refineryId">
+          <el-select v-model="form.refineryId" placeholder="请选择炼厂">
+            <el-option
+              v-for="(item, index) in refineryList"
+              :key="index"
+              :label="item.refineryName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="产品类型" prop="productType">
+          <el-select v-model="form.productType" placeholder="请选择产品类型">
+            <el-option
+              v-for="(item, index) in productTypeList"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="产品名称" prop="productName">
+          <el-input
+            maxlength="50"
+            v-model="form.productName"
+            placeholder="请输入产品名称"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="销售价" prop="productName">
+          <el-input
+            maxlength="50"
+            v-model="form.productName"
+            placeholder="请输入销售价"
+          ></el-input>
+          元/吨
+        </el-form-item>
+        <el-form-item label="预约提货量" prop="productName">
+          <el-input
+            maxlength="50"
+            v-model="form.productName"
+            placeholder="请输入预约提货量"
+          ></el-input>
+          吨
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="buttons">
+      <el-button @click="controlWindows.create = false">取消 </el-button>
+      <el-button @click="submit">确定</el-button>
+    </div>
+  </el-drawer>
+</template>
+
+<script>
+import serve from "api/product.js";
+import refineryServe from "api/refineryInfo.js";
+export default {
+  props: {
+    controlWindows: Object,
+    // refineryTypeEnum: Array,
+  },
+  data() {
+    return {
+      form: {},
+      refineryList: [],
+      productTypeList: [
+        {
+          label: "0#柴",
+          value: "0#",
+        },
+        {
+          label: "-10#柴",
+          value: "-10#",
+        },
+        {
+          label: "92#汽",
+          value: "92#",
+        },
+        {
+          label: "95#汽",
+          value: "95#",
+        },
+      ],
+      rules: {
+        productName: [
+          { required: true, message: "请输入产品名称", trigger: "blur" },
+        ],
+        refineryId: [
+          { required: true, message: "请选择炼厂", trigger: "blur" },
+        ],
+        enableMark: [
+          { required: true, message: "请选择启用状态", trigger: "blur" },
+        ],
+        productType: [
+          { required: true, message: "请选择产品类型", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.findByEntity();
+  },
+  methods: {
+    openDrawer() {},
+    submit() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.judgeInterface(this.form).then((res) => {
+            if (res.code === 20000) {
+              this.$message.success(res.msg);
+              this.closeWindow();
+            }
+          });
+        }
+      });
+    },
+    judgeInterface(form) {
+      let { id } = this.controlWindows.addInfo;
+      if (id) return serve.update(form);
+      else return serve.save(form);
+    },
+    //炼厂list
+    findByEntity() {
+      refineryServe.findByEntity().then((res) => {
+        this.refineryList = res.data;
+      });
+    },
+    closeWindow() {
+      this.$emit("closeWindow");
+      this.$refs.form.clearValidate();
+      this.form = {};
+      this.controlWindows.create = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.create {
+  padding: 20px;
+  .el-input,
+  .el-select,
+  .el-textarea {
+    width: 300px;
+  }
+}
+.buttons {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  padding-right: 40px;
+  width: 100%;
+  height: 80px;
+  line-height: 80px;
+  text-align: right;
+  border-top: 1px solid #f2f3f5;
+  .el-button {
+    text-align: right;
+    font-size: 14px;
+    border-radius: 5px;
+  }
+}
+</style>
diff --git a/src/views/product/components/record.vue b/src/views/product/components/record.vue
new file mode 100644
index 0000000..ad7511c
--- /dev/null
+++ b/src/views/product/components/record.vue
@@ -0,0 +1,287 @@
+<template>
+  <el-drawer
+    title="调价记录"
+    direction="ltr"
+    size="60%"
+    :visible="controlWindows.record"
+    :before-close="closeWindow"
+    @opened="openDrawer"
+  >
+    <div class="record">
+      <div class="frame record-frame">
+        <!-- <el-input
+          class="mr20"
+                    placeholder="创建人"
+          v-model="parameter.params.productName"
+          :fetch-suggestions="querySearchAsync"
+          @select="handleSelect"
+
+        ></el-input> -->
+        <el-date-picker
+          v-model="datetime"
+          type="datetimerange"
+          align="right"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          :default-time="['00:00:00', '23:59:59']"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          @change="changeDateTime"
+        >
+        </el-date-picker>
+
+        <div class="buttons">
+          <el-button icon="el-icon-search" @click="search">查询</el-button>
+          <el-button icon="el-icon-refresh" @click="initDateTime"
+            >重置</el-button
+          >
+        </div>
+      </div>
+      <div class="table">
+        <el-table
+          v-if="tableHeight"
+          ref="multipleTable"
+          :height="tableHeight"
+          :data="tableData"
+          style="width: 100%"
+        >
+          <el-table-column label="成本价">
+            <template slot-scope="{ row }">
+              {{ row.floorPrice }}/{{ row.measurement }}
+            </template>
+          </el-table-column>
+          <el-table-column label="上次成本价">
+            <template slot-scope="{ row }">
+              {{ row.lastFloorPrice }}/{{ row.measurement }}
+            </template>
+          </el-table-column>
+          <el-table-column label="企业销售价">
+            <template slot-scope="{ row }">
+              {{ row.salePrice2company }}/{{ row.measurement }}
+            </template>
+          </el-table-column>
+          <el-table-column label="上次企业销售价">
+            <template slot-scope="{ row }">
+              {{ row.lastSalePrice2company }}/{{ row.measurement }}</template
+            >
+          </el-table-column>
+          <el-table-column label="个人销售价">
+            <template slot-scope="{ row }">
+              {{ row.salePrice2personal }}/{{ row.measurement }}
+            </template>
+          </el-table-column>
+          <el-table-column label="上次个人销售价">
+            <template slot-scope="{ row }">
+              {{ row.lastSalePrice2personal }}/{{ row.measurement }}</template
+            >
+          </el-table-column>
+          <el-table-column label="时间" width="235">
+            <template slot-scope="{ row }">
+              <p class="gray">
+                创建人 <span>{{ row.createUserName }}</span>
+              </p>
+              <p class="gray">
+                创建时间 <span>{{ row.createTime }}</span>
+              </p>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- <el-pagination
+          class="record-el-pagination"
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="parameter.currentPage"
+          :page-size="parameter.pageSize"
+          :popper-append-to-body="false"
+          :page-sizes="[10, 20, 30, 50]"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+        >
+        </el-pagination> -->
+        <!-- 分页 -->
+        <pagination
+          class="record-el-pagination"
+          :parameter="parameter"
+          @searchAgain="getByPageRecord"
+        />
+      </div>
+    </div>
+    <div class="footer-buttons">
+      <el-button @click="controlWindows.record = false">关闭 </el-button>
+      <!-- <el-button @click="submit">确定</el-button> -->
+    </div>
+  </el-drawer>
+</template>
+
+<script>
+import serve from "api/product.js";
+
+import pagination from "components/pagination/index.vue";
+export default {
+  props: {
+    controlWindows: Object,
+  },
+  data() {
+    return {
+      datetime: [],
+      tableHeight: 0,
+      tableData: [],
+      total: 0,
+      parameter: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        params: {
+          startCreateTime: "",
+          endCreateTime: "",
+        },
+      },
+    };
+  },
+  components: {
+    pagination,
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    openDrawer() {
+      let { id } = this.controlWindows.addInfo;
+      if (id) {
+        this.$nextTick(() => {
+          this.heightHandle();
+          window.addEventListener(
+            "resize",
+            this.$utils.debounce(this.heightHandle, 500)
+          );
+        });
+        this.initDateTime();
+        this.parameter.params.productId = id;
+        this.getByPageRecord();
+      }
+    },
+    initDateTime() {
+      let now = new Date().getTime();
+      let beforeDay30 = now - 1000 * 60 * 60 * 24 * 30;
+      let nowRes = this.$utils.parseTime(now);
+      let beforeDay30Res = this.$utils.parseTime(beforeDay30);
+      let { y, M, d } = nowRes;
+      let { y: beforey, M: beforeM, d: befored } = beforeDay30Res;
+      this.datetime = [
+        `${beforey}-${beforeM}-${befored} 00:00:00`,
+        `${y}-${M}-${d} 23:59:59`,
+      ];
+      this.changeDateTime(this.datetime);
+    },
+    changeDateTime(val) {
+      if (val) {
+        this.parameter.params.startCreateTime = val[0];
+        this.parameter.params.endCreateTime = val[1];
+      }
+    },
+    search() {
+      this.parameter.currentPage = 1;
+      this.getByPageRecord();
+    },
+    // table
+    getByPageRecord() {
+      serve.getByPageRecord(this.parameter).then((res) => {
+        this.tableData = res.data.list;
+        this.parameter.total = res.data.totalPage;
+      });
+    },
+    // table height
+    heightHandle() {
+      let bodyHeight = document.body.clientHeight;
+      let drawerHeaderHeight =
+        this.obtainElement(".el-drawer__header").clientHeight;
+      let frameHeight = this.obtainElement(".record-frame").clientHeight;
+      let paginationHeight = this.obtainElement(
+        ".record-el-pagination"
+      ).clientHeight;
+      this.tableHeight =
+        bodyHeight - drawerHeaderHeight - frameHeight - paginationHeight - 230;
+    },
+    obtainElement(className) {
+      return document.documentElement.querySelector(className);
+    },
+    closeWindow() {
+      window.removeEventListener(
+        "resize",
+        this.$utils.debounce(this.heightHandle, 500)
+      );
+      this.$emit("closeWindow");
+      this.parameter = {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        params: { startCreateTime: "", endCreateTime: "" },
+      };
+      this.controlWindows.addInfo = {};
+      this.controlWindows.record = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.record {
+  padding: 0 20px;
+  .el-input,
+  .el-select,
+  .el-textarea {
+    width: 300px;
+  }
+  .frame {
+    padding: 20px;
+    border-radius: 6px;
+    border: 1px solid #e3e3e5;
+    background: #fff;
+    .el-input,
+    .el-select {
+      width: 183px;
+      height: 40px;
+    }
+    .el-input + .el-input,
+    .el-input + .el-select,
+    .el-select + .el-select,
+    .el-select + .el-input,
+    .el-input + .el-date-picker {
+      margin-right: 20px;
+      margin-bottom: 15px;
+    }
+    .mr20 {
+      margin-right: 20px;
+    }
+    .buttons {
+      text-align: right;
+    }
+  }
+  .table {
+    overflow: hidden;
+    margin-top: 20px;
+    padding-bottom: 20px;
+    background: #fff;
+    border-radius: 6px;
+    border: 1px solid #e3e3e5;
+    .record-el-pagination {
+      margin-top: 15px;
+    }
+  }
+}
+.footer-buttons {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  padding-right: 40px;
+  width: 100%;
+  height: 80px;
+  line-height: 80px;
+  text-align: right;
+  border-top: 1px solid #f2f3f5;
+  .el-button {
+    text-align: right;
+    font-size: 14px;
+    border-radius: 5px;
+  }
+}
+</style>
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 1b6ce7f..4b5d8dc 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -1,29 +1,21 @@
 <template>
   <div class="order">
     <div class="frame">
-      <el-select v-model="parameter.params.id" placeholder="炼厂名称" clearable>
-        <el-option
-          v-for="item in refineryList"
-          :key="item.id"
-          :label="item.refineryName"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
+      <el-input
+        v-model="parameter.params.productName"
+        placeholder="产品名称"
+      ></el-input>
+
       <div class="buttons">
-        <el-button icon="el-icon-search" @click="handleCurrentChange(1)"
-          >查询</el-button
-        >
+        <el-button icon="el-icon-search" @click="search">查询</el-button>
         <el-button icon="el-icon-refresh" @click="reset">重置</el-button>
       </div>
     </div>
     <div class="table">
       <div class="operation">
-        <el-button icon="el-icon-upload2" @click="addition">新增产品</el-button>
-        <el-button icon="el-icon-upload2" @click="addition"
-          >批量启禁用</el-button
-        >
-        <el-button icon="el-icon-upload2" @click="addition">下单</el-button>
+        <el-button @click="addition">新增产品</el-button>
+        <el-button @click="batchHandler">批量启禁用</el-button>
+        <el-button @click="createOrder">下单</el-button>
       </div>
       <el-table
         v-if="tableHeight"
@@ -31,24 +23,27 @@
         :height="tableHeight"
         :data="tableData"
         style="width: 100%"
+        @selection-change="handleSelectionChange"
       >
+        >
+        <el-table-column type="selection" width="55"> </el-table-column>
+        <el-table-column
+          prop="productName"
+          label="产品名称"
+          show-overflow-tooltip
+        >
+        </el-table-column>
         <el-table-column
           prop="refineryName"
           label="炼厂名称"
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column prop="orderSerialNumber" label="炼厂类型" width="90">
-          <template slot-scope="{ row }">
-            {{
-              refineryTypeEnum.find((item) => item.value === row.refineryType)
-                .label
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="refineryLevel" label="炼厂等级" width="90">
-        </el-table-column>
-        <el-table-column prop="address" label="炼厂地址" show-overflow-tooltip>
+        <el-table-column
+          prop="belongLibrary"
+          label="所属炼厂库"
+          show-overflow-tooltip
+        >
         </el-table-column>
         <el-table-column prop="orderSerialNumber" label="启用状态" width="80">
           <template slot-scope="{ row }">
@@ -67,11 +62,20 @@
             </el-switch>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="orderSerialNumber"
-          label="启用产品数量"
-          width="120"
-        >
+        <el-table-column prop="refineryLevel" label="成本价" width="70">
+          <template slot-scope="{ row }">
+            {{ row.floorPrice }}/{{ row.measurement }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="refineryLevel" label="企业销售价" width="100">
+          <template slot-scope="{ row }">
+            {{ row.salePrice2company }}/{{ row.measurement }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="refineryLevel" label="个人销售价" width="100">
+          <template slot-scope="{ row }">
+            {{ row.salePrice2personal }}/{{ row.measurement }}
+          </template>
         </el-table-column>
         <el-table-column label="时间" width="235">
           <template slot-scope="{ row }">
@@ -83,45 +87,65 @@
             </p>
           </template>
         </el-table-column>
-        <el-table-column prop="orderSerialNumber" label="操作" width="150">
+        <el-table-column label="操作" width="210">
           <template slot-scope="{ row }">
-            <el-link type="primary" :underline="false" @click="update(row)"
-              >修改</el-link
+            <span class="el-dropdown-link" @click="detail(row)">详情</span>
+            <span class="el-dropdown-link special" @click="adjustPrice(row)"
+              >调价</span
             >
-            <el-link type="primary" :underline="false" @click="detail(row)"
-              >详情</el-link
+            <el-dropdown
+              @command="
+                (val) => {
+                  commandPrice(val, row);
+                }
+              "
             >
-            <el-popconfirm
-              title="确定删除该条数据吗？"
-              icon-color="red"
-              @confirm="deleteRow(row)"
+              <span class="el-dropdown-link">
+                <i class="el-icon-arrow-down el-icon--right"></i>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="record">调价记录</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+            <span class="el-dropdown-link">下单</span>
+            <el-dropdown
+              @command="
+                (val) => {
+                  commandMore(val, row);
+                }
+              "
             >
-              <el-link slot="reference" type="primary" :underline="false"
-                >删除</el-link
-              >
-            </el-popconfirm>
+              <span class="el-dropdown-link">
+                更多<i class="el-icon-arrow-down el-icon--right"></i>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="base">修改基础信息</el-dropdown-item>
+                <el-dropdown-item command="settle"
+                  >修改结算账户</el-dropdown-item
+                >
+              </el-dropdown-menu>
+            </el-dropdown>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        background
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="parameter.currentPage"
-        :page-size="parameter.pageSize"
-        :popper-append-to-body="false"
-        :page-sizes="[10, 20, 30, 50]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      >
-      </el-pagination>
+      <!-- 分页 -->
+      <pagination :parameter="parameter" @searchAgain="getByPage" />
     </div>
-    <add
+    <!--新增产品  -->
+    <add :controlWindows="controlWindows" @closeWindow="search" />
+    <!-- 下单 -->
+    <create :controlWindows="controlWindows" @closeWindow="search" />
+    <!-- 调价记录 -->
+    <record :controlWindows="controlWindows" />
+    <!-- 批量 -->
+    <batch
       :controlWindows="controlWindows"
-      :refineryTypeEnum="refineryTypeEnum"
-      @closeWindow="handleCurrentChange(1)"
+      :multipleRowList="multipleRowList"
+      @closeWindow="search"
     />
-
+    <!-- 调价 -->
+    <adjust :controlWindows="controlWindows" @closeWindow="search" />
+    <!-- 详情 -->
     <el-drawer
       title="详情"
       direction="ltr"
@@ -143,9 +167,15 @@
 </template>
 
 <script>
-import serve from "api/refineryInfo.js";
+import serve from "api/product.js";
 
 import add from "./components/add.vue";
+import create from "./components/create.vue";
+import record from "./components/record.vue";
+import batch from "./components/batch.vue";
+import adjust from "./components/adjust.vue";
+
+import pagination from "components/pagination/index.vue";
 import generalDetails from "components/generalDetails/index.vue";
 
 export default {
@@ -153,24 +183,20 @@ export default {
     return {
       controlWindows: {
         add: false,
-        addInfo: {
-          title: "炼厂入驻",
-        },
+        addInfo: {},
         detail: false,
+        create: false,
+        record: false,
+        batch: false,
+        adjust: false,
       },
-      refineryTypeEnum: [
-        {
-          label: "普通炼厂",
-          value: "COMMON",
-        },
-      ],
-      refineryList: [],
+      multipleRowList: [],
       tableHeight: 0,
       tableData: [],
-      total: 0,
       parameter: {
         currentPage: 1,
         pageSize: 10,
+        total: 0,
         params: {},
       },
       oilCompanyMatch: {},
@@ -178,15 +204,20 @@ export default {
         {
           carTitle: "",
           carItems: [
+            { label: "炼厂id", value: "refineryId" },
             { label: "炼厂名称", value: "refineryName" },
-            { label: "炼厂类型", value: "refineryType" },
-            { label: "启用状态", value: "enableMark" },
-            { label: "炼厂等级", value: "refineryLevel" },
-            { label: "炼厂地址", value: "address" },
+            { label: "产品名称", value: "productName" },
+            { label: "产品类型", value: "productType" },
+            { label: "成本价", value: "floorPrice" },
+            { label: "企业销售价", value: "salePrice2company" },
+            { label: "个人销售价", value: "salePrice2personal" },
+            { label: "计量单位", value: "measurement" },
+            { label: "启用/禁用", value: "enableMark" },
+            { label: "所属炼厂库名", value: "belongLibrary" },
             { label: "创建用户ID", value: "createUser" },
             { label: "创建时间", value: "createTime" },
             { label: "修改用户ID", value: "updateUser" },
-            { label: "修改时间", value: "updateTime" },
+            { label: "修改时间", value: "createSource" },
           ],
         },
       ],
@@ -194,6 +225,12 @@ export default {
   },
   components: {
     add,
+    create,
+    record,
+    batch,
+    adjust,
+
+    pagination,
     generalDetails,
   },
   mounted() {
@@ -206,50 +243,45 @@ export default {
     );
   },
   created() {
-    this.findByEntity();
     this.getByPage();
   },
   methods: {
-    // currentPage change
-    handleCurrentChange(page) {
-      this.parameter.currentPage = page;
-      this.getByPage();
+    // 多选
+    handleSelectionChange(val) {
+      this.multipleRowList = val;
     },
-    // pageSize change
-    handleSizeChange(size) {
+    search() {
       this.parameter.currentPage = 1;
-      this.parameter.pageSize = size;
       this.getByPage();
     },
     //table list
     getByPage() {
       serve.getByPage(this.parameter).then((res) => {
         this.tableData = res.data.list;
-        this.total = res.data.totalPage;
-      });
-    },
-    //炼厂list
-    findByEntity() {
-      serve.findByEntity().then((res) => {
-        this.refineryList = res.data;
+        this.parameter.total = res.data.totalPage;
       });
     },
     //新增
     addition() {
-      this.controlWindows.addInfo.title = "炼厂入驻";
+      this.controlWindows.addInfo.title = "产品新增";
       this.controlWindows.add = true;
     },
-    //修改
-    update(row) {
-      this.controlWindows.addInfo.title = "炼厂修改";
-      Object.assign(this.controlWindows.addInfo, row);
-      this.controlWindows.add = true;
+
+    //下单
+    createOrder(row) {
+      this.controlWindows.create = true;
+      console.log(this.controlWindows.create);
     },
     //详情
     detail(row) {
       this.oilCompanyMatch = row;
       this.controlWindows.detail = true;
     },
+    //调价
+    adjustPrice(row) {
+      this.controlWindows.addInfo = { id: row.id };
+      this.controlWindows.adjust = true;
+    },
     //删除
     deleteRow(row) {
       serve
@@ -261,6 +293,21 @@ export default {
           this.getByPage();
         });
     },
+    //更多
+    commandMore(val, row) {
+      if (val === "base") {
+        this.controlWindows.addInfo.title = "产品修改";
+        Object.assign(this.controlWindows.addInfo, row);
+        this.controlWindows.add = true;
+      }
+    },
+    //调价
+    commandPrice(val, row) {
+      if (val === "record") {
+        this.controlWindows.addInfo = { id: row.id };
+        this.controlWindows.record = true;
+      }
+    },
     //启用禁用
     switchTrigger(val, row) {
       row.enableMark = row.enableMark;
@@ -275,11 +322,21 @@ export default {
           } else this.$message.error(res.msg);
         });
     },
+    //批量启用禁用
+    batchHandler() {
+      if (!this.multipleRowList.length) {
+        this.$message.warning("请至少选择一条数据");
+        return;
+      }
+
+      this.controlWindows.batch = true;
+    },
     //重置
     reset() {
       this.parameter = {
         currentPage: 1,
         pageSize: 10,
+        total: 0,
         params: {},
       };
     },
@@ -349,8 +406,21 @@ export default {
       margin-bottom: 20px;
       border-radius: 10px 10px 0px 0px;
     }
-    .el-link {
+    // .el-link,
+    // .el-dropdown {
+    //   margin-right: 10px;
+    // }
+
+    .el-dropdown-link {
       margin-right: 10px;
+      cursor: pointer;
+      color: #409eff;
+      &.special {
+        margin-right: 0;
+      }
+    }
+    .el-icon-arrow-down {
+      font-size: 12px;
     }
   }
 }
diff --git a/src/views/refineryInfo/index.vue b/src/views/refineryInfo/index.vue
index 6ce2a00..9153c3b 100644
--- a/src/views/refineryInfo/index.vue
+++ b/src/views/refineryInfo/index.vue
@@ -11,15 +11,13 @@
         </el-option>
       </el-select>
       <div class="buttons">
-        <el-button icon="el-icon-search" @click="handleCurrentChange(1)"
-          >查询</el-button
-        >
+        <el-button icon="el-icon-search" @click="search">查询</el-button>
         <el-button icon="el-icon-refresh" @click="reset">重置</el-button>
       </div>
     </div>
     <div class="table">
       <div class="operation">
-        <el-button icon="el-icon-upload2" @click="addition">炼厂入驻</el-button>
+        <el-button @click="addition">炼厂入驻</el-button>
       </div>
       <el-table
         v-if="tableHeight"
@@ -99,23 +97,13 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        background
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="parameter.currentPage"
-        :page-size="parameter.pageSize"
-        :popper-append-to-body="false"
-        :page-sizes="[10, 20, 30, 50]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      >
-      </el-pagination>
+      <!-- 分页 -->
+      <pagination :parameter="parameter" @searchAgain="getByPage" />
     </div>
     <add
       :controlWindows="controlWindows"
       :refineryTypeEnum="refineryTypeEnum"
-      @closeWindow="handleCurrentChange(1)"
+      @closeWindow="search"
     />
 
     <el-drawer
@@ -142,6 +130,8 @@
 import serve from "api/refineryInfo.js";
 
 import add from "./components/add.vue";
+
+import pagination from "components/pagination/index.vue";
 import generalDetails from "components/generalDetails/index.vue";
 
 export default {
@@ -149,9 +139,7 @@ export default {
     return {
       controlWindows: {
         add: false,
-        addInfo: {
-          title: "炼厂入驻",
-        },
+        addInfo: {},
         detail: false,
       },
       refineryTypeEnum: [
@@ -167,6 +155,7 @@ export default {
       parameter: {
         currentPage: 1,
         pageSize: 10,
+        total: 0,
         params: {},
       },
       oilCompanyMatch: {},
@@ -190,6 +179,7 @@ export default {
   },
   components: {
     add,
+    pagination,
     generalDetails,
   },
   mounted() {
@@ -206,22 +196,15 @@ export default {
     this.getByPage();
   },
   methods: {
-    // currentPage change
-    handleCurrentChange(page) {
-      this.parameter.currentPage = page;
-      this.getByPage();
-    },
-    // pageSize change
-    handleSizeChange(size) {
+    serch() {
       this.parameter.currentPage = 1;
-      this.parameter.pageSize = size;
       this.getByPage();
     },
     //table list
     getByPage() {
       serve.getByPage(this.parameter).then((res) => {
         this.tableData = res.data.list;
-        this.total = res.data.totalPage;
+        this.parameter.total = res.data.totalPage;
       });
     },
     //炼厂list
@@ -276,6 +259,7 @@ export default {
       this.parameter = {
         currentPage: 1,
         pageSize: 10,
+        total: 0,
         params: {},
       };
     },