| 
					
				 | 
			
			
				@@ -19,7 +19,16 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <a-descriptions-item label="调拨退货单号">{{ (basicInfoData&&basicInfoData.allocateReturnNo) || '--' }}</a-descriptions-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              <a-descriptions-item label="调入仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              <a-descriptions-item label="调入仓库"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                <warehouse 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                style="width:200px;" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                :allowClear="false" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  v-model="basicInfoData.warehouseSn" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  @change="updateWarehouse" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  id="basicInfo-warehouseSn" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  placeholder="请选择调入仓库" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              </a-descriptions-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <a-descriptions-item label="费用/调拨退货类型"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <AllocateType 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   id="allocateEdit-allocateReturnTypeSn" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -239,6 +248,7 @@ import { commonMixin } from '@/utils/mixin' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { STable, VSelect } from '@/components' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 // import ImportGuideModal from './importGuideModal.vue' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import print from './print.vue' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import warehouse from '@/views/common/chooseWarehouse.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { allocDetailQueryPageForReturn } from '@/api/allocateBill' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import AllocateType from '@/views/common/allocateType.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -255,7 +265,7 @@ import { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   name: 'TransferReturnGrpEdit', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   mixins: [commonMixin], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  components: { STable, VSelect, AllocateType, print }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  components: { STable, VSelect, AllocateType, print, warehouse }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   data () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       spinning: false, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -280,7 +290,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         const targetSn =  this.basicInfoData.targetSn 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         const targetType = this.$route.params.targetType 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         const allocateNo = this.queryParam.allocateNo 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        const otherParams = { allocateBill: { targetType: targetType , targetSn:targetSn, warehouseSn:warehouseSn, allocateNo: allocateNo } } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        const otherParams = { allocateBill: { targetType: targetType , targetSn:targetSn, allocateNo: allocateNo } } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return allocDetailQueryPageForReturn(Object.assign(parameter, this.queryParam, otherParams)).then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           const data = res.data 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           const no = (data.pageNo - 1) * data.pageSize 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -427,6 +437,11 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       _this.editRemark = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    // 修改仓库 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    updateWarehouse(warehouseSn){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.basicInfoData.warehouseSn = warehouseSn 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.handleEditRemark() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 修改调拨类型 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     changeAllocateType (val, opt) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       console.log(val, opt, '------------') 
			 |