111

src/view/record/outrecord.vue

@@ -587,13 +587,13 @@
 				this.selectRows = val
 			},
 			handleOutBack() {
-				if (this.selectRows.length != 1) {
-					this.$message({
-						type: 'error',
-						message: '只能选择一条数据取消出库！',
-					});
-					return
-				}
+				// if (this.selectRows.length != 1) {
+				// 	this.$message({
+				// 		type: 'error',
+				// 		message: '只能选择一条数据取消出库！',
+				// 	});
+				// 	return
+				// }
 
 				if (this.selectRows[0].recordType == '0') {
 					this.$message({

src/view/ware/storechange.vue

@@ -64,11 +64,20 @@
             			<el-button type="primary" size="small"  @click="showOut">出库</el-button>
             			<el-button type="danger"  size="small"  @click="handleInBack" :disabled="backAble">取消入库</el-button>
 						<el-button type="primary" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
+						<el-button type="primary" size="small"  @click="handleRemark1" :disabled="backAble">修改垛位备注</el-button>
 					</el-form-item>
 						<!-- <el-button type="primary" @click="showOut">出库</el-button> -->
 					<!-- 	<el-form-item label=" ">
 						<el-button @click="showChangeAddress" type="primary">修改地址</el-button>
 					</el-form-item> -->
+					<el-form-item label="数量" style="margin-left: -15px">
+						<el-input v-model="sumCount" 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="sumWeight" size="small" style="width:120px;margin-left: -8px">
+						</el-input>
+					</el-form-item>
 				</el-row>
 				
 			</el-form>
@@ -142,8 +151,31 @@
 					</el-input>
 				</el-form-item>
 				<el-form-item label=" ">
-					<el-button type="success" @click="handleCustomerSave">保存</el-button>
-					<el-button type="danger" @click="handleCustomerCancelSave">取消</el-button>
+					<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="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-button type="success" @click="handleStackSave">保存</el-button>
+					<el-button type="danger" @click="handleStackCancelSave">取消</el-button>
 				</el-form-item>
 			</el-form>
 		</el-dialog>
@@ -270,6 +302,13 @@
 				imTableData: [],
 				moveStore: {},
                 optionsCust: [],
+				sumCount:'',
+				sumWeight:'',
+
+				stackDialogVisible: false,
+				newWare:'',
+				newStack:'',
+				newRemark1:'',
 			};
 		},
 		mounted() {
@@ -443,10 +482,10 @@
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
 					remark1: this.query.remark1
 				}
-				console.log(param);
+				//console.log(param);
 				axios.get(url, param).then(response => {
 					if (response.data.code == 0) {
-						console.log(response.data.data.list);
+						//console.log(response.data.data.list);
 						this.tableData = response.data.data.list
 						this.totalRows = response.data.data.total
 					} else {
@@ -460,6 +499,13 @@
 			},
 			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) {
@@ -515,6 +561,35 @@
 			handleCustomerCancelSave() {
 				this.customerDialogVisible = false
 			},
+			handleRemark1(){
+				this.stackDialogVisible= true;
+				this.newStack='';
+				this.newRemark1='';
+			},
+			handleStackSave(){
+				var url = 'WareStore/changeStack.do'
+				var param = {
+
+					json: JSON.stringify(this.multipleSelection),
+					newWare: this.newWare,
+					newStack: this.newStack,
+					newRemark1: this.newRemark1
+				}
+				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
+			},
 			handleInBack() {
 				if (this.selectRows.length < 1) {
 					this.$message({