修改bug

src/api/warehouseBusiness/warehouseInStock.js

@@ -42,7 +42,7 @@ export function deleteCode(fId) {
 //导入查询条码
 export function importQueryBarcode(params) {
   return request({
-    url: '/warehouseBusiness/label/in-list',
+    url: '/warehouseBusiness/inStock/generateELabel',
     method: 'get',
     params
   })
@@ -254,3 +254,12 @@ export function downloadTemplate(data){
     method: 'get',
   })
 }
+
+//生成条码
+export function generate(data) {
+  return request({
+    url: '/warehouseBusiness/inStock/generate',
+    method: 'post',
+    params: data
+  })
+}

src/layout/components/Sidebar/Logo.vue

@@ -15,11 +15,12 @@
         to="/"
       >
 <!--        途宝-->
-        <!-- <img :src="logo" class="sidebar-logo-mini" /> -->
+        <img :src="logo" 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 :src="logo" class="sidebar-logo" /> -->
+        <img :src="logo" class="sidebar-logo" />
         <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>

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1479,6 +1479,13 @@
                 <el-button
                     type="text"
                     size="small"
+                    @click="makerCode(scope.row)"
+                    v-if="scope.row.fId&&showGenerate==1"
+                >生成条码
+                </el-button>
+                <el-button
+                    type="text"
+                    size="small"
                     @click="showElabel(scope)"
                     v-if="showDataElabel == '0'"
                 >条码
@@ -6442,7 +6449,7 @@ import {
   checkCode,
   queryClerkRoleList,
   pleaseCheck,
-  feesCheck, downloadTemplate, listElabelByfGPid, saveCode, deleteCode
+  feesCheck, downloadTemplate, listElabelByfGPid, saveCode, deleteCode,generate
 } from '@/api/warehouseBusiness/warehouseInStock'
 import { operationAgreement } from '@/api/agreement/agreement'
 import { listCorps, getCorps } from '@/api/basicdata/corps'
@@ -6918,7 +6925,8 @@ export default {
       elabelList: [],
       isPledgeOptions:[],
       eId:'',
-      eRow:{}
+      eRow:{},
+      showGenerate:false
     }
   },
   async created() {
@@ -7028,6 +7036,9 @@ export default {
     this.getConfigKey('warehouse.inStock.showPrint').then((response) => {
       this.showPrint = response.msg
     })
+    this.getConfigKey("generate_label").then((response) => {
+      this.showGenerate = response.msg;
+    });
     // 业务员获取
     selectUserByRole().then(res => {
       this.fSalesmanOption = res.rows
@@ -9311,6 +9322,18 @@ export default {
         this.elabelList.splice(scope.$index, 1);
       }
     },
+    makerCode(row){
+      console.log(this.form)
+      generate({
+        id:this.form.fId,
+        itemId:row.fId,
+        number:row.fQty,
+        type:1,
+        corpId:this.form.fCorpid
+      }).then(res=>{
+        this.$message('生成成功');
+      })
+    },
     //打印
     addprint(status) {
       // if (status == "zyd") {

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -5816,7 +5816,7 @@ export default {
     },
     //条码导入查询
     importBarcodeQuery() {
-      importQueryBarcode({ stockId: this.eRow.fSrcid }).then(res => {
+      importQueryBarcode({ originalBillNo: this.eRow.fOriginalbillno}).then(res => {
         this.elabelListTwo = res.data
         this.showElabelDialogTwo = true
       })

src/views/login.vue

@@ -52,13 +52,13 @@
     </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">
+   <!-- <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">-->