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

界面优化修改

Browse Source
master
anthonywj 2 years ago
parent dffcb8c204
commit 0a8ec29845
10 changed files with 134 additions and 144 deletions
Show Stats Download Patch File Download Diff File

10
src/views/basic/locUdi/UdiInfoDb.vue
Unescape Escape View File

@ -16,7 +16,7 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="销售单元产品标识"> <el-form-item class="query-form-item" label="销售单元产品标识">
<el-input <el-input
v-model="unionQuery.nameCode" clearable="true" v-model="unionQuery.nameCode" clearable="true"
@ -26,7 +26,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="医疗器械注册人:"> <el-form-item class="query-form-item" label="医疗器械注册人:">
<el-select <el-select
v-model="unionQuery.ylqxzcrbarmc" v-model="unionQuery.ylqxzcrbarmc"
@ -50,7 +50,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="器械通用名称:"> <el-form-item class="query-form-item" label="器械通用名称:">
<el-input <el-input
:disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''" :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
@ -62,7 +62,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="规格型号:" class="query-form-item"> <el-form-item label="规格型号:" class="query-form-item">
<el-input <el-input
v-model="unionQuery.ggxh" clearable="true" v-model="unionQuery.ggxh" clearable="true"
@ -72,7 +72,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="注册证/备案号:" class="query-form-item"> <el-form-item label="注册证/备案号:" class="query-form-item">
<el-input <el-input
v-model="unionQuery.zczbhhzbapzbh" clearable="true" v-model="unionQuery.zczbhhzbapzbh" clearable="true"

10
src/views/basic/product/dict/UdiBasicProduct.vue
Unescape Escape View File

@ -3,32 +3,32 @@
<el-card> <el-card>
<el-form :model="filterQuery" label-width="120px" v-show="showSearch"> <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="产品编码:" class="query-form-item"> <el-form-item label="产品编码:" class="query-form-item">
<el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码" <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="产品通用名称:" class="query-form-item"> <el-form-item label="产品通用名称:" class="query-form-item">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称" <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="规格型号:" class="query-form-item"> <el-form-item label="规格型号:" class="query-form-item">
<el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input> <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="生产企业:" class="query-form-item"> <el-form-item label="生产企业:" class="query-form-item">
<el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人" <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="注册备案号:" class="query-form-item"> <el-form-item label="注册备案号:" class="query-form-item">
<el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册备案号" <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册备案号"
clearable="true"></el-input> clearable="true"></el-input>

12
src/views/basic/product/rel/UdiRlCompany.vue
Unescape Escape View File

@ -3,7 +3,7 @@
<el-card> <el-card>
<el-form :model="filterQuery" label-width="120px" v-show="showSearch"> <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="注册企业:" class="query-form-item"> <el-form-item label="注册企业:" class="query-form-item">
<el-select <el-select
v-model="filterQuery.companyIdFk" v-model="filterQuery.companyIdFk"
@ -27,13 +27,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="产品编码:" class="query-form-item"> <el-form-item label="产品编码:" class="query-form-item">
<el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码" <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="产品通用名称:" class="query-form-item"> <el-form-item label="产品通用名称:" class="query-form-item">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名称" <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名称"
clearable="true"></el-input> clearable="true"></el-input>
@ -43,18 +43,18 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="规格型号:" class="query-form-item"> <el-form-item label="规格型号:" class="query-form-item">
<el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input> <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="注册备案号:" class="query-form-item"> <el-form-item label="注册备案号:" class="query-form-item">
<el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册备案号" <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册备案号"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="生产企业:" class="query-form-item"> <el-form-item label="生产企业:" class="query-form-item">
<el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人" <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
clearable="true"></el-input> clearable="true"></el-input>

30
src/views/system/user/authUser.vue
Unescape Escape View File

@ -5,6 +5,9 @@
<el-form-item label="用户账号:"> <el-form-item label="用户账号:">
<el-input v-model="query.userName" placeholder="用户账号" clearable></el-input> <el-input v-model="query.userName" placeholder="用户账号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="用户名称:">
<el-input v-model="query.employeeName" placeholder="用户名称" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item" label="账号状态:"> <el-form-item class="query-form-item" label="账号状态:">
<el-select v-model="query.userFlag" placeholder="请选择账号状态:"> <el-select v-model="query.userFlag" placeholder="请选择账号状态:">
<el-option label="正常" value="1"></el-option> <el-option label="正常" value="1"></el-option>
@ -73,7 +76,7 @@
<el-button <el-button
type="text" type="text"
:disabled="scope.row.userName === 'admin'" :disabled="scope.row.userName === 'admin'"
@click.native="handleDel(scope.$index, scope.row)" @click.native="handleDel(scope.$index, scope.row)"
v-hasPermi="['system:user:remove']" v-hasPermi="['system:user:remove']"
>删除 >删除
</el-button> </el-button>
@ -104,7 +107,7 @@
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="用户账号" prop="userName"> <el-form-item label="用户账号" prop="userName">
<el-input v-model="formData.userName" size="small" style="width: 90%" <el-input v-model="formData.userName" size="small" style="width: 90%"
:disabled="formData.userName === 'admin'? true : false" :disabled="formData.userName === 'admin'? true : false"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -113,7 +116,7 @@
<el-input v-model="formData.employeeName" size="small" <el-input v-model="formData.employeeName" size="small"
style="width: 90%" style="width: 90%"
:disabled="formData.userName === 'admin'? true : false" :disabled="formData.userName === 'admin'? true : false"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -154,7 +157,7 @@
placeholder="请选择" placeholder="请选择"
:remote-method="findDeptMethod" :remote-method="findDeptMethod"
:loading="loading" :loading="loading"
> >
<el-option <el-option
v-for="item in fromDeptOptions" v-for="item in fromDeptOptions"
:key="item.code" :key="item.code"
@ -172,7 +175,7 @@
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="状态" prop="userFlag"> <el-form-item label="状态" prop="userFlag">
<el-radio-group v-model="formData.userFlag" <el-radio-group v-model="formData.userFlag"
:disabled="formData.userName === 'admin'? true : false"> :disabled="formData.userName === 'admin'? true : false">
<el-radio :label="1">正常</el-radio> <el-radio :label="1">正常</el-radio>
<el-radio :label="0">禁用</el-radio> <el-radio :label="0">禁用</el-radio>
@ -212,7 +215,7 @@
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="角色"> <el-form-item label="角色">
<el-checkbox-group v-model="formData.roles" <el-checkbox-group v-model="formData.roles"
:disabled="formData.userName === 'admin'? true : false" > :disabled="formData.userName === 'admin'? true : false">
<el-checkbox <el-checkbox
v-for="item in roles" v-for="item in roles"
:key="item.roleId" :key="item.roleId"
@ -264,7 +267,7 @@ import {findConfig} from "@/api/sync/spsSyncStatus";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {listRole} from "@/api/system/role"; import {listRole} from "@/api/system/role";
import {selectSysParamByKey} from "@/api/system/systemParamConfig"; import {selectSysParamByKey} from "@/api/system/systemParamConfig";
import {filterList, selectInvById,getDeptById} from '@/api/system/invWarehouse' import {filterList, selectInvById, getDeptById} from '@/api/system/invWarehouse'
const formJson = { const formJson = {
id: "", id: "",
@ -300,6 +303,7 @@ export default {
roles: [], roles: [],
query: { query: {
userName: "", userName: "",
employeeName: null,
userFlag: "1", userFlag: "1",
page: 1, page: 1,
limit: 10, limit: 10,
@ -384,7 +388,7 @@ export default {
this.query.page = 1; this.query.page = 1;
this.getList(); this.getList();
}, },
change(){ change() {
this.$forceUpdate(); this.$forceUpdate();
}, },
findInv(val) { findInv(val) {
@ -397,7 +401,7 @@ export default {
}, },
getList() { getList() {
this.loading = true; this.loading = true;
this.query.key='key'; this.query.key = 'key';
authAdminList(this.query) authAdminList(this.query)
.then(response => { .then(response => {
this.loading = false; this.loading = false;
@ -459,7 +463,7 @@ export default {
roles: row.roles, roles: row.roles,
depts: row.depts, depts: row.depts,
dept: row.dept, dept: row.dept,
locInvCode:row.locInvCode locInvCode: row.locInvCode
}; };
} }
this.formName = "add"; this.formName = "add";
@ -564,10 +568,10 @@ export default {
}; };
filterList(query) filterList(query)
.then((response) => { .then((response) => {
var deptList=[]; var deptList = [];
this.loading = false; this.loading = false;
for(var i=0;i<response.data.list.length;i++){ for (var i = 0; i < response.data.list.length; i++) {
if(response.data.list[i].id!=1){ if (response.data.list[i].id != 1) {
deptList.push(response.data.list[i]); deptList.push(response.data.list[i]);
} }
} }

15
src/views/udi/trace/history/index.vue
Unescape Escape View File

@ -1,12 +1,12 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form label-width="120px" > <el-form label-width="100px" >
<el-row type="flex"> <el-row type="flex">
<el-col type="flex" :span="8"> <el-col type="flex" :span="8">
<el-form-item label="记录号:" class="query-form-item"> <el-form-item label="记录号:" class="query-form-item">
<el-input v-model="filterQuery.recordCode" <el-input v-model="filterQuery.recordCode"
style="width: 200px;" style="width: 90%"
placeholder="请输入记录号" placeholder="请输入记录号"
clearable clearable
></el-input> ></el-input>
@ -15,7 +15,7 @@
<el-col type="flex" :span="8" > <el-col type="flex" :span="8" >
<el-form-item label="产品通用名称:" class="query-form-item"> <el-form-item label="产品通用名称:" class="query-form-item">
<el-input v-model="filterQuery.cpmctymc" <el-input v-model="filterQuery.cpmctymc"
style="width: 200px;" style="width: 90%"
placeholder="请输入产品通用名称" placeholder="请输入产品通用名称"
clearable clearable
@ -25,7 +25,7 @@
<el-col type="flex" :span="8"> <el-col type="flex" :span="8">
<el-form-item label="规格型号:" class="query-form-item"> <el-form-item label="规格型号:" class="query-form-item">
<el-input v-model="filterQuery.ggxh" <el-input v-model="filterQuery.ggxh"
style="width: 200px;" style="width: 90%"
placeholder="请输入规格型号" placeholder="请输入规格型号"
clearable clearable
></el-input> ></el-input>
@ -38,7 +38,7 @@
<el-col type="flex" :span="8"> <el-col type="flex" :span="8">
<el-form-item label="批次号:" class="query-form-item" > <el-form-item label="批次号:" class="query-form-item" >
<el-input v-model="filterQuery.batchNo" <el-input v-model="filterQuery.batchNo"
style="width: 200px;" style="width: 90%"
placeholder="请输入批次号" placeholder="请输入批次号"
clearable clearable
></el-input> ></el-input>
@ -46,7 +46,7 @@
</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: 200px" @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 +55,7 @@
</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: 200px" @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>-->
@ -101,6 +101,7 @@
{{ formatTaskType1(traceType.row) }} {{ formatTaskType1(traceType.row) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="查询人" prop="createUser" width="120"></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">

87
src/views/udi/trace/manu/index.vue
Unescape Escape View File

@ -2,66 +2,66 @@
<div> <div>
<el-card> <el-card>
<el-form label-width="120px" v-show="showSearch" size="mini"> <el-form label-width="120px" v-show="showSearch" size="mini">
<el-row type="flex" > <el-row type="flex">
<el-col type="flex" > <el-col type="flex" :span="8">
<el-form-item label="记录号:" prop="recordCode" class="query-form-item"> <el-form-item label="记录号:" prop="recordCode" class="query-form-item">
<el-input v-model="filterQuery.recordCode" <el-input v-model="filterQuery.recordCode"
style="width: 200px" style="width: 90%"
placeholder="请输入记录号" placeholder="请输入记录号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col type="flex" > <el-col type="flex" :span="8">
<el-form-item label="注册企业:" prop="companyName" class="query-form-item"> <el-form-item label="注册企业:" prop="companyName" class="query-form-item">
<el-input v-model="filterQuery.companyName" <el-input v-model="filterQuery.companyName"
style="width: 200px" style="width: 90%"
placeholder="请输入注册企业" placeholder="请输入注册企业"
@keyup.native="onSubmit" @keyup.native="onSubmit"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col type="flex" > <el-col type="flex" :span="8">
<el-form-item label="DI标识:" prop="nameCode" class="query-form-item"> <el-form-item label="DI标识:" prop="nameCode" class="query-form-item">
<el-input v-model="filterQuery.nameCode" <el-input v-model="filterQuery.nameCode"
style="width: 200px" style="width: 90%"
placeholder="请输入DI标识" placeholder="请输入DI标识"
></el-input> ></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 type="flex" :span="8">
<el-form-item label="产品通用名称:" prop="cpmctymc" class="query-form-item"> <el-form-item label="产品通用名称:" prop="cpmctymc" class="query-form-item">
<el-input v-model="filterQuery.cpmctymc" <el-input v-model="filterQuery.cpmctymc"
style="width: 200px" style="width: 90%"
placeholder="请输入产品通用名称" placeholder="请输入产品通用名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col type="flex" > <el-col type="flex" :span="8">
<el-form-item label="规格型号:" prop="ggxh" class="query-form-item"> <el-form-item label="规格型号:" prop="ggxh" class="query-form-item">
<el-input v-model="filterQuery.ggxh" <el-input v-model="filterQuery.ggxh"
style="width: 200px" style="width: 90%"
placeholder="请输入规格型号" placeholder="请输入规格型号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col type="flex" > <el-col type="flex" :span="8">
<el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc" class="query-form-item"> <el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc" class="query-form-item">
<el-input v-model="filterQuery.ylqxzcrbarmc" <el-input v-model="filterQuery.ylqxzcrbarmc"
style="width: 200px" style="width: 90%"
placeholder="请输入医疗器械注册人" placeholder="请输入医疗器械注册人"
></el-input> ></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 type="flex" :span="8">
<el-form-item label="注册备案号:" prop="zczbhhzbapzbh" class="query-form-item"> <el-form-item label="注册备案号:" prop="zczbhhzbapzbh" class="query-form-item">
<el-input v-model="filterQuery.zczbhhzbapzbh" <el-input v-model="filterQuery.zczbhhzbapzbh"
style="width: 200px" style="width: 90%"
placeholder="请输入注册备案号" placeholder="请输入注册备案号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -88,17 +88,12 @@
<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"></el-table-column> <el-table-column label="记录号" prop="recordCode" width="180"></el-table-column>
<el-table-column label="生产订单号" prop="billNo" width="220"></el-table-column> <el-table-column label="生产订单号" prop="billNo" width="220"></el-table-column>
<el-table-column label="订单日期" prop="billDate" width="180"></el-table-column>
<el-table-column label="DI标识" prop="nameCode" width="180"></el-table-column> <el-table-column label="DI标识" prop="nameCode" width="180"></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="180"></el-table-column> <el-table-column label="产品通用名称" prop="cpmctymc" width="180"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column> <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
<el-table-column label="订单日期" prop="billDate" width="180"></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="180"></el-table-column> <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="180"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column> <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
<!-- <el-table-column label="批次号" prop="batchNo" width="180"></el-table-column>-->
<!-- <el-table-column label="查询人" prop="createUser" width="180"></el-table-column>-->
<!-- <el-table-column label="所属企业" prop="companyName" width="180"></el-table-column>-->
<!-- <el-table-column label="查询方式" prop="traceType" width="120" :formatter="formaterTraceType"></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">
<el-button <el-button
@ -261,23 +256,22 @@
</el-dialog> </el-dialog>
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务详情</span> <span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-关联关系</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="DI标识" prop="nameCode" width="180"></el-table-column> <el-table-column label="UDI码" prop="code" width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="180"></el-table-column> <el-table-column label="父码" prop="pcode" width="180"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="180"></el-table-column> <el-table-column label="产品通用名称" prop="cpmctymc" width="160"></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="220"></el-table-column> <el-table-column label="DI标识" prop="nameCode" width="160"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column> <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
<!-- <el-table-column label="UDI码" prop="code" width="120"></el-table-column>--> <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<!-- <el-table-column label="父码" prop="pcode" width="180"></el-table-column>-->
<el-table-column label="包装层级" prop="bzcj" width="180"></el-table-column>
<el-table-column label="包装状态" prop="packState" width="180" :formatter="formaterPackState"></el-table-column>
<el-table-column label="生产日期" prop="produceDate" width="180"></el-table-column> <el-table-column label="生产日期" prop="produceDate" width="180"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="180"></el-table-column> <el-table-column label="失效日期" prop="expireDate" width="180"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="120"></el-table-column>
<el-table-column label="包装层级" prop="bzcj" width="180"></el-table-column>
<el-table-column label="包装状态" prop="packState" width="180" :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">
<el-button <el-button
@ -398,7 +392,7 @@
<script> <script>
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {getTraceManuOrderList,getManuCodeRelList} from "@/api/udi/udiTrace"; import {getTraceManuOrderList, getManuCodeRelList} from "@/api/udi/udiTrace";
export default { export default {
data() { data() {
@ -443,26 +437,26 @@ export default {
} }
}, },
methods: { methods: {
formaterPackState(row){ formaterPackState(row) {
if (row.packState == 1) { if (row.packState == 1) {
this.formatePackState = "满箱" this.formatePackState = "满箱"
return "满箱" return "满箱"
}else if (row.packState == 2){ } else if (row.packState == 2) {
this.formatePackState = "零箱" this.formatePackState = "零箱"
return "零箱" return "零箱"
}else if (row.packState == 3){ } else if (row.packState == 3) {
this.formatePackState = "拼箱满箱" this.formatePackState = "拼箱满箱"
return "拼箱满箱" return "拼箱满箱"
}else { } else {
this.formatePackState = "拼箱零箱" this.formatePackState = "拼箱零箱"
return "拼箱零箱" return "拼箱零箱"
} }
}, },
formaterTraceType(row){ formaterTraceType(row) {
if (row.traceType == 1) { if (row.traceType == 1) {
this.formateTraceType = "源头查询" this.formateTraceType = "源头查询"
return "源头查询" return "源头查询"
}else { } else {
this.formateTraceType = "现场检查查询" this.formateTraceType = "现场检查查询"
return "现场检查查询" return "现场检查查询"
} }
@ -475,7 +469,7 @@ export default {
this.currentRow = val; this.currentRow = val;
this.getManuCodeRel(); this.getManuCodeRel();
}, },
getManuCodeRel(){ getManuCodeRel() {
if (this.currentRow == null || isBlank(this.currentRow.billNo)) { if (this.currentRow == null || isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据！") this.$message.error("请先选择需要查询的单据！")
return; return;
@ -500,7 +494,7 @@ export default {
this.codeRelTotal = 0; this.codeRelTotal = 0;
}) })
}, },
handleView(row){ handleView(row) {
this.listOrder.forEach(obj => { this.listOrder.forEach(obj => {
if (row.id == obj.id) { if (row.id == obj.id) {
this.formView = obj this.formView = obj
@ -509,7 +503,7 @@ export default {
console.log(this.formView) console.log(this.formView)
this.openManuOrder = true this.openManuOrder = true
}, },
handleViewCoderel(row){ handleViewCoderel(row) {
this.listCodeRel.forEach(obj => { this.listCodeRel.forEach(obj => {
if (this.listCodeRel[0]) { if (this.listCodeRel[0]) {
this.formViewCodeRel = obj this.formViewCodeRel = obj
@ -518,7 +512,7 @@ export default {
console.log(this.formViewCodeRel) console.log(this.formViewCodeRel)
this.openManuCodeRel = true this.openManuCodeRel = true
}, },
onReset(){ onReset() {
this.$router.push({ this.$router.push({
path: "", path: "",
}); });
@ -535,9 +529,9 @@ export default {
}; };
this.currentRow.billNo = null this.currentRow.billNo = null
this.listCodeRel = null, this.listCodeRel = null,
this.getManuOrderList(); this.getManuOrderList();
}, },
onSubmit(){ onSubmit() {
this.currentRow.billNo = null this.currentRow.billNo = null
this.filterQuery.page = 1; this.filterQuery.page = 1;
this.getManuOrderList() this.getManuOrderList()
@ -576,6 +570,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;

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

@ -11,7 +11,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="6"> <el-col :span="8">
<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"
@ -36,7 +36,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<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"
@ -62,7 +62,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<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"
@ -90,7 +90,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="产品DI标识:" class="query-form-item"> <el-form-item label="产品DI标识:" class="query-form-item">
<el-select <el-select
v-model="filterQuery.nameCode" v-model="filterQuery.nameCode"
@ -117,7 +117,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="批次号:" class="query-form-item"> <el-form-item label="批次号:" class="query-form-item">
<el-input <el-input
v-model="filterQuery.batchNo" v-model="filterQuery.batchNo"

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

@ -11,7 +11,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col type="flex" :span="6"> <el-col type="flex" :span="8">
<el-form-item label="当前所在企业:" class="query-form-item"> <el-form-item label="当前所在企业:" class="query-form-item">
<el-select <el-select
v-model="filterQuery.companyId" v-model="filterQuery.companyId"
@ -34,7 +34,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<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"
@ -59,7 +59,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<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"
@ -87,7 +87,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<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"
@ -113,7 +113,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="产品DI标识:" class="query-form-item"> <el-form-item label="产品DI标识:" class="query-form-item">
<el-select <el-select
v-model="filterQuery.nameCode" v-model="filterQuery.nameCode"
@ -140,7 +140,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="批次号:" class="query-form-item"> <el-form-item label="批次号:" class="query-form-item">
<el-input <el-input
v-model="filterQuery.batchNo" v-model="filterQuery.batchNo"

89
src/views/udi/trace/task/index.vue
Unescape Escape View File

@ -7,7 +7,7 @@
<el-form-item label="任务类型:" prop="taskType" class="query-form-item"> <el-form-item label="任务类型:" prop="taskType" class="query-form-item">
<el-select v-model="filterQuery.taskType" <el-select v-model="filterQuery.taskType"
placeholder="请选择任务类型" placeholder="请选择任务类型"
style="width: 200px" style="width: 90%"
@change="onSubmit" @change="onSubmit"
clearable clearable
> >
@ -20,7 +20,8 @@
</el-col> </el-col>
<el-col type="flex"> <el-col type="flex">
<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: 200px" @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>
@ -31,7 +32,7 @@
<el-col type="flex"> <el-col type="flex">
<el-form-item label="产品通用名称:" prop="cpmctymc" class="query-form-item"> <el-form-item label="产品通用名称:" prop="cpmctymc" class="query-form-item">
<el-input v-model="filterQuery.cpmctymc" <el-input v-model="filterQuery.cpmctymc"
style="width: 200px" style="width: 90%"
placeholder="请输入产品通用名称" placeholder="请输入产品通用名称"
@keyup.native="onSubmit" @keyup.native="onSubmit"
></el-input> ></el-input>
@ -42,7 +43,7 @@
<el-col type="flex"> <el-col type="flex">
<el-form-item label="规格型号:" prop="ggxh" class="query-form-item"> <el-form-item label="规格型号:" prop="ggxh" class="query-form-item">
<el-input v-model="filterQuery.ggxh" <el-input v-model="filterQuery.ggxh"
style="width: 200px" style="width: 90%"
placeholder="请输入规格型号" placeholder="请输入规格型号"
@keyup.native="onSubmit" @keyup.native="onSubmit"
></el-input> ></el-input>
@ -51,7 +52,7 @@
<el-col type="flex"> <el-col type="flex">
<el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc" class="query-form-item"> <el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc" class="query-form-item">
<el-input v-model="filterQuery.ylqxzcrbarmc" <el-input v-model="filterQuery.ylqxzcrbarmc"
style="width: 200px" style="width: 90%"
placeholder="请输入医疗器械注册人" placeholder="请输入医疗器械注册人"
@keyup.native="onSubmit" @keyup.native="onSubmit"
></el-input> ></el-input>
@ -61,7 +62,7 @@
<el-col type="flex"> <el-col type="flex">
<el-form-item label="批次号:" prop="batchNo" class="query-form-item"> <el-form-item label="批次号:" prop="batchNo" class="query-form-item">
<el-input v-model="filterQuery.batchNo" <el-input v-model="filterQuery.batchNo"
style="width: 200px" style="width: 90%"
placeholder="请输入批次号" placeholder="请输入批次号"
@keyup.native="onSubmit" @keyup.native="onSubmit"
></el-input> ></el-input>
@ -69,7 +70,7 @@
</el-col> </el-col>
</el-row> </el-row>
<!--时间筛选--> <!--时间筛选-->
<el-row> <el-row>
<el-col :span="8" v-show='false'> <el-col :span="8" v-show='false'>
<el-form-item class="query-form-item" label="创建时间:"> <el-form-item class="query-form-item" label="创建时间:">
@ -125,20 +126,11 @@
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="任务类型" prop="taskType" width="120"></el-table-column>-->
<el-table-column label="任务类型" prop="taskType" width="120"> <el-table-column label="任务类型" prop="taskType" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ formatTaskType(scope.row) }} {{ formatTaskType(scope.row) }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="任务状态" prop="status" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- {{ formatTaskType1(scope.row) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="任务状态" prop="status" width="120"> <el-table-column label="任务状态" prop="status" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.status | statusFilterType"> <el-tag :type="scope.row.status | statusFilterType">
@ -148,22 +140,17 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </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="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="batchNo" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200"></el-table-column> <el-table-column label="生产日期" prop="produceDate" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="社会统一信用号" prop="creditNum" width="220"></el-table-column> <el-table-column label="失效日期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="180"></el-table-column> <!-- <el-table-column label="序列号" prop="serialNo" width="180"></el-table-column>-->
<el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column> <el-table-column label="创建时间" prop="createTime" width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="180"></el-table-column> <!-- <el-table-column label="更新时间" prop="updateTime" width="180"></el-table-column>-->
<el-table-column label="生产日期" prop="produceDate" width="180"></el-table-column> <el-table-column label="操作" width="80" fixed="right">
<el-table-column label="失效日期" prop="expireDate" width="180"></el-table-column>
<!-- <el-table-column label="序列号" prop="serialNo" 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="操作" width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -188,7 +175,7 @@
width="60%" width="60%"
top="5vh" top="5vh"
> >
<el-form :model="formView" :rules="formRules" ref="dataForm" label-width="100px"> <el-form :model="formView" :rules="formRules" ref="dataForm" label-width="120px">
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="任务类型" prop="taskType"> <el-form-item label="任务类型" prop="taskType">
@ -288,6 +275,7 @@
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {getTraceTaskList} from "@/api/udi/udiTrace"; import {getTraceTaskList} from "@/api/udi/udiTrace";
const formJson = { const formJson = {
id: "", id: "",
passWord: "", passWord: "",
@ -327,18 +315,18 @@ export default {
open: false, open: false,
openManuCodeRel: false, openManuCodeRel: false,
formView: { formView: {
taskType:null, taskType: null,
status: null, status: null,
}, },
taskTypes: [ taskTypes: [
{ value: 1, label: '关联关系' }, {value: 1, label: '关联关系'},
{ value: 2, label: '入库' }, {value: 2, label: '入库'},
{ value: 3, label: '出库' }, {value: 3, label: '出库'},
], ],
taskStatus: [ taskStatus: [
{ value: 1, label: '未处理' }, {value: 1, label: '未处理'},
{ value: 2, label: '正在处理' }, {value: 2, label: '正在处理'},
{ value: 3, label: '已处理' }, {value: 3, label: '已处理'},
], ],
formViewCodeRel: {}, formViewCodeRel: {},
showSearch: true, showSearch: true,
@ -397,11 +385,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 '任务类型有误！！';
} }
@ -420,7 +408,7 @@ export default {
}, },
//详情 //详情
handleView(row){ handleView(row) {
this.taskList.forEach(obj => { this.taskList.forEach(obj => {
if (row.id == obj.id) { if (row.id == obj.id) {
this.formView = obj this.formView = obj
@ -429,7 +417,7 @@ export default {
console.log(this.formView) console.log(this.formView)
this.open = true this.open = true
}, },
handleViewCoderel(row){ handleViewCoderel(row) {
this.listCodeRel.forEach(obj => { this.listCodeRel.forEach(obj => {
if (this.listCodeRel[0]) { if (this.listCodeRel[0]) {
this.formViewCodeRel = obj this.formViewCodeRel = obj
@ -439,7 +427,7 @@ export default {
this.openManuCodeRel = true this.openManuCodeRel = true
}, },
//重置 //重置
onReset(){ onReset() {
this.$router.push({ this.$router.push({
path: "", path: "",
}); });
@ -457,12 +445,12 @@ export default {
endAduditTime: null, endAduditTime: null,
}; };
this.listCodeRel = null, this.listCodeRel = null,
this.auditDateRange = []; this.auditDateRange = [];
this.actDateRange = []; this.actDateRange = [];
this.getTaskList(); this.getTaskList();
}, },
//查询事件 //查询事件
onSubmit(){ onSubmit() {
this.loading = true; this.loading = true;
if (this.actDateRange !== null) { if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0]; this.filterQuery.startTime = this.actDateRange[0];
@ -506,8 +494,8 @@ export default {
filters: { filters: {
statusFilterType(status) { statusFilterType(status) {
const statusMap = { const statusMap = {
1: "gray", 1: "danger",
2: "danger", 2: "waring",
3: "success" 3: "success"
}; };
@ -533,6 +521,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;

3
src/views/userManage/onLineManage.vue
Unescape Escape View File

@ -65,7 +65,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="备注" label="备注"
prop="creditNum" prop="remark"
width="230" width="230"
></el-table-column> ></el-table-column>
<el-table-column label="操作" fixed="right" width="120"> <el-table-column label="操作" fixed="right" width="120">
@ -253,6 +253,7 @@ export default {
this.filterQuery.page = 1; this.filterQuery.page = 1;
}, },
formSubmit() { formSubmit() {
this.formData.companyId = this.formData.id;
updateCompanyConfig(this.formData) updateCompanyConfig(this.formData)
.then((response) => { .then((response) => {
this.formVisible = false; this.formVisible = false;

Write Preview
Loading…
Cancel
Save