张庆宇 5 months ago
parent
commit
6b19fe8c90

+ 3
- 0
src/view/maint/customer.vue View File

41
 				<el-form-item label="客户名称">
41
 				<el-form-item label="客户名称">
42
 					<el-input v-model="customer.name"></el-input>
42
 					<el-input v-model="customer.name"></el-input>
43
 				</el-form-item>
43
 				</el-form-item>
44
+				<el-form-item label="客户名称(简称)">
45
+					<el-input v-model="customer.code"></el-input>
46
+				</el-form-item>
44
 				<el-form-item label="联系人">
47
 				<el-form-item label="联系人">
45
 					<el-input v-model="customer.contact"></el-input>
48
 					<el-input v-model="customer.contact"></el-input>
46
 				</el-form-item>
49
 				</el-form-item>

+ 18
- 7
src/view/record/inrecord.vue View File

23
 								</el-input>
23
 								</el-input>
24
 							</el-form-item>
24
 							</el-form-item>
25
 							<el-form-item label="客户名称" style="margin-left: -35px">
25
 							<el-form-item label="客户名称" style="margin-left: -35px">
26
-								<el-input v-model="query.customerName" size="small"  style="width:200px;margin-left: -8px">
27
-									<el-button slot="append" icon="el-icon-search" @click="showCustomer"></el-button>
28
-								</el-input>
26
+								<el-select v-model="query.customerName" filterable placeholder="请选择上游客户" clearable size="small" style="margin-left: 5px; width: 170px">
27
+									<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
28
+									</el-option>
29
+								</el-select>
29
 							</el-form-item>
30
 							</el-form-item>
30
 							<el-form-item label="订单号" style="margin-left: -25px">
31
 							<el-form-item label="订单号" style="margin-left: -25px">
31
 								<el-input v-model="query.ordNo" size="small"  style="width:120px;margin-left: -8px">
32
 								<el-input v-model="query.ordNo" size="small"  style="width:120px;margin-left: -8px">
56
 							    </el-date-picker>
57
 							    </el-date-picker>
57
 							</el-form-item>
58
 							</el-form-item>
58
 							<el-form-item label="付款单位" style="margin-left: -35px;margin-top: -15px">
59
 							<el-form-item label="付款单位" style="margin-left: -35px;margin-top: -15px">
59
-								<el-input v-model="query.fkComponyName" size="small" style="width:200px;margin-left: -8px">
60
-									<el-button slot="append" icon="el-icon-search" @click="showFkCompony"></el-button>
61
-								</el-input>
60
+								<el-select v-model="query.fkComponyName" filterable placeholder="请选择上游客户" clearable size="small" style="margin-left: 5px; width: 170px">
61
+									<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
62
+									</el-option>
63
+								</el-select>
62
 							</el-form-item>
64
 							</el-form-item>
63
 							<el-form-item  label=" " style="margin-left: -35px;margin-top: -15px">
65
 							<el-form-item  label=" " style="margin-left: -35px;margin-top: -15px">
64
 								<el-button size="small" @click="handleSearch" type="primary">查询</el-button>
66
 								<el-button size="small" @click="handleSearch" type="primary">查询</el-button>
189
 					plateNo: ''
191
 					plateNo: ''
190
 				},
192
 				},
191
 				childUrl:'WareInRecord/queryTotal.do',
193
 				childUrl:'WareInRecord/queryTotal.do',
192
-				tallyPeopleOption:[]
194
+				tallyPeopleOption:[],
195
+				optionsCust:[],
193
 
196
 
194
 			};
197
 			};
195
 		},
198
 		},
199
 			this.getSearchItem();
202
 			this.getSearchItem();
200
 			// this.getTableData()
203
 			// this.getTableData()
201
 			this.setSearchTime();
204
 			this.setSearchTime();
205
+			this.getAllCustomer();
202
 			
206
 			
203
 		},
207
 		},
204
 		methods: {
208
 		methods: {
216
 				});
220
 				});
217
 
221
 
218
 			},
222
 			},
223
+			getAllCustomer() {
224
+				var url = 'MaintCustomer/queryByUserId.do'
225
+				var param = {}
226
+				axios.get(url, param).then(response => {
227
+					this.optionsCust = response.data.data
228
+				});
229
+			},
219
 			typeFormatter: function(row, column) {
230
 			typeFormatter: function(row, column) {
220
 				switch (row.recordType) {
231
 				switch (row.recordType) {
221
 
232
 

+ 24
- 13
src/view/record/outrecord.vue View File

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">
28
-								<el-button slot="append" icon="el-icon-search" @click="showCustomer"></el-button>
29
-							</el-input>
27
+							<el-select v-model="query.customerName" filterable placeholder="请选择上游客户" clearable size="small" style="margin-left: 5px; width: 170px">
28
+								<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
29
+								</el-option>
30
+							</el-select>
30
 						</el-form-item>
31
 						</el-form-item>
31
 						<el-form-item label="付款单位" style="margin-left: -35px">
32
 						<el-form-item label="付款单位" style="margin-left: -35px">
32
-							<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>
34
-							</el-input>
33
+							<el-select v-model="query.fkComponyName" filterable placeholder="请选择上游客户" clearable size="small" style="margin-left: 5px; width: 170px">
34
+								<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
35
+								</el-option>
36
+							</el-select>
35
 						</el-form-item>
37
 						</el-form-item>
36
 						<el-form-item label="车号" style="margin-left: -35px">
38
 						<el-form-item label="车号" style="margin-left: -35px">
37
 							<el-input v-model="query.carNo" size="small" style="width:100px;margin-left: -8px"></el-input>
39
 							<el-input v-model="query.carNo" size="small" style="width:100px;margin-left: -8px"></el-input>
45
 							<el-input v-model="query.plateNo" size="small" style="width:120px;margin-left: -8px">
47
 							<el-input v-model="query.plateNo" size="small" style="width:120px;margin-left: -8px">
46
 							</el-input>
48
 							</el-input>
47
 						</el-form-item>
49
 						</el-form-item>
48
-						<el-form-item label="出库时间" style="margin-left: -35px;margin-top: -15px">
50
+						<el-form-item label="出库时间" style="margin-left: -35px">
49
 								<el-date-picker v-model="query.RecordDate" style="width:330px;margin-left: -8px" size="small" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
51
 								<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>
52
 							    </el-date-picker>
51
 						</el-form-item>
53
 						</el-form-item>
52
-						<el-form-item label="理货人员" style="margin-top: -15px">
54
+						<el-form-item label="理货人员" >
53
 							<el-select v-model="query.tallyPeople" size="small" style="margin-left: 10px;margin-top: -15px" clearable placeholder="理货人员">
55
 							<el-select v-model="query.tallyPeople" size="small" style="margin-left: 10px;margin-top: -15px" clearable placeholder="理货人员">
54
 								<el-option v-for="item in tallyPeopleOption" :key="item.id" :label="item.dicName" :value="item.dicCode">
56
 								<el-option v-for="item in tallyPeopleOption" :key="item.id" :label="item.dicName" :value="item.dicCode">
55
 								</el-option>
57
 								</el-option>
56
 							</el-select>
58
 							</el-select>
57
 						</el-form-item>
59
 						</el-form-item>
58
-						<el-form-item label="订单号" style="margin-left: -25px;margin-top: -15px">
60
+						<el-form-item label="订单号" style="margin-left: -25px">
59
 							<el-input v-model="query.ordNo" size="small"  style="width:120px;margin-left: -8px">
61
 							<el-input v-model="query.ordNo" size="small"  style="width:120px;margin-left: -8px">
60
 							</el-input>
62
 							</el-input>
61
 						</el-form-item>
63
 						</el-form-item>
62
-						<el-form-item label=" " style="margin-top: -15px;margin-left: -60px">
64
+						<el-form-item label=" " style="margin-left: -60px">
63
 							<el-button @click="handleSearch" type="primary" size="small">查询</el-button>
65
 							<el-button @click="handleSearch" type="primary" size="small">查询</el-button>
64
 							<el-button @click="handlePrintOut" type="primary" size="small" style="width:90px;text-align: left">打印出库单</el-button>
66
 							<el-button @click="handlePrintOut" type="primary" size="small" style="width:90px;text-align: left">打印出库单</el-button>
65
 							<el-button @click="handleOutBack" type="danger" size="small" style="width:70px">取消出库</el-button>
67
 							<el-button @click="handleOutBack" type="danger" size="small" style="width:70px">取消出库</el-button>
66
 							<el-button @click="handleVerifyAcc" type="primary" size="small" style="width:70px">对账</el-button>
68
 							<el-button @click="handleVerifyAcc" type="primary" size="small" style="width:70px">对账</el-button>
67
 							<el-button @click="handleModifyPrice" type="primary" size="small" >批量改价</el-button>
69
 							<el-button @click="handleModifyPrice" type="primary" size="small" >批量改价</el-button>
68
 						</el-form-item>
70
 						</el-form-item>
69
-						<el-form-item label="" style="margin-top: -15px">
71
+						<el-form-item label="" >
70
 							<el-upload class="upload-demo" action="" 
72
 							<el-upload class="upload-demo" action="" 
71
 								 ref="upload" :limit="1" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
73
 								 ref="upload" :limit="1" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
72
 								 :auto-upload="false"  >
74
 								 :auto-upload="false"  >
74
 								<el-button   type="success" @click="handleExport" style="margin-left: 2px" size="small">导出记录</el-button>
76
 								<el-button   type="success" @click="handleExport" style="margin-left: 2px" size="small">导出记录</el-button>
75
 							</el-upload>
77
 							</el-upload>
76
 						</el-form-item>
78
 						</el-form-item>
77
-						<el-form-item label="" style="margin-top: -15px">
79
+						<el-form-item label="" >
78
 							    <el-button type="primary" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
80
 							    <el-button type="primary" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
79
 						</el-form-item>
81
 						</el-form-item>
80
 					</el-row>
82
 					</el-row>
301
 				popupVerifyAcc:false,
303
 				popupVerifyAcc:false,
302
 				popupModPrice:false,
304
 				popupModPrice:false,
303
 				modifyWgt:0,
305
 				modifyWgt:0,
304
-				modifyPrice:0
306
+				modifyPrice:0,
307
+				optionsCust:[],
305
 			};
308
 			};
306
 		},
309
 		},
307
 		//页面加载完成渲染
310
 		//页面加载完成渲染
310
 			// this.getTableData()
313
 			// this.getTableData()
311
 			this.getSearchItem();
314
 			this.getSearchItem();
312
 			this.setSearchTime();
315
 			this.setSearchTime();
316
+			this.getAllCustomer();
313
 		},
317
 		},
314
 		methods: {
318
 		methods: {
315
 			setSearchTime(){
319
 			setSearchTime(){
326
 						break;
330
 						break;
327
 				}
331
 				}
328
 			},
332
 			},
333
+			getAllCustomer() {
334
+				var url = 'MaintCustomer/queryByUserId.do'
335
+				var param = {}
336
+				axios.get(url, param).then(response => {
337
+					this.optionsCust = response.data.data
338
+				});
339
+			},
329
 			handleSavePriceMod(){
340
 			handleSavePriceMod(){
330
 				var url = 'WareOutRecord/savePriceMod.do'
341
 				var url = 'WareOutRecord/savePriceMod.do'
331
 				var param = {
342
 				var param = {

+ 17
- 6
src/view/ware/storechange.vue View File

27
 						</el-input>
27
 						</el-input>
28
 					</el-form-item>
28
 					</el-form-item>
29
 					<el-form-item label="客户名称" style="margin-left: -35px">
29
 					<el-form-item label="客户名称" style="margin-left: -35px">
30
-						<el-input v-model="query.fkcustmerName" size="small" style="width:170px;margin-left: -8px">
31
-							<el-button slot="append" icon="el-icon-search" @click="showFKcustmer"></el-button>
32
-						</el-input>
30
+						<el-select v-model="query.fkcustmerName" filterable placeholder="请选择客户名称" clearable size="small" style="margin-left: 5px; width: 170px">
31
+							<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
32
+							</el-option>
33
+						</el-select>
33
 					</el-form-item>
34
 					</el-form-item>
34
 					<el-form-item label="订单客户" style="margin-left: -35px">
35
 					<el-form-item label="订单客户" style="margin-left: -35px">
35
-						<el-input v-model="query.customerName" size="small" style="width:170px;margin-left: -8px">
36
-							<el-button slot="append" icon="el-icon-search" @click="showCustomer"></el-button>
37
-						</el-input>
36
+						<el-select v-model="query.customerName" filterable placeholder="请选择订单客户" clearable size="small" style="margin-left: 5px; width: 170px">
37
+							<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
38
+							</el-option>
39
+						</el-select>
38
 					</el-form-item>
40
 					</el-form-item>
39
 					<el-form-item label="规格型号" style="margin-left: -15px">
41
 					<el-form-item label="规格型号" style="margin-left: -15px">
40
 						<el-input v-model="query.model" size="small" style="width:120px;margin-left: -8px">
42
 						<el-input v-model="query.model" size="small" style="width:120px;margin-left: -8px">
254
 				fileTemp: [],
256
 				fileTemp: [],
255
 				imTableData: [],
257
 				imTableData: [],
256
 				moveStore: {},
258
 				moveStore: {},
259
+                optionsCust: [],
257
 			};
260
 			};
258
 		},
261
 		},
259
 		mounted() {
262
 		mounted() {
260
 			this.getWare()
263
 			this.getWare()
264
+			this.getAllCustomer()
261
 			//this.getTableData()
265
 			//this.getTableData()
262
 		},
266
 		},
263
 		methods: {
267
 		methods: {
387
 					}
391
 					}
388
 				});
392
 				});
389
 			},
393
 			},
394
+			getAllCustomer() {
395
+				var url = 'MaintCustomer/queryByUserId.do'
396
+				var param = {}
397
+				axios.get(url, param).then(response => {
398
+					this.optionsCust = response.data.data
399
+				});
400
+			},
390
 			handleSizeChange(val) {
401
 			handleSizeChange(val) {
391
 				this.pageSize = val
402
 				this.pageSize = val
392
 				this.getTableData()
403
 				this.getTableData()

Loading…
Cancel
Save