液体出入库

src/api/incomeWmsBox.js

@@ -92,6 +92,16 @@ export function batchAddIncomeWmsBox(data) {
     }
   })
 }
+export function batchAddIncomeWmsBoxNew(data) {
+  return request({
+    url: '/incomewmsbox/batchAddNew',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8' // 接口修改传参类型
+    }
+  })
+}
 export function checkIsZero(data) {
   return request({
     url: 'incomewmsbox/checkIsZero',

src/store/modules/permission.js

@@ -4,7 +4,7 @@ import { getInfo } from '@/api/login'
 import Layout from '@/layout/index'
 
 // pathList: 是要隐藏菜单的集合 system元素:一级菜单的路径(path)
-const pathList = ['system', 'system/log', 'production', 'equipment', 'process', '/none2', 'sample', 'tlias', '/test', '/inspect', '/controlPlatform/control', '/template/planeGraph', '/demoData/demoData1','/setup/test']
+const pathList = ['system', 'system/log', 'production', 'equipment', 'process', '/none2', 'sample', 'tlias', '/test', '/inspect', '/controlPlatform/control', '/template/planeGraph', '/demoData/demoData1', '/setup/test']
 
 const permission = {
   state: {

src/utils/common.js

@@ -211,7 +211,7 @@ export function successAudio(start) {
 
 // 自定义转换成大写的
 export function customUpperCase(sourceStr) {
-  return sourceStr && sourceStr !== '' ? sourceStr.toUpperCase() : sourceStr
+  return sourceStr && sourceStr !== '' ? sourceStr.toUpperCase().trim() : sourceStr
 }
 
 export function UpperCaseStr(sourceStr) {

src/views/setup/enterbound.vue

@@ -170,7 +170,6 @@ export default {
     this.queryForm.cj = this.manufacturer[0].value
   },
   methods: {
-    customUpperCase,
     /**
      * @description: 获取数据字典
      * @author: gaoyu

src/views/setup/inspectionRequestProcessing.vue

@@ -195,14 +195,22 @@ export default {
         businessId: item.businessId
       }
       validNumber(obj).then(res => {
-        console.log('res', res)
         if (res.data) {
-          this.$router.push({
-            path: '/setup/checkTheApplicationForExit',
-            query: {
-              businessId: item.businessId
-            }
-          })
+          if (item.ptype === '1') {
+            this.$router.push({
+              path: '/setup/checkTheApplicationForExit',
+              query: {
+                businessId: item.businessId
+              }
+            })
+          } else {
+            this.$router.push({
+              path: '/setup/dealWithStorage',
+              query: {
+                businessId: item.businessId
+              }
+            })
+          }
         }
       })
     }