新增耗材分类

dev2.0.1
anthonywj 1 year ago
parent 4cb6e2ca56
commit a6699c23c5

@ -33,7 +33,7 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/'
VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/'
#诏安医院
# VUE_APP_BASE_API = 'http://139.9.174.242:9150/UDI_SPMS_SERVER/'
@ -45,7 +45,7 @@ VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://192.168.0.72:9150/UDI_SPMS_SERVER/'
# 南靖
# VUE_APP_BASE_API = 'http://183.250.74.182:9150/UDI_SPMS_SERVER/'
VUE_APP_BASE_API = 'http://183.250.74.182:9150/UDI_SPMS_SERVER/'
# 东山
# VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/'

@ -385,6 +385,23 @@
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">耗材类别</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="editQuery.attributeType" style="width: 65%" placeholder="选择耗材类别" clearable>
<el-option label="高值耗材" :value="1"></el-option>
<el-option label="普通耗材" :value="2"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">耗材类别</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">最小包装可使用次数</span>

@ -7,7 +7,7 @@
<h3 class="toptitle">{{ title }}</h3>
</el-row>
<el-row>
<h3 class="topSubtitle">医院UDI管理系统</h3>
<h3 class="topSubtitle">{{ subTitle }}</h3>
</el-row>
</div>
<el-form
@ -161,7 +161,8 @@ export default {
showDialog: false, // dialog
redirect: null, //
hospName: "",
title: "福建省XXX医院"
title: "福建省XXX医院",
subTitle: "医院UDI管理系统",
};
},
methods: {
@ -274,6 +275,7 @@ export default {
getTitleConfig() {
getTitleConfig().then(res => {
this.title = res.data.title;
this.subTitle = res.data.subTitle;
});
},
},

@ -346,6 +346,7 @@ export default {
ybbm: this.editQuery.ybbm,
purType: this.editQuery.purType,
attributeType: this.editQuery.attributeType,
hcType: this.editQuery.hcType,
overStockNum: this.editQuery.overStockNum,
lowStockNum: this.editQuery.lowStockNum,
recentDateTime: this.editQuery.recentDateTime,

@ -108,6 +108,20 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="耗材类别">
<el-select
v-model="editQuery.hcType"
placeholder="请选择"
clearable
:disabled="true"
style="width: 65%"
>
<el-option label="高值耗材" :value="1"></el-option>
<el-option label="普通耗材" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"

@ -225,6 +225,19 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="耗材类别">
<el-select
v-model="editQuery.hcType"
placeholder="请选择"
clearable
style="width: 65%"
>
<el-option label="高值耗材" :value="1"></el-option>
<el-option label="普通耗材" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="是否可集采:"

@ -1,65 +1,67 @@
<template>
<div>
<el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<!-- <el-row>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="物资编码:">-->
<!-- <el-input v-model="filterQuery.code" placeholder="请输入产品编码/商品条码/医保编码" clearable-->
<!-- style="width: 90%" @keyup.enter.native="keyupErp_submit($event)"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="物资名称:">-->
<!-- <el-input v-model="filterQuery.name" style="width: 90%" clearable placeholder="请输入物资名称"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="规格型号:">-->
<!-- <el-input v-model="filterQuery.spec" style="width: 90%" clearable placeholder="请输入规格型号"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="审核状态:">-->
<!-- <el-select v-model="filterQuery.checkStatus" style="width: 90%" placeholder="请选择审核状态">-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="已审核" value="2"></el-option>-->
<!-- <el-option label="未审核" value="1"></el-option>-->
<!-- <el-option label="未通过" value="3"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="供应商:">-->
<!-- <el-select-->
<!-- v-model="filterQuery.customerId"-->
<!-- filterable-->
<!-- remote-->
<!-- clearable="true"-->
<!-- reserve-keyword-->
<!-- style="width: 90%"-->
<!-- placeholder="请选择供应商"-->
<!-- :remote-method="findCompany"-->
<!-- :loading="loading"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in companyNames"-->
<!-- :key="item.companyName"-->
<!-- :label="item.companyName"-->
<!-- :value="item.customerId"-->
<!-- >-->
<!-- <span style="float: left">{{ item.companyName }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" label-width="100px"
v-show="showSearch">
<!-- <el-row>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="物资编码:">-->
<!-- <el-input v-model="filterQuery.code" placeholder="请输入产品编码/商品条码/医保编码" clearable-->
<!-- style="width: 90%" @keyup.enter.native="keyupErp_submit($event)"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="物资名称:">-->
<!-- <el-input v-model="filterQuery.name" style="width: 90%" clearable placeholder="请输入物资名称"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="规格型号:">-->
<!-- <el-input v-model="filterQuery.spec" style="width: 90%" clearable placeholder="请输入规格型号"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="审核状态:">-->
<!-- <el-select v-model="filterQuery.checkStatus" style="width: 90%" placeholder="请选择审核状态">-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="已审核" value="2"></el-option>-->
<!-- <el-option label="未审核" value="1"></el-option>-->
<!-- <el-option label="未通过" value="3"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="供应商:">-->
<!-- <el-select-->
<!-- v-model="filterQuery.customerId"-->
<!-- filterable-->
<!-- remote-->
<!-- clearable="true"-->
<!-- reserve-keyword-->
<!-- style="width: 90%"-->
<!-- placeholder="请选择供应商"-->
<!-- :remote-method="findCompany"-->
<!-- :loading="loading"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in companyNames"-->
<!-- :key="item.companyName"-->
<!-- :label="item.companyName"-->
<!-- :value="item.customerId"-->
<!-- >-->
<!-- <span style="float: left">{{ item.companyName }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" >
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<template v-for="(item, index) in queryList">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
@ -68,7 +70,8 @@
clearable
></el-input>
</el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@ -80,10 +83,13 @@
:value="dict.value"
/>
<span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
item.code
}}</span>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
@ -99,10 +105,13 @@
:value="item.code"
/>
<span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
item.code
}}</span>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
@ -114,7 +123,8 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker
v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
@ -139,29 +149,29 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
<!-- <el-table-column label="产品标识" prop="code" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="物资名称" prop="name" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="产品描述" prop="cpms" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="规格型号" prop="standard" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="注册证编号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="审核状态" prop="status" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ checkMap[scope.row.status] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="审核意见" prop="remark" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row,1)">详情</el-button>-->
<!-- <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"-->
<!-- :disabled="scope.row.status==2">删除-->
<!-- </el-button>-->
<!-- <el-button type="text" size="small" :disabled="scope.row.status==2" @click="detailDialog(scope.row,2)">-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="产品标识" prop="code" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="物资名称" prop="name" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="产品描述" prop="cpms" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="规格型号" prop="standard" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="注册证编号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="审核状态" prop="status" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ checkMap[scope.row.status] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="审核意见" prop="remark" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row,1)">详情</el-button>-->
<!-- <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"-->
<!-- :disabled="scope.row.status==2">删除-->
<!-- </el-button>-->
<!-- <el-button type="text" size="small" :disabled="scope.row.status==2" @click="detailDialog(scope.row,2)">-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@ -182,7 +192,7 @@
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
@ -195,8 +205,10 @@
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template>
</el-table-column>
<el-table-column
@ -208,9 +220,12 @@
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
<template slot-scope="scope">
<el-tag
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span>
</el-tag>
</template>
</el-table-column>
@ -245,7 +260,9 @@
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template>
</el-table-column>
</template>
@ -321,10 +338,10 @@ import {
} from '@/api/supplier/supProductsAddDi'
import selectDiDetail from '@/views/supplier/products/selectDIDetailDialog'
import ThrProductsAdd from '@/views/supplier/products/supProductsAdd'
import { filterCustomers, filterCustomersOptimize } from '@/api/auth/customer'
import {filterCustomers, filterCustomersOptimize} from '@/api/auth/customer'
import thrProductsDetail from '@/views/supplier/products/supProductsDetail'
import {
getHead,executeFuc
getHead, executeFuc
} from "@/utils/customConfig";
export default {
@ -351,12 +368,12 @@ export default {
fileList: [],
checkVisible: false,
newType: 1,
tableHeader:[],
queryList:[],
fromList:[],
tableHeader: [],
queryList: [],
fromList: [],
options: {
findCompany:[],
findMethod:[],
findCompany: [],
findMethod: [],
},
thrProductsDetailVisible: false,
thrProductsDiDetailVisible: false,
@ -434,7 +451,7 @@ export default {
this.total = 0
})
},
deleteDialog(_this,row) {
deleteDialog(_this, row) {
_this.$confirm('此操作将永久删除该产品信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -461,7 +478,7 @@ export default {
.catch(() => {
})
},
detailDialog(_this,row) {
detailDialog(_this, row) {
_this.title = "产品信息详情"
if (row.type == 1) {
let query = {devKey: row.deviceRecordKey}
@ -469,7 +486,7 @@ export default {
if (res.code === 20000) {
_this.thisData = res.data
_this.editDate = row
_this.thisData.isAudit = type
_this.thisData.isAudit = 1
_this.thrProductsDiDetailVisible = true
} else {
_this.$message.error('参数错误')
@ -481,7 +498,7 @@ export default {
_this.thrProductsDetailVisible = true;
}
},
auditDialog(_this,row) {
auditDialog(_this, row) {
_this.title = "物资入院审核"
if (row.type == 1) {
let query = {devKey: row.deviceRecordKey}
@ -489,7 +506,7 @@ export default {
if (res.code === 20000) {
_this.thisData = res.data
_this.editDate = row
_this.thisData.isAudit = type
_this.thisData.isAudit = 2
_this.thrProductsDiDetailVisible = true
} else {
_this.$message.error('参数错误')
@ -529,7 +546,7 @@ export default {
this.$message.error(error.message)
})
},
findCompany(_this,query) {
findCompany(_this, query) {
_this.companyNames = []
let cQuery = {
key: query
@ -540,11 +557,11 @@ export default {
_this.options.findCompany = []
})
},
executeFuc(row,type,clickFuc,value){
return executeFuc(this,row,type,clickFuc,value);
executeFuc(row, type, clickFuc, value) {
return executeFuc(this, row, type, clickFuc, value);
},
executeEval(row,expression,defaultRet){
if(expression){
executeEval(row, expression, defaultRet) {
if (expression) {
return eval(expression);
}
return defaultRet;
@ -556,7 +573,7 @@ export default {
mounted() {
},
created() {
getHead("supDiProductsCheck","1").then((re) => {
getHead("supDiProductsCheck", "1").then((re) => {
//
this.tableObj = re.data;
this.tableHeader = re.data.tableList;

Loading…
Cancel
Save