Merge remote-tracking branch 'origin/dev' into dev

src/layout/components/Navbar.vue

@@ -10,10 +10,10 @@
 
         <div class="inv-hos-title">
             <span
-              style="margin-left:8px;color: #2d8cf0;font-size: 14px;">部门:{{ deptName }}</span>
+              style="margin: 10px;color: #2d8cf0;font-size: 14px;">部门&nbsp:&nbsp{{ deptName }}</span>
           <span
-            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库:{{ inv }}</span>
+            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库&nbsp:&nbsp{{ inv }}</span>
-          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户:{{ this.companyName }}</span>
+          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp吴XX{{ this.companyName }}</span>
           <span
             style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px">({{
               this.userName

src/views/purchase/cert/supCertAudit.vue

@@ -503,6 +503,8 @@ export default {
         limit: 20,
       };
       this.getList();
+      this.manufacturerList = [];
+      this.registrationList = [];
       this.productList = [];
       this.salesmanList = [];
     },
@@ -586,6 +588,7 @@ export default {
         limit: 10,
       };
       this.manufacturerList = [];
+      this.registrationList = [];
       this.getManufacturerList();
     },
     close() {

src/views/purchase/cert/supCertSearch.vue

@@ -391,6 +391,8 @@ export default {
             this.getList();
             this.productList = [];
             this.salesmanList = [];
+            this.manufacturerList = [];
+            this.registrationList = [];
         },
         hideSearch() {
           this.showSearch = !this.showSearch;
@@ -469,6 +471,7 @@ export default {
                 limit: 10,
             };
             this.manufacturerList = [];
+            this.registrationList = [];
             this.getManufacturerList();
         },
         hideSearch1() {

src/views/supplier/company/basicCompanyproductEdit.vue

@@ -426,3 +426,4 @@ export default {
 <style scoped>
 
 </style>
+