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

耗材字典相关修改，新增集采，配送

Browse Source
prod
anthonywj 2 years ago
parent 217879692e
commit 9ccf855f7b
14 changed files with 179 additions and 86 deletions
Show Stats Download Patch File Download Diff File

16
src/views/basic/busType/busTypeAdvancedSettings.vue
Unescape Escape View File

@ -70,6 +70,22 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" type="flex">
<el-col :span="24" >
<div class="check-box-group" style="margin-top: 12px">
<el-checkbox v-model="inputQuery.vailDispatch" border style="width: 200px;">校验产品是否可配送
</el-checkbox>
<span style="margin-left: 45px">校验是否集采产品:</span>
<el-select v-model="inputQuery.vailGroupBuy" style="margin-left: 5px"
size="mini">
<el-option label="无需校验" :value=0></el-option>
<el-option label="只采集集采产品" :value=1></el-option>
<el-option label="只采集非集采产品" :value=2></el-option>
</el-select>
</div>
</el-col>
</el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row type="flex"> <el-row type="flex">
<el-col :span="24"> <el-col :span="24">

4
src/views/basic/busType/bussinessType.vue
Unescape Escape View File

@ -219,6 +219,8 @@ export default {
checkBalance: null, checkBalance: null,
secCheckBalance: null, secCheckBalance: null,
preInBack:null, preInBack:null,
vailDispatch:null,
vailGroupBuy:null,
}, },
enableMap: { enableMap: {
true: "是", true: "是",
@ -411,6 +413,8 @@ export default {
preIn: null, preIn: null,
originAction: null, originAction: null,
preInBack:null, preInBack:null,
vailDispatch:null,
vailGroupBuy:null,
} }
this.addDialogVisible = true; this.addDialogVisible = true;
}, },

2
src/views/basic/product/SelectDIDetailDialog.vue
Unescape Escape View File

@ -405,7 +405,7 @@
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span>包装单位/包装级别:&nbsp;</span> <span>包装层级:&nbsp;</span>
</div> </div>
<el-input <el-input

4
src/views/basic/product/basicCompanyProductsImport.vue
Unescape Escape View File

@ -189,8 +189,8 @@
<el-row> <el-row>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="包装单位/包装级别" prop="bzcj"> <el-form-item label="包装层级" prop="bzcj">
<el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj" :disabled="true"></el-input> <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

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

@ -2,7 +2,7 @@
<div> <div>
<el-card> <el-card>
<el-row> <el-row>
<el-col :span="2" v-show="showSearch"> <el-col :span="2" v-show="showSearch">
<div style="height: 100%"> <div style="height: 100%">
<el-tree :data="treeList" <el-tree :data="treeList"
class="tree" class="tree"
@ -46,8 +46,6 @@
style="width: 90%"></el-input> style="width: 90%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</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-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件" <el-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件"
@ -62,6 +60,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</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="生产企业/注册备案人"
@ -76,6 +77,24 @@
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="集采状态">
<el-select v-model="filterQuery.groupBuy" placeholder="集采状态" clearable>
<el-option label="全部" value=""></el-option>
<el-option label="集采" value="true"></el-option>
<el-option label="非集采" value="false"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="可配送状态">
<el-select v-model="filterQuery.dispatch" placeholder="可配送状态" clearable>
<el-option label="全部" value=""></el-option>
<el-option label="可配送" value="true"></el-option>
<el-option label="不可配送" value="false"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -191,11 +210,12 @@
<span>产品标识:</span> <span>产品标识:</span>
</div> </div>
<el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row @current-change="handleDetail"> <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3"
highlight-current-row @current-change="handleDetail">
<el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column> <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column> <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column> <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
<el-table-column label="包装层级" prop="packUnit" show-overflow-tooltip></el-table-column> <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-card> <el-card>
@ -895,7 +915,7 @@
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span>包装单位/包装级别:&nbsp;</span> <span>包装层级:&nbsp;</span>
</div> </div>
<el-input <el-input
@ -1152,6 +1172,7 @@ import selectHospProduct from "@/views/basic/product/bindHospProduct";
import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct"; import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
import {getBasicHospType, getListTree} from "@/api/basic/basicHospType"; import {getBasicHospType, getListTree} from "@/api/basic/basicHospType";
export default { export default {
data() { data() {
return { return {
@ -1168,12 +1189,15 @@ export default {
addType: 1, addType: 1,
thrPiId: null, thrPiId: null,
filterType: null, filterType: null,
diType: 1 diType: 1,
dispatch: null,
groupBuy: null,
}, },
rId: null, rId: null,
selectUdiTypeVisible: false, selectUdiTypeVisible: false,
selectHospProductVisible: false, selectHospProductVisible: false,
selectUnBindHospProductVisible:false, selectUnBindHospProductVisible: false,
loading: false, loading: false,
showSearch: true, showSearch: true,
productType: null, productType: null,
@ -1308,8 +1332,8 @@ export default {
this.detailList = []; this.detailList = [];
}); });
}, },
hideForm(){ hideForm() {
this.selectUdiTypeVisible=false; this.selectUdiTypeVisible = false;
this.getTerrList(); this.getTerrList();
}, },
getThirdSysDetail() { getThirdSysDetail() {
@ -1523,7 +1547,7 @@ export default {
this.getList(); this.getList();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.filterQuery.page = val.page; this.filterQuery.page = val;
this.getList(); this.getList();
}, },
handleModifyClick(row) { handleModifyClick(row) {
@ -1584,7 +1608,7 @@ export default {
this.selectErpDialogVisible = false; this.selectErpDialogVisible = false;
this.selectLocalVisible = false; this.selectLocalVisible = false;
this.selectVersionVisible = false; this.selectVersionVisible = false;
this.selectHospProductVisible=false; this.selectHospProductVisible = false;
this.getThirdSysDetail(); this.getThirdSysDetail();
if (val) { if (val) {
this.getList(); this.getList();
@ -1634,8 +1658,8 @@ export default {
this.selectErpDialogVisible = false; this.selectErpDialogVisible = false;
this.selectLocalVisible = false; this.selectLocalVisible = false;
this.selectVersionVisible = false; this.selectVersionVisible = false;
this.selectHospProductVisible=false; this.selectHospProductVisible = false;
this.selectUnBindHospProductVisible=false; this.selectUnBindHospProductVisible = false;
}, },
onAddSubmit(relSubmit) { onAddSubmit(relSubmit) {
this.editFormat.relSubmit = relSubmit; this.editFormat.relSubmit = relSubmit;
@ -1741,27 +1765,27 @@ export default {
addHospProduct(data) { addHospProduct(data) {
this.rId = data.code this.rId = data.code
if(data.code!=10000){ if (data.code != 10000) {
this.filterQuery.relCode = data.code this.filterQuery.relCode = data.code
}else{ } else {
this.filterQuery.relCode = null; this.filterQuery.relCode = null;
} }
this.selectHospProductVisible = true; this.selectHospProductVisible = true;
}, },
removeHospProduct(data){ removeHospProduct(data) {
this.rId = data.code this.rId = data.code
if(data.code!=10000){ if (data.code != 10000) {
this.filterQuery.relCode = data.code this.filterQuery.relCode = data.code
}else{ } else {
this.filterQuery.relCode = null; this.filterQuery.relCode = null;
} }
this.selectUnBindHospProductVisible = true; this.selectUnBindHospProductVisible = true;
}, },
handleNodeClick(data) { handleNodeClick(data) {
this.rId = data.code this.rId = data.code
if(data.code!=10000){ if (data.code != 10000) {
this.filterQuery.relCode = data.code this.filterQuery.relCode = data.code
}else{ } else {
this.filterQuery.relCode = null; this.filterQuery.relCode = null;
} }
this.getList(); this.getList();

147
src/views/basic/product/productEdit.vue
Unescape Escape View File

@ -7,48 +7,54 @@
border border
label-width="120px" label-width="120px"
> >
<el-card> <el-card>
<el-table :data="sysList" style="width: 100%; margin-bottom: 8px" key="2" border> <el-table :data="sysList" style="width: 100%; margin-bottom: 8px" key="2" border>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="系统名称" prop="sysName" show-overflow-tooltip></el-table-column> <el-table-column label="系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
<el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column> <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
<el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column> <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column> <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column> <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column> <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">关联</el-button> <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">
<el-button type="text" @click.native.stop="removeErp(scope.row)" :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑 关联
</el-button> </el-button>
</template> <el-button type="text" @click.native.stop="removeErp(scope.row)"
</el-table-column> :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑
</el-table> </el-button>
</el-card> </template>
<el-card> </el-table-column>
<div style=" float: left; </el-table>
</el-card>
<el-card>
<div style=" float: left;
text-align: left; text-align: left;
font-weight: bold; font-weight: bold;
margin-bottom: 8px"> margin-bottom: 8px">
<span>产品标识:</span> <span>产品标识:</span>
</div> </div>
<div style=" float: right; <div style=" float: right;
text-align: right; text-align: right;
margin-bottom: 8px;"> margin-bottom: 8px;">
<el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1" style="text-align:right">解绑DI器械信息</el-button> <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1"
</div> style="text-align:right">解绑DI器械信息
<el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row @current-change="handleDetail"> </el-button>
<el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column> </div>
<el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column> <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row
<el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column> @current-change="handleDetail">
<el-table-column label="包装层级" prop="packUnit" show-overflow-tooltip></el-table-column> <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="180px"> <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
<template slot-scope="scope"> <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
<el-button type="text" @click.native.stop="singleDiEdit">编辑</el-button> <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
</template> <el-table-column label="操作" width="180px">
</el-table-column> <template slot-scope="scope">
</el-table> <el-button type="text" @click.native.stop="singleDiEdit">编辑</el-button>
</el-card> </template>
</el-table-column>
</el-table>
</el-card>
<el-row type="flex" class="edit-row" style="margin-top: 20px"> <el-row type="flex" class="edit-row" style="margin-top: 20px">
<el-col :span="12"> <el-col :span="12">
@ -184,27 +190,42 @@
</el-row> </el-row>
<el-row type="flex" class="edit-row"> <el-row type="flex" class="edit-row">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="最小包装可使用次数:"> <el-form-item label="医保编码:">
<el-input <el-input
style="width: 80%" style="width: 80%"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
:disabled="this.useNumEnable" v-model="editQuery.ybbm"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="使用周期(天):">
<el-input
style="width: 80%"
size="small"
type="number" type="number"
v-model="editQuery.useNum" splaceholder="请输入内容"
v-model="editQuery.useExpireTime"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="医保编码:"> <el-form-item label="最小包装可使用次数:">
<el-input <el-input
style="width: 80%" style="width: 80%"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
v-model="editQuery.ybbm" :disabled="this.useNumEnable"
type="number"
v-model="editQuery.useNum"
></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 :span="24"> <el-col :span="24">
@ -254,7 +275,29 @@
@change="useMutiChange" @change="useMutiChange"
style="width: 180px" style="width: 180px"
border border
>允许科室多次使用出库 >多次/重复使用耗材
</el-checkbox>
<el-checkbox v-model="editQuery.dispatch"
style="width: 180px"
border
>是否可配送
</el-checkbox>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="24" class="el-col">
<div style="margin-bottom: 18px;margin-left: 25px">
<el-checkbox v-model="editQuery.groupBuy"
style="width: 180px"
@change="groupBuyChange"
border
>是否集采产品
</el-checkbox> </el-checkbox>
</div> </div>
</el-col> </el-col>
@ -359,7 +402,7 @@ export default {
sysList: [], sysList: [],
detailList: [], detailList: [],
defaultSys: null, defaultSys: null,
isImport:false, isImport: false,
selectErpDialogVisible: false, //选入ERP产品 selectErpDialogVisible: false, //选入ERP产品
editSingleDiDialogVisible: false, editSingleDiDialogVisible: false,
editSingleFormat: { editSingleFormat: {
@ -379,8 +422,8 @@ export default {
created() { created() {
this.useMutiChange(true) this.useMutiChange(true)
this.getThirdSysDetail(); this.getThirdSysDetail();
let ttquery={ let ttquery = {
id:this.relevanceEdit.id id: this.relevanceEdit.id
} }
this.getDetailList(ttquery); this.getDetailList(ttquery);
}, },
@ -532,7 +575,7 @@ export default {
useMutiChange(val) { useMutiChange(val) {
if (val) { if (val) {
this.useNumEnable = false; this.useNumEnable = false;
// this.editQuery.useNum = this.editQuery.zxxsbzbhsydysl; // this.editQuery.useNum = this.editQuery.zxxsbzbhsydysl;
if (!isBlank(this.editQuery.zxxsbzbhsydysl)) { if (!isBlank(this.editQuery.zxxsbzbhsydysl)) {
if (this.editQuery.zxxsbzbhsydysl > 0) { if (this.editQuery.zxxsbzbhsydysl > 0) {
this.isUseDyCheck = true; this.isUseDyCheck = true;
@ -547,10 +590,16 @@ export default {
this.selectErpDialogVisible = false; this.selectErpDialogVisible = false;
}, },
closeUdi(val) { closeUdi(val) {
this.selectErpDialogVisible=false; this.selectErpDialogVisible = false;
this.getThirdSysDetail(); this.getThirdSysDetail();
}, },
groupBuyChange() {
if (this.editQuery.groupBuy == true) {
this.editQuery.dispatch = true;
} else {
this.editQuery.dispatch = false;
}
},
} }
} }
</script> </script>

4
src/views/basic/product/udIInfoSelect.vue
Unescape Escape View File

@ -197,8 +197,8 @@
<el-row> <el-row>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="包装单位/包装级别" prop="bzcj"> <el-form-item label="包装层级" prop="bzcj">
<el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj" :disabled="true"></el-input> <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

2
src/views/basic/product/udilnfoManageSpDetail.vue
Unescape Escape View File

@ -425,7 +425,7 @@
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span>包装单位/包装级别:&nbsp;</span> <span>包装层级:&nbsp;</span>
</div> </div>
<el-input <el-input

2
src/views/biz/UdiTrace.vue
Unescape Escape View File

@ -438,7 +438,7 @@
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span>包装单位/包装级别:&nbsp;</span> <span>包装层级:&nbsp;</span>
</div> </div>
<el-input <el-input

2
src/views/inout/DialogSelectRl.vue
Unescape Escape View File

@ -354,7 +354,7 @@
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span>包装单位/包装级别:&nbsp;</span> <span>包装层级:&nbsp;</span>
</div> </div>
<el-input <el-input

4
src/views/purchase/company/basicSelectSingleProducts.vue
Unescape Escape View File

@ -188,8 +188,8 @@
<el-row> <el-row>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="包装单位/包装级别" prop="bzcj"> <el-form-item label="包装层级" prop="bzcj">
<el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj" :disabled="true"></el-input> <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

4
src/views/purchase/company/companyProducts.vue
Unescape Escape View File

@ -188,8 +188,8 @@
<el-row> <el-row>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="包装单位/包装级别" prop="bzcj"> <el-form-item label="包装层级" prop="bzcj">
<el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj" :disabled="true"></el-input> <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

4
src/views/purchase/purApply/purApplyProducts.vue
Unescape Escape View File

@ -188,8 +188,8 @@
<el-row> <el-row>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="包装单位/包装级别" prop="bzcj"> <el-form-item label="包装层级" prop="bzcj">
<el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj" :disabled="true"></el-input> <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

4
src/views/purchase/purApply/purUdiRlDetailDialog.vue
Unescape Escape View File

@ -111,8 +111,8 @@
<el-row> <el-row>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="包装单位/包装级别" prop="bzcj"> <el-form-item label="包装层级" prop="bzcj">
<el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj" :disabled="true"></el-input> <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

Write Preview
Loading…
Cancel
Save