箱型报错修改

src/api/warehouseBusiness/warehouseInStock.js

@@ -208,3 +208,10 @@ export function revokefeeCheck(id) {
     }
   })
 }
+// 根据单号获得港口入库信息
+export function getCrawler(data) {
+  return request({
+    url: '/192.168.1.114:9002/crawler/' + data,
+    method: 'get',
+  })
+}

src/layout/components/Sidebar/Logo.vue

@@ -8,17 +8,28 @@
     }"
   >
     <transition name="sidebarLogoFade">
+<!--      如果是靖润 添加style样式background="#fff"-->
       <router-link
         v-if="collapse"
         key="collapse"
         class="sidebar-logo-link"
+        :class="{ 'jingrun-logo': sysType == 2 }"
         to="/"
       >
-        <img v-if="logo" :src="logo" class="sidebar-logo-mini" />
+<!--        途宝-->
+        <img v-if="sysType != 2" :src="logo" class="sidebar-logo-mini" />
+<!--        靖润-->
+        <img v-if="sysType == 2" :src="jingrunLogo" class="sidebar-logo-mini" />
         <!-- <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1> -->
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+<!--        途宝-->
+        <img v-if="sysType != 2" :src="logo" class="sidebar-logo" />
+<!--        靖润logo-->
+        <div style="width: 80%;height: 100%;background-color: #fff;float: left" v-if="company === ''">
+          <img v-if="sysType == 2" :src="jingrunLogo" class="sidebar-logo" />
+        </div>
+        <div style="float: right;background-color: #fff" class="other" v-if="company === ''"></div>
         <!-- <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1> -->
       </router-link>
     </transition>
@@ -27,7 +38,9 @@
 
 <script>
 import logoImg from "@/assets/logo/logo.png";
+import jingrunLogo from "@/assets/logo/jingrun-logo.png"
 import variables from "@/assets/styles/variables.scss";
+import Cookies from "js-cookie";
 
 export default {
   name: "SidebarLogo",
@@ -49,8 +62,15 @@ export default {
     return {
       title: "途宝智慧云仓平台",
       logo: logoImg,
+      jingrunLogo: jingrunLogo,
+      company: '',
+      sysType: "",
     };
   },
+  mounted() {
+    this.company = Cookies.get("companyName")
+    this.sysType = Cookies.get("sysType");
+  },
 };
 </script>
 
@@ -105,4 +125,13 @@ export default {
     }
   }
 }
+.other {
+  width: 0;
+  height: 0;
+  border-bottom: 60px solid #014da1;
+  border-left: 40px solid transparent;
+}
+.jingrun-logo {
+  background-color: #fff;
+}
 </style>

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -485,7 +485,7 @@
                   <template slot-scope="scope">
                     <el-select
                         placeholder="请选择箱型"
-                        v-model="scope.row.fCntrtype"
+                        v-model="scope.row.fCntrid"
                         size="mini"
                     >
                       <el-option

vue.config.js

@@ -39,9 +39,10 @@ module.exports = {
         // target: `http://192.168.1.111:9010/`,
         // target: `http://192.168.1.116:9012/`,
         // target: `http://192.168.1.116:9010/`,
-        // target: `http://192.168.1.197:9010/`,
+        // target: `http://192.168.1.140:9010/`,
         // target: `https://test.fms.tubaosoft.com/prod-api/`,
         // target: `https://test.wms.tubaosoft.com/prod-api/`,
+        // target: `https://test.wms.tubaosoft.com/prod-api                                                                            /`,
         // target: `https://test.tms.tubaosoft.com/prod-api/`,
         // target: `https://test.ke.tubaosoft.com/prod-api/`,
         // target: `http://lhsy.tubaosoft.com/prod-api/`,