朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 90048340df870ba9a3085aa0ea56ca30cc8effc1 2 个父辈 f2cb7629 91b0bc44

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 7 个修改的文件 包含 396 行增加 和 245 行删除
... ... @@ -80,8 +80,7 @@
</el-table-column>
<el-table-column
prop="totallocation"
label="占用库位"
width="120">
label="占用库位">
</el-table-column>
<!-- <el-table-column-->
<!-- prop="xstart"-->
... ... @@ -140,32 +139,53 @@
<el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog.addDialog" width="80%" >
<el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px">
<el-row>
<el-col :span="7">
<el-col :span="12">
<el-form-item label="" :label-width="formLabelWidth" prop="houseid">
<!-- <el-input v-model="addForm.houseid" autocomplete="off" size="small" style="width: 300px">-->
<!-- <template slot="prepend">所属仓库</template>-->
<!-- </el-input>-->
<el-select v-model="addForm.houseid"
filterable
allow-create
default-first-option
remote size="small"
:remote-method="getHouseid"
:loading="loading" placeholder="请输入所属仓库" style="width: 300px">
<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>
<div class="my-text-area">
<div class="el-input-group__prepend prepand">所属仓库</div>
<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
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>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
</el-row>
<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>
... ... @@ -177,7 +197,13 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="totallocation">
<el-input v-model="addForm.totallocation" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">占用库位</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
... ... @@ -227,13 +253,6 @@
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="" :label-width="formLabelWidth" prop="totallocation">
<el-input v-model="addForm.totallocation" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">占用库位</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="xstart">
<el-input v-model="addForm.xstart" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">库区X起始位</template>
... ... @@ -247,16 +266,16 @@
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="ystart">
<el-input v-model="addForm.ystart" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">库区Y起始位</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="" :label-width="formLabelWidth" prop="yend">
<el-input v-model="addForm.yend" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">库区Y结束位</template>
... ... @@ -270,9 +289,7 @@
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="zend">
<el-input v-model="addForm.zend" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">库区Z结束位</template>
... ... @@ -322,6 +339,7 @@
create: '新增'
},
dialogApply: 'create',
dis: undefined,
apply_dialog: {
// 添加对话框
addDialog: false,
... ... @@ -445,6 +463,7 @@
remark4:'',
};
this.dialogApply= 'create';
this.dis= 'create';
this.apply_dialog.addDialog = true;
},
// 添加功能
... ... @@ -473,6 +492,7 @@
applyEdit(row) {
this.apply_dialog.addDialog = true;
this.dialogApply = 'update';
this.dis= 'update';
this.addForm=row;
},
// 编辑功能
... ... @@ -547,5 +567,20 @@
padding: 15px 0 0 20px;
box-shadow: 0px 5px 5px #e5e8eb;
}
.my-text-area .prepand{
float: left;
width:89px;
height: 28px;
font-size: 12px;
line-height: 28px;
}
</style>
<style>
.my-text-area .el-textarea__inner{
min-height: 28px;
height: 28px;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
}
</style>
... ...
... ... @@ -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>
... ... @@ -171,23 +174,23 @@
</el-col>
<el-col :span="12">
<el-form-item label="" :label-width="formLabelWidth" prop="stationid">
<!-- <el-input v-model="addForm.stationid" autocomplete="off" size="small" style="width: 260px">-->
<!-- <template slot="prepend">场站&emsp;id</template>-->
<!-- </el-input>-->
<el-select v-model="addForm.stationid"
filterable
allow-create
default-first-option
remote autocomplete="off" size="small"
:remote-method="getStationno"
:loading="loading" placeholder="请输入场站id" style="width: 260px">
<el-option
v-for="item in stationids"
:key="item.stationno"
:label="item.stationno"
:value="item.stationno">
</el-option>
</el-select>
<div class="my-text-area">
<div class="el-input-group__prepend prepand">体&emsp;&emsp;积</div>
<el-select v-model="addForm.stationid"
filterable
allow-create
default-first-option
remote autocomplete="off" size="small"
:remote-method="getStationno"
:loading="loading" placeholder="请输入场站id" style="width: 170px">
<el-option
v-for="item in stationids"
:key="item.stationno"
:label="item.stationno"
:value="item.stationno">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
</el-row>
... ... @@ -233,10 +236,13 @@
</el-col>
<el-col :span="12">
<el-form-item label="" :label-width="formLabelWidth" prop="ismeta">
<el-select v-model="addForm.ismeta" placeholder="请选择是否虚拟仓库" size="mini" style="width: 260px">
<el-option label="否" value="0"></el-option>
<el-option label="是" value="1"></el-option>
</el-select>
<div class="my-text-area">
<div class="el-input-group__prepend prepand">虚拟仓库</div>
<el-select v-model="addForm.ismeta" placeholder="请选择是否虚拟仓库" size="small" style="width: 170px">
<el-option label="否" value="0"></el-option>
<el-option label="是" value="1"></el-option>
</el-select>
</div>
</el-form-item>
</el-col>
</el-row>
... ... @@ -288,6 +294,7 @@
update: '编辑',
create: '新增'
},
dis: undefined,
dialogApply: 'create',
apply_dialog: {
// 添加对话框
... ... @@ -405,6 +412,7 @@
remark3:''
};
this.dialogApply= 'create';
this.dis= 'create';
this.apply_dialog.addDialog = true;
},
// 添加功能
... ... @@ -433,6 +441,7 @@
applyEdit(row) {
this.apply_dialog.addDialog = true;
this.dialogApply = 'update';
this.dis= 'update';
this.addForm=row;
},
// 编辑功能
... ... @@ -504,4 +513,19 @@
padding: 15px 0 0 20px;
box-shadow: 0px 5px 5px #e5e8eb;
}
.my-text-area .prepand{
float: left;
width:89px;
height: 28px;
font-size: 12px;
line-height: 28px;
}
</style>
<style>
.my-text-area .el-textarea__inner{
min-height: 28px;
height: 28px;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
}
</style>
... ...
... ... @@ -7,7 +7,7 @@
<el-row>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="serialnumber">
<el-input v-model="addForm.serialnumber" autocomplete="off" disabled>
<el-input v-model="addForm.serialnumber" autocomplete="off" suffix-icon="el-icon-files" disabled>
<template slot="prepend">流&emsp;&emsp;水</template>
</el-input>
</el-form-item>
... ... @@ -106,7 +106,7 @@
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="transcar">
<el-input v-model="addForm.transcar" autocomplete="off">
<el-input v-model="addForm.transcar" autocomplete="off" suffix-icon="el-icon-files" >
<template slot="prepend">运输车辆</template>
</el-input>
</el-form-item>
... ... @@ -133,7 +133,7 @@
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="opter">
<el-input v-model="addForm.opter" autocomplete="off" disabled>
<el-input v-model="addForm.opter" autocomplete="off" disabled suffix-icon="el-icon-files">
<template slot="prepend">经&nbsp;办&nbsp;人</template>
</el-input>
</el-form-item>
... ... @@ -175,47 +175,49 @@
-->
<el-divider content-position="left"><i class="el-icon-mobile-phone"></i> 业务属性</el-divider>
<el-row>
<el-col :span="7">
<el-form-item label="" :label-width="formLabelWidth" prop="transtype">
<!-- <el-input v-model="addForm.transtype" autocomplete="off" style="width: 300px">-->
<!-- <template slot="prepend">交易类型</template>-->
<!-- </el-input>-->
<el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off" style="width: 300px">
<el-option
v-for="item in options1"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="transtype">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">交易类型</div>
<el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off">
<el-option
v-for="item in options1"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="" :label-width="formLabelWidth" prop="goodstype">
<!-- <el-input v-model="addForm.goodstype" autocomplete="off" style="width: 300px">-->
<!-- <template slot="prepend">出入库货物类型</template>-->
<!-- </el-input>-->
<el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off" style="width: 300px">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="goodstype">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">交易类型</div>
<el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="ietype">
<el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini" style="width: 300px">
<el-option label="出入库类型-进" value="I"></el-option>
<el-option label="出入库类型-出" value="E"></el-option>
</el-select>
<el-form-item label=" " :label-width="formLabelWidth" prop="ietype">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">交易类型</div>
<el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini">
<el-option label="出入库类型-进" value="I"></el-option>
<el-option label="出入库类型-出" value="E"></el-option>
</el-select>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-form-item label="" :label-width="formLabelWidth" prop="status">-->
<!-- <el-input v-model="addForm.status" autocomplete="off" style="width: 300px">-->
... ... @@ -254,12 +256,18 @@
</el-row>
<!-- 搜索区域-->
<el-row :gutter="10" class="toolbar">
<el-col :span="7">
<el-input v-model="queryInfo.waybill" prefix-icon="el-icon-search" style="width: 280px"
<el-col :span="5.5">
<el-input v-model="queryInfo.waybill" prefix-icon="el-icon-search"
placeholder="货物单号" clearable>
<template slot="prepend">货物单号</template>
</el-input>
</el-col>
<el-col :span="5.5" :offset="1">
<el-input v-model="queryInfo.serialnumber" prefix-icon="el-icon-search"
placeholder="流水" clearable>
<template slot="prepend">流&emsp;&emsp;水</template>
</el-input>
</el-col>
<el-col :span="8">
<el-button type="primary" icon="el-icon-search" @click="getList()">
查询
... ... @@ -273,36 +281,49 @@
<el-table
:data="tableData"
border
@selection-change="trnSelectionChange"
:cell-style="{textAlign:'center'}"
style="border-radius: 10px 10px 0px 0px;line-height: 25px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
>
<el-table-column
type="selection"
:selectable="checkSelectable"
fixed="left"
width="55"
/>
<el-table-column
fixed
prop="waybill"
label="货物单号"
width="120">
</el-table-column>
<el-table-column
prop="vol"
label="体积"
width="60">
</el-table-column>
<el-table-column
fixed
prop="serialnumber"
label="流水号"
width="120">
</el-table-column>
<el-table-column
prop="pcs"
label="件数"
width="60">
</el-table-column>
<el-table-column
prop="weight"
label="重量"
width="60">
</el-table-column>
<el-table-column
prop="pcs"
label="件数"
width="60">
</el-table-column>
<el-table-column
prop="billweight"
label="计费重量"
width="70">
</el-table-column>
<el-table-column
prop="vol"
label="体积"
width="60">
</el-table-column>
<el-table-column
prop="area"
label="库区"
... ... @@ -314,11 +335,6 @@
width="60">
</el-table-column>
<el-table-column
prop="serialnumber"
label="流水号"
width="120">
</el-table-column>
<el-table-column
prop="station"
label="出入库场站"
width="100">
... ... @@ -342,16 +358,16 @@
label="交易类型"
width="100">
</el-table-column>
<el-table-column
prop="custel"
label="客户联系电话"
width="140">
</el-table-column>
<el-table-column
prop="customer"
label="联系人姓名"
width="100">
</el-table-column>
<!-- <el-table-column-->
<!-- prop="custel"-->
<!-- label="客户联系电话"-->
<!-- width="140">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="customer"-->
<!-- label="联系人姓名"-->
<!-- width="100">-->
<!-- </el-table-column>-->
<el-table-column
prop="customername"
label="客户名称"
... ... @@ -432,6 +448,7 @@
return {
queryInfo: {
waybill:'',
serialnumber:'',
// 当前页数
pageNum: 1,
// 每页大小
... ...
... ... @@ -287,23 +287,24 @@
</el-col>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="ietype">
<el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini" style="width: 300px">
<el-option label="出入库类型-进" value="I"></el-option>
<el-option label="出入库类型-出" value="E"></el-option>
</el-select>
<div class="my-text-area">
<div class="el-input-group__prepend prepand">出入库类型</div>
<el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini" style="width: 210px">
<el-option label="出入库类型-进" value="I"></el-option>
<el-option label="出入库类型-出" value="E"></el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-form-item label="" :label-width="formLabelWidth" prop="status">-->
<!-- <el-input v-model="addForm.status" autocomplete="off" size="small" style="width: 300px">-->
<!-- <template slot="prepend">状&emsp;&emsp;态</template>-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<el-form-item label="" :label-width="formLabelWidth" prop="status">
<el-select v-model="addForm.status" placeholder="请选择状态" size="mini" style="width: 300px">
<el-option label="状态-失败" value="0"></el-option>
<el-option label="状态-成功" value="1"></el-option>
</el-select>
<div class="my-text-area">
<div class="el-input-group__prepend prepand">请选择状态</div>
<el-select v-model="addForm.status" placeholder="请选择状态" size="mini" style="width: 210px">
<el-option label="状态-失败" value="0"></el-option>
<el-option label="状态-成功" value="1"></el-option>
</el-select>
</div>
</el-form-item>
</el-col>
</el-row>
... ... @@ -563,6 +564,21 @@
padding: 15px 0 0 20px;
box-shadow: 0px 5px 5px #e5e8eb;
}
.my-text-area .prepand{
float: left;
width:89px;
height: 28px;
font-size: 12px;
line-height: 28px;
}
</style>
<style>
.my-text-area .el-textarea__inner{
min-height: 28px;
height: 28px;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
}
</style>
... ...
... ... @@ -224,17 +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-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>
<div class="my-text-area">
<div class="el-input-group__prepend prepand">交易类型</div>
<el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off" size="small" style="width: 210px">
<el-option
v-for="item in options1"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
</el-row>
... ... @@ -248,17 +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-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>
<div class="my-text-area">
<div class="el-input-group__prepend prepand">交易类型</div>
<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:210px"
placeholder="选择出入库时间">
</el-date-picker>
</div>
</el-form-item>
</el-col>
... ... @@ -272,6 +272,45 @@
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="" :label-width="formLabelWidth" prop="goodstype">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">交易类型</div>
<el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off" size="small" style="width: 170px">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="ietype">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">出入库类型</div>
<el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini" style="width: 210px">
<el-option label="出入库类型-进" value="I"></el-option>
<el-option label="出入库类型-出" value="E"></el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="status">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">状&emsp;&emsp;态</div>
<el-select v-model="addForm.status" placeholder="请选择状态" size="mini" style="width: 210px">
<el-option label="状态-失败" value="0"></el-option>
<el-option label="状态-成功" value="1"></el-option>
</el-select>
</div>
</el-form-item>
</el-col>
</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>
... ... @@ -295,44 +334,6 @@
</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-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">
<el-form-item label="" :label-width="formLabelWidth" prop="ietype">
<el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini" style="width: 300px">
<el-option label="出入库类型-进" value="I"></el-option>
<el-option label="出入库类型-出" value="E"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-form-item label="" :label-width="formLabelWidth" prop="status">-->
<!-- <el-input v-model="addForm.status" autocomplete="off" size="small" style="width: 300px">-->
<!-- <template slot="prepend">状&emsp;&emsp;态</template>-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<el-form-item label="" :label-width="formLabelWidth" prop="status">
<el-select v-model="addForm.status" placeholder="请选择状态" size="mini" style="width: 300px">
<el-option label="状态-失败" value="0"></el-option>
<el-option label="状态-成功" value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="" :label-width="formLabelWidth" prop="custel">
<el-input v-model="addForm.custel" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">出入库客户联系电话</template>
... ... @@ -351,6 +352,7 @@
<div slot="footer" class="dialog-footer">
<el-button @click="apply_dialog.addDialog = false" size="small">取 消</el-button>
<el-button type="primary" @click="dialogApply==='create'?add():edit()" size="small">提 交</el-button>
<el-button type="primary" @click="zancun()" size="small">暂存</el-button>
</div>
</el-dialog>
</el-row>
... ... @@ -433,6 +435,7 @@
value: '销售入库',
label: '交易类型-销售入库'
}],
zancundata:[],
formLabelWidth: '80px',
rules: {
userName: [
... ... @@ -456,6 +459,10 @@
}
},
methods: {
zancun(){
this.zancundata.push(this.addForm);
console.log(this.zancundata)
},
handleSizeChange(val) {
this.queryInfo.pageSize = val
this.getList()
... ... @@ -607,5 +614,20 @@
padding: 15px 0 0 20px;
box-shadow: 0px 5px 5px #e5e8eb;
}
.my-text-area .prepand{
float: left;
width:89px;
height: 28px;
font-size: 12px;
line-height: 28px;
}
</style>
<style>
.my-text-area .el-textarea__inner{
min-height: 28px;
height: 28px;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
}
</style>
... ...
... ... @@ -74,8 +74,7 @@
</el-table-column>
<el-table-column
prop="autodist"
label="库位自动分配"
width="120">
label="库位自动分配">
</el-table-column>
<el-table-column
fixed="right"
... ... @@ -101,12 +100,52 @@
</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.addDialog" width="70%">
<el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px">
<el-row>
<el-col :span="12">
<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" 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
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>
</div>
</el-form-item>
</el-col>
</el-row>
<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>
... ... @@ -121,58 +160,37 @@
</el-row>
<el-row>
<el-col :span="9">
<el-form-item label="" :label-width="formLabelWidth" prop="areaid">
<!-- <el-input v-model="addForm.areaid" autocomplete="off" size="small" style="width: 260px">-->
<!-- <template slot="prepend">所属库区</template>-->
<!-- </el-input>-->
<el-select v-model="addForm.areaid"
filterable
allow-create
default-first-option
remote size="small"
:remote-method="getArea"
:loading="loading" placeholder="请输入所属库区" style="width: 260px">
<el-option
v-for="item in areaids"
:key="item.areano"
:label="item.areano"
:value="item.areano">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="" :label-width="formLabelWidth" prop="length">
<el-input v-model="addForm.length" autocomplete="off" size="small" style="width: 260px">
<template slot="prepend">库位长度</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
<el-col :span="12">
<el-form-item label="" :label-width="formLabelWidth" prop="width">
<el-input v-model="addForm.width" autocomplete="off" size="small" style="width: 260px">
<template slot="prepend">库位宽度</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
</el-row>
<el-row>
<el-col :span="9">
<el-form-item label="" :label-width="formLabelWidth" prop="heigth">
<el-input v-model="addForm.heigth" autocomplete="off" size="small" style="width: 260px">
<template slot="prepend">库位高度</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
<el-col :span="12">
<el-form-item label="" :label-width="formLabelWidth" prop="area">
<el-input v-model="addForm.area" autocomplete="off" size="small" style="width: 260px">
<template slot="prepend">库位面积</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
<el-form-item label="" :label-width="formLabelWidth" prop="vol">
<el-input v-model="addForm.vol" autocomplete="off" size="small" style="width: 260px">
... ... @@ -180,16 +198,16 @@
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
<el-col :span="12">
<el-form-item label="" :label-width="formLabelWidth" prop="xyz">
<el-input v-model="addForm.xyz" autocomplete="off" size="small" style="width: 260px">
<template slot="prepend">库位xyz</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
</el-row>
<el-row>
<el-col :span="9">
<el-form-item label="" :label-width="formLabelWidth" prop="autodist">
<el-input v-model="addForm.autodist" autocomplete="off" size="small" style="width: 260px">
<template slot="prepend">库位自动分配</template>
... ... @@ -235,6 +253,7 @@
update: '编辑',
create: '新增'
},
dis: undefined,
dialogApply: 'create',
apply_dialog: {
// 添加对话框
... ... @@ -347,6 +366,7 @@
remark4:'',
};
this.dialogApply= 'create';
this.dis= 'create';
this.apply_dialog.addDialog = true;
},
// 添加功能
... ... @@ -375,6 +395,7 @@
applyEdit(row) {
this.apply_dialog.addDialog = true;
this.dialogApply = 'update';
this.dis= 'update';
this.addForm=row;
},
// 编辑功能
... ... @@ -440,5 +461,20 @@
padding: 15px 0 0 20px;
box-shadow: 0px 5px 5px #e5e8eb;
}
.my-text-area .prepand{
float: left;
width:89px;
height: 28px;
font-size: 12px;
line-height: 28px;
}
</style>
<style>
.my-text-area .el-textarea__inner{
min-height: 28px;
height: 28px;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
}
</style>
... ...
... ... @@ -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 => {
... ...