111

src/view/ware/store.vue

@@ -139,15 +139,7 @@
 			</el-form>
 
 		</el-dialog>
-		<popup-stack-with-select-ware :wares="options" :fromStack="moveFromStack" ref="PopupStackWithSelectWare"
-		 @receviceFromChild="receviceFromWareStack"></popup-stack-with-select-ware>
-		<popup-stack :wareName="store.wareName" ref="PopupStack" @receviceFromChild="receviceFromStack"></popup-stack>
-
-		<popup-distribution ref="PopupDistribution" @receviceFromChild="receviceFromDistreibution" :selectRows="selectRows"></popup-distribution>
-		<popup-out ref="PopupOut" @receviceFromChild="receviceFromOut"></popup-out>
-		<popup-in ref="PopupIn" @receviceFromChild="receviceFromIn" :wares="options" :wareId="query.wareId" :stack="moveFromStack"></popup-in>
- 
-
+		
 		<el-dialog title="库房明细" :visible.sync="importDialogVisible" width="1000px">
 
 			<el-upload class="upload-demo" action="" :on-change="handleChange" :on-exceed="handleExceed" :on-remove="handleRemove"
@@ -233,6 +225,15 @@
 			</el-form>
 
 		</el-dialog>
+
+		<popup-stack-with-select-ware :wares="options" :fromStack="moveFromStack" ref="PopupStackWithSelectWare"
+		 @receviceFromChild="receviceFromWareStack"></popup-stack-with-select-ware>
+		<popup-stack :wareName="store.wareName" ref="PopupStack" @receviceFromChild="receviceFromStack"></popup-stack>
+
+		<popup-distribution ref="PopupDistribution" @receviceFromChild="receviceFromDistreibution" :selectRows="selectRows"></popup-distribution>
+		<popup-out ref="PopupOut" @receviceFromChild="receviceFromOut"></popup-out>
+		<popup-in ref="PopupIn" @receviceFromChild="receviceFromIn" :wares="options" :wareId="query.wareId" :stack="moveFromStack"></popup-in>
+ 
 	</div>
 </template>