111

src/components/PopupStackWithSelectWare.vue

 <template>
 	<div>
-		<el-dialog title="添加信息" :visible.sync="dialogVisible" width="700px">
+		<el-dialog title="添加信息" :visible.sync="dialogVisible" width="1100px">
 			<el-row>
 				<el-select v-model="wareId" clearable placeholder="请选择" @change="changeWare">
 					<el-option v-for="item in wares" :key="item.id" :label="item.name" :value="item.id">
 					</el-option>
 				</el-select>
+				<el-select v-model="areaId" style="margin-left: 5px; width: 100px" 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="layer" style="width: 200px;" v-show="layerVisible"></el-input>
 				<el-button type="success" @click="handleComfirm">确定</el-button>
 			</el-row>
 			<el-row>
-				<div id="popMoveWareLayout" style=" margin:10px;width:600px; height: 300px;background-color: #00FFFF;"></div>
+				<div id="popMoveWareLayout" style=" margin:10px;width:1000px; height: 650px;background-color: #00FFFF;"></div>
 			<!-- 	<div id="popMoveStoreLayer" style=" margin:10px;width:600px; height: 300px;background-color: #00FFFF;"></div> -->
 			</el-row>
 		</el-dialog>
 		data() {
 			return {
 				wareId: '',
+				areaId: '',
 				wareStack: [],
+				optionsArea: [],
 				dialogVisible: false,
 				layerVisible: false,
 				popMoveWare: {},
 				//console.log(this.wareName)
 				var url = 'MaintStack/queryByWareId.do'
 				var param = {
-					wareId: this.wareId
+					wareId: this.wareId,
+					areaId: this.areaId
 				}
 				axios.get(url, param).then(response => {
 					// alert(JSON.stringify(response));
 					this.wares = response.data.data
 					//console.log("getWare() :" + JSON.stringify(this.options))
 					if (response.data.data.length == 1) {
-						this.query.wareId = response.data.data[0].id
-						this.getAllStackByWareId(this.query.wareId)
+						this.wareId = response.data.data[0].id
+						this.getAllStackByWareId(this.wareId)
+						this.getArea()
 					}
 				});
 			},
+			getArea() {
+				var url = 'MaintArea/queryAll.do'
+      			var param = {
+          			wareId: this.wareId
+        		}
+      			axios.get(url, param).then(response => {
+      				this.optionsArea = response.data.data
+				});
+			},
 			drawStoreNoLayer(data) {
 				//console.log("drawStoreLayer(data)");
 				this.popMoveStore = zrender.init(document.getElementById('popMoveStoreLayer'));
 				if (val != '') {
 					this.getAllStackByWareId()
 				}
+				this.getArea()
+			},
+			changeArea(val) {
+				if (val != '') {
+					this.getAllStackByWareId(val)
+				}
 			},
 			setColor() {
 				for (let i = 0; i < this.popMoveWare.storage._roots.length; i++) {

src/view/record/changerecord.vue

 				</el-table-column>
 				<el-table-column prop="plateNo" label="钢板号" width="200px" show-overflow-tooltip align="center">
 				</el-table-column>
-				<el-table-column prop="recordType" label="类型" width="100px" show-overflow-tooltip align="center" :formatter="typeFormatter">
+				<el-table-column prop="fkCustomerNameOld" label="原货权单位" show-overflow-tooltip width="300px">
 				</el-table-column>
-				<el-table-column prop="customerNameOld" label="客户名称" show-overflow-tooltip width="300px">
+				<el-table-column prop="customerNameOld" label="原客户名称" show-overflow-tooltip width="300px">
 				</el-table-column>
-				<el-table-column prop="receiveAddressOld" label="收货地址" width="300" show-overflow-tooltip align="left">
+				<el-table-column prop="fkCustomerNameNew" label="新货权单位" show-overflow-tooltip width="300px">
 				</el-table-column>
-				<el-table-column prop="customerNameNew" label="客户名称" show-overflow-tooltip width="300px">
+				<el-table-column prop="customerNameNew" label="新客户名称" show-overflow-tooltip width="300px">
 				</el-table-column>
-				<el-table-column prop="receiveAddressNew" label="收货地址" width="300" show-overflow-tooltip align="left">
+				<el-table-column prop="receiveAddressOld" label="原收货地址" width="300" show-overflow-tooltip align="left">
+				</el-table-column>
+				<el-table-column prop="receiveAddressNew" label="新收货地址" width="300" show-overflow-tooltip align="left">
+				</el-table-column>
+				<el-table-column prop="addTime" label="操作时间" width="200px" show-overflow-tooltip align="left">
+				</el-table-column>
+				<el-table-column prop="addUser.userDesc" label="操作人" width="100px" show-overflow-tooltip align="left">
 				</el-table-column>
 				<el-table-column prop="wgtDcnMtcCd" label="计量方式" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
 				</el-table-column>
 				<el-table-column prop="remark" label="备注" width="100px" show-overflow-tooltip align="left">
 				</el-table-column>
-				<el-table-column prop="addUser.userDesc" label="操作人" width="100px" show-overflow-tooltip align="left">
-				</el-table-column>
-				<el-table-column prop="addTime" label="操作时间" width="200px" show-overflow-tooltip align="left">
-				</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">

src/view/record/inrecord.vue

 				</el-table-column>
 				<el-table-column prop="materialName" label="品名" show-overflow-tooltip width="100px" header-align="center" align="center">
 				</el-table-column>
+				<el-table-column prop="standard" label="钢种" show-overflow-tooltip width="80px" align="center">
+				</el-table-column>
+				<el-table-column prop="plateNo" label="产品编号" width="200px" show-overflow-tooltip align="center">
+				</el-table-column>
 				<el-table-column prop="ordNo" label="订单号" width="180px" show-overflow-tooltip align="left">
 				</el-table-column>
 				<el-table-column prop="model" label="规格" show-overflow-tooltip width="180px" align="center">
 				</el-table-column>
-				<el-table-column prop="standard" label="钢种" show-overflow-tooltip width="80px" align="center">
+				<el-table-column prop="weight" label="入库重量" width="100px" show-overflow-tooltip align="right">
 				</el-table-column>
 				<el-table-column prop="count" label="入库数量" width="100px" show-overflow-tooltip align="right">
 				</el-table-column>
-				<el-table-column prop="weight" label="入库重量" width="100px" show-overflow-tooltip align="right">
+				<el-table-column prop="contractNo" label="合约号" width="120" show-overflow-tooltip align="right" header-align="center">
+				</el-table-column>
+				<el-table-column prop="carNo" label="入库车号" width="120px" show-overflow-tooltip align="left">
 				</el-table-column>
-				<el-table-column prop="plateNo" label="钢板号" width="200px" show-overflow-tooltip align="center">
+				<el-table-column prop="addTime" label="入库时间" width="200px" show-overflow-tooltip align="left">
 				</el-table-column>
-				<el-table-column prop="customerName" label="货权单位" width="200px" show-overflow-tooltip align="center">
-				</el-table-column>   <!-- 原客户名称 -->
-				<el-table-column prop="fkComponyName" label="付款单位" width="200px" show-overflow-tooltip align="center">
-				</el-table-column>   <!-- 新增 -->
-				<el-table-column prop="receiveAddress" label="收货地址" width="300" show-overflow-tooltip align="left">
+				<el-table-column prop="fkComponyName" label="货权单位" width="200px" show-overflow-tooltip align="center">
 				</el-table-column>
-				<el-table-column prop="wgtDcnMtcCd" label="计量方式" width="100" show-overflow-tooltip header-align="center">
+				<el-table-column prop="customerName" label="客户名称" width="200px" show-overflow-tooltip align="center">
 				</el-table-column>
-				<el-table-column prop="edgeTy" label="切边类型" width="100" show-overflow-tooltip header-align="center">
+				<el-table-column prop="receiveAddress" label="收货地址" width="300" show-overflow-tooltip align="left">
 				</el-table-column>
 				<el-table-column prop="productionPlace" label="产地" width="250" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="carNo" label="入库车号" width="120px" show-overflow-tooltip align="left">
+				<el-table-column prop="packNo" label="捆包号" width="180" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="tallyPeople" label="入库理货人员" width="250" show-overflow-tooltip header-align="center">
+				<el-table-column prop="remark" label="备注" width="100px" show-overflow-tooltip align="left">
+				</el-table-column>
+				<el-table-column prop="outFlag" label="货物状态" width="100px" show-overflow-tooltip align="left" :formatter="outFormatter">
 				</el-table-column>
 				<el-table-column prop="addUser.userDesc" label="入库操作人" width="120px" show-overflow-tooltip align="left">
 				</el-table-column>
-				<el-table-column prop="addTime" label="入库时间" width="200px" show-overflow-tooltip align="left">
+				<el-table-column prop="tallyPeople" label="吊装工" width="250" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="remark" label="备注" width="100px" show-overflow-tooltip align="left">
+				<el-table-column prop="wgtDcnMtcCd" label="计量方式" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
 				<el-table-column prop="recordType" label="类型" width="100px" show-overflow-tooltip align="center" :formatter="typeFormatter">
 				</el-table-column>
-				<el-table-column prop="remark" label="备注" width="100px" show-overflow-tooltip align="left">
-				</el-table-column>
 				
 			</el-table>
 		</div>
 						break;
 				}
 			},
+			outFormatter: function(row, column) {
+				switch (row.outFlag) {
+
+					case "0":
+						return "正常在库";
+						break;
+					default:
+						return "已出库";
+						break;
+				}
+			},
 			showMaterial() {
 				this.$refs.PopupMaterial.show()
 			},

src/view/record/outrecord.vue

 				</el-table-column>
 				<el-table-column prop="materialName" label="品名" show-overflow-tooltip width="100px" header-align="center" align="center">
 				</el-table-column>
-				<el-table-column prop="ordNo" label="订单号" width="180px" show-overflow-tooltip align="left">
-				</el-table-column>
-				<el-table-column prop="inUser" label="入库人" width="100px" show-overflow-tooltip align="left">
+				<el-table-column prop="standard" label="钢种" show-overflow-tooltip width="80px" align="center">
 				</el-table-column>
-				<el-table-column prop="inCarNo" label="入库车号" width="120px" show-overflow-tooltip align="left">
+				<el-table-column prop="plateNo" label="产品编号" width="200px" show-overflow-tooltip align="center">
 				</el-table-column>
-				<el-table-column prop="inTime" label="入库时间" width="200px" show-overflow-tooltip align="left">
+				<el-table-column prop="ordNo" label="订单号" width="180px" show-overflow-tooltip align="left">
 				</el-table-column>
-				<el-table-column prop="model" label="规格" show-overflow-tooltip width="180px" align="center">
+				<el-table-column prop="model" label="规格型号" show-overflow-tooltip width="180px" align="center">
 				</el-table-column>
-				<el-table-column prop="standard" label="钢种" show-overflow-tooltip width="80px" align="center">
+				<el-table-column prop="weight" label="出库重量" width="100px" show-overflow-tooltip align="right">
 				</el-table-column>
 				<el-table-column prop="count" label="出库数量" width="100px" show-overflow-tooltip align="right">
 				</el-table-column>
-				<el-table-column prop="weight" label="出库重量" width="100px" show-overflow-tooltip align="right">
+				<el-table-column prop="contractNo" label="合约号" width="100px" show-overflow-tooltip align="left">
 				</el-table-column>
-				<el-table-column prop="invoicePrice" label="基价" width="100px" show-overflow-tooltip align="right">
+				<el-table-column prop="outCarNo" label="出库车号" width="100px" show-overflow-tooltip align="left">
 				</el-table-column>
-				<el-table-column prop="plateNo" label="钢板号" width="200px" show-overflow-tooltip align="center">
+				<el-table-column prop="addTime" label="出库时间" width="200px" show-overflow-tooltip align="left">
 				</el-table-column>
-				<el-table-column prop="customerName" label="货权单位" width="200px" show-overflow-tooltip align="center">
-				</el-table-column>   <!-- 原客户名称 -->
-				<el-table-column prop="fkComponyName" label="付款单位" width="200px" show-overflow-tooltip align="center">
-				</el-table-column>   <!-- 新增 -->
-				<el-table-column prop="receiveAddress" label="收货地址" width="300" show-overflow-tooltip align="left">
+				<el-table-column prop="fkComponyName" label="货权单位" width="200px" show-overflow-tooltip align="center">
 				</el-table-column>
-				<el-table-column prop="wgtDcnMtcCd" label="计量方式" width="100" show-overflow-tooltip header-align="center">
+				<el-table-column prop="customerName" label="客户名称" width="200px" show-overflow-tooltip align="center">
 				</el-table-column>
-				<el-table-column prop="edgeTy" label="切边类型" width="100" show-overflow-tooltip header-align="center">
+				<el-table-column prop="receiveAddress" label="收货地址" width="300" show-overflow-tooltip align="left">
 				</el-table-column>
 				<el-table-column prop="productionPlace" label="产地" width="250" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="outCarNo" label="出库车号" width="100px" show-overflow-tooltip align="left">
+				<el-table-column prop="packNo" label="捆包号" width="250" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="tallyPeople" label="出库理货人员" width="180px" show-overflow-tooltip align="left">
+				<el-table-column prop="remark" label="备注" width="100px" show-overflow-tooltip align="left">
 				</el-table-column>
 				<el-table-column prop="addId" label="出库操作人" width="120px" show-overflow-tooltip align="left">
 				</el-table-column>
-				<el-table-column prop="addTime" label="出库时间" width="200px" show-overflow-tooltip align="left">
+				<el-table-column prop="tallyPeople" label="吊装工" width="180px" show-overflow-tooltip align="left">
 				</el-table-column>
-				<el-table-column prop="remark" label="备注" width="100px" show-overflow-tooltip align="left">
+				<el-table-column prop="inCarNo" label="入库车号" width="120px" show-overflow-tooltip align="left">
+				</el-table-column>
+				<el-table-column prop="inTime" label="入库时间" width="200px" show-overflow-tooltip align="left">
+				</el-table-column>
+				<el-table-column prop="inUser" label="入库操作人" width="150px" show-overflow-tooltip align="left">
+				</el-table-column>
+				<el-table-column prop="wgtDcnMtcCd" label="计量方式" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
 				<el-table-column prop="recordType" label="类型" width="100px" show-overflow-tooltip align="center" :formatter="typeFormatter">
 				</el-table-column>
 				<el-table-column prop="verifyAccountId" v-if="false" label="对账ID" width="100px" show-overflow-tooltip align="center" >
 				</el-table-column>
-				
-				
-				
-				
-				<el-table-column prop="backFlag" label="取消标记" show-overflow-tooltip width="100px" align="center">
-				</el-table-column>
 			</el-table>
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
 			 :page-sizes="pageSizes" style="margin-left: 25px" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalRows">

src/view/ware/storechange.vue

 					<el-form-item label="垛位名称" style="margin-left: -35px">
 						<el-input v-model="query.stackName" size="small" style="width:120px;margin-left: -8px"></el-input>
 					</el-form-item>
+					<el-form-item label="钢板号" style="margin-left: -15px">
+						<el-input v-model="query.plateNo" size="small" style="width:120px;margin-left: -8px" @input="getPltList">
+						</el-input>
+					</el-form-item>
 					<el-form-item label="物料名称" style="margin-left: -35px">
 						<el-input v-model="query.materialName" size="small" style="width:120px;margin-left: -8px">
 							<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
 						</el-input>
 					</el-form-item>
 					<el-form-item label="客户名称" style="margin-left: -35px">
-						<el-input v-model="query.customerName" size="small" style="width:170px;margin-left: -8px">
-							<el-button slot="append" icon="el-icon-search" @click="showCustomer"></el-button>
-						</el-input>
+						<el-select v-model="query.fkcustmerName" filterable placeholder="请选择客户名称" clearable size="small" style="margin-left: 5px; width: 170px">
+							<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
+							</el-option>
+						</el-select>
 					</el-form-item>
-					<el-form-item label="规格型号" style="margin-left: -15px;margin-top: -3px">
+					<el-form-item label="订单客户" style="margin-left: -35px">
+						<el-select v-model="query.customerName" filterable placeholder="请选择订单客户" clearable size="small" style="margin-left: 5px; width: 170px">
+							<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
+							</el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item label="规格型号" style="margin-left: -15px">
 						<el-input v-model="query.model" size="small" style="width:120px;margin-left: -8px">
 						</el-input>
 					</el-form-item>
+					
+					<el-form-item label="订单号" style="margin-left: -15px">
+						<el-input v-model="query.ordNo" size="small" style="width:120px;margin-left: -8px" @input="getOrdList">
+						</el-input>
+					</el-form-item>
+
 					<el-form-item label="" style="margin-top: 0px;margin-left: 10px">
 						<el-button @click="handleSearch" size="small"  type="primary">查询</el-button>
 						<el-button @click="showChangeCustomer" size="small"  type="primary">货权转移</el-button>
 						<el-button type="primary" size="small"  @click="showDistribution">配货</el-button>
+            			<el-button type="primary" size="small"  @click="showOut">出库</el-button>
+            			
+						<el-button type="primary" size="small"  @click="resetButton" >重置</el-button>
+            			<el-button type="success" size="small"  @click="handleExport" >导出记录</el-button>
+						
+					</el-form-item>
+					<el-form-item label="" style="margin-top: 0px;margin-left: 10px">
+						<el-dropdown placement="bottom" trigger="click" @command="batchOperate">
+							<el-button type="danger" size="small"> 其他操作<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+							<el-dropdown-menu slot="dropdown">
+								<el-dropdown-item command="handleInBack" style="background-color: #f5f5f5;">取消入库</el-dropdown-item>
+								<el-dropdown-item command="handleChangeCustomer" style="background-color: #f5f5f5;">修改客户</el-dropdown-item>
+							</el-dropdown-menu>
+						</el-dropdown>
+						
 					</el-form-item>
 				</el-row>
 				
 				</el-table-column>
 				<el-table-column prop="wgtDcnMtcCd" label="计量方式" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="" label="月付方式" width="100" show-overflow-tooltip header-align="center">
+				<el-table-column prop="payWay" label="月付方式" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
 				<el-table-column prop="inwareDay" label="存储天数" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
 
 		<popup-material ref="PopupMaterial" @receviceFromChild="receviceFromMaterial"></popup-material>
 		<popup-customer ref="PopupCustomer" @receviceFromChild="receviceFromCustomer"></popup-customer>
+		<popup-customer ref="PopupFKcustmer" @receviceFromChild="receviceFKcustmerr"></popup-customer>
 		<popup-customer ref="PopupNewCustomer" @receviceFromChild="receviceFromNewCustomer"></popup-customer>
 		<popup-address ref="PopupAddress" @receviceFromChild="receviceFromAddress"></popup-address>
 		<popup-distribution ref="PopupDistribution" @receviceFromChild="receviceFromDistreibution" :selectRows="selectRows"></popup-distribution>
 		<popup-in ref="PopupIn" @receviceFromChild="receviceFromIn" :wares="options" :wareId="query.wareId" :stack="moveFromStack"></popup-in>
 		<el-dialog title="货权转移" :visible.sync="customerDialogVisible" width="500px">
 			<el-form>
-				<el-form-item label="货权转移">
-					<el-input v-model="newCustomer.name">
-						<el-button slot="append" icon="el-icon-search" @click="showNewCustomer"></el-button>
+				<el-form-item label="旧货主">
+					<el-input v-model="oldCustomer">
 					</el-input>
 				</el-form-item>
+				<el-form-item label="新货主">
+					<el-select v-model="newCustomer.name" filterable placeholder="请选择订单客户" clearable>
+						<el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id" >
+						</el-option>
+					</el-select>
+				</el-form-item>
 				<el-form-item label="修改地址">
 					<el-input v-model="newAddress">
 						<el-button slot="append" icon="el-icon-search" @click="showAddress"></el-button>
 				</el-form-item>
 			</el-form>
 		</el-dialog>
+
+		<el-dialog title="垛位备注" :visible.sync="stackDialogVisible" width="500px">
+			<el-form>
+				<el-form-item label="库房名称" style="margin-left: -15px">
+					<el-select v-model="newWare" clearable size="small" style="width:120px;margin-left: -8px">
+						<el-option v-for="item in optionsWare" :key="item.id" :label="item.name" :value="item.name">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="新垛位">
+					<el-input v-model="newStack">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="新垛位备注">
+					<el-input v-model="newRemark1">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="新备注信息">
+					<el-input v-model="newRemark">
+					</el-input>
+				</el-form-item>
+				<el-form-item label=" ">
+					<el-button type="success" @click="handleStackSave">保存</el-button>
+					<el-button type="danger" @click="handleStackCancelSave">取消</el-button>
+				</el-form-item>
+			</el-form>
+		</el-dialog>
+
+		<el-dialog title="修改客户信息" :visible.sync="changeCUSTDialogVisible" width="500px">
+			<el-form>
+				<el-form-item label="新订单客户" >
+					<el-select v-model="newCustomername" filterable placeholder="请选择客户名称" clearable size="small" >
+						<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="新客户名称" >
+					<el-select v-model="newFKCustomername" filterable placeholder="请选择客户名称" clearable size="small" >
+						<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
+						</el-option>
+					</el-select>
+				</el-form-item>
+				
+				<el-form-item label=" ">
+					<el-button type="success" @click="handleChangeCUSTSave">保存</el-button>
+					<el-button type="danger" @click="handleChangeCUSTCancelSave">取消</el-button>
+				</el-form-item>
+			</el-form>
+		</el-dialog>
 		<el-dialog title="库房明细" :visible.sync="importDialogVisible" width="1000px">
 
 			<el-upload class="upload-demo" action="" :on-change="handleChange" :on-exceed="handleExceed" :on-remove="handleRemove"
 			</el-table>
 
 		</el-dialog>
+		
 	</div>
 </template>
 
 	import PopupDistribution from '@/components/PopupDistribution.vue'
 	import PopupOut from '@/components/PopupOut.vue'
 	import PopupIn from '@/components/PopupIn.vue'
+	import Export2Excel from '../../excel/Export2Excel.js'
 	import {
 		mapState
 	} from 'vuex'
 			PopupIn,
 		},
 		computed: {
+			// splitCount: function() {
+			// 	let result = Number(this.split.originalCount) - Number(this.split.count)
+			// 	return result
+			// },
+			// splitWeight: function() {
+			// 	let result = Number(this.split.originalWeight) - Number(this.split.weight)
+			// 	return result
+			// },
 			...mapState({
 				serverName: state => state.app.serverName,
+				// wareBackgroundColor: state => state.color.wareBackgroundColor,
+				// stackColor: state => state.color.stackColor,
+				// stackSelectedColor: state => state.color.stackSelectedColor,
+				// lockColor: state => state.color.lockColor,
 			})
 		},
 		data() {
 					materialName: '',
 					standard: '',
 					customerName: '',
-					plateNo: '',
+					plateNo: [],
 					wareId:'',
+					ordNo:[],
+					fkcustmerName:'',
+					remark1:''
 				},
 				multipleSelection: [],
 				tableData: [],
 				optionsWare: [],
 
-
+				oldCustomer:'',
 				newCustomer: {
 					id: '',
 					name: ''
 
 				currentPage: 1,
 				totalRows: 0,
-				pageSizes: [50, 100, 200],
-				pageSize: 50,
+				pageSizes: [50, 100, 200,1000],
+				pageSize: 1000,
 				HideAndShow: 0,
 
 
 				fileTemp: [],
 				imTableData: [],
 				moveStore: {},
+                optionsCust: [],
+				sumCount:'',
+				sumWeight:'',
+
+				stackDialogVisible: false,
+				newWare:'',
+				newStack:'',
+				newRemark1:'',
+				newRemark:'',
+				changeCUSTDialogVisible: false,
+				newCustomername:'',
+				newFKCustomername:''
 			};
 		},
 		mounted() {
 			this.getWare()
+			this.getAllCustomer()
 			//this.getTableData()
 		},
 		methods: {
 				this.query.materialName = material.name
 				this.query.standard = material.standard
 			},
+			batchOperate(command) {
+				switch (command) {
+					case "handleInBack":
+						this.handleInBack();
+						break;
+					case "handleChangeCustomer":
+						this.handleChangeCustomer();
+						break;
+				}
+			},
 
 			showCustomer() {
 				this.$refs.PopupCustomer.show()
 				this.query.customerName = customer.name
 			},
 
+			
+			showFKcustmer() {
+				this.$refs.PopupFKcustmer.show()
+			},
+			receviceFKcustmerr(customer) {
+				this.query.fkcustmerName = customer.name
+			},
+
 			showNewCustomer() {
 				this.$refs.PopupNewCustomer.show()
 			},
 					'/import.xls')
 			},
 			showIn() {
+				// if (this.query.wareId == '') {
+				// 	this.$message({
+				// 		type: 'error',
+				// 		message: '请选择入库库房'
+				// 	});
+				// 	return
+				// }
+				// if (this.query.stackId == '') {
+				// 	this.$message({
+				// 		type: 'error',
+				// 		message: '请选择入库垛位'
+				// 	});
+				// 	return
+				// }
 				this.$refs.PopupIn.show()
 			},
 			handleInBack() {
-				if (this.selectRows.length < 1) {
-					this.$message({
+				this.$confirm("确认删除吗?", "提示", {
+					confirmButtonText:'确认',
+					cancelButtonText:'取消',
+					type: "warning"
+				}).then(() => {
+					if (this.selectRows.length < 1) {
+						this.$message({
 						type: 'error',
 						message: '至少选择一条数据！',
-					});
-					return
-				} else {
-					var url = 'WareIn/back.do'
-					var param = {
-						json: JSON.stringify(this.selectRows),
-					}
-					axios.post(url, param).then(response => {
-						if (response.data.code == 0) {
-							this.getStoreByStackId(response.data.data)
-						} else {
-							this.$message({
-								type: 'error',
-								message: '操作失败；' + response.data.msg,
-							});
+						});
+						return
+					} else {
+						var url = 'WareIn/back.do'
+						var param = {
+							json: JSON.stringify(this.selectRows),
 						}
-					});
-				}
+						axios.post(url, param).then(response => {
+							if (response.data.code == 0) {
+								this.getStoreByStackId(response.data.data)
+							} else {
+								this.$message({
+									type: 'error',
+									message: '操作失败；' + response.data.msg,
+								});
+							}
+						});
+					}
+				}).catch(() => {});
+				
+			},
+			resetButton(){      //查询条件重置
+				this.query.wareName = '',
+				this.query.stackName = '',
+				this.query.model = '',
+				this.query.materialName = '',
+				this.query.standard = '',
+				this.query.customerName = '',
+				this.query.plateNo = '',
+				this.query.wareId = '',
+				this.query.ordNo = '',
+				this.query.fkcustmerName = ''
 			},
 			showDistribution() {
 				//console.log(this.selectRows.length)
 				this.$refs.PopupDistribution.show()
 
 			},
+			handleChangeCustomer(){
+				this.newCustomername = '',
+				this.newFKCustomername='',
+				this.changeCUSTDialogVisible= true
+			},
 			showOut() {
 				this.$refs.PopupOut.show()
 			},
 					}
 				});
 			},
+			getAllCustomer() {
+				var url = 'MaintCustomer/queryByUserId.do'
+				var param = {}
+				axios.get(url, param).then(response => {
+					this.optionsCust = response.data.data
+				});
+			},
 			handleSizeChange(val) {
 				this.pageSize = val
 				this.getTableData()
 					model: this.query.model,
 					materialName: this.query.materialName,
 					standard: this.query.standard,
-					customerName: this.query.customerName
+					customerName: this.query.customerName,
+					fkcustmerName: this.query.fkcustmerName,
+					plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
+					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
+					remark1: this.query.remark1
 				}
+				//console.log(param);
 				axios.get(url, param).then(response => {
 					if (response.data.code == 0) {
+						//console.log(response.data.data.list);
 						this.tableData = response.data.data.list
 						this.totalRows = response.data.data.total
 					} else {
 			},
 			handleSelectionChange(val) {
 				this.multipleSelection = val;
+				this.sumCount =0;
+				this.sumWeight=0;
+				for (var i = 0; i < this.multipleSelection.length; i++){
+					this.sumCount = parseInt(this.multipleSelection[i].count)+parseInt(this.sumCount);
+					this.sumWeight = parseFloat(this.multipleSelection[i].weight)+parseFloat(this.sumWeight);
+				}
+				this.sumWeight = this.sumWeight.toFixed(3);
 			},
 			showChangeCustomer() {
 				if (this.multipleSelection.length < 1) {
 					}
 				}
 				if (boolean) {
-					this.newCustomer = this.multipleSelection[0].customer
-					this.newAddress = this.multipleSelection[0].receiveAddress
+					this.oldCustomer = this.multipleSelection[0].customer.name
+					//this.newAddress = this.multipleSelection[0].receiveAddress
+					this.newCustomer.name = "",
+					this.newCustomer.id = "",
 					this.customerDialogVisible = true
+					
 				} else {
 					this.$message({
 						type: 'error',
 			},
 
 			handleCustomerSave() {
+				this.newCustomer.id = this.newCustomer.name;
 				var url = 'WareChange/changeCustomer.do'
 				var param = {
+
 					json: JSON.stringify(this.multipleSelection),
 					customer: JSON.stringify(this.newCustomer),
 					address: this.newAddress
 			handleCustomerCancelSave() {
 				this.customerDialogVisible = false
 			},
+			handleRemark1(){
+				this.stackDialogVisible= true;
+				this.newStack='';
+				this.newRemark1='';
+				this.newRemark = '';
+			},
+			handleChangeCUSTSave(){
+				var url = 'WareStore/changeCustName.do'
+				var param = {
+					json: JSON.stringify(this.multipleSelection),
+					newCustomername: this.newCustomername,
+					newFKCustomername: this.newFKCustomername,
+				}
+				axios.post(url, param).then(response => {
+					if (response.data.code == 0) {
+						this.getTableData()
+						this.changeCUSTDialogVisible = false
+					} else {
+						this.$message({
+							type: 'error',
+							message: '操作失败；' + response.data.msg,
+						});
+					}
+				});
+			},
+			handleChangeCUSTCancelSave(){
+				this.changeCUSTDialogVisible = false
+			},
+			handleStackSave(){
+				var url = 'WareStore/changeStack.do'
+				var param = {
+
+					json: JSON.stringify(this.multipleSelection),
+					newWare: this.newWare,
+					newStack: this.newStack,
+					newRemark1: this.newRemark1,
+					newRemark: this.newRemark
+				}
+				axios.post(url, param).then(response => {
+					if (response.data.code == 0) {
+						this.getTableData()
+						this.stackDialogVisible = false
+					} else {
+						this.$message({
+							type: 'error',
+							message: '操作失败；' + response.data.msg,
+						});
+					}
+				});
+			},
+			handleStackCancelSave(){
+				this.stackDialogVisible = false
+			},
 			inImport() {
 				var url = 'WareIn/inImport.do'
 				var json = JSON.stringify(this.imTableData)
 			handleTableSelect(selection, row) {  //第一个参数是目前所有选中的数据
 				console.log(JSON.stringify(row))
 				if (row.lockFlag == '1') {
+					// this.$message({
+					// 	type: 'error',
+					// 	message: '该行已被配货锁定',
+					// });
 					alert("该行已被配货锁定")
 					this.toggleSelection([row], false)
-
+					// for(let i = 0;i<selection.length;i++){
+					//  if(selection[i]==row){
+					// 	 selection.splice(i,1)
+					//  }
+					// }
 				} else {
 					this.selectRows = selection
 					this.setLayerColor()
 			},
 			selectAll(selection){
 				this.selectRows = selection;
-			}
+			},
+			getlist(){
+				const replaceResult = this.query.plateNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
+				this.query.plateNo = replaceResult;
+			},
+			getPltList(){
+				const replaceResult = this.query.plateNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
+				this.query.plateNo = replaceResult;
+			},
+			getOrdList(){
+				const replaceResult = this.query.ordNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
+				this.query.ordNo = replaceResult;
+			},
+
+			handleExport() {
+				var imptData = [];
+				var url = 'WareStore/queryStore.do'
+				var param = {
+					page: -1,
+					rows: -1,
+					wareName: this.query.wareName,
+					stackName: this.query.stackName,
+					model: this.query.model,
+					materialName: this.query.materialName,
+					standard: this.query.standard,
+					customerName: this.query.customerName,
+					fkcustmerName: this.query.fkcustmerName,
+					plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
+					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
+					remark1: this.query.remark1
+				}
+
+
+				axios.get(url, param).then(response => {
+
+					if (response.data.code == 0) {
+						console.log(response);
+						var imptData = response.data.data;
+						if (imptData.length == 0) {
+							this.$alert('无法导出，没有库存', '提示', {
+								confirmButtonText: '确定',
+								callback: action => {}
+							});
+						} else {
+
+							this.exportExcel(imptData)
+						}
+					} else {
+						this.$message({
+							type: 'error',
+							message: '操作失败；' + response.data.msg,
+						});
+					}
+
+				});
+				
+			},
+			exportExcel(imptData) {
+				// alert(JSON.stringify(imptData))
+				const header = ["层数"
+								,"垛位"
+								,"货物品名"
+								,"材质"
+								,"钢板号"
+								,"规格型号"
+								,"数量"
+								,"重量"
+								,"订单号"
+								,"合约号"
+								,"订单客户"
+								,"客户名称"
+								,"收货地址"
+								,"产地"
+								,"备注"
+								,"垛位备注"
+								,"入库时间"
+								,"入库车号"
+
+				] // 导出的表头名
+				const filterVal = ["layer"
+									,"stackName"
+									,"materialName"
+									,"materialStandard"
+									,"plateNo"
+									,"model"
+									,"count"
+									,"weight"
+									,"ordNo"
+									,"contractNo"
+									,"customerName"
+									,"customerName"
+									,"receiveAddress"
+									,"productionPlace"
+									,"remark"
+									,"remark1"
+									,"addTime"
+									,"carNo"
+				]
+				for(var i=0;i<imptData.length;i++){
+					imptData[i]["stackName"] 			= imptData[i].stack.name;
+					imptData[i]["materialName"]     	= imptData[i].material.name;
+					imptData[i]["materialStandard"]     = imptData[i].material.standard;
+					imptData[i]["customerName"]     	= imptData[i].customer.name;
+				}
+				const list = imptData
+				const data = this.formatJson(filterVal, list)
+
+				const filename = '库存信息' + (new Date()).toLocaleDateString();
+				Export2Excel.export_json_to_excel({
+					header,
+					data,
+					filename
+				})
+			},
+			formatJson(filterVal, jsonData) {
+				return jsonData.map(v => filterVal.map(j => {
+					return v[j]
+				}))
+			},
+
+			//showChangeAddress() {},
+			// handleAddressSave() {
+			// },
+			// handleAddressCancelSave() {
+			// 	this.addressDialogVisible = false
+			// },
 		},
 	}
 </script>