111

src/components/PopupDistribution.vue

@@ -271,7 +271,7 @@
 				axios.post(url, param).then(response => {
 					if (response.data.code == 0) {
 
-					//	this.dialogVisible = false   //modify by liuc 2025/04/16  10:14
+						this.dialogVisible = false   //modify by liuc 2025/04/16  10:14
 						this.selectRows    = [];
 						this.$message({
 							message: '配车成功',

src/components/PopupOut.vue

@@ -31,7 +31,7 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item label="承运单位">
-					<el-select v-model="distribution.transportName" size="small" style="margin-left: 10px" clearable placeholder="承运单位">
+					<el-select v-model="distribution.transportName" size="small" style="margin-left: 10px" clearable filterable placeholder="承运单位">
 						<el-option v-for="item in transports" :key="item.name" :label="item.name" :value="item.name">
 						</el-option>
 					</el-select>

src/view/record/inrecord.vue

@@ -35,6 +35,10 @@
 								<el-input v-model="query.carNo" size="small"  style="width:120px;margin-left: -8px">
 								</el-input>
 							</el-form-item>
+							<el-form-item label="合约号" style="margin-left: -25px">
+								<el-input v-model="query.contractNo" size="small"  style="width:120px;margin-left: -8px">
+								</el-input>
+							</el-form-item>
 						</el-row>
 						<el-row>
 							<el-form-item label="规格型号" style="margin-left: -25px;margin-top: -15px">
@@ -164,6 +168,7 @@
 					carNo:'',
 					tallyPeople:'',
 					fkComponyName:'',
+					contractNo:''
 				},
 				loading: false,
 				tableData: [],
@@ -298,7 +303,8 @@
 					ordNo :this.query.ordNo,
 					carNo : this.query.carNo,
 					tallyPeople:this.query.tallyPeople,
-					fkComponyName:this.query.fkComponyName
+					fkComponyName:this.query.fkComponyName,
+					contractNo :this.query.contractNo,
 				}
 
 				this.childParam = param;
@@ -339,6 +345,7 @@
 					carNo : this.query.carNo,
 					tallyPeople:this.query.tallyPeople,
 					fkComponyName:this.query.fkComponyName,
+					contractNo :this.query.contractNo,
 				}
 
 

src/view/record/outrecord.vue

@@ -5,7 +5,7 @@
 				<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-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>
@@ -24,10 +24,14 @@
 							</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-input v-model="query.customerName" size="small" style="width:160px;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: -25px;margin-top: 0px">
+							<el-input v-model="query.contractNo" 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.fkComponyName" size="small" style="width:200px;margin-left: -8px">
 								<el-button slot="append" icon="el-icon-search" @click="showFkCompony"></el-button>
@@ -45,7 +49,7 @@
 							<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-form-item label="出库时间" style="margin-left: -35px;margin-top: 0px">
 								<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>
@@ -264,7 +268,7 @@
 					tallyPeople:'',
 					ordNo:'',
 					fkComponyName:'',
-					
+					contractNo:''
 				},
 				accData:{
 					accDate:'',
@@ -537,7 +541,8 @@
 					carNo:this.query.carNo,
 					tallyPeople:this.query.tallyPeople,
 					ordNo :this.query.ordNo,
-					fkComponyName:this.query.fkComponyName
+					fkComponyName:this.query.fkComponyName,
+					contractNo:this.query.contractNo
 				}
 				this.childParam = param;
 
@@ -667,7 +672,8 @@
 					carNo:this.query.carNo,
 					tallyPeople:this.query.tallyPeople,
 					ordNo :this.query.ordNo,
-					fkComponyName:this.query.fkComponyName
+					fkComponyName:this.query.fkComponyName,
+					contractNo:this.query.contractNo
 				}
 				// alert(JSON.stringify(param))
 

src/view/ware/storechange.vue

@@ -4,13 +4,13 @@
 			<el-form :model="query" label-width="100px" inline="">
 				<el-row>
 					<el-form-item label="库房名称" style="margin-left: -15px">
-						<el-select v-model="query.wareName" clearable size="small" style="width:120px;margin-left: -8px">
+						<el-select v-model="query.wareName" clearable size="small" style="width:100px;margin-left: -8px">
 							<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:120px;margin-left: -8px"></el-input>
+						<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:120px;margin-left: -8px">
@@ -27,6 +27,10 @@
 							<el-button slot="append" icon="el-icon-search" @click="showFKcustmer"></el-button>
 						</el-input>
 					</el-form-item>
+					<el-form-item label="合约号" style="margin-left: -35px">
+						<el-input v-model="query.contractNo" 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.customerName" size="small" style="width:170px;margin-left: -8px">
 							<el-button slot="append" icon="el-icon-search" @click="showCustomer"></el-button>
@@ -240,6 +244,7 @@
 					inRecordDate:[],
 					fkcustmerName:'',
 					ordNo:'',
+					contractNo:''
 				},
 				multipleSelection: [],
 				tableData: [],
@@ -431,6 +436,7 @@
 					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"),
 					fkcustmerName : this.query.fkcustmerName,
 					ordNo : this.query.ordNo,
+					contractNo : this.query.contractNo,
 				}
 				axios.get(url, param).then(response => {
 					if (response.data.code == 0) {
@@ -741,6 +747,7 @@
 					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"),
 					fkcustmerName : this.query.fkcustmerName,
 					ordNo : this.query.ordNo,
+					contractNo : this.query.contractNo,
 				}