From ddd09de44c744520f9cfea01c972d2ec302e7854 Mon Sep 17 00:00:00 2001
From: duhe <duhe@ccbjb.com.cn>
Date: Fri, 28 Mar 2025 14:14:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8D=AF=E5=93=81=E7=9B=AE=E5=BD=95=E5=BF=85?=
 =?UTF-8?q?=E9=A1=BBcheck=E8=B0=83=E6=95=B4=20up=20by=20dh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../medicine/components/medicineDialog.vue    | 35 +++++++++++++++++--
 .../src/views/catalog/medicine/index.vue      | 26 --------------
 2 files changed, 32 insertions(+), 29 deletions(-)

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 1d65a4e6..523d3c8d 100644
--- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
@@ -291,9 +291,9 @@
                   <el-input v-model="form.version" placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="6"  v-if="form.id != undefined">
                 <el-form-item label="药品编号" prop="busNo">
-                  <el-input v-model="form.busNo" placeholder="" />
+                  <el-input v-model="form.busNo" placeholder="" disabled/>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -737,7 +737,10 @@ const data = reactive({
     thoPartAttributeEnum:[{ required: true, message: "住院临时医嘱拆分属性不能为空", trigger: "blur" }],
     basicFlag:[{ required: true, message: "基药标识不能为空", trigger: "blur" }],
     antibioticFlag:[{ required: true, message: "抗生素不能为空", trigger: "blur" }],
-    selfFlag:[{ 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" }],
   },
 });
 
@@ -936,6 +939,32 @@ function reset() {
 }
 /** 提交按钮 */
 function submitForm() {
+  form.value.activeFlag == true
+    ? (form.value.activeFlag = 1)
+    : (form.value.activeFlag = 0); //是否为活性
+    form.value.ybMatchFlag == true
+    ? (form.value.ybMatchFlag = 1)
+    : (form.value.ybMatchFlag = 0); //医保是否对码
+    form.value.skinTestFlag == true
+    ? (form.value.skinTestFlag = 1)
+    : (form.value.skinTestFlag = 0); //是否皮试
+    form.value.injectFlag == true
+    ? (form.value.injectFlag = 1)
+    : (form.value.injectFlag = 0); //是否为注射药物
+    form.value.restrictedFlag == true
+    ? (form.value.restrictedFlag = 1)
+    : (form.value.restrictedFlag = 0); //是否限制使用
+    form.value.childrenFlag == true
+    ? (form.value.childrenFlag = 1)
+    : (form.value.childrenFlag = 0); //儿童用药标志
+    form.value.antibioticFlag == true
+    ? (form.value.antibioticFlag = 1)
+    : (form.value.antibioticFlag = 0); //抗生素标志v
+    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); //启用状态
   proxy.$refs["medicationRef"].validate((valid) => {
     if (valid) {
       if (form.value.activeFlag == true) {
diff --git a/openhis-ui-vue3/src/views/catalog/medicine/index.vue b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
index 143c39bb..dadb6f4e 100644
--- a/openhis-ui-vue3/src/views/catalog/medicine/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
@@ -844,32 +844,6 @@ function openViewMedicine(row) {
 
 /** 提交按钮 */
 function submitForm(formData) {
-  formData.activeFlag == true
-    ? (formData.activeFlag = 1)
-    : (formData.activeFlag = 0); //是否为活性
-  formData.ybMatchFlag == true
-    ? (formData.ybMatchFlag = 1)
-    : (formData.ybMatchFlag = 0); //医保是否对码
-  formData.skinTestFlag == true
-    ? (formData.skinTestFlag = 1)
-    : (formData.skinTestFlag = 0); //是否皮试
-  formData.injectFlag == true
-    ? (formData.injectFlag = 1)
-    : (formData.injectFlag = 0); //是否为注射药物
-  formData.restrictedFlag == true
-    ? (formData.restrictedFlag = 1)
-    : (formData.restrictedFlag = 0); //是否限制使用
-  formData.childrenFlag == true
-    ? (formData.childrenFlag = 1)
-    : (formData.childrenFlag = 0); //儿童用药标志
-  formData.antibioticFlag == true
-    ? (formData.antibioticFlag = 1)
-    : (formData.antibioticFlag = 0); //抗生素标志
-  formData.basicFlag == true
-    ? (formData.basicFlag = 1)
-    : (formData.basicFlag = 0); //抗生素标志
-  formData.selfFlag == true ? (formData.selfFlag = 1) : (formData.selfFlag = 0); //自制标志
-  formData.status == true ? (formData.status = 1) : (formData.status = 0); //启用状态
   console.log(formData, "submitForm");
   if (formData.id != undefined) {
     editMedication(formData).then((response) => {