Browse Source

1.垛位操作导入入库明细表 新增合约号字段

2.出库操作导入出库明细表字段 新增合约号字段
3.导出入库明细表excel 新增合约号字段
4.导出出库明细表excel 新增合约号字段
dw 5 days ago
parent
commit
60eb01e76f
3 changed files with 44 additions and 40 deletions
  1. 10
    8
      src/view/record/inrecord.vue
  2. 29
    27
      src/view/record/outrecord.vue
  3. 5
    5
      src/view/ware/store.vue

+ 10
- 8
src/view/record/inrecord.vue View File

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:100px;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:130px;margin-left: -8px">
16
 								<el-input v-model="query.materialName" size="small"  style="width:130px;margin-left: -8px">
17
 									<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
17
 									<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
18
 								</el-input>
18
 								</el-input>
71
 								<!-- <el-button @click="handleSearch" type="primary" size="small">查询</el-button> -->
71
 								<!-- <el-button @click="handleSearch" type="primary" size="small">查询</el-button> -->
72
 							</el-form-item>
72
 							</el-form-item>
73
 							<el-form-item label="" style="margin-top: -15px">
73
 							<el-form-item label="" style="margin-top: -15px">
74
-								<el-upload class="upload-demo" action="" 
74
+								<el-upload class="upload-demo" action=""
75
 									 ref="upload" :limit="1" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
75
 									 ref="upload" :limit="1" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
76
 									 :auto-upload="false"  >
76
 									 :auto-upload="false"  >
77
 									 <el-button plain slot="trigger"  type="success" v-show="false" style= "margin-left: 5px" size="small">询单导入</el-button>
77
 									 <el-button plain slot="trigger"  type="success" v-show="false" style= "margin-left: 5px" size="small">询单导入</el-button>
92
 										<el-dropdown-item command="changeRecordInDtm" style="background-color: #f5f5f5;">修改时间</el-dropdown-item>
92
 										<el-dropdown-item command="changeRecordInDtm" style="background-color: #f5f5f5;">修改时间</el-dropdown-item>
93
 									</el-dropdown-menu>
93
 									</el-dropdown-menu>
94
 								</el-dropdown>
94
 								</el-dropdown>
95
-								
95
+
96
 							</el-form-item>
96
 							</el-form-item>
97
 							<el-form-item label="修改时间" style="margin-left: -35px;margin-top: -15px">
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">
98
 								<el-date-picker size="small" v-model="ChangeInDtm" type="datetime" placeholder="选择日期时间" style="width:200px;margin-left: -8px">
149
 				</el-table-column>
149
 				</el-table-column>
150
 				<el-table-column prop="recordType" label="类型" width="100px" show-overflow-tooltip align="center" :formatter="typeFormatter">
150
 				<el-table-column prop="recordType" label="类型" width="100px" show-overflow-tooltip align="center" :formatter="typeFormatter">
151
 				</el-table-column>
151
 				</el-table-column>
152
-				
152
+
153
 			</el-table>
153
 			</el-table>
154
 		</div>
154
 		</div>
155
 		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
155
 		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
231
 			// this.getTableData()
231
 			// this.getTableData()
232
 			this.setSearchTime();
232
 			this.setSearchTime();
233
 			this.getAllCustomer();
233
 			this.getAllCustomer();
234
-			
234
+
235
 		},
235
 		},
236
 		methods: {
236
 		methods: {
237
 			setSearchTime(){
237
 			setSearchTime(){
389
 					}
389
 					}
390
 					this.loading = false
390
 					this.loading = false
391
 				});
391
 				});
392
-				
392
+
393
 			},
393
 			},
394
 			changeWare(){
394
 			changeWare(){
395
 
395
 
446
 					}
446
 					}
447
 
447
 
448
 				});
448
 				});
449
-				
449
+
450
 			},
450
 			},
451
 			exportExcel(imptData) {
451
 			exportExcel(imptData) {
452
 				// alert(JSON.stringify(imptData))
452
 				// alert(JSON.stringify(imptData))
473
 								,"垛位备注"
473
 								,"垛位备注"
474
 								,"类型"
474
 								,"类型"
475
 								,"备注"
475
 								,"备注"
476
+                ,"合约号"
476
 				] // 导出的表头名
477
 				] // 导出的表头名
477
 				const filterVal = [
478
 				const filterVal = [
478
 						"wareName"
479
 						"wareName"
498
 						,"remark1"
499
 						,"remark1"
499
 						,"recordType"
500
 						,"recordType"
500
 						,"remark"
501
 						,"remark"
502
+            ,"contractNo"
501
 				]
503
 				]
502
 
504
 
503
 				for(var i=0;i<imptData.length;i++){
505
 				for(var i=0;i<imptData.length;i++){
547
 						}
549
 						}
548
 					});
550
 					});
549
 				}
551
 				}
550
-				
552
+
551
 			},
553
 			},
552
 			changeRecordInDtm(){
554
 			changeRecordInDtm(){
553
 				if (this.selectRows.length < 1) {
555
 				if (this.selectRows.length < 1) {

+ 29
- 27
src/view/record/outrecord.vue View File

75
 							<el-button @click="changeCarNoShow" type="primary" size="small" >修改车号</el-button>
75
 							<el-button @click="changeCarNoShow" type="primary" size="small" >修改车号</el-button>
76
 						</el-form-item>
76
 						</el-form-item>
77
 						<el-form-item label="" >
77
 						<el-form-item label="" >
78
-							<el-upload class="upload-demo" action="" 
78
+							<el-upload class="upload-demo" action=""
79
 								 ref="upload" :limit="1" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
79
 								 ref="upload" :limit="1" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
80
 								 :auto-upload="false"  >
80
 								 :auto-upload="false"  >
81
 								 <el-button plain slot="trigger"  type="success" v-show="false" style= "margin-left: 5px" size="small">询单导入</el-button>
81
 								 <el-button plain slot="trigger"  type="success" v-show="false" style= "margin-left: 5px" size="small">询单导入</el-button>
91
 								<el-dropdown-item command="changeRecordOutDtm" style="background-color: #f5f5f5;">修改时间</el-dropdown-item>
91
 								<el-dropdown-item command="changeRecordOutDtm" style="background-color: #f5f5f5;">修改时间</el-dropdown-item>
92
 							</el-dropdown-menu>
92
 							</el-dropdown-menu>
93
 						</el-dropdown>
93
 						</el-dropdown>
94
-						
94
+
95
 					</el-form-item>
95
 					</el-form-item>
96
 					<el-form-item label="修改时间" style="margin-left: -35px">
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">
97
 							<el-date-picker size="small" v-model="ChangeOutDtm" type="datetime" placeholder="选择日期时间" style="width:200px;margin-left: -8px">
98
 							</el-date-picker>
98
 							</el-date-picker>
99
 					</el-form-item>
99
 					</el-form-item>
100
-						
100
+
101
 					</el-row>
101
 					</el-row>
102
 				</el-form>
102
 				</el-form>
103
 			</el-row>
103
 			</el-row>
217
 					</el-col>
217
 					</el-col>
218
 				</el-row>
218
 				</el-row>
219
 			</el-form>
219
 			</el-form>
220
-			
220
+
221
 
221
 
222
 		</el-dialog>
222
 		</el-dialog>
223
 		<el-dialog title="批量改价" :visible.sync="popupModPrice" width="780px">
223
 		<el-dialog title="批量改价" :visible.sync="popupModPrice" width="780px">
252
 				<el-row>
252
 				<el-row>
253
 					<el-button size="small" type="primary" style="margin-left: 30px;" @click="handlechangeCarNo">提交</el-button>
253
 					<el-button size="small" type="primary" style="margin-left: 30px;" @click="handlechangeCarNo">提交</el-button>
254
 				</el-row>
254
 				</el-row>
255
-				
255
+
256
 			</el-form>
256
 			</el-form>
257
 		</el-dialog>
257
 		</el-dialog>
258
 		<popup-stack-with-select-ware :selectVareName="optionsWare" ref="PopupStackWithSelectWare" @receviceFromChild="receviceFromWareStack"></popup-stack-with-select-ware>
258
 		<popup-stack-with-select-ware :selectVareName="optionsWare" ref="PopupStackWithSelectWare" @receviceFromChild="receviceFromWareStack"></popup-stack-with-select-ware>
301
 					ordNo:[],
301
 					ordNo:[],
302
 					fkComponyName:'',
302
 					fkComponyName:'',
303
 					remark1:''
303
 					remark1:''
304
-					
304
+
305
 				},
305
 				},
306
 				accData:{
306
 				accData:{
307
 					accDate:'',
307
 					accDate:'',
429
 							message: '保存成功',
429
 							message: '保存成功',
430
 						});
430
 						});
431
 						this.popupVerifyAcc = false
431
 						this.popupVerifyAcc = false
432
-						this.getTableData();	
432
+						this.getTableData();
433
 					} else {
433
 					} else {
434
 						this.$message({
434
 						this.$message({
435
 							type: 'error',
435
 							type: 'error',
535
 					});
535
 					});
536
 				}
536
 				}
537
 			},
537
 			},
538
-			numSub(num1, num2) { 
539
-				var baseNum, baseNum1, baseNum2; 
540
-				var precision;// 精度 
541
-				try { 
542
-					baseNum1 = num1.toString().split(".")[1].length; 
543
-				} catch (e) { 
544
-					baseNum1 = 0; 
545
-				} 
546
-				try { 
547
-					baseNum2 = num2.toString().split(".")[1].length; 
548
-				} catch (e) { 
549
-					baseNum2 = 0; 
550
-				} 
551
-				baseNum = Math.pow(10, Math.max(baseNum1, baseNum2)); 
552
-				precision = (baseNum1 >= baseNum2) ? baseNum1 : baseNum2; 
553
-				return ((num1 * baseNum + num2 * baseNum) / baseNum).toFixed(precision); 
538
+			numSub(num1, num2) {
539
+				var baseNum, baseNum1, baseNum2;
540
+				var precision;// 精度
541
+				try {
542
+					baseNum1 = num1.toString().split(".")[1].length;
543
+				} catch (e) {
544
+					baseNum1 = 0;
545
+				}
546
+				try {
547
+					baseNum2 = num2.toString().split(".")[1].length;
548
+				} catch (e) {
549
+					baseNum2 = 0;
550
+				}
551
+				baseNum = Math.pow(10, Math.max(baseNum1, baseNum2));
552
+				precision = (baseNum1 >= baseNum2) ? baseNum1 : baseNum2;
553
+				return ((num1 * baseNum + num2 * baseNum) / baseNum).toFixed(precision);
554
 			},
554
 			},
555
 			numMulti(arg1,arg2){
555
 			numMulti(arg1,arg2){
556
 				var m=0,s1=arg1.toString(),s2=arg2.toString();
556
 				var m=0,s1=arg1.toString(),s2=arg2.toString();
619
 			receviceFromFkCompony(customer) {
619
 			receviceFromFkCompony(customer) {
620
 				this.query.fkComponyName = customer.name
620
 				this.query.fkComponyName = customer.name
621
 			},
621
 			},
622
-			
622
+
623
 			getTableData() {
623
 			getTableData() {
624
 				var url = 'WareOutRecord/query.do'
624
 				var url = 'WareOutRecord/query.do'
625
 				if(this.query.RecordDate == null){
625
 				if(this.query.RecordDate == null){
684
 					});
684
 					});
685
 					return
685
 					return
686
 				}
686
 				}
687
-				
687
+
688
 				if (this.selectRows[0].backFlag == '1') {
688
 				if (this.selectRows[0].backFlag == '1') {
689
 					this.$message({
689
 					this.$message({
690
 						type: 'error',
690
 						type: 'error',
796
 			},
796
 			},
797
 			handleExport() {
797
 			handleExport() {
798
 				var imptData = [];
798
 				var imptData = [];
799
-				
799
+
800
 
800
 
801
 				var url = 'WareOutRecord/query.do'
801
 				var url = 'WareOutRecord/query.do'
802
 				var param = {
802
 				var param = {
840
 					}
840
 					}
841
 
841
 
842
 				});
842
 				});
843
-				
843
+
844
 			},
844
 			},
845
 			exportExcel(imptData) {
845
 			exportExcel(imptData) {
846
 				 console.log(JSON.stringify(imptData))
846
 				 console.log(JSON.stringify(imptData))
870
 								,"备注"
870
 								,"备注"
871
 								,"垛位备注"
871
 								,"垛位备注"
872
 								,"类型"
872
 								,"类型"
873
+                ,"合约号"
873
 
874
 
874
 				] // 导出的表头名
875
 				] // 导出的表头名
875
 				const filterVal = [
876
 				const filterVal = [
899
 						,"remark"
900
 						,"remark"
900
 						,"remark1"
901
 						,"remark1"
901
 						,"recordType"
902
 						,"recordType"
903
+          ,"contractNo"
902
 				]
904
 				]
903
 
905
 
904
 				for(var i=0;i<imptData.length;i++){
906
 				for(var i=0;i<imptData.length;i++){

+ 5
- 5
src/view/ware/store.vue View File

21
 				<el-button size="small" type="danger" @click="handleInBack" :disabled="backAble">取消入库</el-button>
21
 				<el-button size="small" type="danger" @click="handleInBack" :disabled="backAble">取消入库</el-button>
22
 				<el-button type="primary" size="small" @click="showDistribution">配货</el-button>
22
 				<el-button type="primary" size="small" @click="showDistribution">配货</el-button>
23
 				<el-button type="primary" size="small" @click="showOut">出库</el-button>
23
 				<el-button type="primary" size="small" @click="showOut">出库</el-button>
24
-			</el-col> 
24
+			</el-col>
25
 			<el-col :span="2">
25
 			<el-col :span="2">
26
 				<el-row style=" margin:10px;">
26
 				<el-row style=" margin:10px;">
27
 				</el-row>
27
 				</el-row>
139
 			</el-form>
139
 			</el-form>
140
 
140
 
141
 		</el-dialog>
141
 		</el-dialog>
142
-		
142
+
143
 		<el-dialog title="库房明细" :visible.sync="importDialogVisible" width="1000px">
143
 		<el-dialog title="库房明细" :visible.sync="importDialogVisible" width="1000px">
144
 
144
 
145
 			<el-upload class="upload-demo" action="" :on-change="handleChange" :on-exceed="handleExceed" :on-remove="handleRemove"
145
 			<el-upload class="upload-demo" action="" :on-change="handleChange" :on-exceed="handleExceed" :on-remove="handleRemove"
223
 		<popup-distribution ref="PopupDistribution" @receviceFromChild="receviceFromDistreibution" :selectRows="selectRows"></popup-distribution>
223
 		<popup-distribution ref="PopupDistribution" @receviceFromChild="receviceFromDistreibution" :selectRows="selectRows"></popup-distribution>
224
 		<popup-out ref="PopupOut" @receviceFromChild="receviceFromOut"></popup-out>
224
 		<popup-out ref="PopupOut" @receviceFromChild="receviceFromOut"></popup-out>
225
 		<popup-in ref="PopupIn" @receviceFromChild="receviceFromIn" :wares="options" :wareId="query.wareId" :stack="moveFromStack"></popup-in>
225
 		<popup-in ref="PopupIn" @receviceFromChild="receviceFromIn" :wares="options" :wareId="query.wareId" :stack="moveFromStack"></popup-in>
226
- 
226
+
227
 	</div>
227
 	</div>
228
 </template>
228
 </template>
229
 
229
 
235
 	import PopupDistribution from '@/components/PopupDistribution.vue'
235
 	import PopupDistribution from '@/components/PopupDistribution.vue'
236
 	import PopupOut from '@/components/PopupOut.vue'
236
 	import PopupOut from '@/components/PopupOut.vue'
237
 	import PopupIn from '@/components/PopupIn.vue'
237
 	import PopupIn from '@/components/PopupIn.vue'
238
- 
238
+
239
 	import {
239
 	import {
240
 		mapState
240
 		mapState
241
 	} from 'vuex'
241
 	} from 'vuex'
1343
 					return
1343
 					return
1344
 				}
1344
 				}
1345
 				//console.log(this.selectRows.length)
1345
 				//console.log(this.selectRows.length)
1346
-				
1346
+
1347
 				this.$refs.PopupDistribution.show()
1347
 				this.$refs.PopupDistribution.show()
1348
 
1348
 
1349
 			},
1349
 			},

Loading…
Cancel
Save