同步出库记录1,2界面

src/view/record/outrecordWithoutCancel.vue

@@ -2,78 +2,108 @@
 	<div style="height:100%;">
 		<div class="searchForm-header">
 			<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: 100px;" @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 :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-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: -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-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-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 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>
-							
-						</el-form-item>
-						<el-form-item label="" style="margin-top: -15px">
-							<el-upload class="upload-demo" action="" 
-								 ref="upload" :limit="1" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
-								 :auto-upload="false"  >
-								 <el-button plain slot="trigger"  type="success" v-show="false" style= "margin-left: 5px" size="small">询单导入</el-button>
-								<el-button   type="success" @click="handleExport" style="margin-left: 2px" size="small">导出记录</el-button>
-							</el-upload>
-						</el-form-item>
-					</el-row>
-				</el-form>
+            <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"  @input="getPltList">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="合约号" style="margin-left: -35px;">
+              <el-input v-model="query.contractNo" size="small"  style="width:120px;margin-left: -8px" @input="getConList">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="出库时间" style="margin-left: -35px">
+              <el-date-picker v-model="query.RecordDate" style="width:330px;margin-left: -8px" size="small" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="理货人员" >
+              <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">
+              <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: -35px">
+              <el-date-picker size="small" v-model="ChangeOutDtm" type="datetime" placeholder="选择日期时间" style="width:200px;margin-left: -8px">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label=" " style="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>
+              <!-- <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-button @click="changeCarNoShow" type="primary" size="small" >修改车号</el-button>
+            </el-form-item>
+            <el-form-item label="" >
+              <el-upload class="upload-demo" action=""
+                         ref="upload" :limit="1" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
+                         :auto-upload="false"  >
+                <el-button plain slot="trigger"  type="success" v-show="false" style= "margin-left: 5px" size="small">询单导入</el-button>
+                <el-button   type="success" @click="handleExport" style="margin-left: 2px" size="small">导出记录</el-button>
+              </el-upload>
+            </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="handleOutBack" style="background-color: #f5f5f5;">取消出库</el-dropdown-item>
+                  <el-dropdown-item command="handleDeleteRecord" style="background-color: #f5f5f5;">删除记录</el-dropdown-item>
+                  <el-dropdown-item command="changeRecordOutDtm" style="background-color: #f5f5f5;">修改时间</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+
+            </el-form-item>
+
+          </el-row>
+        </el-form>
 			</el-row>
 			<total-block style="margin-top: -15px" ref="totalBlock" v-bind:childParam="childParam" v-bind:childUrl = 'childUrl'></total-block>
 		</div>
@@ -132,9 +162,9 @@
 				</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="backFlag" label="取消标记" show-overflow-tooltip width="100px" align="center">
 				</el-table-column>
 			</el-table>
@@ -175,20 +205,22 @@
 		},
 		data() {
 			return {
-				query: {
-					wareName: '',
-					stackName: '',
-					model: '',
-					materialName: '',
-					standard: '',
-					customerName: '',
-					plateNo: '',
-					RecordDate:[],
-					carNo:'',
-					tallyPeople:'',
-					ordNo:'',
-					fkComponyName:'',
-				},
+        query: {
+          wareName: '',
+          stackName: '',
+          model: '',
+          materialName: '',
+          standard: '',
+          customerName: '',
+          plateNo: [],
+          RecordDate:[],
+          carNo:'',
+          tallyPeople:'',
+          ordNo:[],
+          fkComponyName:'',
+          remark1:'',
+          contractNo:'',
+        },
 				tableData: [],
 
 				currentPage: 1,
@@ -296,49 +328,53 @@
 			receviceFromFkCompony(customer) {
 				this.query.fkComponyName = customer.name
 			},
-			
-			getTableData() {
-				var url = 'WareOutRecord/query.do'
-				if(this.query.RecordDate == null){
-					this.query.RecordDate = [false,false];
-				}
-				this.loading = true;
-				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"),
-					carNo:this.query.carNo,
-					tallyPeople:this.query.tallyPeople,
-					ordNo :this.query.ordNo,
-					fkComponyName:this.query.fkComponyName
-				}
-				this.childParam = param;
 
-				axios.get(url, param).then(response => {
-					if (response.data.code == 0) {
-						this.tableData = response.data.data.list
-						// console.log(JSON.stringify(response))
-						this.totalRows = response.data.data.total
-						// console.log(JSON.stringify(this.tableData[0]))
-						this.$refs.totalBlock.getTotalData();
-					} else {
-						this.$message({
-							type: 'error',
-							message: '操作失败；' + response.data.msg,
-						});
-					}
-					this.loading = false;
-				});
+      getTableData() {
+        var url = 'WareOutRecord/query.do'
+        if(this.query.RecordDate == null){
+          this.query.RecordDate = [false,false];
+        }
+        this.loading = true
+        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.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 == 0 ? '' : this.query.ordNo.join(','),
+          fkComponyName:this.query.fkComponyName,
+          remark1 : this.query.remark1,
+          contractNo:this.query.contractNo.length == 0 ? '' : this.query.contractNo.join(','),
+        }
+        this.childParam = param;
+        console.log(param);
+        console.log(this.childParam);
 
-			},
+        axios.get(url, param).then(response => {
+          if (response.data.code == 0) {
+            this.tableData = response.data.data.list
+            // console.log(JSON.stringify(response))
+            this.totalRows = response.data.data.total
+            // console.log(JSON.stringify(this.tableData[0]))
+            this.$refs.totalBlock.getTotalData();
+          } else {
+            this.$message({
+              type: 'error',
+              message: '操作失败；' + response.data.msg,
+            });
+          }
+          this.loading = false;
+        });
+
+      },
 			handleTableSelect(val) {
 				this.selectRows = val
 			},
@@ -358,7 +394,7 @@
 					});
 					return
 				}
-				
+
 				if (this.selectRows[0].backFlag == '1') {
 					this.$message({
 						type: 'error',
@@ -430,7 +466,7 @@
 			},
 			handleExport() {
 				var imptData = [];
-				
+
 
 				var url = 'WareOutRecord/query.do'
 				var param = {
@@ -473,7 +509,7 @@
 					}
 
 				});
-				
+
 			},
 			exportExcel(imptData) {
 				 console.log(JSON.stringify(imptData))