修改bug

src/layout/components/Sidebar/Logo.vue

@@ -31,6 +31,7 @@
 <script>
 import logoImg from "@/assets/logo/logo.png";
 import overseas from "@/assets/logo/hwc.png";
+import haituling from "@/assets/logo/haituling.png";
 import had from "@/assets/logo/had.jpg";
 import overseasZjxd from "@/assets/logo/zjxd.png";
 import variables from "@/assets/styles/variables.scss";
@@ -67,7 +68,7 @@ export default {
     if (Cookies.get("test") == 0) {
       this.logo = testLogo;
     }else if (Cookies.get("test") == 1) {
-      this.logo = testLogo;
+      this.logo = logoImg;
     }else if (Cookies.get("test") == 2) {
       this.logo = overseas
     }else if (Cookies.get("test") == 3) {

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -2488,12 +2488,12 @@
           >
             <tr>
               <td>客户名称</td>
-              <td>{{ form.fCorpidName }}</td>
-              <td>入库日期</td>
-              <td colspan="2" v-if="Printinglist.length">
+              <td colspan="2">{{ form.fCorpidName }}</td>
+              <td >入库日期</td>
+              <td colspan="3" v-if="Printinglist.length">
                 {{ Printinglist[0].fBsdate | fBsdateFormat }}
               </td>
-              <td colspan="2" v-else></td>
+              <td colspan="3" v-else></td>
               <td>流水号</td>
               <td colspan="3" v-if="form.fBillno">
                 {{ form.fBillno }}-{{ lsTime }}
@@ -2502,14 +2502,16 @@
             </tr>
             <tr>
               <td>车号</td>
-              <td colspan="2" v-if="Printinglist.length">{{ Printinglist[0].fTruckno }}</td>
-              <td colspan="2" v-else></td>
+              <td colspan="3" v-if="Printinglist.length">{{ Printinglist[0].fTruckno }}</td>
+              <td colspan="3" v-else></td>
               <td colspan="2">提单号</td>
-              <td colspan="4">{{ form.fMblno }}</td>
+              <td colspan="5">{{ form.fMblno }}</td>
             </tr>
             <tr>
               <td style="width: 15%">货名</td>
               <td>箱号</td>
+              <td>属性</td>
+              <td>属性详情</td>
               <td>箱量</td>
               <td>件数</td>
               <td v-if="radio == 1">毛重(吨)</td>
@@ -2523,6 +2525,8 @@
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ item.fGoodsid | goodsFormat(goodsOptions) }}</td>
               <td>{{ item.fCntrno }}</td>
+              <td>{{ item.fBusinessType| fStorageTypeFormat(fStorageTypeOptions) }}</td>
+              <td>{{ item.fMarks }}</td>
               <td>{{ item.fCntqty }}</td>
               <td>{{ item.fQty }}</td>
               <td v-if="item.fGrossweight && radio == 1">
@@ -2540,7 +2544,7 @@
             </tr>
             <tr>
               <td>备注</td>
-              <td colspan="4"></td>
+              <td colspan="6"></td>
               <td>总件数</td>
               <td colspan="3">{{ allfQty }}</td>
             </tr>
@@ -5786,6 +5790,12 @@
                 <td colspan="2">{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</td>
               </tr>
               <tr>
+                <td>属性</td>
+                <td colspan="2">{{ item.fBusinessType| fStorageTypeFormat(fStorageTypeOptions)}}</td>
+                <td>属性详情</td>
+                <td colspan="2">{{ item.fMarks }}</td>
+              </tr>
+              <tr>
                 <td>出库日期</td>
                 <td>出库件数</td>
                 <td>剩余件数</td>
@@ -6243,7 +6253,7 @@
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
             <tr>
               <td>客户</td>
-              <td colspan="2">{{ form.fCorpidName }}</td>
+              <td colspan="4">{{ form.fCorpidName }}</td>
               <td>箱量</td>
               <td v-if="Printinglist.length">{{ Printinglist[0].fCntqty }}</td>
               <td v-else></td>
@@ -6252,7 +6262,7 @@
             </tr>
             <tr>
               <td>提单号</td>
-              <td colspan="2">{{ form.fMblno }}</td>
+              <td colspan="4">{{ form.fMblno }}</td>
               <td>品名</td>
               <td colspan="3">
                 {{ form.fGoodsid | goodsFormat(goodsOptions) }}
@@ -6260,7 +6270,7 @@
             </tr>
             <tr>
               <td>箱号</td>
-              <td colspan="2" v-if="Printinglist.length">
+              <td colspan="4" v-if="Printinglist.length">
                 {{ Printinglist[0].fCntrno }}
               </td>
               <td colspan="2" v-else></td>
@@ -6271,6 +6281,8 @@
               <td>入库日期</td>
               <td>入库件数</td>
               <td>出库日期</td>
+              <td>属性</td>
+              <td>属性详情</td>
               <td>出库件数</td>
               <td>结余件数</td>
               <td>区位</td>
@@ -6280,6 +6292,8 @@
               <td>{{ item.fBsdate }}</td>
               <td>{{ item.fQty }}</td>
               <td></td>
+              <td>{{ item.fBusinessType| fStorageTypeFormat(fStorageTypeOptions) }}</td>
+              <td>{{ item.fMarks }}</td>
               <td></td>
               <td></td>
               <td>{{ item.fWarehouseInformation }}</td>

src/views/login.vue

@@ -57,7 +57,7 @@
    </div>
    <!--    青岛海图领信息技术有限公司-->
    <!-- <div class="el-login-footer">
-     <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=37021302000853">鲁公网安备 37021302000853号</a> <a href="https://beian.miit.gov.cn/">鲁ICP备2021000559号</a>  青岛海图领信息技术有限公司</span>
+     <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="https://www.hturing.com/">鲁ICP备2022022886号</a>  青岛海图领信息技术有限公司 Copyright  2021-2024</span>
    </div> -->
 <!--    凯和-->