111

src/view/record/changerecord.vue

@@ -44,6 +44,7 @@
 						</el-form-item>
 						<el-form-item label=" " style="margin-top: -15px">
 							<el-button @click="handleSearch" type="primary"  size="small" >查询</el-button>
+							<el-button   type="success" @click="handleExport" style="margin-left: 2px" size="small">导出记录</el-button>
 						</el-form-item>
 					</el-row>
 				</el-form>
@@ -113,7 +114,16 @@
 	import PopupMaterial from '@/components/PopupMaterial.vue'
 	import PopupCustomer from '@/components/PopupCustomer.vue'
 	import TotalBlock    from '@/components/TotalBlock.vue'
+	import Export2Excel from '../../excel/Export2Excel.js'
+	import {
+		mapState
+	} from 'vuex'
 	export default {
+		computed: {
+			...mapState({
+				serverName: state => state.app.serverName
+			})
+		},
 		components: {
 			PopupStack,
 			PopupMaterial,
@@ -255,7 +265,120 @@
 			},
 			changeWare(){
 
-			}
+			},
+			handleExport() {
+				var imptData = [];
+				
+
+				var url = 'WareChangeRecord/query.do'
+				if(this.query.RecordDate == null){
+					this.query.RecordDate = [false,false];
+				}
+				var param = {
+					page: this.currentPage,
+					rows: this.pageSize,
+					wareName: this.query.wareName,
+					stackName: this.query.stackName,
+					model: this.query.model,
+					materialName: this.query.materialName,
+					standard: this.query.standard,
+					customerName: this.query.customerName,
+					plateNo: this.query.plateNo,
+					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"), 
+				}
+				// alert(JSON.stringify(param))
+
+				axios.get(url, param).then(response => {
+					// alert(JSON.stringify(response))
+					if (response.data.code == 0) {
+						var imptData = response.data.data.list;
+						if (imptData.length == 0) {
+							this.$alert('无法导出，选择时间段无记录', '提示', {
+								confirmButtonText: '确定',
+								callback: action => {}
+							});
+						} else {
+
+							this.exportExcel(imptData)
+						}
+					} else {
+						this.$message({
+							type: 'error',
+							message: '操作失败；' + response.data.msg,
+						});
+					}
+
+				});
+				
+			},
+			exportExcel(imptData) {
+				 console.log(imptData)
+				const header = ["仓库名称",
+								"垛位",
+								"层号",
+								"品名",
+								"规格型号",
+								"钢种",
+								"数量",
+								"重量",
+								"钢板号",
+								"原货权单位",
+								"原客户名称",
+								"新货权单位",
+								"新客户名称",
+								"原收货地址",
+								"新收货地址",
+								"操作时间",
+								"操作人",
+								"计量方式",
+								"切边类型",
+								"产地",
+								"备注"
+
+				] // 导出的表头名
+				const filterVal = [
+						"wareName",
+						"stackName",
+						"layer",
+						"materialName",
+						"model",
+						"standard",
+						"count",
+						"weight",
+						"plateNo",
+						"fkCustomerNameOld",
+						"customerNameOld",
+						"fkCustomerNameNew",
+						"customerNameNew",
+						"receiveAddressOld",
+						"receiveAddressNew",
+						"addTime",
+						"addUserUserDesc",
+						"wgtDcnMtcCd",
+						"edgeTy",
+						"productionPlace",
+						"remark"
+				]
+
+				for(var i=0;i<imptData.length;i++){
+					imptData[i]["addUserUserDesc"] = imptData[i].addUser.userDesc;
+				}
+				const list = imptData
+				const data = this.formatJson(filterVal, list)
+
+				const filename = '货权转移记录' + (new Date()).toLocaleDateString();
+				Export2Excel.export_json_to_excel({
+					header,
+					data,
+					filename
+				})
+			},
+			formatJson(filterVal, jsonData) {
+				return jsonData.map(v => filterVal.map(j => {
+					return v[j]
+				}))
+			},
 		},
 	}
 </script>

src/view/record/inrecord.vue

@@ -12,7 +12,7 @@
 							<el-form-item label="垛位名称" style="margin-left: -35px">
 								<el-input v-model="query.stackName" size="small" style="width:100px;margin-left: -8px"></el-input>
 							</el-form-item>
-							<el-form-item label="物料名称" style="margin-left: -35px"> 
+							<el-form-item label="品名" style="margin-left: -35px"> 
 								<el-input v-model="query.materialName" size="small"  style="width:130px;margin-left: -8px">
 									<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
 								</el-input>
@@ -22,49 +22,57 @@
 									<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
 								</el-input>
 							</el-form-item>
-							<el-form-item label="客户名称" style="margin-left: -35px">
-								<el-input v-model="query.customerName" size="small"  style="width:200px;margin-left: -8px">
-									<el-button slot="append" icon="el-icon-search" @click="showCustomer"></el-button>
+							<el-form-item label="规格型号" style="margin-left: -25px">
+								<el-input v-model="query.model" size="small"  style="width:120px;margin-left: -8px">
 								</el-input>
 							</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-form-item label="捆包号" style="margin-left: -15px">
+								<el-input v-model="query.packNo" clearable size="small" style="width:120px;margin-left: -8px" @input="getPackList">
 								</el-input>
 							</el-form-item>
-							<el-form-item label="车号" style="margin-left: -25px">
-								<el-input v-model="query.carNo" size="small"  style="width:120px;margin-left: -8px">
+							<el-form-item label="材料号" style="margin-left: -15px">
+								<el-input v-model="query.plateNo" clearable size="small" style="width:120px;margin-left: -8px" @input="getPltList">
 								</el-input>
 							</el-form-item>
-						</el-row>
-						<el-row>
-							<el-form-item label="规格型号" style="margin-left: -25px;margin-top: -15px">
-								<el-input v-model="query.model" size="small"  style="width:120px;margin-left: -8px">
+							<el-form-item label="订单号" style="margin-left: -15px">
+								<el-input v-model="query.ordNo" clearable size="small" style="width:120px;margin-left: -8px" @input="getOrdList">
+								</el-input>
+							</el-form-item>
+							<el-form-item label="合约号" style="margin-left: -15px">
+								<el-input v-model="query.contractNo" clearable size="small" style="width:120px;margin-left: -8px" @input="getContractList">
 								</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-form-item label="货权单位" style="margin-left: -35px">
+								<el-select v-model="query.fkComponyName" filterable placeholder="请选择客户名称" clearable size="small" style="margin-left: 5px; width: 170px">
+									<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
+									</el-option>
+								</el-select>
+							</el-form-item>
+							<el-form-item label="客户名称" style="margin-left: -35px">
+								<el-select v-model="query.customerName" filterable placeholder="请选择订单客户" clearable size="small" style="margin-left: 5px; width: 170px">
+									<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
+									</el-option>
+								</el-select>
+							</el-form-item>
+							<el-form-item label="入库车号" style="margin-left: -25px">
+								<el-input v-model="query.carNo" size="small"  style="width:120px;margin-left: -8px">
 								</el-input>
 							</el-form-item>
-							<el-form-item label="理货人员" style="margin-top: -15px">
+							<el-form-item label="理货人员" style="">
 								<el-select v-model="query.tallyPeople" size="small" style="margin-left: 10px;margin-top: -15px" clearable placeholder="理货人员">
 									<el-option v-for="item in tallyPeopleOption" :key="item.id" :label="item.dicName" :value="item.dicCode">
 									</el-option>
 								</el-select>
 							</el-form-item>
-							<el-form-item label="入库时间" style="margin-left: -35px;margin-top: -15px">
+							<el-form-item label="入库时间" style="margin-left: -35px">
 								<el-date-picker size="small" v-model="query.inRecordDate"  style="width:330px;margin-left: -8px" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
 							    </el-date-picker>
 							</el-form-item>
-							<el-form-item label="付款单位" style="margin-left: -35px;margin-top: -15px">
-								<el-input v-model="query.fkComponyName" size="small" style="width:200px;margin-left: -8px">
-									<el-button slot="append" icon="el-icon-search" @click="showFkCompony"></el-button>
-								</el-input>
-							</el-form-item>
-							<el-form-item  label=" " style="margin-left: -35px;margin-top: -15px">
+							<el-form-item  label=" " style="margin-left: -35px">
 								<el-button size="small" @click="handleSearch" type="primary">查询</el-button>
 								<!-- <el-button @click="handleSearch" type="primary" size="small">查询</el-button> -->
 							</el-form-item>
-							<el-form-item label="" style="margin-top: -15px">
+							<el-form-item label="" style="">
 								<el-upload class="upload-demo" action="" 
 									 ref="upload" :limit="1" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
 									 :auto-upload="false"  >
@@ -164,9 +172,11 @@
 					materialName: '',
 					standard: '',
 					customerName: '',
-					plateNo: '',
+					plateNo: [],
 					inRecordDate:[],
-					ordNo:'',
+					ordNo:[],
+					contractNo:[],
+					packNo:[],
 					carNo:'',
 					tallyPeople:'',
 					fkComponyName:'',
@@ -183,18 +193,24 @@
 				pageSizes: [50, 100, 200,500],
 				pageSize: 50,
 				childParam:{
-					page: '',
-					rows: '',
 					wareName: '',
 					stackName: '',
 					model: '',
 					materialName: '',
 					standard: '',
 					customerName: '',
-					plateNo: ''
+					plateNo: [],
+					inRecordDate:[],
+					ordNo:[],
+					contractNo:[],
+					packNo:[],
+					carNo:'',
+					tallyPeople:'',
+					fkComponyName:'',
 				},
 				childUrl:'WareInRecord/queryTotal.do',
-				tallyPeopleOption:[]
+				tallyPeopleOption:[],
+				optionsCust: [],
 
 			};
 		},
@@ -204,6 +220,7 @@
 			this.getSearchItem();
 			// this.getTableData()
 			this.setSearchTime();
+			this.getAllCustomer();
 			
 		},
 		methods: {
@@ -221,6 +238,13 @@
 				});
 
 			},
+			getAllCustomer() {
+				var url = 'MaintCustomer/queryByUserId.do'
+				var param = {}
+				axios.get(url, param).then(response => {
+					this.optionsCust = response.data.data
+				});
+			},
 			typeFormatter: function(row, column) {
 				switch (row.recordType) {
 
@@ -294,6 +318,22 @@
 					}
 				});
 			},
+			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;
+			},
+			getContractList(){
+				const replaceResult = this.query.contractNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
+				this.query.contractNo = replaceResult;
+			},
+			getPackList(){
+				const replaceResult = this.query.packNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
+				this.query.packNo = replaceResult;
+			},
 			getTableData() {
 				var url = 'WareInRecord/query.do'
 				if(this.query.inRecordDate == null){
@@ -309,10 +349,12 @@
 					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(','),
+					contractNo: this.query.contractNo == 0 ? '' : this.query.contractNo.join(','),
+					packNo: this.query.packNo == 0 ? '' : this.query.packNo.join(','),
 					carNo : this.query.carNo,
 					tallyPeople:this.query.tallyPeople,
 					fkComponyName:this.query.fkComponyName
@@ -349,13 +391,15 @@
 					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(','),
+					contractNo: this.query.contractNo == 0 ? '' : this.query.contractNo.join(','),
+					packNo: this.query.packNo == 0 ? '' : this.query.packNo.join(','),
 					carNo : this.query.carNo,
 					tallyPeople:this.query.tallyPeople,
-					fkComponyName:this.query.fkComponyName,
+					fkComponyName:this.query.fkComponyName
 				}
 
 
@@ -384,59 +428,62 @@
 			},
 			exportExcel(imptData) {
 				// alert(JSON.stringify(imptData))
-				const header = ["仓库名称"
-								,"垛位"
-								,"层号"
-								,"品名"
-								,"订单号"
-								,"规格"
-								,"钢种"
-								,"入库数量"
-								,"入库重量"
-								,"钢板号"
-								,"货权单位"
-								,"付款单位"
-								,"收货地址"
-								,"计量方式"
-								,"切边类型"
-								,"产地"
-								,"入库车号"
-								,"入库理货人员"
-								,"入库操作人"
-								,"入库时间"
-								,"备注"
-								,"类型"
-								,"备注"
+				const header = ["仓库名称",
+								"垛位",
+								"层号",
+								"品名",
+								"钢种",
+								"产品编号",
+								"订单号",
+								"规格",
+								"入库重量",
+								"入库数量",
+								"合约号",
+								"入库车号",
+								"入库时间",
+								"货权单位",
+								"客户名称",
+								"收货地址",
+								"产地",
+								"捆包号",
+								"备注",
+								"货物状态",
+								"入库操作人",
+								"吊装工",
+								"计量方式",
+								"类型"
 				] // 导出的表头名
 				const filterVal = [
-						"wareName"
-						,"stackName"
-						,"layer"
-						,"materialName"
-						,"ordNo"
-						,"model"
-						,"standard"
-						,"count"
-						,"weight"
-						,"plateNo"
-						,"customerName"
-						,"fkComponyName"
-						,"receiveAddress"
-						,"wgtDcnMtcCd"
-						,"edgeTy"
-						,"productionPlace"
-						,"carNo"
-						,"tallyPeople"
-						,"addUserUserDesc"
-						,"addTime"
-						,"remark"
-						,"recordType"
-						,"remark"
+						"wareName",
+						"stackName",
+						"layer",
+						"materialName",
+						"standard",
+						"plateNo",
+						"ordNo",
+						"model",
+						"weight",
+						"count",
+						"contractNo",
+						"carNo",
+						"addTime",
+						"fkComponyName",
+						"customerName",
+						"receiveAddress",
+						"productionPlace",
+						"packNo",
+						"remark",
+						"outFlag",
+						"addUseruserDesc",
+						"tallyPeople",
+						"wgtDcnMtcCd",
+						"recordType"
 				]
 
 				for(var i=0;i<imptData.length;i++){
 					imptData[i]["addUserUserDesc"] = imptData[i].addUser.userDesc;
 					imptData[i]["recordType"]      = imptData[i]["recordType"] == 0 ? "入库取消" : "入库";
+					imptData[i]["outFlag"]      = imptData[i]["outFlag"] == 0 ? "正常在库" : "已出库";
 				}
 				const list = imptData
 				const data = this.formatJson(filterVal, list)

src/view/record/outrecord.vue

@@ -4,61 +4,71 @@
 			<el-row>
 				<el-form :model="query" label-width="100px" inline="">
 					<el-row>
-						<el-form-item label="库房名称">
-							<el-select size="small" v-model="query.wareName" clearable style="width: 140px;" @change="changeWare">
-								<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="垛位名称" style="margin-left: -35px">
-							<el-input v-model="query.stackName" size="small" style="width:100px;margin-left: -8px"></el-input>
-						</el-form-item>
-						<el-form-item label="物料名称" style="margin-left: -35px">
-							<el-input v-model="query.materialName" size="small" style="width:130px;margin-left: -8px">
-								<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
-							</el-input>
-						</el-form-item>
-						<el-form-item label="钢种" style="margin-left: -35px">
-							<el-input v-model="query.standard" size="small" style="width:130px;margin-left: -8px">
-								<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
-							</el-input>
-						</el-form-item>
-						<el-form-item label="客户名称" style="margin-left: -35px">
-							<el-input v-model="query.customerName" size="small" style="width:200px;margin-left: -8px">
-								<el-button slot="append" icon="el-icon-search" @click="showCustomer"></el-button>
-							</el-input>
-						</el-form-item>
-						<el-form-item label="付款单位" style="margin-left: -35px">
-							<el-input v-model="query.fkComponyName" size="small" style="width:200px;margin-left: -8px">
-								<el-button slot="append" icon="el-icon-search" @click="showFkCompony"></el-button>
-							</el-input>
-						</el-form-item>
-						<el-form-item label="车号" style="margin-left: -35px">
-							<el-input v-model="query.carNo" size="small" style="width:100px;margin-left: -8px"></el-input>
-						</el-form-item>
-
-						<el-form-item label="规格型号" style="margin-left: 0px;">
-							<el-input v-model="query.model"  size="small" style="width:120px;margin-left: -8px">
-							</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>
-						</el-form-item>
-						<el-form-item label="出库时间" style="margin-left: -35px;margin-top: -15px">
-								<el-date-picker v-model="query.RecordDate" style="width:330px;margin-left: -8px" size="small" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+						<el-form-item label="库房名称" style="margin-left: -25px">
+								<el-select v-model="query.wareName" clearable size="small"  style="width:100px;margin-left: -8px" @change="changeWare">
+									<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="垛位名称" style="margin-left: -35px">
+								<el-input v-model="query.stackName" size="small" style="width:100px;margin-left: -8px"></el-input>
+							</el-form-item>
+							<el-form-item label="品名" style="margin-left: -35px"> 
+								<el-input v-model="query.materialName" size="small"  style="width:130px;margin-left: -8px">
+									<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
+								</el-input>
+							</el-form-item>
+							<el-form-item label="钢种" style="margin-left: -35px">
+								<el-input v-model="query.standard" size="small"  style="width:150px;margin-left: -8px">
+									<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
+								</el-input>
+							</el-form-item>
+							<el-form-item label="规格型号" style="margin-left: -25px">
+								<el-input v-model="query.model" 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="query.packNo" clearable size="small" style="width:120px;margin-left: -8px" @input="getPackList">
+								</el-input>
+							</el-form-item>
+							<el-form-item label="材料号" style="margin-left: -15px">
+								<el-input v-model="query.plateNo" clearable size="small" style="width:120px;margin-left: -8px" @input="getPltList">
+								</el-input>
+							</el-form-item>
+							<el-form-item label="订单号" style="margin-left: -15px">
+								<el-input v-model="query.ordNo" clearable size="small" style="width:120px;margin-left: -8px" @input="getOrdList">
+								</el-input>
+							</el-form-item>
+							<el-form-item label="合约号" style="margin-left: -15px">
+								<el-input v-model="query.contractNo" clearable size="small" style="width:120px;margin-left: -8px" @input="getContractList">
+								</el-input>
+							</el-form-item>
+							<el-form-item label="货权单位" style="margin-left: -35px">
+								<el-select v-model="query.fkComponyName" filterable placeholder="请选择客户名称" clearable size="small" style="margin-left: 5px; width: 170px">
+									<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
+									</el-option>
+								</el-select>
+							</el-form-item>
+							<el-form-item label="客户名称" style="margin-left: -35px">
+								<el-select v-model="query.customerName" filterable placeholder="请选择订单客户" clearable size="small" style="margin-left: 5px; width: 170px">
+									<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
+									</el-option>
+								</el-select>
+							</el-form-item>
+							<el-form-item label="出库车号" style="margin-left: -25px">
+								<el-input v-model="query.carNo" size="small"  style="width:120px;margin-left: -8px">
+								</el-input>
+							</el-form-item>
+							<el-form-item label="理货人员" style="">
+								<el-select v-model="query.tallyPeople" size="small" style="margin-left: 10px;margin-top: -15px" clearable placeholder="理货人员">
+									<el-option v-for="item in tallyPeopleOption" :key="item.id" :label="item.dicName" :value="item.dicCode">
+									</el-option>
+								</el-select>
+							</el-form-item>
+							<el-form-item label="出库时间" style="margin-left: -35px">
+								<el-date-picker size="small" v-model="query.RecordDate"  style="width:330px;margin-left: -8px" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
 							    </el-date-picker>
-						</el-form-item>
-						<el-form-item label="理货人员" style="margin-top: -15px">
-							<el-select v-model="query.tallyPeople" size="small" style="margin-left: 10px;margin-top: -15px" clearable placeholder="理货人员">
-								<el-option v-for="item in tallyPeopleOption" :key="item.id" :label="item.dicName" :value="item.dicCode">
-								</el-option>
-							</el-select>
-						</el-form-item>
-						<el-form-item label="订单号" style="margin-left: -25px;margin-top: -15px">
-							<el-input v-model="query.ordNo" size="small"  style="width:120px;margin-left: -8px">
-							</el-input>
-						</el-form-item>
+							</el-form-item>
 						<el-form-item label=" " style="margin-top: -15px;margin-left: -60px">
 							<el-button @click="handleSearch" type="primary" size="small">查询</el-button>
 							<el-button @click="handlePrintOut" type="primary" size="small" style="width:90px;text-align: left">打印出库单</el-button>
@@ -277,11 +287,13 @@
 					materialName: '',
 					standard: '',
 					customerName: '',
-					plateNo: '',
+					plateNo: [],
 					RecordDate:[],
+					ordNo:[],
+					contractNo:[],
+					packNo:[],
 					carNo:'',
 					tallyPeople:'',
-					ordNo:'',
 					fkComponyName:'',
 					
 				},
@@ -312,7 +324,14 @@
 					materialName: '',
 					standard: '',
 					customerName: '',
-					plateNo: ''
+					plateNo: [],
+					RecordDate:[],
+					ordNo:[],
+					contractNo:[],
+					packNo:[],
+					carNo:'',
+					tallyPeople:'',
+					fkComponyName:'',
 				},
 				childUrl:'WareOutRecord/queryTotal.do',
 				time:"",
@@ -325,7 +344,8 @@
 				popupCar:false,
 				truckNo:"",
 				driverName:"",
-				driverPhone:""
+				driverPhone:"",
+				optionsCust:[]
 			};
 		},
 		//页面加载完成渲染
@@ -334,6 +354,7 @@
 			// this.getTableData()
 			this.getSearchItem();
 			this.setSearchTime();
+			this.getAllCustomer();
 		},
 		methods: {
 			setSearchTime(){
@@ -350,6 +371,13 @@
 						break;
 				}
 			},
+			getAllCustomer() {
+				var url = 'MaintCustomer/queryByUserId.do'
+				var param = {}
+				axios.get(url, param).then(response => {
+					this.optionsCust = response.data.data
+				});
+			},
 			handleSavePriceMod(){
 				var url = 'WareOutRecord/savePriceMod.do'
 				var param = {
@@ -554,13 +582,15 @@
 					materialName: this.query.materialName,
 					standard: this.query.standard,
 					customerName: this.query.customerName,
-					plateNo: this.query.plateNo,
 					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
+					fkComponyName:this.query.fkComponyName,
+					plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
+					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
+					contractNo: this.query.contractNo == 0 ? '' : this.query.contractNo.join(','),
+					packNo: this.query.packNo == 0 ? '' : this.query.packNo.join(','),
 				}
 				this.childParam = param;
 
@@ -585,31 +615,32 @@
 				this.selectRows = val
 			},
 			handleOutBack() {
-				if (this.selectRows.length != 1) {
-					this.$message({
-						type: 'error',
-						message: '只能选择一条数据取消出库！',
-					});
-					return
-				}
-
-				if (this.selectRows[0].recordType == '0') {
-					this.$message({
-						type: 'error',
-						message: '取消记录不能再次取消出库！',
-					});
-					return
-				}
-				
-				if (this.selectRows[0].backFlag == '1') {
-					this.$message({
-						type: 'error',
-						message: '该记录不能再次取消出库！',
+				this.$confirm('该操作将取消出库, 是否继续?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+					}).then(() => {
+						var url = 'WareOut/back.do'
+						var param = {
+							json: JSON.stringify(this.selectRows),
+							to: '',
+						}
+						axios.post(url, param).then(response => {
+							if (response.data.code == 0) {
+								this.getTableData()
+							} else {
+								this.$message({
+									type: 'error',
+									message: '操作失败；' + response.data.msg,
+								});
+							}
+						});
+					}).catch(() => {
+						this.$message({
+							type: 'info',
+							message: '已取消删除'
+						});          
 					});
-					return
-				}
-				// alert("1")
-				this.$refs.PopupStackWithSelectWare.show()
 
 			},
 			receviceFromWareStack(stack) {
@@ -670,6 +701,22 @@
 				this.time = year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
 
 			},
+			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;
+			},
+			getContractList(){
+				const replaceResult = this.query.contractNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
+				this.query.contractNo = replaceResult;
+			},
+			getPackList(){
+				const replaceResult = this.query.packNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
+				this.query.packNo = replaceResult;
+			},
 			handleExport() {
 				var imptData = [];
 				
@@ -684,13 +731,15 @@
 					materialName: this.query.materialName,
 					standard: this.query.standard,
 					customerName: this.query.customerName,
-					plateNo: this.query.plateNo,
 					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
+					fkComponyName:this.query.fkComponyName,
+					plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
+					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
+					contractNo: this.query.contractNo == 0 ? '' : this.query.contractNo.join(','),
+					packNo: this.query.packNo == 0 ? '' : this.query.packNo.join(','),
 				}
 				// alert(JSON.stringify(param))
 
@@ -768,59 +817,61 @@
 			},
 			exportExcel(imptData) {
 				 console.log(JSON.stringify(imptData))
-				const header = ["仓库名称"
-								,"垛位"
-								,"层号"
-								,"品名"
-								,"订单号"
-								,"入库人"
-								,"入库车号"
-								,"入库时间"
-								,"规格"
-								,"钢种"
-								,"出库数量"
-								,"出库重量"
-								,"钢板号"
-								,"货权单位"
-								,"付款单位"
-								,"收货地址"
-								,"计量方式"
-								,"切边类型"
-								,"产地"
-								,"出库车号"
-								,"出库理货人员"
-								,"出库操作人"
-								,"出库时间"
-								,"备注"
-								,"类型"
+				const header = ["仓库名称",
+								"垛位",
+								"层号",
+								"品名",
+								"钢种",
+								"产品编号",
+								"订单号",
+								"规格型号",
+								"出库重量",
+								"出库数量",
+								"合约号",
+								"出库车号",
+								"出库时间",
+								"货权单位",
+								"客户名称",
+								"收货地址",
+								"产地",
+								"捆包号",
+								"备注",
+								"出库操作人",
+								"吊装工",
+								"入库车号",
+								"入库时间",
+								"入库操作人",
+								"计量方式",
+								"类型"
 
 				] // 导出的表头名
 				const filterVal = [
-						"wareName"
-						,"stackName"
-						,"layer"
-						,"materialName"
-						,"ordNo"
-						,"inUser"
-						,"inCarNo"
-						,"inTime"
-						,"model"
-						,"standard"
-						,"count"
-						,"weight"
-						,"plateNo"
-						,"customerName"
-						,"fkComponyName"
-						,"receiveAddress"
-						,"wgtDcnMtcCd"
-						,"edgeTy"
-						,"productionPlace"
-						,"outCarNo"
-						,"tallyPeople"
-						,"addId"
-						,"addTime"
-						,"remark"
-						,"recordType"
+						"wareName",
+						"stackName",
+						"layer",
+						"materialName",
+						"standard",
+						"plateNo",
+						"ordNo",
+						"model",
+						"weight",
+						"count",
+						"contractNo",
+						"outCarNo",
+						"addTime",
+						"fkComponyName",
+						"customerName",
+						"receiveAddress",
+						"productionPlace",
+						"packNo",
+						"remark",
+						"addId",
+						"tallyPeople",
+						"inCarNo",
+						"inTime",
+						"inUser",
+						"wgtDcnMtcCd",
+						"recordType"
 				]
 
 				for(var i=0;i<imptData.length;i++){

src/view/ware/storechange.vue

@@ -12,11 +12,7 @@
 					<el-form-item label="垛位名称" style="margin-left: -35px">
 						<el-input v-model="query.stackName" 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="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">
+					<el-form-item label="品名" style="margin-left: -35px">
 						<el-input v-model="query.materialName" size="small" style="width:120px;margin-left: -8px">
 							<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
 						</el-input>
@@ -26,6 +22,26 @@
 							<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
 						</el-input>
 					</el-form-item>
+					<el-form-item label="规格型号" style="margin-left: -15px">
+						<el-input v-model="query.model" clearable 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="query.packNo" clearable size="small" style="width:120px;margin-left: -8px" @input="getPackList">
+						</el-input>
+					</el-form-item>
+					<el-form-item label="材料号" style="margin-left: -15px">
+						<el-input v-model="query.plateNo" clearable size="small" style="width:120px;margin-left: -8px" @input="getPltList">
+						</el-input>
+					</el-form-item>
+					<el-form-item label="订单号" style="margin-left: -15px">
+						<el-input v-model="query.ordNo" clearable size="small" style="width:120px;margin-left: -8px" @input="getOrdList">
+						</el-input>
+					</el-form-item>
+					<el-form-item label="合约号" style="margin-left: -15px">
+						<el-input v-model="query.contractNo" clearable size="small" style="width:120px;margin-left: -8px" @input="getContractList">
+						</el-input>
+					</el-form-item>
 					<el-form-item label="货权单位" style="margin-left: -35px">
 						<el-select v-model="query.fkcustmerName" filterable placeholder="请选择客户名称" clearable size="small" style="margin-left: 5px; width: 170px">
 							<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
@@ -38,20 +54,6 @@
 							</el-option>
 						</el-select>
 					</el-form-item>
-					<el-form-item label="规格型号" style="margin-left: -15px">
-						<el-input v-model="query.model" 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="query.ordNo" size="small" style="width:120px;margin-left: -8px" @input="getOrdList">
-						</el-input>
-					</el-form-item>
-					<el-form-item label="合约号" style="margin-left: -15px">
-						<el-input v-model="query.contractNo" size="small" style="width:120px;margin-left: -8px" @input="getContractList">
-						</el-input>
-					</el-form-item>
-
 					<el-form-item label="" style="margin-top: 0px;margin-left: 10px">
 						<el-button @click="handleSearch" size="small"  type="primary">查询</el-button>
 						<el-button @click="showChangeCustomer" size="small"  type="primary">货权转移</el-button>
@@ -330,6 +332,7 @@
 					wareId:'',
 					ordNo:[],
 					contractNo:[],
+					packNo:[],
 					fkcustmerName:'',
 					remark1:''
 				},
@@ -471,7 +474,7 @@
 				this.$refs.PopupIn.show()
 			},
 			handleInBack() {
-				this.$confirm("确认删除吗?", "提示", {
+				this.$confirm("确认取消入库吗?", "提示", {
 					confirmButtonText:'确认',
 					cancelButtonText:'取消',
 					type: "warning"
@@ -586,6 +589,7 @@
 					plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
 					contractNo: this.query.contractNo == 0 ? '' : this.query.contractNo.join(','),
+					packNo: this.query.packNo == 0 ? '' : this.query.packNo.join(','),
 					remark1: this.query.remark1
 				}
 				//console.log(param);
@@ -914,6 +918,10 @@
 				const replaceResult = this.query.contractNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
 				this.query.contractNo = replaceResult;
 			},
+			getPackList(){
+				const replaceResult = this.query.packNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
+				this.query.packNo = replaceResult;
+			},
 
 			handleExport() {
 				var imptData = [];
@@ -931,6 +939,7 @@
 					plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
 					contractNo: this.query.contractNo == 0 ? '' : this.query.contractNo.join(','),
+					packNo: this.query.packNo == 0 ? '' : this.query.packNo.join(','),
 					remark1: this.query.remark1
 				}