Merge branch 'dev' of depot-qinghai/depot-vue-qinghai into master

build/build-test.js

@@ -0,0 +1,41 @@
+'use strict'
+require('./check-versions')()
+
+process.env.NODE_ENV = 'test'
+
+const ora = require('ora')
+const rm = require('rimraf')
+const path = require('path')
+const chalk = require('chalk')
+const webpack = require('webpack')
+const config = require('../config')
+const webpackConfig = require('./webpack.test.conf')
+
+const spinner = ora('building for test...')
+spinner.start()
+
+rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
+  if (err) throw err
+  webpack(webpackConfig, (err, stats) => {
+    spinner.stop()
+    if (err) throw err
+    process.stdout.write(stats.toString({
+      colors: true,
+      modules: false,
+      children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build.
+      chunks: false,
+      chunkModules: false
+    }) + '\n\n')
+
+    if (stats.hasErrors()) {
+      console.log(chalk.red('  Build failed with errors.\n'))
+      process.exit(1)
+    }
+
+    console.log(chalk.cyan('  Build complete.\n'))
+    console.log(chalk.yellow(
+      '  Tip: built files are meant to be served over an HTTP server.\n' +
+      '  Opening index.html over file:// won\'t work.\n'
+    ))
+  })
+})

build/webpack.test.conf.js

@@ -0,0 +1,145 @@
+'use strict'
+const path = require('path')
+const utils = require('./utils')
+const webpack = require('webpack')
+const config = require('../config')
+const merge = require('webpack-merge')
+const baseWebpackConfig = require('./webpack.base.conf')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
+
+const env = require('../config/test.env')
+
+const webpackConfig = merge(baseWebpackConfig, {
+  module: {
+    rules: utils.styleLoaders({
+      sourceMap: config.build_test.productionSourceMap,
+      extract: true,
+      usePostCSS: true
+    })
+  },
+  devtool: config.build_test.productionSourceMap ? config.build_test.devtool : false,
+  output: {
+    path: config.build_test.assetsRoot,
+    filename: utils.assetsPath('js/[name].[chunkhash].js'),
+    chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
+  },
+  plugins: [
+    // http://vuejs.github.io/vue-loader/en/workflow/production.html
+    new webpack.DefinePlugin({
+      'process.env': env
+    }),
+    new UglifyJsPlugin({
+      uglifyOptions: {
+        compress: {
+          warnings: false
+        }
+      },
+      sourceMap: config.build_test.productionSourceMap,
+      parallel: true
+    }),
+    // extract css into its own file
+    new ExtractTextPlugin({
+      filename: utils.assetsPath('css/[name].[contenthash].css'),
+      // Setting the following option to `false` will not extract CSS from codesplit chunks.
+      // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
+      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`,
+      // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
+      allChunks: true,
+    }),
+    // Compress extracted CSS. We are using this plugin so that possible
+    // duplicated CSS from different components can be deduped.
+    new OptimizeCSSPlugin({
+      cssProcessorOptions: config.build_test.productionSourceMap
+        ? { safe: true, map: { inline: false } }
+        : { safe: true }
+    }),
+    // generate dist index.html with correct asset hash for caching.
+    // you can customize output by editing /index.html
+    // see https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: config.build_test.index,
+      template: 'index.html',
+      inject: true,
+      minify: {
+        removeComments: true,
+        collapseWhitespace: true,
+        removeAttributeQuotes: true
+        // more options:
+        // https://github.com/kangax/html-minifier#options-quick-reference
+      },
+      // necessary to consistently work with multiple chunks via CommonsChunkPlugin
+      chunksSortMode: 'dependency'
+    }),
+    // keep module.id stable when vendor modules does not change
+    new webpack.HashedModuleIdsPlugin(),
+    // enable scope hoisting
+    new webpack.optimize.ModuleConcatenationPlugin(),
+    // split vendor js into its own file
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'vendor',
+      minChunks (module) {
+        // any required modules inside node_modules are extracted to vendor
+        return (
+          module.resource &&
+          /\.js$/.test(module.resource) &&
+          module.resource.indexOf(
+            path.join(__dirname, '../node_modules')
+          ) === 0
+        )
+      }
+    }),
+    // extract webpack runtime and module manifest to its own file in order to
+    // prevent vendor hash from being updated whenever app bundle is updated
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'manifest',
+      minChunks: Infinity
+    }),
+    // This instance extracts shared chunks from code splitted chunks and bundles them
+    // in a separate chunk, similar to the vendor chunk
+    // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'app',
+      async: 'vendor-async',
+      children: true,
+      minChunks: 3
+    }),
+
+    // copy custom static assets
+    new CopyWebpackPlugin([
+      {
+        from: path.resolve(__dirname, '../static'),
+        to: config.build_test.assetsSubDirectory,
+        ignore: ['.*']
+      }
+    ])
+  ]
+})
+
+if (config.build_test.productionGzip) {
+  const CompressionWebpackPlugin = require('compression-webpack-plugin')
+
+  webpackConfig.plugins.push(
+    new CompressionWebpackPlugin({
+      asset: '[path].gz[query]',
+      algorithm: 'gzip',
+      test: new RegExp(
+        '\\.(' +
+        config.build_test.productionGzipExtensions.join('|') +
+        ')$'
+      ),
+      threshold: 10240,
+      minRatio: 0.8
+    })
+  )
+}
+
+if (config.build_test.bundleAnalyzerReport) {
+  const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
+  webpackConfig.plugins.push(new BundleAnalyzerPlugin())
+}
+
+module.exports = webpackConfig

config/dev.env.js

@@ -4,5 +4,6 @@ const prodEnv = require('./prod.env')
 
 module.exports = {
     NODE_ENV: '"development"',
+    // BASE_API: '"http://172.16.0.46:9025"', //内网
    //BASE_API: '"https://easy-mock.com/mock/5a72c1ecc76727050336e0bc/mdm/"',
 }

config/index.js

@@ -13,7 +13,27 @@ module.exports = {
     assetsSubDirectory: "static",
     assetsPublicPath: "./", //请根据自己路径配置更改
     productionSourceMap: false,
-    baseURL: TEST_HOST,
+    // baseURL: TEST_HOST,
+    // Gzip off by default as many popular static hosts such as
+    // Surge or Netlify already gzip all static assets for you.
+    // Before setting to `true`, make sure to:
+    // npm install --save-dev compression-webpack-plugin
+    productionGzip: false,
+    productionGzipExtensions: ["js", "css"],
+    // Run the build command with an extra argument to
+    // View the bundle analyzer report after build finishes:
+    // `npm run build --report`
+    // Set to `true` or `false` to always turn it on or off
+    bundleAnalyzerReport: process.env.npm_config_report,
+  },
+  build_test: {
+    prodEnv: require("./test.env"),
+    index: path.resolve(__dirname, "../dist/index.html"),
+    assetsRoot: path.resolve(__dirname, "../dist"),
+    assetsSubDirectory: "static",
+    assetsPublicPath: "./", //请根据自己路径配置更改
+    productionSourceMap: false,
+    // baseURL: TEST_HOST,
     // Gzip off by default as many popular static hosts such as
     // Surge or Netlify already gzip all static assets for you.
     // Before setting to `true`, make sure to:

config/prod.env.js

@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
     NODE_ENV: '"production"',
-    BASE_API: '"http://172.16.0.46:9025"', //内网
+    BASE_API: '"http://172.18.93.216:80"', //内网
 };

config/test.env.js

@@ -0,0 +1,5 @@
+'use strict'
+module.exports = {
+    NODE_ENV: '"test"',
+    BASE_API: '"http://172.16.0.46:9025"', //内网
+};

index.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="ico" type="image/x-icon" href="static/favicon.ico">
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico">
-    <title>青海省粮食局</title>
+    <title>智慧青粮粮库管理系统</title>
 </head>
 
 <body>

package.json

@@ -7,7 +7,8 @@
   "scripts": {
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "start": "npm run dev",
-    "build": "node build/build.js"
+    "build:prod": "node build/build.js",
+    "build:test": "node build/build-test.js"
   },
   "dependencies": {
     "@fortawesome/fontawesome": "^1.1.8",

src/api/base/clearance.js

@@ -50,3 +50,21 @@ export function remove(id) {
     data: formData
   })
 }
+
+export function findStorehouse(orgId) {
+  const query = {orgId}
+  return request({
+    url: `${depot_qualitycheck}/ClearanceConfirmationController/findStorehouse`,
+    method: 'get',
+    params: query,
+  })
+}
+
+export function findByWarehouse(storehouseId) {
+  const query = {storehouseId}
+  return request({
+    url: `${depot_qualitycheck}/ClearanceConfirmationController/findByWarehouse`,
+    method: 'get',
+    params: query,
+  })
+}

src/api/deviceManagement/index.js

@@ -2,6 +2,8 @@ import request from '@/utils/require'
 import {depot_business, depot_device} from "../index";
 import {PLUS} from "@/utils/systemUtils";
 
+export const importUrl = `${depot_device}/BasicEquipmentEquipmentPool/importFile`
+
 export function getPageInfoList(page, query) {
   return request({
     url: `${depot_device}/devicePutStorage/getPageInfoList?pageNum=${page.page}&pageSize=${page.size}`,
@@ -27,23 +29,23 @@ export function getStorePositionById(id) {
 }
 
 export function storePositionUpdate(data) {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(/_____PLACEHOLDER_PLUS_____/g, '+')
+  // const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(/_____PLACEHOLDER_PLUS_____/g, '+')
   return request({
     url: `${depot_device}/BasicEquipmentEquipmentPool/update`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    // headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
     method: 'post',
-    data: formData,
+    data: data,
   })
 }
 
 export function storePositionRemove(id) {
-  const data = {id}
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(/_____PLACEHOLDER_PLUS_____/g, '+')
+  // const data = {id}
+  // const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(/_____PLACEHOLDER_PLUS_____/g, '+')
   return request({
-    url: `${depot_device}/BasicEquipmentEquipmentPool/remove`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    url: `${depot_device}/BasicEquipmentEquipmentPool/remove?id=${id}`,
+    // headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
     method: 'post',
-    data: formData,
+    // data: formData,
   })
 }
 
@@ -56,21 +58,17 @@ export function getDeviceGetList(page, query) {
 }
 
 export function save(data) {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace('_____PLACEHOLDER_PLUS_____', '+')
   return request({
     url: `${depot_device}/devicePutStorage/save`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
     method: 'post',
-    data: formData,
+    data: data,
   })
 }
 export function remove(data) {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace('_____PLACEHOLDER_PLUS_____', '+')
+  const {orgId, sbbh} = data
   return request({
-    url: `${depot_device}/devicePutStorage/remove`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    url: `${depot_device}/devicePutStorage/remove?orgId=${orgId}&sbbh=${sbbh}`,
     method: 'post',
-    data: formData,
   })
 }
 

src/api/facilitiesManagement/index.js

@@ -18,33 +18,23 @@ export function facilitiesOptions(query) {
 }
 
 export function maintainSave(data) {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace('_____PLACEHOLDER_PLUS_____', '+')
   return request({
     url: `${depot_device}/facilities/maintain/save`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
     method: 'post',
-    data: formData,
+    data: data,
   })
 }
 
 export function maintainRemove(id) {
-  const data = {id}
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace('_____PLACEHOLDER_PLUS_____', '+')
   return request({
-    url: `${depot_device}/facilities/maintain/remove`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    url: `${depot_device}/facilities/maintain/remove?id=${id}`,
     method: 'post',
-    data: formData,
   })
 }
 export function repairRemove(id) {
-  const data = {id}
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace('_____PLACEHOLDER_PLUS_____', '+')
   return request({
-    url: `${depot_device}/facilities/repair/remove`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    url: `${depot_device}/facilities/repair/remove?id=${id}`,
     method: 'post',
-    data: formData,
   })
 }
 
@@ -65,12 +55,11 @@ export function repairList(page, query) {
 }
 
 export function repairSave(data) {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(/_____PLACEHOLDER_PLUS_____/g, '+')
+  // const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(/_____PLACEHOLDER_PLUS_____/g, '+')
+  const {dFacilitiesRepairJson} = data
   return request({
-    url: `${depot_device}/facilities/repair/save`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    url: `${depot_device}/facilities/repair/save?dFacilitiesRepairJson=${dFacilitiesRepairJson}`,
     method: 'post',
-    data: formData,
   })
 }
 

src/components/common/header.vue

@@ -18,11 +18,11 @@
             }}</span>
           </span>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item
-              @click.native="updatemimas"
-              icon="el-icon-s-promotion"
-              >修改密码</el-dropdown-item
-            >
+<!--            <el-dropdown-item-->
+<!--              @click.native="updatemimas"-->
+<!--              icon="el-icon-s-promotion"-->
+<!--              >修改密码</el-dropdown-item-->
+<!--            >-->
             <el-dropdown-item @click.native="logout" icon="el-icon-s-promotion"
               >退出登录</el-dropdown-item
             >

src/components/common/topMenu.vue

@@ -1,26 +1,31 @@
 <template>
   <div class="menu-container">
     <div class="btn left-btn" @click="scrollLeft">
-      <img v-show="hasPrev" src="@/assets/wisdom_images/left-nav.png">
+      <img v-show="hasPrev" src="@/assets/wisdom_images/left-nav.png" />
     </div>
     <nav class="menu" ref="menu">
       <ul>
-        <li v-for="(item, index) in list" :key="index" class="menu-item" :class="{activate: $store.state.user.topMenuIndex === index}" @click="openMenu(item, index)">
+        <li
+          v-for="(item, index) in list"
+          :key="index"
+          class="menu-item"
+          :class="{ activate: $store.state.user.topMenuIndex === index }"
+          @click="openMenu(item, index)"
+        >
           <i :class="item.icon"></i>
-          {{item.funcName}}
+          {{ item.funcName }}
         </li>
       </ul>
     </nav>
     <div class="btn right-btn" @click="scrollRight">
-      <img v-show="hasNext" src="@/assets/wisdom_images/right-nav.png">
+      <img v-show="hasNext" src="@/assets/wisdom_images/right-nav.png" />
     </div>
   </div>
 </template>
 
 <script>
-
-const ITEM_WIDTH = 130
-const ITEM_BORDER = 1
+const ITEM_WIDTH = 130;
+const ITEM_BORDER = 1;
 export default {
   data() {
     return {
@@ -31,9 +36,9 @@ export default {
       funcTree: null,
       list: [
         {
-          icon: 'el-icon-s-home',
-          funcName: '首页',
-          funcUrl: '/home',
+          icon: "el-icon-s-home",
+          funcName: "首页",
+          funcUrl: "/home",
           resourceCode: null,
         },
         // {
@@ -91,14 +96,13 @@ export default {
         //   funcUrl: '/system/userManagement',
         //   resourceCode: 'RM1001008008',
         // },
-
-      ]
-    }
+      ],
+    };
   },
   created() {
-    this.visibleItems = this.list.length
+    this.visibleItems = this.list.length;
     // this.welcome()
-    this.welcome2()
+    this.welcome2();
     const menuCode = sessionStorage.getItem("menuCode");
     const menuData = JSON.parse(sessionStorage.getItem("xzdata"));
 
@@ -109,28 +113,26 @@ export default {
     //     }
     //   });
     // }
-    window.addEventListener('resize', this.updateVisibleItems);
+    window.addEventListener("resize", this.updateVisibleItems);
   },
   mounted() {
     this.updateVisibleItems();
     this.$nextTick(() => {
-      this.$refs.menu.scrollLeft = 0
-    })
+      this.$refs.menu.scrollLeft = 0;
+    });
   },
   beforeDestroy() {
-    window.removeEventListener('resize', this.updateVisibleItems);
+    window.removeEventListener("resize", this.updateVisibleItems);
   },
   watch: {
-    defaultActiveUrl (n, o) {
-      console.log('------', n)
-    }
+    defaultActiveUrl(n, o) {
+      console.log("------", n);
+    },
   },
   methods: {
-    handleSelect() {
-
-    },
+    handleSelect() {},
     scrollLeft() {
-      this.$refs.menu.scrollLeft -= (ITEM_WIDTH + 2);
+      this.$refs.menu.scrollLeft -= ITEM_WIDTH + 2;
       // if(this.$refs.menu.scrollLeft <= 0) {
       //   this.hasPrev = false
       // }else {
@@ -138,7 +140,7 @@ export default {
       // }
     },
     scrollRight() {
-      this.$refs.menu.scrollLeft += (ITEM_WIDTH + 2);
+      this.$refs.menu.scrollLeft += ITEM_WIDTH + 2;
       // if(this.$refs.menu.scrollLeft >= (ITEM_WIDTH + 2) * this.list.length) {
       //   this.hasNext = false
       // }else {
@@ -146,65 +148,75 @@ export default {
       // }
     },
     updateVisibleItems() {
-      const width = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+      const width =
+        window.innerWidth ||
+        document.documentElement.clientWidth ||
+        document.body.clientWidth;
       if (width <= 690) {
         this.visibleItems = 2;
       } else if (width <= 800) {
         this.visibleItems = 3;
       } else if (width <= 1200) {
         this.visibleItems = 4;
-      } else if(width <= 1400) {
+      } else if (width <= 1400) {
         this.visibleItems = 5;
-      }else if (width <= 1600) {
+      } else if (width <= 1600) {
         this.visibleItems = 6;
       } else {
         this.visibleItems = this.list.length;
       }
-      this.$refs.menu.style.width = `${this.visibleItems * ITEM_WIDTH + this.visibleItems * 2}px`;
+      this.$refs.menu.style.width = `${
+        this.visibleItems * ITEM_WIDTH + this.visibleItems * 2
+      }px`;
     },
     openMenu(item, index) {
-      console.log('open menu', item, index)
-      if(['crk', '/crk'].indexOf(item.funcUrl) >= 0) {
-        return this.$systemUtils.gotoCrkSystem(this)
+      console.log("open menu", item, index);
+      if (["crk", "/crk"].indexOf(item.funcUrl) >= 0) {
+        this.$store.state.flag = 1;
+        // return
+        this.$store.commit("SET_TOP_MENU_INDEX", index);
+        // return this.$systemUtils.gotoCrkSystem(this)
+      } else {
+        this.$store.state.flag = 2;
       }
-      if(this.$store.state.user.topMenuIndex === index) return
-      this.$store.commit('SET_TOP_MENU_INDEX', index)
+      if (this.$store.state.user.topMenuIndex === index) return;
+      this.$store.commit("SET_TOP_MENU_INDEX", index);
       // if(!item.resourceCode) {
       //   return this.$router.push({path: item.funcUrl})
       // }
 
-      this.getMenuList(item, index)
+      this.getMenuList(item, index);
     },
     welcome() {
       this.loginPeople = sessionStorage.getItem("userName");
       const data = JSON.parse(sessionStorage.getItem("xzdata"));
-      this.xzdata = data
-      this.$store.commit("SET_MENU_DATA", data)
-      const defaultCode = 'RM1001008001'
-      let leftMenuList = []
+      this.xzdata = data;
+      this.$store.commit("SET_MENU_DATA", data);
+      const defaultCode = "RM1001008001";
+      let leftMenuList = [];
       this.xzdata.forEach((item) => {
         if (item.resourceCode == defaultCode) {
-          leftMenuList = [item]
+          leftMenuList = [item];
         }
       });
       this.$store.dispatch("changeLeftMenu", leftMenuList);
     },
     welcome2() {
       const tree = JSON.parse(sessionStorage.getItem("FUN_TREE"));
-      this.funcTree = tree
-      let defaultChild = []
-      for(const menu of tree) {
-        if(defaultChild.length <= 0) {
-          defaultChild = menu.children
+      this.funcTree = tree;
+      let defaultChild = [];
+      for (const menu of tree) {
+        if (defaultChild.length <= 0) {
+          defaultChild = menu.children;
         }
         this.list.push({
-          icon: 'el-icon-s-home',
+          icon: "el-icon-s-home",
           funcName: menu.funcName,
           funcUrl: menu.funcUrl,
           funcId: menu.funcId,
-          resourceCode: 'RM1001008007',
-          children: menu.children
-        })
+          resourceCode: "RM1001008007",
+          children: menu.children,
+        });
       }
       this.$store.dispatch("changeLeftMenu", defaultChild);
     },
@@ -215,17 +227,17 @@ export default {
       if (arr[0] && arr[0].children && arr[0].children.length) {
         this.getFirstMenu(arr[0].children);
       } else {
-        console.log('first menu', arr[0])
+        console.log("first menu", arr[0]);
         this.menuUrl = arr[0].funcUrl;
       }
     },
     getMenuList(item, index) {
-      console.log('get menu list', item, index, )
+      console.log("get menu list", item, index);
       // debugger
-      let leftMenuList = [item];
+      let leftMenuList = item.children;
       if (item.children && item.children.length > 0) {
         this.getFirstMenu(item.children);
-        console.log('menuUrl', this.menuUrl)
+        console.log("menuUrl", this.menuUrl);
         this.$router.push({ path: this.menuUrl });
       } else {
         if (item.funcUrl.indexOf("http") == -1) {
@@ -238,7 +250,7 @@ export default {
       this.isClick = index;
       sessionStorage.menuIdx = index;
       // this.getFirstMenu([item]);
-      this.$store.commit('SET_DEFAULT_ACTIVE_URL', this.menuUrl)
+      this.$store.commit("SET_DEFAULT_ACTIVE_URL", this.menuUrl);
       sessionStorage.setItem("leftMenuList", JSON.stringify(leftMenuList));
       sessionStorage.setItem("menuCode", code);
       sessionStorage.setItem("resourceCode", code);
@@ -247,8 +259,8 @@ export default {
 
       this.$store.dispatch("changeLeftMenu", leftMenuList);
     },
-  }
-}
+  },
+};
 </script>
 
 
@@ -292,12 +304,12 @@ export default {
   color: white;
   height: 100%;
 }
+
 .menu ul {
   display: flex;
   list-style-type: none;
 }
 
-
 .menu-item {
   width: 130px;
   height: 100%;

src/page/CostStandard/index.vue

@@ -68,7 +68,6 @@
         prop="standardName"
         label="标准名称"
       ></el-table-column>
-      </el-table-column>
       <el-table-column
         align="center"
         prop="standardType"

src/page/Layout/layout.vue

@@ -3,6 +3,7 @@
     class="content-wrap"
     ref="wrapper"
     :style="{ height: wrapHeight + 'px' }"
+    v-if="$store.state.flag == 2"
   >
     <el-row>
       <!-- <BreadCrumb></BreadCrumb> -->
@@ -22,6 +23,13 @@
       </el-col>
     </el-row>
   </div>
+  <div v-else class="content-wrap" style="width: 100vw; height: 86vh">
+    <iframe
+      id="iframeContainer"
+      :src="url"
+      style="width: 100%; height: 100%"
+    ></iframe>
+  </div>
 </template>
 
 <script>
@@ -36,13 +44,18 @@ export default {
     // Applications
   },
   data() {
+    const u = localStorage.getItem("_userName");
+    const p = localStorage.getItem("_password");
     return {
       id: this.$route.params.id,
       dat: {
         name: "admin",
         password: "admin",
       },
+      u: localStorage.getItem("_userName"),
+      p: localStorage.getItem("_password"),
       clientHeight: document.documentElement.clientHeight,
+      url: `http://101.36.160.210:31055/crk/?k_username=${u}&k_password=${p}&code=1`,
     };
   },
   computed: {
@@ -50,6 +63,7 @@ export default {
       return this.clientHeight - 70 - 40;
     },
   },
+  watch: {},
   methods: {
     update() {
       this.clientHeight =
@@ -59,7 +73,7 @@ export default {
     },
   },
   mounted() {
-    console.log('layout' , this.clientHeight)
+    console.log("layout", this.clientHeight);
     if (!Element.prototype.matches) {
       Element.prototype.matches =
         Element.prototype.msMatchesSelector ||

src/page/basicData/components/clearanceConfirmationListEdit.vue

@@ -107,7 +107,7 @@
 import {simpleEdit} from "@/components/simpleList/simpleEdit";
 import {houseAndWareQuery} from "@/components/simpleList";
 import {simple_required, number_required} from '@/utils/ruleDatas'
-import {cleSave, findByCleCon} from "@/api/base/clearance";
+import {cleSave, findByCleCon, findStorehouse, findByWarehouse} from "@/api/base/clearance";
 import {granaryList, granaryById, getEmptyStorehouse, getWarehouse} from "@/api/base";
 import {PLUS} from "@/utils/systemUtils";
 
@@ -181,7 +181,7 @@ export default {
     },
     getHouseOptions() {
       this.houseOptions = []
-      return getEmptyStorehouse({orgId: this.orgId}).then(resp => {
+      return findStorehouse(this.orgId).then(resp => {
         this.houseOptions = (resp || []).map(d => {
           return {
             label: d.storehouseName,
@@ -194,18 +194,21 @@ export default {
 
     getWareOptions(houseId) {
       this.wareOptions = []
-      return getWarehouse({unitId: this.orgId, storehouseId: houseId, libraryType: 0}).then(resp => {
-        const wares = resp.wares || {}
-        const keys = Object.keys(wares).sort((a, b) => a - b)
-        this.wareOptions = keys.map(k => {
-          const w = wares[k]
-          return {
-            label: w.warehouseName,
-            value: w.warehouseId,
-            raw: w,
-          }
+      if(houseId) {
+        return findByWarehouse(houseId).then(resp => {
+          const wares = resp || []
+          this.wareOptions = wares.map(w => {
+            return {
+              label: w.warehouseName,
+              value: w.warehouseId,
+              raw: w,
+            }
+          })
         })
-      })
+      }else {
+        this.wareOptions = []
+      }
+
     },
 
     houseChanged(n) {

src/page/basicData/components/equipmentEquipmentPoolListEdit.vue

@@ -60,11 +60,12 @@ export default {
       return getStorePositionById
     },
     getLocalData() {
-      return {
-        poolJson: JSON.stringify(this.form),
+      const d = {
+        ... this.form,
         orgId: this.orgId,
-        userId: this.userId,
+        inputPersonId: this.userId,
       }
+      return d
     },
     getSaveFun() {
       return storePositionUpdate

src/page/basicData/components/warehouseListEdit.vue

@@ -71,7 +71,7 @@
           <template>
             <el-col :span="8">
               <el-form-item label="统一货位编码" prop="tyhwbm">
-                <el-input v-model="form.tyhwbm" :readonly="readonly || isEdit" />
+                <el-input v-model="form.tyhwbm" disabled placeholder="保存后生成" />
               </el-form-item>
             </el-col>
 
@@ -251,6 +251,7 @@ export default {
       orgNameDEl: "",
       aisleId: null,
       ajdh: null,
+      tyajbm: null,
       gaojOption: [],
       form: {
         warehouseCode: "",
@@ -263,13 +264,17 @@ export default {
         warehouseCode: number_data_del_tw,
         warehouseUseTime: simple_required,
         warehouseCapacity: simple_required,
-        tyhwbm: simple_required,
+        // tyhwbm: simple_required,
       },
     };
   },
   created() {},
   methods: {
     setUp() {
+      this.tyajbm = null
+      this.aisleId = null
+      this.ajdh = null
+      this.gaojOption = []
       this.initHouseIdNameMap("storehouseId");
       this.initOrgIdNameMap();
       this.initHouseOptions();
@@ -280,7 +285,13 @@ export default {
     parseResp(resp) {
       console.log("resp", resp);
       resp.houseName = parseInt(resp.houseName);
-      this.getFileAojianGet({ orgId: this.orgId, cfid: resp.storehouseId });
+      this.aisleId = resp.aisleId
+      this.getFileAojianGet({ unitId: this.orgId, storehouseId: resp.storehouseId, libraryType: 0 }).then(_ => {
+        const h = this.gaojOption.find((d) => d.id === resp.aisleId);
+        if(h) {
+          this.tyajbm = h.tyajbm
+        }
+      })
       return resp;
     },
 
@@ -310,9 +321,11 @@ export default {
         console.log("3333", h);
         this.ajmc = h.ajmc;
         this.ajdh = h.ajdh;
+        this.tyajbm = h.tyajbm
       }else {
         this.ajmc = null
         this.ajdh = null
+        this.tyajbm = null
       }
 
     },
@@ -365,6 +378,7 @@ export default {
       return {
         warehouseJson: JSON.stringify(data),
         fileIds: '[]',
+        tyajbm: this.tyajbm,
       };
     },
     checkWareCode() {
@@ -381,38 +395,46 @@ export default {
         })
       }
     },
+
+    async doSave() {
+      const data = this.getLocalData();
+
+      const fd = new FormData();
+      for (const key in data) {
+        fd.append(key, data[key]);
+      }
+
+      // console.log(fd.get("storehouseJson"));
+
+      const resp = await getFileAojianAddOrEdit(data);
+      if (resp.status === "success") {
+        this.$message.success("保存成功");
+        this.show = false;
+        this.$emit("on-save");
+      } else {
+        this.$message.error(resp.msg);
+      }
+    },
     save() {
 
       console.log("data", this.form);
       this.$refs.editForm.validate(async (ok) => {
         if (ok) {
-          findWareCode({
-            storehouseId: this.form.storehouseId,
-            warehouseCode: this.form.warehouseCode,
-            orgId: this.orgId,
-          }).then(async (resp) => {
-            if(resp == 0) {
-              return this.$message.error('货位编号已存在')
-            }else if(resp == 1) {
-              const data = this.getLocalData();
-
-              const fd = new FormData();
-              for (const key in data) {
-                fd.append(key, data[key]);
-              }
-
-              // console.log(fd.get("storehouseJson"));
-
-              const resp = await getFileAojianAddOrEdit(data);
-              if (resp.status === "success") {
-                this.$message.success("保存成功");
-                this.show = false;
-                this.$emit("on-save");
-              } else {
-                this.$message.error(resp.msg);
+          if(this.isAdd) {
+            findWareCode({
+              storehouseId: this.form.storehouseId,
+              warehouseCode: this.form.warehouseCode,
+              orgId: this.orgId,
+            }).then(async (resp) => {
+              if(resp == 0) {
+                return this.$message.error('货位编号已存在')
+              }else if(resp == 1) {
+                this.doSave()
               }
-            }
-          })
+            })
+          }else if(this.isEdit) {
+            this.doSave()
+          }
         }
       });
     },

src/page/basicData/equipmentEquipmentPoolList.vue

@@ -11,7 +11,18 @@
         >
           <el-form-item>
             <el-button type="primary" size="small" icon="el-icon-plus" @click="add">新增</el-button>
-            <el-button type="primary" size="small" icon="el-icon-download" @click="importData">导入</el-button>
+            <el-upload
+              style="display: inline-block"
+              :action="importUrl"
+              :before-upload="beforeImport"
+              :on-success="afterImport"
+              :show-file-list="false"
+              :data="{orgId: orgId, fileType: 'xlsx'}"
+              accept=".xlsx"
+              :limit="100"
+            >
+              <el-button size="small" type="primary" icon="el-icon-download">导入</el-button>
+            </el-upload>
             <el-button type="primary" size="small" icon="el-icon-upload2" @click="exportData">导出</el-button>
             <el-divider direction="vertical"></el-divider>
           </el-form-item>
@@ -121,7 +132,7 @@
 
 import {simpleList, hasHouseName, hasWareName, hasOrgName, houseAndWareQuery} from "@/components/simpleList";
 import edit from "./components/equipmentEquipmentPoolListEdit.vue";
-import {getStorePosition, storePositionRemove} from "@/api/deviceManagement";
+import {getStorePosition, importUrl, storePositionRemove} from "@/api/deviceManagement";
 
 export default {
   name: "equipmentEquipmentPoolList",
@@ -131,6 +142,7 @@ export default {
   },
   data() {
     return {
+      importUrl,
       form: {
         shelfId: null,
         warehouseId: null,
@@ -158,6 +170,12 @@ export default {
     getListFun() {
       return getStorePosition
     },
+    beforeImport(f) {
+      console.log('before upload', f)
+    },
+    afterImport() {
+      console.log('after upload', arguments)
+    },
     exportData() {
 
     },

src/page/basicData/storehouseList.vue

@@ -273,8 +273,10 @@ export default {
       this.listLoading = true
     },
     afterImport(response, file, fileList) {
-      this.importMsg = response
-      this.uploadResultShow = true
+      if(response) {
+        this.importMsg = response
+        this.uploadResultShow = true
+      }
       this.listLoading = false
       this.getList()
     },

src/page/basicData/warehouseList.vue

@@ -219,8 +219,10 @@ export default {
       this.listLoading = true
     },
     afterImport(response, file, fileList) {
-      this.importMsg = response
-      this.uploadResultShow = true
+      if(response) {
+        this.importMsg = response
+        this.uploadResultShow = true
+      }
       this.listLoading = false
       this.getList()
     },

src/page/customerManagement/customerArchives.vue

@@ -79,7 +79,7 @@
           <span :style="{color: blackColor(scope.row)}">{{scope.row.isInBlacklist == 0 ? '否' : '是'}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="320">
+      <el-table-column label="操作" align="center" width="380">
         <template v-slot="scope">
           <el-button
             type="primary"

src/page/decisionSupport/inventorySupervisionStatistics.vue

@@ -29,7 +29,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="粮油品种:" prop="status">
+          <el-form-item label="粮油品种:" prop="pz">
             <common-select v-model.number="form.pz" type="lsmxpz" :remote="true" class="small-field"></common-select>
           </el-form-item>
           <div class="search-button">
@@ -47,7 +47,7 @@
               @click="print"
               size="small"
               icon="el-icon-printer"
-            >导出
+            >打印
             </el-button>
           </div>
 

src/page/deviceManagement/components/edit/index.vue

@@ -39,7 +39,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="设备编号" prop="sbbh">
-                <el-input v-model="form.sbbh"></el-input>
+                <el-input v-model="form.sbbh" placeholder="保存后自动生成" disabled></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -139,7 +139,7 @@
           <el-row type="flex" align="middle" justify="center" class="row">
             <el-col :span="8">
               <el-form-item label="编号" prop="sbbh">
-                <el-input v-model="form.sbbh"></el-input>
+                <el-input v-model="form.sbbh" placeholder="保存后自动生成" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -148,7 +148,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="存放位置" prop="sbbh">
+              <el-form-item label="存放位置" prop="fzd">
                 <el-select v-model="form.fzd" clearable placeholder="请选择" :disabled="readonly" @change="placeChange">
                   <el-option
                     v-for="item in storePlaceOptions"
@@ -200,7 +200,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="检定时间" prop="jdsj">
-              <el-date-picker v-model="form.jdsj" type="datetime" :readonly="readonly"/>
+              <el-date-picker v-model="form.jdsj" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" :readonly="readonly"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -420,9 +420,10 @@ export default {
       }
       d.szdwdm = this.orgId
 
-      return {
-        dSbxxsjyJson: JSON.stringify(d)
-      }
+      // return {
+      //   dSbxxsjyJson: d
+      // }
+      return d
     },
     save() {
       this.$refs.editForm.validate((ok) => {

src/page/facilitiesManagement/components/facilitiesMaintenanceEdit.vue

@@ -177,9 +177,7 @@ export default {
         orgId: this.orgId,
         ... this.form
       }
-      return {
-        dFacilitiesMaintainJson: JSON.stringify(data)
-      }
+      return data
     },
     save() {
       this.$refs.editForm.validate((ok) => {

src/page/facilitiesManagement/components/facilitiesRepairEdit.vue

@@ -192,6 +192,9 @@ export default {
       this.$refs.editForm.validate((ok) => {
         if(ok) {
           repairSave(this.getLocalData()).then(resp => {
+            if(resp.status === 'error') {
+              return this.$message.error('保存失败')
+            }
             this.$message.success('保存成功')
             this.show = false
             this.$emit('on-save')

src/page/facilitiesManagement/facilitiesBaseInfo.vue

@@ -215,9 +215,9 @@ export default {
       }
       d.bfrq = this.$dateUtils.formatNow()
       for(const k of []) {
-        d[k] = d[k].replaceAll(' ', '_____PLACEHOLDER_PLUS_____')
+        d[k] = d[k].replace(/\s/g, '_____PLACEHOLDER_PLUS_____')
       }
-      facilitiesBasicsScrap({dFacilitiesBasicsJson: JSON.stringify(d)}).then(resp => {
+      facilitiesBasicsScrap(d).then(resp => {
         if(resp.status === 'success') {
           this.$message.success('已报废')
           this.getList()

src/page/intelligentStorage/components/deviceControlEdit.vue

@@ -83,6 +83,7 @@
               <el-date-picker v-model="form.rkrq" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :readonly="readonly"></el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="8"></el-col>
         </el-row>
 
       </el-form>

src/page/intelligentStorage/components/quantityDetectionDeviceConfigEdit.vue

@@ -128,6 +128,7 @@ export default {
         vvedioTdh: null,
         vvedioUser: null,
         vwsSrc: null,
+        updatePerson: null,
       },
       rules: {
         vcfCode: simple_required, vdevCode: simple_required, ivedioPort: positive_integer,
@@ -137,9 +138,14 @@ export default {
   },
   methods: {
     setUp() {
+      console.log('userName', this.realName)
       this.initHouseOptions();
     },
-
+    beforeAll() {
+      if(this.isAdd || this.isEdit) {
+        this.form.updatePerson = this.userId
+      }
+    },
     getDataFun() {
       return findById;
     },

src/page/intelligentStorage/multifunctionalGrainInfo.vue

@@ -177,8 +177,10 @@ export default {
         if(resp.retCode == '200') {
           this.$message.success('操作成功')
         }else {
-          this.$message.error(resp.message)
+          this.$message.error('检测失败')
         }
+      }).catch(err => {
+        this.$message.error('检测失败')
       })
     },
     check() {

src/page/intelligentStorage/quantityDetectionDeviceConfig.vue

@@ -91,7 +91,7 @@
       ></el-table-column>
       <el-table-column
         align="center"
-        prop="orgName"
+        prop="updatePerson"
         label="创建人"
       ></el-table-column>
       <el-table-column

src/page/login/index.vue

@@ -143,7 +143,7 @@
             </el-form-item>
           </el-form>
 
-          <el-row>
+          <el-row v-show="false">
             <div style="float: left">
               没有账号请&nbsp;
               <span
@@ -164,7 +164,7 @@
               >
             </div>
           </el-row>
-          <el-row>
+          <el-row v-show="false">
             <div style="float: right">
               <span
                 style="

src/page/mixin/legacyUpload.js

@@ -0,0 +1,60 @@
+import {uploadUrl_2} from "@/api/settlementManagement";
+import {downloadBase} from "@/api/inventoryQualityTraceability";
+import {basicUploadUrl, getFileList} from "@/api/base";
+export default {
+  data() {
+    return {
+      uploadUrl_2,
+      downloadBase,
+      fileList: [],
+      fileIds: [],
+      deleteFileIds: [],
+    }
+  },
+  methods: {
+    getFileListById(dataId) {
+      getFileList({bid: dataId, orgId: this.orgId}).then(resp => {
+
+        this.fileList = resp.map(d => {
+          return {
+            id: d.id,
+            name: d.originalFileName,
+            url: `${downloadBase}/${d.filePath}`
+          }
+        })
+        console.log('文件列表', resp, this.fileList)
+      })
+    },
+    onUploadSuccess(resp, file, fileList) {
+      console.log('上传文件 resp', resp, file, fileList)
+      this.fileList = fileList.map(f => {
+        let url
+        let id
+        if(f.response) {
+          url = f.response.filePath
+          id = f.response.id
+        }else {
+          url = f.url
+          id = f.id
+        }
+        return {
+          name: f.name,
+          url: url,
+          id: id,
+        }
+      })
+    },
+    onUploadRemove(fileList) {
+      const removeFiles = []
+      for(const f of this.fileList) {
+        const file = fileList.find(temp => temp.id === f.id)
+        if(! file) {
+          removeFiles.push(f)
+        }
+      }
+      this.fileList = fileList
+      this.deleteFileIds.push(... removeFiles.map(f => f.id))
+      console.log('删除文件 ', fileList, removeFiles)
+    }
+  }
+}

src/page/receiptConfirmation/reportingInterest/index.vue

@@ -13,7 +13,7 @@
     </div>
     <el-form
       style="margin-bottom: 24px"
-      label-width="90px"
+      label-width="120px"
       :model="formState"
       :rules="rules"
       ref="ruleForm"
@@ -164,6 +164,7 @@
         <el-col :span="8"
           ><el-form-item prop="createDate" label="创建日期">
             <el-date-picker
+              style="width: 100%"
               v-model="formState.createDate"
               value-format="yyyy-MM-dd HH:mm:ss"
               type="date"
@@ -177,12 +178,10 @@
             label="对其他扣款"
             label-width="120px"
           >
-            <el-date-picker
-              v-model="formState.createDate"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="date"
+            <el-input
+              autocomplete="off"
               :disabled="dataObj.showLock"
-              placeholder="日期"
+              v-model="formState.applicant"
             /> </el-form-item
         ></el-col>
       </el-row>

src/page/storageQualificationData/components/informationChangesEdit.vue

@@ -105,7 +105,7 @@
             <el-form-item label="附件" prop="attachment">
               <upload
                 :post-action="uploadUrlV2"
-                :readonly="readonly"
+                :readonly="true"
                 :file-list="uploadFiles"
                 @on-upload-success="uploadSuccess"
                 @on-remove="uploadRemove"
@@ -190,6 +190,10 @@ export default {
           this.companySelected = resp
           if(this.isAdd) {
             this.form.sqrEnterpriseId = this.companySelected.id
+            if (resp.attachment) {
+              this.form.attachment = resp.attachment
+              this.uploadFiles = [resp.attachment]
+            }
           }
         })
       })

src/page/storageQualificationData/components/storageQualificationEdit.vue

@@ -104,7 +104,7 @@
             <el-form-item label="附件" prop="attachment">
               <upload
                 :post-action="uploadUrlV2"
-                :readonly="readonly"
+                :readonly="true"
                 :file-list="uploadFiles"
                 @on-upload-success="uploadSuccess"
                 @on-remove="uploadRemove"
@@ -190,6 +190,10 @@ export default {
           this.companySelected = resp
           if(this.isAdd) {
             this.form.sqrEnterpriseId = this.companySelected.id
+            if (resp.attachment) {
+              this.form.attachment = resp.attachment
+              this.uploadFiles = [resp.attachment]
+            }
           }
         })
       })

src/page/storehouseManagement/components/hazardControlEdit.vue

@@ -163,8 +163,10 @@ import {simple_required} from "@/utils/ruleDatas";
 import upload from '@/components/upload/v2.vue'
 import {basicUploadUrl, getFileList, minioUrl} from "@/api/base";
 import {downloadBase} from "@/api/inventoryQualityTraceability";
+import legacyUpload from "@/page/mixin/legacyUpload";
 
 export default {
+  mixins: [legacyUpload, ],
   props: {
     visible: {
       type: Boolean,
@@ -220,9 +222,6 @@ export default {
       uploadUrl_2,
       show: this.visible,
       form: { },
-      fileList: [],
-      fileIds: [],
-      deleteFileIds: [],
       rules: {
         sbr: simple_required, fxxx: simple_required, hjbw: simple_required,
         fxlx: simple_required, fxfj: simple_required, fxglcs: simple_required,
@@ -239,17 +238,8 @@ export default {
       this.resetForm()
       if(this.isAdd) {
       }else {
-        getFileList(this.dataId).then(resp => {
-
-          this.fileList = resp.map(d => {
-            return {
-              id: d.id,
-              name: d.originalFileName,
-              url: `${basicUploadUrl}${d.filePath}`
-            }
-          })
-          console.log('文件列表', resp, this.fileList)
-        })
+        console.log('查看 id', this.dataId)
+        this.getFileListById(this.dataId)
         StorageSafeManageControllerEdit(this.dataId).then(resp  => {
           this.form = resp.storageSafeManageWithBLOBs
           // const fl = resp.fileList || []
@@ -330,37 +320,6 @@ export default {
         }
       })
     },
-    onUploadSuccess(resp, file, fileList) {
-      console.log('上传文件 resp', resp, file, fileList)
-      this.fileList = fileList.map(f => {
-        let url
-        let id
-        if(f.response) {
-          url = f.response.filePath
-          id = f.response.id
-        }else {
-          url = f.url
-          id = f.id
-        }
-        return {
-          name: f.name,
-          url: url,
-          id: id,
-        }
-      })
-    },
-    onUploadRemove(fileList) {
-      const removeFiles = []
-      for(const f of this.fileList) {
-        const file = fileList.find(temp => temp.id === f.id)
-        if(! file) {
-          removeFiles.push(f)
-        }
-      }
-      this.fileList = fileList
-      this.deleteFileIds.push(... removeFiles.map(f => f.id))
-      console.log('删除文件 ', fileList, removeFiles)
-    }
   }
 
 }

src/page/storehouseManagement/storehouseBaseInfo.vue

@@ -61,11 +61,11 @@
           {{ $enumUtils.getNameById(scope.row.storehouseType).name }}
         </template>
       </el-table-column>
-      <el-table-column
-        align="center"
-        prop="positionName"
-        label="代储甲方名称"
-      ></el-table-column>
+<!--      <el-table-column-->
+<!--        align="center"-->
+<!--        prop="agentDepotName"-->
+<!--        label="代储甲方名称"-->
+<!--      ></el-table-column>-->
       <el-table-column
         align="center"
         prop="designCapacity"
@@ -78,22 +78,30 @@
       ></el-table-column>
       <el-table-column
         align="center"
-        prop="totalCost"
+        prop="dutystoreman"
         label="保管员"
       ></el-table-column>
       <el-table-column
         align="center"
-        prop="totalCost"
+        prop="storehouseState"
         label="仓房状态"
-      ></el-table-column>
+      >
+        <template v-slot="scope">
+          {{$enumUtils.getNameById(scope.row.storehouseState).name}}
+        </template>
+      </el-table-column>
       <el-table-column
         align="center"
-        prop="totalCost"
+        prop="delFlag"
         label="使用情况"
-      ></el-table-column>
+      >
+        <template v-slot="scope">
+          {{scope.row.delFlag == '1' ? "在用":"弃用"}}
+        </template>
+      </el-table-column>
       <el-table-column
         align="center"
-        prop="completionDate"
+        prop="usedate"
         label="交付使用日期"
       ></el-table-column>
       <el-table-column label="操作" align="center" width="80">

src/page/storehouseManagement/temperatureInspection.vue

@@ -10,7 +10,7 @@
           class="demo-form-inline search-form"
         >
           <el-form-item label="仓房名称:" prop="houseId">
-            <el-select v-model="form.houseId" clearable placeholder="请选择" @change="$forceUpdate()" >
+            <el-select v-model="form.houseId" clearable placeholder="请选择" @change="$forceUpdate()" :disabled="houseOptionsLock">
               <el-option
                 v-for="item in houseOptions"
                 :key="item.value"
@@ -35,6 +35,7 @@
             <span class="search-line"></span>
             <el-button type="primary" @click="search" size="small" class="iconfont iconchaxun">查询</el-button>
             <el-button
+              v-if="! houseOptionsLock"
               type="primary"
               @click="reset('searchForm')"
               size="small"
@@ -68,7 +69,7 @@
         label="仓房名称"
       >
         <template v-slot="scope">
-          {{ houseIdNameMap[scope.row.houseId] }}
+          {{ scope.row.houseName ? scope.row.houseName : houseIdNameMap[scope.row.houseId] }}
         </template>
       </el-table-column>
       <el-table-column
@@ -122,15 +123,15 @@
           label="平均"
         ></el-table-column>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="130">
-        <template slot-scope="scope">
-          <el-button
-            type="primary"
-            size="small"
-            icon="el-icon-s-data"
-          >查看五温图</el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" align="center" width="130">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            type="primary"-->
+<!--            size="small"-->
+<!--            icon="el-icon-s-data"-->
+<!--          >查看五温图</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     <!-- 分页开始 -->
     <div class="pag-right clearFix">
@@ -180,6 +181,7 @@ export default {
       tableData: [],
       houseIdNameMap: {},
       houseOptions: [],
+      houseOptionsLock: false,
       form: {
         houseId: null,
         date: [],
@@ -203,7 +205,9 @@ export default {
   },
   mounted() {
     if(this.houseId != null) {
+      console.log('接收 house id', this.houseId)
       this.form.houseId = this.houseId
+      this.houseOptionsLock = true
     }
     this.getHouseOptions()
     this.getList()
@@ -242,6 +246,7 @@ export default {
             raw: d.raw
           }
         })
+        console.log('仓房列表', this.houseOptions)
       })
     },
     add() {

src/router/index.js

@@ -166,7 +166,7 @@ export default new Router({
         transferManagementModule,
         // settlementManagementModule,
         // statisticsManagementModule,
-        // financialManagementModule,
+        financialManagementModule,
         progressManagementModule,
         consumerManagementModule,
         alertingModule,

src/store/index.js

@@ -7,6 +7,9 @@ import getters from './getters'
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
+  state: {
+    flag: 2,
+  },
   modules: {
     app,
     user

src/utils/menuMock.js

@@ -100,7 +100,7 @@ const modules1 = [
   transferManagementModule,
   // settlementManagementModule,
   // statisticsManagementModule,
-  // financialManagementModule,
+  financialManagementModule,
   progressManagementModule,
   consumerManagementModule,
   alertingModule,

src/utils/systemUtils.js

@@ -909,12 +909,12 @@ export const gotoCrkSystem = (vueObj) => {
     }
     return alert('请重新登录')
   }
-  const isDev = process.env.NODE_ENV === 'development'
+  const isProd = process.env.NODE_ENV === 'production'
   let url
-  if(isDev) {
+  if(!isProd) {
     url = 'http://101.36.160.210:31055/crk'
   }else {
-    url = 'http://172.18.93.228:80/crk'
+    url = 'http://172.18.93.228:80'
   }
   window.open(`${url}/#/welcome?username=${u}&password=${p}`)
 }