LiuCheng 3 天之前
父節點
當前提交
53938b0781

+ 1
- 1
src/components/PopupDistribution.vue 查看文件

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

+ 1
- 1
src/components/PopupOut.vue 查看文件

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

+ 8
- 1
src/view/record/inrecord.vue 查看文件

35
 								<el-input v-model="query.carNo" size="small"  style="width:120px;margin-left: -8px">
35
 								<el-input v-model="query.carNo" size="small"  style="width:120px;margin-left: -8px">
36
 								</el-input>
36
 								</el-input>
37
 							</el-form-item>
37
 							</el-form-item>
38
+							<el-form-item label="合约号" style="margin-left: -25px">
39
+								<el-input v-model="query.contractNo" size="small"  style="width:120px;margin-left: -8px">
40
+								</el-input>
41
+							</el-form-item>
38
 						</el-row>
42
 						</el-row>
39
 						<el-row>
43
 						<el-row>
40
 							<el-form-item label="规格型号" style="margin-left: -25px;margin-top: -15px">
44
 							<el-form-item label="规格型号" style="margin-left: -25px;margin-top: -15px">
164
 					carNo:'',
168
 					carNo:'',
165
 					tallyPeople:'',
169
 					tallyPeople:'',
166
 					fkComponyName:'',
170
 					fkComponyName:'',
171
+					contractNo:''
167
 				},
172
 				},
168
 				loading: false,
173
 				loading: false,
169
 				tableData: [],
174
 				tableData: [],
298
 					ordNo :this.query.ordNo,
303
 					ordNo :this.query.ordNo,
299
 					carNo : this.query.carNo,
304
 					carNo : this.query.carNo,
300
 					tallyPeople:this.query.tallyPeople,
305
 					tallyPeople:this.query.tallyPeople,
301
-					fkComponyName:this.query.fkComponyName
306
+					fkComponyName:this.query.fkComponyName,
307
+					contractNo :this.query.contractNo,
302
 				}
308
 				}
303
 
309
 
304
 				this.childParam = param;
310
 				this.childParam = param;
339
 					carNo : this.query.carNo,
345
 					carNo : this.query.carNo,
340
 					tallyPeople:this.query.tallyPeople,
346
 					tallyPeople:this.query.tallyPeople,
341
 					fkComponyName:this.query.fkComponyName,
347
 					fkComponyName:this.query.fkComponyName,
348
+					contractNo :this.query.contractNo,
342
 				}
349
 				}
343
 
350
 
344
 
351
 

+ 12
- 6
src/view/record/outrecord.vue 查看文件

5
 				<el-form :model="query" label-width="100px" inline="">
5
 				<el-form :model="query" label-width="100px" inline="">
6
 					<el-row>
6
 					<el-row>
7
 						<el-form-item label="库房名称">
7
 						<el-form-item label="库房名称">
8
-							<el-select size="small" v-model="query.wareName" clearable style="width: 140px;" @change="changeWare">
8
+							<el-select size="small" v-model="query.wareName" clearable style="width: 100px;" @change="changeWare">
9
 								<el-option v-for="item in optionsWare" :key="item.id" :label="item.name" :value="item.name">
9
 								<el-option v-for="item in optionsWare" :key="item.id" :label="item.name" :value="item.name">
10
 								</el-option>
10
 								</el-option>
11
 							</el-select>
11
 							</el-select>
24
 							</el-input>
24
 							</el-input>
25
 						</el-form-item>
25
 						</el-form-item>
26
 						<el-form-item label="客户名称" style="margin-left: -35px">
26
 						<el-form-item label="客户名称" style="margin-left: -35px">
27
-							<el-input v-model="query.customerName" size="small" style="width:200px;margin-left: -8px">
27
+							<el-input v-model="query.customerName" size="small" style="width:160px;margin-left: -8px">
28
 								<el-button slot="append" icon="el-icon-search" @click="showCustomer"></el-button>
28
 								<el-button slot="append" icon="el-icon-search" @click="showCustomer"></el-button>
29
 							</el-input>
29
 							</el-input>
30
 						</el-form-item>
30
 						</el-form-item>
31
+						<el-form-item label="合约号" style="margin-left: -25px;margin-top: 0px">
32
+							<el-input v-model="query.contractNo" size="small"  style="width:100px;margin-left: -8px">
33
+							</el-input>
34
+						</el-form-item>
31
 						<el-form-item label="付款单位" style="margin-left: -35px">
35
 						<el-form-item label="付款单位" style="margin-left: -35px">
32
 							<el-input v-model="query.fkComponyName" size="small" style="width:200px;margin-left: -8px">
36
 							<el-input v-model="query.fkComponyName" size="small" style="width:200px;margin-left: -8px">
33
 								<el-button slot="append" icon="el-icon-search" @click="showFkCompony"></el-button>
37
 								<el-button slot="append" icon="el-icon-search" @click="showFkCompony"></el-button>
45
 							<el-input v-model="query.plateNo" size="small" style="width:120px;margin-left: -8px">
49
 							<el-input v-model="query.plateNo" size="small" style="width:120px;margin-left: -8px">
46
 							</el-input>
50
 							</el-input>
47
 						</el-form-item>
51
 						</el-form-item>
48
-						<el-form-item label="出库时间" style="margin-left: -35px;margin-top: -15px">
52
+						<el-form-item label="出库时间" style="margin-left: -35px;margin-top: 0px">
49
 								<el-date-picker v-model="query.RecordDate" style="width:330px;margin-left: -8px" size="small" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
53
 								<el-date-picker v-model="query.RecordDate" style="width:330px;margin-left: -8px" size="small" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
50
 							    </el-date-picker>
54
 							    </el-date-picker>
51
 						</el-form-item>
55
 						</el-form-item>
264
 					tallyPeople:'',
268
 					tallyPeople:'',
265
 					ordNo:'',
269
 					ordNo:'',
266
 					fkComponyName:'',
270
 					fkComponyName:'',
267
-					
271
+					contractNo:''
268
 				},
272
 				},
269
 				accData:{
273
 				accData:{
270
 					accDate:'',
274
 					accDate:'',
537
 					carNo:this.query.carNo,
541
 					carNo:this.query.carNo,
538
 					tallyPeople:this.query.tallyPeople,
542
 					tallyPeople:this.query.tallyPeople,
539
 					ordNo :this.query.ordNo,
543
 					ordNo :this.query.ordNo,
540
-					fkComponyName:this.query.fkComponyName
544
+					fkComponyName:this.query.fkComponyName,
545
+					contractNo:this.query.contractNo
541
 				}
546
 				}
542
 				this.childParam = param;
547
 				this.childParam = param;
543
 
548
 
667
 					carNo:this.query.carNo,
672
 					carNo:this.query.carNo,
668
 					tallyPeople:this.query.tallyPeople,
673
 					tallyPeople:this.query.tallyPeople,
669
 					ordNo :this.query.ordNo,
674
 					ordNo :this.query.ordNo,
670
-					fkComponyName:this.query.fkComponyName
675
+					fkComponyName:this.query.fkComponyName,
676
+					contractNo:this.query.contractNo
671
 				}
677
 				}
672
 				// alert(JSON.stringify(param))
678
 				// alert(JSON.stringify(param))
673
 
679
 

+ 9
- 2
src/view/ware/storechange.vue 查看文件

4
 			<el-form :model="query" label-width="100px" inline="">
4
 			<el-form :model="query" label-width="100px" inline="">
5
 				<el-row>
5
 				<el-row>
6
 					<el-form-item label="库房名称" style="margin-left: -15px">
6
 					<el-form-item label="库房名称" style="margin-left: -15px">
7
-						<el-select v-model="query.wareName" clearable size="small" style="width:120px;margin-left: -8px">
7
+						<el-select v-model="query.wareName" clearable size="small" style="width:100px;margin-left: -8px">
8
 							<el-option v-for="item in optionsWare" :key="item.id" :label="item.name" :value="item.name">
8
 							<el-option v-for="item in optionsWare" :key="item.id" :label="item.name" :value="item.name">
9
 							</el-option>
9
 							</el-option>
10
 						</el-select>
10
 						</el-select>
11
 					</el-form-item>
11
 					</el-form-item>
12
 					<el-form-item label="垛位名称" style="margin-left: -35px">
12
 					<el-form-item label="垛位名称" style="margin-left: -35px">
13
-						<el-input v-model="query.stackName" size="small" style="width:120px;margin-left: -8px"></el-input>
13
+						<el-input v-model="query.stackName" size="small" style="width:100px;margin-left: -8px"></el-input>
14
 					</el-form-item>
14
 					</el-form-item>
15
 					<el-form-item label="物料名称" style="margin-left: -35px">
15
 					<el-form-item label="物料名称" style="margin-left: -35px">
16
 						<el-input v-model="query.materialName" size="small" style="width:120px;margin-left: -8px">
16
 						<el-input v-model="query.materialName" size="small" style="width:120px;margin-left: -8px">
27
 							<el-button slot="append" icon="el-icon-search" @click="showFKcustmer"></el-button>
27
 							<el-button slot="append" icon="el-icon-search" @click="showFKcustmer"></el-button>
28
 						</el-input>
28
 						</el-input>
29
 					</el-form-item>
29
 					</el-form-item>
30
+					<el-form-item label="合约号" style="margin-left: -35px">
31
+						<el-input v-model="query.contractNo" size="small" style="width:100px;margin-left: -8px">
32
+						</el-input>
33
+					</el-form-item>
30
 					<el-form-item label="订单客户" style="margin-left: -35px">
34
 					<el-form-item label="订单客户" style="margin-left: -35px">
31
 						<el-input v-model="query.customerName" size="small" style="width:170px;margin-left: -8px">
35
 						<el-input v-model="query.customerName" size="small" style="width:170px;margin-left: -8px">
32
 							<el-button slot="append" icon="el-icon-search" @click="showCustomer"></el-button>
36
 							<el-button slot="append" icon="el-icon-search" @click="showCustomer"></el-button>
240
 					inRecordDate:[],
244
 					inRecordDate:[],
241
 					fkcustmerName:'',
245
 					fkcustmerName:'',
242
 					ordNo:'',
246
 					ordNo:'',
247
+					contractNo:''
243
 				},
248
 				},
244
 				multipleSelection: [],
249
 				multipleSelection: [],
245
 				tableData: [],
250
 				tableData: [],
431
 					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"),
436
 					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"),
432
 					fkcustmerName : this.query.fkcustmerName,
437
 					fkcustmerName : this.query.fkcustmerName,
433
 					ordNo : this.query.ordNo,
438
 					ordNo : this.query.ordNo,
439
+					contractNo : this.query.contractNo,
434
 				}
440
 				}
435
 				axios.get(url, param).then(response => {
441
 				axios.get(url, param).then(response => {
436
 					if (response.data.code == 0) {
442
 					if (response.data.code == 0) {
741
 					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"),
747
 					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"),
742
 					fkcustmerName : this.query.fkcustmerName,
748
 					fkcustmerName : this.query.fkcustmerName,
743
 					ordNo : this.query.ordNo,
749
 					ordNo : this.query.ordNo,
750
+					contractNo : this.query.contractNo,
744
 				}
751
 				}
745
 
752
 
746
 
753
 

Loading…
取消
儲存