1111

src/view/record/inrecord.vue

@@ -81,12 +81,16 @@
 							<el-form-item label="" style="margin-top: -15px">
 							    <el-button type="primary" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
 							</el-form-item>
+							<el-form-item label="" style="margin-top: -15px">
+							    <el-button type="danger" size="small"  @click="deleteRecord" :disabled="backAble">删除记录</el-button>
+							</el-form-item>
 						</el-row>
 					</el-form>
 			<total-block ref="totalBlock" style="margin-left: -25px;font-size: 13px;margin-left: 5px" v-bind:childParam="childParam" v-bind:childUrl = 'childUrl'></total-block>
 		</div>
 		<div class="tabledata-grid">
-			<el-table v-loading="loading"  :data="tableData" height="100%" stripe border style="width: 97%;font-size: 13px;margin-top: -50px;margin-left: 25px" :header-cell-style="{'text-align':'center'}">
+			<el-table v-loading="loading"  :data="tableData" height="100%" stripe border style="width: 97%;font-size: 13px;margin-top: -50px;margin-left: 25px" @select="handleTableSelect" :header-cell-style="{'text-align':'center'}">
+				<el-table-column type="selection" width="40" header-align="center" align="center"></el-table-column>
 				<el-table-column prop="id" label="编号" min-width="10%" v-if="false">
 				</el-table-column>
 				<el-table-column prop="wareName" label="仓库名称" width="150px" show-overflow-tooltip header-align="center">
@@ -175,6 +179,7 @@
 					fkComponyName:'',
 					remark1:''
 				},
+				selectRows: [],
 				loading: false,
 				tableData: [],
 				optionsWare: [],
@@ -195,7 +200,8 @@
 					materialName: '',
 					standard: '',
 					customerName: '',
-					plateNo: ''
+					plateNo: '',
+					ord_no:''
 				},
 				childUrl:'WareInRecord/queryTotal.do',
 				tallyPeopleOption:[],
@@ -245,6 +251,11 @@
 						break;
 				}
 			},
+			handleTableSelect(selection, row) {  //第一个参数是目前所有选中的数据
+				console.log(JSON.stringify(row))
+				this.selectRows = selection
+				this.setLayerColor()
+			},
 			showMaterial() {
 				this.$refs.PopupMaterial.show()
 			},
@@ -334,7 +345,8 @@
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
 					carNo : this.query.carNo,
 					tallyPeople:this.query.tallyPeople,
-					fkComponyName:this.query.fkComponyName
+					fkComponyName:this.query.fkComponyName,
+					remark1:this.query.remark1
 				}
 
 				this.childParam = param;
@@ -382,7 +394,8 @@
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
 					carNo : this.query.carNo,
 					tallyPeople:this.query.tallyPeople,
-					fkComponyName:this.query.fkComponyName
+					fkComponyName:this.query.fkComponyName,
+					remark1:this.query.remark1
 				}
 
 
@@ -480,6 +493,36 @@
 					return v[j]
 				}))
 			},
+			handleTableSelectionChange(val) {
+				this.selectRows = val
+				this.setLayerColor()
+			},
+			deleteRecord(){
+				if (this.selectRows.length < 1) {
+					this.$message({
+						type: 'error',
+						message: '至少选择一条数据！',
+					});
+					return
+				}else{
+					var url = 'WareInRecord/deleterecord.do'
+					var param = {
+						json: JSON.stringify(this.selectRows),
+					}
+					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,
+							});
+						}
+					});
+				}
+				
+			}
 
 		},
 	}

src/view/record/outrecord.vue

@@ -72,7 +72,7 @@
 							<el-button @click="handleVerifyAcc" type="primary" size="small" style="width:70px">对账</el-button>
 							<el-button @click="handleModifyPrice" type="primary" size="small" >批量改价</el-button>
 							<el-button type="primary" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
-							
+							<el-button @click="changeCarNoShow" type="primary" size="small" >修改车号</el-button>
 						</el-form-item>
 						<el-form-item label="" >
 							<el-upload class="upload-demo" action="" 
@@ -226,6 +226,20 @@
 				</el-row>
 			</el-form>
 		</el-dialog>
+
+		<el-dialog title="更改出库车号" :visible.sync="popupCarno" width="780px">
+			<el-form label-width="150px" inline="">
+				<el-row>
+					<el-form-item label="车号" style="">
+							<el-input v-model="changeCarNo" size="small" style="width:150px;margin-left: -8px"></el-input>
+						</el-form-item>
+				</el-row>
+				<el-row>
+					<el-button size="small" type="primary" style="margin-left: 30px;" @click="handlechangeCarNo">提交</el-button>
+				</el-row>
+				
+			</el-form>
+		</el-dialog>
 		<popup-stack-with-select-ware :selectVareName="optionsWare" ref="PopupStackWithSelectWare" @receviceFromChild="receviceFromWareStack"></popup-stack-with-select-ware>
 		<popup-material ref="PopupMaterial" @receviceFromChild="receviceFromMaterial"></popup-material>
 		<popup-customer ref="PopupCustomer" @receviceFromChild="receviceFromCustomer"></popup-customer>
@@ -313,6 +327,8 @@
 				modifyWgt:0,
 				modifyPrice:0,
 				optionsCust:[],
+				changeCarNo:"",
+				popupCarno: false
 			};
 		},
 		//页面加载完成渲染
@@ -675,6 +691,38 @@
 				window.open(this.serverName + 'ureport/preview?_u=file:out.ureport.xml&id=' + distId +
 					'&time=' + this.time)
 
+			},
+			changeCarNoShow(){
+				this.popupCarno = true,
+				this.changeCarNo = ""
+			},
+			handlechangeCarNo(){
+				if(this.selectRows.length > 1){
+					this.$message({
+						type: 'warning',
+						message: '操作失败,请选择一条数据进行操作' ,
+					});
+					return;
+				}
+				// console.log(JSON.stringify(this.selectRows[0]))
+				var distId = this.selectRows[0].distributionId;
+				var url = 'WareOut/changeCarNo.do'
+				var param = {
+					distId: distId,
+					carNo: this.changeCarNo
+				}
+				axios.post(url, param).then(response => {
+					if (response.data.code == 0) {
+						this.popupCarno = false,
+						this.getTableData()
+					} else {
+						this.$message({
+							type: 'error',
+							message: '操作失败；' + response.data.msg,
+						});
+					}
+				});
+
 			},
 			getTime() {
 				var date = new Date();

src/view/ware/storechange.vue

@@ -530,7 +530,10 @@
 				if (boolean) {
 					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',