Browse Source

Merge commit 'fc1da63ab11a8e555a20fa8ae41bb5b321cbc973' into HEAD

gitadmin 2 years ago
parent
commit
f0590d8392

+ 5 - 0
src/views/dealerManagement/businessOwnerSettings/settingsIndex.vue

@@ -181,6 +181,11 @@ export default {
             _this.$nextTick(() => {
               this.$refs.setCategory.pageInit()
             })
+          } else if (res.data.allDealerFlag == 1 && res.data.allProductFlag == 1 && res.data.allSupplierFlag != 1) {
+            _this.activeKeyVal = '3'
+            _this.$nextTick(() => {
+              this.$refs.setSupplier.pageInit()
+            })
           }
         }
       })

+ 1 - 1
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -17,7 +17,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="供应商名称">
-                <supplier v-model="queryParam.supplierSn" placeholder="请输入供应商名称"></supplier>
+                <supplier v-model="queryParam.supplierSn" isPermission placeholder="请输入供应商名称"></supplier>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">