111

src/view/ware/storechange.vue

@@ -54,6 +54,16 @@
 							</el-option>
 						</el-select>
 					</el-form-item>
+					<el-form-item label="是否已出库" style="margin-left: -35px">
+						<el-select v-model="query.outFlag" filterable placeholder="请选择订单客户" clearable size="small" style="margin-left: 5px; width: 170px">
+							<el-option v-for="item in optionsOutFlag" :key="item.value" :label="item.label" :value="item.value" >
+							</el-option>
+						</el-select>
+					</el-form-item>
+					<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-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>
@@ -75,6 +85,18 @@
 						</el-dropdown>
 						
 					</el-form-item>
+
+					<el-form-item label="" style="margin-top: 0px;margin-left: 10px">
+						<el-dropdown placement="bottom" trigger="click" @command="batchOperate">
+							<el-button type="danger" size="small"> 封锁出仓<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+							<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-menu>
+						</el-dropdown>
+						
+					</el-form-item>
 				</el-row>
 				
 			</el-form>
@@ -131,6 +153,8 @@
 				</el-table-column>
 				<el-table-column prop="payWay" label="月付方式" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
+				<el-table-column prop="outBound" label="是否出仓" width="100" show-overflow-tooltip header-align="center">
+				</el-table-column>
 				<el-table-column prop="inwareDay" label="存储天数" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
 			</el-table>
@@ -334,7 +358,9 @@
 					contractNo:[],
 					packNo:[],
 					fkcustmerName:'',
-					remark1:''
+					remark1:'',
+					outFlag:'0',
+					inRecordDate:[]
 				},
 				multipleSelection: [],
 				tableData: [],
@@ -382,7 +408,14 @@
 				newOrdno:'',
 				newReceiveaddress:'',
 				newProductionplace:'',
-				newPackno:''
+				newPackno:'',
+				optionsOutFlag:[{
+					value: '0',
+					label: '在库'
+				},{
+					value: '1',
+					label: '已出库'
+				}],
 			};
 		},
 		mounted() {
@@ -415,6 +448,15 @@
 					case "handleChangeStack":
 						this.handleChangeStack();
 						break;
+					case "handleLock":
+						this.handleLock();
+						break;
+					case "handleUnLock":
+						this.handleUnLock();
+						break;
+					case "handleOutbound":
+						this.handleOutbound();
+						break;
 				}
 			},
 
@@ -591,6 +633,16 @@
 			},
 
 			getTableData() {
+				if(this.query.outFlag == '1' && this.query.inRecordDate == null){
+					this.$message({
+						type: 'error',
+						message: '查询历史数据请选择入库时间区间',
+					});
+					return
+				}
+				if(this.query.inRecordDate == null){
+					this.query.inRecordDate = [false,false];
+				}
 				this.loading = true
 				var url = 'WareStore/queryStore.do'
 				var param = {
@@ -607,7 +659,9 @@
 					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
+					remark1: this.query.remark1,
+					outFlag: this.query.outFlag,
+
 				}
 				//console.log(param);
 				axios.get(url, param).then(response => {
@@ -903,22 +957,8 @@
 			},
 			handleTableSelect(selection, row) {  //第一个参数是目前所有选中的数据
 				console.log(JSON.stringify(row))
-				if (row.lockFlag == '1') {
-					// this.$message({
-					// 	type: 'error',
-					// 	message: '该行已被配货锁定',
-					// });
-					alert("该行已被配货锁定")
-					this.toggleSelection([row], false)
-					// for(let i = 0;i<selection.length;i++){
-					//  if(selection[i]==row){
-					// 	 selection.splice(i,1)
-					//  }
-					// }
-				} else {
-					this.selectRows = selection
-					this.setLayerColor()
-				}
+				this.selectRows = selection
+				this.setLayerColor()
 			},
 			selectAll(selection){
 				this.selectRows = selection;
@@ -1078,14 +1118,103 @@
 					return v[j]
 				}))
 			},
-
-			//showChangeAddress() {},
-			// handleAddressSave() {
-			// },
-			// handleAddressCancelSave() {
-			// 	this.addressDialogVisible = false
-			// },
+			handleLock(){
+				this.$confirm("确认将选中的材料进行封锁吗?", "提示", {
+					confirmButtonText:'确认',
+					cancelButtonText:'取消',
+					type: "warning"
+				}).then(() => {
+					if (this.selectRows.length < 1) {
+						this.$message({
+						type: 'error',
+						message: '至少选择一条数据！',
+						});
+						return
+					} else {
+						var url = 'WareStore/lockAndUnlock.do'
+						var param = {
+							json: JSON.stringify(this.selectRows),
+							lockFlag:'1'
+						}
+						axios.post(url, param).then(response => {
+							if (response.data.code == 0) {
+								this.getTableData()
+							} else {
+								this.$message({
+									type: 'error',
+									message: '操作失败；' + response.data.msg,
+								});
+							}
+						});
+					}
+				}).catch(() => {});
+			},
+			handleUnLock(){
+				this.$confirm("确认将选中的材料取消封锁吗?", "提示", {
+					confirmButtonText:'确认',
+					cancelButtonText:'取消',
+					type: "warning"
+				}).then(() => {
+					if (this.selectRows.length < 1) {
+						this.$message({
+						type: 'error',
+						message: '至少选择一条数据！',
+						});
+						return
+					} else {
+						var url = 'WareStore/lockAndUnlock.do'
+						var param = {
+							json: JSON.stringify(this.selectRows),
+							lockFlag:'0'
+						}
+						axios.post(url, param).then(response => {
+							if (response.data.code == 0) {
+								this.getTableData()
+							} else {
+								this.$message({
+									type: 'error',
+									message: '操作失败；' + response.data.msg,
+								});
+							}
+						});
+					}
+				}).catch(() => {});
+			},
+			handleOutbound(){
+				this.$confirm("确认将选中的材料标记为出仓吗?", "提示", {
+					confirmButtonText:'确认',
+					cancelButtonText:'取消',
+					type: "warning"
+				}).then(() => {
+					if (this.selectRows.length < 1) {
+						this.$message({
+						type: 'error',
+						message: '至少选择一条数据！',
+						});
+						return
+					} else {
+						var url = 'WareStore/Outbound.do'
+						var param = {
+							json: JSON.stringify(this.selectRows),
+							outbound: '已出仓'
+						}
+						axios.post(url, param).then(response => {
+							if (response.data.code == 0) {
+								this.getTableData()
+							} else {
+								this.$message({
+									type: 'error',
+									message: '操作失败；' + response.data.msg,
+								});
+							}
+						});
+					}
+				}).catch(() => {});
+			},
 		},
+
+		
+
 	}
 </script>