Merge branch 'feature/商品采购入库单仓库可编辑' into pengyouhao_dev

src/views/salesPurchasing/merchandisePurchaseReturn/index.vue

@@ -102,7 +102,9 @@ export default {
         totalQty: '',
         venderId: '',
         venderName: '',
-        codeInfoList: []
+        codeInfoList: [],
+		storageId: '',
+		storageName: '',
       },
       activeName: 'goodsInfo',
       goods_material_id: '',

src/views/salesPurchasing/mixins/common_form.js

@@ -143,7 +143,7 @@ export default {
                                   this.joinCode = res.data.joinCode === "CODE"
 								  this.formData.storageId = res.data.storageId
 								  this.formData.storageName = res.data.storageName
-								  this.getWarehouseList()
+								  this.getWarehouseList(1)
                                   this.formData.items = res.data.items.map(item => ({
                                     brandId: item.brandId,
                                     brandName: item.brandName,
@@ -298,13 +298,13 @@ export default {
         })
       }
     },
-	getWarehouseList(){
+	getWarehouseList(type){
 		storageListPageV2({
           pageNum: 1,
           pageSize: -1,
           params: [{param: "a.type", compare: "like", value: "商品"},{param: "a.status", compare: "=", value: "true"}]
         }).then(res => {
-			if(JSON.parse(localStorage.getItem('greemall_user')).joinCode != "NO" && !this.formData.storageId){
+			if(JSON.parse(localStorage.getItem('greemall_user')).joinCode != "NO" && !this.formData.storageId && type){
 				this.formData.storageId = res.data.records[0].storageId
 				this.formData.storageName = res.data.records[0].storageName
 			}