Browse Source

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

YL2767 1 week ago
parent
commit
b2ec95aa04
2 changed files with 24 additions and 34 deletions
  1. 2
    2
      src/components/PopupStackWithSelectWare.vue
  2. 22
    32
      src/view/ware/store.vue

+ 2
- 2
src/components/PopupStackWithSelectWare.vue View File

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

+ 22
- 32
src/view/ware/store.vue View File

39
 					</el-table-column>
39
 					</el-table-column>
40
 					<el-table-column prop="stack.name" label="垛位" width="60" show-overflow-tooltip header-align="center" align="center">
40
 					<el-table-column prop="stack.name" label="垛位" width="60" show-overflow-tooltip header-align="center" align="center">
41
 					</el-table-column>
41
 					</el-table-column>
42
-					<el-table-column prop="material.name" label="物料" width="100" show-overflow-tooltip header-align="center" align="center">
42
+					<el-table-column prop="material.name" label="货物品名" width="100" show-overflow-tooltip header-align="center" align="center">
43
 					</el-table-column>
43
 					</el-table-column>
44
 					<el-table-column prop="ordNo" label="订单号" width="180" show-overflow-tooltip header-align="center">
44
 					<el-table-column prop="ordNo" label="订单号" width="180" show-overflow-tooltip header-align="center">
45
 					</el-table-column>
45
 					</el-table-column>
46
-					<el-table-column prop="material.standard" label="钢种" width="100" show-overflow-tooltip header-align="center" align="center">
46
+					<el-table-column prop="contractNo" label="合约号" width="180" show-overflow-tooltip header-align="center">
47
+					</el-table-column>
48
+					<el-table-column prop="material.standard" label="材质" width="100" show-overflow-tooltip header-align="center" align="center">
47
 					</el-table-column>
49
 					</el-table-column>
48
 					<el-table-column prop="plateNo" label="钢板号" width="200" show-overflow-tooltip header-align="center">
50
 					<el-table-column prop="plateNo" label="钢板号" width="200" show-overflow-tooltip header-align="center">
49
 					</el-table-column>
51
 					</el-table-column>
53
 					</el-table-column>
55
 					</el-table-column>
54
 					<el-table-column prop="weight" label="重量" width="120" show-overflow-tooltip align="right" header-align="center">
56
 					<el-table-column prop="weight" label="重量" width="120" show-overflow-tooltip align="right" header-align="center">
55
 					</el-table-column>
57
 					</el-table-column>
56
-					<el-table-column prop="customer.name" label="客户" width="300" show-overflow-tooltip header-align="center">
58
+					<el-table-column prop="customer.name" label="订单客户" width="300" show-overflow-tooltip header-align="center">
57
 					</el-table-column>
59
 					</el-table-column>
58
 					<el-table-column prop="receiveAddress" label="收货地址" width="300" show-overflow-tooltip header-align="center">
60
 					<el-table-column prop="receiveAddress" label="收货地址" width="300" show-overflow-tooltip header-align="center">
59
 					</el-table-column>
61
 					</el-table-column>
60
-					<el-table-column prop="fkComponyId" label="付款单位" width="300" show-overflow-tooltip header-align="center">
61
-					</el-table-column>
62
-					<el-table-column prop="wgtDcnMtcCd" label="计量方式" width="100" show-overflow-tooltip header-align="center">
63
-					</el-table-column>
64
-					<el-table-column prop="edgeTy" label="切边类型" width="100" show-overflow-tooltip header-align="center">
62
+					<el-table-column prop="fkComponyId" label="客户" width="300" show-overflow-tooltip header-align="center">
65
 					</el-table-column>
63
 					</el-table-column>
66
 					<el-table-column prop="carNo" label="车号" width="150" show-overflow-tooltip header-align="center">
64
 					<el-table-column prop="carNo" label="车号" width="150" show-overflow-tooltip header-align="center">
67
 					</el-table-column>
65
 					</el-table-column>
68
 					<el-table-column prop="productionPlace" label="产地" width="250" show-overflow-tooltip header-align="center">
66
 					<el-table-column prop="productionPlace" label="产地" width="250" show-overflow-tooltip header-align="center">
69
 					</el-table-column>
67
 					</el-table-column>
70
-					<el-table-column prop="tallyPeople" label="入库理货人员" width="250" show-overflow-tooltip header-align="center">
68
+					<el-table-column prop="tallyPeople" label="吊装工" width="250" show-overflow-tooltip header-align="center">
71
 				    </el-table-column>
69
 				    </el-table-column>
72
 					<el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip header-align="center">
70
 					<el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip header-align="center">
73
 					</el-table-column>
71
 					</el-table-column>
152
 			<el-table :data="imTableData" border>
150
 			<el-table :data="imTableData" border>
153
 				<el-table-column prop="仓库名称" label="仓库名称" width="100" show-overflow-tooltip header-align="center">
151
 				<el-table-column prop="仓库名称" label="仓库名称" width="100" show-overflow-tooltip header-align="center">
154
 				</el-table-column>
152
 				</el-table-column>
155
-				<el-table-column prop="垛位号" label="垛位号" width="120" show-overflow-tooltip header-align="center">
156
-				</el-table-column>
157
-				<el-table-column prop="层号" label="层号" width="60" show-overflow-tooltip header-align="center">
158
-				</el-table-column>
159
-				<el-table-column prop="产品编号" label="产品编号" width="200" show-overflow-tooltip header-align="center">
160
-				</el-table-column>
161
-				<el-table-column prop="物料类型" label="物料类型" width="120" show-overflow-tooltip align="center" header-align="center">
162
-				</el-table-column>
163
-        		<el-table-column prop="订单号" label="订单号" width="200" show-overflow-tooltip header-align="center">
153
+				<el-table-column prop="货物品名" label="货物品名" width="100" show-overflow-tooltip header-align="center">
164
 				</el-table-column>
154
 				</el-table-column>
165
-				<el-table-column prop="产品规格" label="产品规格" width="120" show-overflow-tooltip header-align="center">
155
+				<el-table-column prop="材质" label="材质" width="100" show-overflow-tooltip header-align="center">
166
 				</el-table-column>
156
 				</el-table-column>
167
-				<el-table-column prop="重量" label="重量" width="120" show-overflow-tooltip align="right" header-align="center">
157
+				<el-table-column prop="规格" label="规格" width="100" show-overflow-tooltip header-align="center">
168
 				</el-table-column>
158
 				</el-table-column>
169
-				<el-table-column prop="钢种" label="钢种" width="120" show-overflow-tooltip align="center" header-align="center">
159
+				<el-table-column prop="数量" label="数量" width="100" show-overflow-tooltip header-align="center">
170
 				</el-table-column>
160
 				</el-table-column>
171
-				<el-table-column prop="数量" label="数量" width="120" show-overflow-tooltip align="right" header-align="center">
161
+				<el-table-column prop="重量" label="重量" width="100" show-overflow-tooltip header-align="center">
172
 				</el-table-column>
162
 				</el-table-column>
173
-				<el-table-column prop="客户名称" label="客户名称" width="300" show-overflow-tooltip header-align="center">
163
+				<el-table-column prop="顺序号" label="顺序号" width="100" show-overflow-tooltip header-align="center">
174
 				</el-table-column>
164
 				</el-table-column>
175
-				<el-table-column prop="订单客户" label="订单客户" width="300" show-overflow-tooltip header-align="center">
165
+				<el-table-column prop="车号" label="车号" width="100" show-overflow-tooltip header-align="center">
176
 				</el-table-column>
166
 				</el-table-column>
177
-				<el-table-column prop="目的地" label="目的地" width="300" show-overflow-tooltip header-align="center">
167
+				<el-table-column prop="订单号" label="订单号" width="100" show-overflow-tooltip header-align="center">
178
 				</el-table-column>
168
 				</el-table-column>
179
-				<el-table-column prop="收货地址" label="收货地址" width="300" show-overflow-tooltip header-align="center">
169
+				<el-table-column prop="合约号" label="合约号" width="100" show-overflow-tooltip header-align="center">
180
 				</el-table-column>
170
 				</el-table-column>
181
-				<el-table-column prop="计量方式" label="计量方式" width="100" show-overflow-tooltip header-align="center">
171
+				<el-table-column prop="垛位号" label="垛位号" width="100" show-overflow-tooltip header-align="center">
182
 				</el-table-column>
172
 				</el-table-column>
183
-				<el-table-column prop="切边类型" label="切边类型" width="100" show-overflow-tooltip header-align="center">
173
+				<el-table-column prop="层号" label="层号" width="100" show-overflow-tooltip header-align="center">
184
 				</el-table-column>
174
 				</el-table-column>
185
-				<el-table-column prop="车号" label="车号" width="150" show-overflow-tooltip header-align="center">
175
+				<el-table-column prop="客户名称" label="客户名称" width="100" show-overflow-tooltip header-align="center">
186
 				</el-table-column>
176
 				</el-table-column>
187
-				<el-table-column prop="产地" label="产地" width="250" show-overflow-tooltip header-align="center">
177
+				<el-table-column prop="订单客户" label="订单客户" width="100" show-overflow-tooltip header-align="center">
188
 				</el-table-column>
178
 				</el-table-column>
189
-				<el-table-column prop="入库理货人员" label="入库理货人员" width="250" show-overflow-tooltip header-align="center">
179
+				<el-table-column prop="目的地" label="目的地" width="100" show-overflow-tooltip header-align="center">
190
 				</el-table-column>
180
 				</el-table-column>
191
-				<el-table-column prop="货权单位" label="货权单位" width="300" show-overflow-tooltip header-align="center">
181
+				<el-table-column prop="产地" label="产地" width="100" show-overflow-tooltip header-align="center">
192
 				</el-table-column>
182
 				</el-table-column>
193
 				<el-table-column prop="吊装工" label="吊装工" width="150" show-overflow-tooltip header-align="center">
183
 				<el-table-column prop="吊装工" label="吊装工" width="150" show-overflow-tooltip header-align="center">
194
 				</el-table-column>
184
 				</el-table-column>

Loading…
Cancel
Save