Merge branch 'dev' into dev-2.19.1

* dev: (102 commits)
  fix bug
  修改bug
  fix bug
  fix bug
  fix bug
  fix bug
  fix bug
  fix bug
  fix bug
  fix bug
  fix bug
  fix bug
  修改接口
  fix bug
  fix bug
  fix bug
  fix bug
  fix bug
  fix bug
  添加 test 环境
  ...

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/alerting/index.js

@@ -1,5 +1,5 @@
 import request from '@/utils/require'
-import { depot_storage } from "../index";
+import {depot_intelligent, depot_storage, depot_alarm} from "../index";
 
 export function getTempAlarmList(page, query) {
   return request({
@@ -16,6 +16,23 @@ export function getDewingAlarmList(page, query) {
     params: query
   })
 }
+
+export function getAbnormalEquipmentList(page, query) {
+  return request({
+    url: `${depot_intelligent}/intelligents/warning/getAbnormalEquipmentList?pageNum=${page.page}&pageSize=${page.size}`,
+    method: 'get',
+    params: query
+  })
+}
+
+export function getHumidnessAlarmList(page, query) {
+  return request({
+    url: `${depot_storage}/spt/getHumidnessAlarmList?pageNum=${page.page}&pageSize=${page.size}`,
+    method: 'get',
+    params: query
+  })
+}
+
 export function getkccxbjList(page, query) {
   return request({
     url: `${depot_storage}/spt/getkccxbjList?pageNum=${page.page}&pageSize=${page.size}`,
@@ -52,6 +69,22 @@ export function violationWarningAlarmList(page, query) {
   })
 }
 
+export function getOldPageList(page, query) {
+  return request({
+    url: `${depot_alarm}/alarm/getOldPageList?pageNum=${page.page}&pageSize=${page.size}`,
+    method: 'get',
+    params: query
+  })
+}
+
+export function getSxtgzsList(page, query) {
+  return request({
+    url: `${depot_storage}/spt/getSxtgzsList?pageNum=${page.page}&pageSize=${page.size}`,
+    method: 'get',
+    params: query
+  })
+}
+
 export function getCwdgzsList(page, query) {
   return request({
     url: `${depot_storage}/spt/getCwdgzsList?pageNum=${page.page}&pageSize=${page.size}`,

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/base/index.js

@@ -588,3 +588,11 @@ export function findWareCode(query) {
     params: query
   })
 }
+
+export function getFileList(query) {
+  return request({
+    url: `${depot_basic}/depot/basic/file/getList`,
+    method: 'get',
+    params: query
+  })
+}

src/api/comprehensiveSearch/index.js

@@ -17,3 +17,11 @@ export function comprehensiveGetById(id) {
     params: query
   })
 }
+
+export function insectPestDetectionList(page, query) {
+  return request({
+    url: `${depot_intelligent}/intelligents/insectPestDetection/getList?pageNum=${page.page}&pageSize=${page.size}`,
+    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,
   })
 }
 
@@ -90,6 +88,14 @@ export function deviceRepairList(page, query) {
   })
 }
 
+export function getCheckListNoPage(query) {
+  return request({
+    url: `${depot_device}/deviceCheck/getCheckListNoPage`,
+    method: 'get',
+    params: query
+  })
+}
+
 export function deviceCheckList(page, query) {
   return request({
     url: `${depot_device}/deviceCheck/getCheckList?pageNum=${page.page}&pageSize=${page.size}`,

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,
   })
 }
 
@@ -82,13 +71,20 @@ export function facilitiesBasicsSave(data) {
   })
 }
 
+export function facilitiesBasicsScrap(data) {
+  return request({
+    url: `${depot_device}/facilities/basics/scrap`,
+    method: 'post',
+    data: data,
+  })
+}
+
 export function facilitiesBasicsRemove(id) {
   const data = {id}
-  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}/facilities/basics/remove`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
     method: 'post',
-    data: formData,
+    data: data,
   })
 }

src/api/index.js

@@ -19,6 +19,7 @@ export const depot_monitor = "/depot-monitor";
 export const depot_intelligent = "/depot-smart-storage";
 
 export const depot_smart_storage = "/depot-smart-storage";
+export const depot_alarm = "/depot-alarm";
 //正式环境
 // let service = '/main'
 // 开发服务器

src/api/settlementManagement/index.js

@@ -238,6 +238,13 @@ export function StorageSafeManageControllerEdit(id) {
   })
 }
 
+export function StorageSafeManageControllerRemove(id, orgId) {
+  return request({
+    url: `${depot_storage}/StorageSafeManageController/remove?id=${id}&orgId=${orgId}`,
+    method: 'post',
+  })
+}
+
 export function insectPestDetectionList(page, query) {
   return request({
     url: `${depot_qualitycheck}/intelligents/insectPestDetection/getList?pageNum=${page.page}&pageSize=${page.size}`,
@@ -359,6 +366,13 @@ export function dailyEdit(id) {
   })
 }
 
+export function getListOrRcsj(query, orgId) {
+  return request({
+    url: `${depot_agile}/agile/kcsw/getListOrRcsj?kcswStr=${JSON.stringify(query)}&orgId=${orgId}`,
+    method: 'get',
+  })
+}
+
 export function moveLibraryNoticeList(page, query) {
   return request({
     url: `${depot_business}/depot/business/moveLibraryNotice/getList?pageNum=${page.page}&pageSize=${page.size}`,

src/api/statisticalReport/index.js

@@ -8,3 +8,19 @@ export function getSummaryReportInfo(page, query) {
     params: query
   })
 }
+
+export function getDetailsReportInfo(page, query) {
+  return request({
+    url: `${depot_storage}/storage/statisticalReport/getDetailsReportInfo?pageNum=${page.page}&pageSize=${page.size}`,
+    method: 'get',
+    params: query
+  })
+}
+
+export function getSubmitReportInfo(page, query) {
+  return request({
+    url: `${depot_storage}/storage/statisticalReport/getSubmitReportInfo?pageNum=${page.page}&pageSize=${page.size}`,
+    method: 'get',
+    params: query
+  })
+}

src/api/storehouseAnalyze/index.js

@@ -0,0 +1,17 @@
+import { depot_agent, depot_storage, depot_smart_storage } from '@/api'
+import request from '@/utils/require'
+
+export function getChartList(orgId) {
+  return request({
+    url: `${depot_smart_storage}/warehouseDataAnalysis/getChartList/${orgId}`,
+    method: 'get',
+  })
+}
+
+export function getPageList(page, query) {
+  return request({
+    url: `${depot_smart_storage}/warehouseDataAnalysis/getPageList?current=${page.page}&size=${page.size}`,
+    method: 'get',
+    params: query,
+  })
+}

src/api/system/index.js

@@ -9,6 +9,13 @@ export function userList(page, query) {
   })
 }
 
+export function userDel(userId) {
+  return request({
+    url: `${depot_system}/userInfo/remove?userId=${userId}`,
+    method: 'post',
+  })
+}
+
 export function userEdit(userId) {
   const query = {userId}
   return request({
@@ -161,3 +168,28 @@ export function getgetTreeList(page, query) {
     params: query
   })
 }
+
+/**
+ * funcInfoJson
+ * {"funcId":40,"funcName":"待办与审批","funcUrl":"123","funcSort":1,"parentId":8,"icoUrl":null,"status":null,"remark":null,"delFlag":null,"children":null}
+ */
+export const saveFuncInfo = (data) => {
+  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replaceAll('_____PLACEHOLDER_PLUS_____', '+')
+  return request({
+    url: `${depot_system}/funcInfo/save`,
+    method: 'post',
+    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    data: formData
+  })
+}
+
+export const removeFunc = (id) => {
+  const data = {funcId: id}
+  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(/_____PLACEHOLDER_PLUS_____/g, '+')
+  return request({
+    url: `${depot_system}/funcInfo/remove`,
+    method: 'post',
+    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    data: formData
+  })
+}

src/api/user/index.js

@@ -1,10 +1,11 @@
 import request from '@/utils/require'
 import {depot_business, depot_system} from '../index'
 
-export function getUser() {
+export function getUser(data) {
   return request({
     url: `${depot_system}/userInfo/getUser`,
     method: 'get',
+    params: data || {}
   })
 }
 
@@ -71,10 +72,15 @@ export function getByRoleId(roleId) {
 
 export function getFunc(query) {
   return request({
-    url: `${depot_system}/funcInfo/getFunc`,
+    url: `${depot_system}/funcInfo/getFuncList`,
     method: 'get',
     params: query,
   })
+  // return request({
+  //   url: `${depot_system}/funcInfo/getFunc`,
+  //   method: 'get',
+  //   params: query,
+  // })
 }
 
 export function getFuncByUserId(query) {

src/components/common/carInOutEdit.vue

@@ -187,6 +187,7 @@ export default {
 
   methods: {
     init() {
+      console.log('edit data', this.editData)
       this.loading = true
       this.resetForm()
       if(this.isAdd) {
@@ -209,7 +210,7 @@ export default {
           crkRecordDetails({
             bizNo: this.editData.bizno,
             lspz: this.editData.lspzid,
-            ywlx: '入仓'
+            ywlx: this.editData.ywlx,
           }).then(resp => {
             console.log('--- ', resp)
             const zjxx = resp.zjxx

src/components/common/data.js

@@ -846,3 +846,45 @@ export const settleContractUniformity = [
 export const APPROVAL_OPTIONS_7 = [
   { value: '0', label: '待审核'},
 ]
+
+export const CGXZFS = [
+  {value: '0', label: '粮面潮解'},
+  {value: '1', label: '布袋埋藏'},
+  {value: '2', label: '探管'},
+  {value: '3', label: '综合施药'},
+]
+
+export const HLXZFS = [
+  {value: '0', label: '固定式布置形式'},
+  {value: '1', label: '移动式布置形式'},
+]
+
+export const HLXZNHLJS = [
+  {value: '0', label: '分别使用_固定式'},
+  {value: '1', label: '分别使用_移动式'},
+  {value: '2', label: '二合一应用_移动式'},
+  {value: '3', label: '二合一应用_移动式'},
+]
+
+export const SYFF = [
+  {value: '0', label: '潮解法'},
+  {value: '1', label: '仓外发生器'},
+  {value: '2', label: '钢瓶气'},
+]
+
+export const LHQNDDW = [
+  {value: '1', label: 'g/m³'},
+  {value: '2', label: 'ppm'},
+  {value: '3', label: 'ml/m³'},
+  {value: '4', label: '%VOL'},
+]
+
+export const XZXGPJ = [
+  {value: '0', label: '良好'},
+  {value: '1', label: '一般'},
+  {value: '2', label: '不好'},
+]
+
+export const violationType = [
+  {value: '1', label: '疑转圈粮预警'}
+]

src/components/common/header.vue

@@ -1,30 +1,31 @@
 <template>
   <header class="header">
     <div class="logo">
-      <img src="@/assets/wisdom_images/logo.png" alt="Logo">
+      <!-- <img src="@/assets/wisdom_images/logo.png" alt="Logo"> -->
+      <img src="@/assets/wisdom_images/logoDEl.png" alt="Logo" />
     </div>
     <div class="right-section">
       <div class="userInfo-2">
         <el-dropdown trigger="click">
-                  <span class="el-dropdown-link">
-                    <el-avatar
-                      :size="22"
-                      icon="el-icon-user-solid"
-                      style="vertical-align: middle; cursor: pointer"
-                    ></el-avatar>
-                    <span style="margin-left: 10px; font-size: .8rem;">{{
-                        realName
-                      }}</span>
-                  </span>
+          <span class="el-dropdown-link">
+            <el-avatar
+              :size="22"
+              icon="el-icon-user-solid"
+              style="vertical-align: middle; cursor: pointer"
+            ></el-avatar>
+            <span style="margin-left: 10px; font-size: 0.8rem">{{
+              realName
+            }}</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="logout"
-              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
+            >
           </el-dropdown-menu>
         </el-dropdown>
       </div>
@@ -33,15 +34,14 @@
   </header>
 </template>
 <script>
-
 import topMenu from "./topMenu";
 import bus from "@/utils/bus.js";
-import {mapGetters} from "vuex"
-import {clearCacheAndGotoLogin} from "@/utils/loginStatusChecker";
-import {logout} from "@/api/login/login";
+import { mapGetters } from "vuex";
+import { clearCacheAndGotoLogin } from "@/utils/loginStatusChecker";
+import { logout } from "@/api/login/login";
 export default {
   components: {
-    topMenu
+    topMenu,
   },
   data() {
     return {
@@ -52,15 +52,13 @@ export default {
       rightNum: 0,
       isleft: false,
       isright: true,
-      xzdata: [
-
-      ],
+      xzdata: [],
       menuUrl: "",
       accouncementNum: "0",
     };
   },
   computed: {
-    ...mapGetters(['realName']),
+    ...mapGetters(["realName"]),
     // ...mapGetters(['sidebar', 'index'])
     // navData() {
     //   console.log('navData', this.data[0].children)
@@ -92,9 +90,9 @@ export default {
       // this.$store.dispatch('LogOut').then(resp => {
       //   this.$router.push({ name: "login" });
       // })
-      logout().then(resp => {
-        clearCacheAndGotoLogin(true)
-      })
+      logout().then((resp) => {
+        clearCacheAndGotoLogin(true);
+      });
     },
     // // 退出
     // logout() {
@@ -155,7 +153,6 @@ export default {
   },
   mounted() {
     bus.$on("msg", (e) => {
-      console.log(123, e);
       this.accouncementNum = e;
     });
     // if (this.xzdata.children && this.xzdata.children.length != 0) {
@@ -178,19 +175,19 @@ export default {
 .header {
   display: flex;
   justify-content: space-between;
-  background-image: url('../../assets/wisdom_images/banner.png');
+  background-image: url("../../assets/wisdom_images/banner.png");
 }
 
 .logo {
   display: flex;
-  align-content: center;
-  justify-content: center;
-  margin-left: 5px;
+  // align-content: center;
+  // justify-content: center;
+  margin-left: 12px;
 }
 
 .logo img {
   object-fit: contain;
-  width: 100%;
+  width: 72%;
   height: auto;
 }
 
@@ -220,4 +217,3 @@ export default {
   margin-bottom: 2px;
 }
 </style>
-

src/components/common/topMenu.vue

@@ -1,31 +1,26 @@
 <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.title }}
+          {{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 {
@@ -33,101 +28,109 @@ export default {
       visibleItems: 6,
       hasPrev: true,
       hasNext: true,
+      funcTree: null,
       list: [
         {
-          icon: "el-icon-s-home",
-          title: "首页",
-          resourceUrl: "/home",
+          icon: 'el-icon-s-home',
+          funcName: '首页',
+          funcUrl: '/home',
           resourceCode: null,
         },
-        {
-          icon: "el-icon-s-home",
-          title: "综合业务",
-          resourceUrl: "/businessHome",
-          resourceCode: "RM1001008001",
-        },
-        {
-          icon: "el-icon-s-home",
-          title: "出入库",
-          type: "crk",
-          resourceUrl: "/businessHome",
-          resourceCode: "RM10010080010",
-        },
-        {
-          icon: "el-icon-house",
-          title: "仓储业务",
-          resourceUrl: "/storageHome",
-          resourceCode: "RM1001008002",
-        },
-        {
-          icon: "el-icon-s-home",
-          title: "智能安防",
-          resourceUrl: "/monitorHome",
-          resourceCode: "RM1001008003",
-        },
-        {
-          icon: "el-icon-s-home",
-          title: "粮库决策",
-          resourceUrl: "/granaryComprehensiveExhibition/warningThreshold",
-          resourceCode: "RM1001008004",
-        },
-        {
-          icon: "el-icon-s-home",
-          title: "查询追溯",
-          resourceUrl: "/inventoryQualityTraceability/warehouseSource",
-          resourceCode: "RM1001008005",
-        },
-        {
-          icon: "el-icon-s-home",
-          title: "智能仓房",
-          resourceUrl: "/grainSituationInspection/grainSituationReport",
-          resourceCode: "RM1001008006",
-        },
-        {
-          icon: "el-icon-s-home",
-          title: "基础数据",
-          resourceUrl: "/basicData/storehouseList",
-          resourceCode: "RM1001008007",
-        },
-        {
-          icon: "el-icon-s-home",
-          title: "系统设置",
-          resourceUrl: "/system/userManagement",
-          resourceCode: "RM1001008008",
-        },
-      ],
-    };
+        // {
+        //   icon: 'el-icon-s-home',
+        //   title: '综合业务',
+        //   funcUrl: '/businessHome',
+        //   resourceCode: 'RM1001008001',
+        // },
+        // {
+        //   icon: 'el-icon-s-home',
+        //   title: '出入库',
+        //   type: 'crk',
+        //   funcUrl: '/businessHome',
+        //   resourceCode: 'RM10010080010',
+        // },
+        // {
+        //   icon: 'el-icon-house',
+        //   title: '仓储业务',
+        //   funcUrl: '/storageHome',
+        //   resourceCode: 'RM1001008002',
+        // },
+        // {
+        //   icon: 'el-icon-s-home',
+        //   title: '智能安防',
+        //   funcUrl: '/monitorHome',
+        //   resourceCode: 'RM1001008003',
+        // },
+        // {
+        //   icon: 'el-icon-s-home',
+        //   title: '粮库决策',
+        //   funcUrl: '/granaryComprehensiveExhibition/warningThreshold',
+        //   resourceCode: 'RM1001008004',
+        // },
+        // {
+        //   icon: 'el-icon-s-home',
+        //   title: '查询追溯',
+        //   funcUrl: '/inventoryQualityTraceability/warehouseSource',
+        //   resourceCode: 'RM1001008005',
+        // },
+        // {
+        //   icon: 'el-icon-s-home',
+        //   title: '智能仓房',
+        //   funcUrl: '/grainSituationInspection/grainSituationReport',
+        //   resourceCode: 'RM1001008006',
+        // },
+        // {
+        //   icon: 'el-icon-s-home',
+        //   funcName: '基础数据',
+        //   funcUrl: '/basicData/storehouseList',
+        //   resourceCode: 'RM1001008007',
+        // },
+        // {
+        //   icon: 'el-icon-s-home',
+        //   funcName: '系统设置',
+        //   funcUrl: '/system/userManagement',
+        //   resourceCode: 'RM1001008008',
+        // },
+
+      ]
+    }
   },
   created() {
-    this.visibleItems = this.list.length;
-    this.welcome();
+    this.visibleItems = this.list.length
+    // this.welcome()
+    this.welcome2()
     const menuCode = sessionStorage.getItem("menuCode");
     const menuData = JSON.parse(sessionStorage.getItem("xzdata"));
 
-    if (menuCode) {
-      menuData.forEach((item) => {
-        if (item.resourceCode == menuCode) {
-          this.$store.dispatch("changeLeftMenu", [item]);
-        }
-      });
-    }
-    window.addEventListener("resize", this.updateVisibleItems);
+    // if (menuCode) {
+    //   menuData.forEach((item) => {
+    //     if (item.resourceCode == menuCode) {
+    //       this.$store.dispatch("changeLeftMenu", [item]);
+    //     }
+    //   });
+    // }
+    window.addEventListener('resize', this.updateVisibleItems);
   },
   mounted() {
     this.updateVisibleItems();
+    this.$nextTick(() => {
+      this.$refs.menu.scrollLeft = 0
+    })
   },
   beforeDestroy() {
-    window.removeEventListener("resize", this.updateVisibleItems);
+    window.removeEventListener('resize', this.updateVisibleItems);
   },
   watch: {
     defaultActiveUrl(n, o) {
-      console.log("------", n);
-    },
+      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 {
@@ -135,7 +138,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 {
@@ -143,10 +146,7 @@ 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) {
@@ -160,68 +160,89 @@ export default {
       } 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) {
-      if (item.type === "crk") {
-        this.$store.state.flag = 1;
-        // 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 (!item.resourceCode) {
-        return this.$router.push({ path: item.resourceUrl });
+      console.log('open menu', item, index)
+      if (['crk', '/crk'].indexOf(item.funcUrl) >= 0) {
+        // this.$store.state.flag = 1;
+        // return
+        return this.$systemUtils.gotoCrkSystem(this)
+      }else {
+        // this.$store.state.flag = 2;
       }
-      this.getMenuList(item, 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)
     },
     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.list.push({
+          icon: 'el-icon-s-home',
+          funcName: menu.funcName,
+          funcUrl: menu.funcUrl,
+          funcId: menu.funcId,
+          resourceCode: 'RM1001008007',
+          children: menu.children
+        })
+      }
+      this.$store.dispatch("changeLeftMenu", defaultChild);
+    },
+    /**
+     * 默认展开的左侧菜单
+     */
     getFirstMenu(arr) {
       if (arr[0] && arr[0].children && arr[0].children.length) {
         this.getFirstMenu(arr[0].children);
       } else {
-        this.menuUrl = arr[0].resourceUrl;
+        console.log('first menu', arr[0])
+        this.menuUrl = arr[0].funcUrl;
       }
     },
     getMenuList(item, index) {
+      console.log('get menu list', item, index,)
+      // debugger
+      let leftMenuList = item.children;
       if (item.children && item.children.length > 0) {
         this.getFirstMenu(item.children);
-        this.$router.push({ path: this.menuUrl });
+        console.log('menuUrl', this.menuUrl)
+        this.$router.push({path: this.menuUrl});
       } else {
-        if (item.resourceUrl.indexOf("http") == -1) {
-          this.$router.push({ path: item.resourceUrl });
+        if (item.funcUrl.indexOf("http") == -1) {
+          this.$router.push({path: item.funcUrl});
         } else {
-          window.location.href = item.resourceUrl;
+          window.location.href = item.funcUrl;
         }
       }
       let code = item.resourceCode;
       this.isClick = index;
       sessionStorage.menuIdx = index;
-      let leftMenuList = [];
-      this.xzdata.forEach((item) => {
-        if (item.resourceCode == code) {
-          leftMenuList = [item];
-        }
-      });
-      this.getFirstMenu([item]);
-      this.$store.commit("SET_DEFAULT_ACTIVE_URL", this.menuUrl);
+      // this.getFirstMenu([item]);
+      this.$store.commit('SET_DEFAULT_ACTIVE_URL', this.menuUrl)
       sessionStorage.setItem("leftMenuList", JSON.stringify(leftMenuList));
       sessionStorage.setItem("menuCode", code);
       sessionStorage.setItem("resourceCode", code);
@@ -230,8 +251,8 @@ export default {
 
       this.$store.dispatch("changeLeftMenu", leftMenuList);
     },
-  },
-};
+  }
+}
 </script>
 
 
@@ -275,11 +296,13 @@ export default {
   color: white;
   height: 100%;
 }
+
 .menu ul {
   display: flex;
   list-style-type: none;
 }
 
+
 .menu-item {
   width: 130px;
   height: 100%;

src/components/simpleList/index.js

@@ -26,7 +26,7 @@ export const simpleList = {
     }
   },
   computed: {
-    ...mapGetters(['userId', "orgId", 'userName', 'realName', 'creditCode', 'orgName', 'orgClassId']),
+    ...mapGetters(['userId', "orgId", 'userName', 'realName', 'creditCode', 'orgName', 'orgClassId', 'unitInfoId']),
   },
   mounted() {
     this.init()

src/components/simpleList/simpleEdit.js

@@ -119,6 +119,7 @@ export const simpleEdit= {
       }).catch(err => {
         if(err) {
           this.$message.error(err)
+          this.loading = false
         }
       })
     },
@@ -164,6 +165,7 @@ export const simpleEdit= {
     },
     getSaveFailMsg(resp) {
       if(resp.message) return resp.message
+      if(resp.error) return resp.error
       return resp.msg
     },
     filterNull(obj) {

src/components/system/customer/customerAdd.vue

@@ -14,19 +14,19 @@
         </el-col>
         <el-col :span="8">
         <el-form-item label="客户名称" prop="name">
-          <el-input v-model="form.name"></el-input>
+          <el-input v-model="form.name" :readonly="readonly"></el-input>
         </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" align="middle" justify="center" class="row">
         <el-col :span="8">
           <el-form-item label="客户分组编码" prop="customerGroupId">
-            <el-input v-model="form.customerGroupId"></el-input>
+            <el-input v-model="form.customerGroupId" :readonly="readonly"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="客户分组名称" prop="customerGroupName">
-            <el-input v-model="form.customerGroupName"></el-input>
+            <el-input v-model="form.customerGroupName" :readonly="readonly"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8"></el-col>
@@ -39,114 +39,114 @@
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="身份证号" prop="identification">
-              <el-input v-model="personalForm.identification"></el-input>
+              <el-input v-model="personalForm.identification" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="手机号" prop="mobile">
-              <el-input v-model="personalForm.mobile"></el-input>
+              <el-input v-model="personalForm.mobile" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="电子邮件" prop="email">
-              <el-input v-model="personalForm.email"></el-input>
+              <el-input v-model="personalForm.email" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="通讯地址(省/直辖市)" prop="province" label-width="180px">
-              <common-select v-model="personalForm.province" type="xzqh" :remote="true"></common-select>
+              <common-select v-model="personalForm.province" type="xzqh" :remote="true" :readonly="readonly"></common-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="通讯地址(地市)" prop="city">
-              <second-level-remote-select v-model="personalForm.city" :base-id="personalForm.province"></second-level-remote-select>
+              <second-level-remote-select v-model="personalForm.city" :base-id="personalForm.province" :readonly="readonly"></second-level-remote-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="通讯地址(县区)" prop="county">
-              <second-level-remote-select v-model="personalForm.county" :base-id="personalForm.city"></second-level-remote-select>
+              <second-level-remote-select v-model="personalForm.county" :base-id="personalForm.city" :readonly="readonly"></second-level-remote-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="通讯详细地址(含门牌号)" prop="address" label-width="180px">
-              <el-input v-model="personalForm.address"></el-input>
+              <el-input v-model="personalForm.address" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系人姓名" prop="linkman">
-              <el-input v-model="personalForm.linkman"></el-input>
+              <el-input v-model="personalForm.linkman" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系人身份证号" prop="lxrsfzh">
-              <el-input v-model="personalForm.lxrsfzh"></el-input>
+              <el-input v-model="personalForm.lxrsfzh" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="开票信息(发票抬头)" prop="invoiceTitle" label-width="180px">
-              <el-input v-model="personalForm.invoiceTitle"></el-input>
+              <el-input v-model="personalForm.invoiceTitle" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="开户行名称" prop="bankName">
-              <common-select v-model="personalForm.bankName" type="kaihuhangmingcheng" :remote="true"></common-select>
+              <common-select v-model="personalForm.bankName" type="kaihuhangmingcheng" :remote="true" :readonly="readonly"></common-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="银行账户名称" prop="accountName">
-              <el-input v-model="personalForm.accountName"></el-input>
+              <el-input v-model="personalForm.accountName" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="开户账号" prop="accountNumber">
-              <el-input v-model="personalForm.accountNumber"></el-input>
+              <el-input v-model="personalForm.accountNumber" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="客户所属地区名称" prop="district">
-              <el-input v-model="personalForm.district"></el-input>
+              <el-input v-model="personalForm.district" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="种植面积(亩)" prop="plantAcreage">
-              <el-input v-model="personalForm.plantAcreage"></el-input>
+              <el-input v-model="personalForm.plantAcreage" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="每亩的价外补贴数量(公斤)" prop="subsidy" label-width="180px">
-              <el-input v-model="personalForm.subsidy"></el-input>
+              <el-input v-model="personalForm.subsidy" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="计划客户" prop="businessRegistNum">
-              <el-input v-model="personalForm.businessRegistNum"></el-input>
+              <el-input v-model="personalForm.businessRegistNum" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="收款人" prop="administrativeDivision">
-              <el-input v-model="personalForm.administrativeDivision"></el-input>
+              <el-input v-model="personalForm.administrativeDivision" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="开户行号" prop="khhh">
-              <el-input v-model="personalForm.khhh"></el-input>
+              <el-input v-model="personalForm.khhh" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="邮政编码" prop="yzbm">
-              <el-input v-model="personalForm.yzbm"></el-input>
+              <el-input v-model="personalForm.yzbm" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8"></el-col>
@@ -154,7 +154,7 @@
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="24">
             <el-form-item label="客户描述" prop="remark">
-              <el-input type="textarea" v-model="personalForm.remark"></el-input>
+              <el-input type="textarea" v-model="personalForm.remark" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -166,131 +166,131 @@
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="企业性质" prop="generalProperty">
-              <el-input v-model="companyForm.generalProperty"></el-input>
+              <el-input v-model="companyForm.generalProperty" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="统一社会信用代码" prop="socialCreditCode">
-              <el-input v-model="companyForm.socialCreditCode"></el-input>
+              <el-input v-model="companyForm.socialCreditCode" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="注册资本(万元)" prop="registeredCapital">
-              <el-input v-model="companyForm.registeredCapital"></el-input>
+              <el-input v-model="companyForm.registeredCapital" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="法人" prop="legalPerson">
-              <el-input v-model="companyForm.legalPerson"></el-input>
+              <el-input v-model="companyForm.legalPerson" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系人" prop="linkman">
-              <el-input v-model="companyForm.linkman"></el-input>
+              <el-input v-model="companyForm.linkman" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系人身份证号" prop="lxrsfzh">
-              <el-input v-model="companyForm.lxrsfzh"></el-input>
+              <el-input v-model="companyForm.lxrsfzh" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="通讯地址(省/直辖市)" prop="province">
-              <common-select v-model="companyForm.province" type="xzqh" :remote="true"></common-select>
+              <common-select v-model="companyForm.province" type="xzqh" :remote="true" :readonly="readonly"></common-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="通讯地址(地市)" prop="city">
-              <second-level-remote-select v-model="companyForm.city" :base-id="companyForm.province"></second-level-remote-select>
+              <second-level-remote-select v-model="companyForm.city" :base-id="companyForm.province" :readonly="readonly"></second-level-remote-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="通讯地址(县区)" prop="county">
-              <second-level-remote-select v-model="companyForm.county" :base-id="companyForm.city"></second-level-remote-select>
+              <second-level-remote-select v-model="companyForm.county" :base-id="companyForm.city" :readonly="readonly"></second-level-remote-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="联系地址" prop="address">
-              <el-input v-model="companyForm.address"></el-input>
+              <el-input v-model="companyForm.address" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="企业电话" prop="enterprisePhone">
-              <el-input v-model="companyForm.enterprisePhone"></el-input>
+              <el-input v-model="companyForm.enterprisePhone" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="电子邮件" prop="email">
-              <el-input v-model="companyForm.email"></el-input>
+              <el-input v-model="companyForm.email" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="开票信息(发票抬头)" prop="invoiceTitle">
-              <el-input v-model="companyForm.invoiceTitle"></el-input>
+              <el-input v-model="companyForm.invoiceTitle" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="开户行名称" prop="bankName">
-              <common-select v-model="companyForm.bankName" type="kaihuhangmingcheng" :remote="true"></common-select>
+              <common-select v-model="companyForm.bankName" type="kaihuhangmingcheng" :remote="true" :readonly="readonly"></common-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="银行账户名称" prop="accountName">
-              <el-input v-model="companyForm.accountName"></el-input>
+              <el-input v-model="companyForm.accountName" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="开户账号" prop="accountNumber">
-              <el-input v-model="companyForm.accountNumber"></el-input>
+              <el-input v-model="companyForm.accountNumber" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="客户所属地区名称" prop="district">
-              <el-input v-model="companyForm.district"></el-input>
+              <el-input v-model="companyForm.district" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="种植面积(亩)" prop="plantAcreage">
-              <el-input v-model="companyForm.plantAcreage"></el-input>
+              <el-input v-model="companyForm.plantAcreage" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="每亩的价外补贴数量(公斤)" prop="subsidy">
-              <el-input v-model="companyForm.subsidy"></el-input>
+              <el-input v-model="companyForm.subsidy" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="计划客户" prop="businessRegistNum">
-              <el-input v-model="companyForm.businessRegistNum"></el-input>
+              <el-input v-model="companyForm.businessRegistNum" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="收款人" prop="administrativeDivision">
-              <el-input v-model="companyForm.administrativeDivision"></el-input>
+              <el-input v-model="companyForm.administrativeDivision" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="开户行号" prop="khhh">
-              <el-input v-model="companyForm.khhh"></el-input>
+              <el-input v-model="companyForm.khhh" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="邮政编码" prop="lxrsfzh">
-              <el-input v-model="companyForm.yzbm"></el-input>
+              <el-input v-model="companyForm.yzbm" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8"></el-col>
@@ -298,7 +298,7 @@
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="24">
             <el-form-item label="客户描述" prop="lxrsfzh">
-              <el-input type="textarea" v-model="companyForm.remark"></el-input>
+              <el-input type="textarea" v-model="companyForm.remark" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -306,7 +306,7 @@
     </div>
 
     <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="onSave" :disabled="!canSave">确定</el-button>
+        <el-button v-if="!readonly" type="primary" @click="onSave" :disabled="!canSave">确定</el-button>
         <el-button @click="show = false">取消</el-button>
     </span>
   </el-dialog>
@@ -368,7 +368,7 @@ export default {
     },
   },
   mounted() {
-    if(this.isEdit) {
+    if(this.isEdit || this.isView) {
       this.loading = true
       getCustomer(this.editId).then(resp => {
         const type = resp.classify
@@ -410,6 +410,12 @@ export default {
     },
     isEdit() {
       return this.action === 'edit'
+    },
+    isView() {
+      return this.action === 'view'
+    },
+    readonly(){
+      return this.isView
     }
   },
   data() {

src/components/system/keeper/keeperListEdit.vue

@@ -494,6 +494,7 @@ export default {
       })
     },
     getUserOptions() {
+      console.log('获取用户选项', this.orgId)
       return getUser({orgId: this.orgId}).then(resp => {
         const list = resp.list
         this.userOptions = list.map(d => {

src/components/upload/v2.vue

@@ -75,6 +75,7 @@ export default {
   },
   watch: {
     fileList(n) {
+      console.log('上传组件 文件列表变化 ', n, this.parseFileList(n))
       this.uploadFiles = this.parseFileList(n)
     }
   },

src/page/ACCinventory/index.vue

@@ -4,10 +4,18 @@
       <el-row>
         <el-form label-width="120px" :inline="true" class="demo-form-inline search-form">
           <el-form-item label="仓房名称:" prop="unitName">
-            <el-input class="title-box" autocomplete="off" v-model:value="searchData.houseName" />
+            <el-select v-model="searchData.houseId" placeholder="请选择" @change="houseChanged">
+              <el-option v-for="item in houseOptions" :key="item.value" :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="货位名称:" prop="unitName">
-            <el-input class="title-box" autocomplete="off" v-model:value="searchData.wareName" />
+            <el-select v-model="searchData.wareId" placeholder="请选择">
+              <el-option v-for="item in wareOptions" :key="item.value" :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="商品名称:" prop="unitName">
             <el-input class="title-box" autocomplete="off" v-model:value="searchData.sjjlspmc" />
@@ -28,10 +36,6 @@
       <el-table-column align="center" prop="chmc" label="仓房名称"></el-table-column>
       </el-table-column>
       <el-table-column align="center" prop="hwmc" label="货位名称">
-        <!-- <template v-slot="scope">
-<div v-if="scope.row.standardType == 1">保管费用标准 </div>
-<div v-if="scope.row.standardType == 2">轮换费用标准 </div>
-        </template> -->
       </el-table-column>
       <el-table-column align="center" prop="sjjlspmc" label="商品名称"></el-table-column>
       <el-table-column align="center" prop="sjjlpzmc" label="品种"></el-table-column>
@@ -72,8 +76,8 @@ export default {
       },
       searchData: {
         sjjlspmc: "",
-        houseName: "",
-        wareName: ""
+        houseId: "",
+        wareId: ""
       },
       limit: {
         page: 1,
@@ -81,14 +85,35 @@ export default {
         total: 0,
       },
       tableData: [],
+      houseOptions: [],
+      wareOptions: [],
     }
   },
 
   mounted () {
     this.getList()
+    this.getHouseOptions()
   },
-
   methods: {
+    houseChanged (n) {
+      if (n) {
+        this.searchData.wareId = ''
+        this.getWareOptions(n)
+      } else {
+        this.wareOptions = []
+        this.searchData.wareId = ''
+      }
+    },
+    getHouseOptions () {
+      this.houseOptions = []
+      this.$systemUtils.getHouseOption(this.orgId).then(opt => this.houseOptions = opt)
+    },
+    getWareOptions (houseId) {
+      this.wareOptions = []
+      this.$systemUtils.getWarehouseOption(this.orgId, houseId).then(opt => this.wareOptions = opt)
+    },
+
+
     getList () {
       const userInfoJSON = JSON.parse(sessionStorage.getItem("userInfo"))
       const obj = {
@@ -111,8 +136,8 @@ export default {
     // 重置
     reset () {
       this.searchData.sjjlspmc = ""
-      this.searchData.houseName = ""
-      this.searchData.wareName = ""
+      this.searchData.houseId = ""
+      this.searchData.wareId = ""
       this.getList()
     },
     // 新增

src/page/Layout/layout.vue

@@ -55,9 +55,6 @@ export default {
       u: localStorage.getItem("_userName"),
       p: localStorage.getItem("_password"),
       clientHeight: document.documentElement.clientHeight,
-      // url: `http://101.36.160.210:31055/crk/?ku_username=${u}&ku_password=${p}`,
-      // url: `http://localhost:9528/crk/welcome/?username=${u}&password=${p}`,
-      // url: `http://101.36.160.210:31055/crk/?ku_username=${u}&ku_password=${p}`,
       url: `http://101.36.160.210:31055/crk/#/welcome?username=${u}&password=${p}`,
     };
   },

src/page/Layout/menuList/menuItem.vue

@@ -1,80 +1,20 @@
 <template>
   <div class="menuItem-wrapper">
-    <template v-for="(firstItem,firstIndex) in routeList">
-      <el-menu-item
-        v-if="firstItem.children.length === 0"
-        :index="firstItem.resourceUrl"
-        :key="firstIndex"
-        @click="handleSelect(firstItem)"
-      >
-<!--        <span class="iconfont icondian iconStyle"></span>-->
-        <span v-if="firstItem.resourceName" slot="title" class="test">{{firstItem.resourceName}}</span>
-
-      </el-menu-item>
-      <el-submenu v-else :index="firstIndex + ''" :key="firstItem.resourceCode">
-        <template slot="title">
-<!--          <span class="iconfont icondian iconStyle"></span>-->
-          <span slot="title">{{firstItem.resourceName}}</span>
-        </template>
-        <template v-for="(secondItem,secondIndex) in firstItem.children">
-          <el-menu-item
-            :index="secondItem.resourceUrl"
-            v-if="secondItem.children.length == 0"
-            :key="secondIndex"
-            class="menuSecondary2"
-            @click="handleSelect(secondItem)"
-          >
-<!--            <span class="iconfont icondian iconStyle"></span>-->
-            <span slot="title">{{secondItem.resourceName}}</span>
-          </el-menu-item>
-          <el-submenu
-            v-else
-            :index="firstIndex + '-' + secondIndex"
-            :key="secondIndex"
-            class="menuSecondaryWrap2"
-          >
-            <template slot="title">
-<!--              <span class="iconfont icondian iconStyle"></span>-->
-              <span v-if="secondItem.resourceName" slot="title">{{secondItem.resourceName}}</span>
-            </template>
-            <template v-for="(thirdItem,thirdIndex) in secondItem.children">
-
-              <el-menu-item
-                :index="thirdItem.resourceUrl"
-                v-if="thirdItem.children.length == 0"
-                :key="thirdIndex"
-                :title="thirdItem.resourceName"
-                class="menuThirdGrade1"
-                @click="handleSelect(thirdItem)"
-              >
-                <span slot="title">{{thirdItem.resourceName}}</span>
-              </el-menu-item>
-              <el-submenu
-                v-else
-                :index="firstIndex+'-'+secondIndex+'-'+thirdIndex"
-                :key="thirdIndex"
-              >
-                <template slot="title">{{thirdItem.resourceName}}</template>
-                <el-menu-item
-                  :index="fourthItem.resourceUrl"
-                  :title="fourthItem.resourceName"
-                  v-if="fourthItem.children.length === 0"
-                  v-for="(fourthItem,fourthIndex) in thirdItem.children"
-                  :key="fourthIndex"
-                  @click="handleSelect(fourthItem)"
-                >{{fourthItem.resourceName}}</el-menu-item>
-              </el-submenu>
-            </template>
-          </el-submenu>
-        </template>
-      </el-submenu>
-    </template>
+    <my-menu-item
+      v-for="(firstItem, firstIndex) in routeList"
+      :key="firstIndex"
+      :item="firstItem"
+      :index="firstIndex + ''"
+      @handle-select="handleSelect"
+      />
   </div>
 </template>
 
 
 
 <script>
+import MyMenuItem from "@/page/Layout/menuList/myMenuItem.vue";
+
 export default {
   name: "menuItem",
   props: {
@@ -82,6 +22,7 @@ export default {
       type: Array
     }
   },
+  components: {MyMenuItem},
   data() {
     return {};
   },

src/page/Layout/menuList/menuList.vue

@@ -11,7 +11,7 @@
         :default-openeds="defaultOpened"
         :unique-opened="true"
       >
-        <Menu-item :routeList="leftMenuList"></Menu-item>
+        <Menu-item :routeList="routeList"></Menu-item>
       </el-menu>
     </el-scrollbar>
   </div>
@@ -46,6 +46,7 @@ export default {
   watch: {
     leftMenuList(n, o) {
       this.defaultActive = this.defaultActiveUrl
+      this.routeList = n
       console.log('菜单修改', n, this.defaultActive)
     },
     defaultActiveUrl(n, o) {
@@ -55,7 +56,8 @@ export default {
   created() {
     // alert("99");
     // console.log(JSON.parse(sessionStorage.getItem('leftMenuList')))
-    // this.routeList = this.routes()
+    this.routeList = this.routes()
+    console.log('left menu list', this.routeList)
     let href = window.location.href;
     // console.log(href, "href");
     // console.log(this.$route.path, "this.$route.path");

src/page/Layout/menuList/myMenuItem.vue

@@ -0,0 +1,38 @@
+<template>
+  <el-submenu v-if="item.children && item.children.length" :index="index" :key="item.funcId">
+    <template slot="title">
+      <span v-if="item.funcName" slot="title">{{ item.funcName }}</span>
+    </template>
+    <my-menu-item
+      v-for="(child, childIndex) in item.children"
+      :key="childIndex"
+      :item="child"
+      :index="index + '-' + childIndex"
+      @handle-select="handleSelect"
+    ></my-menu-item>
+  </el-submenu>
+  <el-menu-item v-else :index="item.funcUrl" :key="index" @click="handleSelect(item)">
+    <span v-if="item.funcName" slot="title" class="test">{{ item.funcName }}</span>
+  </el-menu-item>
+</template>
+
+<script>
+export default {
+  name: 'MyMenuItem',
+  props: {
+    item: {
+      type: Object,
+      required: true
+    },
+    index: {
+      type: String,
+      required: true
+    }
+  },
+  methods: {
+    handleSelect(item) {
+      this.$emit('handle-select', item);
+    }
+  }
+};
+</script>

src/page/ProcurementAndSales/components/monthlyReport.vue

@@ -100,7 +100,7 @@
               /> </el-form-item
           ></el-col>
           <el-col :span="8"
-            ><el-form-item label="采购金额">
+            ><el-form-item label="采购金额(元)">
               <el-input
                 class="title-box"
                 autocomplete="off"

src/page/StorehouseAnalyze/index.vue

@@ -0,0 +1,260 @@
+<template>
+  <!-- 廒间管理 -->
+  <div class="content-main">
+    <div class="search-bm-boder">
+      <el-row>
+        <el-form
+          :model="form"
+          label-width="80px"
+          ref="searchForm"
+          :inline="true"
+          class="demo-form-inline search-form"
+        >
+<!--          <el-form-item label="库区名称:" prop="storeName">-->
+<!--            <el-input />-->
+<!--          </el-form-item>-->
+          <el-form-item label="预警类型:" prop="warnType">
+            <el-input v-model="form.warnType" />
+          </el-form-item>
+          <div class="search-button">
+            <span class="search-line"></span>
+            <el-button
+              type="primary"
+              @click="search"
+              size="small"
+              class="iconfont iconchaxun"
+            >查询</el-button
+            >
+            <el-button
+              type="primary"
+              @click="reset('searchForm')"
+              size="small"
+              class="iconfont iconzhongzhi"
+            >重置</el-button
+            >
+          </div>
+        </el-form>
+      </el-row>
+    </div>
+
+    <el-table
+      :data="tableData"
+      border
+      stripe
+      highlight-current-row
+      v-loading="listLoading"
+      style="width: 100%"
+    >
+      <el-table-column
+        align="center"
+        type="index"
+        width="60"
+        label="序号"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="orgName"
+        label="库区名称"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="warnType"
+        label="违规类型"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="warnAct"
+        label="违规行为"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="warnTime"
+        label="预警时间"
+      ></el-table-column>
+    </el-table>
+    <!-- 分页开始 -->
+    <div class="pag-right clearFix">
+      <el-pagination
+        class="right"
+        :current-page.sync="limit.page"
+        :page-size="limit.size"
+        :page-sizes="[10, 20, 30, 40]"
+        :total="limit.total"
+        @current-change="handleCurrentChangeTask"
+        @size-change="handleSizeChangeTask"
+        layout="total, sizes, prev, pager, next, jumper"
+        v-if="paginationShow"
+      ></el-pagination>
+
+      <div id="chart" class="chart">
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  simpleList,
+  hasHouseName,
+  hasWareName,
+  hasOrgName,
+  houseAndWareQuery,
+} from "@/components/simpleList";
+import { granaryList, granaryRemove } from "@/api/base";
+import {getPageList, getChartList} from "@/api/storehouseAnalyze";
+import * as echarts from 'echarts'
+
+export default {
+  name: "StorehouseAnalyze",
+  mixins: [simpleList, hasHouseName, houseAndWareQuery],
+  components: { },
+  data() {
+    return {
+      form: {
+        warnType: null,
+
+      },
+      chartList: [],
+    };
+  },
+  computed: {},
+  methods: {
+    setUp() {
+      this.getChartData()
+    },
+    getChartData() {
+      getChartList(this.orgId).then(resp => {
+        console.log('图表数据', resp)
+        if(resp.retCode == '200') {
+          let list = resp.data || []
+          // list = [
+          //     {
+          //       "months": "1",
+          //       "currentYearMonth_1": null,
+          //       "monthCount_1": '10',
+          //       "currentYearMonth_2": null,
+          //       "monthCount_2": '20',
+          //       "currentYearMonth_3": null,
+          //       "monthCount_3": '30'
+          //     },
+          //     {
+          //       "months": "2",
+          //       "currentYearMonth_1": null,
+          //       "monthCount_1": '30',
+          //       "currentYearMonth_2": null,
+          //       "monthCount_2": '20',
+          //       "currentYearMonth_3": null,
+          //       "monthCount_3": '10'
+          //     },
+          //     {
+          //       "months": "3",
+          //       "currentYearMonth_1": null,
+          //       "monthCount_1": null,
+          //       "currentYearMonth_2": null,
+          //       "monthCount_2": null,
+          //       "currentYearMonth_3": null,
+          //       "monthCount_3": null
+          //     },
+          //     {
+          //       "months": "4",
+          //       "currentYearMonth_1": null,
+          //       "monthCount_1": null,
+          //       "currentYearMonth_2": null,
+          //       "monthCount_2": null,
+          //       "currentYearMonth_3": null,
+          //       "monthCount_3": null
+          //     },
+          //   ]
+          this.chartList = list
+        }
+        else {
+          this.chartList = []
+        }
+        this.drawLine(this.chartList)
+      })
+    },
+    drawLine(list) {
+      this.$nextTick(() => {
+        const xData = []
+        const list1 = []
+        const list2 = []
+        const list3 = []
+        const dataList = []
+        list.sort((a, b) => parseInt(a.months) - parseInt(b.months))
+        list.forEach(d => {
+          xData.push(`${d.months}月`)
+          const monthCount_1 = d.monthCount_1 ? parseInt(d.monthCount_1) : 0
+          const monthCount_2 = d.monthCount_2 ? parseInt(d.monthCount_2) : 0
+          const monthCount_3 = d.monthCount_3 ? parseInt(d.monthCount_3) : 0
+          list1.push(monthCount_1)
+          list2.push(monthCount_2)
+          list3.push(monthCount_3)
+        })
+        dataList.push({
+          name: `在库时间异常`,
+          type: 'bar',
+          data: list1
+        })
+        dataList.push({
+          name: `临近轮换期`,
+          type: 'bar',
+          data: list2
+        })
+        dataList.push({
+          name: `超架空期`,
+          type: 'bar',
+          data: list3
+        })
+        console.log('data', xData, dataList)
+        const options = {
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'shadow'
+            }
+          },
+          legend: {
+            data: ['在库时间异常', '临近轮换期', '超架空期']
+          },
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true
+          },
+          xAxis: {
+            type: 'category',
+            data: xData
+          },
+          yAxis: {
+            type: 'value'
+          },
+          series: dataList
+        }
+
+        echarts.init(document.getElementById('chart')).setOption(options);
+      })
+
+    },
+    getConstantsQuery() {
+      console.log('orgId = ', this.orgId)
+      return {
+        orgId: this.orgId,
+      };
+    },
+    // 列表接口
+    getListFun() {
+      return getPageList;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.chart {
+  margin-top: 10px;
+  width: 100%;
+  min-height: 600px;
+}
+</style>

src/page/StorehouseView/view1.vue

@@ -0,0 +1,37 @@
+<template>
+  <div class="view">
+    <el-image v-if="img" :src="img" style="width: 100%;"/>
+    <div v-else class="tips">
+      您还没有上传图片
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: "view1",
+  data() {
+    return {
+      img: null
+    }
+  },
+  mounted() {
+    const orgInfo = JSON.parse(sessionStorage.getItem('orgInfo'))
+    console.log('orgInfo', orgInfo)
+    this.img = orgInfo.birdsRemote
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.view {
+  width: 100%;
+  height: 100%;
+}
+.tips {
+  width: 100%;
+  min-height: 200px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>

src/page/StorehouseView/view2.vue

@@ -0,0 +1,37 @@
+<template>
+  <div class="view">
+    <el-image v-if="img" :src="img" style="width: 100%;"/>
+    <div v-else class="tips">
+      您还没有上传图片
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: "view1",
+  data() {
+    return {
+      img: null
+    }
+  },
+  mounted() {
+    const orgInfo = JSON.parse(sessionStorage.getItem('orgInfo'))
+    console.log('orgInfo', orgInfo)
+    this.img = orgInfo.birdsRemote
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.view {
+  width: 100%;
+  height: 100%;
+}
+.tips {
+  width: 100%;
+  min-height: 200px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>

src/page/alerting/cameraAlerting.vue

@@ -9,9 +9,10 @@
           :inline="true"
           class="demo-form-inline search-form"
         >
-          <el-form-item label="报警时间:" prop="beginDate">
+          <el-form-item label="报警时间:" prop="bjsj">
             <el-date-picker
-              v-model="form.beginDate"
+              v-model="form.bjsj"
+              value-format="yyyy-MM-dd"
               type="date">
             </el-date-picker>
           </el-form-item>
@@ -111,6 +112,7 @@
 
 import commonSelect from "@/components/common/commonSelect"
 import consumerAdd from '@/components/system/customer/customerAdd'
+import {getSxtgzsList} from "@/api/alerting";
 
 
 
@@ -129,9 +131,7 @@ export default {
       },
       tableData: [],
       form: {
-        type: null,
-        beginDate: null,
-        endDate: null,
+        bjsj: null,
       },
       paginationShow: true,
       listLoading: false,
@@ -143,14 +143,18 @@ export default {
   computed: {
 
   },
+  mounted() {
+    this.getList()
+  },
   methods: {
     search() {
-
+      this.getList()
     },
     reset(formName) {
       if(this.$refs[formName]) {
         this.$refs[formName].resetFields()
       }
+      this.getList()
     },
     add(inOut, notification) {
       this.inOutType = inOut
@@ -163,6 +167,25 @@ export default {
         this.listLoading = false
       })
     },
+    getList() {
+      this.listLoading = true
+      getSxtgzsList(this.limit, {orgId: this.orgId, ... this.form}).then(resp => {
+        if(resp && resp.retCode == '200' ) {
+          const data = resp.data
+          this.tableData = data.list
+          this.limit = {
+            page: data.pageNum,
+            size: data.pageSize,
+            total: data.total,
+          }
+        }else {
+          this.$message.error(resp.msg)
+        }
+
+      }).finally(() => {
+        this.listLoading = false
+      })
+    },
     manage(data) {
 
     },

src/page/alerting/circleGrainAlerting.vue

@@ -9,13 +9,14 @@
           :inline="true"
           class="demo-form-inline search-form"
         >
-          <el-form-item label="车牌号:" prop="name">
-            <el-input v-model="form.name" ></el-input>
+          <el-form-item label="车牌号:" prop="cphm">
+            <el-input v-model="form.cphm" ></el-input>
           </el-form-item>
-          <el-form-item label="日期:" prop="beginDate">
+          <el-form-item label="日期:" prop="date">
             <el-date-picker
-              v-model="form.beginDate"
+              v-model="form.date"
               type="daterange"
+              value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期">
@@ -141,9 +142,8 @@ export default {
       },
       tableData: [],
       form: {
-        type: null,
-        beginDate: null,
-        endDate: null,
+        cphm: null,
+        date: [],
       },
       paginationShow: true,
       listLoading: false,
@@ -182,7 +182,12 @@ export default {
     },
     getList() {
       this.listLoading = true
-      getZqlyjxxList(this.limit, {...this.form}).then(resp => {
+      const [startTime, endTime] = this.form.date
+      const q = {
+        startTime, endTime,
+        cphm: this.form.cphm
+      }
+      getZqlyjxxList(this.limit, {...q}).then(resp => {
         if (resp.code == '200') {
           const data = resp.data
           this.tableData = data.list

src/page/alerting/condensationAlerting.vue

@@ -13,13 +13,21 @@
             <el-button type="primary" size="small" icon="el-icon-printer" @click="print()">打印</el-button>
             <el-divider direction="vertical"></el-divider>
           </el-form-item>
-          <el-form-item label="仓房名称:" prop="cfmc">
-            <common-select v-model="form.cfmc" type="STOREHOUSE"></common-select>
+          <el-form-item label="仓房名称:" prop="cfbm">
+            <el-select v-model="form.cfbm" placeholder="请选择">
+              <el-option
+                v-for="item in houseOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="检查日期:" prop="beginDate">
+          <el-form-item label="检查日期:" prop="date">
             <el-date-picker
-              v-model="form.beginDate"
+              v-model="form.date"
               type="daterange"
+              value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期">
@@ -118,10 +126,10 @@ export default {
         total: 0
       },
       tableData: [],
+      houseOptions: [],
       form: {
-        cfmc: null,
-        beginDate: null,
-        endDate: null,
+        cfbm: null,
+        date: [],
       },
       paginationShow: true,
       listLoading: false,
@@ -134,6 +142,7 @@ export default {
     ...mapGetters(['userId', "orgId", 'userName', 'realName', 'orgCode']),
   },
   mounted() {
+    this.$systemUtils.getHouseOption(this.orgId).then(opt => this.houseOptions = opt)
     this.getList()
   },
   methods: {
@@ -160,7 +169,12 @@ export default {
     },
     getList() {
       this.listLoading = true
-      getDewingAlarmList(this.limit, { ... this.form}).then(resp => {
+      const [searchStartDate, searchEndDate] = this.form.date
+      const q = {
+        searchStartDate, searchEndDate,
+        cfbm: this.form.cfbm
+      }
+      getDewingAlarmList(this.limit, { ... q}).then(resp => {
         this.tableData = resp.list
         this.limit = {
           page: resp.pageNum,

src/page/alerting/deviceAbnormalAlerting.vue

@@ -13,13 +13,21 @@
             <el-button type="primary" size="small" icon="el-icon-printer" @click="print()">打印</el-button>
             <el-divider direction="vertical"></el-divider>
           </el-form-item>
-          <el-form-item label="仓房名称:" prop="name">
-            <common-select v-model="form.name" type="STOREHOUSE"></common-select>
+          <el-form-item label="仓房名称:" prop="vCfCode">
+            <el-select v-model="form.vCfCode" placeholder="请选择">
+              <el-option
+                v-for="item in houseOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.raw.storehouseCode">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="检查日期:" prop="beginDate">
+          <el-form-item label="检查日期:" prop="date">
             <el-date-picker
-              v-model="form.beginDate"
+              v-model="form.date"
               type="daterange"
+              value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期">
@@ -115,6 +123,7 @@
 
 import commonSelect from "@/components/common/commonSelect"
 import consumerAdd from '@/components/system/customer/customerAdd'
+import {getAbnormalEquipmentList} from "@/api/alerting";
 
 
 
@@ -132,10 +141,10 @@ export default {
         total: 0
       },
       tableData: [],
+      houseOptions: [],
       form: {
-        name: null,
-        beginDate: null,
-        endDate: null,
+        vCfCode: null,
+        date: [],
       },
       paginationShow: true,
       listLoading: false,
@@ -147,20 +156,44 @@ export default {
   computed: {
 
   },
+  mounted() {
+    this.$systemUtils.getHouseOption(this.orgId).then(opt => this.houseOptions = opt)
+    this.getList()
+  },
   methods: {
     search() {
-
+      this.getList()
     },
     reset(formName) {
       if(this.$refs[formName]) {
         this.$refs[formName].resetFields()
       }
+      this.getList()
     },
     add(inOut, notification) {
       this.inOutType = inOut
       this.notificationType = notification
       this.addShow = true
     },
+
+    getList() {
+      this.listLoading = true
+      const [searchStartDate, searchEndDate] = this.form.date
+      const q = {
+        searchStartDate, searchEndDate,
+        vCfCode: this.form.vCfCode
+      }
+      getAbnormalEquipmentList(this.limit, { ... q}).then(resp => {
+        this.tableData = resp.list
+        this.limit = {
+          page: resp.pageNum,
+          size: resp.pageSize,
+          total: resp.total,
+        }
+      }).finally(() => {
+        this.listLoading = false
+      })
+    },
     print() {
       this.listLoading = true
       this.$systemUtils.printTable(this.$refs.table.$el).finally(() => {

src/page/alerting/humidityAlerting.vue

@@ -13,13 +13,21 @@
             <el-button type="primary" size="small" icon="el-icon-printer" @click="print()">打印</el-button>
             <el-divider direction="vertical"></el-divider>
           </el-form-item>
-          <el-form-item label="仓房名称:" prop="name">
-            <common-select v-model="form.name" type="STOREHOUSE"></common-select>
+          <el-form-item label="仓房名称:" prop="cfbm">
+            <el-select v-model="form.cfbm" placeholder="请选择">
+              <el-option
+                v-for="item in houseOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="检查日期:" prop="beginDate">
+          <el-form-item label="检查日期:" prop="date">
             <el-date-picker
-              v-model="form.beginDate"
+              v-model="form.date"
               type="daterange"
+              value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期">
@@ -115,6 +123,7 @@
 
 import commonSelect from "@/components/common/commonSelect"
 import consumerAdd from '@/components/system/customer/customerAdd'
+import { getHumidnessAlarmList} from "@/api/alerting";
 
 
 
@@ -132,10 +141,10 @@ export default {
         total: 0
       },
       tableData: [],
+      houseOptions: [],
       form: {
-        name: null,
-        beginDate: null,
-        endDate: null,
+        cfbm: null,
+        date: [],
       },
       paginationShow: true,
       listLoading: false,
@@ -147,20 +156,45 @@ export default {
   computed: {
 
   },
+  mounted() {
+    this.$systemUtils.getHouseOption(this.orgId).then(opt => this.houseOptions = opt)
+    this.getList()
+  },
   methods: {
     search() {
-
+      this.getList()
     },
     reset(formName) {
       if(this.$refs[formName]) {
         this.$refs[formName].resetFields()
       }
+      this.getList()
     },
     add(inOut, notification) {
       this.inOutType = inOut
       this.notificationType = notification
       this.addShow = true
     },
+    getList() {
+      this.listLoading = true
+      const [searchStartDate, searchEndDate] = this.form.date
+      const q = {
+        searchStartDate, searchEndDate,
+        cfbm: this.form.cfbm
+      }
+      getHumidnessAlarmList(this.limit, { ... q}).then(resp => {
+        this.tableData = resp.list || []
+        if(resp.pageNumb) {
+          this.limit = {
+            page: resp.pageNum,
+            size: resp.pageSize,
+            total: resp.total,
+          }
+        }
+      }).finally(() => {
+        this.listLoading = false
+      })
+    },
     print() {
       this.listLoading = true
       this.$systemUtils.printTable(this.$refs.table.$el).finally(() => {

src/page/alerting/illegalAlerting.vue

@@ -9,13 +9,14 @@
           :inline="true"
           class="demo-form-inline search-form"
         >
-          <el-form-item label="违规类型:" prop="name">
-            <common-select v-model="form.name" type="ILLEGAL_TYPE"></common-select>
+          <el-form-item label="违规类型:" prop="violationType">
+            <common-select v-model="form.violationType" type="ILLEGAL_TYPE"></common-select>
           </el-form-item>
-          <el-form-item label="预警时间:" prop="beginDate">
+          <el-form-item label="预警时间:" prop="date">
             <el-date-picker
-              v-model="form.beginDate"
+              v-model="form.date"
               type="daterange"
+              value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期">
@@ -147,9 +148,8 @@ export default {
       },
       tableData: [],
       form: {
-        name: null,
-        beginDate: null,
-        endDate: null,
+        violationType: null,
+        date: [],
       },
       paginationShow: true,
       listLoading: false,
@@ -195,7 +195,12 @@ export default {
     },
     getList() {
       this.listLoading = true
-      violationWarningAlarmList(this.limit, {orgId: this.orgId, ... this.form}).then(resp => {
+      const [startDate, endDate] = this.form.date
+      const q = {
+        startDate, endDate,
+        violationType: this.form.violationType
+      }
+      violationWarningAlarmList(this.limit, {orgId: this.orgId, ... q}).then(resp => {
         if(resp.retCode == '200' ) {
           const data = resp.data
           this.tableData = data.list

src/page/alerting/innerControlAlerting.vue

@@ -9,10 +9,11 @@
           :inline="true"
           class="demo-form-inline search-form"
         >
-          <el-form-item label="日期:" prop="beginDate">
+          <el-form-item label="日期:" prop="date">
             <el-date-picker
-              v-model="form.beginDate"
+              v-model="form.date"
               type="daterange"
+              value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期">
@@ -113,9 +114,7 @@ export default {
       },
       tableData: [],
       form: {
-        name: null,
-        beginDate: null,
-        endDate: null,
+        date: []
       },
       paginationShow: true,
       listLoading: false,
@@ -154,7 +153,11 @@ export default {
     },
     getList() {
       this.listLoading = true
-      contentPreControlAlarmList(this.limit, {orgId: this.orgId, ... this.form}).then(resp => {
+      const [startDate, endDate] = this.form.date
+      const q = {
+        startDate, endDate
+      }
+      contentPreControlAlarmList(this.limit, {orgId: this.orgId, ... q}).then(resp => {
         if(resp.retCode == '200' ) {
           const data = resp.data
           this.tableData = data.list

src/page/alerting/inspectionReportAlerting.vue

@@ -9,8 +9,8 @@
           :inline="true"
           class="demo-form-inline search-form"
         >
-          <el-form-item label="仓房名称:" prop="name">
-            <el-input v-model="form.name"></el-input>
+          <el-form-item label="仓房名称:" prop="cfmc">
+            <el-input v-model="form.cfmc"></el-input>
           </el-form-item>
 
           <div class="search-button">
@@ -140,10 +140,7 @@ export default {
       },
       tableData: [],
       form: {
-        name: null,
-        type: null,
-        beginDate: null,
-        endDate: null,
+        cfmc: null,
       },
       paginationShow: true,
       listLoading: false,

src/page/alerting/intelligentAnalysisAlerting.vue

@@ -9,12 +9,13 @@
           :inline="true"
           class="demo-form-inline search-form"
         >
-          <el-form-item label="报警类别:" prop="type">
-            <el-input v-model="form.type"></el-input>
+          <el-form-item label="报警类别:" prop="alarmTypeName">
+            <el-input v-model="form.alarmTypeName"></el-input>
           </el-form-item>
-          <el-form-item label="报警时间:" prop="beginDate">
+          <el-form-item label="报警时间:" prop="alarmTime">
             <el-date-picker
-              v-model="form.beginDate"
+              value-format="yyyy-MM-dd"
+              v-model="form.alarmTime"
               type="date">
             </el-date-picker>
           </el-form-item>
@@ -114,6 +115,7 @@
 
 import commonSelect from "@/components/common/commonSelect"
 import consumerAdd from '@/components/system/customer/customerAdd'
+import {getOldPageList, } from "@/api/alerting";
 
 
 
@@ -132,9 +134,8 @@ export default {
       },
       tableData: [],
       form: {
-        type: null,
-        beginDate: null,
-        endDate: null,
+        alarmTypeName: null,
+        alarmTime: null,
       },
       paginationShow: true,
       listLoading: false,
@@ -146,20 +147,43 @@ export default {
   computed: {
 
   },
+  mounted() {
+    this.getList()
+  },
   methods: {
     search() {
-
+      this.getList()
     },
     reset(formName) {
       if(this.$refs[formName]) {
         this.$refs[formName].resetFields()
       }
+      this.getList()
     },
     add(inOut, notification) {
       this.inOutType = inOut
       this.notificationType = notification
       this.addShow = true
     },
+    getList() {
+      this.listLoading = true
+      getOldPageList(this.limit, {orgId: this.orgId, ... this.form}).then(resp => {
+        if(resp.retCode == '200' ) {
+          const data = resp.data
+          this.tableData = data.list
+          this.limit = {
+            page: data.pageNum,
+            size: data.pageSize,
+            total: data.total,
+          }
+        }else {
+          this.$message.error(resp.msg)
+        }
+
+      }).finally(() => {
+        this.listLoading = false
+      })
+    },
     print() {
       this.listLoading = true
       this.$printElement(this.$refs.table.$el).finally(() => {

src/page/alerting/inventoryEmptyAlerting.vue

@@ -14,10 +14,10 @@
             <el-divider direction="vertical"></el-divider>
           </el-form-item>
           <el-form-item label="仓房名称:" prop="cfmc">
-            <common-select v-model="form.cfmc" type="STOREHOUSE"></common-select>
+            <el-input v-model="form.cfmc" />
           </el-form-item>
-          <el-form-item label="仓房状态:" prop="cfmc">
-            <common-select v-model="form.cfmc" type="STOREHOUSE_STATUS"></common-select>
+          <el-form-item label="仓房状态:" prop="cfzt">
+            <common-select v-model="form.cfzt" type="STOREHOUSE_STATUS"></common-select>
           </el-form-item>
 
           <div class="search-button">
@@ -131,10 +131,10 @@ export default {
         total: 0
       },
       tableData: [],
+      houseOptions: [],
       form: {
         cfmc: null,
-        beginDate: null,
-        endDate: null,
+        cfzt: null,
       },
       paginationShow: true,
       listLoading: false,
@@ -147,6 +147,7 @@ export default {
     ...mapGetters(['userId', "orgId", 'userName', 'realName', 'orgCode']),
   },
   mounted() {
+    this.$systemUtils.getHouseOption(this.orgId).then(opt => this.houseOptions = opt)
     this.getList()
   },
   methods: {

src/page/alerting/inventoryOverrunsAlerting.vue

@@ -11,7 +11,7 @@
         >
 
           <el-form-item label="仓房名称:" prop="cfmc">
-            <common-select v-model="form.cfmc" type="STOREHOUSE"></common-select>
+            <el-input v-model="form.cfmc" />
           </el-form-item>
 
           <div class="search-button">

src/page/alerting/overheadAlerting.vue

@@ -9,8 +9,8 @@
           :inline="true"
           class="demo-form-inline search-form"
         >
-          <el-form-item label="协议编号:" prop="type">
-            <el-input v-model="form.type"></el-input>
+          <el-form-item label="协议编号:" prop="xybh">
+            <el-input v-model="form.xybh"></el-input>
           </el-form-item>
           <div class="search-button">
             <span class="search-line"></span>
@@ -145,9 +145,7 @@ export default {
       },
       tableData: [],
       form: {
-        type: null,
-        beginDate: null,
-        endDate: null,
+        xybh: null,
       },
       paginationShow: true,
       listLoading: false,

src/page/alerting/storageOverrunAlerting.vue

@@ -11,10 +11,10 @@
         >
 
           <el-form-item label="仓房名称:" prop="cfmc">
-            <common-select v-model="form.cfmc" type="STOREHOUSE"></common-select>
+            <el-input v-model="form.cfmc" />
           </el-form-item>
-          <el-form-item label="品种明细:" prop="cfmc">
-            <common-select v-model="form.cfmc" type="GRAIN_TYPE"></common-select>
+          <el-form-item label="品种明细:" prop="pzbm">
+            <common-select v-model="form.pzbm" type="lsmxpz" :remote="true"></common-select>
           </el-form-item>
 
           <div class="search-button">
@@ -142,6 +142,7 @@ export default {
       tableData: [],
       form: {
         cfmc: null,
+        pzbm: null,
       },
       paginationShow: true,
       listLoading: false,

src/page/alerting/temperatureMeasurementPoint.vue

@@ -9,9 +9,10 @@
           :inline="true"
           class="demo-form-inline search-form"
         >
-          <el-form-item label="报警日期:" prop="searchStartDate">
+          <el-form-item label="报警日期:" prop="bjsj">
             <el-date-picker
-              v-model="form.searchStartDate"
+              v-model="form.bjsj"
+              value-format="yyyy-MM-dd"
               type="date">
             </el-date-picker>
           </el-form-item>
@@ -108,9 +109,7 @@ export default {
       },
       tableData: [],
       form: {
-        cfbm: null,
-        searchEndDate: null,
-        searchStartDate: null,
+        bjsj: null,
       },
       paginationShow: true,
       listLoading: false,

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

@@ -96,7 +96,7 @@
 
           <el-col :span="8">
             <el-form-item label="货位编号" prop="warehouseCode">
-              <el-input v-model="form.warehouseCode" :readonly="readonly" />
+              <el-input v-model="form.warehouseCode" :readonly="readonly" @change="checkWareCode"/>
             </el-form-item>
           </el-col>
 
@@ -367,7 +367,20 @@ export default {
         fileIds: '[]',
       };
     },
-
+    checkWareCode() {
+      if(this.form.storehouseId && this.form.warehouseCode) {
+        findWareCode({
+          storehouseId: this.form.storehouseId,
+          warehouseCode: this.form.warehouseCode,
+          orgId: this.orgId,
+        }).then((resp) => {
+          if(resp == 0) {
+            this.form.warehouseCode = null
+            return this.$message.error('货位编号已存在')
+          }
+        })
+      }
+    },
     save() {
 
       console.log("data", this.form);

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/comprehensiveSearch/comprehensiveSearchInsect.vue

@@ -10,14 +10,21 @@
           class="demo-form-inline search-form"
         >
 
-          <el-form-item label="仓房名称:" prop="contractsId">
-            <common-select type="STOREHOUSE" class="small-field"></common-select>
+          <el-form-item label="仓房名称:" prop="vCfCode">
+            <el-select v-model="form.vCfCode" placeholder="请选择">
+              <el-option
+                v-for="item in houseOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.raw.storehouseCode">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="开始通道:" prop="status">
-            <el-input class="small-field"></el-input>
+          <el-form-item label="开始通道:" prop="iBeginTdh">
+            <el-input v-model="form.iBeginTdh" class="small-field"></el-input>
           </el-form-item>
-          <el-form-item label="结束通道:" prop="status">
-            <el-input class="small-field"></el-input>
+          <el-form-item label="结束通道:" prop="iEndTdh">
+            <el-input v-model="form.iEndTdh" class="small-field"></el-input>
           </el-form-item>
           <div class="search-button">
             <span class="search-line"></span>
@@ -44,50 +51,42 @@
       <el-table-column label="序号" type="index" align="center" width="60"></el-table-column>
       <el-table-column
         align="center"
-        :show-overflow-tooltip="true"
-        prop="contractId"
+        prop="vcfcode"
         label="仓房名称"
       ></el-table-column>
       <el-table-column
         align="center"
-        :show-overflow-tooltip="true"
-        prop="contractType"
+        prop="vhwid"
         label="货位名称"
       ></el-table-column>
       <el-table-column
         align="center"
-        :show-overflow-tooltip="true"
-        prop="storehouseName"
+        prop="standor"
         label="扦样人"
       ></el-table-column>
       <el-table-column
         align="center"
-        :show-overflow-tooltip="true"
-        prop="positionName"
+        prop="standtime"
         label="扦样时间"
       ></el-table-column>
       <el-table-column
         align="center"
-        :show-overflow-tooltip="true"
-        prop="count"
+        prop="hcjcdh"
         label="害虫种类"
       ></el-table-column>
       <el-table-column
         align="center"
-        :show-overflow-tooltip="true"
-        prop="price"
+        prop="ckmdzjh"
         label="虫情(个)"
       ></el-table-column>
       <el-table-column
         align="center"
-        :show-overflow-tooltip="true"
-        prop="totalCost"
+        prop="vupdatepeople"
         label="检测人"
       ></el-table-column>
       <el-table-column
         align="center"
-        :show-overflow-tooltip="true"
-        prop="totalCost"
+        prop="vupdatetime"
         label="检测时间"
       ></el-table-column>
       <el-table-column label="操作" align="center" width="80">
@@ -129,51 +128,33 @@
 <script>
 
 import commonSelect from "@/components/common/commonSelect"
+import {simpleList, houseAndWareQuery} from "@/components/simpleList";
+import {insectPestDetectionList} from "@/api/comprehensiveSearch";
 export default {
   name: "comprehensiveSearchInsect",
+  mixins: [simpleList, houseAndWareQuery],
   components: {
     commonSelect
   },
   data() {
     return {
-      limit: {
-        page: 1,
-        size: 10,
-        total: 0
-      },
-      tableData: [],
+
       form: {
-        contractsId: null,
-        status: null,
+        iBeginTdh: null,
+        iEndTdh: null,
+        vCfCode: null,
       },
-      paginationShow: true,
-      listLoading: false,
-      addShow: false,
     }
   },
   computed: {
 
   },
   methods: {
-    search() {
-
-    },
-    reset(formName) {
-      if(this.$refs[formName]) {
-        this.$refs[formName].resetFields()
-      }
-    },
-    add() {
-      this.addShow = true
+    setUp() {
+      this.initHouseOptions()
     },
-    manage(data) {
-
-    },
-    handleCurrentChangeTask() {
-
-    },
-    handleSizeChangeTask() {
-
+    getListFun() {
+      return insectPestDetectionList
     }
   }
 }

src/page/comprehensiveSearch/comprehensiveSearchWarning.vue

@@ -15,7 +15,7 @@
 <!--          </el-form-item>-->
 
 <!--          <el-form-item label="仓房名称:" prop="contractsId">-->
-<!--            <common-select type="STOREHOUSE" class="small-field"></common-select>-->
+<!--            <common-select  class="small-field"></common-select>-->
 <!--          </el-form-item>-->
 <!--          <el-form-item label="检测时间:" prop="status">-->
 <!--            <el-date-picker type="daterange" style="width: 220px;"></el-date-picker>-->

src/page/customerManagement/customerArchives.vue

@@ -79,10 +79,16 @@
           <span :style="{color: blackColor(scope.row)}">{{scope.row.isInBlacklist == 0 ? '否' : '是'}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="280">
+      <el-table-column label="操作" align="center" width="380">
         <template v-slot="scope">
           <el-button
             type="primary"
+            @click="view(scope.row)"
+            size="small"
+            icon="el-icon-edit"
+          >查看</el-button>
+          <el-button
+            type="primary"
             @click="edit(scope.row)"
             size="small"
             icon="el-icon-edit"
@@ -219,6 +225,11 @@ export default {
         this.getList()
       })
     },
+    view(data) {
+      this.action = 'view'
+      this.editId = data.id
+      this.addShow = true
+    },
     edit(data) {
       this.action = 'edit'
       this.editId = data.id

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/deviceManagement/inventory.vue

@@ -13,13 +13,21 @@
             <el-button type="primary" size="small" icon="el-icon-plus" @click="add()">新建盘点单</el-button>
             <el-divider direction="vertical"></el-divider>
           </el-form-item>
-          <el-form-item label="盘点单号:" prop="name">
-            <common-select v-model="form.name" type="STOREHOUSE"></common-select>
+          <el-form-item label="盘点单号:" prop="pdNum">
+            <el-select v-model="form.pdNum" placeholder="请选择" >
+              <el-option
+                v-for="item in noOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="盘点时间:" prop="beginDate">
+          <el-form-item label="盘点时间:" prop="date">
             <el-date-picker
-              v-model="form.beginDate"
+              v-model="form.date"
               type="daterange"
+              value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期">
@@ -103,7 +111,7 @@
 
 import commonSelect from "@/components/common/commonSelect"
 import edit from "./components/inventoryEdit.vue";
-import {deviceCheckList} from "@/api/deviceManagement";
+import {deviceCheckList, getCheckListNoPage} from "@/api/deviceManagement";
 import {mapGetters} from "vuex";
 
 
@@ -120,11 +128,11 @@ export default {
         size: 10,
         total: 0
       },
+      noOptions: [],
       tableData: [],
       form: {
-        name: null,
-        beginDate: null,
-        endDate: null,
+        pdNum: null,
+        date: [],
       },
       paginationShow: true,
       listLoading: false,
@@ -144,6 +152,7 @@ export default {
     }
   },
   mounted() {
+    this.getNoOptions()
     this.getList()
   },
   methods: {
@@ -212,9 +221,26 @@ export default {
         this.submitData = null
       })
     },
+    getNoOptions() {
+      this.noOptions = []
+      return getCheckListNoPage().then(resp => {
+        const list = resp || []
+        this.noOptions = list.map(d => {
+          return {
+            label: d.checkNumber,
+            value: d.checkNumber,
+          }
+        })
+      })
+    },
     getList() {
       this.listLoading = true
-      deviceCheckList(this.limit, { orgId: this.orgId, ... this.form }).then(resp => {
+      const [starttime, endtime] = this.form.date
+      const q = {
+        starttime, endtime,
+        pdNum: this.form.pdNum,
+      }
+      deviceCheckList(this.limit, { orgId: this.orgId, ... q }).then(resp => {
         const list = resp.list || []
         this.tableData = list
         this.limit = {

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

@@ -133,7 +133,7 @@
 
 import commonSelect from "@/components/common/commonSelect"
 import edit from "./components/baseInfoEdit"
-import {facilitiesList, facilitiesBasicsSave, facilitiesBasicsRemove} from "@/api/facilitiesManagement";
+import {facilitiesList, facilitiesBasicsSave, facilitiesBasicsRemove, facilitiesBasicsScrap} from "@/api/facilitiesManagement";
 import {mapGetters} from "vuex";
 
 export default {
@@ -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_____')
       }
-      facilitiesBasicsSave({dFacilitiesBasicsJson: JSON.stringify(d)}).then(resp => {
+      facilitiesBasicsScrap(d).then(resp => {
         if(resp.status === 'success') {
           this.$message.success('已报废')
           this.getList()

src/page/grainCard/components/grainCardEdit.vue

@@ -574,6 +574,9 @@ export default {
       if(this.editData) {
         d.id = this.editData.id
       }
+      if(list1.length > 0) {
+        d.checkRecordIds = list1.map(d => d.id).join(',')
+      }
       this.$systemUtils.parseField2Float(d, [
         'outQuantity', 'excessLossQuantity', 'volume', 'siloInnerDiameter', 'length', 'width',
         'flatStorageHeight', 'trapezoidUpperLength', 'trapezoidLowerLength', 'siloGrainHeight',

src/page/grainCountManagement/carInOut.vue

@@ -9,19 +9,33 @@
           :inline="true"
           class="demo-form-inline search-form"
         >
-          <el-form-item label="仓房名称:" prop="name">
-            <common-select type="STOREHOUSE"></common-select>
+          <el-form-item label="仓房名称:" prop="houseId">
+            <el-select v-model="form.houseId" placeholder="请选择" @change="houseChanged">
+              <el-option
+                v-for="item in houseOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="货位名称:" prop="name">
-            <common-select type="STOREHOUSE1"></common-select>
+          <el-form-item label="货位名称:" prop="warehouseId">
+            <el-select v-model="form.warehouseId" placeholder="请选择">
+              <el-option
+                v-for="item in wareOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="业务类型:" prop="name">
-            <common-select type="IN_OUT_TYPE_2"></common-select>
+          <el-form-item label="业务类型:" prop="cazylx">
+            <common-select v-model="form.cazylx" type="IN_OUT_TYPE_2"></common-select>
           </el-form-item>
-          <el-form-item label="粮油品种:" prop="name">
-            <common-select type="GRAIN_TYPE"></common-select>
+          <el-form-item label="粮油品种:" prop="pz">
+            <common-select v-model="form.pz" type="lsmxpz" :remote="true" :get-name="true"></common-select>
           </el-form-item>
-          <el-form-item label="出入库日期:" prop="name">
+          <el-form-item label="出入库日期:" prop="date">
             <el-date-picker
               v-model="form.date"
               type="daterange"
@@ -154,11 +168,15 @@ export default {
         total: 0
       },
       tableData: [],
+      houseOptions: [],
+      wareOptions: [],
       storehouseNameIdMap: {},
       form: {
-        type: null,
-        status: null,
-        name: null,
+        houseId: null,
+        warehouseId: null,
+        cazylx: null,
+        pz: null,
+        date: [],
       },
       paginationShow: true,
       listLoading: false,
@@ -171,6 +189,7 @@ export default {
     ...mapGetters(['userId', "orgId", 'userName', 'realName']),
   },
   mounted() {
+    this.$systemUtils.getHouseOption(this.orgId).then(opt => this.houseOptions = opt)
     this.getList()
   },
   methods: {
@@ -215,7 +234,15 @@ export default {
     },
     getList() {
       this.listLoading = true
-      getQcCrkPageList(this.limit, {orgid: this.orgId, ... this.form}).then(resp => {
+      const [beginDate, endDate] = this.form.date
+      const q = {
+        beginDate, endDate,
+        houseId: this.form.houseId,
+        warehouseId: this.form.warehouseId,
+        cazylx: this.form.cazylx,
+        pz: this.form.pz,
+      }
+      getQcCrkPageList(this.limit, {orgid: this.orgId, ... q}).then(resp => {
         const list = resp.list || []
         this.tableData = list
         this.limit = {
@@ -232,6 +259,18 @@ export default {
         this.listLoading = false
       })
     },
+    getWareOptions(houseId) {
+      this.wareOptions = []
+      this.$systemUtils.getWarehouseOption(this.orgId, houseId).then(opt => this.wareOptions = opt)
+    },
+    houseChanged(n) {
+      this.form.warehouseId = null
+      if(n) {
+        this.getWareOptions(n)
+      }else {
+        this.wareOptions = []
+      }
+    },
     handleCurrentChangeTask(page) {
       this.limit.page = page
       this.getList()

src/page/grainCountManagement/index.vue

@@ -9,14 +9,28 @@
           :inline="true"
           class="demo-form-inline search-form"
         >
-          <el-form-item label="仓房名称:" prop="name">
-            <common-select type="STOREHOUSE"></common-select>
+          <el-form-item label="仓房名称:" prop="ch">
+            <el-select v-model="form.ch" placeholder="请选择"  @change="houseChanged">
+              <el-option
+                v-for="item in houseOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="货位名称:" prop="name">
-            <common-select type="STOREHOUSE1"></common-select>
+          <el-form-item label="货位名称:" prop="hwh">
+            <el-select v-model="form.hwh" placeholder="请选择" >
+              <el-option
+                v-for="item in wareOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="粮油品种:" prop="name">
-            <common-select type="GRAIN_TYPE"></common-select>
+          <el-form-item label="粮油品种:" prop="pz">
+            <common-select v-model="form.pz" type="lsmxpz" :remote="true"></common-select>
           </el-form-item>
           <div class="search-button">
             <span class="search-line"></span>
@@ -148,13 +162,15 @@ export default {
         total: 0
       },
       tableData: [],
+      houseOptions: [],
+      wareOptions: [],
       orgNameIdMap: {},
       storehouseNameIdMap: {},
       warehouseNameIdMap: {},
       form: {
-        type: null,
-        status: null,
-        name: null,
+        ch: null,
+        hwh: null,
+        pz: null,
       },
       paginationShow: true,
       listLoading: false,
@@ -167,9 +183,26 @@ export default {
     ...mapGetters(['userId', "orgId", 'userName', 'realName']),
   },
   mounted() {
+    this.getHouseOptions()
     this.getList()
   },
   methods: {
+    getHouseOptions() {
+      this.houseOptions = []
+      this.$systemUtils.getHouseOption(this.orgId).then(opt => this.houseOptions = opt)
+    },
+    getWareOptions(houseId) {
+      this.wareOptions = []
+      this.$systemUtils.getWarehouseOption(this.orgId, houseId).then(opt => this.wareOptions = opt)
+    },
+    houseChanged(n) {
+      if(n) {
+        this.getWareOptions(n)
+      }else {
+        this.wareOptions = []
+        this.form.hwh = null
+      }
+    },
     search() {
       this.getList()
     },
@@ -212,9 +245,9 @@ export default {
     getList() {
       this.listLoading = true
       const query = {
-        ch: null,
-        hwh: null,
-        pz: null,
+        ch: this.form.ch,
+        hwh: this.form.hwh,
+        pz: this.form.pz,
         unitid: this.orgId,
       }
       kcswList(this.limit, {kcswStr: JSON.stringify(query)}).then(resp => {

src/page/intelligentStorage/components/deviceControlEdit.vue

@@ -4,18 +4,18 @@
       <el-divider>明细信息</el-divider>
       <el-form ref="editForm" :model="form" :rules="rules" label-width="150px">
         <el-row type="flex" align="middle" justify="center" class="row">
-          <el-col :span="8">
-            <el-form-item label="企业名称" prop="companyCode">
-              <el-select v-model="form.companyCode" clearable placeholder="请选择" :disabled="readonly" @change="comChanged">
-                <el-option
-                  v-for="item in comOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="企业名称" prop="companyCode">-->
+<!--              <el-select v-model="form.companyCode" clearable placeholder="请选择" :disabled="readonly" @change="comChanged">-->
+<!--                <el-option-->
+<!--                  v-for="item in comOptions"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="8">
             <el-form-item label="库区名称" prop="orgName">
               <el-input :value="form.orgName" readonly />
@@ -26,14 +26,15 @@
               <el-input v-model="form.devName" :readonly="readonly" />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="仪器代码" prop="devCode">
               <el-input v-model="form.devCode" :readonly="readonly" />
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row type="flex" align="middle" justify="center" class="row">
+
           <el-col :span="8">
             <el-form-item label="规格型号" prop="ggxh">
               <el-input v-model="form.ggxh" :readonly="readonly" />
@@ -44,14 +45,15 @@
               <el-input v-model="form.sccj" :readonly="readonly" />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="生产日期" prop="scrq">
               <el-date-picker v-model="form.scrq" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :readonly="readonly"></el-date-picker>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row type="flex" align="middle" justify="center" class="row">
+
           <el-col :span="8">
             <el-form-item label="设备描述" prop="sbms">
               <el-input v-model="form.sbms" :readonly="readonly" />
@@ -62,14 +64,15 @@
               <el-input v-model="form.sbzt" :readonly="readonly" />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="检定时间" prop="jdsj">
               <el-date-picker v-model="form.jdsj" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :readonly="readonly"></el-date-picker>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row type="flex" align="middle" justify="center" class="row">
+
           <el-col :span="8">
             <el-form-item label="检定单位" prop="jddw">
               <el-input v-model="form.jddw" :readonly="readonly" />
@@ -80,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>
@@ -117,8 +121,8 @@ export default {
       house: null,
       comOptions: [],
       defaultForm: {
-        companyCode: null, // string 企业编码
-        companyName: null, // string 企业名称
+        // companyCode: null, // string 企业编码
+        // companyName: null, // string 企业名称
         devCode: null, // string 设备编号
         devName: null, // string 设备名称
         ggxh: null, // string 规格型号

src/page/intelligentStorage/components/fumigationJobEdit.vue

@@ -118,17 +118,20 @@
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="常规熏蒸方式" prop="cgxzfs">
-              <el-input v-model="form.cgxzfs" :readonly="readonly"/>
+              <common-select v-model="form.cgxzfs" type="CGXZFS" :readonly="readonly"/>
+<!--              <el-input v-model="form.cgxzfs" :readonly="readonly"/>-->
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="环流熏蒸方式" prop="hlxzfs">
-              <el-input v-model="form.hlxzfs" :readonly="readonly"/>
+              <common-select v-model="form.hlxzfs" type="HLXZFS" :readonly="readonly"/>
+<!--              <el-input v-model="form.hlxzfs" :readonly="readonly"/>-->
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="环流熏蒸与内环流技术结合" prop="hlxzynhljsjh">
-              <el-input v-model="form.hlxzynhljsjh" :readonly="readonly"/>
+              <common-select v-model="form.hlxzynhljsjh" type="HLXZNHLJS" :readonly="readonly"/>
+<!--              <el-input v-model="form.hlxzynhljsjh" :readonly="readonly"/>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -185,12 +188,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="浓度" prop="nd">
+            <el-form-item label="浓度(%)" prop="nd">
               <el-input v-model="form.nd" :readonly="readonly"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="粮堆单位用药量" prop="dldwyyl">
+            <el-form-item label="粮堆单位用药量(g/m³)" prop="dldwyyl">
               <el-input v-model="form.dldwyyl" :readonly="readonly"/>
             </el-form-item>
           </el-col>
@@ -198,18 +201,19 @@
 
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
-            <el-form-item label="空间单位用药量" prop="kjdwyyl">
+            <el-form-item label="空间单位用药量(g/m³)" prop="kjdwyyl">
               <el-input v-model="form.kjdwyyl" :readonly="readonly"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="总用药量" prop="zyl">
+            <el-form-item label="总用药量(kg)" prop="zyl">
               <el-input v-model="form.zyl" :readonly="readonly"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="施药方法" prop="syff">
-              <el-input v-model="form.syff" :readonly="readonly"/>
+              <common-select v-model="form.syff" type="SYFF" :readonly="readonly"/>
+<!--              <el-input v-model="form.syff" :readonly="readonly"/>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -279,7 +283,7 @@
 
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
-            <el-form-item label="散气持续天数" prop="sqcxts">
+            <el-form-item label="散气持续天数(天)" prop="sqcxts">
               <el-input v-model.number="form.sqcxts" :readonly="readonly" />
             </el-form-item>
           </el-col>
@@ -336,17 +340,17 @@
 
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
-            <el-form-item label="熏蒸后虫口密度" prop="xzhckmd">
+            <el-form-item label="熏蒸后虫口密度(头/kg)" prop="xzhckmd">
               <el-input v-model.number="form.xzhckmd" :readonly="readonly" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="培养15天后活虫数" prop="py15Thhcs">
+            <el-form-item label="培养15天后活虫数(头/kg)" prop="py15Thhcs">
               <el-input v-model.number="form.py15Thhcs" :readonly="readonly" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="培养45天后活虫数" prop="py45Thhcs">
+            <el-form-item label="培养45天后活虫数(头/kg)" prop="py45Thhcs">
               <el-input v-model.number="form.py45Thhcs" :readonly="readonly" />
             </el-form-item>
           </el-col>
@@ -355,7 +359,8 @@
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="熏蒸效果评价" prop="xzxgpj">
-              <el-input v-model="form.xzxgpj" :readonly="readonly" />
+              <common-select v-model="form.xzxgpj" type="XZXGPJ" :readonly="readonly"/>
+<!--              <el-input v-model="form.xzxgpj" :readonly="readonly" />-->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -379,7 +384,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="磷化氢浓度单位" prop="lhqnddw">
-              <el-input v-model="form.lhqnddw" :readonly="readonly" />
+              <common-select v-model="form.lhqnddw" type="LHQNDDW" :readonly="readonly"/>
+<!--              <el-input v-model="form.lhqnddw" :readonly="readonly" />-->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -391,7 +397,7 @@
 
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
-            <el-form-item label="计算补药量" prop="jsbyl">
+            <el-form-item label="计算补药量(g)" prop="jsbyl">
               <el-input v-model="form.jsbyl" :readonly="readonly" />
             </el-form-item>
           </el-col>
@@ -401,7 +407,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="补药方法" prop="byfa">
+            <el-form-item label="补药方法(g)" prop="byfa">
               <el-input v-model="form.byfa" :readonly="readonly" />
             </el-form-item>
           </el-col>
@@ -432,7 +438,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="目标浓度维持天数" prop="mbndwcts">
+            <el-form-item label="目标浓度维持天数(天)" prop="mbndwcts">
               <el-input v-model.number="form.mbndwcts" :readonly="readonly" />
             </el-form-item>
           </el-col>
@@ -450,8 +456,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="密闭时间" prop="mbsj">
-              <el-date-picker v-model="form.mbsj" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :readonly="readonly"></el-date-picker>
+            <el-form-item label="密闭时间(天)" prop="mbsj">
+              <el-input v-model.number="form.mbsj" :readonly="readonly"/>
+<!--              <el-date-picker v-model="form.mbsj" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :readonly="readonly"></el-date-picker>-->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -487,11 +494,12 @@ import {
   positive_integer_required,
   positive_integer,number_data,
 } from "@/utils/ruleDatas";
+import CommonSelect from "@/components/common/commonSelect/index.vue";
 
 
 export default {
   mixins: [simpleEdit, houseAndWareQuery],
-  components: {},
+  components: {CommonSelect},
 
   data() {
     return {
@@ -528,12 +536,12 @@ export default {
         kqhxqjaqjcqk: null, // string 空气呼吸器及安全检查情况
         lhqbjyaqjc: null, // string 磷化氢报警仪安全检查
         lhqjczztsqk: null, // string 磷化氢检测装置调试情况
-        lhqnddw: null, // string 磷化氢浓度单位
+        lhqnddw: '1', // string 磷化氢浓度单位
         lqbwcqdbjcs: null, // string 漏气部位采取的补救措施
         lqwzjc: null, // string 漏气位置监测
         mbnd: null, // string 目标浓度
         mbndwcts: null, // integer($int32) 目标浓度维持天数
-        mbsj: null, // string($date-time) 密闭时间
+        mbsj: null, // string($date-time) 密闭时间 （改 integer）
         nd: null, // string 浓度
         nnumber: null, // integer($int32) ???
         orderNumber: null, // string 熏蒸作业单号

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.form.updatePerson = this.realName
+      }
+    },
     getDataFun() {
       return findById;
     },

src/page/intelligentStorage/multifunctionalGrainInfo.vue

@@ -177,15 +177,17 @@ export default {
         if(resp.retCode == '200') {
           this.$message.success('操作成功')
         }else {
-          this.$message.error(resp.message)
+          this.$message.error('检测失败')
         }
+      }).catch(err => {
+        this.$message.error('检测失败')
       })
     },
     check() {
-      if(! this.form.storehouse) {
-        return this.$message.warning('请选择仓房')
-      }
-      this.doCheck(this.form.ilqYq, this.form.storehouse)
+      // if(! this.form.storehouse) {
+      //   return this.$message.warning('请选择仓房')
+      // }
+      this.doCheck(this.form.ilqYq, null)
     },
     checkRow(data) {
       const storeCode = data.storehouseCode

src/page/intelligentStorage/pestChecking.vue

@@ -52,7 +52,7 @@
       ></el-table-column>
       <el-table-column
         align="center"
-        prop="hcjcdn"
+        prop="hcjcdh"
         label="害虫检测单号"
       ></el-table-column>
       <el-table-column

src/page/intelligentStorage/pestDeviceConfig.vue

@@ -85,7 +85,11 @@
         align="center"
         prop="sitecode"
         label="站点名称"
-      ></el-table-column>
+      >
+        <template v-slot="scope">
+          {{staticName('SITE_TYPE', scope.row.sitecode)}}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="320">
         <template v-slot="scope">
           <el-button

src/page/intelligentStorage/quantityDetectionDeviceConfig.vue

@@ -59,11 +59,11 @@
           {{houseName(scope.row)}}
         </template>
       </el-table-column>
-      <el-table-column
-        align="center"
-        prop="vdevname"
-        label="设备名称"
-      ></el-table-column>
+<!--      <el-table-column-->
+<!--        align="center"-->
+<!--        prop="vdevname"-->
+<!--        label="设备名称"-->
+<!--      ></el-table-column>-->
       <el-table-column
         align="center"
         prop="vjcName"

src/page/intelligentStorage/ventilationDeviceConfig.vue

@@ -84,9 +84,13 @@
       ></el-table-column>
       <el-table-column
         align="center"
-        prop="igateway"
+        prop="inoutstorage"
         label="设备位置"
-      ></el-table-column>
+      >
+        <template v-slot="scope">
+          {{staticName('BUS_TYPE_3', scope.row.inoutstorage)}}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="320">
         <template v-slot="scope">
           <el-button

src/page/login/index.vue

@@ -15,7 +15,9 @@
             display: inline-block;
           "
         />-->
-        <img src="../../assets/wisdom_images/qhLoginLogo.png"/>
+        <!-- <img src="../../assets/wisdom_images/qhLoginLogo.png"/> -->
+        <!-- logins -->
+        <img style="width: 100%" src="../../assets/wisdom_images/logins.png" />
       </div>
     </div>
     <div class="login_main">
@@ -141,7 +143,7 @@
             </el-form-item>
           </el-form>
 
-          <el-row>
+          <el-row v-show="false">
             <div style="float: left">
               没有账号请&nbsp;
               <span
@@ -162,7 +164,7 @@
               >
             </div>
           </el-row>
-          <el-row>
+          <el-row v-show="false">
             <div style="float: right">
               <span
                 style="
@@ -186,9 +188,9 @@
 // import Cookies from 'js-cookie'
 // import axios from "axios";
 import { getVerify, getCurrUserDetails } from "@/api/login/login";
-
+import { getFunc, getFuncByUserId } from "@/api/user";
 // @TODO 假 token 目前以 session 方式验证用户，后期改为 token
-const MOCK_TOKEN = "123"
+const MOCK_TOKEN = "123";
 export default {
   components: {},
   name: "login",
@@ -257,17 +259,14 @@ export default {
       // }
     },
     async getVerifyFn() {
-      const data = await getVerify()
-      const base64 = data.file
-      this.img = `data:image/png;base64,${base64}`
+      const data = await getVerify();
+      const base64 = data.file;
+      this.img = `data:image/png;base64,${base64}`;
     },
     keyupEnter() {
       document.onkeydown = (e) => {
         let body = document.getElementsByTagName("body")[0];
-        if (
-          (e.keyCode === 13) &&
-          this.$route.path == "/login"
-        ) {
+        if (e.keyCode === 13 && this.$route.path == "/login") {
           console.log("enter");
           this.handleLogin();
         }
@@ -280,32 +279,68 @@ export default {
           this.loading = true;
           let password = this.loginForm.password;
           const data = {
-            ... this.loginForm
-          }
+            ...this.loginForm,
+          };
           data.password = this.$md5(this.loginForm.password);
           this.$store
             .dispatch("Login", data)
             .then((response) => {
               sessionStorage.menuIdx = 0;
-              if (response.status) { // 登录成功
-                sessionStorage.setItem('TOKENL', MOCK_TOKEN)
-                this.$store.dispatch('GetInfo').then(_ => {
-                  this.loading = false;
-                  this.$systemUtils.updateUserNamePwd(this.loginForm.name, this.loginForm.password)
-                  this.$router.push({
-                    path: "/home",
-                  });
-                }).catch(_ => {
-                  this.getVerifyFn()
-                  this.$message({
-                    type: "warning",
-                    message: '无法获取用户信息,请重新登录',
+              if (response.status) {
+                // 登录成功
+                sessionStorage.setItem("TOKENL", MOCK_TOKEN);
+                this.$store
+                  .dispatch("GetInfo")
+                  .then((_) => {
+                    this.loading = false;
+                    this.$systemUtils.updateUserNamePwd(
+                      this.loginForm.name,
+                      this.loginForm.password
+                    );
+
+                    // getFunc({}).then((all) => {
+                    //   const allTree = this.$systemUtils.buildFuncTree(all);
+                    //   const setting = allTree.find(
+                    //     (d) => d.funcName == "系统管理"
+                    //   );
+                    //   console.log("系统管理", allTree, setting);
+                    //   getFuncByUserId().then((resp) => {
+                    //     const tree = this.$systemUtils.buildFuncTree(resp);
+                    //     tree.push(setting);
+                    //     console.log("aaaaaaa", resp, tree);
+                    //     sessionStorage.setItem("FUN_RAW", JSON.stringify(resp));
+                    //     sessionStorage.setItem(
+                    //       "FUN_TREE",
+                    //       JSON.stringify(tree)
+                    //     );
+                    //     this.$router.push({
+                    //       path: "/home",
+                    //     });
+                    //   });
+                    // });
+
+                    getFuncByUserId().then(resp => {
+                      const tree = this.$systemUtils.buildFuncTree(resp)
+                      console.log('aaaaaaa', resp, tree)
+                      sessionStorage.setItem('FUN_RAW', JSON.stringify(resp))
+                      sessionStorage.setItem('FUN_TREE', JSON.stringify(tree))
+                      this.$router.push({
+                        path: "/home",
+                      });
+                    })
+                  })
+                  .catch((_) => {
+                    this.getVerifyFn();
+                    this.$message({
+                      type: "warning",
+                      message: "无法获取用户信息,请重新登录",
+                    });
+                    this.loading = false;
                   });
-                  this.loading = false;
-                })
                 this.rememberPasswordFn(password);
                 this.showDialog = true;
-              } else { // 登录失败
+              } else {
+                // 登录失败
                 this.getVerifyFn();
                 this.$message({
                   type: "warning",
@@ -315,10 +350,10 @@ export default {
               }
             })
             .catch((err) => {
-              console.log('login error:', err)
+              console.log("login error:", err);
               this.$message({
                 type: "warning",
-                message: '未知异常 -1',
+                message: "未知异常 -1",
               });
               this.loading = false;
             });
@@ -416,7 +451,7 @@ export default {
     },
     loadAll() {
       // return JSON.parse(unescape(this.getCookie("companyloginHistory")));
-      return null
+      return null;
     },
     querySearch(queryString, cb) {
       var restaurants = this.restaurants;
@@ -533,7 +568,8 @@ h3 {
   @include relative;
   height: 100vh;
   min-height: 600px;
-  background: url(../../assets/wisdom_images/bg.png) no-repeat center center;
+  // background: url(../../assets/wisdom_images/bg.png) no-repeat center center;
+  background: url(../../assets/wisdom_images/bj.png) no-repeat center center;
   background-size: 100% 100%;
   background-color: #2d3a4b;
   input:-webkit-autofill {
@@ -607,7 +643,8 @@ h3 {
   margin-top: 5%;
   float: left;
   height: 433px;
-  background: url(../../assets/wisdom_images/cicle.png) top left no-repeat;
+  // background: url(../../assets/wisdom_images/cicle.png) top left no-repeat;
+  background: url(../../assets/wisdom_images/zuo.png) top left no-repeat;
   background-size: 80%;
 }
 

src/page/spillageLeakageLossCollection/components/spillageLeakageLossCollectionEdit.vue

@@ -76,7 +76,7 @@
 
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
-            <el-form-item label="入库净重" prop="netWeightIn">
+            <el-form-item label="入库净重(kg)" prop="netWeightIn">
               <el-input v-model.trim="form.netWeightIn" :readonly="readonly"/>
             </el-form-item>
           </el-col>
@@ -87,7 +87,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="出库净重" prop="netWeightOut">
+            <el-form-item label="出库净重(kg)" prop="netWeightOut">
               <el-input v-model.trim="form.netWeightOut" :readonly="readonly"/>
             </el-form-item>
           </el-col>
@@ -109,17 +109,17 @@
         <el-divider>损耗计算</el-divider>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
-            <el-form-item label="入库水分" prop="moistureIn">
+            <el-form-item label="入库水分(%)" prop="moistureIn">
               <el-input v-model.trim="form.moistureIn" :readonly="readonly"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="出库水分" prop="moistureOut">
+            <el-form-item label="出库水分(%)" prop="moistureOut">
               <el-input v-model.trim="form.moistureOut" :readonly="readonly"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="水分减量" prop="moistureLoss">
+            <el-form-item label="水分减量(kg)" prop="moistureLoss">
               <el-input v-model.trim="waterReduce" placeholder="自动计算" readonly />
             </el-form-item>
           </el-col>
@@ -127,17 +127,17 @@
 
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
-            <el-form-item label="入库杂质" prop="impurityIn">
+            <el-form-item label="入库杂质(%)" prop="impurityIn">
               <el-input v-model.trim="form.impurityIn" :readonly="readonly"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="出库杂质" prop="impurityOut">
+            <el-form-item label="出库杂质(%)" prop="impurityOut">
               <el-input v-model.trim="form.impurityOut" :readonly="readonly"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="杂质减量" prop="impurityReductionQuality">
+            <el-form-item label="杂质减量(kg)" prop="impurityReductionQuality">
               <el-input v-model.trim="impurityReduce" placeholder="自动计算" readonly/>
             </el-form-item>
           </el-col>
@@ -146,17 +146,17 @@
         <el-row type="flex" align="middle" justify="center" class="row">
 
           <el-col :span="8">
-            <el-form-item label="水杂减量" prop="moistureImpurityLoss">
+            <el-form-item label="水杂减量(kg)" prop="moistureImpurityLoss">
               <el-input v-model.trim="wiReduce" placeholder="自动计算" readonly />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="实际损耗数量" prop="actualLossQuantity">
+            <el-form-item label="实际损耗数量(kg)" prop="actualLossQuantity">
               <el-input v-model.trim="loss3" placeholder="自动计算" readonly/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="保管自然损耗" prop="naturalLoss">
+            <el-form-item label="保管自然损耗(kg)" prop="naturalLoss">
               <el-input v-model.trim="loss" placeholder="自动计算" readonly />
             </el-form-item>
           </el-col>
@@ -164,17 +164,17 @@
 
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
-            <el-form-item label="超耗数量" prop="excessLossQuantity">
+            <el-form-item label="超耗数量(kg)" prop="excessLossQuantity">
               <el-input v-model.trim="lq" placeholder="自动计算" readonly />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="存储损耗" prop="storageLoss">
+            <el-form-item label="存储损耗(kg)" prop="storageLoss">
               <el-input v-model.trim="loss2" placeholder="自动计算" :readonly="readonly"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="检查计算数" prop="checkCalculateNumber">
+            <el-form-item label="检查计算数(kg)" prop="checkCalculateNumber">
               <el-input v-model.trim="calData" placeholder="自动计算" readonly />
             </el-form-item>
           </el-col>

src/page/statisticalReport/detailsReport.vue

@@ -9,11 +9,18 @@
           :inline="true"
           class="demo-form-inline search-form"
         >
-          <el-form-item label="仓房名称:" prop="contractsId">
-            <common-select type="STOREHOUSE"></common-select>
+          <el-form-item label="仓房名称:" prop="storehouseCode">
+            <el-select v-model="form.storehouseCode" placeholder="请选择" >
+              <el-option
+                v-for="item in houseOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.raw.storehouseCode">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="检测时间:" prop="status">
-            <el-date-picker tpye="date"></el-date-picker>
+          <el-form-item label="检测时间:" prop="startDate">
+            <el-date-picker tpye="date" v-model="form.startDate" value-format="yyyy-MM-dd"></el-date-picker>
           </el-form-item>
           <div class="search-button">
             <span class="search-line"></span>
@@ -39,86 +46,72 @@
     >
       <el-table-column
         align="center"
-        :show-overflow-tooltip="true"
         prop="contractId"
         label="基本情况"
       >
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="仓房名称"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="仓房类型"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="设计仓容（t）"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="储粮品种"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="储粮性质"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="存储方式"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="实存数量（t）"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="入仓等级"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="入仓时间"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="产地"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="入仓水分(%)"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="保管员"
         ></el-table-column>
       </el-table-column>
       <el-table-column
         align="center"
-        :show-overflow-tooltip="true"
         prop="contractType"
         label="粮情"
       >
@@ -130,43 +123,36 @@
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="气温（℃）"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="仓温（℃）"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="气湿(%RH)"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="仓湿(%RH)"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="平均粮温（℃）"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="最高粮温（℃）"
         ></el-table-column>
         <el-table-column
           align="center"
-          :show-overflow-tooltip="true"
           prop="contractType"
           label="最低粮温（℃）"
         ></el-table-column>
@@ -198,54 +184,31 @@
 <script>
 
 import commonSelect from "@/components/common/commonSelect"
+import {getDetailsReportInfo} from "@/api/statisticalReport";
+import {simpleList, houseAndWareQuery} from "@/components/simpleList";
 export default {
   name: "detailsReport",
+  mixins: [simpleList, houseAndWareQuery],
   components: {
     commonSelect
   },
   data() {
     return {
-      limit: {
-        page: 1,
-        size: 10,
-        total: 0
-      },
-      tableData: [],
       form: {
-        contractsId: null,
-        status: null,
-      },
-      paginationShow: true,
-      listLoading: false,
-      addShow: false,
+        storehouseCode: null,
+        startDate: null,
+      }
     }
   },
   computed: {
 
   },
   methods: {
-    search() {
-
-    },
-    reset(formName) {
-      if(this.$refs[formName]) {
-        this.$refs[formName].resetFields()
-      }
-    },
-    add() {
-      this.addShow = true
+    setUp() {
+      this.initHouseOptions()
     },
-    exportTable() {
-
-    },
-    manage(data) {
-
-    },
-    handleCurrentChangeTask() {
-
-    },
-    handleSizeChangeTask() {
-
+    getListFun() {
+      return getDetailsReportInfo
     }
   }
 }

src/page/statisticalReport/submitReport.vue

@@ -9,8 +9,8 @@
           :inline="true"
           class="demo-form-inline search-form"
         >
-          <el-form-item label="检测日期:" prop="status">
-            <el-date-picker tpye="date"></el-date-picker>
+          <el-form-item label="检测日期:" prop="startDate">
+            <el-date-picker tpye="date" v-model="form.startDate" value-format="yyyy-MM-dd"></el-date-picker>
           </el-form-item>
           <div class="search-button">
             <span class="search-line"></span>
@@ -147,54 +147,27 @@
 <script>
 
 import commonSelect from "@/components/common/commonSelect"
+import {simpleList} from "@/components/simpleList";
+import {getDetailsReportInfo, getSubmitReportInfo} from "@/api/statisticalReport";
 export default {
   name: "submitReport",
+  mixins: [simpleList],
   components: {
     commonSelect
   },
   data() {
     return {
-      limit: {
-        page: 1,
-        size: 10,
-        total: 0
-      },
-      tableData: [],
+
       form: {
-        contractsId: null,
-        status: null,
+        startDate: null,
       },
-      paginationShow: true,
-      listLoading: false,
-      addShow: false,
+
     }
   },
-  computed: {
 
-  },
   methods: {
-    search() {
-
-    },
-    reset(formName) {
-      if(this.$refs[formName]) {
-        this.$refs[formName].resetFields()
-      }
-    },
-    add() {
-      this.addShow = true
-    },
-    exportTable() {
-
-    },
-    manage(data) {
-
-    },
-    handleCurrentChangeTask() {
-
-    },
-    handleSizeChangeTask() {
-
+    getListFun() {
+      return getSubmitReportInfo
     }
   }
 }

src/page/storageForewarning/circle.vue

@@ -9,12 +9,15 @@
           :inline="true"
           class="demo-form-inline search-form"
         >
-          <el-form-item>
-            <el-button type="primary" size="small" icon="el-icon-plus" @click="add">新增</el-button>
-            <el-divider direction="vertical"></el-divider>
+<!--          <el-form-item>-->
+<!--            <el-button type="primary" size="small" icon="el-icon-plus" @click="add">新增</el-button>-->
+<!--            <el-divider direction="vertical"></el-divider>-->
+<!--          </el-form-item>-->
+          <el-form-item label="违规类型:" prop="violationType">
+            <common-select v-model="form.violationType" type="violationType" />
           </el-form-item>
-          <el-form-item label="企业名称:" prop="dwmc">
-            <el-input v-model="form.dwmc" />
+          <el-form-item label="预警时间:" prop="date">
+            <el-date-picker type="daterange" value-format="yyyy-MM-dd" v-model="form.date" />
           </el-form-item>
           <div class="search-button">
             <span class="search-line"></span>
@@ -51,7 +54,7 @@
       <el-table-column
         align="center"
         prop="violationSubjectType"
-        label="违规主体类型"
+        label="违规主题类型"
       ></el-table-column>
       <el-table-column
         align="center"
@@ -143,15 +146,17 @@ import {simpleList, hasHouseName, hasWareName, hasOrgName, houseAndWareQuery} fr
 import {circleList} from "@/api/storageForewarning";
 // import edit from "./components/storageDataEdit.vue";
 import edit from './circleEdit.vue'
+import commonSelect from "@/components/common/commonSelect/index.vue";
 
 export default {
   name: "circle",
   mixins: [simpleList, ],
-  components: {edit},
+  components: {edit, commonSelect},
   data() {
     return {
       form: {
-        dwmc: null,
+        violationType: null,
+        date: [],
       },
     }
   },
@@ -176,6 +181,13 @@ export default {
         orgName: this.orgName,
       }
     },
+    getQuery() {
+      const [startDate, endDate] = this.form.date
+      const violationType = this.form.violationType
+      return {
+        startDate, endDate, violationType
+      }
+    },
     getListFun() {
       return circleList
     },

src/page/storageForewarning/nonRotation.vue

@@ -26,8 +26,8 @@
           <el-form-item label="品种:" prop="lspz">
             <common-select v-model="form.lspz" type="lsmxpz" :remote="true" />
           </el-form-item>
-          <el-form-item label="入库时间:" prop="dwmc">
-
+          <el-form-item label="入库时间:" prop="rksj">
+            <el-date-picker v-model="form.rksj" type="date" value-format="yyyy-MM-dd"/>
           </el-form-item>
           <div class="search-button">
             <span class="search-line"></span>
@@ -61,11 +61,11 @@
         prop="orgId"
         label="承储库点"
       ></el-table-column>
-      <el-table-column
-        align="center"
-        prop="someField"
-        label="封仓时间"
-      ></el-table-column>
+<!--      <el-table-column-->
+<!--        align="center"-->
+<!--        prop="someField"-->
+<!--        label="封仓时间"-->
+<!--      ></el-table-column>-->
       <el-table-column
         align="center"
         prop="lspz"
@@ -160,6 +160,8 @@ export default {
       orgOptions: [],
       form: {
         dwmc: null,
+        lspz: null,
+        rksj: null,
       },
     }
   },

src/page/storageForewarning/tradeInList.vue

@@ -9,18 +9,15 @@
           :inline="true"
           class="demo-form-inline search-form"
         >
-          <el-form-item>
-            <el-button type="primary" size="small" icon="el-icon-plus" @click="add">新增</el-button>
-            <el-divider direction="vertical"></el-divider>
+          <!--          <el-form-item>-->
+          <!--            <el-button type="primary" size="small" icon="el-icon-plus" @click="add">新增</el-button>-->
+          <!--            <el-divider direction="vertical"></el-divider>-->
+          <!--          </el-form-item>-->
+          <el-form-item label="违规类型:" prop="violationType">
+            <common-select v-model="form.violationType" type="violationType" />
           </el-form-item>
-          <el-form-item label="承储库点:" prop="dwmc">
-            <el-input v-model="form.dwmc" />
-          </el-form-item>
-          <el-form-item label="车牌号:" prop="dwmc">
-            <el-input v-model="form.dwmc" />
-          </el-form-item>
-          <el-form-item label="出入库时间:" prop="dwmc">
-            <el-input v-model="form.dwmc" />
+          <el-form-item label="预警时间:" prop="date">
+            <el-date-picker type="daterange" value-format="yyyy-MM-dd" v-model="form.date" />
           </el-form-item>
           <div class="search-button">
             <span class="search-line"></span>
@@ -51,44 +48,43 @@
       ></el-table-column>
       <el-table-column
         align="center"
-        prop="someField"
-        label="车牌号"
-      ></el-table-column>
-      <el-table-column
-        align="center"
-        prop="someField"
-        label="库区名称"
+        prop="alarmPublishTime"
+        label="预警发布时间"
       ></el-table-column>
       <el-table-column
         align="center"
-        prop="someField"
-        label="仓房名称"
+        prop="violationSubjectType"
+        label="违规主题类型"
       ></el-table-column>
       <el-table-column
         align="center"
-        prop="someField"
-        label="出入库时间"
+        prop="offender"
+        label="违规行为人"
       ></el-table-column>
       <el-table-column
         align="center"
-        prop="someField"
-        label="品种"
+        prop="involvingLibraryPoints"
+        label="涉及库点"
       ></el-table-column>
       <el-table-column
         align="center"
-        prop="someField"
-        label="等级"
+        prop="violationType"
+        label="违规类型"
       ></el-table-column>
       <el-table-column
         align="center"
-        prop="someField"
-        label="净重"
+        prop="violationDetail"
+        label="违规详情"
       ></el-table-column>
       <el-table-column
         align="center"
-        prop="someField"
-        label="出入库类型"
-      ></el-table-column>
+        prop="currentStatus"
+        label="当前处置状态"
+      >
+        <template v-slot="scope">
+          {{staticName('F_TYPE_1', scope.row.currentStatus)}}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="320">
         <template v-slot="scope">
           <el-button
@@ -97,25 +93,25 @@
             size="small"
             icon="el-icon-view"
           >查看</el-button>
-          <el-button
-            type="primary"
-            @click="edit(scope.row)"
-            size="small"
-            icon="el-icon-edit"
-          >编辑</el-button>
-          <el-popconfirm
-            title="确定删除吗？"
-            icon="el-icon-info"
-            icon-color="red"
-            @confirm="del(scope.row)"
-          >
-            <el-button
-              type="primary"
-              size="small"
-              slot="reference"
-              icon="el-icon-delete"
-            >删除</el-button>
-          </el-popconfirm>
+          <!--          <el-button-->
+          <!--            type="primary"-->
+          <!--            @click="edit(scope.row)"-->
+          <!--            size="small"-->
+          <!--            icon="el-icon-edit"-->
+          <!--          >编辑</el-button>-->
+          <!--          <el-popconfirm-->
+          <!--            title="确定删除吗？"-->
+          <!--            icon="el-icon-info"-->
+          <!--            icon-color="red"-->
+          <!--            @confirm="del(scope.row)"-->
+          <!--          >-->
+          <!--            <el-button-->
+          <!--              type="primary"-->
+          <!--              size="small"-->
+          <!--              slot="reference"-->
+          <!--              icon="el-icon-delete"-->
+          <!--            >删除</el-button>-->
+          <!--          </el-popconfirm>-->
         </template>
       </el-table-column>
     </el-table>
@@ -157,7 +153,8 @@ export default {
   data() {
     return {
       form: {
-        dwmc: null,
+        violationType: null,
+        date: [],
       },
     }
   },
@@ -182,6 +179,13 @@ export default {
         // orgName: this.orgName,
       }
     },
+    getQuery() {
+      const [startDate, endDate] = this.form.date
+      const violationType = this.form.violationType
+      return {
+        startDate, endDate, violationType
+      }
+    },
     getListFun() {
       return tradeInList
     },

src/page/storageQualificationData/components/informationChangesEdit.vue

@@ -6,7 +6,7 @@
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="企业全称" prop="sqrEnterpriseId">
-              <el-input v-model="form.orgName" readonly/>
+              <el-input v-model="form.orgName" disabled/>
 <!--              <el-select v-model="form.sqrEnterpriseId" clearable placeholder="默认带出当前登录账号的企业名称" :disabled="readonly"-->
 <!--                         @change="companyChanged">-->
 <!--                <el-option-->
@@ -20,55 +20,52 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="企业代码">
-              <el-input :value="field(companySelected, 'dwdm')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'dwdm')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="企业地址">
-              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="法定代表人">
-              <el-input :value="field(companySelected, 'fddbr')" placeholder="根据企业名称带出" readonly/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="是否独立法人">
-              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'fddbr')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="企业性质">
-              <el-input :value="field(companySelected, 'dictLabel')" placeholder="根据企业名称带出" readonly />
+              <el-input :value="field(companySelected, 'dictLabel')" placeholder="根据企业名称带出" disabled />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="占地面积">
-              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'depotArea')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row type="flex" align="middle" justify="center" class="row">
+
           <el-col :span="8">
             <el-form-item label="总仓容">
-              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'depotArea')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="仓房数量">
-              <el-input :value="field(companySelected, 'cfs')" placeholder="根据企业名称带出" readonly />
+              <el-input :value="field(companySelected, 'cfs')" placeholder="根据企业名称带出" disabled />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="油罐数量" prop="ygs">
-              <el-input :value="field(companySelected, 'ygs')" placeholder="根据企业名称带出" readonly />
+              <el-input :value="field(companySelected, 'ygs')" placeholder="根据企业名称带出" disabled />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row type="flex" align="middle" justify="center" class="row">
+
           <el-col :span="8">
             <el-form-item label="正式职工人数" prop="fullTimeStaffCount">
               <el-input v-model.number="form.fullTimeStaffCount" :readonly="readonly"/>
@@ -79,19 +76,21 @@
               <el-input v-model.number="form.certifiedStorekeeperCount" :readonly="readonly"/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="持证检验员数量" prop="certifiedInspectorCount">
               <el-input v-model.number="form.certifiedInspectorCount" :readonly="readonly"/>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row type="flex" align="middle" justify="center" class="row">
+
           <el-col :span="8">
             <el-form-item label="承储资格年限" prop="storageExpireTime">
               <el-date-picker v-model="form.storageExpireTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :readonly="readonly"/>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="16">
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
@@ -106,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"
@@ -187,10 +186,14 @@ export default {
       this.addBeforeHook(() => {
         return getSqrEnterById(this.$store.state.user.orgInfo.unitInfoId).then(resp => {
           console.log("加载的企业数据 ", resp)
-          if(! resp) throw new Error('无法加载数据')
+          if(! resp) return Promise.reject('请先去提承储资格申请')
           this.companySelected = resp
           if(this.isAdd) {
             this.form.sqrEnterpriseId = this.companySelected.id
+            if (resp.attachment) {
+              this.form.attachment = resp.attachment
+              this.uploadFiles = [resp.attachment]
+            }
           }
         })
       })
@@ -267,7 +270,7 @@ export default {
             this.show = false
             this.$emit('on-save')
           }else {
-            this.$message.error(resp.msg)
+            this.$message.error(this.getSaveFailMsg(resp))
           }
         })
       }).catch(err => {

src/page/storageQualificationData/components/storageDataEdit.vue

@@ -6,7 +6,7 @@
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="企业全称" prop="unitInfoId">
-              <el-input v-model="form.orgName" readonly/>
+              <el-input v-model="form.orgName" disabled/>
               <!--              <el-select v-model="form.unitInfoId" clearable placeholder="默认带出当前登录账号的企业名称" :disabled="readonly"-->
               <!--                         @change="companyChanged">-->
               <!--                <el-option-->
@@ -20,55 +20,50 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="企业代码">
-              <el-input :value="field(companySelected, 'dwdm')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'dwdm')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="企业地址">
-              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="法定代表人">
-              <el-input :value="field(companySelected, 'fddbr')" placeholder="根据企业名称带出" readonly/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="是否独立法人">
-              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'fddbr')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="企业性质">
-              <el-input :value="field(companySelected, 'dictLabel')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'dictLabel')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="占地面积">
-              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'depotArea')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="总仓容">
-              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'actualCapacity')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="仓房数量">
-              <el-input :value="field(companySelected, 'cfs')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'cfs')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="油罐数量" prop="ygs">
-              <el-input :value="field(companySelected, 'ygs')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'ygs')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="正式职工人数" prop="fullTimeStaffCount">
               <el-input v-model.number="form.fullTimeStaffCount" :readonly="readonly"/>
@@ -79,20 +74,21 @@
               <el-input v-model.number="form.certifiedStorekeeperCount" :readonly="readonly"/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="持证检验员数量" prop="certifiedInspectorCount">
               <el-input v-model.number="form.certifiedInspectorCount" :readonly="readonly"/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row type="flex" align="middle" justify="center" class="row">
+
           <el-col :span="8">
             <el-form-item label="承储资格年限" prop="storageExpireTime">
               <el-date-picker v-model="form.storageExpireTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
                               :readonly="readonly"/>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="16">
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
@@ -283,7 +279,7 @@ export default {
             this.show = false
             this.$emit('on-save')
           } else {
-            this.$message.error(resp.msg)
+            this.$message.error(this.getSaveFailMsg(resp))
           }
         })
       }).catch(err => {

src/page/storageQualificationData/components/storageQualificationEdit.vue

@@ -6,7 +6,7 @@
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="企业全称" prop="sqrEnterpriseId">
-              <el-input v-model="form.orgName" readonly/>
+              <el-input v-model="form.orgName" disabled/>
 <!--              <el-select v-model="form.sqrEnterpriseId" clearable placeholder="默认带出当前登录账号的企业名称" :disabled="readonly"-->
 <!--                         @change="companyChanged">-->
 <!--                <el-option-->
@@ -20,84 +20,82 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="企业代码">
-              <el-input :value="field(companySelected, 'dwdm')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'dwdm')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="企业地址">
-              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" placeholder="根据企业名称带出" class="row">
           <el-col :span="8">
-            <el-form-item label="法定代表人">
-              <el-input :value="field(companySelected, 'fddbr')" placeholder="根据企业名称带出" readonly/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
             <el-form-item label="是否独立法人">
-              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="企业性质">
-              <el-input :value="field(companySelected, 'dictLabel')" placeholder="根据企业名称带出" readonly />
+              <el-input :value="field(companySelected, 'dictLabel')" placeholder="根据企业名称带出" disabled />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex" align="middle" justify="center" placeholder="根据企业名称带出" class="row">
           <el-col :span="8">
             <el-form-item label="占地面积">
-              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'depotArea')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row type="flex" align="middle" justify="center" placeholder="根据企业名称带出" class="row">
+
           <el-col :span="8">
             <el-form-item label="总仓容">
-              <el-input :value="field(companySelected, 'zcdz')" placeholder="根据企业名称带出" readonly/>
+              <el-input :value="field(companySelected, 'actualCapacity')" placeholder="根据企业名称带出" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="仓房数量">
-              <el-input :value="field(companySelected, 'cfs')" placeholder="根据企业名称带出" readonly />
+              <el-input :value="field(companySelected, 'cfs')" placeholder="根据企业名称带出" disabled />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="油罐数量" prop="ygs">
-              <el-input :value="field(companySelected, 'ygs')" placeholder="根据企业名称带出" readonly />
+              <el-input :value="field(companySelected, 'ygs')" placeholder="根据企业名称带出" disabled />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row type="flex" align="middle" justify="center" class="row">
+
           <el-col :span="8">
             <el-form-item label="正式职工人数" prop="fullTimeStaffCount">
-              <el-input :value="field(companySelected, 'fullTimeStaffCount')" placeholder="根据企业名称带出" readonly />
+              <el-input :value="field(companySelected, 'fullTimeStaffCount')" placeholder="根据企业名称带出" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="持证保管员数量" prop="certifiedStorekeeperCount">
-              <el-input :value="field(companySelected, 'certifiedStorekeeperCount')" placeholder="根据企业名称带出" readonly />
+              <el-input :value="field(companySelected, 'certifiedStorekeeperCount')" placeholder="根据企业名称带出" disabled />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="持证检验员数量" prop="certifiedInspectorCount">
-              <el-input :value="field(companySelected, 'certifiedInspectorCount')" placeholder="根据企业名称带出" readonly />
+              <el-input :value="field(companySelected, 'certifiedInspectorCount')" placeholder="根据企业名称带出" disabled />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row type="flex" align="middle" justify="center" class="row">
+
           <el-col :span="8">
             <el-form-item label="承储资格年限" prop="storageExpireTime">
               <el-date-picker v-model="form.storageExpireTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :readonly="readonly"/>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="16">
           </el-col>
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="24">
             <el-form-item label="仓房设施设备情况" prop="warehouseFacilitySituation">
-              <el-input :value="field(companySelected, 'warehouseFacilitySituation')" type="textarea" readonly/>
+              <el-input :value="field(companySelected, 'warehouseFacilitySituation')" type="textarea" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -106,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"
@@ -188,10 +186,14 @@ export default {
       this.addBeforeHook(() => {
         return getSqrEnterById(this.$store.state.user.orgInfo.unitInfoId).then(resp => {
           console.log("加载的企业数据 ", resp)
-          if(! resp) throw new Error('无法加载数据')
+          if(! resp) return Promise.reject('请先去提承储资格申请')
           this.companySelected = resp
           if(this.isAdd) {
             this.form.sqrEnterpriseId = this.companySelected.id
+            if (resp.attachment) {
+              this.form.attachment = resp.attachment
+              this.uploadFiles = [resp.attachment]
+            }
           }
         })
       })
@@ -273,7 +275,7 @@ export default {
             this.show = false
             this.$emit('on-save')
           } else {
-            this.$message.error(resp.msg)
+            this.$message.error(this.getSaveFailMsg(resp))
           }
         })
       }).catch(err => {

src/page/storageQualificationData/informationChanges.vue

@@ -221,6 +221,7 @@ export default {
     getConstantsQuery() {
       return {
         applyType: APPLY_TYPE,
+        unitInfoId: this.unitInfoId,
       }
     },
     getListFun() {
@@ -246,7 +247,11 @@ export default {
           if(resp.status === 'success') {
             this.getList()
           }else {
-            this.$message.error(resp.msg)
+            if(resp.error) {
+              this.$message.error(resp.error)
+            }else if(resp.msg) {
+              this.$message.error(resp.msg)
+            }
           }
         })
       })

src/page/storageQualificationData/storageData.vue

@@ -221,6 +221,7 @@ export default {
     getConstantsQuery() {
       return {
         applyType: APPLY_TYPE,
+        unitInfoId: this.unitInfoId
       }
     },
     getListFun() {
@@ -243,7 +244,12 @@ export default {
           if(resp.status === 'success') {
             this.getList()
           }else {
-            this.$message.error(resp.msg)
+            if(resp.error) {
+              this.$message.error(resp.error)
+            }else if(resp.msg) {
+              this.$message.error(resp.msg)
+            }
+
           }
         })
       })

src/page/storageQualificationData/storageQualification.vue

@@ -221,6 +221,7 @@ export default {
     getConstantsQuery() {
       return {
         applyType: APPLY_TYPE,
+        unitInfoId: this.unitInfoId,
       }
     },
     getListFun() {
@@ -243,7 +244,11 @@ export default {
           if(resp.status === 'success') {
             this.getList()
           }else {
-            this.$message.error(resp.msg)
+            if(resp.error) {
+              this.$message.error(resp.error)
+            }else if(resp.msg) {
+              this.$message.error(resp.msg)
+            }
           }
         })
       })

src/page/storehouseManagement/components/dailyInspectionEdit.vue

@@ -6,24 +6,41 @@
     <el-row type="flex" align="middle" justify="center" class="row">
       <el-col :span="8">
         <el-form-item label="仓房名称" prop="houseId">
-          <storehouse-select v-model.number="form.houseId" value-fun="id" :org-id="orgId" :readonly="readonly"/>
+          <el-select v-model="form.houseId"  placeholder="请选择" :disabled="readonly" @change="houseChanged">
+            <el-option
+              v-for="item in houseOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+<!--          <storehouse-select v-model.number="form.houseId" value-fun="id" :org-id="orgId" :readonly="readonly"/>-->
         </el-form-item>
       </el-col>
       <el-col :span="8">
         <el-form-item label="货位名称" prop="warehouseId">
-          <warehouse-select :value="form.warehouseId" :org-id="orgId" @input="onWareSelect" :readonly="readonly"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="8">
-        <el-form-item label="粮油品种" prop="subType">
-          <el-select v-model.number="form.subType" clearable placeholder="请选择" :disabled="readonly" @change="emitChange">
+          <el-select v-model="form.warehouseId"  placeholder="请选择" :disabled="readonly" @change="wareChanged">
             <el-option
-              v-for="item in subTypeOptions"
+              v-for="item in wareOptions"
               :key="item.value"
               :label="item.label"
               :value="item.value">
             </el-option>
           </el-select>
+<!--          <warehouse-select :value="form.warehouseId" :org-id="orgId" @input="onWareSelect" :readonly="readonly"/>-->
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="粮油品种" prop="subType">
+          <el-input :value="$enumUtils.getNameById(form.subType).name" disabled/>
+<!--          <el-select v-model.number="form.subType" clearable placeholder="请选择" :disabled="readonly" @change="emitChange">-->
+<!--            <el-option-->
+<!--              v-for="item in subTypeOptions"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
         </el-form-item>
       </el-col>
     </el-row>
@@ -196,7 +213,7 @@ import CommonSelect from "@/components/common/commonSelect/index.vue";
 import StorehouseSelect from "@/components/common/storehouseSelect/index.vue"
 import WarehouseSelect from "@/components/common/warehouseSelect/index_v2.vue";
 import {mapGetters} from "vuex";
-import {getNumberList, getKeeperNamesByHouseId, dailySave, dailyEdit} from "@/api/settlementManagement";
+import {getNumberList, getKeeperNamesByHouseId, dailySave, dailyEdit, getListOrRcsj} from "@/api/settlementManagement";
 import {number_data, simple_required} from "../../../utils/ruleDatas";
 export default {
   props: {
@@ -236,24 +253,25 @@ export default {
         this.getGrainSelect()
       }
     },
-    'form.houseId': {
-      handler: function(n) {
-        if(this.loading) return
-        this.form.warehouseId = null
-        this.form.subType = null
-        this.subTypeOptions = []
-        if(n) {
-          this.loading = true
-          getKeeperNamesByHouseId(n).then(resp => {
-            this.form.bgy = resp.name
-          }).finally(() => {
-            this.loading = false
-          })
-        }else {
-          this.form.bgy = null
-        }
-      }
-    }
+    // 'form.houseId': {
+    //   handler: function(n) {
+    //     if(this.loading) return
+    //     this.form.warehouseId = null
+    //     this.form.subType = null
+    //     this.subTypeOptions = []
+    //     if(n) {
+    //       this.loading = true
+    //       getKeeperNamesByHouseId(n).then(resp => {
+    //         this.form.bgy = resp.name
+    //       }).finally(() => {
+    //         this.loading = false
+    //       })
+    //     }else {
+    //       this.form.warehouseId = null
+    //       this.form.bgy = null
+    //     }
+    //   }
+    // }
   },
   computed: {
     ...mapGetters(['userId', "orgId", 'userName', 'realName']),
@@ -275,6 +293,8 @@ export default {
       show: this.visible,
       loading: false,
       form: { },
+      houseOptions: [],
+      wareOptions: [],
       rules: {
         houseId: simple_required, warehouseId: simple_required, subType: simple_required,
         checkTime: simple_required, checker: simple_required, bgy: simple_required,
@@ -286,8 +306,9 @@ export default {
     }
   },
   methods: {
-    init() {
+    async init() {
       this.resetForm()
+      await this.$systemUtils.getHouseOption(this.orgId).then(opt => this.houseOptions = opt)
       if(this.isAdd) {
         this.form.rainCheck = '正常'
       }else {
@@ -335,6 +356,12 @@ export default {
         findQuestion: null,
       }
     },
+    getWareOptions(houseId) {
+      this.wareOptions = []
+      if(houseId) {
+        this.$systemUtils.getWarehouseOption(this.orgId, houseId).then(opt => this.wareOptions = opt)
+      }
+    },
     getLocalData() {
       const data = {
         orgId: this.orgId,
@@ -368,10 +395,37 @@ export default {
     emitChange() {
 
     },
-    onWareSelect(selected, data) {
-      if(this.loading) return
-      console.log('货位选择 = ', data)
-      this.form.warehouseId = data.raw.warehouseId
+    houseChanged(n) {
+      console.log('仓房变化', n)
+      this.form.subType = null
+      this.subTypeOptions = []
+      this.form.warehouseId = null
+      if(n) {
+        this.getWareOptions(n)
+        getKeeperNamesByHouseId(n).then(resp => {
+          this.form.bgy = resp.name
+        }).finally(() => {
+          this.loading = false
+        })
+      }else {
+        this.form.bgy = null
+        this.wareOptions = []
+      }
+    },
+    wareChanged(n) {
+      // if(this.loading) return
+      // console.log('货位选择 = ', data)
+      // this.form.warehouseId = data.raw.warehouseId
+      this.getGrainSelect()
+      if(this.form.houseId && this.form.warehouseId) {
+        getListOrRcsj({ch: this.form.houseId, hwh: this.form.warehouseId, unitid: this.orgId}, this.orgId).then(resp => {
+          console.log('货位明细', resp)
+          if(resp && resp.length > 0) {
+            const o = resp[0]
+            this.form.subType = o.mxpz
+          }
+        })
+      }
     },
     save() {
       this.$refs.editForm.validate((ok) => {

src/page/storehouseManagement/components/hazardControlEdit.vue

@@ -121,7 +121,9 @@
       <el-col :span="24">
         <el-form-item label="附件">
           <upload
+            :download-base="downloadBase"
             :post-action="uploadUrl_2"
+            :limit="2"
             :post-data="{
               type: 'safeManage',
               userId: userId,
@@ -129,6 +131,8 @@
             }"
             :file-list="fileList"
             :readonly="readonly"
+            @on-upload-success="onUploadSuccess"
+            @on-remove="onUploadRemove"
           ></upload>
         </el-form-item>
       </el-col>
@@ -157,6 +161,9 @@ import {mapGetters} from "vuex";
 import {StorageSafeManageControllerSave, StorageSafeManageControllerEdit, uploadUrl_2} from "@/api/settlementManagement";
 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";
+
 export default {
   props: {
     visible: {
@@ -208,10 +215,14 @@ export default {
   },
   data() {
     return {
+      downloadBase,
+      minioUrl,
       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,
@@ -228,12 +239,32 @@ export default {
       this.resetForm()
       if(this.isAdd) {
       }else {
+        console.log('查看 id', this.dataId)
+        getFileList({bid: this.dataId, orgId: this.orgId}).then(resp => {
+
+          this.fileList = resp.map(d => {
+            return {
+              id: d.id,
+              name: d.originalFileName,
+              url: `${basicUploadUrl}${d.filePath}`
+            }
+          })
+          console.log('文件列表', resp, this.fileList)
+        })
         StorageSafeManageControllerEdit(this.dataId).then(resp  => {
           this.form = resp.storageSafeManageWithBLOBs
+          // const fl = resp.fileList || []
+          // this.fileList = fl.map(d => {
+          //   console.log('文件列表', d)
+          //   return d
+          // })
         })
       }
     },
     resetForm() {
+      this.fileList = []
+      this.fileIds = []
+      this.deleteFileIds = []
       this.form = {
         sbr: null,
         hjbw: null,
@@ -254,6 +285,7 @@ export default {
         rectificationState: null,
       }
     },
+
     getLocalData() {
       const data = {
         orgId: this.orgId,
@@ -262,8 +294,8 @@ export default {
       }
       return {
         storageSafeManage: JSON.stringify(data),
-        fileIds: "[]",
-        deleteFileIds: "[]",
+        fileIds: JSON.stringify(this.fileList.map(f => f.id)),
+        deleteFileIds: JSON.stringify(this.deleteFileIds),
       }
     },
     onChoose(data) {
@@ -279,6 +311,10 @@ export default {
     },
     save() {
       console.log(this.$refs.editForm.validate)
+      const c = this.$store.state.user.depotInfo.zcCounty
+      if(!c ) {
+        return this.$message.error('您的库区信息不完整, 无法保存')
+      }
       this.$refs.editForm.validate((ok) => {
         if(ok) {
           const data = this.getLocalData()
@@ -294,6 +330,37 @@ 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/hazardControl.vue

@@ -154,7 +154,7 @@
 
 import commonSelect from "@/components/common/commonSelect"
 import edit from "./components/hazardControlEdit";
-import {storageSafeManageControllerList} from "@/api/settlementManagement";
+import {storageSafeManageControllerList, StorageSafeManageControllerRemove} from "@/api/settlementManagement";
 import {mapGetters} from "vuex";
 export default {
   name: "hazardControl",
@@ -213,8 +213,8 @@ export default {
       this.addShow = true
     },
     del(data) {
-      festivalbeforeCheckRemove(data.id).then(resp => {
-        if(resp.msg === 'success') {
+      StorageSafeManageControllerRemove(data.id).then(resp => {
+        if(resp.status === '200') {
           this.$message.success('删除成功')
           this.getList()
         }else {

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/page/system/authManagement.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="content-main">
+  <div class="content-main" v-loading="loading">
     <el-row>
       <el-col :span="11" style="margin-right: 5px">
         <el-card class="box-card">
@@ -14,12 +14,16 @@
             >
               <el-table-column
                 align="center"
-                type="index" width="60">
+                type="index" width="60"
+              >
               </el-table-column>
               <el-table-column
                 align="center"
                 prop="roleName"
                 label="角色">
+                <template v-slot="scope">
+                  <span :class="{'selected-role': selectRoleId === scope.row.roleId}">{{scope.row.roleName}}</span>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -71,6 +75,9 @@ export default {
     this.init()
   },
   methods: {
+    backgroundColor() {
+      return backgroundColor
+    },
     init() {
       this.loading = true
       this.getAllRole().finally(_ => {
@@ -111,9 +118,9 @@ export default {
       return getRole().then(resp => {
         this.roleList = resp.list
         return getFunc().then(resp => {
-          console.log('all fun ', resp.list.filter(d => d.funcSort == null))
+          console.log('all fun ', resp.filter(d => d.funcSort == null))
           const funcMap = {}
-          const list = resp.list.map(d => {
+          const list = resp.map(d => {
             const ret =  {
               ...d,
               label: d.funcName,
@@ -146,7 +153,9 @@ export default {
         return fList
       }).then(list => {
         console.log('all list', list)
-        const tree = this.arrayToTree(list, fMap)
+        // const tree = this.arrayToTree(list, fMap)
+        //   .filter(d => d.funcSort != null)
+        const tree = this.$systemUtils.buildFuncTree(list)
           .filter(d => d.funcSort != null)
         tree.sort((d1, d2) => d1.funcSort - d2.funcSort)
         return tree
@@ -166,28 +175,59 @@ export default {
         tree.setChecked(d.id, false)
       })
     },
+    getParentIds(pidList, arr) {
+      const ps = []
+      for(const d of arr) {
+        if(d.parentId > 0) {
+          // 有父菜单
+          if(! pidList.includes(d.parentId)) {
+            pidList.push(d.parentId)
+            const p = this.funMap[d.parentId]
+            ps.push(p)
+          }
+        }
+      }
+      if(ps.length > 0) {
+        this.getParentIds(pidList, ps)
+      }
+    },
     submit() {
+      this.loading = true
       const tree = this.$refs.tree
       const nodes = tree.getCheckedNodes()
+      const ps = []
+      this.getParentIds(ps, nodes)
+      console.log('nnnnn', nodes, ps)
       const funList = nodes.filter(n => ! (n.id + '').startsWith('btn-'))
       if(funList.length <= 0) {
-        return this.$message.error('情选择功能')
+        return this.$message.error('请选择功能')
       }
       const btnList = nodes.filter(n => (n.id + '').startsWith('btn-'))
-      console.log('功能', funList.map(n => n.id).join(','))
-      console.log('按钮', btnList.map(n => n.id.replace('btn-', '')).join(','))
+
       console.log(nodes)
+      const funIdList = funList.map(n => n.id)
+      funIdList.push(... ps)
+      const uniList = [... new Set(funIdList)]
+      console.log('功能', uniList.join(','))
+      console.log('按钮', btnList.map(n => n.id.replace('btn-', '')).join(','))
       Promise.all([
-        roleButtonSave({
-          roleId: this.selectRoleId,
-          btnIds: btnList.map(n => n.id.replace('btn-', '')).join(',')
-        }),
+        // roleButtonSave({
+        //   roleId: this.selectRoleId,
+        //   btnIds: btnList.map(n => n.id.replace('btn-', '')).join(',')
+        // }),
         roleFuncSave({
           roleId: this.selectRoleId,
-          funcIds: funList.map(n => n.id).join(',')
+          funcIds: uniList.join(',')
         })
       ]).then(resp => {
-        this.$message.success('保存成功')
+        if(!resp.status) {
+          this.$message.success('保存成功')
+        }else {
+          this.$message.error(resp.message)
+        }
+
+      }).finally(_ => {
+        this.loading = false
       })
     },
     onRowSelect(row, column, event) {
@@ -240,4 +280,8 @@ export default {
   height: fit-content;
   min-height: 500px;
 }
+
+.selected-role {
+  color: green;
+}
 </style>