diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTank/oilTank.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTank/oilTank.js
index b80037a8..9b87d206 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTank/oilTank.js
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTank/oilTank.js
@@ -64,4 +64,16 @@ export default {
     });
   },
 
-}
\ No newline at end of file
+  // 登记库存列表
+  crudeinventoryList: function(data) {
+    return request({
+      url: '/cyf/crudeinventory/listPage',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+}
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/rawMaterialInAndOutBound/rawMaterialInAndOutBound.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/rawMaterialInAndOutBound/rawMaterialInAndOutBound.js
index 215f5455..c048e6b2 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/rawMaterialInAndOutBound/rawMaterialInAndOutBound.js
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/rawMaterialInAndOutBound/rawMaterialInAndOutBound.js
@@ -37,6 +37,7 @@ export default {
 
   // 出库
   // 查询分页列表
+  
   in112PagerList: function(params) {
     return request({
       url: '/cyf/rawoutbound/listPage',
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 27e25f25..1f6cfabc 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
@@ -1,5 +1,5 @@
 <template>
- <div :class="{'has-logo':showLogo}">
+  <div :class="{'has-logo':showLogo}">
     <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <el-menu :default-active="activeMenu" :background-color="variables.menuBg" :text-color="variables.menuText"
@@ -39,74 +39,221 @@
           sourceSid: '9d048c07-7677-4774-9177-aa02b049ff06',
           userSid: '',
         },
-        routes: [{
-            alwaysShow: true,
-            component: 'index',
-            meta: {
-              icon: "el-icon-menu",
-              title: "原料类型"
-            },
-            name: "/rawMaterialType/index",
-            path: "/rawMaterialType/index"
-          },{
-            alwaysShow: true,
-            component: 'index',
-            meta: {
-              icon: "el-icon-menu",
-              title: "原料信息"
-            },
-            name: "/rawMaterialInfo/index",
-            path: "/rawMaterialInfo/index"
-          },{
-            alwaysShow: true,
-            component: 'index',
-            meta: {
-              icon: "el-icon-menu",
-              title: "原油类型"
-            },
-            name: "/oilType/index",
-            path: "/oilType/index"
-          },
-          {
-            alwaysShow: true,
-            component: 'index',
-            meta: {
-              icon: "el-icon-menu",
-              title: "油罐信息"
-            },
-            name: "/oilTank/index",
-            path: "/oilTank/index"
-          },
+        routes: [
           {
             alwaysShow: true,
-            component: 'index',
+            component: 'supervise',
             meta: {
               icon: "el-icon-menu",
-              title: "流量仪器"
+              title: "监管操作"
             },
-            name: "/flowInstrument/index",
-            path: "/flowInstrument/index"
+            name: "",
+            path: "/supervise",
+            children: [{
+                alwaysShow: true,
+                component: 'index',
+                meta: {
+                  icon: "el-icon-help",
+                  title: "油罐库存登记"
+                },
+                name: "/supervise/recordOilTank",
+                path: "/supervise/recordOilTank",
+              },
+              {
+                alwaysShow: true,
+                component: 'index',
+                meta: {
+                  icon: "el-icon-help",
+                  title: "原油入库登记"
+                },
+                name: "/supervise/oilTypeInBound",
+                path: "/supervise/oilTypeInBound",
+              },
+              {
+                alwaysShow: true,
+                component: 'index',
+                meta: {
+                  icon: "el-icon-help",
+                  title: "原油出库登记"
+                },
+                name: "/supervise/oilTypeOutBound",
+                path: "/supervise/oilTypeOutBound",
+              },
+            ]
           },
           {
             alwaysShow: true,
-            component: 'index',
+            component: 'inventory',
             meta: {
               icon: "el-icon-menu",
-              title: "原油出入库记录"
+              title: "库存管理"
             },
-            name: "/oilTypeInAndOutBound/index",
-            path: "/oilTypeInAndOutBound/index"
+            name: "",
+            path: "/inventory",
+            children: [
+              {
+                  alwaysShow: true,
+                  component: 'index',
+                  meta: {
+                    icon: "el-icon-help",
+                    title: "油罐库存记录"
+                  },
+                  name: "/inventory/oilTankList",
+                  path: "/inventory/oilTankList",
+                },{
+                alwaysShow: true,
+                component: 'index',
+                meta: {
+                  icon: "el-icon-help",
+                  title: "原油入库记录"
+                },
+                name: "/inventory/oilTypeInBoundList",
+                path: "/inventory/oilTypeInBoundList",
+              },
+              {
+                alwaysShow: true,
+                component: 'index',
+                meta: {
+                  icon: "el-icon-help",
+                  title: "原油出库记录"
+                },
+                name: "/inventory/oilTypeOutBoundList",
+                path: "/inventory/oilTypeOutBoundList",
+              },
+            ]
+
           },
           {
-            alwaysShow: true,
-            component: 'index',
-            meta: {
-              icon: "el-icon-menu",
-              title: "原料出入库记录"
+              alwaysShow: true,
+              component: 'baseInfo',
+              meta: {
+                icon: "el-icon-menu",
+                title: "基础信息"
+              },
+              name: "",
+              path: "/baseInfo",
+              children: [{
+                  alwaysShow: true,
+                  component: 'index',
+                  meta: {
+                    icon: "el-icon-help",
+                    title: "原料类型"
+                  },
+                  name: "/baseInfo/rawMaterialType",
+                  path: "/baseInfo/rawMaterialType",
+                },
+                {
+                  alwaysShow: true,
+                  component: 'index',
+                  meta: {
+                    icon: "el-icon-help",
+                    title: "原料信息"
+                  },
+                  name: "/baseInfo/rawMaterialInfo",
+                  path: "/baseInfo/rawMaterialInfo",
+                },
+                {
+                  alwaysShow: true,
+                  component: 'index',
+                  meta: {
+                    icon: "el-icon-help",
+                    title: "原油类型"
+                  },
+                  name: "/baseInfo/oilType",
+                  path: "/baseInfo/oilType",
+                },
+                {
+                  alwaysShow: true,
+                  component: 'index',
+                  meta: {
+                    icon: "el-icon-help",
+                    title: "油罐信息"
+                  },
+                  name: "/baseInfo/oilTank",
+                  path: "/baseInfo/oilTank",
+                },
+                {
+                  alwaysShow: true,
+                  component: 'index',
+                  meta: {
+                    icon: "el-icon-help",
+                    title: "流量仪器"
+                  },
+                  name: "/baseInfo/flowInstrument",
+                  path: "/baseInfo/flowInstrument",
+                }
+              ]
             },
-            name: "/rawMaterialInAndOutBound/index",
-            path: "/rawMaterialInAndOutBound/index"
-          },
+          // {
+          //   alwaysShow: true,
+          //   component: 'index',
+          //   meta: {
+          //     icon: "el-icon-menu",
+          //     title: "原料类型"
+          //   },
+          //   name: "/rawMaterialType/index",
+          //   path: "/rawMaterialType/index"
+          // }, {
+          //   alwaysShow: true,
+          //   component: 'index',
+          //   meta: {
+          //     icon: "el-icon-menu",
+          //     title: "原料信息"
+          //   },
+          //   name: "/rawMaterialInfo/index",
+          //   path: "/rawMaterialInfo/index"
+          // }, {
+          //   alwaysShow: true,
+          //   component: 'index',
+          //   meta: {
+          //     icon: "el-icon-menu",
+          //     title: "原油类型"
+          //   },
+          //   name: "/oilType/index",
+          //   path: "/oilType/index"
+          // },
+          // {
+          //   alwaysShow: true,
+          //   component: 'index',
+          //   meta: {
+          //     icon: "el-icon-menu",
+          //     title: "油罐信息"
+          //   },
+          //   name: "/oilTank/index",
+          //   path: "/oilTank/index"
+          // },
+          // {
+          //   alwaysShow: true,
+          //   component: 'index',
+          //   meta: {
+          //     icon: "el-icon-menu",
+          //     title: "流量仪器"
+          //   },
+          //   name: "/flowInstrument/index",
+          //   path: "/flowInstrument/index"
+          // },
+          // {
+          //   alwaysShow: true,
+          //   component: 'index',
+          //   meta: {
+          //     icon: "el-icon-menu",
+          //     title: "原油出入库记录"
+          //   },
+          //   name: "/oilTypeInAndOutBound/index",
+          //   path: "/oilTypeInAndOutBound/index"
+          // },
+          // {
+          //   alwaysShow: true,
+          //   component: 'index',
+          //   meta: {
+          //     icon: "el-icon-menu",
+          //     title: "原料出入库记录"
+          //   },
+          //   name: "/rawMaterialInAndOutBound/index",
+          //   path: "/rawMaterialInAndOutBound/index"
+          // },
+
+
           // {
           //   alwaysShow: true,
           //   component: 'index',
@@ -170,7 +317,7 @@
           redirect: '/404',
           hidden: true
         })
-         console.log('左侧菜单', this.routes)
+        console.log('左侧菜单', this.routes)
         return this.routes
         //     })
         //   }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/index.vue
index b1a19806..0ffefa8d 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/index.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/index.vue
@@ -11,7 +11,7 @@
     <div class="main-container">
       <div class="home-box">
         <a href="javascript:window.opener=null;window.open('','_self');window.close();" class="text-center">平台首页</a>
-        <a href="javascript:void(0);" class="text-center">客户管理</a>
+        <a href="javascript:void(0);" class="text-center">醇油坊</a>
       </div>
       <sidebar class="sidebar-container" />
       <!--菜单-->
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 b41dd209..0a0d5d9b 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
@@ -9,8 +9,7 @@ import Layout from '@/layout'
 
 import codemenu from './modules/codemenu'
 
-export const constantRoutes = [
-  {
+export const constantRoutes = [{
     path: '/redirect',
     component: Layout,
     hidden: true,
@@ -45,99 +44,224 @@ export const constantRoutes = [
         affix: true
       }
     }]
-  },{
-  path: 'rawMaterialType',
-  component: Layout,
-  redirect: '/rawMaterialType',
-  children: [{
-    path: '/rawMaterialType/index',
-    component: () => import('@/views/rawMaterialType/index.vue'),
-    name: 'index',
-    meta: {
-      title: '原料类型',
-      noCache: true
-    }
-  }]
-},{
-  path: 'rawMaterialInfo',
-  component: Layout,
-  redirect: '/rawMaterialInfo',
-  children: [{
-    path: '/rawMaterialInfo/index',
-    component: () => import('@/views/rawMaterialInfo/index.vue'),
-    name: 'index',
-    meta: {
-      title: '原料信息',
-      noCache: true
-    }
-  }]
-},
-{
-  path: 'oilType',
-  component: Layout,
-  redirect: '/oilType',
-  children: [{
-    path: '/oilType/index',
-    component: () => import('@/views/oilType/index.vue'),
-    name: 'index',
-    meta: {
-      title: '原油类型',
-      noCache: true
-    }
-  }]
-},{
-  path: 'oilTank',
-  component: Layout,
-  redirect: '/oilTank',
-  children: [{
-    path: '/oilTank/index',
-    component: () => import('@/views/oilTank/index.vue'),
-    name: 'index',
-    meta: {
-      title: '油罐信息',
-      noCache: true
-    }
-  }]
-},{
-  path: 'flowInstrument',
-  component: Layout,
-  redirect: '/flowInstrument',
-  children: [{
-    path: '/flowInstrument/index',
-    component: () => import('@/views/flowInstrument/index.vue'),
-    name: 'index',
+  }, {
+    path: '/baseInfo',
+    component: Layout,
+    redirect: null,
     meta: {
-      title: '流程仪器',
-      noCache: true
-    }
-  }]
-},{
-  path: 'oilTypeInAndOutBound',
-  component: Layout,
-  redirect: '/oilTypeInAndOutBound',
-  children: [{
-    path: '/oilTypeInAndOutBound/index',
-    component: () => import('@/views/oilTypeInAndOutBound/index.vue'),
-    name: 'index',
+      title: '基础信息'
+    },
+    children: [{
+        path: '/baseInfo/rawMaterialType',
+        component: () =>
+          import('@/views/baseInfo/rawMaterialType/index.vue'),
+        name: 'index',
+        meta: {
+          title: '原料类型'
+        }
+      },
+      {
+        path: '/baseInfo/rawMaterialInfo',
+        component: () =>
+          import('@/views/baseInfo/rawMaterialInfo/index.vue'),
+        name: 'index',
+        meta: {
+          title: '原料信息'
+        }
+      },
+      {
+        path: '/baseInfo/oilType',
+        component: () =>
+          import('@/views/baseInfo/oilType/index.vue'),
+        name: 'index',
+        meta: {
+          title: '原油类型'
+        }
+      },
+      {
+        path: '/baseInfo/oilTank',
+        component: () =>
+          import('@/views/baseInfo/oilTank/index.vue'),
+        name: 'index',
+        meta: {
+          title: '油罐信息'
+        }
+      },
+      {
+        path: '/baseInfo/flowInstrument',
+        component: () =>
+          import('@/views/baseInfo/flowInstrument/index.vue'),
+        name: 'index',
+        meta: {
+          title: '流量仪器'
+        }
+      },
+    ]
+  }, {
+    path: '/supervise',
+    component: Layout,
+    redirect: null,
     meta: {
-      title: '原油出入库记录',
-      noCache: true
-    }
-  }]
-},{
-  path: 'rawMaterialInAndOutBound',
-  component: Layout,
-  redirect: '/rawMaterialInAndOutBound',
-  children: [{
-    path: '/rawMaterialInAndOutBound/index',
-    component: () => import('@/views/rawMaterialInAndOutBound/index.vue'),
-    name: 'index',
+      title: '监管操作'
+    },
+    children: [{
+        path: '/supervise/recordOilTank',
+        component: () =>
+          import('@/views/supervise/recordOilTank/index.vue'),
+        name: 'index',
+        meta: {
+          title: '油罐库存登记'
+        }
+      },
+      {
+        path: '/supervise/oilTypeInBound',
+        component: () =>
+          import('@/views/supervise/oilTypeInBound/index.vue'),
+        name: 'index',
+        meta: {
+          title: '原油入库登记'
+        }
+      },
+      {
+        path: '/supervise/oilTypeOutBound',
+        component: () =>
+          import('@/views/supervise/oilTypeOutBound/index.vue'),
+        name: 'index',
+        meta: {
+          title: '原油出库登记'
+        }
+      },
+    ]
+  }, {
+    path: '/inventory',
+    component: Layout,
+    redirect: null,
     meta: {
-      title: '原料出入库记录',
-      noCache: true
-    }
-  }]
-},
+      title: '库存管理'
+    },
+    children: [
+      {
+        path: '/inventory/oilTankList',
+        component: () =>
+          import('@/views/inventory/oilTankList/index.vue'),
+        name: 'index',
+        meta: {
+          title: '油罐库存记录'
+        }
+      },{
+        path: '/inventory/oilTypeInBoundList',
+        component: () =>
+          import('@/views/inventory/oilTypeInBoundList/index.vue'),
+        name: 'index',
+        meta: {
+          title: '原油入库记录'
+        }
+      },
+      {
+        path: '/inventory/oilTypeOutBoundList',
+        component: () =>
+          import('@/views/inventory/oilTypeOutBoundList/index.vue'),
+        name: 'index',
+        meta: {
+          title: '原油出库记录'
+        }
+      },
+    ]
+  },
+
+  // {
+  //   path: 'rawMaterialType',
+  //   component: Layout,
+  //   redirect: '/rawMaterialType',
+  //   children: [{
+  //     path: '/rawMaterialType/index',
+  //     component: () => import('@/views/rawMaterialType/index.vue'),
+  //     name: 'index',
+  //     meta: {
+  //       title: '原料类型',
+  //       noCache: true
+  //     }
+  //   }]
+  // }, {
+  //   path: 'rawMaterialInfo',
+  //   component: Layout,
+  //   redirect: '/rawMaterialInfo',
+  //   children: [{
+  //     path: '/rawMaterialInfo/index',
+  //     component: () => import('@/views/rawMaterialInfo/index.vue'),
+  //     name: 'index',
+  //     meta: {
+  //       title: '原料信息',
+  //       noCache: true
+  //     }
+  //   }]
+  // },
+  // {
+  //   path: 'oilType',
+  //   component: Layout,
+  //   redirect: '/oilType',
+  //   children: [{
+  //     path: '/oilType/index',
+  //     component: () => import('@/views/oilType/index.vue'),
+  //     name: 'index',
+  //     meta: {
+  //       title: '原油类型',
+  //       noCache: true
+  //     }
+  //   }]
+  // }, {
+  //   path: 'oilTank',
+  //   component: Layout,
+  //   redirect: '/oilTank',
+  //   children: [{
+  //     path: '/oilTank/index',
+  //     component: () => import('@/views/oilTank/index.vue'),
+  //     name: 'index',
+  //     meta: {
+  //       title: '油罐信息',
+  //       noCache: true
+  //     }
+  //   }]
+  // }, {
+  //   path: 'flowInstrument',
+  //   component: Layout,
+  //   redirect: '/flowInstrument',
+  //   children: [{
+  //     path: '/flowInstrument/index',
+  //     component: () => import('@/views/flowInstrument/index.vue'),
+  //     name: 'index',
+  //     meta: {
+  //       title: '流程仪器',
+  //       noCache: true
+  //     }
+  //   }]
+  // }, {
+  //   path: 'oilTypeInAndOutBound',
+  //   component: Layout,
+  //   redirect: '/oilTypeInAndOutBound',
+  //   children: [{
+  //     path: '/oilTypeInAndOutBound/index',
+  //     component: () => import('@/views/oilTypeInAndOutBound/index.vue'),
+  //     name: 'index',
+  //     meta: {
+  //       title: '原油出入库记录',
+  //       noCache: true
+  //     }
+  //   }]
+  // }, {
+  //   path: 'rawMaterialInAndOutBound',
+  //   component: Layout,
+  //   redirect: '/rawMaterialInAndOutBound',
+  //   children: [{
+  //     path: '/rawMaterialInAndOutBound/index',
+  //     component: () => import('@/views/rawMaterialInAndOutBound/index.vue'),
+  //     name: 'index',
+  //     meta: {
+  //       title: '原料出入库记录',
+  //       noCache: true
+  //     }
+  //   }]
+  // },
   ...codemenu,
   {
     path: '/404',
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/flowInstrumentAdd.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/flowInstrumentAdd.vue
new file mode 100644
index 00000000..0014d1cb
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/flowInstrumentAdd.vue
@@ -0,0 +1,219 @@
+<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>
+
+      <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">流量仪器Code：</span>
+          <el-input v-model="formobj.code" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">油罐编号：</span>
+         <el-select v-model="formobj.tankNumber" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
+           <el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" />
+         </el-select>
+        </div>
+      </el-card>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/flowInstrument/flowInstrument'
+  import req2 from '@/api/oilTypeInAndOutBound/oilTypeInAndOutBound'
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        tankLists: [],
+        tankList: [],
+        formobj: {
+          sid: "",
+          name: "",
+          number: "",
+          code: "",
+          tankNumber: "",
+           tankSid:"",
+        }
+      }
+    },
+    created() {
+      this.getTankList()
+    },
+    methods: {
+      getTankList() {
+        req2.tankList().then((res) => {
+          if (res.success) {
+            console.log(">>>>>>>>>111111111111wwwwwwwwww", res.data)
+            this.tankLists = res.data
+            for (var i = 0; i < this.tankLists.length; i++) {
+
+              let item = {
+                name: this.tankLists[i].number,
+                sid: this.tankLists[i].sid,
+
+              }
+              this.tankList.push(item)
+            }
+
+          }
+        })
+      },
+      getTank(value) {
+        console.log(">>>>>>>>>getType", value)
+        const choose = this.tankLists.filter((item) => item.sid === value)
+        console.log(">>>>>>>>>getType", choose[0])
+        this.formobj.tankSid = choose[0].sid
+      },
+      saveOrUpdate() {
+        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: "",
+          tankNumber:"",
+           tankSid:"",
+        }
+        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>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/index.vue
new file mode 100644
index 00000000..9abf3b0d
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/index.vue
@@ -0,0 +1,227 @@
+<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>
+          <!-- 翻页分页 -->
+          <!-- <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-column label="油罐编号" prop="tankNumber" align="center" />
+            <el-table-column label="原油编码" prop="crudeNumber" 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>
+    <flowInstrumentAdd 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/flowInstrument/flowInstrument'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import ButtonBar from '@/components/ButtonBar'
+  import flowInstrumentAdd from './flowInstrumentAdd.vue'
+  // import oilTypeInfo from './oilTypeInfo.vue'
+  export default {
+    name: 'CustomerManagement',
+    components: {
+      Pagination,
+      pageye,
+      ButtonBar,
+      flowInstrumentAdd,
+      // 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/oilTank/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilTank/index.vue
new file mode 100644
index 00000000..1a20fca4
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilTank/index.vue
@@ -0,0 +1,263 @@
+<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.number" 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="number" align="center" />
+            <el-table-column label="原油名称" prop="crudeName" align="center" />
+            <el-table-column label="原油编号" prop="crudeNumber" align="center" />
+            <el-table-column label="油罐容量" prop="capacity" align="center" />
+            <el-table-column label="油罐库存" prop="inventory" align="center" />
+            <el-table-column label="油罐现有库存" prop="existingInventory" 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>
+            <!-- <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/oilTank/oilTank'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import ButtonBar from '@/components/ButtonBar'
+  import oilTankAdd from './oilTankAdd.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: {},
+        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.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/oilTank/oilTankAdd.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilTank/oilTankAdd.vue
new file mode 100644
index 00000000..bb1f153e
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilTank/oilTankAdd.vue
@@ -0,0 +1,199 @@
+<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>
+
+      <el-card class="box-card">
+        <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.crudeName" filterable placeholder="请选择原油类型" class="item_input"
+            @change="getType">
+            <el-option v-for="item in crudeList" :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.crudeNumber" placeholder="" :readonly="true" class="item_input" clearable />
+          <!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
+        </div>
+        <div class="item">
+          <span class="item_text">油罐容量：</span>
+          <el-input v-model="formobj.capacity" 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/oilTank/oilTank'
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        crudeLists:[],
+        crudeList:[],
+        formobj: {
+          sid: "",
+          number: "",
+          crudeSid: "",
+          crudeName: "",
+          crudeNumber: "",
+          capacity: "",
+          tankPipeline: "",
+          initialInventory: "",
+
+        }
+      }
+    },
+    created() {
+      this.crudeinfoList()
+    },
+    methods: {
+      crudeinfoList() {
+       req.crudeinfoList().then((res) => {
+          if (res.success) {
+             console.log(">>>>>>>>>2222222", res.data)
+            this.crudeLists = res.data
+            for (var i = 0; i <this.crudeLists.length; i++) {
+
+              let item = {
+                name: this.crudeLists[i].name,
+                sid: this.crudeLists[i].sid,
+
+              }
+              this.crudeList.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: "",
+          number: "",
+          crudeSid:"",
+          crudeName: "",
+          crudeNumber: "",
+          capacity: "",
+          tankPipeline: "",
+          initialInventory: "",
+
+        }
+        this.$emit('doback')
+      },
+      getType(value) {
+        console.log(">>>>>>>>>getType", value)
+        const choose = this.crudeLists.filter((item) => item.sid === value)
+         console.log(">>>>>>>>>getType", choose[0])
+        // this.formobj.crudeSid = choose[0].sid
+        this.formobj.crudeNumber = choose[0].number
+        this.formobj.crudeSid = value
+      },
+    }
+  }
+</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/oilType/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilType/index.vue
new file mode 100644
index 00000000..ea1e53d3
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilType/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="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>
+          <!-- 翻页分页 -->
+          <!-- <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>
+    <oilTypeAdd 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/oilType/oilType'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import ButtonBar from '@/components/ButtonBar'
+  import oilTypeAdd from './oilTypeAdd.vue'
+  // import oilTypeInfo from './oilTypeInfo.vue'
+  export default {
+    name: 'CustomerManagement',
+    components: {
+      Pagination,
+      pageye,
+      ButtonBar,
+      oilTypeAdd,
+      // 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/oilType/oilTypeAdd.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilType/oilTypeAdd.vue
new file mode 100644
index 00000000..96d19d2a
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilType/oilTypeAdd.vue
@@ -0,0 +1,179 @@
+<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>
+
+      <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">原油Code：</span>
+          <el-input v-model="formobj.code" placeholder="" class="item_input" clearable />
+        </div>
+      </el-card>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/oilType/oilType'
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        formobj: {
+          sid: "",
+          name: "",
+          number: "",
+          code: ""
+        }
+      }
+    },
+    methods: {
+      saveOrUpdate() {
+        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>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilType/oilTypeInfo.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilType/oilTypeInfo.vue
new file mode 100644
index 00000000..1a19a24b
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilType/oilTypeInfo.vue
@@ -0,0 +1,254 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>【查看】项目信息</div>
+        <div>
+          <el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd" style="padding-bottom: 50px;">
+        <el-form ref="dataForm" :model="temp" label-position="top" label-width="190px" class="formadd">
+          <div class="titwu">项目信息表</div>
+          <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+            <div>主体信息</div>
+          </div>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">项目名称</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <span>{{temp.entryName}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">所属行业</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                 <span>{{temp.industryName}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">项目类型</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                 <span>{{temp.typeName}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">授信额度</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <span>{{temp.creditLimit}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">贷款行</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                 <span>{{temp.bankName}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">客户经理</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                 <span>{{temp.bmanagerName}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">接洽日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" >
+              <el-form-item class="trightb_item">
+                 <span>{{temp.engaDate}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">签约日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" >
+              <el-form-item class="trightb_item">
+                 <span>{{temp.signingDate}}</span>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">项目单位</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+               <el-form-item class="trightb_item">
+              <span>{{temp.enterpriseName}}</span>
+               </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+               <el-form-item class="trightb_item">
+               <span slot="label">项目联系人</span>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+               <span>{{temp.econtacts}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">项目说明</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item class="trightb_item">
+                <span>{{temp.remarks}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">监管负责人</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <span>{{temp.regulatoryLeader}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">事业部经理</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <span>{{temp.generalManager}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">结束日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" >
+              <el-form-item class="trightb_item">
+                 <span>{{temp.endDate}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">填表日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" >
+              <el-form-item class="trightb_item">
+                <span>{{temp.fillInDate}}</span>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+        </el-form>
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/oilType/oilType'
+
+  export default {
+    name: 'CustomerManagementInfo',
+    data() {
+      return {
+        temp: {} // 添加和修改
+      }
+    },
+
+    methods: {
+    showAdd(sid) {
+      req.fetchBySid(sid)
+        .then(resp => {
+          if (resp.success) {
+            this.temp = resp.data
+          }
+
+        })
+        .catch(e => {
+          this.$emit('doback')
+        })
+    },
+    // 组件返回
+    handleReturn() {
+      this.$emit('doback')
+    }
+    }
+  }
+</script>
+<style scoped>
+  .trightb {
+    display: flex;
+    align-items: center;
+    text-align: ;
+    justify-content: center;
+  }
+
+  .trightb_item {
+    padding-top: 5px;
+  }
+
+  .span {
+    margin-left: 50px;
+    font-size: 15px;
+    font-weight: 400;
+  }
+
+  /deep/ .el-collapse-item__header {
+    height: 40px;
+    padding: 10px;
+    font-weight: bold;
+    font-size: 20px;
+    text-align: left;
+    color: #ffffff;
+    background-color: #0294d7;
+  }
+
+  /deep/ .el-collapse-item__content {
+    padding-bottom: 0;
+  }
+</style>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/rawMaterialInfo/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/rawMaterialInfo/index.vue
new file mode 100644
index 00000000..018e5a6f
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/rawMaterialInfo/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="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>
+          <!-- 翻页分页 -->
+          <!-- <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>
+    <rawMaterialInfoAdd 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/rawMaterialInfo/rawMaterialInfo.js'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import ButtonBar from '@/components/ButtonBar'
+  import rawMaterialInfoAdd from './rawMaterialInfoAdd.vue'
+  // import oilTypeInfo from './oilTypeInfo.vue'
+  export default {
+    name: 'CustomerManagement',
+    components: {
+      Pagination,
+      pageye,
+      ButtonBar,
+      rawMaterialInfoAdd,
+      // 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/rawMaterialInfo/rawMaterialInfoAdd.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/rawMaterialInfo/rawMaterialInfoAdd.vue
new file mode 100644
index 00000000..6483ad3e
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/rawMaterialInfo/rawMaterialInfoAdd.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>
+
+      <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/rawMaterialInfo/rawMaterialInfo'
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        typeLists: [],
+        typeList: [],
+        formobj: {
+          sid: "",
+          name: "",
+          number: "",
+          inventory: "",
+          initialInventory: "",
+          typeSid: "",
+          typeName: "",
+
+        }
+      }
+    },
+    created() {
+      this.rawMaterialType()
+    },
+    methods: {
+      rawMaterialType() {
+        req.rawMaterialType().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/rawMaterialType/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/rawMaterialType/index.vue
new file mode 100644
index 00000000..a6120451
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/rawMaterialType/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="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>
+          <!-- 翻页分页 -->
+          <!-- <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>
+    <rawMaterialTypeAdd 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/rawMaterialType/rawMaterialType'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import ButtonBar from '@/components/ButtonBar'
+  import rawMaterialTypeAdd from './rawMaterialTypeAdd.vue'
+  // import oilTypeInfo from './oilTypeInfo.vue'
+  export default {
+    name: 'CustomerManagement',
+    components: {
+      Pagination,
+      pageye,
+      ButtonBar,
+      rawMaterialTypeAdd,
+      // 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/rawMaterialType/oilTypeInfo.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/rawMaterialType/oilTypeInfo.vue
new file mode 100644
index 00000000..1a19a24b
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/rawMaterialType/oilTypeInfo.vue
@@ -0,0 +1,254 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>【查看】项目信息</div>
+        <div>
+          <el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd" style="padding-bottom: 50px;">
+        <el-form ref="dataForm" :model="temp" label-position="top" label-width="190px" class="formadd">
+          <div class="titwu">项目信息表</div>
+          <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+            <div>主体信息</div>
+          </div>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">项目名称</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <span>{{temp.entryName}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">所属行业</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                 <span>{{temp.industryName}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">项目类型</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                 <span>{{temp.typeName}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">授信额度</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <span>{{temp.creditLimit}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">贷款行</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                 <span>{{temp.bankName}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">客户经理</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                 <span>{{temp.bmanagerName}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">接洽日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" >
+              <el-form-item class="trightb_item">
+                 <span>{{temp.engaDate}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">签约日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" >
+              <el-form-item class="trightb_item">
+                 <span>{{temp.signingDate}}</span>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">项目单位</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+               <el-form-item class="trightb_item">
+              <span>{{temp.enterpriseName}}</span>
+               </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+               <el-form-item class="trightb_item">
+               <span slot="label">项目联系人</span>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+               <span>{{temp.econtacts}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">项目说明</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item class="trightb_item">
+                <span>{{temp.remarks}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">监管负责人</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <span>{{temp.regulatoryLeader}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">事业部经理</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <span>{{temp.generalManager}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">结束日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" >
+              <el-form-item class="trightb_item">
+                 <span>{{temp.endDate}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">填表日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" >
+              <el-form-item class="trightb_item">
+                <span>{{temp.fillInDate}}</span>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+        </el-form>
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/oilType/oilType'
+
+  export default {
+    name: 'CustomerManagementInfo',
+    data() {
+      return {
+        temp: {} // 添加和修改
+      }
+    },
+
+    methods: {
+    showAdd(sid) {
+      req.fetchBySid(sid)
+        .then(resp => {
+          if (resp.success) {
+            this.temp = resp.data
+          }
+
+        })
+        .catch(e => {
+          this.$emit('doback')
+        })
+    },
+    // 组件返回
+    handleReturn() {
+      this.$emit('doback')
+    }
+    }
+  }
+</script>
+<style scoped>
+  .trightb {
+    display: flex;
+    align-items: center;
+    text-align: ;
+    justify-content: center;
+  }
+
+  .trightb_item {
+    padding-top: 5px;
+  }
+
+  .span {
+    margin-left: 50px;
+    font-size: 15px;
+    font-weight: 400;
+  }
+
+  /deep/ .el-collapse-item__header {
+    height: 40px;
+    padding: 10px;
+    font-weight: bold;
+    font-size: 20px;
+    text-align: left;
+    color: #ffffff;
+    background-color: #0294d7;
+  }
+
+  /deep/ .el-collapse-item__content {
+    padding-bottom: 0;
+  }
+</style>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/rawMaterialType/rawMaterialTypeAdd.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/rawMaterialType/rawMaterialTypeAdd.vue
new file mode 100644
index 00000000..e5ad70ab
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/rawMaterialType/rawMaterialTypeAdd.vue
@@ -0,0 +1,179 @@
+<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>
+
+      <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">原料Code：</span>
+          <el-input v-model="formobj.code" placeholder="" class="item_input" clearable />
+        </div>
+      </el-card>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/rawMaterialType/rawMaterialType'
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        formobj: {
+          sid: "",
+          name: "",
+          number: "",
+          code: ""
+        }
+      }
+    },
+    methods: {
+      saveOrUpdate() {
+        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>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankList/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankList/index.vue
new file mode 100644
index 00000000..6512c468
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankList/index.vue
@@ -0,0 +1,250 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState ==1">
+      <button-bar ref="btnbar" view-title="油罐库存记录" :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="queryParams" :model="jmdListQuery" :inline="true" class="tab-header">
+              <el-form-item label="油罐编号">
+                <el-input v-model="jmdListQuery.number" maxlength="20" placeholder="请输入油罐编号" class="addinputw"
+                  clearable />
+              </el-form-item>
+              <el-form-item label="日期">
+                <el-date-picker v-model="jmdListQuery.date" type="date" clearable value-format="yyyy-MM-dd"
+                  placeholder="选择日期" />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div>
+          <el-table v-loading="tableLoading1" :data="logList" border style="width: 100%">
+            <el-table-column fixed width="100" type="index" label="序号" :index="indexMethod" align="center" />
+            <el-table-column prop="tankNumber" label="油罐编号"  align="center" />
+            <el-table-column prop="existingInventory" label="油罐登记库存"align="center" />
+            <el-table-column prop="recordDate" label="登记日期" align="center" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="logListTotal > 0" :total="logListTotal" :page.sync="logListQuery.current"
+            :limit.sync="logListQuery.size" class="pagination" @pagination="loadLogList" />
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/oilTank/oilTank'
+  import Pagination from '@/components/pagination'
+  import {
+    parseTime
+  } from '@/utils/index'
+  import ButtonBar from '@/components/ButtonBar'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+    },
+    data() {
+      return {
+        viewState: 1,
+        tabActiveName: 'uplog',
+        index: "0",
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        btndisabled: false,
+        tableLoading1: false,
+        tableLoading2: false,
+        btnList: [ // 右上角按钮
+          // {
+          //   type: 'success',
+          //   size: 'small',
+          //   icon: 'export',
+          //   btnKey: 'build',
+          //   btnLabel: '导出'
+          // },
+          // {
+          //   type: 'primary',
+          //   size: 'small',
+          //   icon: 'plus',
+          //   btnKey: 'toAdd1',
+          //   btnLabel: '新增入库记录'
+          // },
+          // {
+          //   type: 'primary',
+          //   size: 'small',
+          //   icon: 'plus',
+          //   btnKey: 'toAdd2',
+          //   btnLabel: '新增出库记录'
+          // },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        logList: [],
+        logListQuery: {
+          current: 1,
+          size: 10
+        },
+        logListTotal: 1,
+
+        jmdListQuery: {
+          number: "",
+          date: ""
+        }
+      }
+    },
+    mounted() {
+      // 初始化按钮
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      // 初始化变量
+      this.init()
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      dosearch() {
+
+        this.loadLogList()
+
+      },
+      resetQuery() {
+        this.jmdListQuery = {
+          contractNumber: "",
+          date: ""
+        }
+      },
+      // 右上角点击事件
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toAdd1': // 新增入库
+            this.doAdd1()
+            break
+          case 'toAdd2': // 新增出库
+            this.doAdd2()
+            break
+          case 'build': // 导出
+            this.doBuild()
+            break
+          case 'doClose': // 关闭
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      init() {
+        this.loadLogList()
+      },
+      loadLogList() {
+        req.crudeinventoryList({
+          current: this.logListQuery.current,
+          size: this.logListQuery.size,
+          params: this.jmdListQuery
+        }).then(response => {
+          if (response.code === '200' && response.data && response.data.total > 0) {
+            this.logList = response.data.records
+            this.logListTotal = response.data.total
+            this.logListQuery.current = response.data.current
+            this.logListQuery.size = response.data.size
+          } else {
+            this.logList = []
+            this.logListTotal = 0
+          }
+        })
+      },
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.logListQuery.current - 1) * this.logListQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      doAdd1() {
+        this.viewState = 2
+      },
+      doAdd2() {
+        this.viewState = 3
+      },
+
+
+      // 导出文件
+      doBuild() {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        exportExcel(this.jmdListQuery).then((resp) => {
+          loading.close()
+          const blob = new Blob([resp], {
+            type: 'application/vnd.ms-excel;charset=UTF-8'
+          })
+          const fileName = '库存明细列表' + '.xls'
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'nonde'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href)
+          document.body.removeChild(elink)
+        }).catch(() => {
+          loading.close()
+        })
+
+      },
+
+      resetState() {
+        this.viewState = 1
+      },
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      }
+    }
+  }
+</script>
+<style scoped>
+  .wenjiantit {
+    font-size: 16px;
+    font-weight: bold;
+    margin: 25px 0 10px 0;
+  }
+
+  .forminfo {
+    margin: 0;
+    padding: 0;
+  }
+
+  .listcon {
+    height: calc(100vh - 250px);
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+</style>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue
new file mode 100644
index 00000000..63ec3a97
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue
@@ -0,0 +1,315 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState ==1">
+      <button-bar ref="btnbar" view-title="原油入库记录" :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="queryParams" :model="jmdListQuery" :inline="true" class="tab-header">
+              <el-form-item label="合同编号">
+                <el-input v-model="jmdListQuery.contractNumber" maxlength="20" placeholder="请输入合同编号" class="addinputw"
+                  clearable />
+              </el-form-item>
+              <el-form-item label="日期">
+                <el-date-picker v-model="jmdListQuery.date" type="date" clearable value-format="yyyy-MM-dd"
+                  placeholder="选择日期" />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div>
+          <el-table v-loading="tableLoading1" :data="logList" border style="width: 100%">
+            <el-table-column fixed width="100" type="index" label="序号" :index="indexMethod" align="center" />
+            <el-table-column prop="contractNumber" label="合同编号" align="center" />
+            <el-table-column prop="supplierSid" label="供货商" width="150" align="center" />
+            <el-table-column prop="contractSigningDate" label="合同日期" width="150" align="center" />
+            <el-table-column prop="licensePlateNumber" label="发货车牌号" width="150" align="center" />
+            <el-table-column prop="warehousingDate" label="入库日期" width="150" align="center" />
+            <el-table-column prop="tankNumber" label="油罐编号" width="150" align="center" />
+            <el-table-column prop="crudeName" label="原油类型" width="150" align="center" />
+            <el-table-column prop="weight" label="收料净重" width="150" align="center" />
+            <el-table-column prop="value" label="收料价值" width="150" align="center" />
+            <el-table-column prop="inventory" label="收料后库存" width="150" align="center" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="logListTotal > 0" :total="logListTotal" :page.sync="logListQuery.current"
+            :limit.sync="logListQuery.size" class="pagination" @pagination="loadLogList" />
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/oilTypeInAndOutBound/oilTypeInAndOutBound'
+  import Pagination from '@/components/pagination'
+  import {
+    parseTime
+  } from '@/utils/index'
+  import ButtonBar from '@/components/ButtonBar'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+    },
+    data() {
+      return {
+        viewState: 1,
+        tabActiveName: 'uplog',
+        index: "0",
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        btndisabled: false,
+        tableLoading1: false,
+        tableLoading2: false,
+        btnList: [ // 右上角按钮
+          // {
+          //   type: 'success',
+          //   size: 'small',
+          //   icon: 'export',
+          //   btnKey: 'build',
+          //   btnLabel: '导出'
+          // },
+          // {
+          //   type: 'primary',
+          //   size: 'small',
+          //   icon: 'plus',
+          //   btnKey: 'toAdd1',
+          //   btnLabel: '新增入库记录'
+          // },
+          // {
+          //   type: 'primary',
+          //   size: 'small',
+          //   icon: 'plus',
+          //   btnKey: 'toAdd2',
+          //   btnLabel: '新增出库记录'
+          // },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        logList: [],
+        logListQuery: {
+          current: 1,
+          size: 10
+        },
+        logListTotal: 1,
+        in112List: [],
+        in112ListQuery: {
+          current: 1,
+          size: 10
+        },
+        in112ListTotal: 1,
+
+        jmdListQuery: {
+          contractNumber: "",
+          date: ""
+        }
+      }
+    },
+    mounted() {
+      // 初始化按钮
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      // 初始化变量
+      this.init()
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      dosearch() {
+
+        // if (this.index == "0") {
+        this.loadLogList()
+        // } else if (this.index == "1") {
+        this.loadIn112List()
+        // }
+
+      },
+      resetQuery() {
+        this.jmdListQuery = {
+          contractNumber: "",
+          date: ""
+        }
+      },
+      // 右上角点击事件
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toAdd1': // 新增入库
+            this.doAdd1()
+            break
+          case 'toAdd2': // 新增出库
+            this.doAdd2()
+            break
+          case 'build': // 导出
+            this.doBuild()
+            break
+          case 'doClose': // 关闭
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      init() {
+        this.loadLogList()
+        this.loadIn112List()
+      },
+      handleOrder(tab, event) {
+        console.log("tab", tab)
+        // this.listQuery.status = tab.name;
+        // this.getList();
+        // this.orderDatas(tab.name);
+
+        this.index = tab.index
+
+        switch (tab.index) {
+          // 入库
+          case "0":
+            if (this.logList.length == 0)
+              this.loadLogList()
+            break;
+            // 出库
+          case "1":
+            if (this.in112List.length == 0)
+              this.loadIn112List()
+            break;
+          default:
+            break;
+        }
+
+      },
+      loadLogList() {
+        req.logPagerList({
+          current: this.logListQuery.current,
+          size: this.logListQuery.size,
+          params: this.jmdListQuery
+        }).then(response => {
+          if (response.code === '200' && response.data && response.data.total > 0) {
+            this.logList = response.data.records
+            this.logListTotal = response.data.total
+            this.logListQuery.current = response.data.current
+            this.logListQuery.size = response.data.size
+          } else {
+            this.logList = []
+            this.logListTotal = 0
+          }
+        })
+      },
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.logListQuery.current - 1) * this.logListQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      loadIn112List() {
+        req.in112PagerList({
+          current: this.in112ListQuery.current,
+          size: this.in112ListQuery.size,
+          params: this.jmdListQuery
+        }).then(response => {
+          if (response.code === '200' && response.data && response.data.total > 0) {
+            this.in112List = response.data.records
+            this.in112ListTotal = response.data.total
+            this.in112ListQuery.current = response.data.current
+            this.in112ListQuery.size = response.data.size
+          } else {
+            this.in112List = []
+            this.in112ListTotal = 0
+          }
+        })
+      },
+      // 序号
+      indexMethod2(index) {
+        var pagestart = (this.in112ListQuery.current - 1) * this.in112ListQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      doAdd1() {
+        this.viewState = 2
+      },
+      doAdd2() {
+        this.viewState = 3
+      },
+
+
+      // 导出文件
+      doBuild() {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        exportExcel(this.jmdListQuery).then((resp) => {
+          loading.close()
+          const blob = new Blob([resp], {
+            type: 'application/vnd.ms-excel;charset=UTF-8'
+          })
+          const fileName = '库存明细列表' + '.xls'
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'nonde'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href)
+          document.body.removeChild(elink)
+        }).catch(() => {
+          loading.close()
+        })
+
+      },
+
+      resetState() {
+        this.viewState = 1
+      },
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      }
+    }
+  }
+</script>
+<style scoped>
+  .wenjiantit {
+    font-size: 16px;
+    font-weight: bold;
+    margin: 25px 0 10px 0;
+  }
+
+  .forminfo {
+    margin: 0;
+    padding: 0;
+  }
+
+  .listcon {
+    height: calc(100vh - 250px);
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+</style>
\ No newline at end of file
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeOutBoundList/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeOutBoundList/index.vue
new file mode 100644
index 00000000..ebcee6dc
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeOutBoundList/index.vue
@@ -0,0 +1,314 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState ==1">
+      <button-bar ref="btnbar" view-title="原油出库记录" :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="queryParams" :model="jmdListQuery" :inline="true" class="tab-header">
+              <el-form-item label="合同编号">
+                <el-input v-model="jmdListQuery.contractNumber" maxlength="20" placeholder="请输入合同编号" class="addinputw"
+                  clearable />
+              </el-form-item>
+              <el-form-item label="日期">
+                <el-date-picker v-model="jmdListQuery.date" type="date" clearable value-format="yyyy-MM-dd"
+                  placeholder="选择日期" />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+
+        <div>
+          <el-table v-loading="tableLoading2" :data="in112List" border style="width: 100%">
+            <el-table-column fixed width="100" type="index" label="序号" :index="indexMethod2" align="center" />
+            <el-table-column prop="salesContractNumber" label="合同编号" align="center" />
+            <el-table-column prop="contractSigningDate" label="合同日期" width="150" align="center" />
+            <el-table-column prop="deliveryDate" label="出库日期" width="150" align="center" />
+            <el-table-column prop="flowmeterNumber" label="流量仪器" width="150" align="center" />
+            <el-table-column prop="tankNumber" label="油罐编号" width="150" align="center" />
+            <el-table-column prop="crudeName" label="原油类型" width="150" align="center" />
+            <el-table-column prop="weight" label="净重" width="150" align="center" />
+            <el-table-column prop="value" label="原油价值" width="150" align="center" />
+            <el-table-column prop="inventory" label="库存剩余净重" width="150" align="center" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="in112ListTotal > 0" :total="in112ListTotal" :page.sync="in112ListQuery.current"
+            :limit.sync="in112ListQuery.size" class="pagination" @pagination="loadIn112List" />
+        </div>
+      </div>
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/oilTypeInAndOutBound/oilTypeInAndOutBound'
+  import Pagination from '@/components/pagination'
+  import {
+    parseTime
+  } from '@/utils/index'
+  import ButtonBar from '@/components/ButtonBar'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+    },
+    data() {
+      return {
+        viewState: 1,
+        tabActiveName: 'uplog',
+        index: "0",
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        btndisabled: false,
+        tableLoading1: false,
+        tableLoading2: false,
+        btnList: [ // 右上角按钮
+          // {
+          //   type: 'success',
+          //   size: 'small',
+          //   icon: 'export',
+          //   btnKey: 'build',
+          //   btnLabel: '导出'
+          // },
+          // {
+          //   type: 'primary',
+          //   size: 'small',
+          //   icon: 'plus',
+          //   btnKey: 'toAdd1',
+          //   btnLabel: '新增入库记录'
+          // },
+          // {
+          //   type: 'primary',
+          //   size: 'small',
+          //   icon: 'plus',
+          //   btnKey: 'toAdd2',
+          //   btnLabel: '新增出库记录'
+          // },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        logList: [],
+        logListQuery: {
+          current: 1,
+          size: 10
+        },
+        logListTotal: 1,
+        in112List: [],
+        in112ListQuery: {
+          current: 1,
+          size: 10
+        },
+        in112ListTotal: 1,
+
+        jmdListQuery: {
+          contractNumber: "",
+          date: ""
+        }
+      }
+    },
+    mounted() {
+      // 初始化按钮
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      // 初始化变量
+      this.init()
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      dosearch() {
+
+        // if (this.index == "0") {
+        this.loadLogList()
+        // } else if (this.index == "1") {
+        this.loadIn112List()
+        // }
+
+      },
+      resetQuery() {
+        this.jmdListQuery = {
+          contractNumber: "",
+          date: ""
+        }
+      },
+      // 右上角点击事件
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toAdd1': // 新增入库
+            this.doAdd1()
+            break
+          case 'toAdd2': // 新增出库
+            this.doAdd2()
+            break
+          case 'build': // 导出
+            this.doBuild()
+            break
+          case 'doClose': // 关闭
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      init() {
+        this.loadLogList()
+        this.loadIn112List()
+      },
+      handleOrder(tab, event) {
+        console.log("tab", tab)
+        // this.listQuery.status = tab.name;
+        // this.getList();
+        // this.orderDatas(tab.name);
+
+        this.index = tab.index
+
+        switch (tab.index) {
+          // 入库
+          case "0":
+            if (this.logList.length == 0)
+              this.loadLogList()
+            break;
+            // 出库
+          case "1":
+            if (this.in112List.length == 0)
+              this.loadIn112List()
+            break;
+          default:
+            break;
+        }
+
+      },
+      loadLogList() {
+        req.logPagerList({
+          current: this.logListQuery.current,
+          size: this.logListQuery.size,
+          params: this.jmdListQuery
+        }).then(response => {
+          if (response.code === '200' && response.data && response.data.total > 0) {
+            this.logList = response.data.records
+            this.logListTotal = response.data.total
+            this.logListQuery.current = response.data.current
+            this.logListQuery.size = response.data.size
+          } else {
+            this.logList = []
+            this.logListTotal = 0
+          }
+        })
+      },
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.logListQuery.current - 1) * this.logListQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      loadIn112List() {
+        req.in112PagerList({
+          current: this.in112ListQuery.current,
+          size: this.in112ListQuery.size,
+          params: this.jmdListQuery
+        }).then(response => {
+          if (response.code === '200' && response.data && response.data.total > 0) {
+            this.in112List = response.data.records
+            this.in112ListTotal = response.data.total
+            this.in112ListQuery.current = response.data.current
+            this.in112ListQuery.size = response.data.size
+          } else {
+            this.in112List = []
+            this.in112ListTotal = 0
+          }
+        })
+      },
+      // 序号
+      indexMethod2(index) {
+        var pagestart = (this.in112ListQuery.current - 1) * this.in112ListQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      doAdd1() {
+        this.viewState = 2
+      },
+      doAdd2() {
+        this.viewState = 3
+      },
+
+
+      // 导出文件
+      doBuild() {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        exportExcel(this.jmdListQuery).then((resp) => {
+          loading.close()
+          const blob = new Blob([resp], {
+            type: 'application/vnd.ms-excel;charset=UTF-8'
+          })
+          const fileName = '库存明细列表' + '.xls'
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'nonde'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href)
+          document.body.removeChild(elink)
+        }).catch(() => {
+          loading.close()
+        })
+
+      },
+
+      resetState() {
+        this.viewState = 1
+      },
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      }
+    }
+  }
+</script>
+<style scoped>
+  .wenjiantit {
+    font-size: 16px;
+    font-weight: bold;
+    margin: 25px 0 10px 0;
+  }
+
+  .forminfo {
+    margin: 0;
+    padding: 0;
+  }
+
+  .listcon {
+    height: calc(100vh - 250px);
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+</style>
\ No newline at end of file
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeInBound/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeInBound/index.vue
new file mode 100644
index 00000000..7dbb2884
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeInBound/index.vue
@@ -0,0 +1,226 @@
+<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>
+
+      <el-card class="box-card">
+        <div class="item">
+          <span class="item_text">合同编号：</span>
+          <el-input v-model="formobj.contractNumber" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">供货商：</span>
+          <el-input v-model="formobj.supplierSid" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">合同日期：</span>
+          <el-date-picker v-model="formobj.contractSigningDate" type="date" format="yyyy-MM-dd" class="item_input"
+            value-format="yyyy-MM-dd" placeholder="请选择" />
+        </div>
+        <div class="item">
+          <span class="item_text">发货车牌号：</span>
+          <el-input v-model="formobj.licensePlateNumber" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">入库日期：</span>
+          <el-date-picker v-model="formobj.warehousingDate" type="date" format="yyyy-MM-dd" class="item_input"
+            value-format="yyyy-MM-dd" placeholder="请选择" />
+        </div>
+        <div class="item">
+          <span class="item_text">油罐编号：</span>
+          <el-select v-model="formobj.tankName" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
+            <el-option v-for="item in tankList" :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.oilType" placeholder="" :readonly="true" class="item_input" clearable />
+          <!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
+        </div>
+        <div class="item">
+          <span class="item_text">收料净重：</span>
+          <el-input v-model="formobj.weight" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">收料价值：</span>
+          <el-input v-model="formobj.value" placeholder="" class="item_input" clearable />
+        </div>
+
+        <div class="item">
+          <span class="item_text">备注：</span>
+          <el-input v-model="formobj.remarks" placeholder="" class="item_input" clearable />
+        </div>
+      </el-card>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/oilTypeInAndOutBound/oilTypeInAndOutBound'
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        tankLists: [],
+        tankList: [],
+        formobj: {
+          sid: "",
+          contractNumber: "",
+          contractSigningDate: "",
+          warehousingDate: "",
+          tankName: "",
+          tankSid: "",
+          oilType: "",
+          weight: "",
+          value: "",
+          supplierSid: "",
+          licensePlateNumber: "",
+          remarks: "",
+
+        }
+      }
+    },
+    created() {
+      this.getTankList()
+    },
+    methods: {
+      getTankList() {
+        req.tankList().then((res) => {
+          if (res.success) {
+            console.log(">>>>>>>>>111111111111wwwwwwwwww", res.data)
+            this.tankLists = res.data
+            for (var i = 0; i < this.tankLists.length; i++) {
+
+              let item = {
+                name: this.tankLists[i].number,
+                sid: this.tankLists[i].sid,
+
+              }
+              this.tankList.push(item)
+            }
+
+          }
+        })
+      },
+      saveOrUpdate() {
+        req.intAddInfo(this.formobj)
+          .then(resp => {
+            if (resp.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+             this.formobj = {
+               sid: "",
+               salesContractNumber: "",
+               contractSigningDate: "",
+               deliveryDate: "",
+               flowmeterSid: "",
+               flowmeterName: "",
+               tankName: "",
+               oilType: "",
+               weight: "",
+               value: "",
+               remarks: "",
+             
+             }
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          })
+          .catch(() => {})
+
+      },
+      handleReturn() {
+         this.$store.dispatch('tagsView/delView', this.$route)
+         this.$router.go(-1)
+      },
+      getTank(value) {
+        console.log(">>>>>>>>>getType", value)
+        const choose = this.tankLists.filter((item) => item.sid === value)
+        console.log(">>>>>>>>>getType", choose[0])
+        this.formobj.tankSid = choose[0].sid
+        this.formobj.oilType = choose[0].crudeName
+      },
+    }
+  }
+</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/supervise/oilTypeOutBound/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeOutBound/index.vue
new file mode 100644
index 00000000..87c587cd
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeOutBound/index.vue
@@ -0,0 +1,226 @@
+<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>
+
+      <el-card class="box-card">
+        <div class="item">
+          <span class="item_text">合同编号：</span>
+          <el-input v-model="formobj.salesContractNumber" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">合同日期：</span>
+          <el-date-picker v-model="formobj.contractSigningDate" type="date" format="yyyy-MM-dd" class="item_input"
+            value-format="yyyy-MM-dd" placeholder="请选择" />
+        </div>
+        <div class="item">
+          <span class="item_text">出库日期：</span>
+          <el-date-picker v-model="formobj.deliveryDate" type="date" format="yyyy-MM-dd" class="item_input"
+            value-format="yyyy-MM-dd" placeholder="请选择" />
+        </div>
+        <div class="item">
+          <span class="item_text">流量仪器：</span>
+          <el-select v-model="formobj.flowmeterName" filterable placeholder="请选择流量仪器" class="item_input"
+            @change="getFlowmeter">
+            <el-option v-for="item in flowmeterList" :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.tankName" placeholder="" :readonly="true" class="item_input" clearable />
+          <!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
+        </div>
+        <div class="item">
+          <span class="item_text">原油编号：</span>
+          <el-input v-model="formobj.oilType" placeholder="" :readonly="true" class="item_input" clearable />
+          <!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
+        </div>
+        <div class="item">
+          <span class="item_text">净重：</span>
+          <el-input v-model="formobj.weight" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">原油价值：</span>
+          <el-input v-model="formobj.value" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">备注：</span>
+          <el-input v-model="formobj.remarks" placeholder="" class="item_input" clearable />
+        </div>
+      </el-card>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/oilTypeInAndOutBound/oilTypeInAndOutBound'
+  import req2 from '@/api/flowInstrument/flowInstrument'
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        flowmeterLists: [],
+        flowmeterList: [],
+        formobj: {
+          sid: "",
+          salesContractNumber: "",
+          contractSigningDate: "",
+          deliveryDate: "",
+          flowmeterSid: "",
+          flowmeterName: "",
+          tankName: "",
+          oilType: "",
+          weight: "",
+          value: "",
+          remarks: "",
+
+        }
+      }
+    },
+    created() {
+      console.log(">>>>>>>>>created")
+      this.getFlowmeterList()
+    },
+    methods: {
+      getFlowmeterList() {
+        console.log(">>>>>>>>>111111111111wwwwwwwwww")
+        req2.flowmeterList().then((res) => {
+          if (res.success) {
+            console.log(">>>>>>>>>111111111111wwwwwwwwww", res.data)
+            this.flowmeterLists = res.data
+            for (var i = 0; i < this.flowmeterLists.length; i++) {
+
+              let item = {
+                name: this.flowmeterLists[i].number,
+                sid: this.flowmeterLists[i].sid,
+
+              }
+              this.flowmeterList.push(item)
+            }
+
+          }
+        })
+      },
+      saveOrUpdate() {
+        req.outAddInfo(this.formobj)
+          .then(resp => {
+            if (resp.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+            this.formobj = {
+              sid: "",
+              salesContractNumber: "",
+              contractSigningDate: "",
+              deliveryDate: "",
+              flowmeterSid: "",
+              flowmeterName: "",
+              tankName: "",
+              oilType: "",
+              weight: "",
+              value: "",
+              remarks: "",
+            
+            }
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          })
+          .catch(() => {})
+
+      },
+     handleReturn() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+     },
+      getFlowmeter(value) {
+        console.log(">>>>>>>>>getType", value)
+        const choose = this.flowmeterLists.filter((item) => item.sid === value)
+        console.log(">>>>>>>>>getType", choose[0])
+        this.formobj.flowmeterSid = choose[0].sid
+        this.formobj.tankName = choose[0].tankNumber
+        this.formobj.oilType = choose[0].crudeNumber
+      },
+    }
+  }
+</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/supervise/recordOilTank/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/recordOilTank/index.vue
new file mode 100644
index 00000000..68bf978e
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/recordOilTank/index.vue
@@ -0,0 +1,173 @@
+<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>
+
+      <el-card class="box-card">
+        <div class="item">
+          <span class="item_text">油罐编号：</span>
+          <el-select v-model="formobj.tankName" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
+            <el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" />
+          </el-select>
+        </div>
+        <div class="item">
+          <span class="item_text">油罐库存：</span>
+          <el-input v-model="formobj.existingInventory" placeholder="" class="item_input" clearable />
+        </div>
+      </el-card>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+   import req from '@/api/oilTank/oilTank'
+  import req2 from '@/api/oilTypeInAndOutBound/oilTypeInAndOutBound'
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        tankLists: [],
+        tankList: [],
+        formobj: {
+          tankName: "",
+          tankSid: "",
+          existingInventory: ""
+        }
+      }
+    },
+    created() {
+      this.getTankList()
+    },
+    methods: {
+      getTankList() {
+        req2.tankList().then((res) => {
+          if (res.success) {
+            console.log(">>>>>>>>>111111111111wwwwwwwwww", res.data)
+            this.tankLists = res.data
+            for (var i = 0; i < this.tankLists.length; i++) {
+
+              let item = {
+                name: this.tankLists[i].number,
+                sid: this.tankLists[i].sid,
+
+              }
+              this.tankList.push(item)
+            }
+
+          }
+        })
+      },
+      saveOrUpdate() {
+          console.log(">>>>>>>>>111111111111wwwwwwwwww",this.formobj)
+        req.saveInfo(this.formobj)
+          .then(resp => {
+            if (resp.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              this.formobj = {
+                tankName: "",
+                tankSid: "",
+                existingInventory: "",
+
+              }
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          })
+          .catch(() => {})
+
+      },
+      handleReturn() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+      getTank(value) {
+        console.log(">>>>>>>>>getType", value)
+        const choose = this.tankLists.filter((item) => item.sid === value)
+        console.log(">>>>>>>>>getType", choose[0])
+        this.formobj.tankSid = choose[0].sid
+        this.formobj.tankName = choose[0].number
+      },
+    }
+  }
+</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>