111

src/view/record/inrecord.vue

@@ -434,8 +434,8 @@
 								,"入库数量"
 								,"入库重量"
 								,"钢板号"
-								,"货权单位"
-								,"付款单位"
+								,"订货单位"
+								,"客户单位"
 								,"收货地址"
 								,"计量方式"
 								,"切边类型"
@@ -444,7 +444,7 @@
 								,"入库理货人员"
 								,"入库操作人"
 								,"入库时间"
-								,"备注"
+								,"垛位备注"
 								,"类型"
 								,"备注"
 				] // 导出的表头名
@@ -469,7 +469,7 @@
 						,"tallyPeople"
 						,"addUserUserDesc"
 						,"addTime"
-						,"remark"
+						,"remark1"
 						,"recordType"
 						,"remark"
 				]

src/view/record/outrecord.vue

@@ -23,13 +23,13 @@
 								<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
 							</el-input>
 						</el-form-item>
-						<el-form-item label="客户名称" style="margin-left: -35px">
+						<el-form-item label="订货单位" style="margin-left: -35px">
 							<el-select v-model="query.customerName" filterable placeholder="请选择上游客户" clearable size="small" style="margin-left: 5px; width: 170px">
 								<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
 								</el-option>
 							</el-select>
 						</el-form-item>
-						<el-form-item label="付款单位" style="margin-left: -35px">
+						<el-form-item label="客户单位" style="margin-left: -35px">
 							<el-select v-model="query.fkComponyName" filterable placeholder="请选择上游客户" clearable size="small" style="margin-left: 5px; width: 170px">
 								<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
 								</el-option>
@@ -803,8 +803,8 @@
 								,"出库数量"
 								,"出库重量"
 								,"钢板号"
-								,"货权单位"
-								,"付款单位"
+								,"订单客户"
+								,"客户单位"
 								,"收货地址"
 								,"计量方式"
 								,"切边类型"
@@ -814,6 +814,7 @@
 								,"出库操作人"
 								,"出库时间"
 								,"备注"
+								,"垛位备注"
 								,"类型"
 
 				] // 导出的表头名
@@ -842,6 +843,7 @@
 						,"addId"
 						,"addTime"
 						,"remark"
+						,"remark1"
 						,"recordType"
 				]