Zhangqy 2 月之前
父節點
當前提交
6b19fe8c90
共有 4 個檔案被更改,包括 62 行新增26 行删除
  1. 3
    0
      src/view/maint/customer.vue
  2. 18
    7
      src/view/record/inrecord.vue
  3. 24
    13
      src/view/record/outrecord.vue
  4. 17
    6
      src/view/ware/storechange.vue

+ 3
- 0
src/view/maint/customer.vue 查看文件

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

+ 18
- 7
src/view/record/inrecord.vue 查看文件

@@ -23,9 +23,10 @@
23 23
 								</el-input>
24 24
 							</el-form-item>
25 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 30
 							</el-form-item>
30 31
 							<el-form-item label="订单号" style="margin-left: -25px">
31 32
 								<el-input v-model="query.ordNo" size="small"  style="width:120px;margin-left: -8px">
@@ -56,9 +57,10 @@
56 57
 							    </el-date-picker>
57 58
 							</el-form-item>
58 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 64
 							</el-form-item>
63 65
 							<el-form-item  label=" " style="margin-left: -35px;margin-top: -15px">
64 66
 								<el-button size="small" @click="handleSearch" type="primary">查询</el-button>
@@ -189,7 +191,8 @@
189 191
 					plateNo: ''
190 192
 				},
191 193
 				childUrl:'WareInRecord/queryTotal.do',
192
-				tallyPeopleOption:[]
194
+				tallyPeopleOption:[],
195
+				optionsCust:[],
193 196
 
194 197
 			};
195 198
 		},
@@ -199,6 +202,7 @@
199 202
 			this.getSearchItem();
200 203
 			// this.getTableData()
201 204
 			this.setSearchTime();
205
+			this.getAllCustomer();
202 206
 			
203 207
 		},
204 208
 		methods: {
@@ -216,6 +220,13 @@
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 230
 			typeFormatter: function(row, column) {
220 231
 				switch (row.recordType) {
221 232
 

+ 24
- 13
src/view/record/outrecord.vue 查看文件

@@ -24,14 +24,16 @@
24 24
 							</el-input>
25 25
 						</el-form-item>
26 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 31
 						</el-form-item>
31 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 37
 						</el-form-item>
36 38
 						<el-form-item label="车号" style="margin-left: -35px">
37 39
 							<el-input v-model="query.carNo" size="small" style="width:100px;margin-left: -8px"></el-input>
@@ -45,28 +47,28 @@
45 47
 							<el-input v-model="query.plateNo" size="small" style="width:120px;margin-left: -8px">
46 48
 							</el-input>
47 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 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 52
 							    </el-date-picker>
51 53
 						</el-form-item>
52
-						<el-form-item label="理货人员" style="margin-top: -15px">
54
+						<el-form-item label="理货人员" >
53 55
 							<el-select v-model="query.tallyPeople" size="small" style="margin-left: 10px;margin-top: -15px" clearable placeholder="理货人员">
54 56
 								<el-option v-for="item in tallyPeopleOption" :key="item.id" :label="item.dicName" :value="item.dicCode">
55 57
 								</el-option>
56 58
 							</el-select>
57 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 61
 							<el-input v-model="query.ordNo" size="small"  style="width:120px;margin-left: -8px">
60 62
 							</el-input>
61 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 65
 							<el-button @click="handleSearch" type="primary" size="small">查询</el-button>
64 66
 							<el-button @click="handlePrintOut" type="primary" size="small" style="width:90px;text-align: left">打印出库单</el-button>
65 67
 							<el-button @click="handleOutBack" type="danger" size="small" style="width:70px">取消出库</el-button>
66 68
 							<el-button @click="handleVerifyAcc" type="primary" size="small" style="width:70px">对账</el-button>
67 69
 							<el-button @click="handleModifyPrice" type="primary" size="small" >批量改价</el-button>
68 70
 						</el-form-item>
69
-						<el-form-item label="" style="margin-top: -15px">
71
+						<el-form-item label="" >
70 72
 							<el-upload class="upload-demo" action="" 
71 73
 								 ref="upload" :limit="1" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
72 74
 								 :auto-upload="false"  >
@@ -74,7 +76,7 @@
74 76
 								<el-button   type="success" @click="handleExport" style="margin-left: 2px" size="small">导出记录</el-button>
75 77
 							</el-upload>
76 78
 						</el-form-item>
77
-						<el-form-item label="" style="margin-top: -15px">
79
+						<el-form-item label="" >
78 80
 							    <el-button type="primary" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
79 81
 						</el-form-item>
80 82
 					</el-row>
@@ -301,7 +303,8 @@
301 303
 				popupVerifyAcc:false,
302 304
 				popupModPrice:false,
303 305
 				modifyWgt:0,
304
-				modifyPrice:0
306
+				modifyPrice:0,
307
+				optionsCust:[],
305 308
 			};
306 309
 		},
307 310
 		//页面加载完成渲染
@@ -310,6 +313,7 @@
310 313
 			// this.getTableData()
311 314
 			this.getSearchItem();
312 315
 			this.setSearchTime();
316
+			this.getAllCustomer();
313 317
 		},
314 318
 		methods: {
315 319
 			setSearchTime(){
@@ -326,6 +330,13 @@
326 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 340
 			handleSavePriceMod(){
330 341
 				var url = 'WareOutRecord/savePriceMod.do'
331 342
 				var param = {

+ 17
- 6
src/view/ware/storechange.vue 查看文件

@@ -27,14 +27,16 @@
27 27
 						</el-input>
28 28
 					</el-form-item>
29 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 34
 					</el-form-item>
34 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 40
 					</el-form-item>
39 41
 					<el-form-item label="规格型号" style="margin-left: -15px">
40 42
 						<el-input v-model="query.model" size="small" style="width:120px;margin-left: -8px">
@@ -254,10 +256,12 @@
254 256
 				fileTemp: [],
255 257
 				imTableData: [],
256 258
 				moveStore: {},
259
+                optionsCust: [],
257 260
 			};
258 261
 		},
259 262
 		mounted() {
260 263
 			this.getWare()
264
+			this.getAllCustomer()
261 265
 			//this.getTableData()
262 266
 		},
263 267
 		methods: {
@@ -387,6 +391,13 @@
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 401
 			handleSizeChange(val) {
391 402
 				this.pageSize = val
392 403
 				this.getTableData()

Loading…
取消
儲存