1.入库明细表单新增合约号字段

2.出库明细表单新增合约号字段
3.入库明细表单新增查询条件"合约号"
4.出库明细表单新增查询条件"合约号"

src/view/record/inrecord.vue

@@ -46,6 +46,10 @@
 								<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;margin-top: -15px">
+                <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-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">
@@ -66,6 +70,10 @@
 								<el-input v-model="query.remark1" size="small"  style="width:120px;margin-left: -8px" @input="getPltList">
 								</el-input>
 							</el-form-item>
+              <el-form-item label="修改时间" style="margin-left: -35px;margin-top: -15px">
+                <el-date-picker size="small" v-model="ChangeInDtm" type="datetime" placeholder="选择日期时间" style="width:200px;margin-left: -8px">
+                </el-date-picker>
+              </el-form-item>
 							<el-form-item  label=" " style="margin-left: -35px;margin-top: -15px">
 								<el-button size="small" @click="handleSearch" type="primary">查询</el-button>
 								<!-- <el-button @click="handleSearch" type="primary" size="small">查询</el-button> -->
@@ -94,10 +102,7 @@
 								</el-dropdown>
 
 							</el-form-item>
-							<el-form-item label="修改时间" style="margin-left: -35px;margin-top: -15px">
-								<el-date-picker size="small" v-model="ChangeInDtm" type="datetime" placeholder="选择日期时间" style="width:200px;margin-left: -8px">
-								</el-date-picker>
-							</el-form-item>
+
 						</el-row>
 					</el-form>
 			<total-block ref="totalBlock" style="margin-left: -25px;font-size: 13px;margin-left: 5px" v-bind:childParam="childParam" v-bind:childUrl = 'childUrl'></total-block>
@@ -115,6 +120,8 @@
 				</el-table-column>
 				<el-table-column prop="materialName" label="货物品名" show-overflow-tooltip width="100px" header-align="center" align="center">
 				</el-table-column>
+        <el-table-column prop="contractNo" label="合约号" show-overflow-tooltip width="100px" header-align="center" align="center">
+				</el-table-column>
 				<el-table-column prop="ordNo" label="订单号" width="180px" show-overflow-tooltip align="left">
 				</el-table-column>
 				<el-table-column prop="model" label="规格" show-overflow-tooltip width="180px" align="center">
@@ -191,7 +198,8 @@
 					carNo:'',
 					tallyPeople:'',
 					fkComponyName:'',
-					remark1:''
+					remark1:'',
+          contractNo:''
 				},
 				selectRows: [],
 				loading: false,
@@ -215,7 +223,8 @@
 					standard: '',
 					customerName: '',
 					plateNo: '',
-					ord_no:''
+					ord_no:'',
+          contractNo:''
 				},
 				childUrl:'WareInRecord/queryTotal.do',
 				tallyPeopleOption:[],
@@ -336,6 +345,7 @@
 				this.query.tallyPeople = '',
 				this.query.fkComponyName = '',
 				this.query.remark1 = '';
+        this.query.contractNo = '';
 				this.setSearchTime()
 			},
 			getWare() {
@@ -372,7 +382,8 @@
 					carNo : this.query.carNo,
 					tallyPeople:this.query.tallyPeople,
 					fkComponyName:this.query.fkComponyName,
-					remark1:this.query.remark1
+					remark1:this.query.remark1,
+          contractNo:this.query.contractNo.length == 0 ? '' : this.query.contractNo.join(','),
 				}
 
 				this.childParam = param;
@@ -398,6 +409,10 @@
 				const replaceResult = this.query.plateNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
 				this.query.plateNo = replaceResult;
 			},
+      getConList(){
+        const replaceResult = this.query.contractNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
+        this.query.contractNo = replaceResult;
+      },
 			getOrdList(){
 				const replaceResult = this.query.ordNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
 				this.query.ordNo = replaceResult;
@@ -421,7 +436,8 @@
 					carNo : this.query.carNo,
 					tallyPeople:this.query.tallyPeople,
 					fkComponyName:this.query.fkComponyName,
-					remark1:this.query.remark1
+					remark1:this.query.remark1,
+          contractNo:this.query.contractNo.length == 0 ? '' : this.query.contractNo.join(','),
 				}
 
 

src/view/record/outrecord.vue

@@ -47,6 +47,10 @@
 							<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>
@@ -65,6 +69,10 @@
 							<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>
@@ -93,10 +101,6 @@
 						</el-dropdown>
 
 					</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-row>
 				</el-form>
@@ -118,6 +122,8 @@
 				</el-table-column>
 				<el-table-column prop="materialName" label="品名" show-overflow-tooltip width="100px" header-align="center" align="center">
 				</el-table-column>
+        <el-table-column prop="contractNo" label="合约号" show-overflow-tooltip width="100px" header-align="center" align="center">
+        </el-table-column>
 				<el-table-column prop="ordNo" label="订单号" width="180px" show-overflow-tooltip align="left">
 				</el-table-column>
 				<el-table-column prop="inUser" label="入库人" width="100px" show-overflow-tooltip align="left">
@@ -300,8 +306,8 @@
 					tallyPeople:'',
 					ordNo:[],
 					fkComponyName:'',
-					remark1:''
-
+					remark1:'',
+          contractNo:'',
 				},
 				accData:{
 					accDate:'',
@@ -332,6 +338,7 @@
 					customerName: '',
 					plateNo: '',
 					remark1:'',
+          contractNo:''
 				},
 				childUrl:'WareOutRecord/queryTotal.do',
 				time:"",
@@ -642,7 +649,8 @@
 					tallyPeople:this.query.tallyPeople,
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
 					fkComponyName:this.query.fkComponyName,
-					remark1 : this.query.remark1
+					remark1 : this.query.remark1,
+          contractNo:this.query.contractNo.length == 0 ? '' : this.query.contractNo.join(','),
 				}
 				this.childParam = param;
 				console.log(param);
@@ -721,6 +729,11 @@
 				const replaceResult = this.query.plateNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
 				this.query.plateNo = replaceResult;
 			},
+      getConList(){
+        const replaceResult = this.query.contractNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
+        console.log( this.query.contractNo,replaceResult)
+        this.query.contractNo = replaceResult;
+      },
 			getOrdList(){
 				const replaceResult = this.query.ordNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
 				this.query.ordNo = replaceResult;
@@ -815,7 +828,8 @@
 					tallyPeople:this.query.tallyPeople,
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
 					fkComponyName:this.query.fkComponyName,
-					remark1:this.query.remark1
+					remark1:this.query.remark1,
+          contractNo:this.query.contractNo.length == 0 ? '' : this.query.contractNo.join(','),
 				}
 				// alert(JSON.stringify(param))