修改导入模板和库图界面垛位显示

src/components/PopupStackWithSelectWare.vue

@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<el-dialog title="添加信息" :visible.sync="dialogVisible" width="700px">
+		<el-dialog title="添加信息" :visible.sync="dialogVisible" width="750px">
 			<el-row>
 				<el-select v-model="wareId" clearable placeholder="请选择" @change="changeWare">
 					<el-option v-for="item in wares" :key="item.id" :label="item.name" :value="item.id">
@@ -14,7 +14,7 @@
 				<el-button type="success" @click="handleComfirm">确定</el-button>
 			</el-row>
 			<el-row>
-				<div id="popMoveWareLayout" style=" margin:10px;width:600px; height: 500px;background-color: #00FFFF;"></div>
+				<div id="popMoveWareLayout" style=" margin:10px;width:700px; height: 550px;background-color: #00FFFF;"></div>
 			<!-- 	<div id="popMoveStoreLayer" style=" margin:10px;width:600px; height: 300px;background-color: #00FFFF;"></div> -->
 			</el-row>
 		</el-dialog>

src/view/ware/store.vue

@@ -39,11 +39,13 @@
 					</el-table-column>
 					<el-table-column prop="stack.name" label="垛位" width="60" 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="ordNo" label="订单号" width="180" show-overflow-tooltip header-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="contractNo" label="合约号" width="180" show-overflow-tooltip header-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>
 					<el-table-column prop="plateNo" label="钢板号" width="200" show-overflow-tooltip header-align="center">
 					</el-table-column>
@@ -53,21 +55,17 @@
 					</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="customer.name" 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="fkComponyId" label="付款单位" width="300" 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>
-					<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="carNo" label="车号" width="150" 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="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="remark" label="备注" width="150" show-overflow-tooltip header-align="center">
 					</el-table-column>
@@ -152,43 +150,35 @@
 			<el-table :data="imTableData" border>
 				<el-table-column prop="仓库名称" label="仓库名称" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="垛位号" label="垛位号" width="120" show-overflow-tooltip header-align="center">
-				</el-table-column>
-				<el-table-column prop="层号" label="层号" width="60" show-overflow-tooltip header-align="center">
-				</el-table-column>
-				<el-table-column prop="产品编号" label="产品编号" width="200" show-overflow-tooltip header-align="center">
-				</el-table-column>
-				<el-table-column prop="物料类型" label="物料类型" width="120" show-overflow-tooltip align="center" header-align="center">
-				</el-table-column>
-        		<el-table-column prop="订单号" label="订单号" width="200" show-overflow-tooltip header-align="center">
+				<el-table-column prop="货物品名" label="货物品名" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="产品规格" label="产品规格" width="120" show-overflow-tooltip header-align="center">
+				<el-table-column prop="材质" label="材质" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="重量" label="重量" width="120" show-overflow-tooltip align="right" header-align="center">
+				<el-table-column prop="规格" label="规格" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="钢种" label="钢种" width="120" show-overflow-tooltip align="center" header-align="center">
+				<el-table-column prop="数量" label="数量" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="数量" label="数量" width="120" show-overflow-tooltip align="right" header-align="center">
+				<el-table-column prop="重量" label="重量" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="客户名称" label="客户名称" width="300" show-overflow-tooltip header-align="center">
+				<el-table-column prop="顺序号" label="顺序号" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="订单客户" label="订单客户" width="300" show-overflow-tooltip header-align="center">
+				<el-table-column prop="车号" label="车号" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="目的地" label="目的地" width="300" show-overflow-tooltip header-align="center">
+				<el-table-column prop="订单号" label="订单号" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="收货地址" label="收货地址" width="300" show-overflow-tooltip header-align="center">
+				<el-table-column prop="合约号" label="合约号" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="计量方式" label="计量方式" width="100" show-overflow-tooltip header-align="center">
+				<el-table-column prop="垛位号" label="垛位号" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="切边类型" label="切边类型" width="100" show-overflow-tooltip header-align="center">
+				<el-table-column prop="层号" label="层号" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="车号" label="车号" width="150" show-overflow-tooltip header-align="center">
+				<el-table-column prop="客户名称" label="客户名称" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="产地" label="产地" width="250" show-overflow-tooltip header-align="center">
+				<el-table-column prop="订单客户" label="订单客户" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="入库理货人员" label="入库理货人员" width="250" show-overflow-tooltip header-align="center">
+				<el-table-column prop="目的地" label="目的地" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
-				<el-table-column prop="货权单位" label="货权单位" width="300" show-overflow-tooltip header-align="center">
+				<el-table-column prop="产地" label="产地" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
 				<el-table-column prop="吊装工" label="吊装工" width="150" show-overflow-tooltip header-align="center">
 				</el-table-column>