diff --git a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue index 66cff3af..62c57a29 100644 --- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue +++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue @@ -11,44 +11,13 @@ label-width="110px" label-position="left" > - - @@ -60,20 +29,15 @@ - - - - + + + + - + + + + + + +
临床信息
- - - - - - - - - - - - - - - - - - @@ -159,58 +67,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -224,8 +85,8 @@ - - + + + + - - @@ -267,11 +128,59 @@ - - - + + + + + + + + + + + + +
库存信息
+ + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - + + + @@ -387,41 +231,13 @@ - - - - - - - - - - - - - - - - - - - +
价格信息
@@ -450,18 +266,105 @@ /> + +
业务信息
+ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - @@ -472,6 +375,11 @@ + + + + + @@ -494,38 +402,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -697,52 +573,107 @@ 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" }], + // 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" }], - ingredientItem: [{ required: true, message: "成分不能为空", trigger: "blur" }], activeFlag: [{ required: true, message: "活性不能为空", trigger: "blur" }], - lotNumber: [{ 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" }], - maxUnit:[{ required: true, message: "单次最大剂量不能为空", trigger: "blur" }], - definition: [{ 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" }, + ], + maxUnit: [ + { required: true, message: "单次最大剂量不能为空", trigger: "blur" }, + ], busNo: [{ required: true, message: "药品编号不能为空", trigger: "blur" }], name: [{ required: true, message: "药品名称不能为空", trigger: "blur" }], - domainEnum: [{ required: true, message: "适用范围不能为空", trigger: "blur" }], - nameEn: [{ required: true, message: "英文药名不能为空", trigger: "blur" }], - categoryCode:[{ required: true, message: "药品分类不能为空", trigger: "blur" }], - merchandiseName:[{ required: true, message: "商品名称不能为空", trigger: "blur" }], - unitCode:[{ required: true, message: "药品单位不能为空", trigger: "blur" }], - minUnitCode:[{ required: true, message: "最小单位不能为空", trigger: "blur" }], - ingredient:[{ required: true, message: "成分不能为空", trigger: "blur" }], - partPercent: [{ 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: true, message: "医保编码不能为空", trigger: "blur" }], - pharmacologyCategoryCode:[{ required: true, message: "药品性质不能为空", trigger: "blur" }], - skinTestFlag:[{ required: true, message: "皮试不能为空", trigger: "blur" }], + categoryCode: [ + { required: true, message: "药品分类不能为空", trigger: "blur" }, + ], + merchandiseName: [ + { required: true, message: "商品名称不能为空", trigger: "blur" }, + ], + unitCode: [ + { required: true, message: "药品单位不能为空", trigger: "blur" }, + ], + minUnitCode: [ + { required: true, message: "最小单位不能为空", trigger: "blur" }, + ], + ingredient: [{ required: true, message: "成分不能为空", trigger: "blur" }], + partPercent: [ + { 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: true, 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: true, message: "贯标国家编码不能为空", trigger: "blur" }], - partAttributeEnum:[{ required: true, message: "拆分属性不能为空", trigger: "blur" }], - thoPartAttributeEnum:[{ required: true, message: "住院临时医嘱拆分属性不能为空", 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" }], - typeCode:[{ 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: true, message: "贯标国家编码不能为空", trigger: "blur" }, + ], + partAttributeEnum: [ + { required: true, message: "拆分属性不能为空", trigger: "blur" }, + ], + thoPartAttributeEnum: [ + { + required: true, + message: "住院临时医嘱拆分属性不能为空", + 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" }], + typeCode: [ + { required: true, message: "财务类型不能为空", trigger: "blur" }, + ], }, }); @@ -867,15 +798,12 @@ function reset() { form.value = { id: undefined, medicationDefId: undefined, - orgId: undefined, + // orgId: undefined, locationId: undefined, activeFlag: undefined, - effectiveDate: undefined, - expirationDate: undefined, doseFrom: undefined, rateCode: undefined, approvalNumber: undefined, - definition: undefined, name: undefined, pyStr: undefined, wbStr: undefined, @@ -889,19 +817,15 @@ function reset() { minUnitCode: undefined, doseUnitCode: undefined, doseFormCode: undefined, - statusEnum: undefined, + // statusEnum: undefined, skinTestFlag: undefined, injectFlag: undefined, childrenFlag: undefined, - ingredientItem: undefined, - lotNumber: undefined, methodCode: undefined, maxUnit: undefined, busNo: undefined, domainEnum: undefined, version: undefined, - nameEn: undefined, - comprisedText: undefined, partPercent: undefined, ybMatchFlag: undefined, ybNo: undefined, @@ -910,7 +834,6 @@ function reset() { supplyId: undefined, restrictedFlag: undefined, restrictedScope: undefined, - characteristic: undefined, purchasePrice: undefined, retailPrice: undefined, maximumRetailPrice: undefined, @@ -944,29 +867,31 @@ function submitForm() { form.value.activeFlag == true ? (form.value.activeFlag = 1) : (form.value.activeFlag = 0); //是否为活性 - form.value.ybMatchFlag == true + form.value.ybMatchFlag == true ? (form.value.ybMatchFlag = 1) : (form.value.ybMatchFlag = 0); //医保是否对码 - form.value.skinTestFlag == true + form.value.skinTestFlag == true ? (form.value.skinTestFlag = 1) : (form.value.skinTestFlag = 0); //是否皮试 - form.value.injectFlag == true + form.value.injectFlag == true ? (form.value.injectFlag = 1) : (form.value.injectFlag = 0); //是否为注射药物 - form.value.restrictedFlag == true + form.value.restrictedFlag == true ? (form.value.restrictedFlag = 1) : (form.value.restrictedFlag = 0); //是否限制使用 - form.value.childrenFlag == true + form.value.childrenFlag == true ? (form.value.childrenFlag = 1) : (form.value.childrenFlag = 0); //儿童用药标志 - form.value.antibioticFlag == true + form.value.antibioticFlag == true ? (form.value.antibioticFlag = 1) : (form.value.antibioticFlag = 0); //抗生素标志v - form.value.basicFlag == true + form.value.basicFlag == true ? (form.value.basicFlag = 1) : (form.value.basicFlag = 0); //抗生素标志 - form.value.selfFlag == true ? (form.value.selfFlag = 1) : (form.value.selfFlag = 0); //自制标志 - form.value.status == true ? (form.value.status = 1) : (form.value.status = 0); //启用状态 + form.value.selfFlag == true + ? (form.value.selfFlag = 1) + : (form.value.selfFlag = 0); //自制标志 + form.value.status == true ? (form.value.status = 1) : (form.value.status = 0); //启用状态 proxy.$refs["medicationRef"].validate((valid) => { if (valid) { if (form.value.activeFlag == true) { @@ -979,15 +904,6 @@ function submitForm() { form.value.dddUnitCode = antibioticForm.value.dddUnitCode; form.value.dddCode = antibioticForm.value.dddCode; } - const effectiveDate = form.value.effectiveDate - ? moment(form.value.effectiveDate).format("YYYY-MM-DD HH:mm:ss") - : ""; - const expirationDate = form.value.expirationDate - ? moment(form.value.expirationDate).format("YYYY-MM-DD HH:mm:ss") - : ""; - form.value.effectiveDate = effectiveDate; - form.value.expirationDate = expirationDate; - console.log(form.value.effectiveDate, form.value.expirationDate, "===================="); // 将表单数据发送给父组件 emits("submit", form.value); visible.value = false; @@ -1023,4 +939,10 @@ defineExpose({ ::v-deep .custom-label-height .el-form-item__label { line-height: 20px; /* 设置 label 的行高为 15px */ } +.title { + font-weight: bold; + font-size: large; + margin-bottom: 10px; + /* background-color: #f5f7fa; */ +} diff --git a/openhis-ui-vue3/src/views/catalog/medicine/index.vue b/openhis-ui-vue3/src/views/catalog/medicine/index.vue index 35856aa9..965d52e5 100644 --- a/openhis-ui-vue3/src/views/catalog/medicine/index.vue +++ b/openhis-ui-vue3/src/views/catalog/medicine/index.vue @@ -4,6 +4,7 @@
+
药品目录
查询 - + - - - - - + /> --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -732,7 +354,12 @@ const filterNode = (value, data) => { function getMedicationCategoryList() { getMedicationCategory().then((response) => { console.log(response, "response药品目录分类查询下拉树结构"); - medicationOptions.value = response.data.medicationCategoryCodeOptions.sort((a, b) => { return parseInt(a.value) - parseInt(b.value) }); + medicationOptions.value = response.data.medicationCategoryCodeOptions.sort( + (a, b) => { + return parseInt(a.value) - parseInt(b.value); + } + ); + medicationOptions.value.push({ info: "全部", value: "" }); statusFlagOptions.value = response.data.statusFlagOptions; domainEnumOptions.value = response.data.domainFlagOptions; supplierListOptions.value = response.data.supplierListOptions; @@ -816,9 +443,9 @@ function handleSelectionChange(selection) { /** 打开新增弹窗 */ function openAddMedicine() { - if (!currentCategoryEnum.value) { - return proxy.$modal.msgError("请选择药品目录分类"); - } + // if (!currentCategoryEnum.value) { + // return proxy.$modal.msgError("请选择药品目录分类"); + // } proxy.$refs["medicineRef"].show(); } /** 打开编辑弹窗 */