From 045bf1ba1921ab3494bc64aeefbeb59b2b044cb9 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Tue, 23 May 2023 10:50:08 +0800
Subject: [PATCH] 2023-5-23

---
 .../yxt-supervise-cyf-ui/.env.development     |   3 +-
 .../src/api/packagInfo/packagInfo.js          |  69 +++++
 .../src/api/packagType/packagType.js          |  48 ++++
 .../src/layout/components/Sidebar/index.vue   |  24 +-
 .../yxt-supervise-cyf-ui/src/router/index.js  |  21 +-
 .../baseInfo/materialInfo/materialInfoAdd.vue |   2 +-
 .../src/views/baseInfo/materialType/index.vue |  14 +-
 .../baseInfo/materialType/materialTypeAdd.vue |  12 +-
 .../src/views/baseInfo/packagInfo/index.vue   | 262 ++++++++++++++++++
 .../baseInfo/packagInfo/packagInfoAdd.vue     | 190 +++++++++++++
 .../src/views/baseInfo/packagType/index.vue   | 225 +++++++++++++++
 .../baseInfo/packagType/packagTypeAdd.vue     | 194 +++++++++++++
 12 files changed, 1045 insertions(+), 19 deletions(-)
 create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagInfo/packagInfo.js
 create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagType/packagType.js
 create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagInfo/index.vue
 create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagInfo/packagInfoAdd.vue
 create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagType/index.vue
 create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagType/packagTypeAdd.vue

diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development b/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
index 9acebe8d..0afd6b35 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
@@ -5,7 +5,8 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
-VUE_APP_URL = "http://192.168.1.177:7101"
+VUE_APP_URL = "http://5wchzg.natappfree.cc"
+##VUE_APP_URL = "http://192.168.1.177:7101"
 
 
 # VUE_APP_URL = "http://192.168.1.193:7101"
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagInfo/packagInfo.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagInfo/packagInfo.js
new file mode 100644
index 00000000..f59b2e59
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagInfo/packagInfo.js
@@ -0,0 +1,69 @@
+import request from '@/utils/request'
+let tokens = window.sessionStorage.getItem('tokenValue')
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/cyf/packinventory/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json',
+        'token': tokens
+      }
+    })
+  },
+
+  addInfo: function(data) {
+    return request({
+      url: '/cyf/packinventory/save',
+      method: 'post',
+      data: data
+    });
+  },
+
+  packageType: function(params) {
+    return request({
+      url: '/cyf/packtype/typeList',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json',
+        'token': tokens
+      }
+    })
+  },
+
+
+  fetchBySid: function(sid) {
+    return request({
+      url: '/cyf/crudeinfo/getCrudeBySid/' + sid
+    })
+  },
+
+  updateData: function(data) {
+    return request({
+      url: '/cyf/crudeinfo/update',
+      method: 'post',
+      data: data
+    });
+  },
+
+  delBySids: function(sid) {
+    return request({
+      url: '/cyf/crudeinfo/delete/' + sid,
+      method: 'delete'
+    })
+  },
+
+  // 保存每次读取库存
+  saveInfo: function(data) {
+    return request({
+      url: '/cyf/crudeinventory/save',
+      method: 'post',
+      data: data
+    });
+  },
+
+}
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagType/packagType.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagType/packagType.js
new file mode 100644
index 00000000..e16d54d6
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagType/packagType.js
@@ -0,0 +1,48 @@
+import request from '@/utils/request'
+
+let tokens = window.sessionStorage.getItem('tokenValue')
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/cyf/packtype/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json',
+        'token': tokens
+      }
+    })
+  },
+
+  addInfo: function(data) {
+    return request({
+      url: '/cyf/packtype/save',
+      method: 'post',
+      data: data
+    });
+  },
+
+  fetchBySid: function(sid) {
+    return request({
+      url: '/cyf/packtype/getTypeBySid/' + sid
+    })
+  },
+
+  updateData: function(data) {
+    return request({
+      url: '/cyf/packtype/update',
+      method: 'post',
+      data: data
+    });
+  },
+
+  delBySids: function(sid) {
+    return request({
+      url: '/cyf/packtype/delete/' + sid,
+      method: 'delete'
+    })
+  },
+
+}
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 247a2107..10761edb 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
@@ -152,7 +152,7 @@ export default {
               component: "index",
               meta: {
                 icon: "el-icon-help",
-                title: "物料类型",
+                title: "原料类型",
               },
               name: "/baseInfo/materialType",
               path: "/baseInfo/materialType",
@@ -162,11 +162,31 @@ export default {
               component: "index",
               meta: {
                 icon: "el-icon-help",
-                title: "物料信息",
+                title: "原料信息",
               },
               name: "/baseInfo/materialInfo",
               path: "/baseInfo/materialInfo",
             },
+            {
+              alwaysShow: true,
+              component: "index",
+              meta: {
+                icon: "el-icon-help",
+                title: "包装物类型",
+              },
+              name: "/baseInfo/packagType",
+              path: "/baseInfo/packagType",
+            },
+            {
+              alwaysShow: true,
+              component: "index",
+              meta: {
+                icon: "el-icon-help",
+                title: "包装物信息",
+              },
+              name: "/baseInfo/packagInfo",
+              path: "/baseInfo/packagInfo",
+            },
             {
               alwaysShow: true,
               component: "index",
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 d6576b83..329427ea 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
@@ -57,7 +57,7 @@ export const constantRoutes = [{
           import('@/views/baseInfo/materialType/index.vue'),
         name: 'index',
         meta: {
-          title: '物料类型'
+          title: '原料类型'
         }
       },
       {
@@ -66,7 +66,24 @@ export const constantRoutes = [{
           import('@/views/baseInfo/materialInfo/index.vue'),
         name: 'index',
         meta: {
-          title: '物料信息'
+          title: '原料信息'
+        }
+      },{
+        path: '/baseInfo/packagType',
+        component: () =>
+          import('@/views/baseInfo/packagType/index.vue'),
+        name: 'index',
+        meta: {
+          title: '包装物类型'
+        }
+      },
+      {
+        path: '/baseInfo/packagInfo',
+        component: () =>
+          import('@/views/baseInfo/packagInfo/index.vue'),
+        name: 'index',
+        meta: {
+          title: '包装物信息'
         }
       },
       {
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/materialInfo/materialInfoAdd.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/materialInfo/materialInfoAdd.vue
index e7cfe9aa..d5d266c1 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/materialInfo/materialInfoAdd.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/materialInfo/materialInfoAdd.vue
@@ -26,7 +26,7 @@
         </div>
         <div class="item">
           <span class="item_text">原料类型：</span>
-          <el-select v-model="formobj.typeName" filterable placeholder="请选择原油类型" class="item_input" @change="getType">
+          <el-select v-model="formobj.typeName" filterable placeholder="请选择原料类型" class="item_input" @change="getType">
             <el-option v-for="item in typeList" :key="item.sid" :label="item.name" :value="item.sid" />
           </el-select>
           <!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> -->
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/materialType/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/materialType/index.vue
index c1977070..09b9df57 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/materialType/index.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/materialType/index.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <div v-show="viewState ==1">
-      <button-bar view-title="物料类型" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <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"
+              <el-form-item label="原料名称">
+                <el-input v-model="listQuery.params.name" maxlength="20" placeholder="请输入原料名称" class="addinputw"
                   clearable />
               </el-form-item>
             </el-form>
@@ -19,7 +19,7 @@
           </div>
         </div>
         <div class="listtop">
-          <div class="tit">物料列表</div>
+          <div class="tit">原料列表</div>
           <!-- 翻页分页 -->
           <!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/> -->
         </div>
@@ -34,9 +34,9 @@
                 <el-button type="primary" size="mini" @click="doDel(scope.row)">删除</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="物料类型" prop="name" align="center" />
-            <el-table-column label="物料编码" prop="number" align="center" />
-            <el-table-column label="物料Code" prop="code" align="center" />
+            <el-table-column label="原料类型" prop="name" align="center" />
+            <el-table-column label="原料编码" prop="number" align="center" />
+            <el-table-column label="原料Code" prop="code" align="center" />
           </el-table>
         </div>
         <div class="pages">
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/materialType/materialTypeAdd.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/materialType/materialTypeAdd.vue
index f9fa5e6a..9231d551 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/materialType/materialTypeAdd.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/materialType/materialTypeAdd.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>
@@ -16,23 +16,23 @@
     <div class="listconadd">
 
       <el-card class="box-card">
-        <div class="item">
+       <!-- <div class="item">
           <span class="item_text">原料/包装物：</span>
          <div class="item_input">
             <el-radio v-model="radio" label="1">原料</el-radio>
              <el-radio v-model="radio" label="2">包装物</el-radio>
          </div>
-        </div>
+        </div> -->
         <div class="item">
-          <span class="item_text">物料类型：</span>
+          <span class="item_text">原料类型：</span>
           <el-input v-model="formobj.name" placeholder="" class="item_input" clearable />
         </div>
         <div class="item">
-          <span class="item_text">物料编码：</span>
+          <span class="item_text">原料编码：</span>
           <el-input v-model="formobj.number" placeholder="" class="item_input" clearable />
         </div>
         <div class="item">
-          <span class="item_text">物料Code：</span>
+          <span class="item_text">原料Code：</span>
           <el-input v-model="formobj.code" placeholder="" class="item_input" clearable />
         </div>
       </el-card>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagInfo/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagInfo/index.vue
new file mode 100644
index 00000000..5fa8899b
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagInfo/index.vue
@@ -0,0 +1,262 @@
+<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="100px" 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>
+          <!-- 翻页分页 -->
+          <!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/> -->
+        </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="包装物名称" prop="name" align="center" />
+            <el-table-column label="包装物编码" prop="number" align="center" />
+            <el-table-column label="包装物类型" prop="typeName" align="center" />
+            <el-table-column label="包装物初始库存" prop="initialInventory" align="center" />
+            <el-table-column label="包装物现有库存" prop="inventory" 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>
+    <packagInfoAdd 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>
+            <!-- <span>{{form.planContent}}</span> -->
+            <el-input v-model="form.existingInventory" 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/packagInfo/packagInfo.js'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import ButtonBar from '@/components/ButtonBar'
+  import packagInfoAdd from './packagInfoAdd.vue'
+  // import oilTypeInfo from './oilTypeInfo.vue'
+  export default {
+    name: 'CustomerManagement',
+    components: {
+      Pagination,
+      pageye,
+      ButtonBar,
+      packagInfoAdd,
+      // oilTypeInfo,
+
+    },
+    data() {
+      return {
+        listLoading: false,
+        btndisabled: false,
+        editDialog: false,
+        form: {},
+        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: {
+            entryName: ""
+          }
+        }
+        this.getList()
+      },
+      // 打开添加
+      toAdd() {
+        this.viewState = 2
+      },
+      // 打开修改
+      toEdit(row) {
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(row)
+      },
+      // 根据本行ID删除数据
+      doDel(row) {
+        const tip = '请确认是否删除所选记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          req.delBySids(row.sid).then((response) => {
+            if (response.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '删除成功'
+              })
+              this.getList()
+            } else {
+              this.$message({
+                showClose: true,
+                type: 'error',
+                message: '删除失败'
+              })
+            }
+          })
+        })
+      },
+      toDetail(row) {
+        this.editDialog = true;
+
+        this.form.tankSid = row.sid
+      },
+      save() {
+        console.log("form", this.form)
+
+        req.saveInfo(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>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagInfo/packagInfoAdd.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagInfo/packagInfoAdd.vue
new file mode 100644
index 00000000..497199f1
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagInfo/packagInfoAdd.vue
@@ -0,0 +1,190 @@
+<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>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-card class="box-card">
+        <div class="item">
+          <span class="item_text">包装物名称：</span>
+          <el-input v-model="formobj.name" 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-select v-model="formobj.typeName" filterable placeholder="请选择包装物类型" class="item_input" @change="getType">
+            <el-option v-for="item in typeList" :key="item.sid" :label="item.name" :value="item.sid" />
+          </el-select>
+          <!-- <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.initialInventory" placeholder="" class="item_input" clearable />
+        </div>
+      </el-card>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/packagInfo/packagInfo'
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        typeLists: [],
+        typeList: [],
+        formobj: {
+          sid: "",
+          name: "",
+          number: "",
+          inventory: "",
+          initialInventory: "",
+          typeSid: "",
+          typeName: "",
+
+        }
+      }
+    },
+    created() {
+      this.packageType()
+    },
+    methods: {
+      packageType() {
+        req.packageType().then((res) => {
+          if (res.success) {
+            console.log(">>>>>>>>>2222222", res.data)
+            this.typeLists = res.data
+            for (var i = 0; i < this.typeLists.length; i++) {
+
+              let item = {
+                name: this.typeLists[i].name,
+                sid: this.typeLists[i].sid,
+
+              }
+              this.typeList.push(item)
+            }
+
+          }
+        })
+      },
+      saveOrUpdate() {
+        req.addInfo(this.formobj)
+          .then(resp => {
+            if (resp.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              this.handleReturn("true")
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          })
+          .catch(() => {})
+
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          sid: "",
+          name: "",
+          number: "",
+          inventory: "",
+          initialInventory: "",
+          typeSid: "",
+          typeName: "",
+
+        }
+        this.$emit('doback')
+      },
+      getType(value) {
+        console.log(">>>>>>>>>getType", value)
+        const choose = this.typeLists.filter((item) => item.sid === value)
+        console.log(">>>>>>>>>getType", choose[0])
+        this.formobj.typeSid = choose[0].sid
+        this.formobj.typeName = choose[0].name
+      },
+    }
+  }
+</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>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagType/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagType/index.vue
new file mode 100644
index 00000000..99fe67e2
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagType/index.vue
@@ -0,0 +1,225 @@
+<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="100px" 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>
+          <!-- 翻页分页 -->
+          <!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/> -->
+        </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="操作" wid align="center" width="180">
+              <template slot-scope="scope">
+                <!-- <el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button> -->
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
+                <el-button type="primary" size="mini" @click="doDel(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="包装物类型" prop="name" align="center" />
+            <el-table-column label="包装物编码" prop="number" align="center" />
+            <el-table-column label="包装物Code" prop="code" 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>
+    <packagTypeAdd v-show="viewState ==2 || viewState ==3" ref="divAdd" @doback="resetState" @reloadlist="getList" />
+    <!-- <oilTypeInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" @reloadlist="getList" /> -->
+  </div>
+</template>
+
+<script>
+  import req from '@/api/packagType/packagType'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import ButtonBar from '@/components/ButtonBar'
+  import packagTypeAdd from './packagTypeAdd.vue'
+  // import oilTypeInfo from './oilTypeInfo.vue'
+  export default {
+    name: 'CustomerManagement',
+    components: {
+      Pagination,
+      pageye,
+      ButtonBar,
+      packagTypeAdd,
+      // oilTypeInfo,
+
+    },
+    data() {
+      return {
+        listLoading: false,
+        btndisabled: false,
+        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: {
+            entryName: '',
+          },
+          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: {
+            entryName: ""
+          }
+        }
+        this.getList()
+      },
+      // 打开添加
+      toAdd() {
+        this.viewState = 2
+      },
+      // 打开修改
+      toEdit(row) {
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(row)
+      },
+      // 根据本行ID删除数据
+      doDel(row) {
+        const tip = '请确认是否删除所选记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          req.delBySids(row.sid).then((response) => {
+            if (response.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '删除成功'
+              })
+              this.getList()
+            } else {
+              this.$message({
+                showClose: true,
+                type: 'error',
+                message: '删除失败'
+              })
+            }
+          })
+        })
+      },
+      // toDetail(row) {
+      //   this.viewState = 4
+      //   this.$refs['divInfo'].showAdd(row.sid)
+      // },
+      resetState() {
+        this.viewState = 1
+      },
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagType/packagTypeAdd.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagType/packagTypeAdd.vue
new file mode 100644
index 00000000..357fca40
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/packagType/packagTypeAdd.vue
@@ -0,0 +1,194 @@
+<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>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-card class="box-card">
+       <!-- <div class="item">
+          <span class="item_text">包装物/包装物：</span>
+         <div class="item_input">
+            <el-radio v-model="radio" label="1">包装物</el-radio>
+             <el-radio v-model="radio" label="2">包装物</el-radio>
+         </div>
+        </div> -->
+        <div class="item">
+          <span class="item_text">包装物类型：</span>
+          <el-input v-model="formobj.name" 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">包装物Code：</span>
+          <el-input v-model="formobj.code" placeholder="" class="item_input" clearable />
+        </div>
+      </el-card>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/packagType/packagType'
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        radio:"1",
+        formobj: {
+          sid: "",
+          type:"",
+          name: "",
+          number: "",
+          code: ""
+        }
+      }
+    },
+    methods: {
+      saveOrUpdate() {
+
+        console.log("radio》》》》》》》",this.radio)
+
+        this.formobj.type = this.radio
+
+
+        if(this.formobj.sid){
+          req.updateData(this.formobj)
+            .then(resp => {
+              if (resp.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: resp.msg
+                })
+                this.handleReturn("true")
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            })
+            .catch(() => {})
+        }else{
+          req.addInfo(this.formobj)
+            .then(resp => {
+              if (resp.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: resp.msg
+                })
+                this.handleReturn("true")
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            })
+            .catch(() => {})
+        }
+
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          sid: "",
+          name: "",
+          number: "",
+          code: ""
+        }
+        this.$emit('doback')
+      },
+
+      showAdd() {
+
+      },
+      showEdit(row) {
+        console.log("sid>>>>>>>>>",row.sid)
+        req.fetchBySid(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+
+          })
+          .catch(e => {
+            this.formobj = row
+          })
+      }
+    }
+  }
+</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>