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

Merge remote-tracking branch 'origin/master'

Browse Source
ywj_dev
郑明梁 2 years ago
parent d37491f19b 496c83fe4c
commit 56b3dd4eb8
8 changed files with 109 additions and 106 deletions
Show Stats Download Patch File Download Diff File

163
src/views/basic/product/UdiInfoSelectLocalUdi.vue
Unescape Escape View File

@ -32,7 +32,7 @@
clearable="true" clearable="true"
style="width: 100%" style="width: 100%"
reserve-keyword reserve-keyword
placeholder="医疗器械注册人" placeholder="请输入医疗器械注册人"
:remote-method="findMethod" :remote-method="findMethod"
:loading="loading" :loading="loading"
@clear="clear" @clear="clear"
@ -53,7 +53,7 @@
<el-input <el-input
:disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''" :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
v-model="unionQuery.cpmctymc" clearable="true" v-model="unionQuery.cpmctymc" clearable="true"
placeholder="器械通用名称" placeholder="请输入器械通用名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -64,7 +64,7 @@
<el-input <el-input
v-model="unionQuery.ggxh" clearable="true" v-model="unionQuery.ggxh" clearable="true"
:disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))" :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
placeholder="规格型号" placeholder="请输入规格型号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -73,7 +73,7 @@
<el-input <el-input
v-model="unionQuery.zczbhhzbapzbh" clearable="true" v-model="unionQuery.zczbhhzbapzbh" clearable="true"
:disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))" :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
placeholder="注册证/备案号" placeholder="请输入注册证/备案号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -142,7 +142,7 @@
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column label="操作" > <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -164,7 +164,7 @@
/> />
</div> </div>
</el-card> </el-card>
<el-card class="el-card" > <el-card class="el-card">
<div> <div>
<el-form label-width="120px"> <el-form label-width="120px">
<el-row :gutter="20"> <el-row :gutter="20">
@ -341,8 +341,9 @@ import {getUdiInfos, filterCompany} from "@/api/basic/product/udiInfo";
import {superSearch} from "@/api/basic/udiInfo"; import {superSearch} from "@/api/basic/udiInfo";
import {combineUdi, combineAllUdi, checkExitUdi} from "@/api/basic/product/udiRelevance"; import {combineUdi, combineAllUdi, checkExitUdi} from "@/api/basic/product/udiRelevance";
import selectDiDetail from "./SelectDIDetailDialog" import selectDiDetail from "./SelectDIDetailDialog"
import {isBlank} from "@/utils/strUtil";
export default { export default {
name: "closeDialog", name: "closeDialog",
props: { props: {
closeDialog: { closeDialog: {
@ -384,7 +385,7 @@ export default {
zczbhhzbapzbh: "", zczbhhzbapzbh: "",
isCheck: 1 isCheck: 1
}, },
cpmctymc1:"", cpmctymc1: "",
combineLoading: false, combineLoading: false,
combineQuery: { combineQuery: {
idSpliUdi: false, idSpliUdi: false,
@ -425,12 +426,13 @@ export default {
ggxh: "", ggxh: "",
zczbhhzbapzbh: "", zczbhhzbapzbh: "",
isCheck: 1 isCheck: 1
}, };
this.actDateRange = []; this.actDateRange = [];
this.udidlList = [];
}, },
clear(){ clear() {
this.unionQuery.ylqxzcrbarmc==null; this.unionQuery.ylqxzcrbarmc == null;
this.unionQuery.cpmctymc=null; this.unionQuery.cpmctymc = null;
}, },
searchList() { searchList() {
this.unionQuery.page = 1; this.unionQuery.page = 1;
@ -530,10 +532,7 @@ export default {
return ""; return "";
}, },
handleErpChange(val) { handleErpChange(val) {
debugger this.cpmctymc1 = val.cpmctymc;
console.log("+++"+ this.data.cpmctymc)
this.cpmctymc1=val.cpmctymc;
this.currentRow = val; this.currentRow = val;
}, },
intentBack() { intentBack() {
@ -541,42 +540,67 @@ export default {
}, },
checkCombine() { checkCombine() {
this.$confirm("是否确定关联DI产品名称:" + this.cpmctymc1 + ":与第三方产品名称"+this.data.cpmctymc, "提示", { if (isBlank(this.relId)) {
confirmButtonText: "确定", this.checkedUdi();
cancelButtonText: "取消", } else {
type: "warning", this.$confirm("是否确定关联DI产品名称:" + this.cpmctymc1 + ":与第三方产品名称" + this.data.cpmctymc, "提示", {
}) confirmButtonText: "确定",
.then(() => { cancelButtonText: "取消",
type: "warning",
let selectData = this.multipleUdiSelection; })
let selected = null; .then(() => {
if (this.multipleUdiSelection.length == 0) { this.checkedUdi();
if (this.relId != null) { });
this.combineQuery.relId = this.relId; }
this.combineQuery.keys.push(this.currentRow.uuid); },
if (this.currentRow.check) {
selected = this.currentRow;
}
} else
return;
} else { checkedUdi() {
selectData.forEach((obj) => { let selectData = this.multipleUdiSelection;
if (obj.check) { let selected = null;
selected = obj; if (this.multipleUdiSelection.length == 0) {
} if (this.relId != null) {
this.combineQuery.keys.push(obj.uuid); this.combineQuery.relId = this.relId;
}); this.combineQuery.keys.push(this.currentRow.uuid);
if (this.currentRow.check) {
selected = this.currentRow;
} }
if (selected != null) { } else
this.$message.warning("UDI编码：" + selected.nameCode + "已被选入"); return;
return;
} else {
selectData.forEach((obj) => {
if (obj.check) {
selected = obj;
} }
this.combineLoading = true; this.combineQuery.keys.push(obj.uuid);
checkExitUdi(this.combineQuery) });
.then((response) => { }
this.combineLoading = false; if (selected != null) {
if (response.code == 20000) { this.$message.warning("UDI编码：" + selected.nameCode + "已被选入");
return;
}
this.combineLoading = true;
checkExitUdi(this.combineQuery)
.then((response) => {
this.combineLoading = false;
if (response.code == 20000) {
this.combine();
// combineUdi(this.combineQuery)
// .then((response) => {
// this.combineLoading = false;
// if (response.code == 20000) {
// this.$emit("closeUdi", true);
// } else {
// this.$emit("closeUdi", false);
// }
// })
// .catch(() => {
// this.combineLoading = false;
// this.$emit("closeUdi", false);
// });
} else if (response.code == 499) {
this.$confirm(response.message, {type: "warning"})
.then(_ => {
this.combine(); this.combine();
// combineUdi(this.combineQuery) // combineUdi(this.combineQuery)
// .then((response) => { // .then((response) => {
@ -591,36 +615,17 @@ export default {
// this.combineLoading = false; // this.combineLoading = false;
// this.$emit("closeUdi", false); // this.$emit("closeUdi", false);
// }); // });
} else if (response.code == 499) { })
this.$confirm(response.message, { type: "warning" }) .catch(_ => {
.then(_ => {
this.combine();
// combineUdi(this.combineQuery)
// .then((response) => {
// this.combineLoading = false;
// if (response.code == 20000) {
// this.$emit("closeUdi", true);
// } else {
// this.$emit("closeUdi", false);
// }
// })
// .catch(() => {
// this.combineLoading = false;
// this.$emit("closeUdi", false);
// });
})
.catch(_ => {
this.combineQuery.keys = [];
});
}
})
.catch(() => {
this.combineLoading = false;
this.$emit("closeUdi", false);
});
});
this.combineQuery.keys = [];
});
}
})
.catch(() => {
this.combineLoading = false;
this.$emit("closeUdi", false);
});
}, },
combine() { combine() {

18
src/views/basic/product/UdiInfoSelectRel.vue
Unescape Escape View File

@ -20,7 +20,7 @@
<el-form-item class="query-form-item" label="产品编码:"> <el-form-item class="query-form-item" label="产品编码:">
<el-input <el-input
v-model="erpQuery.code" v-model="erpQuery.code"
placeholder="产品编码/商品条码/医保编码" placeholder="请输入产品编码/商品条码/医保编码"
clearable="true" clearable="true"
@keyup.enter.native="keyupErp_submit($event)" @keyup.enter.native="keyupErp_submit($event)"
></el-input> ></el-input>
@ -30,14 +30,14 @@
<el-form-item class="query-form-item" label="物资名称:"> <el-form-item class="query-form-item" label="物资名称:">
<el-input v-model="erpQuery.name" <el-input v-model="erpQuery.name"
clearable="true" clearable="true"
placeholder="物资名称"></el-input> placeholder="请输入物资名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="注册/备案号:"> <el-form-item class="query-form-item" label="注册/备案号:">
<el-input v-model="erpQuery.registerNo" <el-input v-model="erpQuery.registerNo"
clearable="true" clearable="true"
placeholder="注册/备案号"></el-input> placeholder="请输入注册/备案号"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -47,7 +47,7 @@
<el-form-item class="query-form-item" label="生产企业:"> <el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="erpQuery.manufactory" <el-input v-model="erpQuery.manufactory"
clearable="true" clearable="true"
placeholder="生产企业"></el-input> placeholder="请输入生产企业"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -55,7 +55,7 @@
<el-input <el-input
v-model="erpQuery.spec" v-model="erpQuery.spec"
clearable="true" clearable="true"
placeholder="规格型号" placeholder="请输入规格型号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -138,7 +138,7 @@
clearable="true" clearable="true"
style="width: 100%" style="width: 100%"
reserve-keyword reserve-keyword
placeholder="医疗器械注册人" placeholder="请输入医疗器械注册人"
:remote-method="findMethod" :remote-method="findMethod"
:loading="loading" :loading="loading"
> >
@ -160,7 +160,7 @@
v-model="unionQuery.cpmctymc" v-model="unionQuery.cpmctymc"
size="mini" size="mini"
clearable="true" clearable="true"
placeholder="器械通用名称" placeholder="请输入器械通用名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -170,7 +170,7 @@
<el-form-item class="query-form-item" label="规格型号:"> <el-form-item class="query-form-item" label="规格型号:">
<el-input <el-input
v-model="unionQuery.ggxh" v-model="unionQuery.ggxh"
placeholder="规格型号" placeholder="请输入规格型号"
clearable="true" clearable="true"
size="mini" size="mini"
:disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))" :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
@ -183,7 +183,7 @@
v-model="unionQuery.zczbhhzbapzbh" v-model="unionQuery.zczbhhzbapzbh"
clearable="true" clearable="true"
:disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))" :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
placeholder="注册/备案号" placeholder="请输入注册/备案号"
size="mini" size="mini"
></el-input> ></el-input>
</el-form-item> </el-form-item>

22
src/views/basic/product/product.vue
Unescape Escape View File

@ -30,20 +30,20 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="最小销售标识:"> <el-form-item class="query-form-item" label="最小销售标识:">
<el-input v-model="filterQuery.unionCode" placeholder="最小销售标识" <el-input v-model="filterQuery.unionCode" placeholder="请输入最小销售标识"
style="width: 90%" style="width: 90%"
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="6">
<el-form-item class="query-form-item" label="物资名称:"> <el-form-item class="query-form-item" label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="物资名称" clearable="true" <el-input v-model="filterQuery.cpmctymc" placeholder="请输入物资名称" clearable="true"
style="width: 90%"></el-input> style="width: 90%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="规格型号:"> <el-form-item class="query-form-item" label="规格型号:">
<el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable="true" <el-input v-model="filterQuery.ggxh" placeholder="请输入规格型号" clearable="true"
style="width: 90%"></el-input> style="width: 90%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -65,21 +65,21 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="注册备案人:"> <el-form-item class="query-form-item" label="注册备案人:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="注册备案人" <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="请输入注册备案人"
style="width: 90%" style="width: 90%"
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="6">
<el-form-item class="query-form-item" label="第三方编码:"> <el-form-item class="query-form-item" label="第三方编码:">
<el-input v-model="filterQuery.thrPiId" placeholder="第三方主系统编码" <el-input v-model="filterQuery.thrPiId" placeholder="请输入第三方主系统编码"
style="width: 90%" style="width: 90%"
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="6">
<el-form-item class="query-form-item" label="集采状态"> <el-form-item class="query-form-item" label="集采状态:">
<el-select v-model="filterQuery.groupBuy" placeholder="集采状态" clearable> <el-select v-model="filterQuery.groupBuy" placeholder="请选择集采状态" clearable style="width: 90%">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option label="集采" value="true"></el-option> <el-option label="集采" value="true"></el-option>
<el-option label="非集采" value="false"></el-option> <el-option label="非集采" value="false"></el-option>
@ -87,8 +87,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="可配送状态"> <el-form-item class="query-form-item" label="可配送状态:">
<el-select v-model="filterQuery.dispatch" placeholder="可配送状态" clearable> <el-select v-model="filterQuery.dispatch" placeholder="请选择可配送状态" clearable style="width: 90%">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option label="可配送" value="true"></el-option> <el-option label="可配送" value="true"></el-option>
<el-option label="不可配送" value="false"></el-option> <el-option label="不可配送" value="false"></el-option>
@ -100,14 +100,14 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="注册/备案号:"> <el-form-item class="query-form-item" label="注册/备案号:">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号" <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="请输入注册/备案号"
style="width: 90%" style="width: 90%"
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="6">
<el-form-item class="query-form-item" label="生产企业:"> <el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="filterQuery.manufactory" placeholder="生产企业" <el-input v-model="filterQuery.manufactory" placeholder="请输入生产企业"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>

6
src/views/basic/product/udiInfoselectErpUdi.vue
Unescape Escape View File

@ -64,9 +64,9 @@
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <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-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="search" @click="searchErpList">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="searchErpList">查询</el-button>
<el-button type="primary" icon="search" @click="combine" :loading="combineLoading">选入</el-button> <el-button type="primary" icon="el-icon-bottom-left" @click="combine" :loading="combineLoading">选入</el-button>
<el-button type="primary" icon="search" @click="combineAll" v-if="isImport && !supEnable">结果全部选入</el-button> <el-button type="primary" icon="el-icon-bottom-left" @click="combineAll" v-if="isImport && !supEnable">结果全部选入</el-button>
</el-button-group> </el-button-group>
</div> </div>

1
src/views/inout/DialogSelectProduct.vue
Unescape Escape View File

@ -301,7 +301,6 @@ export default {
}, },
combine() { combine() {
debugger
let data = { let data = {
relId: this.currentRow.rlId, relId: this.currentRow.rlId,
supId: this.currentRow.customerId, supId: this.currentRow.customerId,

1
src/views/supplier/products/supAddDiProductSelectUdi.vue
Unescape Escape View File

@ -390,7 +390,6 @@ export default {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
getList() { getList() {
debugger
if ( if (
this.unionQuery.udiCode == '' && this.unionQuery.udiCode == '' &&
this.unionQuery.nameCode == '' && this.unionQuery.nameCode == '' &&

1
src/views/system/role/index.vue
Unescape Escape View File

@ -677,7 +677,6 @@ export default {
// this.$message("请选择供应商角色") // this.$message("请选择供应商角色")
// return // return
// } // }
debugger
if(this.form.isCustomer == null){ if(this.form.isCustomer == null){
if (this.userStatus == 0) { if (this.userStatus == 0) {
this.form.isCustomer = 0; this.form.isCustomer = 0;

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

@ -166,7 +166,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="所属仓库" prop="locInv"> <el-form-item label="所属仓库" prop="locInvCode">
<el-select <el-select
v-model="formData.locInvCode" v-model="formData.locInvCode"
filterable filterable
@ -393,6 +393,7 @@ export default {
}, },
getList() { getList() {
this.loading = true; this.loading = true;
this.query.key='key';
authAdminList(this.query) authAdminList(this.query)
.then(response => { .then(response => {
this.loading = false; this.loading = false;

Write Preview
Loading…
Cancel
Save