瀏覽代碼

明晋仓储管理修改内容

出库记录界面增加记录删除功能;(已完成)

库存操作界面调整按钮位置,将"导出记录"按钮移至"修改垛位备注"后面;(已完成)

出库记录界面增加"更多操作"按钮,该按钮中包含"取消出库"和"删除记录"按钮,以及增加确认功能,防止误操作;(已完成)

入库记录界面增加"更多操作"按钮,该按钮中包含"取消出库"和"删除记录"按钮,以及增加确认功能,防止误操作;(已完成)

修复逻辑内容
返修材料可以入库,(已完成)
货权转移的时候无论增加还是减少都不要保留上次的客户名,(已完成)
配货增加限制,防止出现配货配重的情况(已完成)

说明内容:出库记录界面和入库记录界面的删除功能只能删除多余的信息,并不会将正在使用的信息删除
例子,一块板子按照以下次序操作,入库->取消入库->再入库,入库界面出现三条记录,此时全部选中点击删除记录的话,只会删除第一次的入库记录和取消入库的记录,最后一次的入库记录是不会删除的。
YL2767 2 月之前
父節點
當前提交
a8b7642498
共有 4 個文件被更改,包括 110 次插入48 次删除
  1. 1
    1
      src/view/maint/cargo.vue
  2. 18
    1
      src/view/record/inrecord.vue
  3. 46
    1
      src/view/record/outrecord.vue
  4. 45
    45
      src/view/ware/storechange.vue

+ 1
- 1
src/view/maint/cargo.vue 查看文件

303
 				this.dialogVisible = true
303
 				this.dialogVisible = true
304
 				this.change.id = tempRow.id
304
 				this.change.id = tempRow.id
305
 				this.change.uperCustomer = tempRow.uperCustomer.id
305
 				this.change.uperCustomer = tempRow.uperCustomer.id
306
-				this.change.Customer = tempRow.customer.id
306
+				this.change.Customer = ''
307
 				this.change.sub = ''
307
 				this.change.sub = ''
308
 				this.change.weight = ''
308
 				this.change.weight = ''
309
 			},
309
 			},

+ 18
- 1
src/view/record/inrecord.vue 查看文件

81
 							<el-form-item label="" style="margin-top: -15px">
81
 							<el-form-item label="" style="margin-top: -15px">
82
 							    <el-button type="primary" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
82
 							    <el-button type="primary" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
83
 							</el-form-item>
83
 							</el-form-item>
84
-							<el-form-item label="" style="margin-top: -15px">
84
+							<!-- <el-form-item label="" style="margin-top: -15px">
85
 							    <el-button type="danger" size="small"  @click="deleteRecord" :disabled="backAble">删除记录</el-button>
85
 							    <el-button type="danger" size="small"  @click="deleteRecord" :disabled="backAble">删除记录</el-button>
86
+							</el-form-item> -->
87
+							<el-form-item label="" style="margin-top: -15px">
88
+								<el-dropdown placement="bottom" trigger="click" @command="batchOperate">
89
+									<el-button type="danger" size="small"> 其他操作<i class="el-icon-arrow-down el-icon--right"></i></el-button>
90
+									<el-dropdown-menu slot="dropdown">
91
+										<el-dropdown-item command="deleteRecord" style="background-color: #f5f5f5;">删除记录</el-dropdown-item>
92
+									</el-dropdown-menu>
93
+								</el-dropdown>
94
+								
86
 							</el-form-item>
95
 							</el-form-item>
87
 						</el-row>
96
 						</el-row>
88
 					</el-form>
97
 					</el-form>
251
 						break;
260
 						break;
252
 				}
261
 				}
253
 			},
262
 			},
263
+			batchOperate(command) {
264
+				switch (command) {
265
+					case "deleteRecord":
266
+						this.deleteRecord();
267
+						break;
268
+				}
269
+			},
270
+
254
 			handleTableSelect(selection, row) {  //第一个参数是目前所有选中的数据
271
 			handleTableSelect(selection, row) {  //第一个参数是目前所有选中的数据
255
 				console.log(JSON.stringify(row))
272
 				console.log(JSON.stringify(row))
256
 				this.selectRows = selection
273
 				this.selectRows = selection

+ 46
- 1
src/view/record/outrecord.vue 查看文件

68
 						<el-form-item label=" " style="margin-left: -60px">
68
 						<el-form-item label=" " style="margin-left: -60px">
69
 							<el-button @click="handleSearch" type="primary" size="small">查询</el-button>
69
 							<el-button @click="handleSearch" type="primary" size="small">查询</el-button>
70
 							<el-button @click="handlePrintOut" type="primary" size="small" style="width:90px;text-align: left">打印出库单</el-button>
70
 							<el-button @click="handlePrintOut" type="primary" size="small" style="width:90px;text-align: left">打印出库单</el-button>
71
-							<el-button @click="handleOutBack" type="danger" size="small" style="width:70px">取消出库</el-button>
71
+							<!-- <el-button @click="handleOutBack" type="danger" size="small" style="width:70px">取消出库</el-button> -->
72
 							<el-button @click="handleVerifyAcc" type="primary" size="small" style="width:70px">对账</el-button>
72
 							<el-button @click="handleVerifyAcc" type="primary" size="small" style="width:70px">对账</el-button>
73
 							<el-button @click="handleModifyPrice" type="primary" size="small" >批量改价</el-button>
73
 							<el-button @click="handleModifyPrice" type="primary" size="small" >批量改价</el-button>
74
 							<el-button type="primary" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
74
 							<el-button type="primary" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
82
 								<el-button   type="success" @click="handleExport" style="margin-left: 2px" size="small">导出记录</el-button>
82
 								<el-button   type="success" @click="handleExport" style="margin-left: 2px" size="small">导出记录</el-button>
83
 							</el-upload>
83
 							</el-upload>
84
 						</el-form-item>
84
 						</el-form-item>
85
+						<el-form-item label="" style="margin-top: 0px;margin-left: 10px">
86
+						<el-dropdown placement="bottom" trigger="click" @command="batchOperate">
87
+							<el-button type="danger" size="small"> 其他操作<i class="el-icon-arrow-down el-icon--right"></i></el-button>
88
+							<el-dropdown-menu slot="dropdown">
89
+								<el-dropdown-item command="handleOutBack" style="background-color: #f5f5f5;">取消出库</el-dropdown-item>
90
+								<el-dropdown-item command="handleDeleteRecord" style="background-color: #f5f5f5;">删除记录</el-dropdown-item>
91
+							</el-dropdown-menu>
92
+						</el-dropdown>
93
+						
94
+					</el-form-item>
85
 						
95
 						
86
 					</el-row>
96
 					</el-row>
87
 				</el-form>
97
 				</el-form>
361
 					this.optionsCust = response.data.data
371
 					this.optionsCust = response.data.data
362
 				});
372
 				});
363
 			},
373
 			},
374
+			batchOperate(command) {
375
+				switch (command) {
376
+					case "handleOutBack":
377
+						this.handleOutBack();
378
+						break;
379
+					case "handleDeleteRecord":
380
+						this.handleDeleteRecord();
381
+						break;
382
+				}
383
+			},
364
 			handleSavePriceMod(){
384
 			handleSavePriceMod(){
365
 				var url = 'WareOutRecord/savePriceMod.do'
385
 				var url = 'WareOutRecord/savePriceMod.do'
366
 				var param = {
386
 				var param = {
481
 					this.query.remark1='';
501
 					this.query.remark1='';
482
 					this.setSearchTime()
502
 					this.setSearchTime()
483
 			},
503
 			},
504
+			handleDeleteRecord(){
505
+				if (this.selectRows.length < 1) {
506
+					this.$message({
507
+						type: 'error',
508
+						message: '至少选择一条数据!',
509
+					});
510
+					return
511
+				}else{
512
+					var url = 'WareOutRecord/deleterecord.do'
513
+					var param = {
514
+						json: JSON.stringify(this.selectRows),
515
+					}
516
+					axios.post(url, param).then(response => {
517
+						if (response.data.code == 0) {
518
+							this.getTableData()
519
+							this.stackDialogVisible = false
520
+						} else {
521
+							this.$message({
522
+								type: 'error',
523
+								message: '操作失败;' + response.data.msg,
524
+							});
525
+						}
526
+					});
527
+				}
528
+			},
484
 			numSub(num1, num2) { 
529
 			numSub(num1, num2) { 
485
 				var baseNum, baseNum1, baseNum2; 
530
 				var baseNum, baseNum1, baseNum2; 
486
 				var precision;// 精度 
531
 				var precision;// 精度 

+ 45
- 45
src/view/ware/storechange.vue 查看文件

60
 						<el-button size="medium" type="success" @click="showIn">入库</el-button>
60
 						<el-button size="medium" type="success" @click="showIn">入库</el-button>
61
 						<el-button size="medium" type="danger" @click="handleInBack">取消入库</el-button> -->
61
 						<el-button size="medium" type="danger" @click="handleInBack">取消入库</el-button> -->
62
 						<el-button type="primary" size="small"  @click="showDistribution">配货</el-button>
62
 						<el-button type="primary" size="small"  @click="showDistribution">配货</el-button>
63
-            			<el-button type="success" size="small"  @click="handleExport" >导出记录</el-button>
64
             			<el-button type="primary" size="small"  @click="showOut">出库</el-button>
63
             			<el-button type="primary" size="small"  @click="showOut">出库</el-button>
65
-            			<el-button type="danger"  size="small"  @click="handleInBack" :disabled="backAble">取消入库</el-button>
64
+            			
66
 						<el-button type="primary" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
65
 						<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>
66
 						<el-button type="primary" size="small"  @click="handleRemark1" :disabled="backAble">修改垛位备注</el-button>
67
+            			<el-button type="success" size="small"  @click="handleExport" >导出记录</el-button>
68
+						
69
+					</el-form-item>
70
+					<el-form-item label="" style="margin-top: 0px;margin-left: 10px">
71
+						<el-dropdown placement="bottom" trigger="click" @command="batchOperate">
72
+							<el-button type="danger" size="small"> 其他操作<i class="el-icon-arrow-down el-icon--right"></i></el-button>
73
+							<el-dropdown-menu slot="dropdown">
74
+								<el-dropdown-item command="handleInBack" style="background-color: #f5f5f5;">取消入库</el-dropdown-item>
75
+							</el-dropdown-menu>
76
+						</el-dropdown>
77
+						
68
 					</el-form-item>
78
 					</el-form-item>
69
 						<!-- <el-button type="primary" @click="showOut">出库</el-button> -->
79
 						<!-- <el-button type="primary" @click="showOut">出库</el-button> -->
70
 					<!-- 	<el-form-item label=" ">
80
 					<!-- 	<el-form-item label=" ">
326
 				this.query.materialName = material.name
336
 				this.query.materialName = material.name
327
 				this.query.standard = material.standard
337
 				this.query.standard = material.standard
328
 			},
338
 			},
339
+			batchOperate(command) {
340
+				switch (command) {
341
+					case "handleInBack":
342
+						this.handleInBack();
343
+						break;
344
+				}
345
+			},
329
 
346
 
330
 			showCustomer() {
347
 			showCustomer() {
331
 				this.$refs.PopupCustomer.show()
348
 				this.$refs.PopupCustomer.show()
385
 				this.$refs.PopupIn.show()
402
 				this.$refs.PopupIn.show()
386
 			},
403
 			},
387
 			handleInBack() {
404
 			handleInBack() {
388
-				if (this.selectRows.length < 1) {
389
-					this.$message({
405
+				this.$confirm("确认删除吗?", "提示", {
406
+					confirmButtonText:'确认',
407
+					cancelButtonText:'取消',
408
+					type: "warning"
409
+				}).then(() => {
410
+					if (this.selectRows.length < 1) {
411
+						this.$message({
390
 						type: 'error',
412
 						type: 'error',
391
 						message: '至少选择一条数据!',
413
 						message: '至少选择一条数据!',
392
-					});
393
-					return
394
-				} else {
395
-					var url = 'WareIn/back.do'
396
-					var param = {
397
-						json: JSON.stringify(this.selectRows),
398
-					}
399
-					axios.post(url, param).then(response => {
400
-						if (response.data.code == 0) {
401
-							this.getStoreByStackId(response.data.data)
402
-						} else {
403
-							this.$message({
404
-								type: 'error',
405
-								message: '操作失败;' + response.data.msg,
406
-							});
414
+						});
415
+						return
416
+					} else {
417
+						var url = 'WareIn/back.do'
418
+						var param = {
419
+							json: JSON.stringify(this.selectRows),
407
 						}
420
 						}
408
-					});
409
-				}
421
+						axios.post(url, param).then(response => {
422
+							if (response.data.code == 0) {
423
+								this.getStoreByStackId(response.data.data)
424
+							} else {
425
+								this.$message({
426
+									type: 'error',
427
+									message: '操作失败;' + response.data.msg,
428
+								});
429
+							}
430
+						});
431
+					}
432
+				}).catch(() => {});
433
+				
410
 			},
434
 			},
411
 			resetButton(){      //查询条件重置
435
 			resetButton(){      //查询条件重置
412
 				this.query.wareName = '',
436
 				this.query.wareName = '',
595
 			handleStackCancelSave(){
619
 			handleStackCancelSave(){
596
 				this.stackDialogVisible = false
620
 				this.stackDialogVisible = false
597
 			},
621
 			},
598
-			handleInBack() {
599
-				if (this.selectRows.length < 1) {
600
-					this.$message({
601
-						type: 'error',
602
-						message: '至少选择一条数据!',
603
-					});
604
-					return
605
-				} else {
606
-					var url = 'WareIn/back.do'
607
-					var param = {
608
-						json: JSON.stringify(this.selectRows),
609
-					}
610
-					axios.post(url, param).then(response => {
611
-						if (response.data.code == 0) {
612
-							this.getStoreByStackId(response.data.data)
613
-						} else {
614
-							this.$message({
615
-								type: 'error',
616
-								message: '操作失败;' + response.data.msg,
617
-							});
618
-						}
619
-					});
620
-				}
621
-			},
622
 			inImport() {
622
 			inImport() {
623
 				var url = 'WareIn/inImport.do'
623
 				var url = 'WareIn/inImport.do'
624
 				var json = JSON.stringify(this.imTableData)
624
 				var json = JSON.stringify(this.imTableData)

Loading…
取消
儲存