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

wms成品页面修改3

Browse Source
master
mengjiao 4 months ago
parent 81227c2a69
commit 55e63664bc
3 changed files with 53 additions and 114 deletions
Show Stats Download Patch File Download Diff File

32
src/views/wms/odsRawOrderIn/index.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" > <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
<el-form-item label="到货单号" prop="dnNo"> <el-form-item label="到货单号" prop="dnNo">
<el-input <el-input
v-model="queryParams.dnNo" v-model="queryParams.dnNo"
@ -18,7 +18,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料编码" prop="materialCode"> <el-form-item label="物料编码" prop="materialCode">
<el-input <el-input
v-model="queryParams.materialCode" v-model="queryParams.materialCode"
@ -35,7 +35,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="供应商编码" prop="supplyCode" width="180"> <el-form-item label="供应商编码" prop="supplyCode" width="180">
<el-input <el-input
v-model="queryParams.supplyCode" v-model="queryParams.supplyCode"
@ -44,7 +44,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </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>
@ -110,7 +110,7 @@
<el-table-column label="收货数量" align="center" prop="receiptAmount" /> <el-table-column label="收货数量" align="center" prop="receiptAmount" />
<el-table-column label="备品数量" align="center" prop="shelvesAmount" /> <el-table-column label="备品数量" align="center" prop="shelvesAmount" />
<el-table-column label="单据状态" align="center" prop="orderStatus" /> <el-table-column label="单据状态" align="center" prop="orderStatus" />
<el-table-column label="质检状态" align="center" prop="qualityStatus" /> <el-table-column label="质检状态" align="center" prop="qualityStatus" />
<el-table-column label="收货人" align="center" prop="receiptOperator" /> <el-table-column label="收货人" align="center" prop="receiptOperator" />
<el-table-column label="收货时间" align="center" prop="receiptTime" width="180"> <el-table-column label="收货时间" align="center" prop="receiptTime" width="180">
@ -118,27 +118,9 @@
<span>{{ parseTime(scope.row.receiptTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.receiptTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['wms:odsRawOrderIn:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['wms:odsRawOrderIn:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"

86
src/views/wms/order/index.vue
Unescape Escape View File

@ -55,16 +55,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:order:add']" <!-- v-hasPermi="['wms:order: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"
@ -105,9 +105,14 @@
<el-table-column label="序号" type="index" :index='indexMethod'> </el-table-column> <el-table-column label="序号" type="index" :index='indexMethod'> </el-table-column>
<el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" /> <el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" />
<el-table-column label="id" align="center" prop="id" v-if="false" /> <el-table-column label="id" align="center" prop="id" v-if="false" />
<el-table-column label="采购单号" align="center" prop="procureCode" /> <el-table-column label="采购单号" align="center" prop="procureCode" min-width="200"/>
<el-table-column label="物料编码" align="center" prop="materialCode" />
<el-table-column label="物料描述" align="center" prop="materialDesc" /> <el-table-column label="物料编码" align="center" prop="materialCode" min-width="200">
<template slot-scope="scope">
<span>{{ scope.row.materialCode.replace(/^0{7}/, '') }}</span>
</template>
</el-table-column>
<el-table-column label="物料描述" align="center" prop="materialDesc" :min-width="300"/>
<el-table-column label="计划日期" align="center" prop="planDate" width="180"> <el-table-column label="计划日期" align="center" prop="planDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>
@ -116,8 +121,13 @@
<el-table-column label="计划数量" align="center" prop="planNumber" /> <el-table-column label="计划数量" align="center" prop="planNumber" />
<el-table-column label="单位" align="center" prop="unit" /> <el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="已入库数量" align="center" prop="realityNumber" v-if="false" /> <el-table-column label="已入库数量" align="center" prop="realityNumber" v-if="false" />
<el-table-column label="订单状态" align="center" prop="orderStatus" /> <el-table-column label="订单状态" align="center" prop="orderStatus">
<template slot-scope="scope">
<span v-if="scope.row.orderStatus === '0'">未进行</span>
<span v-else-if="scope.row.orderStatus === '1'">进行中</span>
<span v-else-if="scope.row.orderStatus === '2'">完成</span>
</template>
</el-table-column>
<el-table-column label="供应商编码" align="center" prop="supplierCode" /> <el-table-column label="供应商编码" align="center" prop="supplierCode" />
<el-table-column label="供应商名称" align="center" prop="supplierName" /> <el-table-column label="供应商名称" align="center" prop="supplierName" />
<el-table-column label="备注" align="center" prop="Remark" /> <el-table-column label="备注" align="center" prop="Remark" />
@ -128,24 +138,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['wms:order:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['wms:order:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
@ -182,9 +175,7 @@
<el-form-item label="计划数量" prop="planNumber"> <el-form-item label="计划数量" prop="planNumber">
<el-input v-model="form.planNumber" placeholder="请输入计划数量" /> <el-input v-model="form.planNumber" placeholder="请输入计划数量" />
</el-form-item> </el-form-item>
<el-form-item label="单位" prop="Unit">
<el-input v-model="form.Unit" placeholder="请输入单位" />
</el-form-item>
<el-form-item label="已入库数量" prop="realityNumber"> <el-form-item label="已入库数量" prop="realityNumber">
<el-input v-model="form.realityNumber" placeholder="请输入已入库数量" /> <el-input v-model="form.realityNumber" placeholder="请输入已入库数量" />
</el-form-item> </el-form-item>
@ -230,28 +221,7 @@
<el-form-item label="备注" prop="Remark"> <el-form-item label="备注" prop="Remark">
<el-input v-model="form.Remark" placeholder="请输入备注" /> <el-input v-model="form.Remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createDate">
<el-date-picker clearable
v-model="form.createDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="最后更新人" prop="lastUpdateBy">
<el-input v-model="form.lastUpdateBy" placeholder="请输入最后更新人" />
</el-form-item>
<el-form-item label="最后更新时间" prop="lastUpdateDate">
<el-date-picker clearable
v-model="form.lastUpdateDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择最后更新时间">
</el-date-picker>
</el-form-item>
<el-form-item label="可用标识" prop="Active">
<el-input v-model="form.Active" placeholder="请输入可用标识" />
</el-form-item>
<el-form-item label="企业主键" prop="enterpriseId"> <el-form-item label="企业主键" prop="enterpriseId">
<el-input v-model="form.enterpriseId" placeholder="请输入企业主键" /> <el-input v-model="form.enterpriseId" placeholder="请输入企业主键" />
</el-form-item> </el-form-item>

49
src/views/wms/wmsRawOrderInSn/index.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" > <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
<el-form-item label="库位编码" prop="wlCode"> <el-form-item label="库位编码" prop="wlCode">
<el-input <el-input
v-model="queryParams.wlCode" v-model="queryParams.wlCode"
@ -26,7 +26,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料号" prop="materialCode"> <el-form-item label="物料号" prop="materialCode">
<el-input <el-input
v-model="queryParams.materialCode" v-model="queryParams.materialCode"
@ -51,7 +51,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </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>
@ -106,44 +106,31 @@
<el-table v-loading="loading" :data="wmsRawOrderInSnList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="wmsRawOrderInSnList" @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="whCode" /> <el-table-column label="到货单号" align="center" prop="userDefined5" :min-width="200"/>
<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="poNo" />
<el-table-column label="采购行号" align="center" prop="poLine" /> <el-table-column label="采购行号" align="center" prop="poLine" />
<el-table-column label="物料号" align="center" prop="materialCode" /> <el-table-column label="物料编码" align="center" prop="materialCode" min-width="200">
<el-table-column label="物料描述" align="center" prop="materialDesc" /> <template slot-scope="scope">
<span>{{ scope.row.materialCode.replace(/^0{7}/, '') }}</span>
</template>
</el-table-column>
<el-table-column label="物料描述" align="center" prop="materialDesc":min-width="300"/>
<el-table-column label="托盘号" align="center" prop="sn" /> <el-table-column label="托盘号" align="center" prop="sn" />
<el-table-column label="数量" align="center" prop="amount" /> <el-table-column label="数量" align="center" prop="amount" />
<el-table-column label="仓库编码" align="center" prop="whCode" />
<el-table-column label="库位编码" align="center" prop="wlCode" />
<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>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['wms:wmsRawOrderInSn:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['wms:wmsRawOrderInSn:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"

Write Preview
Loading…
Cancel
Save