111

src/view/record/inrecord.vue

@@ -29,7 +29,7 @@
 								</el-select>
 							</el-form-item>
 							<el-form-item label="订单号" style="margin-left: -25px">
-								<el-input v-model="query.ordNo" size="small"  style="width:120px;margin-left: -8px">
+								<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-left: -25px">
@@ -43,7 +43,7 @@
 								</el-input>
 							</el-form-item>
 							<el-form-item label="钢板号" style="margin-left: -35px;margin-top: -15px">
-								<el-input v-model="query.plateNo" size="small"  style="width:120px;margin-left: -8px">
+								<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-top: -15px">
@@ -62,6 +62,10 @@
 									</el-option>
 								</el-select>
 							</el-form-item>
+							<el-form-item label="垛位备注" style="margin-left: -35px;margin-top: -15px">
+								<el-input v-model="query.remark1" size="small"  style="width:120px;margin-left: -8px" @input="getPltList">
+								</el-input>
+							</el-form-item>
 							<el-form-item  label=" " style="margin-left: -35px;margin-top: -15px">
 								<el-button size="small" @click="handleSearch" type="primary">查询</el-button>
 								<!-- <el-button @click="handleSearch" type="primary" size="small">查询</el-button> -->
@@ -123,6 +127,8 @@
 				</el-table-column>
 				<el-table-column prop="remark" label="备注" width="100px" show-overflow-tooltip align="left">
 				</el-table-column>
+				<el-table-column prop="remark1" label="垛位备注" width="100px" show-overflow-tooltip align="left">
+				</el-table-column>
 				<el-table-column prop="recordType" label="类型" width="100px" show-overflow-tooltip align="center" :formatter="typeFormatter">
 				</el-table-column>
 				
@@ -167,6 +173,7 @@
 					carNo:'',
 					tallyPeople:'',
 					fkComponyName:'',
+					remark1:''
 				},
 				loading: false,
 				tableData: [],
@@ -177,7 +184,7 @@
 				//分页参数
 				currentPage: 1,
 				totalRows: 0,
-				pageSizes: [50, 100, 200,500],
+				pageSizes: [50, 100, 200,500,1000],
 				pageSize: 50,
 				childParam:{
 					page: '',
@@ -290,7 +297,9 @@
 				this.query.fkcustmerName = '',
 				this.query.carNo = '',
 				this.query.tallyPeople = '',
-				this.query.fkComponyName = ''
+				this.query.fkComponyName = '',
+				this.query.remark1 = '';
+				this.setSearchTime()
 			},
 			getWare() {
 				var url = 'MaintWare/queryByUserId.do'
@@ -319,10 +328,10 @@
 					materialName: this.query.materialName,
 					standard: this.query.standard,
 					customerName: this.query.customerName,
-					plateNo: this.query.plateNo,
+					plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
 					fromDate:(!this.query.inRecordDate[0]) ? "1970-01-01 00:00:00" : this.query.inRecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),		//date类型
 					toDate  :(!this.query.inRecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.inRecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
-					ordNo :this.query.ordNo,
+					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
 					carNo : this.query.carNo,
 					tallyPeople:this.query.tallyPeople,
 					fkComponyName:this.query.fkComponyName
@@ -346,6 +355,14 @@
 			},
 			changeWare(){
 
+			},
+			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 = [];
@@ -359,13 +376,13 @@
 					materialName: this.query.materialName,
 					standard: this.query.standard,
 					customerName: this.query.customerName,
-					plateNo: this.query.plateNo,
+					plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
 					fromDate:(!this.query.inRecordDate[0]) ? "1970-01-01 00:00:00" : this.query.inRecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),		//date类型
 					toDate  :(!this.query.inRecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.inRecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
-					ordNo : this.query.ordNo,
+					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
 				}
 
 

src/view/record/outrecord.vue

@@ -44,7 +44,7 @@
 							</el-input>
 						</el-form-item>
 						<el-form-item label="钢板号" style="margin-left: -35px;">
-							<el-input v-model="query.plateNo" size="small" style="width:120px;margin-left: -8px">
+							<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">
@@ -58,7 +58,11 @@
 							</el-select>
 						</el-form-item>
 						<el-form-item label="订单号" style="margin-left: -25px">
-							<el-input v-model="query.ordNo" size="small"  style="width:120px;margin-left: -8px">
+							<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-left: -25px">
+							<el-input v-model="query.remark1" size="small"  style="width:120px;margin-left: -8px"  @input="getOrdList">
 							</el-input>
 						</el-form-item>
 						<el-form-item label=" " style="margin-left: -60px">
@@ -67,6 +71,7 @@
 							<el-button @click="handleOutBack" type="danger" size="small" style="width:70px">取消出库</el-button>
 							<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-form-item>
 						<el-form-item label="" >
@@ -77,9 +82,7 @@
 								<el-button   type="success" @click="handleExport" style="margin-left: 2px" size="small">导出记录</el-button>
 							</el-upload>
 						</el-form-item>
-						<el-form-item label="" >
-							    <el-button type="primary" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
-						</el-form-item>
+						
 					</el-row>
 				</el-form>
 			</el-row>
@@ -144,6 +147,8 @@
 				</el-table-column>
 				<el-table-column prop="remark" label="备注" width="100px" show-overflow-tooltip align="left">
 				</el-table-column>
+				<el-table-column prop="remark1" label="垛位备注" width="100px" show-overflow-tooltip align="left">
+				</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" >
@@ -260,12 +265,13 @@
 					materialName: '',
 					standard: '',
 					customerName: '',
-					plateNo: '',
+					plateNo: [],
 					RecordDate:[],
 					carNo:'',
 					tallyPeople:'',
-					ordNo:'',
+					ordNo:[],
 					fkComponyName:'',
+					remark1:''
 					
 				},
 				accData:{
@@ -279,7 +285,7 @@
 
 				currentPage: 1,
 				totalRows: 0,
-				pageSizes: [50, 100, 200,500],
+				pageSizes: [50, 100, 200,500,1000],
 				pageSize: 50,
 				HideAndShow: 0,
 				optionsWare: [],
@@ -295,7 +301,8 @@
 					materialName: '',
 					standard: '',
 					customerName: '',
-					plateNo: ''
+					plateNo: '',
+					remark1:'',
 				},
 				childUrl:'WareOutRecord/queryTotal.do',
 				time:"",
@@ -442,6 +449,22 @@
 				this.accData.accDate = new Date(now.getFullYear(), now.getMonth(), now.getDate());
 				this.popupVerifyAcc = true;
 			},
+			resetButton(){      //查询条件重置
+					this.query.wareName= '',
+					this.query.stackName= '',
+					this.query.model= '',
+					this.query.materialName= '',
+					this.query.standard= '',
+					this.query.customerName= '',
+					this.query.plateNo= [],
+					this.query.RecordDate=[],
+					this.query.carNo='',
+					this.query.tallyPeople='',
+					this.query.ordNo=[],
+					this.query.fkComponyName='',
+					this.query.remark1='';
+					this.setSearchTime()
+			},
 			numSub(num1, num2) { 
 				var baseNum, baseNum1, baseNum2; 
 				var precision;// 精度 
@@ -507,21 +530,6 @@
 				this.currentPage = 1
 				this.getTableData()
 			},
-			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 = '',
-				this.query.carNo = '',
-				this.query.tallyPeople = '',
-				this.query.fkComponyName = ''
-			},
 			showMaterial() {
 				this.$refs.PopupMaterial.show()
 			},
@@ -557,15 +565,18 @@
 					materialName: this.query.materialName,
 					standard: this.query.standard,
 					customerName: this.query.customerName,
-					plateNo: this.query.plateNo,
+					plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
 					pFromDate:(!this.query.RecordDate[0]) ? "1970-01-01 00:00:00" : this.query.RecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),		//date类型
 					pToDate  :(!this.query.RecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.RecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
 					carNo:this.query.carNo,
 					tallyPeople:this.query.tallyPeople,
-					ordNo :this.query.ordNo,
-					fkComponyName:this.query.fkComponyName
+					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
+					fkComponyName:this.query.fkComponyName,
+					remark1 : this.query.remark1
 				}
 				this.childParam = param;
+				console.log(param);
+				console.log(this.childParam);
 
 				axios.get(url, param).then(response => {
 					if (response.data.code == 0) {
@@ -636,6 +647,14 @@
 			changeWare(){
 				//this.getTableData()
 			},
+			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;
+			},
 			handlePrintOut(){
 				if(this.selectRows.length > 1){
 					this.$message({
@@ -687,13 +706,14 @@
 					materialName: this.query.materialName,
 					standard: this.query.standard,
 					customerName: this.query.customerName,
-					plateNo: this.query.plateNo,
+					plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
 					pFromDate:(!this.query.RecordDate[0]) ? "1970-01-01 00:00:00" : this.query.RecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),		//date类型
 					pToDate  :(!this.query.RecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.RecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
 					carNo:this.query.carNo,
 					tallyPeople:this.query.tallyPeople,
-					ordNo :this.query.ordNo,
-					fkComponyName:this.query.fkComponyName
+					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
+					fkComponyName:this.query.fkComponyName,
+					remark1:this.query.remark1
 				}
 				// alert(JSON.stringify(param))