仓库看板样式优化，毛坯，抛光，一次合格仓库添加零件数统计，工单排程中编码号变为字符串
This commit is contained in:
@@ -1,70 +1,80 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
/**
|
||||
* 毛坯库存表分页查询
|
||||
* @param {查询条件} data
|
||||
*/
|
||||
* 毛坯库存表分页查询
|
||||
* @param {查询条件} data
|
||||
*/
|
||||
export function listWmBlankInventory(query) {
|
||||
return request({
|
||||
url: '/mes/wm/WmBlankInventory/list',
|
||||
method: 'get',
|
||||
params: query,
|
||||
})
|
||||
return request({
|
||||
url: '/mes/wm/WmBlankInventory/list',
|
||||
method: 'get',
|
||||
params: query,
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增毛坯库存表
|
||||
* @param data
|
||||
*/
|
||||
* 新增毛坯库存表
|
||||
* @param data
|
||||
*/
|
||||
export function addWmBlankInventory(data) {
|
||||
return request({
|
||||
url: '/mes/wm/WmBlankInventory',
|
||||
method: 'post',
|
||||
data: data,
|
||||
})
|
||||
return request({
|
||||
url: '/mes/wm/WmBlankInventory',
|
||||
method: 'post',
|
||||
data: data,
|
||||
})
|
||||
}
|
||||
/**
|
||||
* 修改毛坯库存表
|
||||
* @param data
|
||||
*/
|
||||
* 修改毛坯库存表
|
||||
* @param data
|
||||
*/
|
||||
export function updateWmBlankInventory(data) {
|
||||
return request({
|
||||
url: '/mes/wm/WmBlankInventory',
|
||||
method: 'PUT',
|
||||
data: data,
|
||||
})
|
||||
return request({
|
||||
url: '/mes/wm/WmBlankInventory',
|
||||
method: 'PUT',
|
||||
data: data,
|
||||
})
|
||||
}
|
||||
/**
|
||||
* 获取毛坯库存表详情
|
||||
* @param {Id}
|
||||
*/
|
||||
* 获取毛坯库存表详情
|
||||
* @param {Id}
|
||||
*/
|
||||
export function getWmBlankInventory(id) {
|
||||
return request({
|
||||
url: '/mes/wm/WmBlankInventory/' + id,
|
||||
method: 'get'
|
||||
})
|
||||
return request({
|
||||
url: '/mes/wm/WmBlankInventory/' + id,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除毛坯库存表
|
||||
* @param {主键} pid
|
||||
*/
|
||||
* 删除毛坯库存表
|
||||
* @param {主键} pid
|
||||
*/
|
||||
export function delWmBlankInventory(pid) {
|
||||
return request({
|
||||
url: '/mes/wm/WmBlankInventory/' + pid,
|
||||
method: 'delete'
|
||||
})
|
||||
return request({
|
||||
url: '/mes/wm/WmBlankInventory/' + pid,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 毛坯库存表同步清单数据
|
||||
* @param data
|
||||
*/
|
||||
* 毛坯库存表同步清单数据
|
||||
* @param data
|
||||
*/
|
||||
export function synchronousMaterial(data) {
|
||||
return request({
|
||||
url: '/mes/wm/WmBlankInventory/synchronousMaterial',
|
||||
method: 'post',
|
||||
data: data,
|
||||
})
|
||||
return request({
|
||||
url: '/mes/wm/WmBlankInventory/synchronousMaterial',
|
||||
method: 'post',
|
||||
data: data,
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询零件数
|
||||
*/
|
||||
export function getPartNumber() {
|
||||
return request({
|
||||
url: '/mes/wm/WmBlankInventory/getPartNumber',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
@@ -102,4 +102,14 @@ export function getWmOneTimeRecordList(query) {
|
||||
method: 'get',
|
||||
params: query,
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询零件数
|
||||
*/
|
||||
export function getPartNumber() {
|
||||
return request({
|
||||
url: '/mes/wm/WmOneTimeInventory/getPartNumber',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
@@ -112,4 +112,14 @@ export function getWmPolishRecordList(query) {
|
||||
method: 'get',
|
||||
params: query,
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询零件数
|
||||
*/
|
||||
export function getPartNumber() {
|
||||
return request({
|
||||
url: '/mes/wm/WmPolishInventory/getPartNumber',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
@@ -1,207 +1,284 @@
|
||||
<template>
|
||||
<div class="main-box">
|
||||
<div class="box-left box-column">
|
||||
<el-card class="card-type-2" v-loading="loading">
|
||||
<div class="card-header-box">数据统计</div>
|
||||
<div class="box-column">
|
||||
<span class="left-span-header">抛光仓库</span>
|
||||
<div class="left-span">
|
||||
<span class="span-text-1">现有零件数</span>
|
||||
<span class="span-num-1">{{ boardData.polishWarehouseTotal }}</span>
|
||||
<el-row :gutter="20">
|
||||
<el-card class="search-card">
|
||||
<el-form :model="queryParams" size="small" label-position="right" inline ref="RecordQueryForm" @submit.native.prevent>
|
||||
<el-form-item label="查询时间" prop="startTime">
|
||||
<el-date-picker v-model="queryParams.startTime" type="datetime" :clearable="true" placeholder="开始时间"></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="至" prop="endTime">
|
||||
<el-date-picker
|
||||
v-model="queryParams.endTime"
|
||||
type="datetime"
|
||||
:clearable="true"
|
||||
placeholder="结束时间"
|
||||
default-time="23:59:59"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="零件号" prop="partnumber">
|
||||
<el-input v-model.trim="queryParams.partnumber" placeholder="请输入零件号" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList()">搜索</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
</el-row>
|
||||
<el-row :gutter="5">
|
||||
<el-col :span="4">
|
||||
<el-card class="card-type-2" v-loading="loading">
|
||||
<div class="card-header-box">
|
||||
<span class="header-2">成品仓库</span>
|
||||
<div class="header-label-1"></div>
|
||||
</div>
|
||||
<span class="left-span-header">一次合格品仓库</span>
|
||||
<div class="left-span">
|
||||
<div>
|
||||
<span class="span-text-1">现有零件数</span>
|
||||
<span class="span-num-1">{{ boardData.oneTimeWarehouseTotal }}</span>
|
||||
<span class="span-num-1 color-red">{{ boardData.finishProductPartTotal }}</span>
|
||||
</div>
|
||||
|
||||
<span class="left-span-header">成品仓库</span>
|
||||
<div class="left-span">
|
||||
<span class="span-text-1">现有零件数</span>
|
||||
<span class="span-num-1">{{ boardData.finishProductPartTotal }}</span>
|
||||
</div>
|
||||
<div class="left-span">
|
||||
<div>
|
||||
<span class="span-text-1">现有箱数</span>
|
||||
<span class="span-num-1">{{ boardData.finishProductPackageTotal }}</span>
|
||||
<span class="span-num-1 color-red">{{ boardData.finishProductPackageTotal }}</span>
|
||||
</div>
|
||||
<div class="left-span">
|
||||
<span class="span-text-1">出库总零件数</span>
|
||||
<span class="span-num-1">{{ boardData.finishProductPartOutTotal }}</span>
|
||||
</div>
|
||||
<div class="left-span">
|
||||
<span class="span-text-1">出库总箱数</span>
|
||||
<span class="span-num-1">{{ boardData.finishProductPackageOutTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
</div>
|
||||
<div class="box-right box-column">
|
||||
<div class="box-row">
|
||||
<el-card class="card-type-4">
|
||||
<el-form :model="queryParams" size="small" label-position="right" inline ref="RecordQueryForm" @submit.native.prevent>
|
||||
<el-form-item label="查询时间" prop="startTime">
|
||||
<el-date-picker
|
||||
v-model="queryParams.startTime"
|
||||
type="datetime"
|
||||
:clearable="true"
|
||||
placeholder="开始时间"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="至" prop="endTime">
|
||||
<el-date-picker
|
||||
v-model="queryParams.endTime"
|
||||
type="datetime"
|
||||
:clearable="true"
|
||||
placeholder="结束时间"
|
||||
default-time="23:59:59"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="零件号" prop="partnumber">
|
||||
<el-input v-model.trim="queryParams.partnumber" placeholder="请输入零件号" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList()">搜索</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
</div>
|
||||
<div class="box-row">
|
||||
<el-card class="card-type-1" v-loading="loading">
|
||||
<div>
|
||||
<span class="span-text-1">打磨总数</span>
|
||||
<span class="span-num-1">{{ boardData.sandingTotal }}</span>
|
||||
<span class="span-text-1">出库零件数</span>
|
||||
<span class="span-num-1 color-red">{{ boardData.finishProductPartOutTotal }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="span-text-1">出库箱数</span>
|
||||
<span class="span-num-1 color-red">{{ boardData.finishProductPackageOutTotal }}</span>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="card-type-1" v-loading="loading">
|
||||
<div>
|
||||
<span class="span-text-1">报废总数</span>
|
||||
<span class="span-num-1 color-red">{{ boardData.discardTotal }}</span>
|
||||
</div>
|
||||
</el-card>
|
||||
</div>
|
||||
<el-card class="card-type-3" v-loading="loading">
|
||||
<div class="card-header-box">
|
||||
<span class="header-2">产线检验</span>
|
||||
<div class="header-label-1">
|
||||
<span class="span-text-1">上件数</span>
|
||||
<span class="span-num-1">{{ boardData.productRequireTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right-text-box">
|
||||
<div>
|
||||
<span class="span-text-1">合格总数</span>
|
||||
<span class="span-num-1">{{ boardData.productQualifiedTotal }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
<span class="span-text-1">一次合格数</span>
|
||||
<span class="span-num-1">{{ boardData.productQualifiedNotDoorknobTotal }}</span>
|
||||
</el-col>
|
||||
<el-col :span="20">
|
||||
<el-row :gutter="5">
|
||||
<el-col :span="7">
|
||||
<el-card v-loading="loading">
|
||||
<div>
|
||||
<span class="card-header-box">抛光仓库</span>
|
||||
<span class="span-text-1"> 现有零件数 </span>
|
||||
<span class="span-num-1">{{ boardData.polishWarehouseTotal }}</span>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="7">
|
||||
<el-card v-loading="loading">
|
||||
<div>
|
||||
<span class="card-header-box">一次合格仓库</span>
|
||||
<span class="span-text-1">现有零件数</span>
|
||||
<span class="span-num-1">{{ boardData.oneTimeWarehouseTotal }}</span>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-card v-loading="loading">
|
||||
<div>
|
||||
<span class="card-header-box">统计</span>
|
||||
<span class="span-text-1">打磨总数</span>
|
||||
<span class="span-num-1 color-warning">{{ boardData.sandingTotal }}</span>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-card v-loading="loading">
|
||||
<div>
|
||||
<span class="card-header-box">统计</span>
|
||||
<span class="span-text-1">报废总数</span>
|
||||
<span class="span-num-1 color-danger">{{ boardData.discardTotal }}</span>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-card class="card-type-3" v-loading="loading">
|
||||
<div class="card-header-box">
|
||||
<span class="header-2">抛光操作</span>
|
||||
<!-- <div class="header-label-1">一次合格数不包含门把手</div> -->
|
||||
</div>
|
||||
<div>
|
||||
<span class="span-text-2">不含门把手</span>
|
||||
<el-row :gutter="5">
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">投入数</span>
|
||||
<span class="span-num-1">{{ boardData.polishRequireTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">合格数</span>
|
||||
<span class="span-num-1">{{ boardData.polishQualifiedTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">一次合格数</span>
|
||||
<span class="span-num-1">-</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">抛光数</span>
|
||||
<span class="span-num-1">-</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">打磨数</span>
|
||||
<span class="span-num-1 color-warning">{{ boardData.polishSandingTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">报废数</span>
|
||||
<span class="span-num-1 color-danger">{{ boardData.polishDiscardTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-card class="card-type-3" v-loading="loading">
|
||||
<div class="card-header-box">
|
||||
<span class="header-2">后道检验</span>
|
||||
<!-- <div class="header-label-1">一次合格数不包含门把手</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<span class="span-text-1">抛光数</span>
|
||||
<span class="span-num-1">{{ boardData.productPolishTotal }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="span-text-1">打磨数</span>
|
||||
<span class="span-num-1">{{ boardData.productSandingTotal }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="span-text-1">报废数</span>
|
||||
<span class="span-num-1">{{ boardData.productDiscardTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="card-type-3" v-loading="loading">
|
||||
<div class="card-header-box">
|
||||
<span class="header-2">抛光操作</span>
|
||||
<div class="header-label-1">
|
||||
<span class="span-text-1">投入数</span>
|
||||
<span class="span-num-1">{{ boardData.polishRequireTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right-text-box">
|
||||
<div>
|
||||
<span class="span-text-1">合格数</span>
|
||||
<span class="span-num-1">{{ boardData.polishQualifiedTotal }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="span-text-1">打磨数</span>
|
||||
<span class="span-num-1">{{ boardData.polishSandingTotal }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="span-text-1">报废数</span>
|
||||
<span class="span-num-1">{{ boardData.polishDiscardTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="card-type-3" v-loading="loading">
|
||||
<div class="card-header-box">
|
||||
<span class="header-2">后道检验</span>
|
||||
<div class="header-label-1">
|
||||
<span class="span-text-1">投入数</span>
|
||||
<span class="span-num-1">{{ boardData.afterPolishRequireTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right-text-box">
|
||||
<div>
|
||||
<span class="span-text-1">合格总数</span>
|
||||
<span class="span-num-1">{{ boardData.afterPolishQualifiedTotal }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
<span class="span-text-1">一次合格数</span>
|
||||
<span class="span-num-1">{{ boardData.afterPolishQualifiedNotDoorknobTotal }}</span>
|
||||
<el-row :gutter="5">
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">投入数</span>
|
||||
<span class="span-num-1">{{ boardData.afterPolishRequireTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">合格数</span>
|
||||
<span class="span-num-1">{{ boardData.afterPolishQualifiedTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">一次合格数</span>
|
||||
<span class="span-num-1">{{ boardData.afterPolishQualifiedNotDoorknobTotal }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="tip-text">不含门把手</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">抛光数</span>
|
||||
<span class="span-num-1">{{ boardData.afterPolishPolishTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">打磨数</span>
|
||||
<span class="span-num-1 color-warning">{{ boardData.afterPolishSandingTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">报废数</span>
|
||||
<span class="span-num-1 color-danger">{{ boardData.afterPolishDiscardTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-card class="card-type-3" v-loading="loading">
|
||||
<div class="card-header-box">
|
||||
<span class="header-2">GP12检验</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="span-text-2">不含门把手</span>
|
||||
<el-row :gutter="5">
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">投入数</span>
|
||||
<span class="span-num-1">{{ boardData.gP12RequireTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">合格数</span>
|
||||
<span class="span-num-1">{{ boardData.gP12QualifiedTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">一次合格数</span>
|
||||
<span class="span-num-1">-</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">抛光数</span>
|
||||
<span class="span-num-1">{{ boardData.gP12PolishTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">打磨数</span>
|
||||
<span class="span-num-1 color-warning">{{ boardData.gP12SandingTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">报废数</span>
|
||||
<span class="span-num-1 color-danger">{{ boardData.gP12DiscardTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-card class="card-type-3" v-loading="loading">
|
||||
<div class="card-header-box">
|
||||
<span class="header-2">产线检验</span>
|
||||
<!-- <div class="header-label-1">一次合格数不包含门把手</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<span class="span-text-1">抛光数</span>
|
||||
<span class="span-num-1">{{ boardData.afterPolishPolishTotal }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="span-text-1">打磨数</span>
|
||||
<span class="span-num-1">{{ boardData.afterPolishSandingTotal }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="span-text-1">报废数</span>
|
||||
<span class="span-num-1">{{ boardData.afterPolishDiscardTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="card-type-3" v-loading="loading">
|
||||
<div class="card-header-box">
|
||||
<span class="header-2">GP12检验</span>
|
||||
<div class="header-label-1">
|
||||
<span class="span-text-1">投入数</span>
|
||||
<span class="span-num-1">{{ boardData.gP12RequireTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right-text-box">
|
||||
<div>
|
||||
<span class="span-text-1">合格数</span>
|
||||
<span class="span-num-1">{{ boardData.gP12QualifiedTotal }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="span-text-1">抛光数</span>
|
||||
<span class="span-num-1">{{ boardData.gP12PolishTotal }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="span-text-1">打磨数</span>
|
||||
<span class="span-num-1">{{ boardData.gP12SandingTotal }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="span-text-1">报废数</span>
|
||||
<span class="span-num-1">{{ boardData.gP12DiscardTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
</div>
|
||||
<el-row :gutter="5">
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">上件数</span>
|
||||
<span class="span-num-1">{{ boardData.productRequireTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">合格数</span>
|
||||
<span class="span-num-1">{{ boardData.productQualifiedTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">一次合格数</span>
|
||||
<span class="span-num-1">{{ boardData.productQualifiedNotDoorknobTotal }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="tip-text">不含门把手</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">抛光数</span>
|
||||
<span class="span-num-1">{{ boardData.productPolishTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">打磨数</span>
|
||||
<span class="span-num-1 color-warning">{{ boardData.productSandingTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<div>
|
||||
<span class="span-text-1">报废数</span>
|
||||
<span class="span-num-1 color-danger">{{ boardData.productDiscardTotal }}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -223,7 +300,7 @@ export default {
|
||||
sandingTotal: 0,
|
||||
discardTotal: 0,
|
||||
productRequireTotal: 0,
|
||||
productQualifiedNotDoorknobTotal:0,
|
||||
productQualifiedNotDoorknobTotal: 0,
|
||||
productQualifiedTotal: 0,
|
||||
productPolishTotal: 0,
|
||||
productSandingTotal: 0,
|
||||
@@ -234,7 +311,7 @@ export default {
|
||||
polishSandingTotal: 0,
|
||||
polishDiscardTotal: 0,
|
||||
afterPolishRequireTotal: 0,
|
||||
afterPolishQualifiedNotDoorknobTotal:0,
|
||||
afterPolishQualifiedNotDoorknobTotal: 0,
|
||||
afterPolishQualifiedTotal: 0,
|
||||
afterPolishPolishTotal: 0,
|
||||
afterPolishSandingTotal: 0,
|
||||
@@ -299,9 +376,9 @@ export default {
|
||||
}
|
||||
.main-box {
|
||||
width: 100%;
|
||||
height: 100vh - 60px;
|
||||
height: 100vh;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-direction: column;
|
||||
background-color: #e6e8eb;
|
||||
}
|
||||
.box-left {
|
||||
@@ -337,31 +414,24 @@ export default {
|
||||
justify-content: center;
|
||||
}
|
||||
.card-type-2 {
|
||||
height: 100%;
|
||||
margin: 2px;
|
||||
height: 100vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
.card-type-3 {
|
||||
height: 120px;
|
||||
margin: 2px;
|
||||
margin-top: 5px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
.card-type-4 {
|
||||
width: 100%;
|
||||
margin: 2px;
|
||||
/* height: 70px; */
|
||||
display: flex;
|
||||
}
|
||||
.span-text-1 {
|
||||
font-size: 16px;
|
||||
color: #909399;
|
||||
color: #606266;
|
||||
}
|
||||
.span-text-2 {
|
||||
margin-left: 90px;
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
color: #606266;
|
||||
}
|
||||
.span-num-1 {
|
||||
font-size: 24px;
|
||||
@@ -395,14 +465,33 @@ export default {
|
||||
}
|
||||
.header-label-1 {
|
||||
margin-left: 40px;
|
||||
font-size: 18px;
|
||||
font-weight: 500;
|
||||
color: red;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.header-2{
|
||||
.header-2 {
|
||||
width: 100px;
|
||||
}
|
||||
.search-card {
|
||||
width: 100%;
|
||||
margin-bottom: 5px;
|
||||
display: flex;
|
||||
}
|
||||
.color-warning {
|
||||
color: #E6A23C !important;
|
||||
}
|
||||
.color-danger {
|
||||
color: #f56c6c !important;
|
||||
}
|
||||
.tip-text{
|
||||
color: #909399;
|
||||
font-size: 14px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
.border {
|
||||
border: 1px solid #000000;
|
||||
}
|
||||
|
||||
@@ -479,7 +479,7 @@
|
||||
//todo 新增或者修改 提交按钮
|
||||
submitForm() {
|
||||
const query = { ...this.workorderItem };
|
||||
(query.codeNumber = Number(query.codeNumber)),
|
||||
// (query.codeNumber = Number(query.codeNumber)),
|
||||
(query.qualificationRate = Number(query.qualificationRate)),
|
||||
(query.vehicleNumber = Number(query.vehicleNumber)),
|
||||
(query.hangNumber = Number(query.hangNumber)),
|
||||
@@ -488,7 +488,7 @@
|
||||
(query.week = Number(query.week)),
|
||||
(query.date = Number(query.date)),
|
||||
(query.sort = Number(query.sort))
|
||||
|
||||
console.log('query',query);
|
||||
if (this.flag == 'insert') {
|
||||
this.$refs['workorder'].validate((valid) => {
|
||||
if (valid) {
|
||||
|
||||
@@ -9,19 +9,35 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
|
||||
<el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
|
||||
<el-form
|
||||
:model="queryParams"
|
||||
size="small"
|
||||
label-position="right"
|
||||
inline
|
||||
ref="queryForm"
|
||||
:label-width="labelWidth"
|
||||
v-show="showSearch"
|
||||
@submit.native.prevent
|
||||
>
|
||||
<el-form-item label="毛坯号" prop="blankNum">
|
||||
<el-input v-model.trim="queryParams.blankNum" placeholder="请输入毛坯号" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="类别" prop="type">
|
||||
<el-select v-model="queryParams.type" placeholder="请选择类别" @change="handleQuery">
|
||||
<el-option v-for="item in typeOptions" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)"></el-option>
|
||||
<el-option
|
||||
v-for="item in typeOptions"
|
||||
:key="item.dictValue"
|
||||
:label="item.dictLabel"
|
||||
:value="parseInt(item.dictValue)"
|
||||
></el-option>
|
||||
<el-option label="全部" :value="0"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-radio-group v-model="queryParams.status" @change="handleQuery">
|
||||
<el-radio-button v-for="item in statusOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{item.dictLabel}}</el-radio-button>
|
||||
<el-radio-button v-for="item in statusOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{
|
||||
item.dictLabel
|
||||
}}</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<div>
|
||||
@@ -30,30 +46,60 @@
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
</el-form>
|
||||
<!-- 工具区域 -->
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" v-hasPermi="['business:wmblankinventory:add']" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
|
||||
<el-button type="primary" v-hasPermi="['business:wmblankinventory:add']" icon="el-icon-plus" size="mini" @click="handleAdd"
|
||||
>新增</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="success" :disabled="single" v-hasPermi="['business:wmblankinventory:edit']" icon="el-icon-edit" size="mini" @click="handleUpdate">修改</el-button>
|
||||
<el-button
|
||||
type="success"
|
||||
:disabled="single"
|
||||
v-hasPermi="['business:wmblankinventory:edit']"
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
@click="handleUpdate"
|
||||
>修改</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="danger" :disabled="multiple" v-hasPermi="['business:wmblankinventory:delete']" icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
:disabled="multiple"
|
||||
v-hasPermi="['business:wmblankinventory:delete']"
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
@click="handleDelete"
|
||||
>删除</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="info" icon="el-icon-refresh" v-hasPermi="['business:wmblankinventory:edit']" size="mini" @click="handleSynchronous">清单列表同步</el-button>
|
||||
<el-button type="info" icon="el-icon-refresh" v-hasPermi="['business:wmblankinventory:edit']" size="mini" @click="handleSynchronous"
|
||||
>清单列表同步</el-button
|
||||
>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button type="warning" icon="el-icon-refresh" v-hasPermi="['business:wmblankinventory:edit']" size="mini" @click="handleBlankInventoryRenew">毛坯库存更新</el-button>
|
||||
</el-col> -->
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<!-- 仓库零件数 -->
|
||||
<div style="display: flex; align-items: center; justify-content: center; margin-bottom: 10px">
|
||||
<span style="font-size: 18px; font-weight: 600">毛坯仓库零件数:{{ partTotal }}</span>
|
||||
</div>
|
||||
<!-- 数据区域 -->
|
||||
<el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange" @selection-change="handleSelectionChange">
|
||||
<el-table
|
||||
:data="dataList"
|
||||
v-loading="loading"
|
||||
ref="table"
|
||||
border
|
||||
highlight-current-row
|
||||
@sort-change="sortChange"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="50" align="center" />
|
||||
<el-table-column prop="blankNum" label="毛坯号" align="center" min-width="160" :show-overflow-tooltip="true" />
|
||||
<el-table-column prop="description" label="产品描述" align="center" min-width="280" :show-overflow-tooltip="true" />
|
||||
@@ -79,13 +125,36 @@
|
||||
<el-table-column prop="updatedTime" label="修改时间" width="200" align="center" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="操作" align="center" width="240">
|
||||
<template slot-scope="scope">
|
||||
<el-button size="mini" v-hasPermi="['business:wmblankinventory:edit']" type="primary" @click="handleDetail(scope.row)">库存记录</el-button>
|
||||
<el-button size="mini" v-hasPermi="['business:wmblankinventory:edit']" type="success" icon="el-icon-edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
|
||||
<el-button size="mini" v-hasPermi="['business:wmblankinventory:delete']" type="danger" icon="el-icon-delete" title="删除" @click="handleDelete(scope.row)"></el-button>
|
||||
<el-button size="mini" v-hasPermi="['business:wmblankinventory:edit']" type="primary" @click="handleDetail(scope.row)"
|
||||
>库存记录</el-button
|
||||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
v-hasPermi="['business:wmblankinventory:edit']"
|
||||
type="success"
|
||||
icon="el-icon-edit"
|
||||
title="编辑"
|
||||
@click="handleUpdate(scope.row)"
|
||||
></el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
v-hasPermi="['business:wmblankinventory:delete']"
|
||||
type="danger"
|
||||
icon="el-icon-delete"
|
||||
title="删除"
|
||||
@click="handleDelete(scope.row)"
|
||||
></el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
|
||||
<pagination
|
||||
class="mt10"
|
||||
background
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 添加或修改毛坯库存表对话框 -->
|
||||
<el-dialog :title="title" :lock-scroll="false" :visible.sync="open" :close-on-click-modal="false">
|
||||
@@ -123,7 +192,12 @@
|
||||
<el-col :lg="12">
|
||||
<el-form-item label="类别" prop="type">
|
||||
<el-select v-model="form.type" placeholder="请选择类别">
|
||||
<el-option v-for="item in typeOptions" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)"></el-option>
|
||||
<el-option
|
||||
v-for="item in typeOptions"
|
||||
:key="item.dictValue"
|
||||
:label="item.dictLabel"
|
||||
:value="parseInt(item.dictValue)"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -131,17 +205,24 @@
|
||||
<el-col :lg="12">
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-radio-group v-model="form.status">
|
||||
<el-radio v-for="item in statusOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{item.dictLabel}}</el-radio>
|
||||
<el-radio v-for="item in statusOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{
|
||||
item.dictLabel
|
||||
}}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :lg="12">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input :autosize="{ minRows: 2, maxRows: 6}" type="textarea" maxlength="240" v-model="form.remark" placeholder="请输入备注" />
|
||||
<el-input
|
||||
:autosize="{ minRows: 2, maxRows: 6 }"
|
||||
type="textarea"
|
||||
maxlength="240"
|
||||
v-model="form.remark"
|
||||
placeholder="请输入备注"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
@@ -154,280 +235,283 @@
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import {
|
||||
listWmBlankInventory,
|
||||
addWmBlankInventory,
|
||||
delWmBlankInventory,
|
||||
updateWmBlankInventory,
|
||||
getWmBlankInventory,
|
||||
synchronousMaterial,
|
||||
} from '@/api/wmsManagement/wmBlankInventory.js';
|
||||
import TheWmBlankRecord from './components/TheWmBlankRecord/TheWmBlankRecord.vue'
|
||||
import TheWmBlankInventoryRenew from './components/TheWmBlankInventoryRenew/TheWmBlankInventoryRenew.vue'
|
||||
export default {
|
||||
name: "wmBlankInventory",
|
||||
components: {
|
||||
TheWmBlankRecord,
|
||||
TheWmBlankInventoryRenew
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
labelWidth: "100px",
|
||||
formLabelWidth: "100px",
|
||||
// 选中id数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 遮罩层
|
||||
loading: false,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
type: 1,
|
||||
status: 1,
|
||||
sort: undefined,
|
||||
sortType: undefined,
|
||||
},
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 操作类型 1、add 2、edit
|
||||
opertype: 0,
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
TheWmBlankRecordShow: false,
|
||||
TheWmBlankInventoryRenewShow: false,
|
||||
// 表单参数
|
||||
form: {},
|
||||
columns: [
|
||||
{ index: 0, key: 'id', label: `主键`, checked: true },
|
||||
{ index: 1, key: 'fkPaintId', label: `油漆id`, checked: true },
|
||||
{ index: 2, key: 'blankNum', label: `毛坯号`, checked: true },
|
||||
{ index: 3, key: 'quantity', label: `库存数量`, checked: true },
|
||||
{ index: 4, key: 'maxNum', label: `最大库存`, checked: true },
|
||||
{ index: 5, key: 'minNum', label: `最小库存`, checked: true },
|
||||
{ index: 6, key: 'warnNum', label: `预警库存`, checked: true },
|
||||
{ index: 7, key: 'type', label: `类别`, checked: true },
|
||||
{ index: 8, key: 'status', label: `状态`, checked: true },
|
||||
{ index: 9, key: 'remark', label: `备注`, checked: false },
|
||||
{ index: 10, key: 'createdBy', label: `创建人`, checked: false },
|
||||
{ index: 11, key: 'createdTime', label: `创建时间`, checked: false },
|
||||
{ index: 12, key: 'updatedBy', label: `更新人`, checked: false },
|
||||
{ index: 13, key: 'updatedTime', label: `更新时间`, checked: false },
|
||||
],
|
||||
// 类别选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
|
||||
typeOptions: [
|
||||
{ dictLabel: '毛坯', dictValue: 1 },
|
||||
{ dictLabel: '返工件', dictValue: 2 },
|
||||
],
|
||||
// 状态选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
|
||||
statusOptions: [
|
||||
{ dictLabel: '启用', dictValue: 1 },
|
||||
{ dictLabel: '停用', dictValue: 0 },
|
||||
],
|
||||
// 数据列表
|
||||
dataList: [],
|
||||
// 总记录数
|
||||
total: 0,
|
||||
// 提交按钮是否显示
|
||||
btnSubmitVisible: true,
|
||||
// 表单校验
|
||||
rules: {
|
||||
blankNum: [
|
||||
{ required: true, message: "毛坯号不能为空", trigger: "blur" }
|
||||
],
|
||||
quantity: [
|
||||
{ required: true, message: "库存数量不能为空", trigger: "blur" }
|
||||
],
|
||||
},
|
||||
// 详情数据
|
||||
detailData: {
|
||||
import {
|
||||
listWmBlankInventory,
|
||||
addWmBlankInventory,
|
||||
delWmBlankInventory,
|
||||
updateWmBlankInventory,
|
||||
getWmBlankInventory,
|
||||
synchronousMaterial,
|
||||
getPartNumber
|
||||
} from '@/api/wmsManagement/wmBlankInventory.js'
|
||||
import TheWmBlankRecord from './components/TheWmBlankRecord/TheWmBlankRecord.vue'
|
||||
import TheWmBlankInventoryRenew from './components/TheWmBlankInventoryRenew/TheWmBlankInventoryRenew.vue'
|
||||
export default {
|
||||
name: 'wmBlankInventory',
|
||||
components: {
|
||||
TheWmBlankRecord,
|
||||
TheWmBlankInventoryRenew,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
labelWidth: '100px',
|
||||
formLabelWidth: '100px',
|
||||
// 选中id数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 遮罩层
|
||||
loading: false,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
type: 1,
|
||||
status: 1,
|
||||
sort: undefined,
|
||||
sortType: undefined,
|
||||
},
|
||||
// 弹出层标题
|
||||
title: '',
|
||||
// 操作类型 1、add 2、edit
|
||||
opertype: 0,
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
TheWmBlankRecordShow: false,
|
||||
TheWmBlankInventoryRenewShow: false,
|
||||
// 表单参数
|
||||
form: {},
|
||||
columns: [
|
||||
{ index: 0, key: 'id', label: `主键`, checked: true },
|
||||
{ index: 1, key: 'fkPaintId', label: `油漆id`, checked: true },
|
||||
{ index: 2, key: 'blankNum', label: `毛坯号`, checked: true },
|
||||
{ index: 3, key: 'quantity', label: `库存数量`, checked: true },
|
||||
{ index: 4, key: 'maxNum', label: `最大库存`, checked: true },
|
||||
{ index: 5, key: 'minNum', label: `最小库存`, checked: true },
|
||||
{ index: 6, key: 'warnNum', label: `预警库存`, checked: true },
|
||||
{ index: 7, key: 'type', label: `类别`, checked: true },
|
||||
{ index: 8, key: 'status', label: `状态`, checked: true },
|
||||
{ index: 9, key: 'remark', label: `备注`, checked: false },
|
||||
{ index: 10, key: 'createdBy', label: `创建人`, checked: false },
|
||||
{ index: 11, key: 'createdTime', label: `创建时间`, checked: false },
|
||||
{ index: 12, key: 'updatedBy', label: `更新人`, checked: false },
|
||||
{ index: 13, key: 'updatedTime', label: `更新时间`, checked: false },
|
||||
],
|
||||
// 类别选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
|
||||
typeOptions: [
|
||||
{ dictLabel: '毛坯', dictValue: 1 },
|
||||
{ dictLabel: '返工件', dictValue: 2 },
|
||||
],
|
||||
// 状态选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
|
||||
statusOptions: [
|
||||
{ dictLabel: '启用', dictValue: 1 },
|
||||
{ dictLabel: '停用', dictValue: 0 },
|
||||
],
|
||||
// 数据列表
|
||||
dataList: [],
|
||||
// 总记录数
|
||||
total: 0,
|
||||
// 提交按钮是否显示
|
||||
btnSubmitVisible: true,
|
||||
// 表单校验
|
||||
rules: {
|
||||
blankNum: [{ required: true, message: '毛坯号不能为空', trigger: 'blur' }],
|
||||
quantity: [{ required: true, message: '库存数量不能为空', trigger: 'blur' }],
|
||||
},
|
||||
// 详情数据
|
||||
detailData: {},
|
||||
//毛坯仓库零件数
|
||||
partTotal: 0,
|
||||
}
|
||||
},
|
||||
created() {
|
||||
// 列表数据查询
|
||||
this.getList()
|
||||
|
||||
var dictParams = []
|
||||
},
|
||||
methods: {
|
||||
// 查询数据
|
||||
getList() {
|
||||
this.loading = true
|
||||
listWmBlankInventory(this.queryParams).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.dataList = res.data.result
|
||||
this.total = res.data.totalNum
|
||||
this.loading = false
|
||||
}
|
||||
};
|
||||
})
|
||||
getPartNumber().then((res) => {
|
||||
if (res.code === 200) {
|
||||
this.partTotal = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
created() {
|
||||
// 列表数据查询
|
||||
this.getList();
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false
|
||||
this.reset()
|
||||
},
|
||||
// 重置数据表单
|
||||
reset() {
|
||||
this.form = {
|
||||
id: undefined,
|
||||
fkPaintId: undefined,
|
||||
blankNum: undefined,
|
||||
quantity: 0,
|
||||
maxNum: 0,
|
||||
minNum: 0,
|
||||
warnNum: 0,
|
||||
type: 1,
|
||||
status: 1,
|
||||
remark: undefined,
|
||||
createdBy: undefined,
|
||||
createdTime: undefined,
|
||||
updatedBy: undefined,
|
||||
updatedTime: undefined,
|
||||
}
|
||||
this.resetForm('form')
|
||||
},
|
||||
// 重置查询操作
|
||||
resetQuery() {
|
||||
this.timeRange = []
|
||||
this.resetForm('queryForm')
|
||||
this.handleQuery()
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map((item) => item.id)
|
||||
this.single = selection.length != 1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
// 自定义排序
|
||||
sortChange(column) {
|
||||
if (column.prop == null || column.order == null) {
|
||||
this.queryParams.sort = undefined
|
||||
this.queryParams.sortType = undefined
|
||||
} else {
|
||||
this.queryParams.sort = column.prop
|
||||
this.queryParams.sortType = column.order
|
||||
}
|
||||
|
||||
var dictParams = [];
|
||||
this.handleQuery()
|
||||
},
|
||||
methods: {
|
||||
// 查询数据
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listWmBlankInventory(this.queryParams).then(res => {
|
||||
if (res.code == 200) {
|
||||
this.dataList = res.data.result;
|
||||
this.total = res.data.totalNum;
|
||||
this.loading = false;
|
||||
}
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1
|
||||
this.getList()
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset()
|
||||
this.open = true
|
||||
this.title = '添加'
|
||||
this.opertype = 1
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const Ids = row.id || this.ids
|
||||
|
||||
this.$confirm('是否确认删除数据项？')
|
||||
.then(function () {
|
||||
return delWmBlankInventory(Ids)
|
||||
})
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 重置数据表单
|
||||
reset() {
|
||||
this.form = {
|
||||
id: undefined,
|
||||
fkPaintId: undefined,
|
||||
blankNum: undefined,
|
||||
quantity: 0,
|
||||
maxNum: 0,
|
||||
minNum: 0,
|
||||
warnNum: 0,
|
||||
type: 1,
|
||||
status: 1,
|
||||
remark: undefined,
|
||||
createdBy: undefined,
|
||||
createdTime: undefined,
|
||||
updatedBy: undefined,
|
||||
updatedTime: undefined,
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
// 重置查询操作
|
||||
resetQuery() {
|
||||
this.timeRange = [];
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map((item) => item.id);
|
||||
this.single = selection.length != 1
|
||||
this.multiple = !selection.length;
|
||||
},
|
||||
// 自定义排序
|
||||
sortChange(column) {
|
||||
if (column.prop == null || column.order == null) {
|
||||
this.queryParams.sort = undefined;
|
||||
this.queryParams.sortType = undefined;
|
||||
} else {
|
||||
this.queryParams.sort = column.prop;
|
||||
this.queryParams.sortType = column.order;
|
||||
}
|
||||
.then(() => {
|
||||
this.handleQuery()
|
||||
this.msgSuccess('删除成功')
|
||||
})
|
||||
.catch(() => {})
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset()
|
||||
const id = row.id || this.ids
|
||||
getWmBlankInventory(id).then((res) => {
|
||||
const { code, data } = res
|
||||
if (code == 200) {
|
||||
this.open = true
|
||||
this.title = '修改数据'
|
||||
this.opertype = 2
|
||||
|
||||
this.handleQuery();
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加";
|
||||
this.opertype = 1;
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const Ids = row.id || this.ids;
|
||||
|
||||
this.$confirm('是否确认删除数据项？')
|
||||
.then(function () {
|
||||
return delWmBlankInventory(Ids);
|
||||
})
|
||||
.then(() => {
|
||||
this.handleQuery();
|
||||
this.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const id = row.id || this.ids;
|
||||
getWmBlankInventory(id).then((res) => {
|
||||
const { code, data } = res;
|
||||
if (code == 200) {
|
||||
this.open = true;
|
||||
this.title = "修改数据";
|
||||
this.opertype = 2;
|
||||
|
||||
this.form = {
|
||||
...data,
|
||||
};
|
||||
this.form = {
|
||||
...data,
|
||||
}
|
||||
});
|
||||
},
|
||||
// 毛坯数据同步
|
||||
handleSynchronous() {
|
||||
this.loading = true;
|
||||
setTimeout(() => {
|
||||
this.loading = false;
|
||||
}, 30000)
|
||||
const data = {};
|
||||
synchronousMaterial(data).then(res => {
|
||||
if (res.code === 200)
|
||||
{
|
||||
this.$message.success(res.msg);
|
||||
this.handleQuery();
|
||||
this.loading = false;
|
||||
}
|
||||
})
|
||||
},
|
||||
// 毛坯数据同步
|
||||
handleSynchronous() {
|
||||
this.loading = true
|
||||
setTimeout(() => {
|
||||
this.loading = false
|
||||
}, 30000)
|
||||
const data = {}
|
||||
synchronousMaterial(data)
|
||||
.then((res) => {
|
||||
if (res.code === 200) {
|
||||
this.$message.success(res.msg)
|
||||
this.handleQuery()
|
||||
this.loading = false
|
||||
} else {
|
||||
this.loading = false;
|
||||
this.loading = false
|
||||
}
|
||||
}).catch(() => {
|
||||
this.loading = false;
|
||||
})
|
||||
},
|
||||
// 毛坯数据详情-库存记录
|
||||
handleDetail(row) {
|
||||
console.log(row);
|
||||
this.detailData = row;
|
||||
this.TheWmBlankRecordShow = true;
|
||||
},
|
||||
// 毛坯数据同步
|
||||
handleBlankInventoryRenew() {
|
||||
this.TheWmBlankInventoryRenewShow = true;
|
||||
},
|
||||
// 类别字典翻译
|
||||
typeFormat(row, column) {
|
||||
return this.selectDictLabel(this.typeOptions, row.type);
|
||||
},
|
||||
// 状态字典翻译
|
||||
statusFormat(row, column) {
|
||||
return this.selectDictLabel(this.statusOptions, row.status);
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm: function () {
|
||||
this.$refs["form"].validate((valid) => {
|
||||
if (valid) {
|
||||
console.log(JSON.stringify(this.form));
|
||||
|
||||
if (this.form.id != undefined && this.opertype === 2) {
|
||||
updateWmBlankInventory(this.form)
|
||||
.then((res) => {
|
||||
this.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
})
|
||||
.catch((err) => {
|
||||
//TODO 错误逻辑
|
||||
});
|
||||
} else {
|
||||
addWmBlankInventory(this.form)
|
||||
.then((res) => {
|
||||
this.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
})
|
||||
.catch((err) => {
|
||||
//TODO 错误逻辑
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
.catch(() => {
|
||||
this.loading = false
|
||||
})
|
||||
},
|
||||
};
|
||||
</script>
|
||||
// 毛坯数据详情-库存记录
|
||||
handleDetail(row) {
|
||||
console.log(row)
|
||||
this.detailData = row
|
||||
this.TheWmBlankRecordShow = true
|
||||
},
|
||||
// 毛坯数据同步
|
||||
handleBlankInventoryRenew() {
|
||||
this.TheWmBlankInventoryRenewShow = true
|
||||
},
|
||||
// 类别字典翻译
|
||||
typeFormat(row, column) {
|
||||
return this.selectDictLabel(this.typeOptions, row.type)
|
||||
},
|
||||
// 状态字典翻译
|
||||
statusFormat(row, column) {
|
||||
return this.selectDictLabel(this.statusOptions, row.status)
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm: function () {
|
||||
this.$refs['form'].validate((valid) => {
|
||||
if (valid) {
|
||||
console.log(JSON.stringify(this.form))
|
||||
|
||||
if (this.form.id != undefined && this.opertype === 2) {
|
||||
updateWmBlankInventory(this.form)
|
||||
.then((res) => {
|
||||
this.msgSuccess('修改成功')
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
.catch((err) => {
|
||||
//TODO 错误逻辑
|
||||
})
|
||||
} else {
|
||||
addWmBlankInventory(this.form)
|
||||
.then((res) => {
|
||||
this.msgSuccess('新增成功')
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
.catch((err) => {
|
||||
//TODO 错误逻辑
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -51,7 +51,10 @@
|
||||
</el-col>
|
||||
<right-toolbar :columns="columns" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<!-- 仓库零件数 -->
|
||||
<div style="display: flex; align-items: center; justify-content: center; margin-bottom: 10px">
|
||||
<span style="font-size: 18px; font-weight: 600">一次合格品仓库零件数:{{ partTotal }}</span>
|
||||
</div>
|
||||
<!-- 数据区域 -->
|
||||
<el-table
|
||||
:data="dataList"
|
||||
@@ -295,6 +298,7 @@ import {
|
||||
doWmOneTimeRetrieval,
|
||||
doWmOneTimeStocktaking,
|
||||
getWmOneTimeRecordList,
|
||||
getPartNumber,
|
||||
} from '@/api/wmsManagement/wmOneTimeInventory.js'
|
||||
import ThePartNumberSelect from './ThePartNumberSelect.vue'
|
||||
export default {
|
||||
@@ -378,6 +382,9 @@ export default {
|
||||
},
|
||||
ThePartNumberSelectRef: null,
|
||||
|
||||
//一次合格仓库零件数
|
||||
partTotal: 0,
|
||||
|
||||
// 详情
|
||||
RecordLoading: false,
|
||||
RecordTitle: '',
|
||||
@@ -418,6 +425,11 @@ export default {
|
||||
this.loading = false
|
||||
}
|
||||
})
|
||||
getPartNumber().then((res) => {
|
||||
if (res.code === 200) {
|
||||
this.partTotal = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
@@ -508,7 +520,7 @@ export default {
|
||||
},
|
||||
// 弹窗打开
|
||||
dialogOpened() {
|
||||
if(this.opertype != 3){
|
||||
if (this.opertype != 3) {
|
||||
this.$refs.ThePartNumberSelectRef.init()
|
||||
}
|
||||
},
|
||||
|
||||
@@ -42,28 +42,18 @@
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<!-- 工具区域 -->
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-row :gutter="10" class="mb10">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handlePolishWarehousing()"
|
||||
>抛光零件入库</el-button
|
||||
>
|
||||
<el-button type="success" icon="el-icon-plus" size="mini" @click="handlePolishWarehousing()">抛光零件入库</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-minus"
|
||||
size="mini"
|
||||
@click="handlePolishRetrieval()"
|
||||
>抛光零件出库</el-button
|
||||
>
|
||||
<el-button type="primary" icon="el-icon-minus" size="mini" @click="handlePolishRetrieval()">抛光零件出库</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :columns="columns" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<div style="display: flex; align-items: center; justify-content: center; margin-bottom: 10px">
|
||||
<span style="font-size: 18px; font-weight: 600">抛光仓库零件数:{{ partTotal }}</span>
|
||||
</div>
|
||||
<!-- 数据区域 -->
|
||||
<el-table
|
||||
:data="dataList"
|
||||
@@ -135,23 +125,9 @@
|
||||
/>
|
||||
<el-table-column label="操作" align="center" fixed="right" width="200">
|
||||
<template slot-scope="scope">
|
||||
<el-button size="mini" type="info" @click="handleShowInfo(scope.row)"
|
||||
>记录</el-button
|
||||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
|
||||
type="warning"
|
||||
@click="handlePolishStocktaking(scope.row)"
|
||||
>盘点</el-button
|
||||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="danger"
|
||||
icon="el-icon-delete"
|
||||
title="删除"
|
||||
@click="handleDelete(scope.row)"
|
||||
></el-button>
|
||||
<el-button size="mini" type="info" @click="handleShowInfo(scope.row)">记录</el-button>
|
||||
<el-button size="mini" type="warning" @click="handlePolishStocktaking(scope.row)">盘点</el-button>
|
||||
<el-button size="mini" type="danger" icon="el-icon-delete" title="删除" @click="handleDelete(scope.row)"></el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -243,10 +219,21 @@
|
||||
>
|
||||
<el-form :model="RecordQueryParams" size="small" label-position="right" inline ref="RecordQueryForm" @submit.native.prevent>
|
||||
<el-form-item label="操作时间" prop="startActionTime">
|
||||
<el-date-picker v-model="RecordQueryParams.startActionTime" type="datetime" :clearable="true" placeholder="开始时间"></el-date-picker>
|
||||
<el-date-picker
|
||||
v-model="RecordQueryParams.startActionTime"
|
||||
type="datetime"
|
||||
:clearable="true"
|
||||
placeholder="开始时间"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="至" prop="endActionTime">
|
||||
<el-date-picker v-model="RecordQueryParams.endActionTime" type="datetime" :clearable="true" placeholder="结束时间" default-time="23:59:59"></el-date-picker>
|
||||
<el-date-picker
|
||||
v-model="RecordQueryParams.endActionTime"
|
||||
type="datetime"
|
||||
:clearable="true"
|
||||
placeholder="结束时间"
|
||||
default-time="23:59:59"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="工单号" prop="remark">
|
||||
<el-input v-model.trim="RecordQueryParams.remark" placeholder="请输入工单号" clearable />
|
||||
@@ -305,6 +292,7 @@ import {
|
||||
doWmPolishRetrieval,
|
||||
doWmPolishStocktaking,
|
||||
getWmPolishRecordList,
|
||||
getPartNumber,
|
||||
} from '@/api/wmsManagement/wmPolishInventory.js'
|
||||
import ThePartNumberSelect from './ThePartNumberSelect.vue'
|
||||
export default {
|
||||
@@ -388,6 +376,9 @@ export default {
|
||||
},
|
||||
ThePartNumberSelectRef: null,
|
||||
|
||||
//抛光仓库零件数
|
||||
partTotal: 0,
|
||||
|
||||
// 详情
|
||||
RecordLoading: false,
|
||||
RecordTitle: '',
|
||||
@@ -428,6 +419,11 @@ export default {
|
||||
this.loading = false
|
||||
}
|
||||
})
|
||||
getPartNumber().then((res) => {
|
||||
if (res.code === 200) {
|
||||
this.partTotal = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
@@ -517,7 +513,7 @@ export default {
|
||||
},
|
||||
// 弹窗打开
|
||||
dialogOpened() {
|
||||
if(this.opertype != 3){
|
||||
if (this.opertype != 3) {
|
||||
this.$refs.ThePartNumberSelectRef.init()
|
||||
}
|
||||
},
|
||||
@@ -635,4 +631,4 @@ export default {
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user