修改第一版

src/view/record/inrecord.vue

@@ -86,13 +86,13 @@
 				</el-table-column>
 				<el-table-column prop="layer" label="层号" show-overflow-tooltip width="60px" header-align="center" align="center">
 				</el-table-column>
-				<el-table-column prop="materialName" label="品名" show-overflow-tooltip width="100px" header-align="center" align="center">
+				<el-table-column prop="materialName" label="货物品名" show-overflow-tooltip width="100px" header-align="center" align="center">
 				</el-table-column>
 				<el-table-column prop="ordNo" label="订单号" width="180px" show-overflow-tooltip align="left">
 				</el-table-column>
 				<el-table-column prop="model" label="规格" show-overflow-tooltip width="180px" align="center">
 				</el-table-column>
-				<el-table-column prop="standard" label="钢种" show-overflow-tooltip width="80px" align="center">
+				<el-table-column prop="standard" label="材质" show-overflow-tooltip width="80px" align="center">
 				</el-table-column>
 				<el-table-column prop="count" label="入库数量" width="100px" show-overflow-tooltip align="right">
 				</el-table-column>
@@ -100,21 +100,17 @@
 				</el-table-column>
 				<el-table-column prop="plateNo" label="钢板号" width="200px" show-overflow-tooltip align="center">
 				</el-table-column>
-				<el-table-column prop="customerName" label="货权单位" width="200px" show-overflow-tooltip align="center">
+				<el-table-column prop="customerName" label="订货单位" width="200px" show-overflow-tooltip align="center">
 				</el-table-column>   <!-- 原客户名称 -->
-				<el-table-column prop="fkComponyName" label="付款单位" width="200px" show-overflow-tooltip align="center">
+				<el-table-column prop="fkComponyName" label="客户单位" width="200px" show-overflow-tooltip align="center">
 				</el-table-column>   <!-- 新增 -->
 				<el-table-column prop="receiveAddress" label="收货地址" width="300" show-overflow-tooltip align="left">
 				</el-table-column>
-				<el-table-column prop="wgtDcnMtcCd" label="计量方式" width="100" show-overflow-tooltip header-align="center">
-				</el-table-column>
-				<el-table-column prop="edgeTy" label="切边类型" width="100" show-overflow-tooltip header-align="center">
-				</el-table-column>
 				<el-table-column prop="productionPlace" label="产地" width="250" show-overflow-tooltip header-align="center">
 				</el-table-column>
 				<el-table-column prop="carNo" label="入库车号" width="120px" show-overflow-tooltip align="left">
 				</el-table-column>
-				<el-table-column prop="tallyPeople" label="入库理货人员" width="250" show-overflow-tooltip header-align="center">
+				<el-table-column prop="tallyPeople" label="吊装工" width="250" show-overflow-tooltip header-align="center">
 				</el-table-column>
 				<el-table-column prop="addUser.userDesc" label="入库操作人" width="120px" show-overflow-tooltip align="left">
 				</el-table-column>
@@ -124,8 +120,6 @@
 				</el-table-column>
 				<el-table-column prop="recordType" label="类型" width="100px" show-overflow-tooltip align="center" :formatter="typeFormatter">
 				</el-table-column>
-				<el-table-column prop="remark" label="备注" width="100px" show-overflow-tooltip align="left">
-				</el-table-column>
 				
 			</el-table>
 		</div>

src/view/record/outrecord.vue

@@ -112,6 +112,8 @@
 				</el-table-column>
 				<el-table-column prop="invoicePrice" label="基价" width="100px" show-overflow-tooltip align="right">
 				</el-table-column>
+				<el-table-column prop="unitPrice" label="结算价格" width="100px" show-overflow-tooltip align="right">
+				</el-table-column>
 				<el-table-column prop="plateNo" label="钢板号" width="200px" show-overflow-tooltip align="center">
 				</el-table-column>
 				<el-table-column prop="customerName" label="货权单位" width="200px" show-overflow-tooltip align="center">
@@ -140,10 +142,6 @@
 				</el-table-column>
 				<el-table-column prop="verifyAccountId" v-if="false" label="对账ID" width="100px" show-overflow-tooltip align="center" >
 				</el-table-column>
-				
-				
-				
-				
 				<el-table-column prop="backFlag" label="取消标记" show-overflow-tooltip width="100px" align="center">
 				</el-table-column>
 			</el-table>

src/view/ware/store.vue

@@ -59,7 +59,7 @@
 					</el-table-column>
 					<el-table-column prop="receiveAddress" label="收货地址" width="300" show-overflow-tooltip header-align="center">
 					</el-table-column>
-					<el-table-column prop="fkComponyId" label="客户" width="300" show-overflow-tooltip header-align="center">
+					<el-table-column prop="fkComponyId" label="客户名称" width="300" show-overflow-tooltip header-align="center">
 					</el-table-column>
 					<el-table-column prop="carNo" label="车号" width="150" show-overflow-tooltip header-align="center">
 					</el-table-column>

src/view/ware/storechange.vue

@@ -22,12 +22,12 @@
 							<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-input v-model="query.fkcustmerName" size="small" style="width:170px;margin-left: -8px">
 							<el-button slot="append" icon="el-icon-search" @click="showFKcustmer"></el-button>
 						</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.customerName" size="small" style="width:170px;margin-left: -8px">
 							<el-button slot="append" icon="el-icon-search" @click="showCustomer"></el-button>
 						</el-input>
@@ -69,11 +69,11 @@
 				<el-table-column type="selection" width="40" header-align="center" align="center"></el-table-column>
 				<el-table-column prop="layer" label="层数" width="60" show-overflow-tooltip header-align="center" align="center">
 				</el-table-column>
-				<el-table-column prop="stack.name" label="垛位" width="60" show-overflow-tooltip header-align="center" align="center">
+				<el-table-column prop="stack.name" label="垛位" width="120" show-overflow-tooltip header-align="center" align="center">
 				</el-table-column>
-				<el-table-column prop="material.name" label="物料" width="100" show-overflow-tooltip header-align="center" align="center">
+				<el-table-column prop="material.name" label="货物品名" width="100" show-overflow-tooltip header-align="center" align="center">
 				</el-table-column>
-				<el-table-column prop="material.standard" label="钢种" width="100" show-overflow-tooltip header-align="center" align="center">
+				<el-table-column prop="material.standard" label="材质" width="100" show-overflow-tooltip header-align="center" align="center">
 				</el-table-column>
 				<el-table-column prop="plateNo" label="钢板号" width="200" show-overflow-tooltip header-align="center">
 				</el-table-column>
@@ -83,13 +83,15 @@
 				</el-table-column>
 				<el-table-column prop="weight" label="重量" width="120" show-overflow-tooltip align="right" header-align="center">
 				</el-table-column>
-				<el-table-column prop="customer.name" label="客户" width="300" show-overflow-tooltip header-align="center">
+				<el-table-column prop="ordNo" label="订单号" width="180" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="receiveAddress" label="收货地址" width="300" show-overflow-tooltip header-align="center">
+				<el-table-column prop="contractNo" label="合约号" width="180" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				 <el-table-column prop="wgtDcnMtcCd" label="计量方式" width="100" show-overflow-tooltip header-align="center">
+				<el-table-column prop="customer.name" label="订单客户" width="300" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="edgeTy" label="切边类型" width="100" show-overflow-tooltip header-align="center">
+				<el-table-column prop="fkComponyId" label="客户名称" width="300" show-overflow-tooltip header-align="center">
+				</el-table-column>
+				<el-table-column prop="receiveAddress" label="收货地址" width="300" show-overflow-tooltip header-align="center">
 				</el-table-column>
 				<el-table-column prop="productionPlace" label="产地" width="250" show-overflow-tooltip header-align="center">
 				</el-table-column>