From 5165c694a6357ae3120d2130170fcc295de53289 Mon Sep 17 00:00:00 2001
From: fengdong777 <1478994744@qq.com>
Date: Fri, 26 May 2023 18:03:21 +0800
Subject: [PATCH] 5.26

---
 .../src/api/baseInfo/becomeoil/index.js       |  48 +++
 .../src/layout/components/Sidebar/index.vue   |  10 +
 .../yxt-supervise-cyf-ui/src/router/index.js  |   9 +
 .../views/baseInfo/becomeoil/commodity.vue    | 164 ++++++++++
 .../src/views/baseInfo/becomeoil/index.vue    | 299 ++++++++++++++++++
 .../views/baseInfo/commodityBrand/index.vue   |   2 +
 .../baseInfo/commodityFily/commodity.vue      |   6 +-
 .../views/baseInfo/commodityFily/index.vue    |   4 +-
 8 files changed, 537 insertions(+), 5 deletions(-)
 create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/becomeoil/index.js
 create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/commodity.vue
 create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue

diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/becomeoil/index.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/becomeoil/index.js
new file mode 100644
index 00000000..28401dec
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/becomeoil/index.js
@@ -0,0 +1,48 @@
+import request from '@/utils/request'
+let tokens = window.sessionStorage.getItem('tokenValue')
+export default {
+
+  // 新增商品品牌
+  save: function(params) {
+    return request({
+      url: '/cyf/inventory/save',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json',
+        'token': tokens
+      }
+    })
+  },
+  // 查询产品
+  selectList: function(data) {
+    return request({
+      url: '/cyf/productInfo/selectList',
+      method: 'get',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json',
+        'token': tokens
+      }
+    })
+  },
+  // 查询成品油库
+  listPage: function(params) {
+    return request({
+      url: '/cyf/inventory/listPage ',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json',
+        'token': tokens
+      }
+    })
+  },
+  // 查看类别
+  selectProductType: function(sid) {
+    return request({
+      url: '/cyf/productType/selectProductType/' + sid,
+      method: 'get'
+    })
+  },
+}
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue
index ef880c95..c9e8b7d3 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue
@@ -347,6 +347,16 @@
                 name: "/baseInfo/commodityFily",
                 path: "/baseInfo/commodityFily",
               },
+              {
+              alwaysShow: true,
+              component: "index",
+              meta: {
+                icon: "el-icon-help",
+                title: "成品油库存",
+              },
+              name: "/baseInfo/becomeoil",
+              path: "/baseInfo/becomeoil",
+            },
             ],
           },
           // {
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js
index 9875b5d4..c92d08cf 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js
@@ -140,6 +140,15 @@ export const constantRoutes = [{
           title: '商品类别'
         }
       },
+      {
+        path: '/baseInfo/becomeoil',
+        component: () =>
+          import('@/views/baseInfo/becomeoil/index.vue'),
+        name: 'index',
+        meta: {
+          title: '商品类别'
+        }
+      },
     ]
   }, {
     path: '/supervise',
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/commodity.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/commodity.vue
new file mode 100644
index 00000000..5f85c0db
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/commodity.vue
@@ -0,0 +1,164 @@
+<template>
+    <div>
+  
+      <div class="tab-header webtop">
+        <!-- 标题 -->
+        <div>成品油库存添加</div>
+        <!-- start 添加修改按钮 -->
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+  
+      <div class="listconadd">
+  
+        <el-card class="box-card">
+          <div class="item">
+           <span class="item_text">商品名称:</span>
+           <el-select v-model="formobj.prodSid"  placeholder="" class="item_input" >
+             <el-option v-for="(item,i) in sidlist" :key="i" :label="item.name" :value="item.sid" />
+           </el-select>
+         </div>
+          <div class="item">
+            <span class="item_text">数量:</span>
+            <el-input v-model="formobj.amount" placeholder="请输入数量" class="item_input" clearable />
+          </div>
+          <div class="item">
+            <span class="item_text">编号:</span>
+            <el-input v-model="formobj.number" placeholder="请输入编码" class="item_input" clearable />
+          </div>
+          <div class="item">
+            <span class="item_text">单价(元):</span>
+            <el-input v-model="formobj.price" placeholder="请输入单价" class="item_input" clearable />
+          </div>
+        </el-card>
+  
+      </div>
+  
+    </div>
+  </template>
+  
+  <script>
+    import req from '@/api/baseInfo/becomeoil/index.js'
+    export default {
+      data() {
+        return {
+         submitdisabled: false,
+          crudeLists: [],
+          crudeList: [],
+          sidlist:[],
+          formobj: {
+            amount: "",
+            number: "",
+            price:'',
+            prodSid:'',
+          },
+        }
+      },
+      created() {
+        this.last()
+      },
+      methods: {
+        saveOrUpdate() {
+          req.save(this.formobj)
+            .then(resp => {
+              if (resp.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: resp.msg
+                })
+                this.handleReturn("true")
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            })
+            .catch(() => {})
+  
+        },
+        last(){
+          req.selectList().then((response) => {
+            this.listLoading = false
+            if (response.success) {
+              this.sidlist = response.data
+            } else {
+              this.sidlist = []
+            }
+          })
+        },
+        handleReturn(isreload) {
+          if (isreload === 'true') this.$emit('reloadlist')
+          this.formobj = {
+            name: "",
+            number: "",
+          }
+          this.$emit('doback')
+        },
+      }
+    }
+  </script>
+  <style lang="scss">
+    .box-card {
+      margin-left: 60px;
+      margin-right: 60px;
+      min-width: 70%;
+      margin-top: 20px;
+  
+      .item {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        margin-top: 15px;
+        height: 40px;
+        line-height: 40px;
+  
+        .item_text {
+          flex: 0.8;
+          font-size: 18px;
+          text-align: right;
+        }
+  
+        .item_input {
+          flex: 4;
+          font-size: 16px;
+          margin-left: 10px;
+          margin-right: 80px;
+        }
+  
+        .item_left_input {
+          width: 20%;
+        }
+  
+        .item_left_text {
+          height: 30px;
+          margin-left: 20px;
+          line-height: 30px;
+          color: #018AD2;
+          padding: 0px 15px;
+          border: 1.5px solid #018AD2;
+          border-radius: 5px;
+  
+        }
+  
+        .item_right {
+          flex: 1;
+          justify-items: center;
+  
+          .item_right_list_text {
+            font-size: 16px;
+          }
+  
+          .item_right_list_delect {
+            color: #5E94FF;
+            margin-left: 20px;
+            font-size: 16px;
+            text-decoration: underline;
+          }
+        }
+  
+      }
+  
+    }
+  </style>
+  
\ No newline at end of file
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue
new file mode 100644
index 00000000..4b3581dd
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue
@@ -0,0 +1,299 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar
+        view-title="成品油类型"
+        ref="btnbar"
+        :btndisabled="btndisabled"
+        @btnhandle="btnHandle"
+      />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{
+            searchxianshitit
+          }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form
+              ref="listQueryform"
+              :inline="true"
+              :model="listQuery"
+              label-width="80px"
+              class="tab-header"
+            >
+              <el-form-item label="成品油名称">
+                <el-input
+                  v-model="listQuery.params.name"
+                  maxlength="20"
+                  placeholder="请输入成品油名称"
+                  class="addinputw"
+                  clearable
+                />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center">
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                size="small"
+                @click="handleReset"
+                >查询</el-button
+              >
+              <el-button
+                type="primary"
+                icon="el-icon-refresh"
+                size="small"
+                @click="handleFilter"
+                >重置</el-button
+              >
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">成品油列表</div>
+        </div>
+        <div class="">
+          <el-table
+            v-loading="listLoading"
+            :data="list"
+            border
+            style="width: 100%"
+          >
+            <!-- <el-table-column type="selection" align="center" width="50"/> -->
+            <el-table-column
+              label="序号"
+              type="index"
+              width="80"
+              :index="indexMethod"
+              align="center"
+            />
+            <el-table-column label="操作" align="center" width="150px">
+              <template slot-scope="scope">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="purchase(scope.row)"
+                >
+                  编辑
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="品牌名称" prop="name" align="center" />
+            <el-table-column label="品牌编号" prop="informationNumber" align="center" />
+            <el-table-column label="数量" prop="amount" align="center" />
+            <el-table-column label="单价" prop="price" align="center" />
+            <el-table-column label="成品油编号" prop="number" align="center" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <pagination
+            v-show="list.length > 0"
+            :total="listQuery.total"
+            :page.sync="listQuery.current"
+            :limit.sync="listQuery.size"
+            class="pagination"
+            @pagination="getList"
+          />
+        </div>
+      </div>
+    </div>
+    <oilTankAdd
+      v-show="viewState == 2 || viewState == 3"
+      ref="divAdd"
+      @doback="resetState"
+      @reloadlist="getList"
+    />
+    <!-- <oilTypeInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" @reloadlist="getList" /> -->
+    <el-dialog title="修改产品类型" :visible.sync="editDialog" width="40%">
+      <table class="e-table" cellspacing="0">
+        <tr>
+          <td>类型名称</td>
+          <td>
+            <el-input v-model="form.name" style="width: 300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>类型编号</td>
+          <td>
+            <el-input v-model="form.number" style="width: 300px"></el-input>
+          </td>
+        </tr>
+      </table>
+      <div style="margin-top: 20px; text-align: center">
+        <el-button type="primary" @click="save()">保存</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+  
+  <script>
+import req from "@/api/baseInfo/becomeoil/index.js";
+import Pagination from "@/components/pagination";
+import pageye from "@/components/pagination/pageye";
+import ButtonBar from "@/components/ButtonBar";
+import oilTankAdd from "./commodity.vue";
+// import oilTypeInfo from './oilTypeInfo.vue'
+export default {
+  name: "CustomerManagement",
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    oilTankAdd,
+    // oilTypeInfo,
+  },
+  data() {
+    return {
+      listLoading: false,
+      btndisabled: false,
+      editDialog: false,
+      form: {
+        name: "",
+        number: "",
+        sid: "",
+      },
+      btnList: [
+        {
+          type: "primary",
+          size: "small",
+          icon: "plus",
+          btnKey: "toAdd",
+          btnLabel: "新增",
+        },
+
+        {
+          type: "info",
+          size: "small",
+          icon: "cross",
+          btnKey: "doClose",
+          btnLabel: "关闭",
+        },
+      ],
+      isSearchShow: false,
+      searchxianshitit: "显示查询条件",
+      list: [],
+      listQuery: {
+        current: 1,
+        size: 10,
+        params: {
+          name: "",
+        },
+        total: 0,
+      },
+      viewState: 1,
+    };
+  },
+  mounted() {
+    this.$refs["btnbar"].setButtonList(this.btnList);
+  },
+  created() {
+    this.init();
+    // 加载列表
+  },
+  methods: {
+    btnHandle(btnKey) {
+      switch (btnKey) {
+        case "toAdd":
+          this.toAdd();
+          break;
+
+        case "doClose":
+          this.doClose();
+          break;
+        default:
+          break;
+      }
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow;
+      if (this.isSearchShow) {
+        this.searchxianshitit = "隐藏查询条件";
+      } else {
+        this.searchxianshitit = "显示查询条件";
+      }
+    },
+    // 初始化
+    init() {
+      this.getList();
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size;
+      var pageindex = index + 1 + pagestart;
+      return pageindex;
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true;
+      req.listPage(this.listQuery).then((response) => {
+        this.listLoading = false;
+        if (response.success) {
+          this.list = response.data.records;
+          this.listQuery.total = response.data.total;
+        } else {
+          this.list = [];
+          this.listQuery.total = 0;
+        }
+      });
+    },
+    // 查询按钮
+    handleReset() {
+      this.listQuery.current = 1;
+      this.getList();
+    },
+    // 重置
+    handleFilter() {
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          name: "",
+        },
+      };
+      this.getList();
+    },
+    // 打开添加
+    toAdd() {
+      this.viewState = 2;
+    },
+    purchase(row) {
+      this.editDialog = true;
+      this.form = Object.assign({}, row);
+      this.form.sid = row.sid;
+    },
+    save() {
+      req
+        .update(this.form)
+        .then((resp) => {
+          if (resp.success) {
+            this.$message({
+              showClose: true,
+              type: "success",
+              message: resp.msg,
+            });
+            this.editDialog = false;
+            this.getList();
+          } else {
+            // 根据resp.code进行异常情况处理
+          }
+        })
+        .catch(() => {});
+      this.reset();
+    },
+    reset() {
+      this.form = {};
+    },
+    resetState() {
+      this.viewState = 1;
+    },
+    doClose() {
+      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+  <style scoped>
+</style>
+  
\ No newline at end of file
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue
index 04fb9a3d..a4e3ea79 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue
@@ -40,6 +40,8 @@
             </el-table-column>
               <el-table-column label="品牌名称" prop="name" align="center" />
               <el-table-column label="品牌编号" prop="number" align="center" />
+              <el-table-column label="品牌初始库存" prop="inventoryQuantity" align="center" />
+              <el-table-column label="品牌现有库存" prop="amount" align="center" />
             </el-table>
           </div>
           <div class="pages">
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue
index 1d1f7ad9..3377043c 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue
@@ -3,7 +3,7 @@
 
     <div class="tab-header webtop">
       <!-- 标题 -->
-      <div>商品品牌</div>
+      <div>添加商品类别</div>
       <!-- start 添加修改按钮 -->
       <div>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
@@ -15,11 +15,11 @@
 
       <el-card class="box-card" >
       <div class="item">
-        <span class="item_text">商品名称：</span>
+        <span class="item_text">类别名称：</span>
           <el-input v-model="form.name" placeholder="" class="item_input" clearable />
       </div>
       <div class="item">
-        <span class="item_text">名称编号：</span>
+        <span class="item_text">类别名称编号：</span>
         <el-input v-model="form.number" placeholder=""  class="item_input" clearable />
       </div>
       <div class="item">
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue
index ead0c43c..34255e65 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue
@@ -47,8 +47,8 @@
             </el-table-column>
             <el-table-column label="品牌名称" prop="informationName" align="center" />
             <el-table-column label="品牌编码" prop="informationNumber" align="center" />
-              <el-table-column label="商品名称" prop="name" align="center" />
-              <el-table-column label="名称编号" prop="number" align="center" />
+              <el-table-column label="类别名称" prop="name" align="center" />
+              <el-table-column label="类别名称编号" prop="number" align="center" />
               <el-table-column  label="操作" align="center" width="150px">
                <template slot-scope="scope">
                  <el-button