ソースを参照

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

2.出库明细表单新增合约号字段
3.入库明细表单新增查询条件"合约号"
4.出库明细表单新增查询条件"合约号"
dw 1週間前
コミット
5a411af5e1
2個のファイルの変更46行の追加16行の削除
  1. 24
    8
      src/view/record/inrecord.vue
  2. 22
    8
      src/view/record/outrecord.vue

+ 24
- 8
src/view/record/inrecord.vue ファイルの表示

46
 								<el-input v-model="query.plateNo" size="small"  style="width:120px;margin-left: -8px" @input="getPltList">
46
 								<el-input v-model="query.plateNo" size="small"  style="width:120px;margin-left: -8px" @input="getPltList">
47
 								</el-input>
47
 								</el-input>
48
 							</el-form-item>
48
 							</el-form-item>
49
+              <el-form-item label="合约号" style="margin-left: -35px;margin-top: -15px">
50
+                <el-input v-model="query.contractNo" size="small"  style="width:120px;margin-left: -8px" @input="getConList">
51
+                </el-input>
52
+              </el-form-item>
49
 							<el-form-item label="理货人员" style="margin-top: -15px">
53
 							<el-form-item label="理货人员" style="margin-top: -15px">
50
 								<el-select v-model="query.tallyPeople" size="small" style="margin-left: 10px;margin-top: -15px" clearable placeholder="理货人员">
54
 								<el-select v-model="query.tallyPeople" size="small" style="margin-left: 10px;margin-top: -15px" clearable placeholder="理货人员">
51
 									<el-option v-for="item in tallyPeopleOption" :key="item.id" :label="item.dicName" :value="item.dicCode">
55
 									<el-option v-for="item in tallyPeopleOption" :key="item.id" :label="item.dicName" :value="item.dicCode">
66
 								<el-input v-model="query.remark1" size="small"  style="width:120px;margin-left: -8px" @input="getPltList">
70
 								<el-input v-model="query.remark1" size="small"  style="width:120px;margin-left: -8px" @input="getPltList">
67
 								</el-input>
71
 								</el-input>
68
 							</el-form-item>
72
 							</el-form-item>
73
+              <el-form-item label="修改时间" style="margin-left: -35px;margin-top: -15px">
74
+                <el-date-picker size="small" v-model="ChangeInDtm" type="datetime" placeholder="选择日期时间" style="width:200px;margin-left: -8px">
75
+                </el-date-picker>
76
+              </el-form-item>
69
 							<el-form-item  label=" " style="margin-left: -35px;margin-top: -15px">
77
 							<el-form-item  label=" " style="margin-left: -35px;margin-top: -15px">
70
 								<el-button size="small" @click="handleSearch" type="primary">查询</el-button>
78
 								<el-button size="small" @click="handleSearch" type="primary">查询</el-button>
71
 								<!-- <el-button @click="handleSearch" type="primary" size="small">查询</el-button> -->
79
 								<!-- <el-button @click="handleSearch" type="primary" size="small">查询</el-button> -->
94
 								</el-dropdown>
102
 								</el-dropdown>
95
 
103
 
96
 							</el-form-item>
104
 							</el-form-item>
97
-							<el-form-item label="修改时间" style="margin-left: -35px;margin-top: -15px">
98
-								<el-date-picker size="small" v-model="ChangeInDtm" type="datetime" placeholder="选择日期时间" style="width:200px;margin-left: -8px">
99
-								</el-date-picker>
100
-							</el-form-item>
105
+
101
 						</el-row>
106
 						</el-row>
102
 					</el-form>
107
 					</el-form>
103
 			<total-block ref="totalBlock" style="margin-left: -25px;font-size: 13px;margin-left: 5px" v-bind:childParam="childParam" v-bind:childUrl = 'childUrl'></total-block>
108
 			<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
 				</el-table-column>
120
 				</el-table-column>
116
 				<el-table-column prop="materialName" label="货物品名" show-overflow-tooltip width="100px" header-align="center" align="center">
121
 				<el-table-column prop="materialName" label="货物品名" show-overflow-tooltip width="100px" header-align="center" align="center">
117
 				</el-table-column>
122
 				</el-table-column>
123
+        <el-table-column prop="contractNo" label="合约号" show-overflow-tooltip width="100px" header-align="center" align="center">
124
+				</el-table-column>
118
 				<el-table-column prop="ordNo" label="订单号" width="180px" show-overflow-tooltip align="left">
125
 				<el-table-column prop="ordNo" label="订单号" width="180px" show-overflow-tooltip align="left">
119
 				</el-table-column>
126
 				</el-table-column>
120
 				<el-table-column prop="model" label="规格" show-overflow-tooltip width="180px" align="center">
127
 				<el-table-column prop="model" label="规格" show-overflow-tooltip width="180px" align="center">
191
 					carNo:'',
198
 					carNo:'',
192
 					tallyPeople:'',
199
 					tallyPeople:'',
193
 					fkComponyName:'',
200
 					fkComponyName:'',
194
-					remark1:''
201
+					remark1:'',
202
+          contractNo:''
195
 				},
203
 				},
196
 				selectRows: [],
204
 				selectRows: [],
197
 				loading: false,
205
 				loading: false,
215
 					standard: '',
223
 					standard: '',
216
 					customerName: '',
224
 					customerName: '',
217
 					plateNo: '',
225
 					plateNo: '',
218
-					ord_no:''
226
+					ord_no:'',
227
+          contractNo:''
219
 				},
228
 				},
220
 				childUrl:'WareInRecord/queryTotal.do',
229
 				childUrl:'WareInRecord/queryTotal.do',
221
 				tallyPeopleOption:[],
230
 				tallyPeopleOption:[],
336
 				this.query.tallyPeople = '',
345
 				this.query.tallyPeople = '',
337
 				this.query.fkComponyName = '',
346
 				this.query.fkComponyName = '',
338
 				this.query.remark1 = '';
347
 				this.query.remark1 = '';
348
+        this.query.contractNo = '';
339
 				this.setSearchTime()
349
 				this.setSearchTime()
340
 			},
350
 			},
341
 			getWare() {
351
 			getWare() {
372
 					carNo : this.query.carNo,
382
 					carNo : this.query.carNo,
373
 					tallyPeople:this.query.tallyPeople,
383
 					tallyPeople:this.query.tallyPeople,
374
 					fkComponyName:this.query.fkComponyName,
384
 					fkComponyName:this.query.fkComponyName,
375
-					remark1:this.query.remark1
385
+					remark1:this.query.remark1,
386
+          contractNo:this.query.contractNo.length == 0 ? '' : this.query.contractNo.join(','),
376
 				}
387
 				}
377
 
388
 
378
 				this.childParam = param;
389
 				this.childParam = param;
398
 				const replaceResult = this.query.plateNo.replace(/[;,,;\s\r\n]+/g, ",").split(",");
409
 				const replaceResult = this.query.plateNo.replace(/[;,,;\s\r\n]+/g, ",").split(",");
399
 				this.query.plateNo = replaceResult;
410
 				this.query.plateNo = replaceResult;
400
 			},
411
 			},
412
+      getConList(){
413
+        const replaceResult = this.query.contractNo.replace(/[;,,;\s\r\n]+/g, ",").split(",");
414
+        this.query.contractNo = replaceResult;
415
+      },
401
 			getOrdList(){
416
 			getOrdList(){
402
 				const replaceResult = this.query.ordNo.replace(/[;,,;\s\r\n]+/g, ",").split(",");
417
 				const replaceResult = this.query.ordNo.replace(/[;,,;\s\r\n]+/g, ",").split(",");
403
 				this.query.ordNo = replaceResult;
418
 				this.query.ordNo = replaceResult;
421
 					carNo : this.query.carNo,
436
 					carNo : this.query.carNo,
422
 					tallyPeople:this.query.tallyPeople,
437
 					tallyPeople:this.query.tallyPeople,
423
 					fkComponyName:this.query.fkComponyName,
438
 					fkComponyName:this.query.fkComponyName,
424
-					remark1:this.query.remark1
439
+					remark1:this.query.remark1,
440
+          contractNo:this.query.contractNo.length == 0 ? '' : this.query.contractNo.join(','),
425
 				}
441
 				}
426
 
442
 
427
 
443
 

+ 22
- 8
src/view/record/outrecord.vue ファイルの表示

47
 							<el-input v-model="query.plateNo" size="small" style="width:120px;margin-left: -8px"  @input="getPltList">
47
 							<el-input v-model="query.plateNo" size="small" style="width:120px;margin-left: -8px"  @input="getPltList">
48
 							</el-input>
48
 							</el-input>
49
 						</el-form-item>
49
 						</el-form-item>
50
+            <el-form-item label="合约号" style="margin-left: -35px;">
51
+              <el-input v-model="query.contractNo" size="small"  style="width:120px;margin-left: -8px" @input="getConList">
52
+              </el-input>
53
+            </el-form-item>
50
 						<el-form-item label="出库时间" style="margin-left: -35px">
54
 						<el-form-item label="出库时间" style="margin-left: -35px">
51
 								<el-date-picker v-model="query.RecordDate" style="width:330px;margin-left: -8px" size="small" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
55
 								<el-date-picker v-model="query.RecordDate" style="width:330px;margin-left: -8px" size="small" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
52
 							    </el-date-picker>
56
 							    </el-date-picker>
65
 							<el-input v-model="query.remark1" size="small"  style="width:120px;margin-left: -8px"  @input="getOrdList">
69
 							<el-input v-model="query.remark1" size="small"  style="width:120px;margin-left: -8px"  @input="getOrdList">
66
 							</el-input>
70
 							</el-input>
67
 						</el-form-item>
71
 						</el-form-item>
72
+            <el-form-item label="修改时间" style="margin-left: -35px">
73
+              <el-date-picker size="small" v-model="ChangeOutDtm" type="datetime" placeholder="选择日期时间" style="width:200px;margin-left: -8px">
74
+              </el-date-picker>
75
+            </el-form-item>
68
 						<el-form-item label=" " style="margin-left: -60px">
76
 						<el-form-item label=" " style="margin-left: -60px">
69
 							<el-button @click="handleSearch" type="primary" size="small">查询</el-button>
77
 							<el-button @click="handleSearch" type="primary" size="small">查询</el-button>
70
 							<el-button @click="handlePrintOut" type="primary" size="small" style="width:90px;text-align: left">打印出库单</el-button>
78
 							<el-button @click="handlePrintOut" type="primary" size="small" style="width:90px;text-align: left">打印出库单</el-button>
93
 						</el-dropdown>
101
 						</el-dropdown>
94
 
102
 
95
 					</el-form-item>
103
 					</el-form-item>
96
-					<el-form-item label="修改时间" style="margin-left: -35px">
97
-							<el-date-picker size="small" v-model="ChangeOutDtm" type="datetime" placeholder="选择日期时间" style="width:200px;margin-left: -8px">
98
-							</el-date-picker>
99
-					</el-form-item>
100
 
104
 
101
 					</el-row>
105
 					</el-row>
102
 				</el-form>
106
 				</el-form>
118
 				</el-table-column>
122
 				</el-table-column>
119
 				<el-table-column prop="materialName" label="品名" show-overflow-tooltip width="100px" header-align="center" align="center">
123
 				<el-table-column prop="materialName" label="品名" show-overflow-tooltip width="100px" header-align="center" align="center">
120
 				</el-table-column>
124
 				</el-table-column>
125
+        <el-table-column prop="contractNo" label="合约号" show-overflow-tooltip width="100px" header-align="center" align="center">
126
+        </el-table-column>
121
 				<el-table-column prop="ordNo" label="订单号" width="180px" show-overflow-tooltip align="left">
127
 				<el-table-column prop="ordNo" label="订单号" width="180px" show-overflow-tooltip align="left">
122
 				</el-table-column>
128
 				</el-table-column>
123
 				<el-table-column prop="inUser" label="入库人" width="100px" show-overflow-tooltip align="left">
129
 				<el-table-column prop="inUser" label="入库人" width="100px" show-overflow-tooltip align="left">
300
 					tallyPeople:'',
306
 					tallyPeople:'',
301
 					ordNo:[],
307
 					ordNo:[],
302
 					fkComponyName:'',
308
 					fkComponyName:'',
303
-					remark1:''
304
-
309
+					remark1:'',
310
+          contractNo:'',
305
 				},
311
 				},
306
 				accData:{
312
 				accData:{
307
 					accDate:'',
313
 					accDate:'',
332
 					customerName: '',
338
 					customerName: '',
333
 					plateNo: '',
339
 					plateNo: '',
334
 					remark1:'',
340
 					remark1:'',
341
+          contractNo:''
335
 				},
342
 				},
336
 				childUrl:'WareOutRecord/queryTotal.do',
343
 				childUrl:'WareOutRecord/queryTotal.do',
337
 				time:"",
344
 				time:"",
642
 					tallyPeople:this.query.tallyPeople,
649
 					tallyPeople:this.query.tallyPeople,
643
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
650
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
644
 					fkComponyName:this.query.fkComponyName,
651
 					fkComponyName:this.query.fkComponyName,
645
-					remark1 : this.query.remark1
652
+					remark1 : this.query.remark1,
653
+          contractNo:this.query.contractNo.length == 0 ? '' : this.query.contractNo.join(','),
646
 				}
654
 				}
647
 				this.childParam = param;
655
 				this.childParam = param;
648
 				console.log(param);
656
 				console.log(param);
721
 				const replaceResult = this.query.plateNo.replace(/[;,,;\s\r\n]+/g, ",").split(",");
729
 				const replaceResult = this.query.plateNo.replace(/[;,,;\s\r\n]+/g, ",").split(",");
722
 				this.query.plateNo = replaceResult;
730
 				this.query.plateNo = replaceResult;
723
 			},
731
 			},
732
+      getConList(){
733
+        const replaceResult = this.query.contractNo.replace(/[;,,;\s\r\n]+/g, ",").split(",");
734
+        console.log( this.query.contractNo,replaceResult)
735
+        this.query.contractNo = replaceResult;
736
+      },
724
 			getOrdList(){
737
 			getOrdList(){
725
 				const replaceResult = this.query.ordNo.replace(/[;,,;\s\r\n]+/g, ",").split(",");
738
 				const replaceResult = this.query.ordNo.replace(/[;,,;\s\r\n]+/g, ",").split(",");
726
 				this.query.ordNo = replaceResult;
739
 				this.query.ordNo = replaceResult;
815
 					tallyPeople:this.query.tallyPeople,
828
 					tallyPeople:this.query.tallyPeople,
816
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
829
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
817
 					fkComponyName:this.query.fkComponyName,
830
 					fkComponyName:this.query.fkComponyName,
818
-					remark1:this.query.remark1
831
+					remark1:this.query.remark1,
832
+          contractNo:this.query.contractNo.length == 0 ? '' : this.query.contractNo.join(','),
819
 				}
833
 				}
820
 				// alert(JSON.stringify(param))
834
 				// alert(JSON.stringify(param))
821
 
835
 

読み込み中…
キャンセル
保存