py/his
3
2
Fork 0
Code Issues Pull Requests 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

193
openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
View File

@@ -46,7 +46,9 @@
clearable
@change="handleLvChange"
style="width: 240px"
:disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
>
>
<el-option
v-for="dict in chrgitm_lv"
:key="dict.value"
@@ -70,7 +72,12 @@
</el-col>
<el-col :span="6">
<el-form-item label="药品分类" prop="categoryCode">
<el-select v-model="form.categoryCode" clearable>
<el-select
v-model="form.categoryCode"
clearable
filterable
:disabled="form.isEditInfoDisable === 2 || form.isEditInfoDisable === 1"
>
<el-option
v-for="category in med_category_code"
:key="category.value"
@@ -107,17 +114,31 @@
</el-col>
<el-col :span="6">
<el-form-item label="规格" prop="totalVolume">
<el-input v-model="form.totalVolume" placeholder="" />
<el-input
v-model="form.totalVolume"
placeholder=""
clearable
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="计量换算" prop="totalVolume">
<el-input v-model="form.unitConversionRatio" placeholder="" />
<el-input
v-model="form.unitConversionRatio"
placeholder=""
clearable
:disabled="form.isEditInfoDisable === 1"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="剂量单位" prop="doseUnitCode">
<el-select v-model="form.doseUnitCode" clearable filterable>
<el-select
v-model="form.doseUnitCode"
clearable
filterable
:disabled="form.isEditInfoDisable === 1"
>
<el-option
v-for="category in unit_code"
:key="category.value"
@@ -131,7 +152,12 @@
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="剂型" prop="doseFormCode">
<el-select v-model="form.doseFormCode" clearable filterable>
<el-select
v-model="form.doseFormCode"
clearable
filterable
:disabled="form.isEditInfoDisable === 1"
>
<el-option
v-for="category in dose_form_code"
:key="category.value"
@@ -182,6 +208,18 @@
<el-input v-model="form.maxUnit" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="用法说明" prop="dosageInstruction">
<el-select v-model="form.dosageInstruction" clearable filterable>
<el-option
v-for="category in dosage_instruction"
:key="category.value"
:label="category.label"
:value="category.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<div class="title">库存信息</div>
<el-row :gutter="24">
@@ -222,7 +260,12 @@
</el-col>
<el-col :span="6">
<el-form-item label="包装单位" prop="unitCode">
<el-select v-model="form.unitCode" clearable filterable>
<el-select
v-model="form.unitCode"
clearable
filterable
:disabled="form.isEditInfoDisable === 2 || form.isEditInfoDisable === 1"
>
<el-option
v-for="category in unit_code"
:key="category.value"
@@ -234,7 +277,12 @@
</el-col>
<el-col :span="6">
<el-form-item label="最小单位" prop="minUnitCode">
<el-select v-model="form.minUnitCode" clearable filterable>
<el-select
v-model="form.minUnitCode"
clearable
filterable
:disabled="form.isEditInfoDisable === 2 || form.isEditInfoDisable === 1"
>
<el-option
v-for="category in unit_code"
:key="category.value"
@@ -245,8 +293,12 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="警戒线最低值(常规单位)" prop="itemMinQuantity" label-width="180px">
<el-input-number
<el-form-item
label="警戒线最低值(常规单位)"
prop="itemMinQuantity"
label-width="180px"
>
<el-input-number
v-model="form.itemMinQuantity"
placeholder=""
controls-position="right"
@@ -287,12 +339,23 @@
</el-col>
<el-col :span="6">
<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"
placeholder=""
:min="1"
clearable
:disabled="form.isEditInfoDisable === 2 || form.isEditInfoDisable === 1"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="警戒线最高值(常规单位)" prop="itemMaxQuantity" label-width="180px">
<el-form-item
label="警戒线最高值(常规单位)"
prop="itemMaxQuantity"
label-width="180px"
>
<el-input-number
v-model="form.itemMaxQuantity"
placeholder=""
@@ -306,12 +369,22 @@
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="购入价" prop="purchasePrice">
<el-input v-model="form.purchasePrice" placeholder="" :disabled="false" />
<el-input
v-model="form.purchasePrice"
placeholder=""
clearable
:disabled="form.isEditInfoDisable === 2 || form.isEditInfoDisable === 1"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="零售价" prop="retailPrice">
<el-input v-model="form.retailPrice" placeholder="" :disabled="false" />
<el-input
v-model="form.retailPrice"
placeholder=""
clearable
:disabled="form.isEditInfoDisable === 2 || form.isEditInfoDisable === 1"
/>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -324,7 +397,12 @@
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="财务类型" prop="typeCode">
<el-select v-model="form.typeCode" clearable filterable>
<el-select
v-model="form.typeCode"
clearable
filterable
:disabled="form.isEditInfoDisable === 2 || form.isEditInfoDisable === 1"
>
<el-option
v-for="category in fin_type_code"
:key="category.value"
@@ -375,6 +453,7 @@
clearable
filterable
style="width: 240px"
:disabled="form.isEditInfoDisable === 1"
>
<el-option
v-for="dict in med_chrgitm_type"
@@ -399,19 +478,28 @@
</el-col> -->
<el-col :span="6">
<el-form-item label="基药标识" prop="basicFlag">
<el-checkbox v-model="form.basicFlag"></el-checkbox>
<el-checkbox
v-model="form.basicFlag"
:disabled="form.isEditInfoDisable === 1"
></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="皮试判别" prop="skinTestFlag">
<el-checkbox v-model="form.skinTestFlag"></el-checkbox>
<el-checkbox
v-model="form.skinTestFlag"
:disabled="form.isEditInfoDisable === 1"
></el-checkbox>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="注射药品" prop="injectFlag">
<el-checkbox v-model="form.injectFlag"></el-checkbox>
<el-checkbox
v-model="form.injectFlag"
:disabled="form.isEditInfoDisable === 1"
></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -448,8 +536,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="处方标志" prop="rxFlag">
<el-radio-group v-model="form.rxFlag">
<el-radio v-for="item in rx_flag" :key="item.value" :label="item.value">
<el-radio-group v-model="form.rxFlag" :disabled="form.isEditInfoDisable === 1">
<el-radio v-for="item in rx_flag" :key="item.value" :value="item.value">
{{ item.label }}
</el-radio>
</el-radio-group>
@@ -583,6 +671,7 @@ const {
ddd_code,
dose_from_code,
rx_flag,
dosage_instruction,
chrgitm_lv,
} = proxy.useDict(
'med_category_code',
@@ -598,6 +687,7 @@ const {
'ddd_code',
'dose_from_code',
'rx_flag',
'dosage_instruction',
'chrgitm_lv'
);
@@ -639,23 +729,11 @@ const data = reactive({
form: {},
antibioticForm: {},
rules: {
// statusEnum: [
// { required: true, message: "药品状态不能为空", trigger: "blur" },
// ],
// orgId: [{ required: true, message: "所属科室不能为空", trigger: "blur" }],
locationId: [{ required: true, message: '所在位置不能为空', trigger: 'blur' }],
doseFormCode: [{ required: true, message: '剂型不能为空', trigger: 'blur' }],
totalVolume: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
// activeFlag: [{ required: true, message: "活性不能为空", trigger: "blur" }],
// methodCode: [{ required: true, message: '用法不能为空', trigger: 'blur' }],
// rateCode: [{ required: true, message: '用药频次不能为空', trigger: 'blur' }],
// dose: [{ required: true, message: '单次剂量不能为空', trigger: 'blur' }],
doseUnitCode: [{ required: true, message: '剂量单位不能为空', trigger: 'blur' }],
manufacturerText: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
// maxUnit: [
// { required: true, message: '单次最大剂量不能为空', trigger: 'blur' },
// { validator: validateMaxUnit, trigger: 'blur' },
// ],
busNo: [{ required: true, message: '药品编号不能为空', trigger: 'blur' }],
name: [{ required: true, message: '药品名称不能为空', trigger: 'blur' }],
categoryCode: [{ required: true, message: '药品分类不能为空', trigger: 'blur' }],
@@ -665,29 +743,10 @@ const data = reactive({
minUnitCode: [{ required: true, message: '最小单位不能为空', trigger: 'blur' }],
ingredient: [{ required: true, message: '成分不能为空', trigger: 'blur' }],
partPercent: [{ required: true, message: '拆零比不能为空', trigger: 'blur' }],
// itemMinQuantity: [{ required: true, message: '警戒线最低值不能为空', trigger: 'blur' }],
// itemMaxQuantity: [{ required: true, message: '警戒线最高值不能为空', trigger: 'blur' }],
doseFrom: [{ required: true, message: '剂量形式不能为空', trigger: 'blur' }],
// approvalNumber: [{ required: true, message: '批准文号不能为空', trigger: 'blur' }],
// ybMatchFlag: [
// { required: true, message: "医保对码不能为空", trigger: "blur" },
// ],
ybNo: [{ required: false, message: '医保编码不能为空', trigger: 'blur' }],
pharmacologyCategoryCode: [{ required: true, message: '药品性质不能为空', trigger: 'blur' }],
// skinTestFlag: [
// { required: true, message: "皮试不能为空", trigger: "blur" },
// ],
// injectFlag: [{ required: true, message: "注射不能为空", trigger: "blur" }],
supplyId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
// restrictedFlag: [
// { required: true, message: "限制使用不能为空", trigger: "blur" },
// ],
// childrenFlag: [
// { required: true, message: "儿童用药不能为空", trigger: "blur" },
// ],
// restrictedScope: [
// { required: true, message: "限制使用范围不能为空", trigger: "blur" },
// ],
nationalDrugCode: [{ required: false, message: '贯标国家编码不能为空', trigger: 'blur' }],
partAttributeEnum: [{ required: true, message: '拆分属性不能为空', trigger: 'blur' }],
thoPartAttributeEnum: [
@@ -697,16 +756,8 @@ const data = reactive({
trigger: 'blur',
},
],
// basicFlag: [
// { required: true, message: "基药标识不能为空", trigger: "blur" },
// ],
// antibioticFlag: [
// { required: true, message: "抗生素不能为空", trigger: "blur" },
// ],
// selfFlag: [{ 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' }],
rxFlag: [{ required: true, message: '处方标志不能为空', trigger: 'blur' }],
chrgitmLv: [{ required: true, message: '医保等级不能为空', trigger: 'blur' }],
@@ -762,15 +813,12 @@ function validateMaxUnit(rule, value, callback) {
/** 查询部门下拉树结构 */
function getDeptTree() {
deptTreeSelect().then((response) => {
console.log(response, 'response查询部门下拉树结构');
deptOptions.value = response.data.records;
console.log(deptOptions.value, '部门下拉树结构');
});
}
/** 查询地点下拉树结构 */
function getLocationTree() {
locationTreeSelect({ formList: '11,16' }).then((response) => {
console.log(response, 'response查询部门下拉树结构');
locationOptions.value = response.data.records;
});
}
@@ -787,10 +835,7 @@ function show(row) {
statusRestrictedOptions.value = props.statusRestrictedOptions;
partAttributeEnumOptions.value = props.partAttributeEnumOptions;
tempOrderSplitPropertyOptions.value = props.tempOrderSplitPropertyOptions;
console.log(form.value.categoryCode, 'form.value.categoryCode');
// setValue(row);
form.value.categoryCode = props.currentCategoryEnum;
console.log(form.value, 1234567890);
visible.value = true;
}
@@ -799,38 +844,22 @@ function setValue(row) {
name: formatValue(props.currentCategoryEnum == '4' ? row.singleDrugName : row.registeredName), // 通用名称
merchandiseName: formatValue(row.registeredName), // 商品名称
ybNo: formatValue(row.medicalCatalogCode), // 医保编码
// categoryCode: row.drugCategory, // 药品分类
// ybMatchFlag: row., // 医保对码
// pharmacologyCategoryCode: row., // 药品性质
totalVolume: formatValue(
props.currentCategoryEnum == '4' ? row.conventionalUsage : row.drugSpecification
), // 规格
doseode: formatValue(row.drugForm), // 剂型
doseUnitCode: formatValue(row.minMeasurementUnit), // 剂量单位
// usageLimit: row.dosage, // 用量限定
methodCode: formatValue(row.usage), // 用法
rateCode: formatValue(row.frequency), // 用药频次
// maxUnit: row., // 单次最大剂量
// skinTestFlag: row., // 皮试判别
// locationId: row., // 采购入库位置
unitCode: formatValue(row.packagingUnit), // 包装单位
minUnitCode: formatValue(row.minUseUnit), // 最小单位
// partAttributeEnum: row., // 门诊拆分属性
// thoPartAttributeEnum: row., // 住院临时医嘱拆分属性
partPercent: formatValue(row.conversionRatio), // 拆零比
itemMinQuantity: formatValue(row.itemMinQuantity), // 警戒线最低值
itemMaxQuantity: formatValue(row.itemMaxQuantity), // 警戒线最高值
// purchasePrice: row., // 购入价
// retailPrice: row., // 零售价
// maximumRetailPrice: row., // 最高零售价
// typeCode: row., // 财务类型
nationalDrugCode: formatValue(row.nationalDrugCode), // 贯标国家编码
version: formatValue(row.version), // 药品版本
approvalNumber: formatValue(row.approvalNo), // 批准文号
// ybType: formatValue(row.insuranceClass), // 医保类别
manufacturerText: formatValue(row.manufacturerName), // 生产厂家
// supplyId: row., // 供应商
basicFlag: formatValue(row.essentialDrugFlag), // 基药标识
// injectFlag: row., // 注射药物
// childrenFlag: row.pediatricUse, // 儿童用药标志
@@ -887,7 +916,6 @@ function edit() {
antibioticForm.value.maxRateCode = form.value.maxRateCode;
antibioticForm.value.dddUnitCode = form.value.dddUnitCode;
antibioticForm.value.dddCode = form.value.dddCode;
//antibioticForm.value.chrgitmLv = form.value.chrgitmLv ? form.value.chrgitmLv.toString() : undefined;
form.value.chrgitmLv = form.value.chrgitmLv ? form.value.chrgitmLv.toString() : undefined;
visible.value = true;
}
@@ -941,7 +969,6 @@ function reset() {
minUnitCode: undefined,
doseUnitCode: undefined,
doseFormCode: undefined,
// statusEnum: undefined,
skinTestFlag: undefined,
injectFlag: undefined,
childrenFlag: undefined,
@@ -968,8 +995,6 @@ function reset() {
nationalDrugCode: undefined,
antibioticFlag: undefined,
selfFlag: undefined,
// minRateCode: undefined,
// maxRateCode: undefined,
partAttributeEnum: undefined,
thoPartAttributeEnum: undefined,
usageLimit: undefined,