111

src/view/ware/storechange.vue

@@ -26,13 +26,13 @@
 							<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-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" >
 							</el-option>
 						</el-select>
 					</el-form-item>
-					<el-form-item label="订单客户" style="margin-left: -35px">
+					<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>
@@ -47,6 +47,10 @@
 						<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>
@@ -113,7 +117,7 @@
 				</el-table-column>
 				<el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="lockFlag" label="锁定状态" width="200" show-overflow-tooltip header-align="center">
+				<el-table-column prop="lockFlag" label="锁定状态" width="200" show-overflow-tooltip header-align="center" :formatter="lockFormatter">
 				</el-table-column>
 				<el-table-column prop="addUser.userDesc" label="入库操作人" width="120px" show-overflow-tooltip align="left">
 				</el-table-column>
@@ -305,6 +309,7 @@
 					plateNo: [],
 					wareId:'',
 					ordNo:[],
+					contractNo:[],
 					fkcustmerName:'',
 					remark1:''
 				},
@@ -412,6 +417,17 @@
 				window.open(this.serverName.substr(0, this.serverName.lastIndexOf('/', this.serverName.lastIndexOf('/') - 1)) +
 					'/import.xls')
 			},
+			lockFormatter: function(row, column) {
+				switch (row.lockFlag) {
+
+					case "0":
+						return "";
+						break;
+					default:
+						return "已锁定";
+						break;
+				}
+			},
 			showIn() {
 				// if (this.query.wareId == '') {
 				// 	this.$message({
@@ -539,6 +555,7 @@
 					fkcustmerName: this.query.fkcustmerName,
 					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(','),
 					remark1: this.query.remark1
 				}
 				//console.log(param);
@@ -857,6 +874,10 @@
 				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;
+			},
 
 			handleExport() {
 				var imptData = [];
@@ -873,6 +894,7 @@
 					fkcustmerName: this.query.fkcustmerName,
 					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(','),
 					remark1: this.query.remark1
 				}
 
@@ -903,50 +925,67 @@
 			},
 			exportExcel(imptData) {
 				// alert(JSON.stringify(imptData))
-				const header = ["层数"
-								,"垛位"
-								,"货物品名"
-								,"材质"
-								,"钢板号"
-								,"规格型号"
-								,"数量"
-								,"重量"
-								,"订单号"
-								,"合约号"
-								,"订单客户"
-								,"客户名称"
-								,"收货地址"
-								,"产地"
-								,"备注"
-								,"垛位备注"
-								,"入库时间"
-								,"入库车号"
+				const header = ["仓库名称",
+								"垛位",
+								"层数",
+								"品名",
+								"钢种",
+								"产品编号",
+								"订单号",
+								"规格型号",
+								"重量",
+								"数量",
+								"合约号",
+								"入库车号",
+								"入库时间",
+								"货权单位",
+								"客户名称",
+								"收货地址",
+								"产地",
+								"捆包号",
+								"备注",
+								"锁定状态",
+								"入库操作人",
+								"吊装工",
+								"计量方式",
+								"月付方式",
+								"存储天数"
 
 				] // 导出的表头名
-				const filterVal = ["layer"
-									,"stackName"
-									,"materialName"
-									,"materialStandard"
-									,"plateNo"
-									,"model"
-									,"count"
-									,"weight"
-									,"ordNo"
-									,"contractNo"
-									,"customerName"
-									,"customerName"
-									,"receiveAddress"
-									,"productionPlace"
-									,"remark"
-									,"remark1"
-									,"addTime"
-									,"carNo"
+				const filterVal = ["wareName",
+									"stackName",
+									"layer",
+									"materialName",
+									"materialStandard",
+									"plateNo",
+									"ordNo",
+									"model",
+									"weight",
+									"count",
+									"contractNo",
+									"carNo",
+									"addTime",
+									"fkCustomerName",
+									"customerName",
+									"receiveAddress",
+									"productionPlace",
+									"packNo",
+									"remark",
+									"lockFlag",
+									"addUserUserDesc",
+									"tallyPeople",
+									"wgtDcnMtcCd",
+									"payWay",
+									"inwareDay"
 				]
 				for(var i=0;i<imptData.length;i++){
+					imptData[i]["wareName"] 			= imptData[i].ware.name;
 					imptData[i]["stackName"] 			= imptData[i].stack.name;
 					imptData[i]["materialName"]     	= imptData[i].material.name;
 					imptData[i]["materialStandard"]     = imptData[i].material.standard;
 					imptData[i]["customerName"]     	= imptData[i].customer.name;
+					imptData[i]["addUserUserDesc"]     	= imptData[i].addUser.userDesc;
+					imptData[i]["lockFlag"]     		= imptData[i].lockFlag == 0 ? '': '已锁定';
 				}
 				const list = imptData
 				const data = this.formatJson(filterVal, list)
@@ -975,10 +1014,10 @@
 </script>
 
 <style>
-.option_btn{
-	margin-left: 30px
-}
-.searchForm-header{
+	.option_btn{
+		margin-left: 30px
+	}
+	.searchForm-header{
 		height: auto;
 		margin-left: 10px;
 	}
@@ -988,4 +1027,8 @@
 		height: calc(100% - 100px);
 
 	}
+	.el-select-dropdown .el-scrollbar .el-scrollbar__wrap
+    {
+        overflow: scroll!important;
+    }
 </style>