统计页面,库存页面修改

prod
anthonywj 2 years ago
parent ff91b5f8d0
commit b52ce167a7

@ -112,29 +112,29 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品通用名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名称" prop="productName" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="期初" header-align="center">
<el-table-column label="数量" prop="beginCount"></el-table-column>
<el-table-column label="价格" prop="beginPrice"></el-table-column>
<el-table-column label="金额" prop="beginAmount"></el-table-column>
<el-table-column label="数量" prop="beginCount" width="80"></el-table-column>
<el-table-column label="价格" prop="beginPrice" width="100"></el-table-column>
<el-table-column label="金额" prop="beginAmount" width="100"></el-table-column>
</el-table-column>
<el-table-column label="入库" header-align="center">
<el-table-column label="数量" prop="inCount"></el-table-column>
<el-table-column label="价格" prop="inPrice"></el-table-column>
<el-table-column label="金额" prop="inAmount"></el-table-column>
<el-table-column label="数量" prop="inCount" width="80"></el-table-column>
<el-table-column label="价格" prop="inPrice" width="100"></el-table-column>
<el-table-column label="金额" prop="inAmount" width="100"></el-table-column>
</el-table-column>
<el-table-column label="出库" header-align="center">
<el-table-column label="数量" prop="outCount"></el-table-column>
<el-table-column label="价格" prop="outPrice"></el-table-column>
<el-table-column label="金额" prop="outAmount"></el-table-column>
<el-table-column label="数量" prop="outCount" width="80"></el-table-column>
<el-table-column label="价格" prop="outPrice" width="100"></el-table-column>
<el-table-column label="金额" prop="outAmount" width="100"></el-table-column>
</el-table-column>
<el-table-column label="结余" header-align="center">
<el-table-column label="数量" prop="balanceCount"></el-table-column>
<el-table-column label="价格" prop="balancePrice"></el-table-column>
<el-table-column label="金额" prop="balanceAmount"></el-table-column>
<el-table-column label="数量" prop="balanceCount" width="80"></el-table-column>
<el-table-column label="价格" prop="balancePrice" width="100"></el-table-column>
<el-table-column label="金额" prop="balanceAmount" width="100"></el-table-column>
</el-table-column>
</el-table>

@ -108,21 +108,31 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品通用名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
<el-table-column label="期初数量" prop="beginCount"></el-table-column>
<el-table-column label="期初价格" prop="beginPrice"></el-table-column>
<el-table-column label="期初金额" prop="beginAmount"></el-table-column>
<el-table-column label="入库数量" prop="inCount"></el-table-column>
<el-table-column label="入库价格" prop="inPrice"></el-table-column>
<el-table-column label="入库金额" prop="inAmount"></el-table-column>
<el-table-column label="出库数量" prop="outCount"></el-table-column>
<el-table-column label="出库价格" prop="outPrice"></el-table-column>
<el-table-column label="出库金额" prop="outAmount"></el-table-column>
<el-table-column label="结余数量" prop="balanceCount"></el-table-column>
<el-table-column label="结余价格" prop="balancePrice"></el-table-column>
<el-table-column label="结余金额" prop="balanceAmount"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品通用名称" prop="productName" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="期初" header-align="center">
<el-table-column label="数量" prop="beginCount" width="80"></el-table-column>
<el-table-column label="价格" prop="beginPrice" width="100"></el-table-column>
<el-table-column label="金额" prop="beginAmount" width="100"></el-table-column>
</el-table-column>
<el-table-column label="入库" header-align="center">
<el-table-column label="数量" prop="inCount" width="80"></el-table-column>
<el-table-column label="价格" prop="inPrice" width="100"></el-table-column>
<el-table-column label="金额" prop="inAmount" width="100"></el-table-column>
</el-table-column>
<el-table-column label="出库" header-align="center">
<el-table-column label="数量" prop="outCount" width="80"></el-table-column>
<el-table-column label="价格" prop="outPrice" width="100"></el-table-column>
<el-table-column label="金额" prop="outAmount" width="100"></el-table-column>
</el-table-column>
<el-table-column label="结余" header-align="center">
<el-table-column label="数量" prop="balanceCount" width="80"></el-table-column>
<el-table-column label="价格" prop="balancePrice" width="100"></el-table-column>
<el-table-column label="金额" prop="balanceAmount" width="100"></el-table-column>
</el-table-column>
</el-table>
<pagination
v-show="detailTotal>0"

@ -108,21 +108,31 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品通用名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
<el-table-column label="期初数量" prop="beginCount"></el-table-column>
<el-table-column label="期初价格" prop="beginPrice"></el-table-column>
<el-table-column label="期初金额" prop="beginAmount"></el-table-column>
<el-table-column label="入库数量" prop="inCount"></el-table-column>
<el-table-column label="入库价格" prop="inPrice"></el-table-column>
<el-table-column label="入库金额" prop="inAmount"></el-table-column>
<el-table-column label="出库数量" prop="outCount"></el-table-column>
<el-table-column label="出库价格" prop="outPrice"></el-table-column>
<el-table-column label="出库金额" prop="outAmount"></el-table-column>
<el-table-column label="结余数量" prop="balanceCount"></el-table-column>
<el-table-column label="结余价格" prop="balancePrice"></el-table-column>
<el-table-column label="结余金额" prop="balanceAmount"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品通用名称" prop="productName" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="期初" header-align="center">
<el-table-column label="数量" prop="beginCount" width="80"></el-table-column>
<el-table-column label="价格" prop="beginPrice" width="100"></el-table-column>
<el-table-column label="金额" prop="beginAmount" width="100"></el-table-column>
</el-table-column>
<el-table-column label="入库" header-align="center">
<el-table-column label="数量" prop="inCount" width="80"></el-table-column>
<el-table-column label="价格" prop="inPrice" width="100"></el-table-column>
<el-table-column label="金额" prop="inAmount" width="100"></el-table-column>
</el-table-column>
<el-table-column label="出库" header-align="center">
<el-table-column label="数量" prop="outCount" width="80"></el-table-column>
<el-table-column label="价格" prop="outPrice" width="100"></el-table-column>
<el-table-column label="金额" prop="outAmount" width="100"></el-table-column>
</el-table-column>
<el-table-column label="结余" header-align="center">
<el-table-column label="数量" prop="balanceCount" width="80"></el-table-column>
<el-table-column label="价格" prop="balancePrice" width="100"></el-table-column>
<el-table-column label="金额" prop="balanceAmount" width="100"></el-table-column>
</el-table-column>
</el-table>
<pagination
v-show="detailTotal>0"

@ -108,21 +108,31 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品通用名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
<el-table-column label="期初数量" prop="beginCount"></el-table-column>
<el-table-column label="期初价格" prop="beginPrice"></el-table-column>
<el-table-column label="期初金额" prop="beginAmount"></el-table-column>
<el-table-column label="入库数量" prop="inCount"></el-table-column>
<el-table-column label="入库价格" prop="inPrice"></el-table-column>
<el-table-column label="入库金额" prop="inAmount"></el-table-column>
<el-table-column label="出库数量" prop="outCount"></el-table-column>
<el-table-column label="出库价格" prop="outPrice"></el-table-column>
<el-table-column label="出库金额" prop="outAmount"></el-table-column>
<el-table-column label="结余数量" prop="balanceCount"></el-table-column>
<el-table-column label="结余价格" prop="balancePrice"></el-table-column>
<el-table-column label="结余金额" prop="balanceAmount"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品通用名称" prop="productName" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="期初" header-align="center">
<el-table-column label="数量" prop="beginCount" width="80"></el-table-column>
<el-table-column label="价格" prop="beginPrice" width="100"></el-table-column>
<el-table-column label="金额" prop="beginAmount" width="100"></el-table-column>
</el-table-column>
<el-table-column label="入库" header-align="center">
<el-table-column label="数量" prop="inCount" width="80"></el-table-column>
<el-table-column label="价格" prop="inPrice" width="100"></el-table-column>
<el-table-column label="金额" prop="inAmount" width="100"></el-table-column>
</el-table-column>
<el-table-column label="出库" header-align="center">
<el-table-column label="数量" prop="outCount" width="80"></el-table-column>
<el-table-column label="价格" prop="outPrice" width="100"></el-table-column>
<el-table-column label="金额" prop="outAmount" width="100"></el-table-column>
</el-table-column>
<el-table-column label="结余" header-align="center">
<el-table-column label="数量" prop="balanceCount" width="80"></el-table-column>
<el-table-column label="价格" prop="balancePrice" width="100"></el-table-column>
<el-table-column label="金额" prop="balanceAmount" width="100"></el-table-column>
</el-table-column>
</el-table>
<pagination
v-show="detailTotal>0"

@ -1,193 +1,258 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-card>
<el-form :model="codeQuery" class="query-form" size="mini" label-width="100px">
<el-row>
<el-col :span="8">
<el-col :span="18">
<el-form-item class="query-form-item" label="扫码查询:">
<el-input v-model="codeQuery.code"
style="width: 97%"
placeholder="请扫描或输入UDI码"
clearable="true"
@keyup.enter.native="keyup_submit($event)"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="预验收单号:">
<el-input v-model="filterQuery.billNo" placeholder="单号"
<el-input v-model="codeQuery.orderId" placeholder="预验收单号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供应商:">
<el-select
v-model="filterQuery.fromCorp"
style="width: 90%"
filterable
remote
clearable="true"
reserve-keyword
placeholder="请选择供应商"
:remote-method="findMethod"
:loading="loading"
<el-col :span="6">
<el-form-item label="余量状态:">
<el-select v-model="codeQuery.status" style="width: 90%" placeholder="请选择状态" clearable>
<el-option label="在库" value="1"></el-option>
<el-option label="已使用" value="2"></el-option>
<el-option label="已退回" value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="收货仓库:">
<el-select v-model="codeQuery.invCode" placeholder="请选择收货仓库" clearable="true"
style="width: 90%"
>
<el-option
v-for="item in fromOptions"
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.erpId"
>
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="收货时间:">
<el-date-picker
:picker-options="pickerOptions"
v-model="auditDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 90%"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="DI/物资编码:">
<el-input v-model="codeQuery.nameCode" placeholder="DI/物资编码"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="物资名称:">
<el-input v-model="codeQuery.cpmctymc" placeholder="物资名称"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="规格型号:">
<el-input v-model="codeQuery.ggxh" placeholder="规格型号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="批次号:">
<el-input v-model="codeQuery.batchNo" placeholder="批次号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="codeQuery.ylqxzcrbarmc" placeholder="生产企业"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="注册/备案号:">
<el-input v-model="codeQuery.zczbhhzbapzbh" placeholder="注册/备案号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
@click="onCodeReset"
>重置
</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"
<el-button type="primary" icon="el-icon-search" @click="onCodeSubmit"
>查询
</el-button
>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
@current-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table v-loading="codeDetailLoading" :data="codeDetailList" style="width: 100%" border
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" width="150"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="来源" prop="fromType">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.orderFromType] }}</span>
</template>
</el-table-column>
<el-table-column label="往来单位" prop="fromCorpName" width="220">
</el-table-column>
<el-table-column label="当前部门" prop="deptName" width="220">
</el-table-column>
<el-table-column label="当前仓库" prop="invName" width="220">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
<el-table-column label="供应商" prop="fromName" v-if="showSup" show-overflow-tooltip
width="160"></el-table-column>
<el-table-column
label="审核时间"
prop="auditTime"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="预验收单号"
prop="orderId"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="物资名称"
prop="productName"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号"
prop="ggxh"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo" width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="入库数量"
prop="originReCount" width="100"
></el-table-column>
<el-table-column
label="使用数量"
width="100"
>
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
<span>{{ scope.row.originReCount - scope.row.reCount }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="150">
<el-table-column
label="剩余数量"
prop="reCount" width="100"
></el-table-column>
<el-table-column
label="退回数量"
prop="returnCount" width="100"
></el-table-column>
<el-table-column
label="计量单位"
prop="measname" width="100"
></el-table-column>
<el-table-column label="余量状态" prop="status">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row)"
>删除
</el-button
>
<el-tag :type="(scope.row.status)">
{{ statusMap[scope.row.status] }}
</el-tag>
</template>
</el-table-column>
<el-table-column
label="所属仓库"
prop="invName"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产日期"
prop="produceDate"
width="100"
></el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
width="100"
></el-table-column>
<el-table-column
label="序列号"
prop="serialNo"
width="120"
></el-table-column>
<el-table-column
label="UDI码"
prop="code"
width="180"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产企业"
prop="manufactory"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案号"
prop="zczbhhzbapzbh"
width="160"
show-overflow-tooltip
></el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="getList"
></pagination>
v-show="codeTotal>0"
:total="codeTotal"
:page.sync="codeQuery.page"
:limit.sync="codeQuery.limit"
@pagination="getCodeDetailList"
/>
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<!--单据扫码明细-->
<el-tab-pane>
<span slot="label">预验收库存详情</span>
<el-form :model="codeQuery" class="query-form" size="mini" label-width="100px">
<el-row>
<el-col :span="11">
<el-form-item class="query-form-item" label="UDI码:">
<el-input
v-model="codeQuery.code"
placeholder="请输入UDI码"
clearable
>
</el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item>
<el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onCodeReset"
>重置
</el-button>
<el-button type="primary" @click="onCodeSubmit"
icon="el-icon-search"
>查询
</el-button
>
</el-button-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table v-loading="codeDetailLoading" :data="codeDetailList" style="width: 100%" border
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="UDI码"
prop="code"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="产品名称"
prop="productName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产日期"
prop="produceDate"
width="120"
></el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
width="120"
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="序列号"
prop="serialNo"
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
></el-table-column>
<el-table-column
label="实际数量"
prop="reCount"
></el-table-column>
</el-table>
<pagination
v-show="codeTotal>0"
:total="codeTotal"
:page.sync="codeQuery.page"
:limit.sync="codeQuery.limit"
@pagination="getCodeDetailList"
/>
</el-tab-pane>
</el-tabs>
</div>
</template>
@ -199,6 +264,7 @@ import {
import {getLocalJoinByUser} from "@/api/basic/busType";
import {isBlank} from "@/utils/strUtil";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import store from "@/store";
const formJson = {
@ -213,14 +279,6 @@ export default {
data() {
return {
showSearch: true,
filterQuery: {
id: "",
billNo: null,
page: 1,
limit: 10,
startTime: null,
endTime: null,
},
invList: [],
list: [],
total: 0,
@ -233,7 +291,7 @@ export default {
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "缺量补录单据",
"6": "流转自动补单",
"7": "UDI供应商平台",
"8": "平衡补录单据",
"10": "手动补单",
@ -285,7 +343,16 @@ export default {
],
},
codeQuery: {
code: null,
orderId: null,
status: null,
invCode: null,
nameCode: null,
cpmctymc: null,
ggxh: null,
batchNo: null,
ylqxzcrbarmc: null,
zczbhhzbapzbh: null,
page: 1,
limit: 10
},
@ -293,6 +360,13 @@ export default {
codeDetailLoading: false,
codeDetailList: [],
fromOptions: [],
auditDateRange: [],
showSup: false,
statusMap: {
1: "在库",
2: "已使用",
3: "已退回",
}
};
},
components: {},
@ -301,26 +375,19 @@ export default {
this.$router.push({
path: "",
});
this.filterQuery = {
id: "",
billNo: null,
page: 1,
limit: 10,
startTime: null,
endTime: null,
};
this.getList();
},
onSubmit() {
this.loading = true;
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
if (this.auditDateRange !== null) {
this.codeQuery.startAduditTime = this.auditDateRange[0];
this.codeQuery.endAduditTime = this.auditDateRange[1];
} else {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
this.codeQuery.startAduditTime = null;
this.codeQuery.endAduditTime = null;
}
this.filterQuery.page = 1;
this.codeQuery.page = 1;
this.getList();
},
hideSearch() {
@ -357,6 +424,7 @@ export default {
this.loading = true;
this.currentRow = {billNo: ""};
this.clearDetailList();
this.filterQuery.fromCorp = store.getters.customerId
filterPrein(this.filterQuery)
.then((response) => {
this.loading = false;
@ -417,18 +485,20 @@ export default {
};
this.getCodeDetailList();
},
keyup_submit(event) {
this.filterQuery.page = 1;
this.getList();
event.target.select();
},
onCodeSubmit() {
this.codeQuery.page = 1;
this.getCodeDetailList();
},
getCodeDetailList() {
if (isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据!")
return;
}
this.codeQuery.orderId = this.currentRow.billNo;
this.codeDetailLoading = true;
this.codeQuery.productName= this.codeQuery.cpmctymc;
filterDetail(this.codeQuery).then((res) => {
this.codeDetailLoading = false;
if (res.code === 20000) {
@ -483,6 +553,11 @@ export default {
};
},
created() {
let supId = this.$store.getters.customerId;
if (supId == "110") {
this.showSup = true;
}
this.getList();
},
};

@ -3,78 +3,62 @@
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="4">
<el-form-item class="query-form-item" label="产品标识DI:">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"
style="width: 90%"
clearable="true"></el-input>
<el-col :span="18">
<el-form-item class="query-form-item" label="扫码查询:">
<el-input v-model="filterQuery.udiCode"
style="width: 97%"
placeholder="请扫描或输入UDI码"
clearable="true"
@keyup.enter.native="keyup_submit($event)"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="query-form-item" label="产品名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="DI/物资编码:">
<el-input v-model="filterQuery.nameCode" placeholder="DI/物资编码"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="query-form-item" label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="批次号"
<el-col :span="6">
<el-form-item class="query-form-item" label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="物资名称"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="query-form-item" label="供应商名称:">
<el-select
v-model="filterQuery.supId"
filterable
remote
clearable="true"
reserve-keyword
placeholder="供应商名称"
:remote-method="findMethod"
size="mini"
:loading="corpLoading"
@change="corpChange"
style="width: 90%"
>
<el-option
v-for="item in fromOptions"
:key="item.name"
:label="item.name"
:value="item.erpId"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-col :span="6">
<el-form-item class="query-form-item" label="规格型号:">
<el-input v-model="filterQuery.ggxh" placeholder="规格型号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="query-form-item" label="批准文号:">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"
<el-col :span="6">
<el-form-item class="query-form-item" label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="批次号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="query-form-item" label="生产厂家:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="注册/备案号:">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@ -110,24 +94,28 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品标识" prop="nameCode"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="部门" prop="deptName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="仓库" prop="invName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="操作" width="150">
<el-table-column label="计量单位" prop="measname" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
@ -257,8 +245,15 @@ export default {
this.filterQuery.page = val;
this.getList();
},
keyup_submit(event) {
this.filterQuery.page = 1;
this.getList();
event.target.select();
},
getList() {
this.loading = true;
this.filterQuery.supId = this.$store.getters.customerId;
getInvPreProduct(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
@ -361,6 +356,10 @@ export default {
};
},
created() {
let supId = this.$store.getters.customerId;
if (supId == "110") {
this.showSup = true;
}
this.findMethod();
this.getInvList();
this.getList();

@ -3,13 +3,13 @@
<el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border>
<el-descriptions-item>
<template slot="label">
产品名称
物资名称
</template>
{{ inputQuery.cpmctymc }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
产品标识
DI/物资编码
</template>
{{ inputQuery.nameCode }}
</el-descriptions-item>
@ -41,9 +41,9 @@
</el-descriptions>
<el-form :inline="true" :model="invPreProductDetailQuery" style="margin-top: 10px;" size="mini">
<el-form-item class="query-form-item" label="码:">
<el-form-item class="query-form-item" label="UDI码:">
<el-input v-model="invPreProductDetailQuery.code"
placeholder="码查询"
placeholder="请输入UDI码查询"
clearable
style="width: 100%"
></el-input>
@ -61,9 +61,15 @@
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="码"
label="UDI码"
prop="code"
width="500"
width="350"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="出入库单号"
prop="orderId"
width="180"
show-overflow-tooltip
></el-table-column>
<el-table-column
@ -90,16 +96,11 @@
show-overflow-tooltip
></el-table-column>
<el-table-column
label="单日期"
label="日期"
prop="orderTime"
width="150"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="所属单据"
prop="orderId"
show-overflow-tooltip
></el-table-column>
</el-table>
<pagination

@ -3,28 +3,77 @@
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="4">
<el-form-item class="query-form-item" label="产品标识DI:">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"
<el-col :span="18">
<el-form-item class="query-form-item" label="扫码查询:">
<el-input v-model="filterQuery.udiCode"
style="width: 97%"
placeholder="请扫描或输入UDI码"
clearable="true"
@keyup.enter.native="keyup_submit($event)"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="DI/物资编码:">
<el-input v-model="filterQuery.nameCode" placeholder="DI/物资编码"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="query-form-item" label="产品名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"
<el-col :span="6">
<el-form-item class="query-form-item" label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="物资名称"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item class="query-form-item" label="规格型号:">
<el-input v-model="filterQuery.ggxh" placeholder="规格型号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="批次号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="注册/备案号:">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="供应商名称:">
<el-select
v-model="filterQuery.supId"
@ -50,45 +99,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-form-item class="query-form-item" label="规格型号:">
<el-input v-model="filterQuery.ggxh" placeholder="规格型号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="query-form-item" label="批准文号:">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="query-form-item" label="生产厂家:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
@ -110,24 +122,26 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品标识" prop="nameCode"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="部门" prop="deptName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="仓库" prop="invName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="操作" width="150">
<el-table-column label="计量单位" prop="measname" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="110" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
@ -195,6 +209,7 @@ export default {
invCode: this.$store.getters.locInvCode,
page: 1,
limit: 10,
udiCode: null,
},
list: [],
total: 0,
@ -204,8 +219,8 @@ export default {
id: "",
status: 10,
},
corpLoading: false,
dialogVisible: false,
corpLoading: false,
fromOptions: [],
showSup: false,
detailDialogVisible: false,
@ -241,6 +256,14 @@ export default {
};
this.getList();
},
keyup_submit(event) {
this.filterQuery.page = 1;
this.getList();
event.target.select();
},
onSubmit() {
this.filterQuery.page = 1;
this.getList();
@ -258,6 +281,7 @@ export default {
},
getList() {
this.loading = true;
getProduct(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
@ -360,6 +384,10 @@ export default {
};
},
created() {
let supId = this.$store.getters.customerId;
if (supId == "110") {
this.showSup = true;
}
this.findMethod();
this.getInvList();
this.getList();

@ -3,17 +3,16 @@
<el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border>
<el-descriptions-item>
<template slot="label">
产品名称
物资名称
</template>
{{ inputQuery.cpmctymc }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
产品标识
DI/物资编码
</template>
{{ inputQuery.nameCode }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
批次号
@ -41,14 +40,13 @@
</el-descriptions>
<el-form :inline="true" :model="invProductDetailQuery" style="margin-top: 10px;" size="mini">
<el-form-item class="query-form-item" label="码:">
<el-form-item class="query-form-item" label="UDI码:">
<el-input v-model="invProductDetailQuery.code"
placeholder="码查询"
placeholder="请输入UDI码查询"
clearable
style="width: 100%"
></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" icon="search" @click="onSubmit"
@ -58,12 +56,18 @@
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table v-loading="loading" :data="list" style="width: 100%" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="码"
label="UDI码"
prop="code"
width="500"
width="350"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="出入库单号"
prop="orderId"
width="180"
show-overflow-tooltip
></el-table-column>
<el-table-column
@ -90,18 +94,12 @@
show-overflow-tooltip
></el-table-column>
<el-table-column
label="单日期"
label="日期"
prop="orderTime"
width="150"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="所属单据"
prop="orderId"
show-overflow-tooltip
></el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"

@ -38,7 +38,7 @@
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="产品名称:">
<el-form-item class="query-form-item" label="物资名称:">
<el-autocomplete
class="inline-input"
style="width: 90%"
@ -88,20 +88,20 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="忽略状态:">
<el-select v-model="filterQuery.ignoreStatus"
placeholder="请选择消息忽略状态"
clearable
style="width: 90%"
>
<el-option label="不忽略" :value="0"></el-option>
<el-option label="忽略7天" :value="1"></el-option>
<el-option label="忽略15天" :value="2"></el-option>
<el-option label="忽略30天" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="忽略状态:">-->
<!-- <el-select v-model="filterQuery.ignoreStatus"-->
<!-- placeholder="请选择消息忽略状态"-->
<!-- clearable-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option label="不忽略" :value="0"></el-option>-->
<!-- <el-option label="忽略7天" :value="1"></el-option>-->
<!-- <el-option label="忽略15天" :value="2"></el-option>-->
<!-- <el-option label="忽略30天" :value="3"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item class="query-form-item" label="预警类型:">
@ -134,37 +134,41 @@
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="仓库名称" prop="invName" width="200"></el-table-column>
<el-table-column label="货位名称" prop="invSpaceName" width="200"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="300" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="消息状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="忽略预警" prop="ignoreStatus" width="100">
<el-table-column label="仓库名称" prop="invName" width="120"></el-table-column>
<el-table-column label="货位名称" prop="invSpaceName" width="120"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="消息状态" prop="status" width="120">
<template slot-scope="scope">
<el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>
<el-tag :type="statusFilterType(scope.row.status)">{{
statusMap[scope.row.status]
}}
</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="忽略预警" prop="ignoreStatus" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="预警类型" prop="type" width="120">
<template slot-scope="scope">
<el-tag>{{ typeMap[scope.row.type] }}</el-tag>
<el-tag type="danger">{{ typeMap[scope.row.type] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="预警内容" prop="msg" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="预警内容" prop="msg" width="250" show-overflow-tooltip></el-table-column>
<el-table-column label="处理方式" prop="handleMsg" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="100"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="100"></el-table-column>
<el-table-column label="库存数量" prop="productionDate" width="100"></el-table-column>
<el-table-column label="库存数量" prop="reCount" width="100"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="批准文号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="100">
<el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
@ -173,13 +177,13 @@
@click.native="confirmMsg(scope.row)"
>确认
</el-button>
<el-button
type="text"
size="small"
v-if="scope.row.ignoreStatus === 0"
@click.native="ignoreMsg(scope.row)"
>忽略
</el-button>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- v-if="scope.row.ignoreStatus === 0"-->
<!-- @click.native="ignoreMsg(scope.row)"-->
<!-- >忽略-->
<!-- </el-button>-->
</template>
</el-table-column>
</el-table>
@ -192,6 +196,77 @@
/>
</el-card>
<el-dialog
v-if="confirmMsgVisible"
title="确认预警信息"
:visible.sync="confirmMsgVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="60%"
top="5vh"
>
<el-form :model="rowData" label-width="200px" style="margin-bottom: -15px">
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="仓库:">
<el-input v-model="rowData.invName" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="货位:">
<el-input v-model="rowData.invSpaceName" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="产品名称:">
<el-input v-model="rowData.productName" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="规格型号:">
<el-input v-model="rowData.ggxh" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-eow>
<el-col :span="10">
<el-form-item class="query-form-item" label="预警类型:">
<el-input v-model="rowData.msg" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="预警类型:">
<el-input v-model="rowData.typeName" disabled></el-input>
</el-form-item>
</el-col>
</el-eow>
<el-row >
<el-col :span="20">
<el-form-item class="query-form-item" label="备注:">
<el-input v-model="handleMsg" auto-complete="off"
type="textarea" style="width: 90%"
placeholder="请输入备注内容"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="closeConfirmDialog">取消</el-button>
<el-button type="primary" @click.native="updateHandleMsg()"
>提交
</el-button>
</div>
</el-dialog>
<!-- 忽略预警弹窗 -->
<el-dialog
@ -264,7 +339,11 @@ export default {
spaceList: [],
ggxhList: [],
ignoreVisible: false,
currentId: null
currentId: null,
confirmMsgVisible: false,
handleMsg: null,
rowData: null,
};
},
methods: {
@ -380,24 +459,11 @@ export default {
this.filterQuery.relId = null;
},
confirmMsg(row) {
this.$prompt('请输入处理方式', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
}).then(({value}) => {
let params = {
id: row.id,
handleMsg: value
};
confirmMsg(params).then((res) => {
if (res.code === 20000) {
this.$message.success("已确认");
this.getList();
} else {
this.$message.error(res.message);
}
})
}).catch(() => {
});
this.rowData = row;
let typeName = this.typeMap[row.type];
this.rowData.typeName = typeName;
this.handleMsg = null;
this.confirmMsgVisible = true;
},
ignoreMsg(row) {
this.ignoreVisible = true;
@ -421,6 +487,39 @@ export default {
this.currentId = null;
})
},
closeConfirmDialog() {
this.confirmMsgVisible = false;
this.rowData = {}
},
updateHandleMsg() {
let params = {
id: this.rowData.id,
handleMsg: this.handleMsg
};
confirmMsg(params).then((res) => {
if (res.code === 20000) {
this.rowData = {};
this.handleMsg = null;
this.confirmMsgVisible = false;
this.$message.success("已确认");
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.rowData = {};
this.handleMsg = null;
this.confirmMsgVisible = false;
this.$message.error(error.message);
})
},
statusFilterType(status) {
const statusMap = {
1: "warning",
2: "success",
};
return statusMap[status];
},
},
created() {
this.getInvList();

Loading…
Cancel
Save