UDI
/
udi-cpt-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/api/udi/udiTrace.js
master
1178634255 2 years ago
parent 83ef851a26 b78451cff0
commit 4c8d1aa4aa
2 changed files with 43 additions and 249 deletions
Show Stats Download Patch File Download Diff File

9
src/api/udi/udiTrace.js
Unescape Escape View File

@ -64,6 +64,15 @@ export function filterBatchNo(query) {
}); });
} }
export function sourceSearch(query) {
return axios({
url: "/udi/trace/source/search",
method: "get",
params: query
});
}
//任务列表 //任务列表
export function getTraceTaskList(query) { export function getTraceTaskList(query) {
return axios({ return axios({

283
src/views/udi/trace/search/index.vue
Unescape Escape View File

@ -1,43 +1,26 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form size="mini" label-width="110px">
<el-row type="flex">
<el-col type="flex" style="width: 300px">
<el-form-item prop="parent" label="查询方式:" class="query-form-item">
<el-select v-model="form.parent"
@change="onReset"
placeholder="请选择查询方式" clearable
style="width: 200px"
>
<el-option v-for="item in options" :key="item.value"
:label="item.label" :value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-divider style="margin: 15px"></el-divider>
<el-form size="mini"> <el-form size="mini">
<el-form-item prop="child" v-if="form.parent == 'A'"> <el-form-item prop="child">
<el-form v-show="showSearch" label-width="110px" size="mini"> <el-form v-show="showSearch" label-width="125px" size="mini">
<el-row type="flex"> <el-row type="flex">
<el-col type="flex"> <el-col :span="18">
<el-form-item label="UDI码:" class="query-form-item"> <el-form-item label="UDI码:" class="query-form-item">
<el-input v-model="filterQuery.udiCode" placeholder="UDI码查询(源头查询)" style="width: 650px" clearable></el-input> <el-input v-model="filterQuery.udiCode" placeholder="UDI码查询"
clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col type="flex"> <el-col :span="6">
<el-form-item label="医疗器械注册人:" class="query-form-item"> <el-form-item label="医疗器械注册人:" class="query-form-item">
<el-select <el-select
v-model="filterQuery.ylqxzcrbarmc" v-model="filterQuery.ylqxzcrbarmc"
filterable filterable
remote remote
style="width: 200px"
clearable="true" clearable="true"
style="width: 100%"
reserve-keyword reserve-keyword
placeholder="医疗器械注册人" placeholder="医疗器械注册人"
:remote-method="getYlqxzcrbarmcList" :remote-method="getYlqxzcrbarmcList"
@ -55,19 +38,19 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col class="el-col"> <el-col :span="6">
<el-form-item label="产品名称:" class="query-form-item"> <el-form-item label="产品名称:" class="query-form-item">
<el-select <el-select
v-model="filterQuery.cpmctymc" v-model="filterQuery.cpmctymc"
filterable filterable
remote remote
style="width: 200px"
clearable="true" clearable="true"
:disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''" :disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword reserve-keyword
placeholder="请输入产品名称" placeholder="请输入产品名称"
:remote-method="getCpmctymcList" :remote-method="getCpmctymcList"
:loading="loading" :loading="loading"
style="width: 100%"
@change="cpmctymcChange" @change="cpmctymcChange"
> >
<el-option <el-option
@ -79,22 +62,15 @@
</el-option> </el-option>
</el-select> </el-select>
<!-- <el-input
v-model="filterQuery.cpmctymc"
placeholder="请输入产品名称"
style="width: 200px"
clearable="true"
:disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
></el-input>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col class="el-col"> <el-col :span="6">
<el-form-item label="规格型号:" class="query-form-item"> <el-form-item label="规格型号:" class="query-form-item">
<el-select <el-select
v-model="filterQuery.ggxh" v-model="filterQuery.ggxh"
filterable filterable
remote remote
style="width: 200px" style="width: 100%"
clearable="true" clearable="true"
:disabled="filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' || :disabled="filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''" filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
@ -122,48 +98,26 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row>
<el-col type="flex"> <el-col :span="6">
<el-form-item label="DI标识:" class="query-form-item"> <el-form-item label="DI标识:" class="query-form-item">
<el-input <el-input
style="width: 100%"
v-model="filterQuery.nameCode" v-model="filterQuery.nameCode"
placeholder="请输入DI标识" placeholder="请输入DI标识"
style="width: 200px"
clearable="true" clearable="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col type="flex"> <el-col :span="6">
<el-form-item label="批次号:" class="query-form-item"> <el-form-item label="批次号:" class="query-form-item">
<el-select <el-input
v-model="filterQuery.batchNo" v-model="filterQuery.batchNo"
filterable placeholder="请输入批次号"
remote style="width: 100%"
style="width: 200px"
clearable="true" clearable="true"
:disabled="filterQuery.ggxh==null || filterQuery.ggxh=='' || :disabled="filterQuery.ggxh==null || filterQuery.ggxh==''"
filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' || ></el-input>
filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword
placeholder="请输入产品名称"
:remote-method="getBatchNoList"
:loading="loading"
>
<el-option
v-for="item in batchNoList"
:key="item.batchNo"
:label="item.batchNo"
:value="item.batchNo"
>
</el-option>
</el-select>
<!-- <el-input
v-model="filterQuery.batchNo"
placeholder="请输入批次号"
style="width: 200px"
clearable="true"
:disabled="filterQuery.ggxh==null || filterQuery.ggxh==''"
></el-input>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col type="flex"> <el-col type="flex">
@ -184,172 +138,6 @@
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form size="mini">
<el-form-item prop="child" v-if="form.parent == 'B'">
<el-form v-show="showSearch" label-width="110px" size="mini">
<el-row type="flex">
<el-col type="flex">
<el-form-item label="UDI码:" class="query-form-item">
<el-input v-model="filterQuery.udiCode" placeholder="UDI码查询(源头查询)" style="width: 650px" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col type="flex">
<el-form-item label="医疗器械注册人:" class="query-form-item">
<el-select
v-model="filterQuery.ylqxzcrbarmc"
filterable
remote
style="width: 200px"
clearable="true"
reserve-keyword
placeholder="医疗器械注册人"
:remote-method="getYlqxzcrbarmcList"
:loading="loading"
@change="ylqxzcrbarmcChange"
>
<el-option
v-for="item in fromOptions"
:key="item.ylqxzcrbarmc"
:label="item.ylqxzcrbarmc"
:value="item.ylqxzcrbarmc"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col class="el-col">
<el-form-item label="产品名称:" class="query-form-item">
<el-select
v-model="filterQuery.cpmctymc"
filterable
remote
style="width: 200px"
clearable="true"
:disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword
placeholder="请输入产品名称"
:remote-method="getCpmctymcList"
:loading="loading"
@change="cpmctymcChange"
>
<el-option
v-for="item in cpmctymcList"
:key="item.cpmctymc"
:label="item.cpmctymc"
:value="item.cpmctymc"
>
</el-option>
</el-select>
<!-- <el-input
v-model="filterQuery.cpmctymc"
placeholder="请输入产品名称"
style="width: 200px"
clearable="true"
:disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
></el-input>-->
</el-form-item>
</el-col>
<el-col class="el-col">
<el-form-item label="规格型号:" class="query-form-item">
<el-select
v-model="filterQuery.ggxh"
filterable
remote
style="width: 200px"
clearable="true"
:disabled="filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword
placeholder="请输入产品名称"
:remote-method="getGgxhList"
:loading="loading"
@change="ggxhChange"
>
<el-option
v-for="item in ggxhList"
:key="item.ggxh"
:label="item.ggxh"
:value="item.ggxh"
>
</el-option>
</el-select>
<!-- <el-input
v-model="filterQuery.ggxh"
placeholder="请输入规格型号"
style="width: 200px"
clearable="true"
:disabled="filterQuery.cpmctymc==null || filterQuery.cpmctymc==''"
></el-input>-->
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col type="flex">
<el-form-item label="DI标识:" class="query-form-item">
<el-input
v-model="filterQuery.nameCode"
placeholder="请输入DI标识"
style="width: 200px"
clearable="true"
></el-input>
</el-form-item>
</el-col>
<el-col type="flex">
<el-form-item label="批次号:" class="query-form-item">
<el-select
v-model="filterQuery.batchNo"
filterable
remote
style="width: 200px"
clearable="true"
:disabled="filterQuery.ggxh==null || filterQuery.ggxh=='' ||
filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword
placeholder="请输入产品名称"
:remote-method="getBatchNoList"
:loading="loading"
>
<el-option
v-for="item in batchNoList"
:key="item.batchNo"
:label="item.batchNo"
:value="item.batchNo"
>
</el-option>
</el-select>
<!-- <el-input
v-model="filterQuery.batchNo"
placeholder="请输入批次号"
style="width: 200px"
clearable="true"
:disabled="filterQuery.ggxh==null || filterQuery.ggxh==''"
></el-input>-->
</el-form-item>
</el-col>
<el-col type="flex">
</el-col>
</el-row>
</el-form>
<el-divider style="margin: 15px"></el-divider>
<div class="top-right-btn" style="display:flex;">
<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">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" size="mini"
>查询
</el-button
>
</el-button-group>
</div>
</el-form-item>
</el-form>
<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>
@ -550,7 +338,7 @@
<script> <script>
import {getTraceOrderList,filterCpmctymc,filterGgxh,filterBatchNo} from "@/api/udi/udiTrace"; import {getTraceOrderList, filterCpmctymc, filterGgxh, filterBatchNo, sourceSearch} from "@/api/udi/udiTrace";
import {filterCompany} from "@/api/basic/udiInfo"; import {filterCompany} from "@/api/basic/udiInfo";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
@ -572,9 +360,9 @@ export default {
{value: 'A', label: 'UDI码查询(源头查询)'}, {value: 'A', label: 'UDI码查询(源头查询)'},
{value: 'B', label: '按产品信息组合查询'}, {value: 'B', label: '按产品信息组合查询'},
], ],
form:{ form: {
parent:'', parent: '',
child:'', child: '',
}, },
total: 0, total: 0,
loading: false, loading: false,
@ -589,10 +377,10 @@ export default {
} }
}, },
methods: { methods: {
ggxhChange(){ ggxhChange() {
this.getBatchNoList() this.getBatchNoList()
}, },
getBatchNoList(query){ getBatchNoList(query) {
let params = { let params = {
ylqxzcrbarmc: this.filterQuery.ylqxzcrbarmc, ylqxzcrbarmc: this.filterQuery.ylqxzcrbarmc,
cpmctymc: this.filterQuery.cpmctymc, cpmctymc: this.filterQuery.cpmctymc,
@ -606,10 +394,10 @@ export default {
console.log(this.batchNoList) console.log(this.batchNoList)
}) })
}, },
cpmctymcChange(){ cpmctymcChange() {
this.getGgxhList() this.getGgxhList()
}, },
getGgxhList(query){ getGgxhList(query) {
let params = { let params = {
ylqxzcrbarmc: this.filterQuery.ylqxzcrbarmc, ylqxzcrbarmc: this.filterQuery.ylqxzcrbarmc,
cpmctymc: this.filterQuery.cpmctymc, cpmctymc: this.filterQuery.cpmctymc,
@ -622,10 +410,10 @@ export default {
console.log(this.ggxhList) console.log(this.ggxhList)
}) })
}, },
ylqxzcrbarmcChange(){ ylqxzcrbarmcChange() {
this.getCpmctymcList() this.getCpmctymcList()
}, },
getCpmctymcList(query){ getCpmctymcList(query) {
let params = { let params = {
ylqxzcrbarmc: this.filterQuery.ylqxzcrbarmc, ylqxzcrbarmc: this.filterQuery.ylqxzcrbarmc,
cpmctymc: query, cpmctymc: query,
@ -656,7 +444,7 @@ export default {
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
handleView(row){ handleView(row) {
this.list.forEach(obj => { this.list.forEach(obj => {
if (row.id == obj.id) { if (row.id == obj.id) {
this.formView = obj this.formView = obj
@ -665,7 +453,7 @@ export default {
console.log(this.formView) console.log(this.formView)
this.open = true this.open = true
}, },
onReset(){ onReset() {
this.$router.push({ this.$router.push({
path: "", path: "",
}); });
@ -682,15 +470,14 @@ export default {
}; };
//this.list = null //this.list = null
//this.total = 0 //this.total = 0
this.getList();
}, },
onSubmit(){ onSubmit() {
this.filterQuery.page = 1; this.filterQuery.page = 1;
this.getList() this.getList()
}, },
getList() { getList() {
this.loading = true; this.loading = true;
getTraceOrderList(this.filterQuery).then((res) => { sourceSearch(this.filterQuery).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.list = res.data.list || []; this.list = res.data.list || [];
@ -710,7 +497,6 @@ export default {
}, },
}, },
created() { created() {
this.getList()
} }
} }
</script> </script>
@ -738,7 +524,6 @@ div /deep/ .el-table .success-row {
.query-form-item { .query-form-item {
display: block !important; display: block !important;
margin-right: 10px;
margin-bottom: 5px; margin-bottom: 5px;
} }
</style> </style>

Write Preview
Loading…
Cancel
Save