朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 91b0bc44df7546e22e64a84263cfd6818221cefd 1 个父辈 4a076d68

场站-仓库-库区-库位 已测试优化

内嵌 并排对比
正在显示 4 个修改的文件 包含 69 行增加 和 22 行删除
@@ -80,8 +80,7 @@ @@ -80,8 +80,7 @@
80 </el-table-column> 80 </el-table-column>
81 <el-table-column 81 <el-table-column
82 prop="totallocation" 82 prop="totallocation"
83 - label="占用库位"  
84 - width="120"> 83 + label="占用库位">
85 </el-table-column> 84 </el-table-column>
86 <!-- <el-table-column--> 85 <!-- <el-table-column-->
87 <!-- prop="xstart"--> 86 <!-- prop="xstart"-->
@@ -144,7 +143,23 @@ @@ -144,7 +143,23 @@
144 <el-form-item label="" :label-width="formLabelWidth" prop="houseid"> 143 <el-form-item label="" :label-width="formLabelWidth" prop="houseid">
145 <div class="my-text-area"> 144 <div class="my-text-area">
146 <div class="el-input-group__prepend prepand">所属仓库</div> 145 <div class="el-input-group__prepend prepand">所属仓库</div>
147 - <el-select v-model="addForm.houseid" 146 + <el-select v-model="addForm.houseid" v-if="this.dis === 'create'"
  147 + filterable
  148 + allow-create
  149 + default-first-option
  150 + remote size="small"
  151 + :remote-method="getHouseid"
  152 + :loading="loading" placeholder="请输入所属仓库" style="width: 210px">
  153 + <el-option
  154 + v-for="item in houseids"
  155 + :key="item.houseid"
  156 + :label="item.housename"
  157 + :value="item.houseid">
  158 + <span style="float: left">{{ item.housename }}</span>
  159 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.houseid }}</span>
  160 + </el-option>
  161 + </el-select>
  162 + <el-select v-model="addForm.houseid" v-else disabled
148 filterable 163 filterable
149 allow-create 164 allow-create
150 default-first-option 165 default-first-option
@@ -167,7 +182,10 @@ @@ -167,7 +182,10 @@
167 <el-row> 182 <el-row>
168 <el-col :span="7"> 183 <el-col :span="7">
169 <el-form-item label="" :label-width="formLabelWidth" prop="areano"> 184 <el-form-item label="" :label-width="formLabelWidth" prop="areano">
170 - <el-input v-model="addForm.areano" autocomplete="off" size="small" style="width: 300px"> 185 + <el-input v-if="this.dis === 'create'" v-model="addForm.areano" autocomplete="off" size="small" style="width: 300px">
  186 + <template slot="prepend">库区编号</template>
  187 + </el-input>
  188 + <el-input v-else disabled v-model="addForm.areano" autocomplete="off" size="small" style="width: 300px">
171 <template slot="prepend">库区编号</template> 189 <template slot="prepend">库区编号</template>
172 </el-input> 190 </el-input>
173 </el-form-item> 191 </el-form-item>
@@ -321,6 +339,7 @@ @@ -321,6 +339,7 @@
321 create: '新增' 339 create: '新增'
322 }, 340 },
323 dialogApply: 'create', 341 dialogApply: 'create',
  342 + dis: undefined,
324 apply_dialog: { 343 apply_dialog: {
325 // 添加对话框 344 // 添加对话框
326 addDialog: false, 345 addDialog: false,
@@ -444,6 +463,7 @@ @@ -444,6 +463,7 @@
444 remark4:'', 463 remark4:'',
445 }; 464 };
446 this.dialogApply= 'create'; 465 this.dialogApply= 'create';
  466 + this.dis= 'create';
447 this.apply_dialog.addDialog = true; 467 this.apply_dialog.addDialog = true;
448 }, 468 },
449 // 添加功能 469 // 添加功能
@@ -472,6 +492,7 @@ @@ -472,6 +492,7 @@
472 applyEdit(row) { 492 applyEdit(row) {
473 this.apply_dialog.addDialog = true; 493 this.apply_dialog.addDialog = true;
474 this.dialogApply = 'update'; 494 this.dialogApply = 'update';
  495 + this.dis= 'update';
475 this.addForm=row; 496 this.addForm=row;
476 }, 497 },
477 // 编辑功能 498 // 编辑功能
@@ -132,7 +132,10 @@ @@ -132,7 +132,10 @@
132 <el-row> 132 <el-row>
133 <el-col :span="9"> 133 <el-col :span="9">
134 <el-form-item label="" :label-width="formLabelWidth" prop="houseid"> 134 <el-form-item label="" :label-width="formLabelWidth" prop="houseid">
135 - <el-input v-model="addForm.houseid" autocomplete="off" size="small" style="width: 260px"> 135 + <el-input v-if="this.dis === 'create'" v-model="addForm.houseid" autocomplete="off" size="small" style="width: 260px">
  136 + <template slot="prepend">仓库编号</template>
  137 + </el-input>
  138 + <el-input v-else disabled v-model="addForm.houseid" autocomplete="off" size="small" style="width: 260px">
136 <template slot="prepend">仓库编号</template> 139 <template slot="prepend">仓库编号</template>
137 </el-input> 140 </el-input>
138 </el-form-item> 141 </el-form-item>
@@ -291,6 +294,7 @@ @@ -291,6 +294,7 @@
291 update: '编辑', 294 update: '编辑',
292 create: '新增' 295 create: '新增'
293 }, 296 },
  297 + dis: undefined,
294 dialogApply: 'create', 298 dialogApply: 'create',
295 apply_dialog: { 299 apply_dialog: {
296 // 添加对话框 300 // 添加对话框
@@ -408,6 +412,7 @@ @@ -408,6 +412,7 @@
408 remark3:'' 412 remark3:''
409 }; 413 };
410 this.dialogApply= 'create'; 414 this.dialogApply= 'create';
  415 + this.dis= 'create';
411 this.apply_dialog.addDialog = true; 416 this.apply_dialog.addDialog = true;
412 }, 417 },
413 // 添加功能 418 // 添加功能
@@ -436,6 +441,7 @@ @@ -436,6 +441,7 @@
436 applyEdit(row) { 441 applyEdit(row) {
437 this.apply_dialog.addDialog = true; 442 this.apply_dialog.addDialog = true;
438 this.dialogApply = 'update'; 443 this.dialogApply = 'update';
  444 + this.dis= 'update';
439 this.addForm=row; 445 this.addForm=row;
440 }, 446 },
441 // 编辑功能 447 // 编辑功能
@@ -74,8 +74,7 @@ @@ -74,8 +74,7 @@
74 </el-table-column> 74 </el-table-column>
75 <el-table-column 75 <el-table-column
76 prop="autodist" 76 prop="autodist"
77 - label="库位自动分配"  
78 - width="120"> 77 + label="库位自动分配">
79 </el-table-column> 78 </el-table-column>
80 <el-table-column 79 <el-table-column
81 fixed="right" 80 fixed="right"
@@ -108,7 +107,21 @@ @@ -108,7 +107,21 @@
108 <el-form-item label="" :label-width="formLabelWidth" prop="areaid"> 107 <el-form-item label="" :label-width="formLabelWidth" prop="areaid">
109 <div class="my-text-area"> 108 <div class="my-text-area">
110 <div class="el-input-group__prepend prepand">所属库区</div> 109 <div class="el-input-group__prepend prepand">所属库区</div>
111 - <el-select v-model="addForm.areaid" 110 + <el-select v-model="addForm.areaid" v-if="this.dis === 'create'"
  111 + filterable
  112 + allow-create
  113 + default-first-option
  114 + remote size="small"
  115 + :remote-method="getArea"
  116 + :loading="loading" placeholder="请输入所属库区" style="width: 170px">
  117 + <el-option
  118 + v-for="item in areaids"
  119 + :key="item.areano"
  120 + :label="item.areano"
  121 + :value="item.areano">
  122 + </el-option>
  123 + </el-select>
  124 + <el-select v-model="addForm.areaid" v-else disabled
112 filterable 125 filterable
113 allow-create 126 allow-create
114 default-first-option 127 default-first-option
@@ -129,7 +142,10 @@ @@ -129,7 +142,10 @@
129 <el-row> 142 <el-row>
130 <el-col :span="9"> 143 <el-col :span="9">
131 <el-form-item label="" :label-width="formLabelWidth" prop="locationno"> 144 <el-form-item label="" :label-width="formLabelWidth" prop="locationno">
132 - <el-input v-model="addForm.locationno" autocomplete="off" size="small" style="width: 260px"> 145 + <el-input v-if="this.dis === 'create'" v-model="addForm.locationno" autocomplete="off" size="small" style="width: 260px">
  146 + <template slot="prepend">库位编号</template>
  147 + </el-input>
  148 + <el-input v-else disabled v-model="addForm.locationno" autocomplete="off" size="small" style="width: 260px">
133 <template slot="prepend">库位编号</template> 149 <template slot="prepend">库位编号</template>
134 </el-input> 150 </el-input>
135 </el-form-item> 151 </el-form-item>
@@ -237,6 +253,7 @@ @@ -237,6 +253,7 @@
237 update: '编辑', 253 update: '编辑',
238 create: '新增' 254 create: '新增'
239 }, 255 },
  256 + dis: undefined,
240 dialogApply: 'create', 257 dialogApply: 'create',
241 apply_dialog: { 258 apply_dialog: {
242 // 添加对话框 259 // 添加对话框
@@ -349,6 +366,7 @@ @@ -349,6 +366,7 @@
349 remark4:'', 366 remark4:'',
350 }; 367 };
351 this.dialogApply= 'create'; 368 this.dialogApply= 'create';
  369 + this.dis= 'create';
352 this.apply_dialog.addDialog = true; 370 this.apply_dialog.addDialog = true;
353 }, 371 },
354 // 添加功能 372 // 添加功能
@@ -377,6 +395,7 @@ @@ -377,6 +395,7 @@
377 applyEdit(row) { 395 applyEdit(row) {
378 this.apply_dialog.addDialog = true; 396 this.apply_dialog.addDialog = true;
379 this.dialogApply = 'update'; 397 this.dialogApply = 'update';
  398 + this.dis= 'update';
380 this.addForm=row; 399 this.addForm=row;
381 }, 400 },
382 // 编辑功能 401 // 编辑功能
@@ -83,12 +83,15 @@ @@ -83,12 +83,15 @@
83 </el-pagination> 83 </el-pagination>
84 </el-row> 84 </el-row>
85 <el-row> 85 <el-row>
86 - <el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog.addDialog" width="70%" > 86 + <el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog" width="70%" >
87 <el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px"> 87 <el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px">
88 <el-row> 88 <el-row>
89 <el-col :span="9"> 89 <el-col :span="9">
90 <el-form-item label="" :label-width="formLabelWidth" prop="stationno"> 90 <el-form-item label="" :label-width="formLabelWidth" prop="stationno">
91 - <el-input v-model="addForm.stationno" autocomplete="off" size="small" style="width: 260px"> 91 + <el-input v-if="this.dis === 'create'" v-model="addForm.stationno" autocomplete="off" size="small" style="width: 260px">
  92 + <template slot="prepend">场站编号</template>
  93 + </el-input>
  94 + <el-input v-else disabled v-model="addForm.stationno" autocomplete="off" size="small" style="width: 260px">
92 <template slot="prepend">场站编号</template> 95 <template slot="prepend">场站编号</template>
93 </el-input> 96 </el-input>
94 </el-form-item> 97 </el-form-item>
@@ -135,7 +138,7 @@ @@ -135,7 +138,7 @@
135 </el-row> 138 </el-row>
136 </el-form> 139 </el-form>
137 <div slot="footer" class="dialog-footer"> 140 <div slot="footer" class="dialog-footer">
138 - <el-button @click="apply_dialog.addDialog = false" size="small">取 消</el-button> 141 + <el-button @click="apply_dialog = false" size="small">取 消</el-button>
139 <el-button type="primary" @click="dialogApply==='create'?add():edit()" size="small">提 交</el-button> 142 <el-button type="primary" @click="dialogApply==='create'?add():edit()" size="small">提 交</el-button>
140 </div> 143 </div>
141 </el-dialog> 144 </el-dialog>
@@ -164,13 +167,9 @@ @@ -164,13 +167,9 @@
164 update: '编辑', 167 update: '编辑',
165 create: '新增' 168 create: '新增'
166 }, 169 },
  170 + dis: undefined,
167 dialogApply: 'create', 171 dialogApply: 'create',
168 - apply_dialog: {  
169 - // 添加对话框  
170 - addDialog: false,  
171 - // 编辑对话框  
172 - editDialog: false  
173 - }, 172 + apply_dialog: false,
174 addForm: { 173 addForm: {
175 stationno: '', 174 stationno: '',
176 stationname: '', 175 stationname: '',
@@ -265,7 +264,8 @@ @@ -265,7 +264,8 @@
265 remark3:'' 264 remark3:''
266 }; 265 };
267 this.dialogApply= 'create'; 266 this.dialogApply= 'create';
268 - this.apply_dialog.addDialog = true; 267 + this.dis= 'create';
  268 + this.apply_dialog = true;
269 }, 269 },
270 // 添加功能 270 // 添加功能
271 add() { 271 add() {
@@ -281,7 +281,7 @@ @@ -281,7 +281,7 @@
281 // 添加，成功 281 // 添加，成功
282 this.$message.success(res.msg); 282 this.$message.success(res.msg);
283 // 隐藏对话框 283 // 隐藏对话框
284 - this.apply_dialog.addDialog = false; 284 + this.apply_dialog = false;
285 // 刷新列表 285 // 刷新列表
286 this.getList(); 286 this.getList();
287 }).catch(error => { 287 }).catch(error => {
@@ -291,8 +291,9 @@ @@ -291,8 +291,9 @@
291 }, 291 },
292 // 打开编辑 292 // 打开编辑
293 applyEdit(row) { 293 applyEdit(row) {
294 - this.apply_dialog.addDialog = true; 294 + this.apply_dialog = true;
295 this.dialogApply = 'update'; 295 this.dialogApply = 'update';
  296 + this.dis= 'update';
296 this.addForm=row; 297 this.addForm=row;
297 }, 298 },
298 // 编辑功能 299 // 编辑功能
@@ -309,7 +310,7 @@ @@ -309,7 +310,7 @@
309 } 310 }
310 this.$message.success(res.msg) 311 this.$message.success(res.msg)
311 // 隐藏对话框 312 // 隐藏对话框
312 - this.apply_dialog.addDialog = false 313 + this.apply_dialog = false
313 // 刷新列表 314 // 刷新列表
314 this.getList() 315 this.getList()
315 }).catch(error => { 316 }).catch(error => {