朱兆平 / vue_cli · 提交

转到一个项目

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

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

内嵌 并排对比
正在显示 4 个修改的文件 包含 69 行增加 和 22 行删除
... ... @@ -80,8 +80,7 @@
</el-table-column>
<el-table-column
prop="totallocation"
label="占用库位"
width="120">
label="占用库位">
</el-table-column>
<!-- <el-table-column-->
<!-- prop="xstart"-->
... ... @@ -144,7 +143,23 @@
<el-form-item label="" :label-width="formLabelWidth" prop="houseid">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">所属仓库</div>
<el-select v-model="addForm.houseid"
<el-select v-model="addForm.houseid" v-if="this.dis === 'create'"
filterable
allow-create
default-first-option
remote size="small"
:remote-method="getHouseid"
:loading="loading" placeholder="请输入所属仓库" style="width: 210px">
<el-option
v-for="item in houseids"
:key="item.houseid"
:label="item.housename"
:value="item.houseid">
<span style="float: left">{{ item.housename }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.houseid }}</span>
</el-option>
</el-select>
<el-select v-model="addForm.houseid" v-else disabled
filterable
allow-create
default-first-option
... ... @@ -167,7 +182,10 @@
<el-row>
<el-col :span="7">
<el-form-item label="" :label-width="formLabelWidth" prop="areano">
<el-input v-model="addForm.areano" autocomplete="off" size="small" style="width: 300px">
<el-input v-if="this.dis === 'create'" v-model="addForm.areano" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">库区编号</template>
</el-input>
<el-input v-else disabled v-model="addForm.areano" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">库区编号</template>
</el-input>
</el-form-item>
... ... @@ -321,6 +339,7 @@
create: '新增'
},
dialogApply: 'create',
dis: undefined,
apply_dialog: {
// 添加对话框
addDialog: false,
... ... @@ -444,6 +463,7 @@
remark4:'',
};
this.dialogApply= 'create';
this.dis= 'create';
this.apply_dialog.addDialog = true;
},
// 添加功能
... ... @@ -472,6 +492,7 @@
applyEdit(row) {
this.apply_dialog.addDialog = true;
this.dialogApply = 'update';
this.dis= 'update';
this.addForm=row;
},
// 编辑功能
... ...
... ... @@ -132,7 +132,10 @@
<el-row>
<el-col :span="9">
<el-form-item label="" :label-width="formLabelWidth" prop="houseid">
<el-input v-model="addForm.houseid" autocomplete="off" size="small" style="width: 260px">
<el-input v-if="this.dis === 'create'" v-model="addForm.houseid" autocomplete="off" size="small" style="width: 260px">
<template slot="prepend">仓库编号</template>
</el-input>
<el-input v-else disabled v-model="addForm.houseid" autocomplete="off" size="small" style="width: 260px">
<template slot="prepend">仓库编号</template>
</el-input>
</el-form-item>
... ... @@ -291,6 +294,7 @@
update: '编辑',
create: '新增'
},
dis: undefined,
dialogApply: 'create',
apply_dialog: {
// 添加对话框
... ... @@ -408,6 +412,7 @@
remark3:''
};
this.dialogApply= 'create';
this.dis= 'create';
this.apply_dialog.addDialog = true;
},
// 添加功能
... ... @@ -436,6 +441,7 @@
applyEdit(row) {
this.apply_dialog.addDialog = true;
this.dialogApply = 'update';
this.dis= 'update';
this.addForm=row;
},
// 编辑功能
... ...
... ... @@ -74,8 +74,7 @@
</el-table-column>
<el-table-column
prop="autodist"
label="库位自动分配"
width="120">
label="库位自动分配">
</el-table-column>
<el-table-column
fixed="right"
... ... @@ -108,7 +107,21 @@
<el-form-item label="" :label-width="formLabelWidth" prop="areaid">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">所属库区</div>
<el-select v-model="addForm.areaid"
<el-select v-model="addForm.areaid" v-if="this.dis === 'create'"
filterable
allow-create
default-first-option
remote size="small"
:remote-method="getArea"
:loading="loading" placeholder="请输入所属库区" style="width: 170px">
<el-option
v-for="item in areaids"
:key="item.areano"
:label="item.areano"
:value="item.areano">
</el-option>
</el-select>
<el-select v-model="addForm.areaid" v-else disabled
filterable
allow-create
default-first-option
... ... @@ -129,7 +142,10 @@
<el-row>
<el-col :span="9">
<el-form-item label="" :label-width="formLabelWidth" prop="locationno">
<el-input v-model="addForm.locationno" autocomplete="off" size="small" style="width: 260px">
<el-input v-if="this.dis === 'create'" v-model="addForm.locationno" autocomplete="off" size="small" style="width: 260px">
<template slot="prepend">库位编号</template>
</el-input>
<el-input v-else disabled v-model="addForm.locationno" autocomplete="off" size="small" style="width: 260px">
<template slot="prepend">库位编号</template>
</el-input>
</el-form-item>
... ... @@ -237,6 +253,7 @@
update: '编辑',
create: '新增'
},
dis: undefined,
dialogApply: 'create',
apply_dialog: {
// 添加对话框
... ... @@ -349,6 +366,7 @@
remark4:'',
};
this.dialogApply= 'create';
this.dis= 'create';
this.apply_dialog.addDialog = true;
},
// 添加功能
... ... @@ -377,6 +395,7 @@
applyEdit(row) {
this.apply_dialog.addDialog = true;
this.dialogApply = 'update';
this.dis= 'update';
this.addForm=row;
},
// 编辑功能
... ...
... ... @@ -83,12 +83,15 @@
</el-pagination>
</el-row>
<el-row>
<el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog.addDialog" width="70%" >
<el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog" width="70%" >
<el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px">
<el-row>
<el-col :span="9">
<el-form-item label="" :label-width="formLabelWidth" prop="stationno">
<el-input v-model="addForm.stationno" autocomplete="off" size="small" style="width: 260px">
<el-input v-if="this.dis === 'create'" v-model="addForm.stationno" autocomplete="off" size="small" style="width: 260px">
<template slot="prepend">场站编号</template>
</el-input>
<el-input v-else disabled v-model="addForm.stationno" autocomplete="off" size="small" style="width: 260px">
<template slot="prepend">场站编号</template>
</el-input>
</el-form-item>
... ... @@ -135,7 +138,7 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="apply_dialog.addDialog = false" size="small">取 消</el-button>
<el-button @click="apply_dialog = false" size="small">取 消</el-button>
<el-button type="primary" @click="dialogApply==='create'?add():edit()" size="small">提 交</el-button>
</div>
</el-dialog>
... ... @@ -164,13 +167,9 @@
update: '编辑',
create: '新增'
},
dis: undefined,
dialogApply: 'create',
apply_dialog: {
// 添加对话框
addDialog: false,
// 编辑对话框
editDialog: false
},
apply_dialog: false,
addForm: {
stationno: '',
stationname: '',
... ... @@ -265,7 +264,8 @@
remark3:''
};
this.dialogApply= 'create';
this.apply_dialog.addDialog = true;
this.dis= 'create';
this.apply_dialog = true;
},
// 添加功能
add() {
... ... @@ -281,7 +281,7 @@
// 添加，成功
this.$message.success(res.msg);
// 隐藏对话框
this.apply_dialog.addDialog = false;
this.apply_dialog = false;
// 刷新列表
this.getList();
}).catch(error => {
... ... @@ -291,8 +291,9 @@
},
// 打开编辑
applyEdit(row) {
this.apply_dialog.addDialog = true;
this.apply_dialog = true;
this.dialogApply = 'update';
this.dis= 'update';
this.addForm=row;
},
// 编辑功能
... ... @@ -309,7 +310,7 @@
}
this.$message.success(res.msg)
// 隐藏对话框
this.apply_dialog.addDialog = false
this.apply_dialog = false
// 刷新列表
this.getList()
}).catch(error => {
... ...