Merge branch 'dev' of http://git.echepei.com/zhujiawei/Warehouse_management_ui into dev

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -850,15 +850,12 @@
                 type="primary"
                 :disabled="browseStatus"
                 @click.prevent="addWarehousing()"
-            >新行
-            </el-button>
+            >新行</el-button>
               <el-button
                   type="primary"
                   size="small"
                   @click="saveForm"
-              >保 存
-              </el-button
-              >
+              >保 存</el-button>
             <!--   <el-button
                   :disabled="browseStatus || Printinglist.length != 1"
                   type="primary"
@@ -1561,8 +1558,7 @@
                   size="small"
                   @click="saveForm"
               >保 存
-              </el-button
-              >
+              </el-button>
             </el-col>
        <!--      <el-col style="display: flex; justify-content: flex-end">
               <el-button size="small" type="info" prop="打印" @click="printZyd" v-if="entryPrinting == 0"

src/views/login.vue

@@ -52,14 +52,14 @@
     </el-form>
     <!--  底部  -->
 <!--    青岛途宝软件开发有限公司-->
-   <!-- <div class="el-login-footer">
+   <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>
-   </div> -->
+   </div>
 <!--    凯和-->
 
-   <div class="el-login-footer">
-     <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="https://beian.miit.gov.cn/">鲁ICP备2021017300号-1</a>  青岛凯和志诚物流有限公司</span>
-   </div>
+<!--   <div class="el-login-footer">-->
+<!--     <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="https://beian.miit.gov.cn/">鲁ICP备2021017300号-1</a>  青岛凯和志诚物流有限公司</span>-->
+<!--   </div>-->
   </div>
 </template>