wangyizhe/his
3
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
View File

@@ -22,12 +22,12 @@
<el-row :gutter="24">
<el-col :span="8" v-if="form.id != undefined">
<el-form-item label="编号" prop="busNo">
<el-input v-model="form.busNo" placeholder="请输入编码" disabled />
<el-input v-model="form.busNo" clearable placeholder="请输入编码" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="器材名称" prop="name">
<el-input v-model="form.name" placeholder="请输入器材名称" />
<el-input v-model="form.name" clearable placeholder="请输入器材名称" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -35,10 +35,10 @@
<el-tree-select
v-model="form.categoryCode"
:data="deviceCategories"
filterable
:props="{ value: 'value', label: 'info', children: 'children' }"
:disabled="false"
:disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
value-key="value"
placeholder=""
check-strictly
clearable
/>
@@ -48,7 +48,7 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="器材种类" prop="typeCode">
<el-select v-model="form.typeCode" placeholder="请选择" clearable>
<el-select v-model="form.typeCode" clearable filterable>
<el-option
v-for="dict in device_type_code"
:key="dict.value"
@@ -68,6 +68,7 @@
placeholder="请选择提供部门"
check-strictly
clearable
filterable
/>
</el-form-item>
</el-col>
@@ -81,6 +82,7 @@
placeholder="请选择地点"
check-strictly
clearable
filterable
/>
</el-form-item>
</el-col>
@@ -90,9 +92,10 @@
<el-form-item label="包装单位" prop="unitCode">
<el-select
v-model="form.unitCode"
placeholder="请选择"
clearable
filterable
@change="handleUnitCodeChange"
:disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
>
<el-option
v-for="dict in unit_code"
@@ -105,7 +108,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="销售单位" prop="salesUnitCode">
<el-select v-model="form.salesUnitCode" placeholder="请选择" clearable>
<el-select v-model="form.salesUnitCode" clearable filterable>
<el-option
v-for="dict in unit_code"
:key="dict.value"
@@ -117,7 +120,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="最小单位" prop="minUnitCode">
<el-select v-model="form.minUnitCode" placeholder="请选择" clearable>
<el-select
v-model="form.minUnitCode"
clearable
filterable
:disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
>
<el-option
v-for="dict in unit_code"
:key="dict.value"
@@ -131,95 +139,70 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="包装规格" prop="size">
<el-input v-model="form.size" placeholder="" />
<el-input
v-model="form.size"
clearable
:disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="拆零比" prop="partPercent">
<el-input-number v-model="form.partPercent" controls-position="right" placeholder="" :min="1"/>
<el-input-number
v-model="form.partPercent"
controls-position="right"
:min="1"
:disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品型号" prop="modelNumber">
<el-input v-model="form.modelNumber" placeholder="" />
<el-input v-model="form.modelNumber" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="批准文号" prop="approvalNumber">
<el-input v-model="form.approvalNumber" placeholder="" />
<el-input v-model="form.approvalNumber" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="医保编码" prop="ybNo">
<el-input v-model="form.ybNo" placeholder="" />
<el-input v-model="form.ybNo" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="医药机构目录编码" prop="ybOrgNo" label-width="125px">
<el-input v-model="form.ybOrgNo" placeholder="" />
<el-input v-model="form.ybOrgNo" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主要成分" prop="substanceText">
<el-input v-model="form.substanceText" placeholder="" />
<el-input v-model="form.substanceText" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="警戒线最低值(常规单位)" prop="itemMinQuantity" label-width="180px">
<el-input-number
v-model="form.itemMinQuantity"
placeholder=""
controls-position="right"
:min="0"
/>
<el-input-number v-model="form.itemMinQuantity" controls-position="right" :min="0" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="警戒线最高值(常规单位)" prop="itemMaxQuantity" label-width="180px">
<el-input-number
v-model="form.itemMaxQuantity"
placeholder=""
controls-position="right"
:min="0"
/>
<el-input-number v-model="form.itemMaxQuantity" controls-position="right" :min="0" />
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="器材版本" prop="version">
<el-input v-model="form.version" placeholder="" />
</el-form-item>
</el-col> -->
</el-row>
<el-row :gutter="24">
<!-- <el-col :span="8">
<el-form-item label="状态" prop="statusEnum">
<el-select
v-model="form.statusEnum"
placeholder="请选择"
clearable
>
<el-option
v-for="dict in statusFlagOptions"
:key="dict.value"
:label="dict.info"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="生产厂家" prop="manufacturerText">
<el-input v-model="form.manufacturerText" placeholder="" />
<el-input v-model="form.manufacturerText" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供应商" prop="supplyId">
<el-select v-model="form.supplyId" placeholder="" clearable style="width: 150px">
<el-select v-model="form.supplyId" filterable clearable style="width: 150px">
<el-option
v-for="supplier in supplierListOptions"
:key="supplier.value"
@@ -255,7 +238,12 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="财务类型" prop="itemTypeCode">
<el-select v-model="form.itemTypeCode" clearable>
<el-select
v-model="form.itemTypeCode"
clearable
filterable
:disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
>
<el-option
v-for="category in fin_type_code"
:key="category.value"
@@ -271,7 +259,9 @@
v-model="form.ybType"
placeholder="医保类别"
clearable
filterable
style="width: 240px"
:disabled="form.isEditInfoDisable === 1"
>
<el-option
v-for="dict in med_chrgitm_type"
@@ -284,7 +274,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="适用范围" prop="jurisdiction">
<el-input v-model="form.jurisdiction" placeholder="" />
<el-input v-model="form.jurisdiction" clearable />
</el-form-item>
</el-col>
</el-row>
@@ -293,20 +283,23 @@
<el-form-item label="购入价" prop="purchasePrice">
<el-input
v-model="form.purchasePrice"
placeholder=""
:disabled="false"
:disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
@input="updatePrices"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="零售价" prop="retailPrice">
<el-input v-model="form.retailPrice" placeholder="" :disabled="false" />
<el-input
v-model="form.retailPrice"
clearable
:disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="最高零售价" prop="maximumRetailPrice">
<el-input v-model="form.maximumRetailPrice" placeholder="" :disabled="false" />
<el-input v-model="form.maximumRetailPrice" clearable :disabled="false" />
</el-form-item>
</el-col>
</el-row>
@@ -317,7 +310,9 @@
v-model="form.chrgitmLv"
placeholder="医保等级"
clearable
filterable
style="width: 240px"
:disabled="form.isEditInfoDisable === 1"
>
<el-option
v-for="dict in chrgitm_lv"
@@ -336,7 +331,7 @@
v-model="form.description"
:autosize="{ minRows: 4, maxRows: 10 }"
type="textarea"
placeholder=""
clearable
/>
</el-form-item>
</el-col>
@@ -376,52 +371,27 @@ const supplierListOptions = ref([]); // 供应商列表
const data = reactive({
form: {},
rules: {
// busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
// pyStr: [{ required: true, message: "拼音不能为空", trigger: "blur" }],
// wbStr: [{ required: true, message: "五笔拼音不能为空", trigger: "blur" }],
categoryCode: [{ required: true, message: '器材分类不能为空', trigger: 'blur' }],
//typeCode: [{ required: true, message: '器材种类不能为空', trigger: 'blur' }],
unitCode: [{ required: true, message: '包装单位不能为空', trigger: 'blur' }],
size: [{ required: true, message: '包装规格不能为空', trigger: 'blur' }],
partPercent: [{ required: true, message: '拆零比不能为空', trigger: 'blur' }],
minUnitCode: [{ required: true, message: '最小使用单位不能为空', trigger: 'blur' }],
// modelNumber: [{ required: true, message: '产品型号不能为空', trigger: 'blur' }],
// hvcmFlag: [
// { required: true, message: "高值器材标志不能为空", trigger: "blur" },
// ],
itemMinQuantity: [{ required: true, message: '警戒线最低值不能为空', trigger: 'blur' }],
itemMaxQuantity: [{ required: true, message: '警戒线最高值不能为空', trigger: 'blur' }],
salesUnitCode: [{ required: true, message: '销售单位不能为空', trigger: 'blur' }],
//approvalNumber: [{ required: true, message: '批准文号不能为空', trigger: 'blur' }],
// ybFlag: [{ required: true, message: "医保标记不能为空", trigger: "blur" }],
// // ybNo: [{ required: true, message: "医保编码不能为空", trigger: "blur" }],
// ybMatchFlag: [
// { required: true, message: "医保对码标记不能为空", trigger: "blur" },
// ],
// statusEnum: [{ required: true, message: "状态不能为空", trigger: "blur" }],
manufacturerId: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
// supplyId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
// description: [{ required: true, message: "说明不能为空", trigger: "blur" }],
//jurisdiction: [{ required: true, message: '适用范围不能为空', trigger: 'blur' }],
ruleId: [{ required: true, message: '执行科室不能为空', trigger: 'blur' }],
// version: [{ required: true, message: "器材版本不能为空", trigger: "blur" }],
// substanceText: [{ required: true, message: "主要成分不能为空", trigger: "blur" }],
// allergenFlag: [
// { required: true, message: "过敏标记不能为空", trigger: "blur" },
// ],
// orgId: [{ required: true, message: '提供部门不能为空', trigger: 'blur' }],
locationId: [{ required: true, message: '地点不能为空', trigger: 'blur' }],
purchasePrice: [{ required: true, message: '购入价不能为空', trigger: 'blur' }],
retailPrice: [{ required: true, message: '零售价不能为空', trigger: 'blur' }],
//maximumRetailPrice: [{ required: true, message: '最高零售价不能为空', trigger: 'blur' }],
ybType: [{ required: true, message: '医保类型不能为空', trigger: 'blur' }],
chrgitmLv: [{ required: true, message: '医保等级不能为空', trigger: 'blur' }],
itemTypeCode: [{ required: true, message: '财务类型不能为空', trigger: 'blur' }],
},
});
const { queryParams, form, rules } = toRefs(data);
const { form, rules } = toRefs(data);
const props = defineProps({
item: {
@@ -465,8 +435,8 @@ function show() {
supplierListOptions.value = props.supplierListOptions;
form.value.partPercent = 1;
form.value.itemTypeCode = '2005';
form.value.ybType = '8';
console.log(props, '22222', title.value, props.deviceCategories);
form.value.ybType = '08';
form.value.size = '-';
getDeptTree();
getLocationTree();
visible.value = true;
@@ -476,21 +446,16 @@ function setValue(row) {
form.value = {
name: formatValue(row.consumableName), //医疗服务项目名称
ybNo: formatValue(row.medicalCatalogCode), // 医保编码
// modelNumber: formatValue(row.productModel), // 产品型号
modelNumber: formatValue(row.specification), // 规格
manufacturerText: formatValue(row.manufacturerName), // 厂家名称
partPercent: 1,
itemMinQuantity: formatValue(row.itemMinQuantity), // 警戒线最低值
itemMaxQuantity: formatValue(row.itemMaxQuantity), // 警戒线最高值
// chrgitmLv: formatValue(
// row.insuranceClass == '甲' ? '1' : row.insuranceClass == '乙' ? '2' : '3'
// ), // 医保等级
};
}
/** 查询部门下拉树结构 */
function getDeptTree() {
deptTreeSelect().then((response) => {
console.log(response, 'response查询部门下拉树结构');
deptOptions.value = response.data.records;
});
}
@@ -538,13 +503,11 @@ function reset() {
ybNo: undefined, // 医保编码
ybOrgNo: undefined, //医药机构目录编码
ybMatchFlag: undefined, // 医保对码标记
// statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用）
manufacturerId: undefined, // 厂家编码
supplyId: undefined, // 供应商编码
description: undefined, // 说明
jurisdiction: undefined, // 适用范围
ruleId: undefined, // 执行科室
// version: undefined, // 器材版本
substanceText: undefined, // 主要成分
allergenFlag: undefined, // 过敏标记
orgId: undefined, // 科室ID
@@ -567,7 +530,6 @@ function submitForm() {
form.value.ybFlag ? (form.value.ybFlag = 1) : (form.value.ybFlag = 0);
form.value.ybMatchFlag ? (form.value.ybMatchFlag = 1) : (form.value.ybMatchFlag = 0);
form.value.allergenFlag ? (form.value.allergenFlag = 1) : (form.value.allergenFlag = 0);
console.log(form.value, 'form.value');
if (form.value.id != undefined) {
editDevice(form.value).then((response) => {
// 触发自定义事件，并传递数据给父组件