diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development b/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
index 8a48175f..9acebe8d 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
@@ -5,5 +5,8 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
-VUE_APP_URL = "http://192.168.1.193:7101"
+VUE_APP_URL = "http://192.168.1.177:7101"
+
+
+# VUE_APP_URL = "http://192.168.1.193:7101"
 ##VUE_APP_URL = "http://8.130.39.13:8112"
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 1c74307d..0411342d 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
@@ -35,6 +35,13 @@ export default {
     })
   },
 
+  selectRecordBySid: function(sid) {
+    return request({
+      url: '/cyf/crudeinventory/selectRecordBySid/' + sid,
+      method: 'get'
+    })
+  },
+
 
   fetchBySid: function(sid) {
     return request({
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeInAndOutBound/oilTypeInAndOutBound.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeInAndOutBound/oilTypeInAndOutBound.js
index c9fbbe0c..210ebceb 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeInAndOutBound/oilTypeInAndOutBound.js
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeInAndOutBound/oilTypeInAndOutBound.js
@@ -13,13 +13,26 @@ export default {
       }
     })
   },
-
   // 获取油罐by Sid
   tankLisBySid: function(sid) {
     return request({
        url: '/cyf/tankinfo/listByType/' + sid
     })
   },
+  // 获取入库信息 Sid
+  selectStorageBySid: function(sid) {
+    return request({
+       url: 'cyf/crudestorage/selectStorageBySid/' + sid,
+       method: 'get',
+    })
+  },
+  // 获取出库信息 Sid
+  getCrudeBySid: function(sid) {
+    return request({
+       url: 'cyf/crudeoutbound/getCrudeBySid/' + sid,
+       method: 'get',
+    })
+  },
 
 
   // 入库
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue
index 70bce73e..20333cab 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,369 +1,371 @@
 <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"
-        :unique-opened="false" :active-text-color="variables.menuActiveText" :collapse-transition="false"
-        mode="vertical">
-        <sidebar-item v-for="route in routes" :key="route.path" :item="route" :base-path="route.path" />
+      <el-menu
+        :default-active="$route.path"
+        :background-color="variables.menuBg"
+        :text-color="variables.menuText"
+        :unique-opened="false"
+        :active-text-color="variables.menuActiveText"
+        :collapse-transition="false"
+        mode="vertical"
+      >
+        <sidebar-item
+          v-for="route in routes"
+          :key="route.path"
+          :item="route"
+          :base-path="route.path"
+        />
       </el-menu>
     </el-scrollbar>
   </div>
-
 </template>
 
 <script>
-  import {
-    mapGetters
-  } from 'vuex'
-  import Logo from './Logo'
-  import SidebarItem from './SidebarItem'
-  import variables from '@/styles/variables.scss'
-  import {
-    getrolemenus,
-    loginDetails
-  } from '@/api/system/Role/role.js'
-  import {
-    getStorage
-  } from '@/utils/auth'
-  export default {
-    components: {
-      SidebarItem,
-      Logo
-    },
-    data() {
-      return {
-        YongHuid: [],
-        // routes: [],
-        params: {
-          sourceSid: '9d048c07-7677-4774-9177-aa02b049ff06',
-          userSid: '',
-        },
-        routes: [
-          {
-            alwaysShow: true,
-            component: 'supervise',
-            meta: {
-              icon: "el-icon-menu",
-              title: "库房登记"
-            },
-            name: "",
-            path: "/supervise",
-            children: [{
-                alwaysShow: true,
-                component: 'index',
-                meta: {
-                  icon: "el-icon-help",
-                  title: "油罐库存登记"
-                },
-                name: "/supervise/recordOilTank",
-                path: "/supervise/recordOilTank",
+import { mapGetters } from "vuex";
+import Logo from "./Logo";
+import SidebarItem from "./SidebarItem";
+import variables from "@/styles/variables.scss";
+import { getrolemenus, loginDetails } from "@/api/system/Role/role.js";
+import { getStorage } from "@/utils/auth";
+export default {
+  components: {
+    SidebarItem,
+    Logo,
+  },
+  data() {
+    return {
+      YongHuid: [],
+      // routes: [],
+      params: {
+        sourceSid: "9d048c07-7677-4774-9177-aa02b049ff06",
+        userSid: "",
+      },
+      routes: [
+        {
+          alwaysShow: true,
+          component: "supervise",
+          meta: {
+            icon: "el-icon-menu",
+            title: "库房登记",
+          },
+          name: "",
+          path: "/supervise",
+          children: [
+            {
+              alwaysShow: true,
+              component: "index",
+              meta: {
+                icon: "el-icon-help",
+                title: "油罐库存登记",
               },
-              {
-                alwaysShow: true,
-                component: 'index',
-                meta: {
-                  icon: "el-icon-help",
-                  title: "原油入库登记"
-                },
-                name: "/supervise/oilTypeInBound",
-                path: "/supervise/oilTypeInBound",
+              name: "/supervise/recordOilTank",
+              path: "/supervise/recordOilTank",
+            },
+            {
+              alwaysShow: true,
+              component: "index",
+              meta: {
+                icon: "el-icon-help",
+                title: "原油入库登记",
               },
-              {
-                alwaysShow: true,
-                component: 'index',
-                meta: {
-                  icon: "el-icon-help",
-                  title: "原油出库登记"
-                },
-                name: "/supervise/oilTypeOutBound",
-                path: "/supervise/oilTypeOutBound",
+              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: "inventory",
+          meta: {
+            icon: "el-icon-menu",
+            title: "库存管理",
           },
-          {
-            alwaysShow: true,
-            component: 'inventory',
-            meta: {
-              icon: "el-icon-menu",
-              title: "库存管理"
+          name: "",
+          path: "/inventory",
+          children: [
+            {
+              alwaysShow: true,
+              component: "index",
+              meta: {
+                icon: "el-icon-help",
+                title: "油罐库存记录",
+              },
+              name: "/inventory/oilTankList",
+              path: "/inventory/oilTankList",
             },
-            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: "原油入库记录",
               },
-              {
-                alwaysShow: true,
-                component: 'index',
-                meta: {
-                  icon: "el-icon-help",
-                  title: "原油出库记录"
-                },
-                name: "/inventory/oilTypeOutBoundList",
-                path: "/inventory/oilTypeOutBoundList",
+              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: "baseInfo",
+          meta: {
+            icon: "el-icon-menu",
+            title: "基础信息",
           },
-          {
+          name: "",
+          path: "/baseInfo",
+          children: [
+            {
               alwaysShow: true,
-              component: 'baseInfo',
+              component: "index",
               meta: {
-                icon: "el-icon-menu",
-                title: "基础信息"
+                icon: "el-icon-help",
+                title: "物料类型",
               },
-              name: "",
-              path: "/baseInfo",
-              children: [{
-                  alwaysShow: true,
-                  component: 'index',
-                  meta: {
-                    icon: "el-icon-help",
-                    title: "物料类型"
-                  },
-                  name: "/baseInfo/materialType",
-                  path: "/baseInfo/materialType",
-                },
-                {
-                  alwaysShow: true,
-                  component: 'index',
-                  meta: {
-                    icon: "el-icon-help",
-                    title: "物料信息"
-                  },
-                  name: "/baseInfo/materialInfo",
-                  path: "/baseInfo/materialInfo",
-                },
-                {
-                  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",
-                },
-                {
-                  alwaysShow: true,
-                  component: 'index',
-                  meta: {
-                    icon: "el-icon-help",
-                    title: "供应商信息"
-                  },
-                  name: "/baseInfo/supplier",
-                  path: "/baseInfo/supplier",
-                }
-              ]
+              name: "/baseInfo/materialType",
+              path: "/baseInfo/materialType",
             },
-          // {
-          //   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",
+              meta: {
+                icon: "el-icon-help",
+                title: "物料信息",
+              },
+              name: "/baseInfo/materialInfo",
+              path: "/baseInfo/materialInfo",
+            },
+            {
+              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",
+            },
+            {
+              alwaysShow: true,
+              component: "index",
+              meta: {
+                icon: "el-icon-help",
+                title: "供应商信息",
+              },
+              name: "/baseInfo/supplier",
+              path: "/baseInfo/supplier",
+            },
+          ],
+        },
+        // {
+        //   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',
-          //   meta: {
-          //     icon: "el-icon-menu",
-          //     title: "项目列表"
-          //   },
-          //   name: "/project/index",
-          //   path: "/project/index"
-          // },
-        ]
-      }
+        // {
+        //   alwaysShow: true,
+        //   component: 'index',
+        //   meta: {
+        //     icon: "el-icon-menu",
+        //     title: "项目列表"
+        //   },
+        //   name: "/project/index",
+        //   path: "/project/index"
+        // },
+      ],
+    };
+  },
+  computed: {
+    ...mapGetters(["sidebar"]),
+    // routes() {
+    // f4d2e507-c4ed-451c-b364-04c08f962045
+    //   console.log('78979789', this.$router.options.routes)
+    //   return this.$router.options.routes
+    // },
+    activeMenu() {
+      // const route = this.$route
+      // const {
+      //   meta,
+      //   path
+      // } = route
+      // // if set path, the sidebar will highlight the path you set
+      // if (meta.activeMenu) {
+      //   return meta.activeMenu
+      // }
+      return "/index";
     },
-    computed: {
-      ...mapGetters([
-        'sidebar'
-      ]),
-      // routes() {
-      // f4d2e507-c4ed-451c-b364-04c08f962045
-      //   console.log('78979789', this.$router.options.routes)
-      //   return this.$router.options.routes
-      // },
-      activeMenu() {
-        // const route = this.$route
-        // const {
-        //   meta,
-        //   path
-        // } = route
-        // // if set path, the sidebar will highlight the path you set
-        // if (meta.activeMenu) {
-        //   return meta.activeMenu
-        // }
-        return "/index"
-      },
-      showLogo() {
-        return this.$store.state.settings.sidebarLogo
-      },
-      variables() {
-        return variables
-      },
-      isCollapse() {
-        return !this.sidebar.opened
-      }
+    showLogo() {
+      return this.$store.state.settings.sidebarLogo;
     },
-    created() {
-      this.postHuoquyonghu()
+    variables() {
+      return variables;
     },
-    methods: {
-      // 获取用户信息
-      postHuoquyonghu() {
-        // var token = getStorage()
-        // loginDetails(token).then((response) => {
-        //   console.log('resss', response)
-        //   if (response.code === '200') {
-        //     this.YongHuid = response.data
-        //     this.params.userSid = this.YongHuid.sid
-        //     getrolemenus(this.params).then((res) => {
-        //       const userRoles = this.resRouter(res.data)
-        this.routes.push({
-          path: '*',
-          redirect: '/404',
-          hidden: true
-        })
-        console.log('左侧菜单', this.routes)
-        return this.routes
-        //     })
-        //   }
-        // })
-      },
-      resRouter(menus) {
-        // 递归，将后台传来数组
-        for (var i = 0; i < menus.length; i++) {
-          if (menus[i].children && menus[i].children.length != 0) {
-            this.resRouter(menus[i].children)
-          }
-          if (menus[i].children.length == 0) {
-            delete menus[i].children
-            delete menus[i].redirect
-          }
-          if (menus[i].component == '') {
-            console.log('55555', menus[i])
-            menus[i] = {
-              path: menus[i].path,
-              component: '',
-              redirect: menus[i].path,
-              children: [menus[i]],
-            }
-          } else {
-            // menus[i] = {
-            //   path: menus[i].path,
-            //   component: '',
-            //   redirect: menus[i].path,
-            //   children: [menus[i]],
-            // }
-          }
+    isCollapse() {
+      return !this.sidebar.opened;
+    },
+  },
+  created() {
+    this.postHuoquyonghu();
+  },
+  methods: {
+    // 获取用户信息
+    postHuoquyonghu() {
+      // var token = getStorage()
+      // loginDetails(token).then((response) => {
+      //   console.log('resss', response)
+      //   if (response.code === '200') {
+      //     this.YongHuid = response.data
+      //     this.params.userSid = this.YongHuid.sid
+      //     getrolemenus(this.params).then((res) => {
+      //       const userRoles = this.resRouter(res.data)
+      this.routes.push({
+        path: "*",
+        redirect: "/404",
+        hidden: true,
+      });
+      console.log("左侧菜单", this.routes);
+      return this.routes;
+      //     })
+      //   }
+      // })
+    },
+    resRouter(menus) {
+      // 递归，将后台传来数组
+      for (var i = 0; i < menus.length; i++) {
+        if (menus[i].children && menus[i].children.length != 0) {
+          this.resRouter(menus[i].children);
         }
-        this.routes = menus
-        console.log('左侧菜单', this.routes)
-        return menus
-      },
+        if (menus[i].children.length == 0) {
+          delete menus[i].children;
+          delete menus[i].redirect;
+        }
+        if (menus[i].component == "") {
+          console.log("55555", menus[i]);
+          menus[i] = {
+            path: menus[i].path,
+            component: "",
+            redirect: menus[i].path,
+            children: [menus[i]],
+          };
+        } else {
+          // menus[i] = {
+          //   path: menus[i].path,
+          //   component: '',
+          //   redirect: menus[i].path,
+          //   children: [menus[i]],
+          // }
+        }
+      }
+      this.routes = menus;
+      console.log("左侧菜单", this.routes);
+      return menus;
     },
-  }
+  },
+};
 </script>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/404.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/404.vue
index 1791f55a..3b3d95e2 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/404.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/404.vue
@@ -2,18 +2,43 @@
   <div class="wscn-http404-container">
     <div class="wscn-http404">
       <div class="pic-404">
-        <img class="pic-404__parent" src="@/assets/404_images/404.png" alt="404">
-        <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
-        <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
-        <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
+        <img
+          class="pic-404__parent"
+          src="@/assets/404_images/404.png"
+          alt="404"
+        />
+        <img
+          class="pic-404__child left"
+          src="@/assets/404_images/404_cloud.png"
+          alt="404"
+        />
+        <img
+          class="pic-404__child mid"
+          src="@/assets/404_images/404_cloud.png"
+          alt="404"
+        />
+        <img
+          class="pic-404__child right"
+          src="@/assets/404_images/404_cloud.png"
+          alt="404"
+        />
       </div>
       <div class="bullshit">
         <div class="bullshit__oops">OOPS!</div>
-        <div class="bullshit__info">All rights reserved
-          <a style="color:#20a0ff" href="https://wallstreetcn.com" target="_blank">wallstreetcn</a>
+        <div class="bullshit__info">
+          All rights reserved
+          <a
+            style="color: #20a0ff"
+            href="https://wallstreetcn.com"
+            target="_blank"
+            >wallstreetcn</a
+          >
         </div>
         <div class="bullshit__headline">{{ message }}</div>
-        <div class="bullshit__info">Please check that the URL you entered is correct, or click the button below to return to the homepage.</div>
+        <div class="bullshit__info">
+          Please check that the URL you entered is correct, or click the button
+          below to return to the homepage.
+        </div>
         <a href="" class="bullshit__return-home">Back to home</a>
       </div>
     </div>
@@ -21,20 +46,19 @@
 </template>
 
 <script>
-
 export default {
-  name: 'Page404',
+  name: "Page404",
   computed: {
     message() {
-      return 'The webmaster said that you can not enter this page...'
-    }
-  }
-}
+      return "The webmaster said that you can not enter this page...";
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-.wscn-http404-container{
-  transform: translate(-50%,-50%);
+.wscn-http404-container {
+  transform: translate(-50%, -50%);
   position: absolute;
   top: 40%;
   left: 50%;
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
index 6512c468..02b2b391 100644
--- 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
@@ -14,7 +14,7 @@
                   clearable />
               </el-form-item>
               <el-form-item label="日期">
-                <el-date-picker v-model="jmdListQuery.date" type="date" clearable value-format="yyyy-MM-dd"
+                <el-date-picker v-model="jmdListQuery.date" :picker-options="pickerOptions" type="date" clearable value-format="yyyy-MM-dd"
                   placeholder="选择日期" />
               </el-form-item>
             </el-form>
@@ -28,8 +28,19 @@
           <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="existingInventory" label="油罐登记库存" align="center" />
             <el-table-column prop="recordDate" label="登记日期" align="center" />
+            <el-table-column  label="操作" width='150px' align="center">
+            <template slot-scope="scope">
+              <el-button
+                type="primary"
+                size="mini"
+                @click="purchase(scope.row)"
+              >
+                查看详情
+              </el-button>
+            </template>
+          </el-table-column>
           </el-table>
         </div>
         <div class="pages">
@@ -41,6 +52,29 @@
       </div>
 
     </div>
+    <el-dialog
+      :title="dialogTitle + '详细信息'"
+      :visible.sync="editDialog"
+      width="37%"
+    >
+    <el-form ref="form" :model="form" label-width="80px">
+      <el-form-item label="油罐编号:">
+        <span>{{ form.number }}</span>
+      </el-form-item>
+      <el-form-item label="登记日期:">
+        <span>{{ form.recordDate }}</span>
+      </el-form-item>
+      <el-form-item label="库存高度:">
+        <span>{{ form.height }}</span>
+      </el-form-item>
+      <el-form-item label="描述:" prop="url">
+        <el-popover placement="left" trigger="hover">
+          <img :src="form.url" style="width: 500px;height: 400px">
+          <img slot="reference" :src="form.url" style="width: 200px;height: 150px">
+         </el-popover>
+      </el-form-item>
+    </el-form>
+    </el-dialog>
   </div>
 </template>
 
@@ -62,6 +96,8 @@
         tabActiveName: 'uplog',
         index: "0",
         isSearchShow: false,
+        dialogTitle:'',
+        editDialog:false,
         searchxianshitit: '显示查询条件',
         btndisabled: false,
         tableLoading1: false,
@@ -97,6 +133,7 @@
           }
         ],
         logList: [],
+        form:{},
         logListQuery: {
           current: 1,
           size: 10
@@ -106,7 +143,12 @@
         jmdListQuery: {
           number: "",
           date: ""
-        }
+        },
+        pickerOptions:{
+          disabledDate(time){
+          return time.getTime()> Date.now()- 8.64e7;// 如果没有后面的-8.64e7就是不可以选择今天的
+          }
+      }
       }
     },
     mounted() {
@@ -137,6 +179,7 @@
           contractNumber: "",
           date: ""
         }
+        this.loadLogList()
       },
       // 右上角点击事件
       btnHandle(btnKey) {
@@ -189,37 +232,13 @@
       doAdd2() {
         this.viewState = 3
       },
-
-
-      // 导出文件
-      doBuild() {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
+      purchase(row){
+        this.dialogTitle = "数据";
+        this.editDialog = true;
+        req.selectRecordBySid(row.sid).then((res)=>{
+          this.form=res.data
         })
-
-        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
       },
@@ -236,7 +255,9 @@
     font-weight: bold;
     margin: 25px 0 10px 0;
   }
-
+  span{
+    margin-left: 20px;
+  }
   .forminfo {
     margin: 0;
     padding: 0;
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
index c836b632..95c174eb 100644
--- 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
@@ -38,6 +38,17 @@
             <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-column  fixed="right" label="操作" width="100" align="center">
+            <template slot-scope="scope">
+              <el-button
+                type="primary"
+                size="mini"
+                @click="purchase(scope.row)"
+              >
+                查看详情
+              </el-button>
+            </template>
+          </el-table-column>
           </el-table>
         </div>
         <div class="pages">
@@ -47,6 +58,83 @@
         </div>
 
       </div>
+      <el-dialog
+      :title="dialogTitle + '详细信息'"
+      :visible.sync="editDialog"
+      width="60%"
+    >
+    <el-form ref="dataForm" :model="form" label-position="top" label-width="190px" class="formadd">
+      <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>{{form.contractNumber}}</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>{{form.contractSigningDate}}</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>{{form.weight}}</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>{{form.value}}</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>{{form.licensePlateNumber}}</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>{{form.warehousingDate}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+    </el-dialog>
 
     </div>
   </div>
@@ -74,6 +162,9 @@
         btndisabled: false,
         tableLoading1: false,
         tableLoading2: false,
+        dialogTitle:'',
+        editDialog:false,
+        form:{},
         btnList: [ // 右上角按钮
           // {
           //   type: 'success',
@@ -179,6 +270,13 @@
         this.loadLogList()
         this.loadIn112List()
       },
+      purchase(row){
+        this.dialogTitle = "数据";
+        this.editDialog = true;
+        req.selectStorageBySid(row.sid).then((res)=>{
+          this.form=res.data
+        })
+      },
       handleOrder(tab, event) {
         console.log("tab", tab)
         // this.listQuery.status = tab.name;
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
index ebcee6dc..b79d0c7f 100644
--- 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
@@ -37,6 +37,17 @@
             <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-column  fixed="right" label="操作" width="100" align="center">
+            <template slot-scope="scope">
+              <el-button
+                type="primary"
+                size="mini"
+                @click="purchase(scope.row)"
+              >
+                查看详情
+              </el-button>
+            </template>
+          </el-table-column>
           </el-table>
         </div>
         <div class="pages">
@@ -47,6 +58,73 @@
       </div>
 
     </div>
+    <el-dialog
+      :title="dialogTitle + '详细信息'"
+      :visible.sync="editDialog"
+      width="60%"
+    >
+    <el-form ref="dataForm" :model="form" label-position="top" label-width="190px" class="formadd">
+      <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>{{form.salesContractNumber}}</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>{{form.contractSigningDate}}</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>{{form.weight}}</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>{{form.value}}</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>{{form.deliveryDate}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+    </el-dialog>
   </div>
 </template>
 
@@ -72,6 +150,9 @@
         btndisabled: false,
         tableLoading1: false,
         tableLoading2: false,
+        dialogTitle:'',
+        editDialog:false,
+        form:{},
         btnList: [ // 右上角按钮
           // {
           //   type: 'success',
@@ -148,6 +229,13 @@
         // }
 
       },
+      purchase(row){
+        this.dialogTitle = "数据";
+        this.editDialog = true;
+        req.getCrudeBySid(row.sid).then((res)=>{
+          this.form=res.data
+        })
+      },
       resetQuery() {
         this.jmdListQuery = {
           contractNumber: "",