界面相关修改

master
anthonywj 2 years ago
parent 8aca3de6ef
commit 1c25967b8d

@ -335,7 +335,6 @@
</div> </div>
<el-row <el-row
:gutter="20" :gutter="20"
class="el-row" class="el-row"
@ -476,11 +475,11 @@
label="序号" label="序号"
width="50" width="50"
></el-table-column> ></el-table-column>
<el-table-column label="证书名称" prop="name"></el-table-column> <el-table-column label="证书名称" prop="name" show-overflow-tooltip></el-table-column>
<el-table-column label="证书编号" prop="code" ></el-table-column> <el-table-column label="证书编号" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column label="生效日期" prop="validDate"></el-table-column> <el-table-column label="生效日期" prop="validDate" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column> <el-table-column label="失效日期" prop="expireDate" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="确认状态" prop="checkStatus" width="80"> <el-table-column label="确认状态" prop="checkStatus" width="80" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.checkStatus | statusFilterType"> <el-tag :type="scope.row.checkStatus | statusFilterType">
{{ checkFlag[scope.row.checkStatus] }} {{ checkFlag[scope.row.checkStatus] }}
@ -503,7 +502,7 @@
<el-table-column label="备注" prop="remark"></el-table-column> <el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" width="140"> <el-table-column label="操作" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -1027,6 +1026,7 @@ export default {
margin: auto; margin: auto;
} }
.el-form-item { .el-form-item {
margin-top: 5px; margin-top: 5px;
margin-bottom: 4px; margin-bottom: 4px;

@ -46,7 +46,8 @@
</el-col> </el-col>
<el-col type="flex" :span="8"> <el-col type="flex" :span="8">
<el-form-item label="查询场景:" prop="traceSource" class="query-form-item"> <el-form-item label="查询场景:" prop="traceSource" class="query-form-item">
<el-select v-model="filterQuery.traceSource" placeholder="请选择查询场景" style="width: 90%" @change="onSubmit" clearable> <el-select v-model="filterQuery.traceSource" placeholder="请选择查询场景" style="width: 90%" @change="onSubmit"
clearable>
<el-option label="源头查询" value="1"></el-option> <el-option label="源头查询" value="1"></el-option>
<el-option label="现场检查查询" value="2"></el-option> <el-option label="现场检查查询" value="2"></el-option>
<!-- <el-option label="出库" value="3"></el-option>--> <!-- <el-option label="出库" value="3"></el-option>-->
@ -55,7 +56,8 @@
</el-col> </el-col>
<el-col type="flex" :span="8"> <el-col type="flex" :span="8">
<el-form-item label="查询方案:" prop="traceType" class="query-form-item"> <el-form-item label="查询方案:" prop="traceType" class="query-form-item">
<el-select v-model="filterQuery.traceType" placeholder="请选择查询方案" style="width: 90%" @change="onSubmit" clearable> <el-select v-model="filterQuery.traceType" placeholder="请选择查询方案" style="width: 90%" @change="onSubmit"
clearable>
<el-option label="按UDI码查询" value="1"></el-option> <el-option label="按UDI码查询" value="1"></el-option>
<el-option label="组合条件查询" value="2"></el-option> <el-option label="组合条件查询" value="2"></el-option>
<!-- <el-option label="出库" value="3"></el-option>--> <!-- <el-option label="出库" value="3"></el-option>-->
@ -102,7 +104,10 @@
{{ formatTaskType1(traceType.row) }} {{ formatTaskType1(traceType.row) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="查询人" prop="createUser" width="120"show-overflow-tooltip></el-table-column>--> <el-table-column label="查询人" prop="createUser" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="查询时间" prop="updateTime" width="120" show-overflow-tooltip></el-table-column>
-->
<!-- <el-table-column label="备注" prop="remark" width="220"></el-table-column>--> <!-- <el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
<el-table-column label="操作" width="100" fixed="right"> <el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
@ -287,13 +292,15 @@
highlight-current-row border> highlight-current-row border>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<!-- <el-table-column label="记录号" prop="recordCode" width="180"show-overflow-tooltip></el-table-column>--> <!-- <el-table-column label="记录号" prop="recordCode" width="180"show-overflow-tooltip></el-table-column>-->
<el-table-column label="生产订单号" prop="billNo" width="220"show-overflow-tooltip></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="订单日期" prop="billDate" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="上报企业" prop="companyName" width="160"></el-table-column>
<el-table-column label="DI标识" prop="nameCode" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="生产订单号" prop="billNo" width="160"></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="订单日期" prop="billDate" width="140"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="DI标识" prop="nameCode" width="120"></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="产品通用名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"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="ylqxzcrbarmc" width="160"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160"></el-table-column>
<el-table-column label="操作" width="100" fixed="right"> <el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -313,16 +320,16 @@
highlight-current-row border> highlight-current-row border>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="UDI码" prop="code" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="UDI码" prop="code" width="180" show-overflow-tooltip></el-table-column>
<!-- <el-table-column label="父码" prop="pcode" width="180"show-overflow-tooltip></el-table-column>--> <el-table-column label="父级UDI码" prop="pcode" width="180"></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="160"show-overflow-tooltip></el-table-column> <el-table-column label="产品通用名称" prop="cpmctymc" width="160"></el-table-column>
<el-table-column label="DI标识" prop="nameCode" width="160"show-overflow-tooltip></el-table-column> <el-table-column label="DI标识" prop="nameCode" width="160"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" 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="batchNo" width="120"show-overflow-tooltip></el-table-column> <el-table-column label="批次号" prop="batchNo" width="140"></el-table-column>
<el-table-column label="生产日期" prop="produceDate" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="生产日期" prop="produceDate" width="140"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="失效日期" prop="expireDate" width="140"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="120"show-overflow-tooltip></el-table-column> <el-table-column label="序列号" prop="serialNo" width="140"></el-table-column>
<el-table-column label="包装层级" prop="bzcj" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="包装层级" prop="bzcj" width="140"></el-table-column>
<el-table-column label="包装状态" prop="packState" width="180" <el-table-column label="包装状态" prop="packState" width="140"
:formatter="formaterPackState"></el-table-column> :formatter="formaterPackState"></el-table-column>
<el-table-column label="操作" width="100" fixed="right"> <el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
@ -599,19 +606,18 @@
<!-- <el-table-column label="出入库类型" prop="inOutType" width="100"--> <!-- <el-table-column label="出入库类型" prop="inOutType" width="100"-->
<!-- :formatter="formaterInOutType"></el-table-column>--> <!-- :formatter="formaterInOutType"></el-table-column>-->
<el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="上报企业" prop="companyName" width="180" 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="ylqxzcrbarmc" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="社会统一信用号" prop="creditNum" width="200" 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="billNo" width="150" show-overflow-tooltip></el-table-column> <el-table-column label="单据号" prop="billNo" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="单据类型" prop="billType" width="100" show-overflow-tooltip></el-table-column> <el-table-column label="单据类型" prop="billType" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="单据日期" prop="billDate" width="150" show-overflow-tooltip></el-table-column> <el-table-column label="单据日期" prop="billDate" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="更新时间" prop="updateTime" width="150"show-overflow-tooltip></el-table-column>
<el-table-column label="发货企业" prop="fromCorp" width="220" show-overflow-tooltip></el-table-column> <el-table-column label="发货企业" prop="fromCorp" width="220" show-overflow-tooltip></el-table-column>
<el-table-column label="收货企业" prop="toCorp" width="220" show-overflow-tooltip></el-table-column> <el-table-column label="收货企业" prop="toCorp" width="220" show-overflow-tooltip></el-table-column>
<el-table-column label="上报企业" prop="companyIdFk" width="220" <el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
:formatter="formatCompanyName" 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="batchNo" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="更新时间" prop="updateTime" width="150" show-overflow-tooltip></el-table-column>
<!-- <el-table-column label="备注" prop="remark" width="220"></el-table-column>--> <!-- <el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
<!-- <el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>--> <!-- <el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>-->
@ -1158,10 +1164,20 @@ export default {
border-radius: 4px; border-radius: 4px;
flex-wrap: wrap; flex-wrap: wrap;
} }
.query-form-item { .query-form-item {
display: block !important; display: block !important;
margin-right: 10px; margin-right: 10px;
margin-bottom: 5px; margin-bottom: 5px;
} }
.form-title {
font-size: 16px;
font-family: Noto Sans SC;
font-weight: bold;
color: #303133;
padding-bottom: 17px;
padding-top: 17px;
}
</style> </style>

@ -11,19 +11,20 @@
@change="onSubmit" @change="onSubmit"
clearable clearable
> >
<el-option label="关联关系" value="1"></el-option> <el-option label="生产单据" value="1"></el-option>
<el-option label="入库" value="2"></el-option> <el-option label="出入库单据" value="2"></el-option>
<el-option label="出库" value="3"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col type="flex" :span="8"> <el-col type="flex" :span="8">
<el-form-item label="任务状态:" prop="status" class="query-form-item"> <el-form-item label="任务状态:" prop="status" class="query-form-item">
<el-select v-model="filterQuery.status" placeholder="请选择任务状态" style="width: 90%" @change="onSubmit" clearable> <el-select v-model="filterQuery.status" placeholder="请选择任务状态" style="width: 90%" @change="onSubmit"
clearable>
<el-option label="未处理" value="1"></el-option> <el-option label="未处理" value="1"></el-option>
<el-option label="正在处理" value="2"></el-option> <el-option label="正在处理" value="2"></el-option>
<el-option label="已处理" value="3"></el-option> <el-option label="已处理" value="3"></el-option>
<el-option label="已超时" value="4"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -151,17 +152,17 @@
</el-table-column> </el-table-column>
<el-table-column label="查询企业" prop="companyName" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="社会统一信用号" prop="creditNum" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200"show-overflow-tooltip></el-table-column>
<el-table-column label="社会统一信用号" prop="creditNum" width="220"show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="产品通用名称" prop="cpmctymc" width="180" 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="ggxh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="180"show-overflow-tooltip></el-table-column>
<el-table-column label="生产日期" prop="produceDate" 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="expireDate" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="生产日期" prop="produceDate" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="120"show-overflow-tooltip></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="180"show-overflow-tooltip></el-table-column>
<!-- <el-table-column label="创建时间" prop="createTime" width="180"></el-table-column>--> <!-- <el-table-column label="创建时间" prop="createTime" width="180"></el-table-column>-->
<!-- <el-table-column label="更新时间" prop="updateTime" width="180"></el-table-column>--> <!-- <el-table-column label="更新时间" prop="updateTime" width="180"></el-table-column>-->
@ -291,6 +292,7 @@
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {deleteTaskList, getTraceHistoryTaskList} from "@/api/udi/udiTrace"; import {deleteTaskList, getTraceHistoryTaskList} from "@/api/udi/udiTrace";
const formJson = { const formJson = {
id: "", id: "",
passWord: "", passWord: "",
@ -400,11 +402,11 @@ export default {
formatTaskType(row) { formatTaskType(row) {
switch (row.taskType) { switch (row.taskType) {
case 1: case 1:
return '关联关系'; return '生产单据';
case 2: case 2:
return '入库'; return '入库单据';
case 3: case 3:
return '出库'; return '出单据';
default: default:
return '任务类型有误!!'; return '任务类型有误!!';
} }
@ -569,6 +571,7 @@ export default {
border-radius: 4px; border-radius: 4px;
flex-wrap: wrap; flex-wrap: wrap;
} }
.query-form-item { .query-form-item {
display: block !important; display: block !important;
margin-right: 10px; margin-right: 10px;

@ -57,7 +57,6 @@
:label="item.cpmctymc" :label="item.cpmctymc"
:value="item.cpmctymc" :value="item.cpmctymc"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -159,15 +158,14 @@
@row-click="handleSelectionChange" @row-click="handleSelectionChange"
highlight-current-row border> highlight-current-row border>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="生产订单号" prop="billNo" width="220"></el-table-column> <el-table-column label="上报企业" prop="companyName" width="160"></el-table-column>
<el-table-column label="订单日期" prop="billDate" width="180"></el-table-column> <el-table-column label="生产订单号" prop="billNo" width="160"></el-table-column>
<el-table-column label="DI标识" prop="nameCode" width="180"></el-table-column> <el-table-column label="订单日期" prop="billDate" width="140"></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="DI标识" prop="nameCode" width="120"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="产品通用名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="180"></el-table-column> <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column> <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="160"></el-table-column>
<el-table-column label="上报企业" prop="companyName" width="200" <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160"></el-table-column>
></el-table-column>
<el-table-column label="操作" width="100" fixed="right"> <el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -181,22 +179,22 @@
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-tabs type="border-card"> <el-tabs type="border-card">
<el-tab-pane> <el-tab-pane>
<span slot="label">生产信息 {{ currentRow == null ? '' : currentRow.billNo }}-关联关系</span> <span slot="label">生产信息 {{ currentRow == null ? '' : currentRow.billNo }}-UDI码关联关系</span>
<el-table v-loading="manuCodeRelLoading" :data="listCodeRel" <el-table v-loading="manuCodeRelLoading" :data="listCodeRel"
style="width: 100%" style="width: 100%"
highlight-current-row border> highlight-current-row border>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="UDI码" prop="code" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="UDI码" prop="code" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="父码" prop="pcode" width="180"></el-table-column> <el-table-column label="父级UDI码" prop="pcode" width="180"></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="160"></el-table-column> <el-table-column label="产品通用名称" prop="cpmctymc" width="160"></el-table-column>
<el-table-column label="DI标识" prop="nameCode" width="160"></el-table-column> <el-table-column label="DI标识" prop="nameCode" width="160"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" 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="batchNo" width="120"></el-table-column> <el-table-column label="批次号" prop="batchNo" width="140"></el-table-column>
<el-table-column label="生产日期" prop="produceDate" width="180"></el-table-column> <el-table-column label="生产日期" prop="produceDate" width="140"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="180"></el-table-column> <el-table-column label="失效日期" prop="expireDate" width="140"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="120"></el-table-column> <el-table-column label="序列号" prop="serialNo" width="140"></el-table-column>
<el-table-column label="包装层级" prop="bzcj" width="180"></el-table-column> <el-table-column label="包装层级" prop="bzcj" width="140"></el-table-column>
<el-table-column label="包装状态" prop="packState" width="180" <el-table-column label="包装状态" prop="packState" width="140"
:formatter="formaterPackState"></el-table-column> :formatter="formaterPackState"></el-table-column>
<el-table-column label="操作" width="100" fixed="right"> <el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
@ -471,21 +469,19 @@
<!-- :formatter="formaterSourceType"></el-table-column>--> <!-- :formatter="formaterSourceType"></el-table-column>-->
<!-- <el-table-column label="出入库类型" prop="inOutType" width="100"--> <!-- <el-table-column label="出入库类型" prop="inOutType" width="100"-->
<!-- :formatter="formaterInOutType"></el-table-column>--> <!-- :formatter="formaterInOutType"></el-table-column>-->
<el-table-column label="上报企业" prop="companyName" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="单据号" prop="billNo" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="单据类型" prop="billType" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="单据日期" prop="billDate" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="发货企业" prop="fromCorp" width="220" show-overflow-tooltip></el-table-column>
<el-table-column label="收货企业" prop="toCorp" width="220" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="产品通用名称" prop="cpmctymc" width="180" 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="ggxh" 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="batchNo" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="单据号" prop="billNo" width="150"></el-table-column>
<el-table-column label="单据类型" prop="billType" width="100"></el-table-column>
<el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>
<el-table-column label="发货企业" prop="fromCorp" width="220"></el-table-column>
<el-table-column label="收货企业" prop="toCorp" width="220"></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200" show-overflow-tooltip></el-table-column> <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column> <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="更新时间" prop="updateTime" width="150"></el-table-column> <el-table-column label="更新时间" prop="updateTime" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="上报企业" prop="companyName" width="200"
></el-table-column>
<!-- <el-table-column label="备注" prop="remark" width="220"></el-table-column>--> <!-- <el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
@ -837,30 +833,11 @@ export default {
}) })
}, },
orderTimeOut() { orderTimeOut() {
//
this.filterQuery.page = 1; this.filterQuery.page = 1;
this.searchIng = true; this.searchIng = true;
if ((this.list == undefined || this.list.length <= 0)) {
this.getRecordResult()
} else {
this.searchIng = false;
}
// 使 // 使
// if (this.list == undefined || this.list.length <= 0) { this.getRecordResult()
this.monitorOrder = setTimeout(this.orderTimeOut, 10000); this.monitorOrder = setTimeout(this.orderTimeOut, 10000);
// }
},
formaterSourceType(row) {
if (row.sourceType == 1) {
this.formateSourceType = "起始位置"
return "起始位置"
} else if (row.sourceType == 2) {
this.formateSourceType = "中间位置"
return "中间位置"
} else {
this.formateSourceType = "结束位置"
return "结束位置"
}
}, },
formaterInOutType(row) { formaterInOutType(row) {
if (row.inOutType == 1) { if (row.inOutType == 1) {
@ -1008,11 +985,11 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
}; };
this.list = "", this.list = "";
this.listOrder = null, this.listOrder = null;
this.listCodeRel = null, this.listCodeRel = null;
clearTimeout(this.monitorOrder); clearTimeout(this.monitorOrder);
this.monitorOrder = "", this.monitorOrder = "";
this.searchIng = false; this.searchIng = false;
}, },
getList() { getList() {
@ -1037,10 +1014,6 @@ export default {
}, },
created() { created() {
this.getCompanyName() this.getCompanyName()
if (this.list > 0) {
clearTimeout(this.monitorOrder);
this.monitorOrder = ""
}
}, },
beforeDestroy() { beforeDestroy() {
if (this.monitorOrder) { if (this.monitorOrder) {

@ -192,13 +192,14 @@
@row-click="handleSelectionChange" @row-click="handleSelectionChange"
highlight-current-row border> highlight-current-row border>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="生产订单号" prop="billNo" width="220"show-overflow-tooltip></el-table-column> <el-table-column label="上报企业" prop="companyName" width="160"></el-table-column>
<el-table-column label="订单日期" prop="billDate" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="生产订单号" prop="billNo" width="160"></el-table-column>
<el-table-column label="DI标识" prop="nameCode" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="订单日期" prop="billDate" width="140"></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="DI标识" prop="nameCode" width="120"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="产品通用名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="180"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="zczbhhzbapzbh" width="180"show-overflow-tooltip></el-table-column> <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="160"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160"></el-table-column>
<el-table-column label="操作" width="100" fixed="right"> <el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -212,7 +213,7 @@
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-tabs type="border-card"> <el-tabs type="border-card">
<el-tab-pane> <el-tab-pane>
<span slot="label">生产信息 {{ currentRow == null ? '' : currentRow.billNo }}-关联关系</span> <span slot="label">生产信息 {{ currentRow == null ? '' : currentRow.billNo }}-UDI码关联关系</span>
<el-table v-loading="manuCodeRelLoading" :data="listCodeRel" <el-table v-loading="manuCodeRelLoading" :data="listCodeRel"
style="width: 100%" style="width: 100%"
highlight-current-row border> highlight-current-row border>
@ -496,19 +497,19 @@
<el-table v-loading="loading" :data="list" <el-table v-loading="loading" :data="list"
style="width: 100%" style="width: 100%"
border highlight-current-row> border highlight-current-row>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="上报企业" prop="companyName" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="单据号" prop="billNo" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="单据类型" prop="billType" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="单据日期" prop="billDate" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="发货企业" prop="fromCorp" width="220" show-overflow-tooltip></el-table-column>
<el-table-column label="收货企业" prop="toCorp" width="220" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="产品通用名称" prop="cpmctymc" width="180" 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="ggxh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120" 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="billNo" width="150"></el-table-column> <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="单据类型" prop="billType" width="100"></el-table-column> <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="单据日期" prop="billDate" width="150"></el-table-column> <el-table-column label="更新时间" prop="updateTime" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="更新时间" prop="updateTime" width="150"></el-table-column>
<el-table-column label="发货企业" prop="fromCorp" width="220"></el-table-column>
<el-table-column label="收货企业" prop="toCorp" width="220"></el-table-column>
<el-table-column label="上报企业" prop="companyName" width="220"
></el-table-column>
<el-table-column label="操作" width="100" fixed="right"> <el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -856,30 +857,11 @@ export default {
}, },
orderTimeOut() { orderTimeOut() {
//
this.filterQuery.page = 1; this.filterQuery.page = 1;
this.searchIng = true; this.searchIng = true;
if ((this.list == undefined || this.list.length <= 0)) {
this.getRecordResult()
} else {
this.searchIng = false;
}
// 使 // 使
if (this.list == undefined || this.list.length <= 0) { this.getRecordResult()
this.monitorOrder = setTimeout(this.orderTimeOut, 10000); this.monitorOrder = setTimeout(this.orderTimeOut, 10000);
}
},
formaterSourceType(row) {
if (row.sourceType == 1) {
this.formateSourceType = "起始位置"
return "起始位置"
} else if (row.sourceType == 2) {
this.formateSourceType = "中间位置"
return "中间位置"
} else {
this.formateSourceType = "结束位置"
return "结束位置"
}
}, },
formaterInOutType(row) { formaterInOutType(row) {
if (row.inOutType == 1) { if (row.inOutType == 1) {
@ -1034,9 +1016,9 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
}; };
this.list = null, this.list = "";
this.listOrder = null, this.listOrder = null;
this.listCodeRel = null, this.listCodeRel = null;
clearTimeout(this.monitorOrder); clearTimeout(this.monitorOrder);
this.monitorOrder = ""; this.monitorOrder = "";
this.searchIng = false; this.searchIng = false;
@ -1062,11 +1044,7 @@ export default {
}, },
}, },
created() { created() {
this.getCompanyName() this.geCompanyNameList();
if (this.list > 0) {
clearTimeout(this.monitorOrder);
this.monitorOrder = ""
}
}, },
beforeDestroy() { beforeDestroy() {
if (this.monitorOrder) { if (this.monitorOrder) {

Loading…
Cancel
Save