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 f36c5526b8 82f42afb56
commit 83ef851a26
8 changed files with 390 additions and 55 deletions
Show Stats Download Patch File Download Diff File

19
.env.production
Unescape Escape View File

@ -7,26 +7,15 @@ VUE_APP_TITLE = UDI协调平台
# 生产环境配置
ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
#林纪裕cd
# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
# 测试服务器
# VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
# 文明东
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
# 吴总测试服务器
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
# 叶东旭
VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_CPT_SERVER/'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'
VUE_APP_CONTEXT_PATH = '/UDI_CPT_CLIENT/'
# 监控地址
VUE_APP_MONITRO_ADMIN = '/admin/login'

2
.env.test
Unescape Escape View File

@ -23,7 +23,7 @@ ENV = 'test'
VUE_APP_BASE_API = 'http://192.168.0.66:8883/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'
VUE_APP_CONTEXT_PATH = '/UDI_CPT_CLIENT/'
# 监控地址
VUE_APP_MONITRO_ADMIN = '/admin/login'

2
.gitignore vendored
Unescape Escape View File

@ -9,7 +9,7 @@ yarn-error.log*
tests/**/coverage/
tests/e2e/reports
selenium-debug.log
UDI_WMS_NEW/
UDI_CPT_CLIENT/
# Editor directories and files
.idea

2
package.bat
Unescape Escape View File

@ -1,4 +1,4 @@
rd /s /q UDI_WMS_NEW
rd /s /q UDI_CPT_CLIENT
npm run build:prod

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

@ -32,6 +32,38 @@ export function getManuCodeRelList(query) {
})
}
export function filterCpmctymc(query) {
return axios({
url: "/udi/basic/dict/filterCpmctymc",
method: "get",
params: query
});
}
export function filterGgxh(query) {
return axios({
url: "/udi/basic/dict/filterGgxh",
method: "get",
params: query
});
}
export function filterCompanyName(query) {
return axios({
url: "/udi/auth/user/comapny/filterCompanyName",
method: "get",
params: query
});
}
export function filterBatchNo(query) {
return axios({
url: "/udi/trace/order/filterBatchNo",
method: "get",
params: query
});
}
//任务列表
export function getTraceTaskList(query) {
return axios({

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

@ -1,38 +1,199 @@
<template>
<div>
<el-card>
<el-form size="mini">
<el-form size="mini" label-width="110px">
<el-row type="flex">
<el-col type="flex" :span="6" style="width: 300px">
<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>
<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-form-item prop="child" v-if="form.parent == 'A'" class="query-form-item">
<el-col type="flex" style="width: 660px">
<el-form-item label="UDI码:">
<el-input v-model="filterQuery.udiCode" placeholder="UDI码查询(源头查询)" style="width: 600px" clearable></el-input>
</el-form-item>
</el-col>
<el-col type="flex" style="width: 100px">
<el-form-item>
<el-button-group style="display:flex;">
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
</el-button-group>
</el-form-item>
</el-col>
</el-form-item>
</el-row>
</el-form>
<el-divider style="margin: 15px"></el-divider>
<el-form size="mini">
<el-form-item prop="child" v-if="form.parent == 'A'">
<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-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">
@ -44,9 +205,9 @@
clearable="true"
reserve-keyword
placeholder="医疗器械注册人"
:remote-method="findMethod"
:remote-method="getYlqxzcrbarmcList"
:loading="loading"
@change=""
@change="ylqxzcrbarmcChange"
>
<el-option
v-for="item in fromOptions"
@ -61,24 +222,68 @@
</el-col>
<el-col class="el-col">
<el-form-item label="产品名称:" class="query-form-item">
<el-input
<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-input>-->
</el-form-item>
</el-col>
<el-col class="el-col">
<el-form-item label="规格型号:" class="query-form-item">
<el-input
<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.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
></el-input>
:disabled="filterQuery.cpmctymc==null || filterQuery.cpmctymc==''"
></el-input>-->
</el-form-item>
</el-col>
</el-row>
@ -95,13 +300,35 @@
</el-col>
<el-col type="flex">
<el-form-item label="批次号:" class="query-form-item">
<el-input
<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.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
></el-input>
:disabled="filterQuery.ggxh==null || filterQuery.ggxh==''"
></el-input>-->
</el-form-item>
</el-col>
<el-col type="flex">
@ -323,8 +550,9 @@
<script>
import {getTraceOrderList} from "@/api/udi/udiTrace";
import {getUdiInfos, filterCompany} from "@/api/basic/udiInfo";
import {getTraceOrderList,filterCpmctymc,filterGgxh,filterBatchNo} from "@/api/udi/udiTrace";
import {filterCompany} from "@/api/basic/udiInfo";
import {isBlank} from "@/utils/strUtil";
export default {
data() {
@ -355,11 +583,61 @@ export default {
formView: {},
showSearch: true,
fromOptions: [],
cpmctymcList: []
cpmctymcList: [],
ggxhList: [],
batchNoList: []
}
},
methods: {
findMethod(query) {
ggxhChange(){
this.getBatchNoList()
},
getBatchNoList(query){
let params = {
ylqxzcrbarmc: this.filterQuery.ylqxzcrbarmc,
cpmctymc: this.filterQuery.cpmctymc,
ggxh: this.filterQuery.ggxh,
batchNo: query,
page: 1,
limit: 10,
};
filterBatchNo(params).then((res) => {
this.batchNoList = res.data.list || [];
console.log(this.batchNoList)
})
},
cpmctymcChange(){
this.getGgxhList()
},
getGgxhList(query){
let params = {
ylqxzcrbarmc: this.filterQuery.ylqxzcrbarmc,
cpmctymc: this.filterQuery.cpmctymc,
ggxh: query,
page: 1,
limit: 10,
};
filterGgxh(params).then((res) => {
this.ggxhList = res.data.list || [];
console.log(this.ggxhList)
})
},
ylqxzcrbarmcChange(){
this.getCpmctymcList()
},
getCpmctymcList(query){
let params = {
ylqxzcrbarmc: this.filterQuery.ylqxzcrbarmc,
cpmctymc: query,
page: 1,
limit: 10,
};
filterCpmctymc(params).then((res) => {
this.cpmctymcList = res.data.list || [];
console.log(this.cpmctymcList)
})
},
getYlqxzcrbarmcList(query) {
let cQuery = {
ylqxzcrbarmc: query,
page: 1,

44
src/views/udi/trace/searchLive/index.vue
Unescape Escape View File

@ -5,10 +5,29 @@
<el-row type="flex">
<el-col type="flex" :span="8">
<el-form-item label="当前所在企业:">
<el-input v-model="filterQuery.companyName"
<el-select
v-model="filterQuery.companyName"
filterable
remote
style="width: 200px"
clearable="true"
reserve-keyword
placeholder="请输入产品名称"
:remote-method="geCompanyNameList"
:loading="loading"
>
<el-option
v-for="item in companyNameList"
:key="item.companyName"
:label="item.companyName"
:value="item.companyName"
>
</el-option>
</el-select>
<!-- <el-input v-model="filterQuery.companyName"
style="width: 200px;"
placeholder="请输入当前所在企业"
@keyup.native="onSubmit"></el-input>
@keyup.native="onSubmit"></el-input>-->
</el-form-item>
</el-col>
<el-col type="flex" :span="16">
@ -230,7 +249,7 @@
<script>
import {getTraceOrderList} from "@/api/udi/udiTrace";
import {getTraceOrderList,filterCompanyName} from "@/api/udi/udiTrace";
export default {
data() {
@ -242,7 +261,7 @@ export default {
ggxh: null,
nameCode: null,
batchNo: null,
companyName: "",
companyName: null,
page: 1,
limit: 10,
},
@ -252,9 +271,26 @@ export default {
open: false,
formView: {},
showSearch: true,
companyNameList: []
}
},
methods: {
geCompanyNameList(query) {
let cQuery = {
companyName: query,
page: 1,
limit: 10,
};
filterCompanyName(cQuery)
.then((response) => {
this.loading = false;
this.companyNameList = response.data.list || [];
console.log(this.companyNameList)
})
.catch(() => {
this.loading = false;
});
},
hideSearch() {
this.showSearch = !this.showSearch;
},

2
vue.config.js
Unescape Escape View File

@ -20,7 +20,7 @@ module.exports = {
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
publicPath: process.env.VUE_APP_CONTEXT_PATH,
// 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
outputDir: "UDI_WMS_NEW",
outputDir: "UDI_CPT_CLIENT",
// 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
assetsDir: "static",
// 是否开启eslint保存检测，有效值：ture | false | 'error'

Write Preview
Loading…
Cancel
Save