diff --git a/openhis-ui-vue3/src/views/catalog/disease/components/disease.js b/openhis-ui-vue3/src/views/catalog/disease/components/disease.js
index 6ab99b62..e8f173a1 100644
--- a/openhis-ui-vue3/src/views/catalog/disease/components/disease.js
+++ b/openhis-ui-vue3/src/views/catalog/disease/components/disease.js
@@ -36,13 +36,13 @@ export function editDisease(data) {
   })
 }
 
-// 删除病种目录
-export function delUser(userId) {
-  return request({
-    url: '/system/user/' + userId,
-    method: 'delete'
-  })
-}
+// // 删除病种目录
+// export function delUser(userId) {
+//   return request({
+//     url: '/system/user/' + userId,
+//     method: 'delete'
+//   })
+// }
 
 // 病种目录分类查询
 export function getDiseaseCategory() {
@@ -50,4 +50,22 @@ export function getDiseaseCategory() {
     url: '/datadictionary/disease/information-category',
     method: 'get'
   })
+}
+
+// 停用病种目录
+export function stopDisease(ids) {
+  return request({
+    url: '/datadictionary/disease/information-stop',
+    method: 'put',
+    data: ids
+  })
+}
+
+// 启用病种目录
+export function startDisease(ids) {
+  return request({
+    url: '/datadictionary/disease/information-start',
+    method: 'put',
+    data: ids
+  })
 }
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/catalog/disease/index.vue b/openhis-ui-vue3/src/views/catalog/disease/index.vue
index 629e75c7..b204e3c3 100644
--- a/openhis-ui-vue3/src/views/catalog/disease/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/disease/index.vue
@@ -12,19 +12,33 @@
                   style="margin-bottom: 20px"
                />
             </div> -->
-        <!-- <div class="head-container">
+        <div class="head-container">
           <el-tree
             :data="conditionDefinitionOptions"
-            :props="{ label: 'label', children: 'children' }"
+            :props="{ label: 'info', children: 'children' }"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
             ref="deptTreeRef"
-            node-key="id"
+            node-key="value"
             highlight-current
             default-expand-all
             @node-click="handleNodeClick"
-          />
-        </div> -->
+          >
+            <template v-slot="{ node, data }">
+              <span class="custom-tree-node">
+                <i
+                  :class="{
+                    'el-icon-folder': !node.expanded && !data.children.length,
+                    'el-icon-folder-opened': node.expanded,
+                    'el-icon-document': data.children.length === 0,
+                  }"
+                  style="color: #409eff"
+                />
+                <span>{{ node.label }}</span>
+              </span>
+            </template>
+          </el-tree>
+        </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
@@ -287,18 +301,22 @@ import {
   addDisease,
   getDiseaseCategory,
   getDiseaseOne,
+  stopDisease,
+  startDisease
 } from "./components/disease";
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict( "sys_normal_disable","sys_user_sex");
+const { sys_normal_disable, sys_user_sex } = proxy.useDict(
+  "sys_normal_disable",
+  "sys_user_sex"
+);
 
 const diseaseList = ref([]);
 const open = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref([]);
-const selectedData = ref([]); // 存储选择的行数据
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
@@ -317,12 +335,10 @@ const data = reactive({
     status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
   },
   rules: {
-    name: [
-      { required: true, message: "名称不能为空", trigger: "blur" },
-    ],
+    name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
     conditionCode: [
       { required: true, message: "编码不能为空", trigger: "blur" },
-    ]
+    ],
   },
 });
 
@@ -374,17 +390,12 @@ function handleQuery() {
 //    handleQuery();
 // };
 /** 启用按钮操作 */
-function handleStart() {
-  selectedData.value.forEach((item) => {
-    item.statusEnum = "2";
-  });
-  const data = selectedData.value;
-  //   selectedData
-  console.log(data, "data");
+function handleStart(row) {
+  const stardIds = row.id || ids.value;
   proxy.$modal
     .confirm("是否确定启用数据！")
     .then(function () {
-      return editDisease(data);
+      return startDisease(stardIds);
     })
     .then(() => {
       getList();
@@ -393,16 +404,12 @@ function handleStart() {
     .catch(() => {});
 }
 /** 停用按钮操作 */
-function handleClose() {
-  selectedData.value.forEach((item) => {
-    item.statusEnum = "3";
-  });
-  const data = selectedData.value;
-  console.log(data, "data");
+function handleClose(row) {
+  const stopIds = row.id || ids.value;
   proxy.$modal
     .confirm("是否确认停用数据！")
     .then(function () {
-      return editDisease(data);
+      return stopDisease(stopIds);
     })
     .then(() => {
       getList();
@@ -435,7 +442,8 @@ function handleExport() {
 /** 选择条数  */
 function handleSelectionChange(selection) {
   console.log(selection, "selection");
-  selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
+  // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
+  ids.value = selection.map(item => item.userId);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
@@ -487,9 +495,7 @@ function submitForm() {
         //   ? (form.value.statusEnum = "3")
         //   : (form.value.statusEnum = "2");
         console.log(form.value, "editDisease", form.value.statusEnum);
-        let param = [];
-        param.push(form.value);
-        editDisease(param).then((response) => {
+        editDisease(form.value).then((response) => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
           getList();
@@ -518,3 +524,9 @@ function handleView(row) {
 getDiseaseCategoryList();
 getList();
 </script>
+<style scoped>
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+}
+</style>
\ No newline at end of file
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 73839c75..7893cf47 100644
--- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
@@ -28,18 +28,12 @@
                     v-model="form.name"
                     placeholder="请输入药品名"
                     maxlength="30"
-                    :disabled="form.id != undefined"
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="拼音码(品名)" prop="name">
-                  <el-input
-                    v-model="form.name"
-                    placeholder=""
-                    maxlength="30"
-                    :disabled="form.id != undefined"
-                  />
+                  <el-input v-model="form.name" placeholder="" maxlength="30" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -50,28 +44,17 @@
                     v-model="form.conditionCode"
                     placeholder=""
                     maxlength="30"
-                    :disabled="form.id != undefined"
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="小规格含量" prop="name">
-                  <el-input
-                    v-model="form.name"
-                    placeholder=""
-                    maxlength="30"
-                    :disabled="form.id != undefined"
-                  />
+                  <el-input v-model="form.name" placeholder="" maxlength="30" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="商品名" prop="name">
-                  <el-input
-                    v-model="form.name"
-                    placeholder=""
-                    maxlength="30"
-                    :disabled="form.id != undefined"
-                  />
+                  <el-input v-model="form.name" placeholder="" maxlength="30" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -82,7 +65,6 @@
                     v-model="form.conditionCode"
                     placeholder=""
                     maxlength="30"
-                    :disabled="form.id != undefined"
                   />
                 </el-form-item>
               </el-col>
@@ -146,28 +128,17 @@
                     v-model="form.conditionCode"
                     placeholder=""
                     maxlength="30"
-                    :disabled="form.id != undefined"
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="采购单价" prop="name">
-                  <el-input
-                    v-model="form.name"
-                    placeholder=""
-                    maxlength="30"
-                    :disabled="form.id != undefined"
-                  />
+                  <el-input v-model="form.name" placeholder="" maxlength="30" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="采购拆零价" prop="name">
-                  <el-input
-                    v-model="form.name"
-                    placeholder=""
-                    maxlength="30"
-                    :disabled="form.id != undefined"
-                  />
+                  <el-input v-model="form.name" placeholder="" maxlength="30" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -208,7 +179,11 @@
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="给药途径" prop="conditionCode">
-                  <el-select v-model="queryParams.status" clearable>
+                  <el-select
+                    v-model="queryParams.status"
+                    clearable
+                    :disabled="form.id != undefined"
+                  >
                     <el-option
                       v-for="dict in sys_normal_disable"
                       :key="dict.value"
@@ -220,7 +195,11 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="用药频次" prop="name">
-                  <el-select v-model="queryParams.status" clearable>
+                  <el-select
+                    v-model="queryParams.status"
+                    clearable
+                    :disabled="form.id != undefined"
+                  >
                     <el-option
                       v-for="dict in sys_normal_disable"
                       :key="dict.value"
@@ -236,13 +215,13 @@
                     v-model="form.name"
                     placeholder=""
                     maxlength="30"
-                    :disabled="form.id != undefined"
                     style="width: 49%"
                   />
                   <el-select
                     v-model="queryParams.status"
                     clearable
                     style="width: 49%"
+                    :disabled="form.id != undefined"
                   >
                     <el-option
                       v-for="dict in sys_normal_disable"
@@ -257,7 +236,11 @@
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="剂型" prop="conditionCode">
-                  <el-select v-model="queryParams.status" clearable>
+                  <el-select
+                    v-model="queryParams.status"
+                    clearable
+                    :disabled="form.id != undefined"
+                  >
                     <el-option
                       v-for="dict in sys_normal_disable"
                       :key="dict.value"
@@ -269,7 +252,11 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="病案结算项" prop="name">
-                  <el-select v-model="queryParams.status" clearable>
+                  <el-select
+                    v-model="queryParams.status"
+                    clearable
+                    :disabled="form.id != undefined"
+                  >
                     <el-option
                       v-for="dict in sys_normal_disable"
                       :key="dict.value"
@@ -281,14 +268,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="剂量单位换算比" prop="name">
-                  <el-select v-model="queryParams.status" clearable>
-                    <el-option
-                      v-for="dict in sys_normal_disable"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
+                  <el-input v-model="form.name" placeholder="" maxlength="30" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -349,7 +329,11 @@
             </el-row>
             <el-row :gutter="24">
               <el-col :span="8">
-                <el-form-item label="库存预警量(最小单位)" prop="conditionCode"  class="custom-label-spacing">
+                <el-form-item
+                  label="库存预警量(最小单位)"
+                  prop="conditionCode"
+                  class="custom-label-spacing"
+                >
                   <el-input
                     v-model="form.conditionCode"
                     placeholder=""
@@ -364,7 +348,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="取消批次号管理" prop="name" class="custom-label-spacing">
+                <el-form-item
+                  label="取消批次号管理"
+                  prop="name"
+                  class="custom-label-spacing"
+                >
                   <el-checkbox v-model="form.status"></el-checkbox>
                 </el-form-item>
               </el-col>
@@ -503,7 +491,7 @@
                 <el-form-item label="说明" prop="status">
                   <el-input
                     v-model="textarea2"
-                    :autosize="{ minRows: 4, maxRows: 10}"
+                    :autosize="{ minRows: 4, maxRows: 10 }"
                     type="textarea"
                     placeholder=""
                   />
@@ -575,14 +563,32 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data);
 
+const props = defineProps({
+  item: {
+    type: Object,
+    required: false,
+  },
+});
+
 // 显示弹框
 function show() {
   // queryParams.roleId = props.roleId;
   // getList();
   visible.value = true;
 }
+// 显示弹框
+function edit() {
+  // queryParams.roleId = props.roleId;
+  // getList();
+  console.log(props, "22222");
+  console.log(props.item);
+  console.log("props.item");
+  form.value = props.item;
+  visible.value = true;
+}
 defineExpose({
   show,
+  edit,
 });
 </script>
 <style scoped>
diff --git a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineViewDialog.vue b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineViewDialog.vue
new file mode 100644
index 00000000..aa29e8f9
--- /dev/null
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineViewDialog.vue
@@ -0,0 +1,363 @@
+<template>
+  <div class="app-container">
+    <!-- 添加或修改用户配置对话框 -->
+    <el-dialog :title="title" v-model="visible" width="800px" append-to-body>
+      <el-form
+        :model="form"
+        :rules="rules"
+        ref="diseaseRef"
+        label-width="110px"
+        label-position="left"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="编号" prop="busNo">
+              <el-input
+                v-model="form.busNo"
+                placeholder="请输入编码"
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="品名" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder="请输入药品名"
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="拼音码(品名)" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="厂家/产地" prop="conditionCode">
+              <el-select v-model="queryParams.status" clearable>
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="批准文号" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="条形码" prop="name">
+              <el-input v-model="form.name" placeholder="" maxlength="30" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="单位" prop="conditionCode">
+              <el-select
+                v-model="queryParams.status"
+                clearable
+                :disabled="true"
+              >
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="零售价" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item
+              label="最小单位"
+              prop="conditionCode"
+            >
+              <el-select v-model="queryParams.status" clearable :disabled="true">
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="拆零比" prop="conditionCode">
+              <el-input
+                v-model="form.conditionCode"
+                placeholder=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="拆零零售价" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="处方限量（最小单位）" prop="conditionCode" class="custom-label-spacing">
+              <el-input
+                v-model="form.conditionCode"
+                placeholder=""
+                maxlength="30"
+                :disabled="form.id != undefined"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="皮试判别" prop="name">
+              <el-checkbox v-model="form.status" :disabled="true"></el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="注射药品" prop="name">
+              <el-checkbox v-model="form.status" :disabled="true"></el-checkbox>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="给药途径" prop="conditionCode">
+              <el-select
+                v-model="queryParams.status"
+                clearable
+                :disabled="true"
+              >
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="用药频次" prop="name" :disabled="true">
+              <el-select v-model="queryParams.status" clearable :disabled="true">
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="单次剂量" prop="name" inline :disabled="true">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :disabled="form.id != undefined"
+                style="width: 49%"
+              />
+              <el-select
+                v-model="queryParams.status"
+                clearable
+                style="width: 49%"
+                :disabled="true"
+              >
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="剂型" prop="conditionCode">
+              <el-select v-model="queryParams.status" clearable :disabled="true">
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="结算项目" prop="name">
+              <el-select
+                v-model="queryParams.status"
+                clearable
+                :disabled="true"
+              >
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="说明" prop="status">
+              <el-input
+                v-model="textarea2"
+                :autosize="{ minRows: 4, maxRows: 10 }"
+                type="textarea"
+                placeholder=""
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="MedicineDialog">
+// import {
+//   getDiseaseList,
+//   editDisease,
+//   addDisease,
+//   getDiseaseCategory,
+//   getDiseaseOne,
+// } from "./components/medicine";
+
+const router = useRouter();
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable, sys_user_sex } = proxy.useDict(
+  "sys_normal_disable",
+  "sys_user_sex"
+);
+
+const diseaseList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const selectedData = ref([]); // 存储选择的行数据
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const dateRange = ref([]);
+const deptName = ref("");
+const visible = ref(false);
+const conditionDefinitionOptions = ref(undefined);
+// const initPassword = ref(undefined);
+// const postOptions = ref([]);
+// const roleOptions = ref([]);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 50,
+    diseaseName: undefined, // 疾病名称
+    status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
+  },
+  rules: {
+    name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+    conditionCode: [
+      { required: true, message: "编码不能为空", trigger: "blur" },
+    ],
+  },
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const props = defineProps({
+  item: {
+    type: Object,
+    required: false,
+  },
+});
+
+// 显示弹框
+function show() {
+  // queryParams.roleId = props.roleId;
+  // getList();
+  visible.value = true;
+}
+// 显示弹框
+function edit() {
+  // queryParams.roleId = props.roleId;
+  // getList();
+  console.log(props, "22222");
+  console.log(props.item);
+  console.log("props.item");
+  form.value = props.item;
+  visible.value = true;
+}
+defineExpose({
+  show,
+  edit,
+});
+</script>
+<style scoped>
+.el-form--inline .el-form-item {
+  display: inline-flex;
+  vertical-align: middle;
+  margin-right: 10px !important;
+}
+
+/* 使用深度选择器 */
+.custom-label-spacing :deep(.el-form-item__label) {
+  line-height: 1.2; /* 调整行间距 */
+  margin-bottom: 4px; /* 调整 label 和输入框之间的间距 */
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/catalog/medicine/index.vue b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
index 0bc0e1ab..eb86b449 100644
--- a/openhis-ui-vue3/src/views/catalog/medicine/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
@@ -129,7 +129,7 @@
               type="primary"
               plain
               icon="Plus"
-              @click="openMedicineDialog"
+              @click="openAddMedicine"
               v-hasPermi="['system:user:add']"
               >添加新项目</el-button
             >
@@ -154,7 +154,7 @@
               >停用</el-button
             >
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button
               type="success"
               plain
@@ -164,7 +164,7 @@
               v-hasPermi="['system:user:remove']"
               >启用</el-button
             >
-          </el-col>
+          </el-col> -->
           <el-col :span="1.5">
             <el-button
               type="primary"
@@ -197,8 +197,8 @@
           <el-table-column
             label="编码"
             align="center"
-            key="conditionCode"
-            prop="conditionCode"
+            key="busNo"
+            prop="busNo"
             :show-overflow-tooltip="true"
           />
           <el-table-column
@@ -211,23 +211,23 @@
           <el-table-column
             label="规格"
             align="center"
-            key="pyStr"
-            prop="pyStr"
+            key="totalVolume"
+            prop="totalVolume"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="厂家(产地)"
             align="center"
-            key="ybNo"
-            prop="ybNo"
+            key="manufacturerId"
+            prop="manufacturerId"
             :show-overflow-tooltip="true"
             width="100"
           />
           <el-table-column
             label="单位"
             align="center"
-            key="ybName"
-            prop="ybName"
+            key="unitCode"
+            prop="unitCode"
             :show-overflow-tooltip="true"
             width="50"
           />
@@ -255,8 +255,8 @@
           <el-table-column
             label="拆零比"
             align="center"
-            key="statusEnum"
-            rop="statusEnum"
+            key="partPercent"
+            rop="partPercent"
             :show-overflow-tooltip="true"
           />
           <el-table-column
@@ -269,18 +269,18 @@
           <el-table-column
             label="医保编码"
             align="center"
-            key="statusEnum"
-            rop="statusEnum"
+            key="ybNo"
+            rop="ybNo"
             :show-overflow-tooltip="true"
           />
 
           <el-table-column
             label="医保已对码"
             align="center"
-            key="statusEnum"
-            rop="statusEnum"
+            key="ybMatchFlag"
+            rop="ybMatchFlag"
             :show-overflow-tooltip="true"
-             width="100"
+            width="100"
           />
           <el-table-column
             label="医保等级"
@@ -299,16 +299,16 @@
           <el-table-column
             label="限制使用标记"
             align="center"
-            key="statusEnum"
-            rop="statusEnum"
+            key="restrictedFlag"
+            rop="restrictedFlag"
             :show-overflow-tooltip="true"
-             width="110"
+            width="110"
           />
           <el-table-column
             label="限制使用范围"
             align="center"
-            key="statusEnum"
-            rop="statusEnum"
+            key="restrictedScope"
+            rop="restrictedScope"
             :show-overflow-tooltip="true"
             width="110"
           />
@@ -400,7 +400,7 @@
                 link
                 type="primary"
                 icon="Edit"
-                @click="handleUpdate(scope.row)"
+                @click="openEditMedicine(scope.row)"
                 v-hasPermi="['system:user:edit']"
                 >编辑</el-button
               >
@@ -408,7 +408,7 @@
                 link
                 type="primary"
                 icon="View"
-                @click="handleView(scope.row)"
+                @click="openViewMedicine(scope.row)"
                 v-hasPermi="['system:user:remove']"
                 >查看</el-button
               >
@@ -424,7 +424,12 @@
         />
       </el-col>
     </el-row>
-    <medicine-dialog ref="medicineRef" :roleId="queryParams.roleId" @ok="handleQuery" />
+    <medicine-dialog ref="medicineRef" :item="currentData" @ok="submitForm" />
+    <medicine-view-dialog
+      ref="medicineViewRef"
+      :item="viewData"
+      :viewFlg="viewFlg"
+    />
     <!-- 添加或修改用户配置对话框 -->
     <!-- <el-dialog :title="title" v-model="open" width="600px" append-to-body>
       <el-form :model="form" :rules="rules" ref="diseaseRef" label-width="80px">
@@ -482,6 +487,8 @@ import {
   getDiseaseOne,
 } from "./components/medicine";
 import medicineDialog from "./components/medicineDialog";
+import medicineViewDialog from "./components/medicineViewDialog";
+import { nextTick } from "vue";
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
@@ -503,6 +510,10 @@ const title = ref("");
 const dateRange = ref([]);
 const deptName = ref("");
 const conditionDefinitionOptions = ref(undefined);
+// 使用 ref 定义当前药品数据
+const currentData = ref({});
+// 使用 ref 定义当前查看药品数据
+const viewData = ref({});
 // const initPassword = ref(undefined);
 // const postOptions = ref([]);
 // const roleOptions = ref([]);
@@ -642,10 +653,30 @@ function cancel() {
   open.value = false;
   reset();
 }
-/** 打开新增/编辑弹窗 */
-function openMedicineDialog() {
+/** 打开新增弹窗 */
+function openAddMedicine() {
   proxy.$refs["medicineRef"].show();
 }
+/** 打开编辑弹窗 */
+function openEditMedicine(row) {
+  currentData.value = row;
+  console.log(currentData.value, "currentData");
+  // 确保子组件已经接收到最新的 props
+  nextTick(() => {
+    proxy.$refs["medicineRef"].edit();
+  });
+  // proxy.$refs["medicineRef"].edit();
+}
+/** 打开查看弹窗 */
+function openViewMedicine(row) {
+  viewData.value = row;
+  console.log(viewData.value, "currentData");
+  // 确保子组件已经接收到最新的 props
+  nextTick(() => {
+    proxy.$refs["medicineViewRef"].edit();
+  });
+  // proxy.$refs["medicineRef"].edit();
+}
 /** 新增按钮操作 */
 function handleAdd() {
   reset();