wms成品页面修改6

master
mengjiao 6 months ago
parent 4a185e96db
commit 35b49e2e77

@ -1,14 +1,14 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="唯一序列" prop="storageId"> <!-- <el-form-item label="唯一序列" prop="storageId">-->
<el-input <!-- <el-input-->
v-model="queryParams.storageId" <!-- v-model="queryParams.storageId"-->
placeholder="请输入唯一序列" <!-- placeholder="请输入唯一序列"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="仓库编码" prop="whCode"> <el-form-item label="仓库编码" prop="whCode">
<el-input <el-input
v-model="queryParams.whCode" v-model="queryParams.whCode"
@ -41,6 +41,14 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </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="productCode"> <el-form-item label="产品编码" prop="productCode">
<el-input <el-input
v-model="queryParams.productCode" v-model="queryParams.productCode"
@ -81,22 +89,22 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="LPN" prop="lpn"> <!-- <el-form-item label="LPN" prop="lpn">-->
<el-input <!-- <el-input-->
v-model="queryParams.lpn" <!-- v-model="queryParams.lpn"-->
placeholder="请输入LPN" <!-- placeholder="请输入LPN"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="入库批次号" prop="productBatch"> <!-- <el-form-item label="入库批次号" prop="productBatch">-->
<el-input <!-- <el-input-->
v-model="queryParams.productBatch" <!-- v-model="queryParams.productBatch"-->
placeholder="请输入入库批次号" <!-- placeholder="请输入入库批次号"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="入库时间" prop="receiveDate"> <el-form-item label="入库时间" prop="receiveDate">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.receiveDate" v-model="queryParams.receiveDate"
@ -105,14 +113,14 @@
placeholder="请选择入库时间"> placeholder="请选择入库时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="生产时间" prop="productDate"> <!-- <el-form-item label="生产时间" prop="productDate">-->
<el-date-picker clearable <!-- <el-date-picker clearable-->
v-model="queryParams.productDate" <!-- v-model="queryParams.productDate"-->
type="date" <!-- type="date"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd"-->
placeholder="请选择生产时间"> <!-- placeholder="请选择生产时间">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="单位" prop="userDefined1"> <el-form-item label="单位" prop="userDefined1">
<el-input <el-input
v-model="queryParams.userDefined1" v-model="queryParams.userDefined1"
@ -121,78 +129,78 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="SAP库位" prop="userDefined2"> <!-- <el-form-item label="SAP库位" prop="userDefined2">-->
<el-input <!-- <el-input-->
v-model="queryParams.userDefined2" <!-- v-model="queryParams.userDefined2"-->
placeholder="请输入SAP库位" <!-- placeholder="请输入SAP库位"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备用3" prop="userDefined3"> <!-- <el-form-item label="备用3" prop="userDefined3">-->
<el-input <!-- <el-input-->
v-model="queryParams.userDefined3" <!-- v-model="queryParams.userDefined3"-->
placeholder="请输入备用3" <!-- placeholder="请输入备用3"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备用4" prop="userDefined4"> <!-- <el-form-item label="备用4" prop="userDefined4">-->
<el-input <!-- <el-input-->
v-model="queryParams.userDefined4" <!-- v-model="queryParams.userDefined4"-->
placeholder="请输入备用4" <!-- placeholder="请输入备用4"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备用5" prop="userDefined5"> <!-- <el-form-item label="备用5" prop="userDefined5">-->
<el-input <!-- <el-input-->
v-model="queryParams.userDefined5" <!-- v-model="queryParams.userDefined5"-->
placeholder="请输入备用5" <!-- placeholder="请输入备用5"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备用6" prop="userDefined6"> <!-- <el-form-item label="备用6" prop="userDefined6">-->
<el-input <!-- <el-input-->
v-model="queryParams.userDefined6" <!-- v-model="queryParams.userDefined6"-->
placeholder="请输入备用6" <!-- placeholder="请输入备用6"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备用7" prop="userDefined7"> <!-- <el-form-item label="备用7" prop="userDefined7">-->
<el-input <!-- <el-input-->
v-model="queryParams.userDefined7" <!-- v-model="queryParams.userDefined7"-->
placeholder="请输入备用7" <!-- placeholder="请输入备用7"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备用8" prop="userDefined8"> <!-- <el-form-item label="备用8" prop="userDefined8">-->
<el-input <!-- <el-input-->
v-model="queryParams.userDefined8" <!-- v-model="queryParams.userDefined8"-->
placeholder="请输入备用8" <!-- placeholder="请输入备用8"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备用9" prop="userDefined9"> <!-- <el-form-item label="备用9" prop="userDefined9">-->
<el-input <!-- <el-input-->
v-model="queryParams.userDefined9" <!-- v-model="queryParams.userDefined9"-->
placeholder="请输入备用9" <!-- placeholder="请输入备用9"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备用10" prop="userDefined10"> <!-- <el-form-item label="备用10" prop="userDefined10">-->
<el-input <!-- <el-input-->
v-model="queryParams.userDefined10" <!-- v-model="queryParams.userDefined10"-->
placeholder="请输入备用10" <!-- placeholder="请输入备用10"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="创建时间" prop="gmtCreate"> <el-form-item label="创建时间" prop="gmtCreate">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.gmtCreate" v-model="queryParams.gmtCreate"
@ -201,54 +209,47 @@
placeholder="请选择创建时间"> placeholder="请选择创建时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="最后更新人" prop="lastModifiedBy"> <!-- <el-form-item label="最后更新人" prop="lastModifiedBy">-->
<el-input <!-- <el-input-->
v-model="queryParams.lastModifiedBy" <!-- v-model="queryParams.lastModifiedBy"-->
placeholder="请输入最后更新人" <!-- placeholder="请输入最后更新人"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="最后更新时间" prop="gmtModified"> <!-- <el-form-item label="时间" prop="gmtModified">-->
<el-date-picker clearable <!-- <el-date-picker clearable-->
v-model="queryParams.gmtModified" <!-- v-model="queryParams.gmtModified"-->
type="date" <!-- type="date"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd"-->
placeholder="请选择最后更新时间"> <!-- placeholder="时间">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="有效标记" prop="activeFlag"> <!-- <el-form-item label="有效标记" prop="activeFlag">-->
<el-input <!-- <el-input-->
v-model="queryParams.activeFlag" <!-- v-model="queryParams.activeFlag"-->
placeholder="请输入有效标记" <!-- placeholder="请输入有效标记"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="工厂号" prop="factoryCode"> <!-- <el-form-item label="工厂号" prop="factoryCode">-->
<el-input <!-- <el-input-->
v-model="queryParams.factoryCode" <!-- v-model="queryParams.factoryCode"-->
placeholder="请输入工厂号" <!-- placeholder="请输入工厂号"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="SAP工厂号" prop="sapFactoryCode"> <!-- <el-form-item label="SAP工厂号" prop="sapFactoryCode">-->
<el-input <!-- <el-input-->
v-model="queryParams.sapFactoryCode" <!-- v-model="queryParams.sapFactoryCode"-->
placeholder="请输入SAP工厂号" <!-- placeholder="请输入SAP工厂号"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </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> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
@ -256,16 +257,16 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
plain <!-- plain-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
size="mini" <!-- size="mini"-->
@click="handleAdd" <!-- @click="handleAdd"-->
v-hasPermi="['wms:major:add']" <!-- v-hasPermi="['wms:major:add']"-->
>新增</el-button> <!-- >新增</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -303,7 +304,7 @@
<el-table v-loading="loading" :data="majorList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="majorList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="唯一序列" align="center" prop="storageId" /> <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="whCode" />
<el-table-column label="区域编号" align="center" prop="regionCode" /> <el-table-column label="区域编号" align="center" prop="regionCode" />
<el-table-column label="库区编码" align="center" prop="waCode" /> <el-table-column label="库区编码" align="center" prop="waCode" />
@ -315,27 +316,27 @@
<el-table-column label="冻结数量" align="center" prop="storageAmount" /> <el-table-column label="冻结数量" align="center" prop="storageAmount" />
<el-table-column label="占用数量" align="center" prop="occupyAmount" /> <el-table-column label="占用数量" align="center" prop="occupyAmount" />
<el-table-column label="LPN" align="center" prop="lpn" /> <el-table-column label="LPN" align="center" prop="lpn" />
<el-table-column label="入库批次号" align="center" prop="productBatch" /> <!-- <el-table-column label="入库批次号" align="center" prop="productBatch" />-->
<el-table-column label="入库时间" align="center" prop="receiveDate" width="180"> <el-table-column label="入库时间" align="center" prop="receiveDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.receiveDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.receiveDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="生产时间" align="center" prop="productDate" width="180"> <!-- <el-table-column label="生产时间" align="center" prop="productDate" width="180">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span> <!-- <span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="单位" align="center" prop="userDefined1" /> <el-table-column label="单位" align="center" prop="userDefined1" />
<el-table-column label="SAP库位" align="center" prop="userDefined2" /> <el-table-column label="SAP库位" align="center" prop="userDefined2" />
<el-table-column label="备用3" align="center" prop="userDefined3" /> <el-table-column label="备用3" align="center" prop="userDefined3" v-if="false" />
<el-table-column label="备用4" align="center" prop="userDefined4" /> <el-table-column label="备用4" align="center" prop="userDefined4" v-if="false" />
<el-table-column label="备用5" align="center" prop="userDefined5" /> <el-table-column label="备用5" align="center" prop="userDefined5" v-if="false" />
<el-table-column label="备用6" align="center" prop="userDefined6" /> <el-table-column label="备用6" align="center" prop="userDefined6"v-if="false" />
<el-table-column label="备用7" align="center" prop="userDefined7" /> <el-table-column label="备用7" align="center" prop="userDefined7" v-if="false" />
<el-table-column label="备用8" align="center" prop="userDefined8" /> <el-table-column label="备用8" align="center" prop="userDefined8" v-if="false" />
<el-table-column label="备用9" align="center" prop="userDefined9" /> <el-table-column label="备用9" align="center" prop="userDefined9" v-if="false" />
<el-table-column label="备用10" align="center" prop="userDefined10" /> <el-table-column label="备用10" align="center" prop="userDefined10" v-if="false" />
<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180"> <el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>
@ -351,24 +352,24 @@
<el-table-column label="工厂号" align="center" prop="factoryCode" /> <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" />
<el-table-column label="库位名称" align="center" prop="wlName" /> <el-table-column label="库位名称" align="center" prop="wlName" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
@click="handleUpdate(scope.row)" <!-- @click="handleUpdate(scope.row)"-->
v-hasPermi="['wms:major:edit']" <!-- v-hasPermi="['wms:major:edit']"-->
>修改</el-button> <!-- >修改</el-button>-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['wms:major:remove']" <!-- v-hasPermi="['wms:major:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
</el-table> </el-table>
<pagination <pagination
@ -415,9 +416,9 @@
<el-form-item label="LPN" prop="lpn"> <el-form-item label="LPN" prop="lpn">
<el-input v-model="form.lpn" placeholder="请输入LPN" /> <el-input v-model="form.lpn" placeholder="请输入LPN" />
</el-form-item> </el-form-item>
<el-form-item label="入库批次号" prop="productBatch"> <!-- <el-form-item label="入库批次号" prop="productBatch">-->
<el-input v-model="form.productBatch" placeholder="请输入入库批次号" /> <!-- <el-input v-model="form.productBatch" placeholder="请输入入库批次号" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="入库时间" prop="receiveDate"> <el-form-item label="入库时间" prop="receiveDate">
<el-date-picker clearable <el-date-picker clearable
v-model="form.receiveDate" v-model="form.receiveDate"
@ -426,14 +427,14 @@
placeholder="请选择入库时间"> placeholder="请选择入库时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="生产时间" prop="productDate"> <!-- <el-form-item label="生产时间" prop="productDate">-->
<el-date-picker clearable <!-- <el-date-picker clearable-->
v-model="form.productDate" <!-- v-model="form.productDate"-->
type="date" <!-- type="date"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd"-->
placeholder="请选择生产时间"> <!-- placeholder="请选择生产时间">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="单位" prop="userDefined1"> <el-form-item label="单位" prop="userDefined1">
<el-input v-model="form.userDefined1" placeholder="请输入单位" /> <el-input v-model="form.userDefined1" placeholder="请输入单位" />
</el-form-item> </el-form-item>

Loading…
Cancel
Save