朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 41e52859014b604c3a679a2a0f918a4431e5b55e 1 个父辈 4aecc583

仓库场站管理优化

内嵌 并排对比
正在显示 6 个修改的文件 包含 120 行增加 和 75 行删除
... ... @@ -30,27 +30,27 @@
fixed
prop="areano"
label="库区编号"
width="160">
width="140">
</el-table-column>
<el-table-column
prop="stationname"
label="库区名称"
width="160">
width="140">
</el-table-column>
<el-table-column
prop="houseid"
label="所属仓库"
width="240">
width="120">
</el-table-column>
<el-table-column
prop="length"
label="库区长度"
width="120">
width="80">
</el-table-column>
<el-table-column
prop="width"
label="库区宽度"
width="160">
width="80">
</el-table-column>
<el-table-column
prop="areanum"
... ... @@ -60,17 +60,17 @@
<el-table-column
prop="areavol"
label="库区体积"
width="160">
width="80">
</el-table-column>
<el-table-column
prop=" owner"
label="分配货主"
width="160">
width="120">
</el-table-column>
<el-table-column
prop="surpluslocation"
label="剩余库位"
width="240">
width="80">
</el-table-column>
<el-table-column
prop="totallocation"
... ... @@ -80,7 +80,7 @@
<el-table-column
prop="xstart"
label="库区X起始位"
width="160">
width="80">
</el-table-column>
<el-table-column
prop="xend"
... ... @@ -90,7 +90,7 @@
<el-table-column
prop="ystart"
label="库区Y起始位"
width="160">
width="80">
</el-table-column>
<el-table-column
prop="yend"
... ... @@ -100,7 +100,7 @@
<el-table-column
prop="zstart"
label="库区Z起始位"
width="160">
width="80">
</el-table-column>
<el-table-column
prop="zend"
... ... @@ -109,7 +109,8 @@
</el-table-column>
<el-table-column
fixed="right"
label="操作">
label="操作"
width="200">
<template slot-scope="scope">
<el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button>
<el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button>
... ...
... ... @@ -9,12 +9,12 @@
<template slot="prepend">仓库编号</template>
</el-input>
</el-col>
<el-col :span="7">
<el-input v-model="queryInfo.housename" prefix-icon="el-icon-search" size="small" style="width: 280px"
placeholder="场站编号" clearable>
<template slot="prepend">仓库名称</template>
</el-input>
</el-col>
<!-- <el-col :span="7">-->
<!-- <el-input v-model="queryInfo.housename" prefix-icon="el-icon-search" size="small" style="width: 280px"-->
<!-- placeholder="场站编号" clearable>-->
<!-- <template slot="prepend">仓库名称</template>-->
<!-- </el-input>-->
<!-- </el-col>-->
<el-col :span="6">
<el-button type="primary" icon="el-icon-search" size="small" @click="getList()">
查询
... ... @@ -36,22 +36,22 @@
fixed
prop="houseid"
label="仓库编号"
width="160">
width="100">
</el-table-column>
<el-table-column
prop="housename"
label="仓库名称"
width="160">
width="120">
</el-table-column>
<el-table-column
prop="houseadr"
label="仓库地址"
width="160">
width="120">
</el-table-column>
<el-table-column
prop="houseuser"
label="仓库负责人名称"
width="240">
width="120">
</el-table-column>
<el-table-column
prop="housetype"
... ... @@ -61,42 +61,41 @@
<el-table-column
prop="ismeta"
label="是否虚拟仓库"
width="160">
width="100">
<template slot-scope="scope">
<span v-if="scope.row.ismeta ==='0'">否</span>
<span v-if="scope.row.ismeta ==='1'">是</span>
</template>
</el-table-column>
<el-table-column
fixed
prop="length"
label="仓库长度"
width="160">
width="80">
</el-table-column>
<el-table-column
prop="width"
label="仓库宽度"
width="160">
width="80">
</el-table-column>
<el-table-column
prop="height"
label="仓库高度"
width="240">
width="80">
</el-table-column>
<el-table-column
prop="area"
label="仓库面积"
width="120">
width="80">
</el-table-column>
<el-table-column
prop="vol"
label="仓库体积"
width="160">
width="80">
</el-table-column>
<el-table-column
prop="stationid"
label="场站id"
width="80">
<template slot-scope="scope">
<span v-if="scope.row.stationid ==='0'">否</span>
<span v-if="scope.row.stationid ==='1'">是</span>
</template>
</el-table-column>
<el-table-column
prop="remark"
... ... @@ -105,7 +104,8 @@
</el-table-column>
<el-table-column
fixed="right"
label="操作">
label="操作"
width="200">
<template slot-scope="scope">
<el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button>
<el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button>
... ... @@ -254,7 +254,6 @@
return {
queryInfo: {
houseid:'',
housename:'',
// 当前页数
pageNum: 1,
// 每页大小
... ...
... ... @@ -28,7 +28,7 @@
>
<el-table-column
fixed
prop="waybill"
prop="goodno"
label="货物单号"
width="120">
</el-table-column>
... ... @@ -93,22 +93,22 @@
</el-table-column>
<el-table-column
prop="custel"
label="出入库客户联系电话"
label="客户联系电话"
width="140">
</el-table-column>
<el-table-column
prop="customer"
label="出入库客户联系人姓名"
label="联系人姓名"
width="80">
</el-table-column>
<el-table-column
prop="customername"
label="出入库客户名称"
label="客户名称"
width="80">
</el-table-column>
<el-table-column
prop="goodstype"
label="出入库货物类型"
label="货物类型"
width="80">
</el-table-column>
<el-table-column
... ... @@ -138,7 +138,7 @@
<el-table-column
fixed="right"
label="操作"
width="160">
width="200">
<template slot-scope="scope">
<el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button>
<el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button>
... ... @@ -163,8 +163,8 @@
<el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px">
<el-row>
<el-col :span="7">
<el-form-item label="" :label-width="formLabelWidth" prop="waybill">
<el-input v-model="addForm.waybill" autocomplete="off" size="small" style="width: 300px">
<el-form-item label="" :label-width="formLabelWidth" prop="goodno">
<el-input v-model="addForm.goodno" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">货物单号</template>
</el-input>
</el-form-item>
... ... @@ -342,7 +342,7 @@
data() {
return {
queryInfo: {
waybill:'',
goodno:'',
// 当前页数
pageNum: 1,
// 每页大小
... ... @@ -380,7 +380,7 @@
transcar: '',
transtype:'',
vol:'',
waybill:'',
goodno:'',
weight:'',
remark:'',
remark1:'',
... ...
... ... @@ -93,22 +93,22 @@
</el-table-column>
<el-table-column
prop="custel"
label="出入库客户联系电话"
label="客户联系电话"
width="140">
</el-table-column>
<el-table-column
prop="customer"
label="出入库客户联系人姓名"
width="80">
label="联系人姓名"
width="100">
</el-table-column>
<el-table-column
prop="customername"
label="出入库客户名称"
label="客户名称"
width="80">
</el-table-column>
<el-table-column
prop="goodstype"
label="出入库货物类型"
label="货物类型"
width="80">
</el-table-column>
<el-table-column
... ... @@ -118,7 +118,7 @@
</el-table-column>
<el-table-column
prop="ietype"
label="出入库类型"
label="类型"
width="60">
<template slot-scope="scope">
<span v-if="scope.row.ietype ==='I'">进</span>
... ... @@ -224,9 +224,17 @@
</el-col>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="transtype">
<el-input v-model="addForm.transtype" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">交易类型</template>
</el-input>
<!-- <el-input v-model="addForm.transtype" autocomplete="off" size="small" style="width: 300px">-->
<!-- <template slot="prepend">交易类型</template>-->
<!-- </el-input>-->
<el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off" size="small" style="width: 300px">
<el-option
v-for="item in options1"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
... ... @@ -240,9 +248,17 @@
</el-col>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="opttime">
<el-input v-model="addForm.opttime" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">出入库时间</template>
</el-input>
<!-- <el-input v-model="addForm.opttime" autocomplete="off" size="small" style="width: 300px">-->
<!-- <template slot="prepend">出入库时间</template>-->
<!-- </el-input>-->
<el-date-picker
v-model="addForm.opttime"
type="datetime" size="mini"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss"
style="width:300px"
placeholder="选择出入库时间">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -256,9 +272,9 @@
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="" :label-width="formLabelWidth" prop="goodstype">
<el-input v-model="addForm.goodstype" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">出入库货物类型</template>
<el-form-item label="" :label-width="formLabelWidth" prop="transcar">
<el-input v-model="addForm.transcar" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">运输车辆信息</template>
</el-input>
</el-form-item>
</el-col>
... ... @@ -279,10 +295,18 @@
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="" :label-width="formLabelWidth" prop="transcar">
<el-input v-model="addForm.transcar" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">运输车辆信息</template>
</el-input>
<el-form-item label="" :label-width="formLabelWidth" prop="goodstype">
<!-- <el-input v-model="addForm.goodstype" autocomplete="off" size="small" style="width: 300px">-->
<!-- <template slot="prepend">出入库货物类型</template>-->
<!-- </el-input>-->
<el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off" size="small" style="width: 300px">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -389,6 +413,26 @@
remark4:'',
remark5:'',
},
options: [{
value: '板箱',
label: '货物类型-板箱'
}, {
value: '运单',
label: '货物类型-运单'
}, {
value: '托盘',
label: '货物类型-托盘'
}],
options1: [{
value: '采购入库',
label: '交易类型-采购入库'
}, {
value: '生产入库',
label: '交易类型-生产入库'
}, {
value: '销售入库',
label: '交易类型-销售入库'
}],
formLabelWidth: '80px',
rules: {
userName: [
... ...
... ... @@ -30,47 +30,47 @@
fixed
prop="locationno"
label="库位编号"
width="160">
width="140">
</el-table-column>
<el-table-column
prop="locationname"
label="库位名称"
width="160">
width="140">
</el-table-column>
<el-table-column
prop="areaid"
label="所属库区"
width="160">
width="140">
</el-table-column>
<el-table-column
prop="length"
label="库位长度"
width="240">
width="80">
</el-table-column>
<el-table-column
prop="width"
label="库位宽度"
width="120">
width="80">
</el-table-column>
<el-table-column
prop="heigth"
label="库位高度"
width="160">
width="80">
</el-table-column>
<el-table-column
prop="area"
label="库位面积"
width="160">
width="80">
</el-table-column>
<el-table-column
prop="vol"
label="库位体积"
width="160">
width="80">
</el-table-column>
<el-table-column
prop="xyz"
label="库位xyz"
width="240">
width="80">
</el-table-column>
<el-table-column
prop="autodist"
... ... @@ -79,7 +79,8 @@
</el-table-column>
<el-table-column
fixed="right"
label="操作">
label="操作"
width="200">
<template slot-scope="scope">
<el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button>
<el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button>
... ...
... ... @@ -105,7 +105,7 @@
<el-col :span="9">
<el-form-item label="" :label-width="formLabelWidth" prop="stationadr">
<el-input v-model="addForm.stationadr" autocomplete="off" size="small" style="width: 260px">
<template slot="prepend">场站名称</template>
<template slot="prepend">场站地址</template>
</el-input>
</el-form-item>
</el-col>
... ...