YL2767 2 months ago
parent
commit
a17942f6ad
2 changed files with 86 additions and 11 deletions
  1. 7
    7
      src/view/record/outrecord.vue
  2. 79
    4
      src/view/ware/storechange.vue

+ 7
- 7
src/view/record/outrecord.vue View File

587
 				this.selectRows = val
587
 				this.selectRows = val
588
 			},
588
 			},
589
 			handleOutBack() {
589
 			handleOutBack() {
590
-				if (this.selectRows.length != 1) {
591
-					this.$message({
592
-						type: 'error',
593
-						message: '只能选择一条数据取消出库!',
594
-					});
595
-					return
596
-				}
590
+				// if (this.selectRows.length != 1) {
591
+				// 	this.$message({
592
+				// 		type: 'error',
593
+				// 		message: '只能选择一条数据取消出库!',
594
+				// 	});
595
+				// 	return
596
+				// }
597
 
597
 
598
 				if (this.selectRows[0].recordType == '0') {
598
 				if (this.selectRows[0].recordType == '0') {
599
 					this.$message({
599
 					this.$message({

+ 79
- 4
src/view/ware/storechange.vue View File

64
             			<el-button type="primary" size="small"  @click="showOut">出库</el-button>
64
             			<el-button type="primary" size="small"  @click="showOut">出库</el-button>
65
             			<el-button type="danger"  size="small"  @click="handleInBack" :disabled="backAble">取消入库</el-button>
65
             			<el-button type="danger"  size="small"  @click="handleInBack" :disabled="backAble">取消入库</el-button>
66
 						<el-button type="primary" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
66
 						<el-button type="primary" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
67
+						<el-button type="primary" size="small"  @click="handleRemark1" :disabled="backAble">修改垛位备注</el-button>
67
 					</el-form-item>
68
 					</el-form-item>
68
 						<!-- <el-button type="primary" @click="showOut">出库</el-button> -->
69
 						<!-- <el-button type="primary" @click="showOut">出库</el-button> -->
69
 					<!-- 	<el-form-item label=" ">
70
 					<!-- 	<el-form-item label=" ">
70
 						<el-button @click="showChangeAddress" type="primary">修改地址</el-button>
71
 						<el-button @click="showChangeAddress" type="primary">修改地址</el-button>
71
 					</el-form-item> -->
72
 					</el-form-item> -->
73
+					<el-form-item label="数量" style="margin-left: -15px">
74
+						<el-input v-model="sumCount" size="small" style="width:120px;margin-left: -8px">
75
+						</el-input>
76
+					</el-form-item>
77
+					<el-form-item label="重量" style="margin-left: -15px">
78
+						<el-input v-model="sumWeight" size="small" style="width:120px;margin-left: -8px">
79
+						</el-input>
80
+					</el-form-item>
72
 				</el-row>
81
 				</el-row>
73
 				
82
 				
74
 			</el-form>
83
 			</el-form>
142
 					</el-input>
151
 					</el-input>
143
 				</el-form-item>
152
 				</el-form-item>
144
 				<el-form-item label=" ">
153
 				<el-form-item label=" ">
145
-					<el-button type="success" @click="handleCustomerSave">保存</el-button>
146
-					<el-button type="danger" @click="handleCustomerCancelSave">取消</el-button>
154
+					<el-button type="success" @click="handleStackSave">保存</el-button>
155
+					<el-button type="danger" @click="handleStackCancelSave">取消</el-button>
156
+				</el-form-item>
157
+			</el-form>
158
+		</el-dialog>
159
+
160
+		<el-dialog title="垛位备注" :visible.sync="stackDialogVisible" width="500px">
161
+			<el-form>
162
+				<el-form-item label="库房名称" style="margin-left: -15px">
163
+					<el-select v-model="newWare" clearable size="small" style="width:120px;margin-left: -8px">
164
+						<el-option v-for="item in optionsWare" :key="item.id" :label="item.name" :value="item.name">
165
+						</el-option>
166
+					</el-select>
167
+				</el-form-item>
168
+				<el-form-item label="新垛位">
169
+					<el-input v-model="newStack">
170
+					</el-input>
171
+				</el-form-item>
172
+				<el-form-item label="新垛位备注">
173
+					<el-input v-model="newRemark1">
174
+					</el-input>
175
+				</el-form-item>
176
+				<el-form-item label=" ">
177
+					<el-button type="success" @click="handleStackSave">保存</el-button>
178
+					<el-button type="danger" @click="handleStackCancelSave">取消</el-button>
147
 				</el-form-item>
179
 				</el-form-item>
148
 			</el-form>
180
 			</el-form>
149
 		</el-dialog>
181
 		</el-dialog>
270
 				imTableData: [],
302
 				imTableData: [],
271
 				moveStore: {},
303
 				moveStore: {},
272
                 optionsCust: [],
304
                 optionsCust: [],
305
+				sumCount:'',
306
+				sumWeight:'',
307
+
308
+				stackDialogVisible: false,
309
+				newWare:'',
310
+				newStack:'',
311
+				newRemark1:'',
273
 			};
312
 			};
274
 		},
313
 		},
275
 		mounted() {
314
 		mounted() {
443
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
482
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
444
 					remark1: this.query.remark1
483
 					remark1: this.query.remark1
445
 				}
484
 				}
446
-				console.log(param);
485
+				//console.log(param);
447
 				axios.get(url, param).then(response => {
486
 				axios.get(url, param).then(response => {
448
 					if (response.data.code == 0) {
487
 					if (response.data.code == 0) {
449
-						console.log(response.data.data.list);
488
+						//console.log(response.data.data.list);
450
 						this.tableData = response.data.data.list
489
 						this.tableData = response.data.data.list
451
 						this.totalRows = response.data.data.total
490
 						this.totalRows = response.data.data.total
452
 					} else {
491
 					} else {
460
 			},
499
 			},
461
 			handleSelectionChange(val) {
500
 			handleSelectionChange(val) {
462
 				this.multipleSelection = val;
501
 				this.multipleSelection = val;
502
+				this.sumCount =0;
503
+				this.sumWeight=0;
504
+				for (var i = 0; i < this.multipleSelection.length; i++){
505
+					this.sumCount = parseInt(this.multipleSelection[i].count)+parseInt(this.sumCount);
506
+					this.sumWeight = parseFloat(this.multipleSelection[i].weight)+parseFloat(this.sumWeight);
507
+				}
508
+				this.sumWeight = this.sumWeight.toFixed(3);
463
 			},
509
 			},
464
 			showChangeCustomer() {
510
 			showChangeCustomer() {
465
 				if (this.multipleSelection.length < 1) {
511
 				if (this.multipleSelection.length < 1) {
515
 			handleCustomerCancelSave() {
561
 			handleCustomerCancelSave() {
516
 				this.customerDialogVisible = false
562
 				this.customerDialogVisible = false
517
 			},
563
 			},
564
+			handleRemark1(){
565
+				this.stackDialogVisible= true;
566
+				this.newStack='';
567
+				this.newRemark1='';
568
+			},
569
+			handleStackSave(){
570
+				var url = 'WareStore/changeStack.do'
571
+				var param = {
572
+
573
+					json: JSON.stringify(this.multipleSelection),
574
+					newWare: this.newWare,
575
+					newStack: this.newStack,
576
+					newRemark1: this.newRemark1
577
+				}
578
+				axios.post(url, param).then(response => {
579
+					if (response.data.code == 0) {
580
+						this.getTableData()
581
+						this.stackDialogVisible = false
582
+					} else {
583
+						this.$message({
584
+							type: 'error',
585
+							message: '操作失败;' + response.data.msg,
586
+						});
587
+					}
588
+				});
589
+			},
590
+			handleStackCancelSave(){
591
+				this.stackDialogVisible = false
592
+			},
518
 			handleInBack() {
593
 			handleInBack() {
519
 				if (this.selectRows.length < 1) {
594
 				if (this.selectRows.length < 1) {
520
 					this.$message({
595
 					this.$message({

Loading…
Cancel
Save