5月1日系统修改完成备份 1.0

doc/山东众工仓库管理系统需求分析及解决方式.txt

@@ -15,4 +15,7 @@
 
 需要修改或者优化的地方
 1、出入库界面在量比较大的情况下进行减少表关联信息（即在输出结果集的时候尽量将表关联写在sql中，获取主要字段）
-2、增加查询条件类
+2、增加查询条件类
+
+2025/5/1
+考虑到会有前期库存在其他系统的情况，增加导入功能，更具数据信息生成入库记录和出库记录以及库存信息

src/view/maint/area.vue

@@ -0,0 +1,224 @@
+<template>
+    <div style="text-align: left;">
+		<el-row>
+			<el-select size="small" v-model="queryWare" clearable placeholder="请选择" @change="change" @clear="clear">
+				<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
+				</el-option>
+			</el-select>
+			<el-button type="info" size="small" @click="search">查询</el-button>
+			<el-button type="primary" size="small" @click="handleAdd">新增</el-button>
+		</el-row>
+    
+		<el-table :data="tableData" border>
+			<el-table-column prop="id" label="编号" width="60" v-if="isShow">
+			</el-table-column>
+			<el-table-column prop="ware.name" label="所属库房" width="120">
+			</el-table-column>
+			<el-table-column prop="name" label="分区名称" width="120">
+			</el-table-column>
+			<el-table-column prop="code" label="分区编码" width="120">
+			</el-table-column>
+
+			<el-table-column label="操作">
+				<template slot-scope="scope">
+					<el-button size="mini" @click="handleEdit(scope.row)">编辑</el-button>
+					<el-button size="mini" type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+
+		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+		 :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalRows">
+		</el-pagination>
+
+
+		<el-dialog title="分区明细" :visible.sync="dialogVisible" width="500px">
+			<el-form :model="area" label-width="100px" ref="area">
+				<el-form-item label="id" v-if="isShow">
+					<el-input v-model="atea.id"></el-input>
+				</el-form-item>
+				<el-form-item label="所属库房">
+					<el-select v-model="area.ware.id" clearable placeholder="请选择" style="width: 100%;">
+						<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
+						</el-option>
+					</el-select>
+
+				</el-form-item>
+				<el-form-item label="分区名称">
+					<el-input v-model="area.name"></el-input>
+				</el-form-item>
+				<el-form-item label="分区编码">
+					<el-input v-model="area.code"></el-input>
+				</el-form-item>
+
+				<el-form-item>
+					<el-button type="success" @click="handleSave">保存</el-button>
+					<el-button @click="handleCancelSave">取消</el-button>
+				</el-form-item>
+			</el-form>
+		</el-dialog>
+
+
+	</div>
+</template>
+
+<script>
+    import axios from '@/axios'
+	import {
+		mapState
+	} from 'vuex'
+	export default {
+        data() {
+            return {
+                queryWare: '',
+                options: [],
+                tableData: [],
+
+                currentPage: 1,
+				totalRows: 0,
+				pageSizes: [50, 100, 200,500],
+				pageSize: 50,
+
+                loading: true,
+                isShow: false,
+                dialogVisible: false,
+
+                area: {
+                    id: '',
+					name: '',
+					code: '',
+					ware: {
+						id: '',
+						name: ''
+					},
+                }
+
+            }
+        },
+        //界面渲染完毕调用   初始化表格参数
+		mounted() {
+			this.getAllWare()
+		},
+        methods: {
+            //
+            getAllWare() {
+				var url = 'MaintWare/queryByUserId.do'
+				var param = {}
+				axios.get(url, param).then(response => {
+					this.options = response.data.data
+				});
+			},
+            handleAdd() {
+
+                this.dialogVisible=true;
+				//this.$$refs.area.clearValidate();
+            },
+            handleCancelSave(row) {
+				this.dialogVisible = false
+			},
+            getTableData() {
+				var url = 'MaintArea/query.do'
+				var param = {
+					page: this.currentPage,
+					rows: this.pageSize,
+					queryWare: this.queryWare
+				}
+				axios.get(url, param).then(response => {
+					if (response.data.code == 0) {
+						this.tableData = response.data.data.list
+						this.totalRows = response.data.data.total
+						//this.drawWareLayout()
+					} else {
+						this.$message({
+							type: 'error',
+							message: '查询失败' + response.data.msg,
+						});
+					}
+				});
+			},
+            search() {
+				this.currentPage = 1
+				this.getTableData()
+			},
+            handleSizeChange(val) {
+				console.log(`每页 ${val} 条`);
+				this.pageSize = val
+				this.getTableData()
+			},
+			// 修改当前页事件
+			handleCurrentChange(val) {
+				console.log(`当前页: ${val}`);
+				this.currentPage = val
+				this.getTableData()
+			},
+            handleSave() {
+				var tempStack = this.area;
+				var json = JSON.stringify(tempStack)
+				var url = 'MaintArea/save.do'
+				var param = {
+					json: json
+				}
+				axios.post(url, param).then(response => {
+					if (response.data.code == 0) {
+						this.$message({
+							type: 'success',
+							message: '保存成功!',
+						});
+						this.getTableData()
+						this.dialogVisible = false
+					} else {
+						this.$message({
+							type: 'error',
+							message: '保存失败' + response.data.msg,
+						});
+					}
+					// loading.close();
+				});
+
+
+
+			},
+
+			// 删除按钮事件
+			handleDelete(id) {
+				this.$confirm('此操作将删除该数据, 是否继续?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+
+					var url = 'MaintArea/remove.do'
+					var param = {
+						id: id
+					}
+					axios.post(url, param).then(response => {
+						if (response.data.code == 0) {
+							this.$message({
+								type: 'success',
+								message: '删除成功!',
+							});
+							this.getTableData()
+						} else {
+							this.$message({
+								type: 'error',
+								message: '删除失败;' + response.data.msg
+							});
+						}
+					});
+				}).catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消删除'
+					});
+				});
+			},
+			// 编辑按钮事件
+			handleEdit(row) {
+				var tempRow = row;
+				//tempRow.ware.name = tempRow.ware.id;
+				this.dialogVisible = true
+				this.area = tempRow
+			},
+        }
+	}
+</script>

src/view/maint/customer.vue

@@ -12,6 +12,8 @@
 				</el-table-column>
 				<el-table-column prop="name" size="small" label="客户名称" width="250" show-overflow-tooltip>
 				</el-table-column>
+				<el-table-column prop="code" size="small" label="客户简称" width="250" show-overflow-tooltip>
+				</el-table-column>
 				<el-table-column prop="contact" size="small" label="联系人" width="120" show-overflow-tooltip>
 				</el-table-column>
 				<el-table-column prop="phone" size="small" label="联系方式" width="200" show-overflow-tooltip>
@@ -41,6 +43,9 @@
 				<el-form-item label="客户名称">
 					<el-input v-model="customer.name"></el-input>
 				</el-form-item>
+				<el-form-item label="客户简称">
+					<el-input v-model="customer.code"></el-input>
+				</el-form-item>
 				<el-form-item label="联系人">
 					<el-input v-model="customer.contact"></el-input>
 				</el-form-item>
@@ -170,6 +175,20 @@
 			},
 			//保存按钮事件
 			handleSave(row) {
+				if (this.customer.name == '') {
+					this.$message({
+						type: 'error',
+						message: '客户名称不能为空',
+					});
+					return
+				}
+				if (this.customer.code == '') {
+					this.$message({
+						type: 'error',
+						message: '客户简称不能为空',
+					});
+					return
+				}
 				var json = JSON.stringify(this.customer)
 				var url = 'MaintCustomer/save.do'
 				var param = {
@@ -179,14 +198,14 @@
 					if (response.data.code == 0) {
 						this.$message({
 							type: 'success',
-							message: '保存成功!',
+							message: '保存成功！',
 						});
 						this.getTableData()
 						this.dialogVisible = false
 					} else {
 						this.$message({
 							type: 'error',
-							message: '保存失败' + response.data.msg,
+							message: '保存失败！' + response.data.msg,
 						});
 					}
 					// loading.close();

src/view/maint/material.vue

@@ -11,11 +11,11 @@
 			<el-table v-loading="loading" :data="tableData" border>
 				<el-table-column prop="id" label="编号" width="60"  v-if="isShow">
 				</el-table-column>
-				<el-table-column prop="name" label="物料名称" width="120">
+				<el-table-column prop="name" label="品名" width="150">
 				</el-table-column>
-				<el-table-column prop="code" label="物料编码" width="120">
+				<el-table-column prop="code" label="品名编码" width="120">
 				</el-table-column>
-				<el-table-column prop="standard" label="种类" width="120">
+				<el-table-column prop="standard" label="钢种" width="150">
 				</el-table-column>
 				<el-table-column prop="model" label="尺寸" width="120">
 				</el-table-column>
@@ -38,13 +38,13 @@
 				<el-form-item label="id" v-if="isShow">
 					<el-input v-model="material.id"></el-input>
 				</el-form-item>
-				<el-form-item label="物料名称">
+				<el-form-item label="品名">
 					<el-input v-model="material.name"></el-input>
 				</el-form-item>
-				<el-form-item label="物料编码">
+				<el-form-item label="品名编码">
 					<el-input v-model="material.code"></el-input>
 				</el-form-item>
-				<el-form-item label="种类">
+				<el-form-item label="钢种">
 					<el-input v-model="material.standard"></el-input>
 				</el-form-item>
 				 		<el-form-item label="尺寸">
@@ -138,6 +138,20 @@
  
 			//保存按钮事件
 			handleSave(row) {
+				if (this.material.name == '') {
+					this.$message({
+						type: 'error',
+						message: '品名不能为空',
+					});
+					return
+				}
+				if (this.material.standard == '') {
+					this.$message({
+						type: 'error',
+						message: '钢种不能为空',
+					});
+					return
+				}
 				var json = JSON.stringify(this.material)
 				var url = 'MaintMaterial/save.do'
 				var param = {
@@ -147,14 +161,14 @@
 					if (response.data.code == 0) {
 						this.$message({
 							type: 'success',
-							message: '保存成功!',
+							message: '保存成功！',
 						});
 						this.getTableData()
 						this.dialogVisible = false
 					} else {
 						this.$message({
 							type: 'error',
-							message: '保存失败' + response.data.msg,
+							message: '保存失败！' + response.data.msg,
 						});
 					}
 					// loading.close();

src/view/maint/stack.vue

@@ -505,3 +505,12 @@
 		}
 	}
 </script>
+<style>
+    .el-select-dropdown .el-scrollbar .el-scrollbar__wrap
+    {
+        overflow: scroll!important;
+    }
+	.el-upload-list__item-name{
+		background-color: #9f9;
+	}
+</style>

src/view/system/dic.vue

@@ -1,12 +1,24 @@
 <template>
     <div>
         <div style="width:600px;float: left; margin: 10px;">
-            <el-input v-model="query" placeholder="请输入查询条件" style="width :300px;float: left;"></el-input>
+            <!-- <el-input v-model="query" placeholder="请输入查询条件" style="width :300px;float: left;"></el-input> -->
+            <el-select v-model="query" clearable>
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+            </el-select>
             <el-button type="primary" @click="search">查询</el-button>
             <el-button type="primary" @click="handleAdd">新增</el-button>
         </div>
         <el-table v-loading="loading" :data="tableData" stripe border style="width: 99%;">
-            <el-table-column v-for="item in tableProperty" :key="item.id" :prop="item.tableProp" :label="item.tableLabel" :width="item.tableWidth" v-if="item.attr1==='0'">
+            <el-table-column prop="id" label="数量" width="120" v-if="isShow">
+            </el-table-column>
+            <el-table-column prop="dicCode" label="编码" width="120" show-overflow-tooltip align="right" header-align="center">
+            </el-table-column>
+            <el-table-column prop="dicName" label="名称" width="120" show-overflow-tooltip align="right" header-align="center">
+            </el-table-column>
+            <el-table-column prop="dicType" label="类型" width="120" show-overflow-tooltip align="right" header-align="center" :formatter="formatDicType">
+            </el-table-column>
+            <el-table-column prop="orderBy" label="排序" width="120" show-overflow-tooltip align="right" header-align="center">
             </el-table-column>
             <el-table-column label="操作">
                 <template slot-scope="scope">
@@ -21,7 +33,7 @@
 
         <el-dialog title="操作" :visible.sync="dialogVisible" width="500px">
             <el-form :model="sysDic" label-position="right" label-width="80px">
-                <el-form-item label="ID">
+                <el-form-item label="ID" v-if="isShow">
                     <el-input v-model="sysDic.id" placeholder=""></el-input>
                 </el-form-item>
                 <el-form-item label="编码">
@@ -31,7 +43,11 @@
                     <el-input v-model="sysDic.dicName" placeholder=""></el-input>
                 </el-form-item>
                 <el-form-item label="类型">
-                    <el-input v-model="sysDic.dicType" placeholder=""></el-input>
+                    <!-- <el-input v-model="sysDic.dicType" placeholder=""></el-input> -->
+                    <el-select v-model="sysDic.dicType" clearable>
+                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="排序">
                     <el-input v-model="sysDic.orderBy" placeholder=""></el-input>
@@ -58,18 +74,33 @@
                 pageSizes: [10, 50, 100, 200],
                 pageSize: 10,
                 query:'',
-        sysDic: {
-                id: '',
-                dicCode: '',
-                dicName: '',
-                dicType: '',
-                orderBy: '',
+                sysDic: {
+                    id: '',
+                    dicCode: '',
+                    dicName: '',
+                    dicType: '',
+                    orderBy: '',
                 },
+                isShow:false,
                 loading: true,
                 dialogVisible: false,
+                options:[{
+                    value: 'TALLY_PEOPLE',
+                    label: '吊装工'
+                    }
+                ],
             }
         },
+        mounted() {
+            this.getTableData()
+            this.getTableProperty()
+        },
         methods: {
+            formatDicType(row, column, cellValue){
+                if (row.dicType == "TALLY_PEOPLE"){
+                    return "吊装工"
+                }
+            },
             //查询table数据
             getTableData() {
                 var url = 'SysDic/query.do'
@@ -170,25 +201,25 @@
             //保存按钮事件
             handleSave(row) {
                 var url = 'SysDic/save.do'
-        var json = JSON.stringify(this.sysDic)
+                var json = JSON.stringify(this.sysDic)
                 var param = {
                     json: json
                 }
                 axios.post(url, param).then(response => {
                     if (response.data.code == '0') {
-            this.$message({
-                type: 'success',
-                message: '操作成功!',
-            });
-            this.getTableData()
-            this.dialogVisible = false
-        } else {
-            this.$message({
-                type: 'error',
-                message: '操作失败!' + response.data.msg
-            });
-        }
-            });
+                        this.$message({
+                            type: 'success',
+                            message: '操作成功!',
+                        });
+                        this.getTableData()
+                        this.dialogVisible = false
+                    } else {
+                        this.$message({
+                            type: 'error',
+                            message: '操作失败!' + response.data.msg
+                        });
+                    }
+                });
             },
 
             // 查询按钮事件
@@ -196,9 +227,16 @@
                 this.getTableData()
             }
         },
-        mounted() {
-            this.getTableData()
-            this.getTableProperty()
-        }
+        
     }
 </script>
+
+<style>
+    .el-select-dropdown .el-scrollbar .el-scrollbar__wrap
+    {
+        overflow: scroll!important;
+    }
+	.el-upload-list__item-name{
+		background-color: #9f9;
+	}
+</style>

src/view/ware/store.vue

@@ -6,8 +6,8 @@
 					<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
 					</el-option>
 				</el-select>
-				<el-select v-model="query.earId" size="small" style="margin-left: 10px" clearable placeholder="请选择区域" @change="change">
-					<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
+				<el-select v-model="query.earId" size="small" style="width: 100px; margin-left: 10px" clearable placeholder="请选择区域" @change="changeArea">
+					<el-option v-for="item in optionsArea" :key="item.id" :label="item.name" :value="item.code">
 					</el-option>
 				</el-select>
 				<el-input v-model="query.stackId" size="small" placeholder="垛位" style="width: 100px;"></el-input>
@@ -30,7 +30,7 @@
 
 		<el-row>
 			<el-col :span="showStoreLayerSpanA">
-				<div id="wareLayout" style=" margin:10px;width:600px; height: 300px;background-color: #DCDCDC;  float:left;"></div>
+				<div id="wareLayout" style=" margin:10px;width:1000px; height: 650px;background-color: #DCDCDC;  float:left;"></div>
 				<el-table :data="tableData" v-loading="tableDataLoading" border ref="multipleTable" @select="handleTableSelect"
 				 :row-class-name="tableRowClassName" @select-all = "selectAll">
 					<!-- //@selection-change="handleTableSelectionChange" -->
@@ -102,6 +102,9 @@
 				<el-row style=" margin:10px;">
 					<el-button type="primary" size="small" @click="handleMove">转移</el-button>
 				</el-row>
+				<el-row style=" margin:10px;">
+					<el-button type="primary" size="small" @click="handleAllDown">落层</el-button>
+				</el-row>
 				<el-row style=" margin:10px;">
 					<el-button type="primary" size="small" @click="handleSplit">拆分</el-button>
 				</el-row>
@@ -114,43 +117,6 @@
 			</el-col>
 		</el-row>
 
-		<!-- 
-		<el-table :data="tableData" border ref="multipleTable" @select="handleTableSelect">
-			 
-			<el-table-column type="selection" width="40" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="layer" label="层数" width="60" show-overflow-tooltip header-align="center" align="center">
-			</el-table-column>
-			<el-table-column prop="stackName" label="垛位" width="60" show-overflow-tooltip header-align="center" align="center">
-			</el-table-column>
-			<el-table-column prop="materialName" label="物料" width="100" show-overflow-tooltip header-align="center" align="center">
-			</el-table-column>
-
-			<el-table-column prop="standard" label="钢种" width="100" show-overflow-tooltip header-align="center" align="center">
-			</el-table-column>
-			<el-table-column prop="plateNo" label="钢板号" width="200" show-overflow-tooltip header-align="center">
-			</el-table-column>
-			<el-table-column prop="model" label="规格型号" width="120" show-overflow-tooltip header-align="center" align="center">
-			</el-table-column>
-			<el-table-column prop="count" label="数量" width="120" show-overflow-tooltip align="right" header-align="center">
-			</el-table-column>
-			<el-table-column prop="weight" label="重量" width="120" show-overflow-tooltip align="right" header-align="center">
-			</el-table-column>
-			<el-table-column prop="customerName" label="客户" width="300" show-overflow-tooltip header-align="center">
-			</el-table-column>
-			<el-table-column prop="receiveAddress" label="收货地址" width="300" show-overflow-tooltip header-align="center">
-			</el-table-column>
-			<el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip header-align="center">
-			</el-table-column>
-			<el-table-column prop="addTime" label="入库时间" width="200" show-overflow-tooltip header-align="center">
-			</el-table-column>
-		</el-table> -->
-
-		<!-- 		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-		 :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalRows">
-		</el-pagination>
-
- -->
-
 		<el-dialog title="客户明细" :visible.sync="splitDialogVisible" width="500px">
 			<el-form :model="split" label-width="100px">
 				<el-form-item label="原始数量">
@@ -172,9 +138,9 @@
 				<el-form-item label="剩余重量">
 					<el-input v-model="splitWeight" disabled></el-input>
 				</el-form-item>
-
-				<el-button type="success" @click="handleSplitSave">保存</el-button>
-				<el-button @click="handleSplitCancelSave">取消</el-button>
+				<el-form-item>
+					<el-button type="success" @click="handleSplitSave">保存</el-button>
+					<el-button @click="handleSplitCancelSave">取消</el-button>
 				</el-form-item>
 			</el-form>
 
@@ -205,36 +171,42 @@
 				</el-table-column>
 				<el-table-column prop="层号" label="层号" width="60" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="订单号" label="订单号" width="200" show-overflow-tooltip header-align="center">
-				</el-table-column>
-				<el-table-column prop="物料类型" label="物料类型" width="120" show-overflow-tooltip align="center" header-align="center">
+				<el-table-column prop="品名" label="品名" width="120" show-overflow-tooltip align="center" header-align="center">
 				</el-table-column>
 				<el-table-column prop="钢种" label="钢种" width="120" show-overflow-tooltip align="center" header-align="center">
 				</el-table-column>
 				<el-table-column prop="产品编号" label="产品编号" width="200" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="产品规格" label="产品规格" width="120" show-overflow-tooltip header-align="center">
+				<el-table-column prop="订单号" label="订单号" width="200" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="数量" label="数量" width="120" show-overflow-tooltip align="right" header-align="center">
+				<el-table-column prop="规格型号" label="规格型号" width="120" show-overflow-tooltip header-align="center">
 				</el-table-column>
 				<el-table-column prop="重量" label="重量" width="120" show-overflow-tooltip align="right" header-align="center">
 				</el-table-column>
-				<el-table-column prop="客户名称" label="客户名称" width="300" show-overflow-tooltip header-align="center">
+				<el-table-column prop="数量" label="数量" width="120" show-overflow-tooltip align="right" header-align="center">
 				</el-table-column>
-				<el-table-column prop="计量方式" label="计量方式" width="100" show-overflow-tooltip header-align="center">
+				<el-table-column prop="合约号" label="合约号" width="120" show-overflow-tooltip align="right" header-align="center">
 				</el-table-column>
-				<el-table-column prop="切边类型" label="切边类型" width="100" show-overflow-tooltip header-align="center">
+				<el-table-column prop="入库车号" label="入库车号" width="150" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="车号" label="车号" width="150" show-overflow-tooltip header-align="center">
+				<el-table-column prop="货权单位" label="货权单位" width="300" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="产地" label="产地" width="250" show-overflow-tooltip header-align="center">
+				<el-table-column prop="客户名称" label="客户名称" width="300" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="入库理货人员" label="入库理货人员" width="250" show-overflow-tooltip header-align="center">
+				<el-table-column prop="收货地址" label="收货地址" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="付款单位" label="付款单位" width="300" show-overflow-tooltip header-align="center">
+				<el-table-column prop="产地" label="产地" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
+				<el-table-column prop="捆包号" label="捆包号" width="250" show-overflow-tooltip header-align="center">
+				</el-table-column>				
 				<el-table-column prop="备注" label="备注" width="150" show-overflow-tooltip header-align="center">
 				</el-table-column>
+				<el-table-column prop="入库操作人员" label="入库操作人员" width="150" show-overflow-tooltip header-align="center">
+				</el-table-column>
+				<el-table-column prop="吊装工" label="吊装工" width="150" show-overflow-tooltip header-align="center">
+				</el-table-column>
+				<el-table-column prop="计量方式" label="计量方式" width="150" show-overflow-tooltip header-align="center">
+				</el-table-column>
 			</el-table>
 
 		</el-dialog>
@@ -382,6 +354,7 @@
 				backAble:false,
 				inAble:false,
 				imptAble:false,
+				optionsArea:[],
 			}
 
 		},
@@ -398,10 +371,27 @@
 					if (response.data.data.length == 1) {
 						this.query.wareId = response.data.data[0].id
 						this.getAllStackByWareId(this.query.wareId)
+						this.getArea()
 					}
 				});
 			},
+			getArea() {
+				var url = 'MaintArea/queryAll.do'
+      			var param = {
+          			wareId: this.query.wareId
+        		}
+      			axios.get(url, param).then(response => {
+      				this.optionsArea = response.data.data
+				});
+			},
 			change(val) {
+				this.query.earId = ""
+				if (val != '') {
+					this.getAllStackByWareId(val)
+				}
+				this.getArea()
+			},
+			changeArea(val) {
 				if (val != '') {
 					this.getAllStackByWareId(val)
 				}
@@ -409,7 +399,8 @@
 			getAllStackByWareId() {
 				var url = 'MaintStack/queryByWareId.do'
 				var param = {
-					wareId: this.query.wareId
+					wareId: this.query.wareId,
+					areaId: this.query.earId
 				}
 				axios.get(url, param).then(response => {
 					if (response.data.code == 0) {
@@ -885,6 +876,23 @@
 				});
 
 			},
+			handleAllDown(){
+				var url = 'WareMove/allDown.do'
+				var param = {
+					wareId: this.query.wareId,
+					stackId: this.moveFromStack.id
+				}
+				axios.post(url, param).then(response => {
+					if (response.data.code == 0) {
+						this.getStoreByStackId()
+					} else {
+						this.$message({
+							type: 'error',
+							message: '操作失败；' + response.data.msg,
+						});
+					}
+				});
+			},
 
 			handleMove() {
 
@@ -1435,7 +1443,11 @@
 	.el-table .warning-row {
 		background: #F08080;
 	}
-	/*#store{
-		zoom:1;
-	}*/
+	.el-select-dropdown .el-scrollbar .el-scrollbar__wrap
+    {
+        overflow: scroll!important;
+    }
+	.el-upload-list__item-name{
+		background-color: #9f9;
+	}
 </style>