Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
chj 1 year ago
parent d07544c874 c17b693651
commit 6c85307a16
4 changed files with 15 additions and 239 deletions
Show Stats Download Patch File Download Diff File

87
src/views/wms/emnews/index.vue
Unescape Escape View File

@ -19,14 +19,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库位名称" prop="wlName">
<el-input
v-model="queryParams.wlName"
placeholder="请输入库位名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库位编码" prop="wlCode">
<el-input
v-model="queryParams.wlCode"
@ -75,31 +68,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="LPN" prop="lpn">
<el-input
v-model="queryParams.lpn"
placeholder="请输入LPN"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库时间" prop="receiveDate">
<el-date-picker clearable
v-model="queryParams.receiveDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择入库时间">
</el-date-picker>
</el-form-item>
<el-form-item label="生产时间" prop="productDate">
<el-date-picker clearable
v-model="queryParams.productDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择生产时间">
</el-date-picker>
</el-form-item>
<el-form-item label="单位" prop="userDefined1">
<el-input
v-model="queryParams.userDefined1"
@ -108,39 +77,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="SAP库位" prop="userDefined2">
<el-input
v-model="queryParams.userDefined2"
placeholder="请输入SAP库位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="gmtCreate">
<el-date-picker clearable
v-model="queryParams.gmtCreate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="修改人" prop="lastModifiedBy">
<el-input
v-model="queryParams.lastModifiedBy"
placeholder="请输入修改人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="修改时间" prop="gmtModified">
<el-date-picker clearable
v-model="queryParams.gmtModified"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择修改时间">
</el-date-picker>
</el-form-item>
<el-form-item label="工厂号" prop="factoryCode">
<el-input
@ -182,25 +118,16 @@
<el-table-column label="区域编号" align="center" prop="regionCode" v-if="false" />
<el-table-column label="库区" align="center" prop="waCode" />
<el-table-column label="库存类型：BP－白胚" align="center" prop="storageType" v-if="false" />
<el-table-column label="库位名称" align="center" prop="wlName" />
<el-table-column label="库位编码" align="center" prop="wlCode" />
<el-table-column label="物料号" align="center" prop="materialCode" />
<el-table-column label="物料描述" align="center" prop="materialDesc" />
<el-table-column label="总数量" align="center" prop="amount" />
<el-table-column label="冻结数量" align="center" prop="storageAmount" />
<el-table-column label="占用数量" align="center" prop="occupyAmount" />
<el-table-column label="LPN" align="center" prop="lpn" v-if="false" />
<el-table-column label="入库批次号" align="center" prop="productBatch" v-if="false" />
<el-table-column label="入库时间" align="center" prop="receiveDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.receiveDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="生产时间" align="center" prop="productDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="userDefined1" />
<el-table-column label="SAP库位" align="center" prop="userDefined2" />
<el-table-column label="备用3" align="center" prop="userDefined3" v-if="false" />
@ -217,7 +144,7 @@
<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="最后更新人" align="center" prop="lastModifiedBy" />
<el-table-column label="最后更新人" align="center" prop="lastModifiedBy" width="100"/>
<el-table-column label="最后更新时间" align="center" prop="gmtModified" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.gmtModified, '{y}-{m}-{d}') }}</span>
@ -225,7 +152,7 @@
</el-table-column>
<el-table-column label="有效标记" align="center" prop="activeFlag" v-if="false" />
<el-table-column label="工厂号" align="center" prop="factoryCode" />
<el-table-column label="SAP工厂号" align="center" prop="sapFactoryCode" />
<el-table-column label="SAP工厂号" align="center" prop="sapFactoryCode" width="100"/>
</el-table>

47
src/views/wms/emsn/index.vue
Unescape Escape View File

@ -27,38 +27,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库位名称" prop="wlName">
<el-input
v-model="queryParams.wlName"
placeholder="请输入库位名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库单号" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
placeholder="请输入入库单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="采购订单号" prop="poNo">
<el-input
v-model="queryParams.poNo"
placeholder="请输入采购订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="行项目" prop="poLine">
<el-input
v-model="queryParams.poLine"
placeholder="请输入行项目"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料号" prop="materialCode">
<el-input
v-model="queryParams.materialCode"
@ -83,14 +52,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="条码" prop="barCode">
<el-input
v-model="queryParams.barCode"
placeholder="请输入条码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="数量" prop="amount">
<el-input
v-model="queryParams.amount"
@ -164,14 +126,9 @@
<el-table-column label="仓库" align="center" prop="whCode" />
<el-table-column label="库区" align="center" prop="waCode" />
<el-table-column label="库位编码" align="center" prop="wlCode" />
<el-table-column label="库位名称" align="center" prop="wlName" />
<el-table-column label="入库单号" align="center" prop="orderNo" />
<el-table-column label="采购订单号" align="center" prop="poNo" />
<el-table-column label="行项目" align="center" prop="poLine" />
<el-table-column label="物料号" align="center" prop="materialCode" />
<el-table-column label="物料描述" align="center" prop="materialDesc" />
<el-table-column label="托盘号" align="center" prop="sn" />
<el-table-column label="条码" align="center" prop="barCode" />
<el-table-column label="数量" align="center" prop="amount" />
<el-table-column label="备用1" align="center" prop="userDefined1" v-if="false" />
<el-table-column label="备用2" align="center" prop="userDefined2" v-if="false" />

79
src/views/wms/matenews/index.vue
Unescape Escape View File

@ -10,14 +10,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="区域" prop="regionCode">
<el-input
v-model="queryParams.regionCode"
placeholder="请输入区域"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库区" prop="waCode">
<el-input
v-model="queryParams.waCode"
@ -35,14 +28,7 @@
/>
</el-form-item>
<el-form-item label="库位名称" prop="wlName">
<el-input
v-model="queryParams.wlName"
placeholder="请输入库位名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料号" prop="materialCode">
<el-input
v-model="queryParams.materialCode"
@ -83,24 +69,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库时间" prop="receiveDate">
<el-date-picker clearable
v-model="queryParams.receiveDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择入库时间">
</el-date-picker>
</el-form-item>
<el-form-item label="生产时间" prop="productDate">
<el-date-picker clearable
v-model="queryParams.productDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择生产时间">
</el-date-picker>
</el-form-item>
<el-form-item label="单位" prop="userDefined1">
<el-input
v-model="queryParams.userDefined1"
@ -110,33 +78,6 @@
/>
</el-form-item>
<el-form-item label="创建时间" prop="gmtCreate">
<el-date-picker clearable
v-model="queryParams.gmtCreate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="更新人" prop="lastModifiedBy">
<el-input
v-model="queryParams.lastModifiedBy"
placeholder="请输入更新人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="更新时间" prop="gmtModified">
<el-date-picker clearable
v-model="queryParams.gmtModified"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择更新时间">
</el-date-picker>
</el-form-item>
<el-form-item label="工厂号" prop="factoryCode">
<el-input
v-model="queryParams.factoryCode"
@ -172,28 +113,14 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="唯一序列" align="center" prop="storageId" v-if="false" />
<el-table-column label="仓库" align="center" prop="whCode" />
<el-table-column label="区域" align="center" prop="regionCode" />
<el-table-column label="库区" align="center" prop="waCode" />
<el-table-column label="库存类型" align="center" prop="storageType" />
<el-table-column label="库位编码" align="center" prop="wlCode" />
<el-table-column label="库位名称" align="center" prop="wlName" />
<el-table-column label="物料号" align="center" prop="materialCode" />
<el-table-column label="物料描述" align="center" prop="materialDesc" />
<el-table-column label="总数量" align="center" prop="amount" />
<el-table-column label="冻结数量" align="center" prop="storageAmount" />
<el-table-column label="占用数量" align="center" prop="occupyAmount" />
<el-table-column label="LPN" align="center" prop="lpn" v-if="false" />
<el-table-column label="入库批次号" align="center" prop="productBatch" v-if="false" />
<el-table-column label="入库时间" align="center" prop="receiveDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.receiveDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="生产时间" align="center" prop="productDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="userDefined1" />
<el-table-column label="SAP库位" align="center" prop="userDefined2" v-if="false" />
<el-table-column label="备用3" align="center" prop="userDefined3" v-if="false" />

41
src/views/wms/matetowsn/index.vue
Unescape Escape View File

@ -25,30 +25,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库单号" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
placeholder="请输入入库单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="采购订单号" prop="poNo">
<el-input
v-model="queryParams.poNo"
placeholder="请输入采购订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="行项目" prop="poLine">
<el-input
v-model="queryParams.poLine"
placeholder="请输入行项目"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料号" prop="materialCode">
<el-input
v-model="queryParams.materialCode"
@ -73,14 +50,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="条码" prop="barCode">
<el-input
v-model="queryParams.barCode"
placeholder="请输入条码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="数量" prop="amount">
<el-input
v-model="queryParams.amount"
@ -156,13 +126,9 @@
<el-table-column label="仓库" align="center" prop="whCode" />
<el-table-column label="库区" align="center" prop="waCode" />
<el-table-column label="库位编码" align="center" prop="wlCode" />
<el-table-column label="入库单号" align="center" prop="orderNo" />
<el-table-column label="采购订单号" align="center" prop="poNo" />
<el-table-column label="行项目" align="center" prop="poLine" />
<el-table-column label="物料号" align="center" prop="materialCode" />
<el-table-column label="物料描述" align="center" prop="materialDesc" />
<el-table-column label="托盘号" align="center" prop="sn" />
<el-table-column label="条码" align="center" prop="barCode" />
<el-table-column label="数量" align="center" prop="amount" />
<el-table-column label="备用1" align="center" prop="userDefined1" v-if="false" />
<el-table-column label="备用2" align="center" prop="userDefined2" v-if="false" />
@ -187,8 +153,7 @@
</el-table-column>
<el-table-column label="有效标记" align="center" prop="activeFlag"v-if="false" />
<el-table-column label="工厂号" align="center" prop="factoryCode" />
<el-table-column label="${comment}" align="center" prop="sapFactoryCode" v-if="false" />
</el-table>
<pagination

Write Preview
Loading…
Cancel
Save