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

2.出库操作导入出库明细表字段 新增合约号字段
3.导出入库明细表excel 新增合约号字段
4.导出出库明细表excel 新增合约号字段

src/view/record/inrecord.vue

@@ -12,7 +12,7 @@
 							<el-form-item label="垛位名称" style="margin-left: -35px">
 								<el-input v-model="query.stackName" size="small" style="width:100px;margin-left: -8px"></el-input>
 							</el-form-item>
-							<el-form-item label="物料名称" style="margin-left: -35px"> 
+							<el-form-item label="物料名称" style="margin-left: -35px">
 								<el-input v-model="query.materialName" size="small"  style="width:130px;margin-left: -8px">
 									<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
 								</el-input>
@@ -71,7 +71,7 @@
 								<!-- <el-button @click="handleSearch" type="primary" size="small">查询</el-button> -->
 							</el-form-item>
 							<el-form-item label="" style="margin-top: -15px">
-								<el-upload class="upload-demo" action="" 
+								<el-upload class="upload-demo" action=""
 									 ref="upload" :limit="1" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
 									 :auto-upload="false"  >
 									 <el-button plain slot="trigger"  type="success" v-show="false" style= "margin-left: 5px" size="small">询单导入</el-button>
@@ -92,7 +92,7 @@
 										<el-dropdown-item command="changeRecordInDtm" style="background-color: #f5f5f5;">修改时间</el-dropdown-item>
 									</el-dropdown-menu>
 								</el-dropdown>
-								
+
 							</el-form-item>
 							<el-form-item label="修改时间" style="margin-left: -35px;margin-top: -15px">
 								<el-date-picker size="small" v-model="ChangeInDtm" type="datetime" placeholder="选择日期时间" style="width:200px;margin-left: -8px">
@@ -149,7 +149,7 @@
 				</el-table-column>
 				<el-table-column prop="recordType" label="类型" width="100px" show-overflow-tooltip align="center" :formatter="typeFormatter">
 				</el-table-column>
-				
+
 			</el-table>
 		</div>
 		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
@@ -231,7 +231,7 @@
 			// this.getTableData()
 			this.setSearchTime();
 			this.getAllCustomer();
-			
+
 		},
 		methods: {
 			setSearchTime(){
@@ -389,7 +389,7 @@
 					}
 					this.loading = false
 				});
-				
+
 			},
 			changeWare(){
 
@@ -446,7 +446,7 @@
 					}
 
 				});
-				
+
 			},
 			exportExcel(imptData) {
 				// alert(JSON.stringify(imptData))
@@ -473,6 +473,7 @@
 								,"垛位备注"
 								,"类型"
 								,"备注"
+                ,"合约号"
 				] // 导出的表头名
 				const filterVal = [
 						"wareName"
@@ -498,6 +499,7 @@
 						,"remark1"
 						,"recordType"
 						,"remark"
+            ,"contractNo"
 				]
 
 				for(var i=0;i<imptData.length;i++){
@@ -547,7 +549,7 @@
 						}
 					});
 				}
-				
+
 			},
 			changeRecordInDtm(){
 				if (this.selectRows.length < 1) {

src/view/record/outrecord.vue

@@ -75,7 +75,7 @@
 							<el-button @click="changeCarNoShow" type="primary" size="small" >修改车号</el-button>
 						</el-form-item>
 						<el-form-item label="" >
-							<el-upload class="upload-demo" action="" 
+							<el-upload class="upload-demo" action=""
 								 ref="upload" :limit="1" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
 								 :auto-upload="false"  >
 								 <el-button plain slot="trigger"  type="success" v-show="false" style= "margin-left: 5px" size="small">询单导入</el-button>
@@ -91,13 +91,13 @@
 								<el-dropdown-item command="changeRecordOutDtm" style="background-color: #f5f5f5;">修改时间</el-dropdown-item>
 							</el-dropdown-menu>
 						</el-dropdown>
-						
+
 					</el-form-item>
 					<el-form-item label="修改时间" style="margin-left: -35px">
 							<el-date-picker size="small" v-model="ChangeOutDtm" type="datetime" placeholder="选择日期时间" style="width:200px;margin-left: -8px">
 							</el-date-picker>
 					</el-form-item>
-						
+
 					</el-row>
 				</el-form>
 			</el-row>
@@ -217,7 +217,7 @@
 					</el-col>
 				</el-row>
 			</el-form>
-			
+
 
 		</el-dialog>
 		<el-dialog title="批量改价" :visible.sync="popupModPrice" width="780px">
@@ -252,7 +252,7 @@
 				<el-row>
 					<el-button size="small" type="primary" style="margin-left: 30px;" @click="handlechangeCarNo">提交</el-button>
 				</el-row>
-				
+
 			</el-form>
 		</el-dialog>
 		<popup-stack-with-select-ware :selectVareName="optionsWare" ref="PopupStackWithSelectWare" @receviceFromChild="receviceFromWareStack"></popup-stack-with-select-ware>
@@ -301,7 +301,7 @@
 					ordNo:[],
 					fkComponyName:'',
 					remark1:''
-					
+
 				},
 				accData:{
 					accDate:'',
@@ -429,7 +429,7 @@
 							message: '保存成功',
 						});
 						this.popupVerifyAcc = false
-						this.getTableData();	
+						this.getTableData();
 					} else {
 						this.$message({
 							type: 'error',
@@ -535,22 +535,22 @@
 					});
 				}
 			},
-			numSub(num1, num2) { 
-				var baseNum, baseNum1, baseNum2; 
-				var precision;// 精度 
-				try { 
-					baseNum1 = num1.toString().split(".")[1].length; 
-				} catch (e) { 
-					baseNum1 = 0; 
-				} 
-				try { 
-					baseNum2 = num2.toString().split(".")[1].length; 
-				} catch (e) { 
-					baseNum2 = 0; 
-				} 
-				baseNum = Math.pow(10, Math.max(baseNum1, baseNum2)); 
-				precision = (baseNum1 >= baseNum2) ? baseNum1 : baseNum2; 
-				return ((num1 * baseNum + num2 * baseNum) / baseNum).toFixed(precision); 
+			numSub(num1, num2) {
+				var baseNum, baseNum1, baseNum2;
+				var precision;// 精度
+				try {
+					baseNum1 = num1.toString().split(".")[1].length;
+				} catch (e) {
+					baseNum1 = 0;
+				}
+				try {
+					baseNum2 = num2.toString().split(".")[1].length;
+				} catch (e) {
+					baseNum2 = 0;
+				}
+				baseNum = Math.pow(10, Math.max(baseNum1, baseNum2));
+				precision = (baseNum1 >= baseNum2) ? baseNum1 : baseNum2;
+				return ((num1 * baseNum + num2 * baseNum) / baseNum).toFixed(precision);
 			},
 			numMulti(arg1,arg2){
 				var m=0,s1=arg1.toString(),s2=arg2.toString();
@@ -619,7 +619,7 @@
 			receviceFromFkCompony(customer) {
 				this.query.fkComponyName = customer.name
 			},
-			
+
 			getTableData() {
 				var url = 'WareOutRecord/query.do'
 				if(this.query.RecordDate == null){
@@ -684,7 +684,7 @@
 					});
 					return
 				}
-				
+
 				if (this.selectRows[0].backFlag == '1') {
 					this.$message({
 						type: 'error',
@@ -796,7 +796,7 @@
 			},
 			handleExport() {
 				var imptData = [];
-				
+
 
 				var url = 'WareOutRecord/query.do'
 				var param = {
@@ -840,7 +840,7 @@
 					}
 
 				});
-				
+
 			},
 			exportExcel(imptData) {
 				 console.log(JSON.stringify(imptData))
@@ -870,6 +870,7 @@
 								,"备注"
 								,"垛位备注"
 								,"类型"
+                ,"合约号"
 
 				] // 导出的表头名
 				const filterVal = [
@@ -899,6 +900,7 @@
 						,"remark"
 						,"remark1"
 						,"recordType"
+          ,"contractNo"
 				]
 
 				for(var i=0;i<imptData.length;i++){

src/view/ware/store.vue

@@ -21,7 +21,7 @@
 				<el-button size="small" type="danger" @click="handleInBack" :disabled="backAble">取消入库</el-button>
 				<el-button type="primary" size="small" @click="showDistribution">配货</el-button>
 				<el-button type="primary" size="small" @click="showOut">出库</el-button>
-			</el-col> 
+			</el-col>
 			<el-col :span="2">
 				<el-row style=" margin:10px;">
 				</el-row>
@@ -139,7 +139,7 @@
 			</el-form>
 
 		</el-dialog>
-		
+
 		<el-dialog title="库房明细" :visible.sync="importDialogVisible" width="1000px">
 
 			<el-upload class="upload-demo" action="" :on-change="handleChange" :on-exceed="handleExceed" :on-remove="handleRemove"
@@ -223,7 +223,7 @@
 		<popup-distribution ref="PopupDistribution" @receviceFromChild="receviceFromDistreibution" :selectRows="selectRows"></popup-distribution>
 		<popup-out ref="PopupOut" @receviceFromChild="receviceFromOut"></popup-out>
 		<popup-in ref="PopupIn" @receviceFromChild="receviceFromIn" :wares="options" :wareId="query.wareId" :stack="moveFromStack"></popup-in>
- 
+
 	</div>
 </template>
 
@@ -235,7 +235,7 @@
 	import PopupDistribution from '@/components/PopupDistribution.vue'
 	import PopupOut from '@/components/PopupOut.vue'
 	import PopupIn from '@/components/PopupIn.vue'
- 
+
 	import {
 		mapState
 	} from 'vuex'
@@ -1343,7 +1343,7 @@
 					return
 				}
 				//console.log(this.selectRows.length)
-				
+
 				this.$refs.PopupDistribution.show()
 
 			},