1111

src/view/ware/storechange.vue

@@ -92,7 +92,7 @@
 							<el-dropdown-menu slot="dropdown">
 								<el-dropdown-item command="handleLock" style="background-color: #f5f5f5;">封锁</el-dropdown-item>
 								<el-dropdown-item command="handleUnLock" style="background-color: #f5f5f5;">取消封锁</el-dropdown-item>
-								<el-dropdown-item command="handleOutbound" style="background-color: #f5f5f5;">出仓</el-dropdown-item>
+								<el-dropdown-item command="handleOutbound" style="background-color: #f5f5f5;">入仓</el-dropdown-item>
 							</el-dropdown-menu>
 						</el-dropdown>
 						
@@ -104,46 +104,47 @@
 		<div class="tabledata-grid">
 			<el-table :data="tableData" height="100%"   border style="width: 97%;" v-loading="loading" ref="multipleTable"	@select="handleTableSelect"	 @selection-change="handleSelectionChange" @select-all = "selectAll" 
 			:row-class-name="tableRowClassName">
-				<el-table-column type="selection" width="40" header-align="center" align="center"></el-table-column>
-				<el-table-column prop="ware.name" label="仓库名称" width="120" show-overflow-tooltip header-align="center" align="center">
-				</el-table-column>
-				<el-table-column prop="stack.name" label="垛位" width="60" show-overflow-tooltip header-align="center" align="center">
+				<el-table-column type="selection" width="40" header-align="center" align="center" fixed></el-table-column>
+				
+				<el-table-column prop="stack.name" label="垛位" width="100" show-overflow-tooltip header-align="center" align="center">
 				</el-table-column>
 				<el-table-column prop="layer" label="层数" width="60" show-overflow-tooltip header-align="center" align="center">
 				</el-table-column>
-				<el-table-column prop="material.name" label="品名" width="100" show-overflow-tooltip header-align="center" align="center">
+				<el-table-column prop="material.name" label="品名" width="120" show-overflow-tooltip header-align="center" align="center">
 				</el-table-column>
-				<el-table-column prop="material.standard" label="钢种" width="100" show-overflow-tooltip header-align="center" align="center">
+				<el-table-column prop="material.standard" label="钢种" width="120" show-overflow-tooltip header-align="center" align="center">
 				</el-table-column>
-				<el-table-column prop="plateNo" label="产品编号" width="200" show-overflow-tooltip header-align="center">
+				<el-table-column prop="plateNo" label="产品编号" width="150" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="ordNo" label="订单号" width="200" show-overflow-tooltip header-align="center">
+				<el-table-column prop="ordNo" label="订单号" width="120" show-overflow-tooltip header-align="center">
 				</el-table-column>
 				<el-table-column prop="model" label="规格型号" width="160" show-overflow-tooltip header-align="center" align="center">
 				</el-table-column>
-				<el-table-column prop="weight" label="重量" width="120" show-overflow-tooltip align="right" header-align="center">
+				<el-table-column prop="weight" label="重量" width="80" show-overflow-tooltip align="left" header-align="center">
 				</el-table-column>
-				<el-table-column prop="count" label="数量" width="120" show-overflow-tooltip align="right" header-align="center">
+				<el-table-column prop="count" label="数量" width="60" show-overflow-tooltip align="left" header-align="center">
 				</el-table-column>
-				<el-table-column prop="contractNo" label="合约号" width="120" show-overflow-tooltip align="right" header-align="center">
+				<el-table-column prop="contractNo" label="合约号" width="100" show-overflow-tooltip align="left" header-align="center">
 				</el-table-column>
-				<el-table-column prop="carNo" label="入库车号" width="120px" show-overflow-tooltip align="left">
+				<el-table-column prop="fkCustomerName" label="货权单位" width="240" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="addTime" label="入库时间" width="200px" show-overflow-tooltip align="left">
+				<el-table-column prop="customer.name" label="客户名称" width="240" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="fkCustomerName" label="货权单位" width="300" show-overflow-tooltip header-align="center">
+				<el-table-column prop="receiveAddress" label="收货地址" width="300" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="customer.name" label="客户名称" width="300" show-overflow-tooltip header-align="center">
+				<el-table-column prop="ware.name" label="仓库名称" width="100" show-overflow-tooltip header-align="center" align="center">
 				</el-table-column>
-				<el-table-column prop="receiveAddress" label="收货地址" width="300" show-overflow-tooltip header-align="center">
+				<el-table-column prop="carNo" label="入库车号" width="120" show-overflow-tooltip align="left">
+				</el-table-column>
+				<el-table-column prop="addTime" label="入库时间" width="180" show-overflow-tooltip align="left">
 				</el-table-column>
-				<el-table-column prop="productionPlace" label="产地" width="250" show-overflow-tooltip header-align="center">
+				<el-table-column prop="productionPlace" label="产地" width="160" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="packNo" label="捆包号" width="180" show-overflow-tooltip header-align="center">
+				<el-table-column prop="packNo" label="捆包号" width="140" show-overflow-tooltip header-align="center">
 				</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" :formatter="lockFormatter">
+				<el-table-column prop="lockFlag" label="锁定状态" width="100" 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>
@@ -633,7 +634,7 @@
 			},
 
 			getTableData() {
-				if(this.query.outFlag == '1' && this.query.inRecordDate == null){
+				if(this.query.outFlag == '1' && (this.query.inRecordDate == null || this.query.inRecordDate == '')){
 					this.$message({
 						type: 'error',
 						message: '查询历史数据请选择入库时间区间',
@@ -661,6 +662,8 @@
 					packNo: this.query.packNo == 0 ? '' : this.query.packNo.join(','),
 					remark1: this.query.remark1,
 					outFlag: this.query.outFlag,
+					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"),
 
 				}
 				//console.log(param);
@@ -1055,6 +1058,7 @@
 								"吊装工",
 								"计量方式",
 								"月付方式",
+								"是否出仓",
 								"存储天数"
 
 				] // 导出的表头名
@@ -1082,6 +1086,7 @@
 									"tallyPeople",
 									"wgtDcnMtcCd",
 									"payWay",
+									"outBound",
 									"inwareDay"
 				]
 				for(var i=0;i<imptData.length;i++){
@@ -1181,7 +1186,7 @@
 				}).catch(() => {});
 			},
 			handleOutbound(){
-				this.$confirm("确认将选中的材料标记为出仓吗?", "提示", {
+				this.$confirm("确认将选中的材料标记为入仓吗?", "提示", {
 					confirmButtonText:'确认',
 					cancelButtonText:'取消',
 					type: "warning"
@@ -1196,7 +1201,7 @@
 						var url = 'WareStore/Outbound.do'
 						var param = {
 							json: JSON.stringify(this.selectRows),
-							outbound: '已出仓'
+							outbound: '已入仓'
 						}
 						axios.post(url, param).then(response => {
 							if (response.data.code == 0) {