From 824281c6afa945e559b3316440acdde215b30a28 Mon Sep 17 00:00:00 2001
From: duhe <duhe@ccbjb.com.cn>
Date: Fri, 28 Feb 2025 17:38:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=89=8D=E5=8F=B0?=
 =?UTF-8?q?=20=E5=85=B6=E4=BB=96=E7=94=BB=E9=9D=A2bug=E4=BF=AE=E6=AD=A3=20?=
 =?UTF-8?q?up=20by=20dh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplier/components/supplier.js           |  63 +++
 .../src/views/basicmanage/supplier/index.vue  | 504 ++++++++++++++++++
 .../views/catalog/device/components/device.js |   1 +
 .../device/components/deviceDialog.vue        |  14 +-
 .../device/components/deviceViewDialog.vue    |   6 -
 .../src/views/catalog/device/index.vue        |  10 +-
 .../components/diagnosisTreatmentDialog.vue   |  52 +-
 .../diagnosisTreatmentViewDialog.vue          |   6 -
 .../catalog/diagnosisTreatment/index.vue      |   6 +-
 .../src/views/catalog/disease/index.vue       |   6 +-
 .../medicine/components/medicineDialog.vue    |   6 -
 .../components/medicineViewDialog.vue         |   6 -
 .../src/views/catalog/medicine/index.vue      |   6 +-
 13 files changed, 625 insertions(+), 61 deletions(-)
 create mode 100644 openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js
 create mode 100644 openhis-ui-vue3/src/views/basicmanage/supplier/index.vue

diff --git a/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js b/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js
new file mode 100644
index 00000000..c5945411
--- /dev/null
+++ b/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js
@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+import { parseStrEmpty } from "@/utils/openhis";
+
+// 查询病种目录列表
+export function getSupplierList(query) {
+  return request({
+    url: '/data-dictionary/supplier/get-supplier-list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询病种目录详细
+export function getSupplierOne(id) {
+  return request({
+    url: '/data-dictionary/supplier/get-supplier-detail/' + parseStrEmpty(id),
+    method: 'get'
+  })
+}
+
+// 新增病种目录
+export function addSupplier(data) {
+  return request({
+    url: '/data-dictionary/supplier/add-supplier',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改病种目录
+export function editSupplier(data) {
+  return request({
+    url: '/data-dictionary/supplier/edit-supplier',
+    method: 'put',
+    data: data
+  })
+}
+
+// // 删除病种目录
+// export function delUser(userId) {
+//   return request({
+//     url: '/system/user/' + userId,
+//     method: 'delete'
+//   })
+// }
+
+// 停用病种目录
+export function stopSupplier(ids) {
+  return request({
+    url: '/data-dictionary/supplier/information-stop',
+    method: 'put',
+    data: ids
+  })
+}
+
+// 启用病种目录
+export function startSupplier(ids) {
+  return request({
+    url: '/data-dictionary/supplier/information-start',
+    method: 'put',
+    data: ids
+  })
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue b/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue
new file mode 100644
index 00000000..43a99615
--- /dev/null
+++ b/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue
@@ -0,0 +1,504 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+      label-width="90px"
+    >
+      <el-form-item label="厂家编码：" prop="busNo">
+        <el-input
+          v-model="queryParams.busNo"
+          placeholder="厂家编码"
+          clearable
+          style="width: 240px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="厂家名称：" prop="searchKey">
+        <el-input
+          v-model="queryParams.searchKey"
+          placeholder="厂家名称"
+          clearable
+          style="width: 240px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="厂商种类：" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="生产商/供应商"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['system:user:add']"
+          >添加</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Remove"
+          :disabled="multiple"
+          @click="handleClose"
+          v-hasPermi="['system:user:edit']"
+          >停用</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="CirclePlus"
+          :disabled="multiple"
+          @click="handleStart"
+          v-hasPermi="['system:user:remove']"
+          >启用</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Search"
+          @click="getList"
+          v-hasPermi="['system:user:import']"
+          >查询</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['system:user:export']"
+          >清空条件</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="supplierList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column label="编号" align="center" key="busNo" prop="busNo" />
+      <el-table-column
+        label="名称"
+        align="center"
+        key="name"
+        prop="name"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="拼音助记码"
+        align="center"
+        key="pyStr"
+        prop="pyStr"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="类型 "
+        align="center"
+        key="typeEnum"
+        prop="typeEnum"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="地址"
+        align="center"
+        key="address"
+        prop="address"
+        width="120"
+      />
+      <el-table-column
+        label="联系人电话"
+        align="center"
+        key="phone"
+        prop="phone"
+      />
+      <el-table-column
+        label="联系人邮箱"
+        align="center"
+        key="email"
+        prop="email"
+        width="160"
+      />
+      <el-table-column
+        label="活动标识"
+        align="center"
+        key="activeFlag"
+        prop="activeFlag"
+        width="160"
+      />
+      <el-table-column
+        label="机构编号"
+        align="center"
+        key="orgId"
+        prop="orgId"
+        width="160"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        width="150"
+        class-name="small-padding fixed-width"
+      >
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:user:edit']"
+            >编辑</el-button
+          >
+          <el-button
+            link
+            type="primary"
+            icon="View"
+            @click="handleView(scope.row)"
+            v-hasPermi="['system:user:remove']"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改用户配置对话框 -->
+    <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+      <el-form :model="form" :rules="rules" ref="supplierRef" label-width="90px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder="请输入名称"
+                maxlength="30"
+                :disabled="form.id != undefined"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="编码" prop="busNo">
+              <el-input
+                v-model="form.busNo"
+                placeholder="请输入编码"
+                maxlength="30"
+                :disabled="form.id != undefined"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="拼音" prop="pyStr">
+              <el-input v-model="form.pyStr" maxlength="11" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="五笔码" prop="wbStr">
+              <el-input v-model="form.wbStr" maxlength="11" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="类型" prop="typeEnum">
+              <el-input v-model="form.typeEnum" maxlength="11" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="地址" prop="address">
+              <el-input v-model="form.address" maxlength="11" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="联系人电话" prop="phone">
+              <el-input v-model="form.phone" maxlength="11" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人邮箱" prop="email">
+              <el-input v-model="form.email" maxlength="11" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="活动标识" prop="activeFlag">
+              <el-input v-model="form.activeFlag" maxlength="11" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="机构编号" prop="orgId">
+              <el-input v-model="form.orgId" maxlength="11" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Supplier">
+import {
+  getSupplierList,
+  editSupplier,
+  addSupplier,
+  getSupplierOne,
+  stopSupplier,
+  startSupplier,
+} from "./components/supplier";
+
+const router = useRouter();
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable, sys_user_sex } = proxy.useDict(
+  "sys_normal_disable",
+  "sys_user_sex"
+);
+
+const supplierList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const conditionDefinitionOptions = ref(undefined);
+// 是否停用
+const statusFlagOptions = ref(undefined);
+// const initPassword = ref(undefined);
+// const postOptions = ref([]);
+// const roleOptions = ref([]);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 50,
+    searchKey: undefined, // 疾病名称
+    statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用）
+    sourceEnum: undefined, // 来源（包括 1：厂商/产地目录分类，2：自定义）
+  },
+  rules: {
+    name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+    conditionCode: [
+      { required: true, message: "编码不能为空", trigger: "blur" },
+    ],
+  },
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+
+/** 查询厂商/产地目录列表 */
+function getList() {
+  loading.value = true;
+  // queryParams.value.statusEnum = +queryParams.value.statusEnum
+  console.log(queryParams.value, "queryParams.value");
+  getSupplierList(queryParams.value).then((res) => {
+    loading.value = false;
+    console.log(res, "res");
+    supplierList.value = res.data.records;
+    total.value = res.data.total;
+    console.log(total.value, "total.value");
+  });
+}
+/** 节点单击事件 */
+function handleNodeClick(data) {
+  queryParams.value.sourceEnum = data.id;
+  handleQuery();
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNo = 1;
+  getList();
+}
+// /** 重置按钮操作 */
+// function resetQuery() {
+//    dateRange.value = [];
+//    proxy.resetForm("queryRef");
+//    queryParams.value.deptId = undefined;
+//    proxy.$refs.deptTreeRef.setCurrentKey(null);
+//    handleQuery();
+// };
+/** 启用按钮操作 */
+function handleStart(row) {
+  const stardIds = row.id || ids.value;
+  proxy.$modal
+    .confirm("是否确定启用数据！")
+    .then(function () {
+      return startSupplier(stardIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("启用成功");
+    })
+    .catch(() => {});
+}
+/** 停用按钮操作 */
+function handleClose(row) {
+  const stopIds = row.id || ids.value;
+  proxy.$modal
+    .confirm("是否确认停用数据！")
+    .then(function () {
+      return stopSupplier(stopIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("停用成功");
+    })
+    .catch(() => {});
+}
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download(
+    "system/user/export",
+    {
+      ...queryParams.value,
+    },
+    `user_${new Date().getTime()}.xlsx`
+  );
+}
+// /** 用户状态修改  */
+// function handleStatusChange(row) {
+//    let text = row.status === "0" ? "启用" : "停用";
+//    proxy.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () {
+//       return changeUserStatus(row.userId, row.status);
+//    }).then(() => {
+//       proxy.$modal.msgSuccess(text + "成功");
+//    }).catch(function () {
+//       row.status = row.status === "0" ? "1" : "0";
+//    });
+// };
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  console.log(selection, "selection");
+  // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download(
+    "system/user/importTemplate",
+    {},
+    `user_template_${new Date().getTime()}.xlsx`
+  );
+}
+/** 重置操作表单 */
+function reset() {
+  form.value = {
+    id: undefined,
+    conditionCode: undefined,
+    pyStr: undefined,
+    status: undefined,
+    statusEnum: undefined,
+  };
+  proxy.resetForm("supplierRef");
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "新增";
+}
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  console.log(row, "row");
+  form.value = row;
+  open.value = true;
+  title.value = "厂商/产地编辑";
+}
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["supplierRef"].validate((valid) => {
+    if (valid) {
+      if (form.value.id != undefined) {
+        // form.value.status
+        //   ? (form.value.statusEnum = "3")
+        //   : (form.value.statusEnum = "2");
+        console.log(form.value, "editSupplier", form.value.statusEnum);
+        editSupplier(form.value).then((response) => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addSupplier(form.value).then((response) => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 详细按钮操作 */
+function handleView(row) {
+  reset();
+  title.value = "查看";
+  open.value = true;
+  getSupplierOne(row.id).then((response) => {
+    console.log(response, "responsebbbb", row.id);
+    form.value = response.data;
+    //  getList();
+  });
+}
+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/device/components/device.js b/openhis-ui-vue3/src/views/catalog/device/components/device.js
index d48b4b78..879ec8b3 100644
--- a/openhis-ui-vue3/src/views/catalog/device/components/device.js
+++ b/openhis-ui-vue3/src/views/catalog/device/components/device.js
@@ -3,6 +3,7 @@ import { parseStrEmpty } from "@/utils/openhis";
 
 // 查询器材目录列表
 export function getDeviceList(query) {
+  console.log(query,'aaaaa')
   return request({
     url: '/datadictionary/device/information-page',
     method: 'get',
diff --git a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
index 57415644..8fe85121 100644
--- a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
@@ -265,12 +265,6 @@ const emits = defineEmits(["submit"]); // 声明自定义事件
 
 const data = reactive({
   form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 50,
-    diseaseName: undefined, // 疾病名称
-    status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
-  },
   rules: {
     // busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
     // name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
@@ -353,6 +347,8 @@ function submitForm() {
     //   : (form.value.statusEnum = "2");
     // console.log(form.value, "editDevice", form.value.statusEnum);
     editDevice(form.value).then((response) => {
+      // 触发自定义事件，并传递数据给父组件
+      emits("submit");
       proxy.$modal.msgSuccess("修改成功");
       visible.value = false;
       reset(); // 重置表单数据
@@ -367,6 +363,12 @@ function submitForm() {
     });
   }
 }
+
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
 defineExpose({
   show,
   edit,
diff --git a/openhis-ui-vue3/src/views/catalog/device/components/deviceViewDialog.vue b/openhis-ui-vue3/src/views/catalog/device/components/deviceViewDialog.vue
index aa29e8f9..a0087d0e 100644
--- a/openhis-ui-vue3/src/views/catalog/device/components/deviceViewDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceViewDialog.vue
@@ -304,12 +304,6 @@ const conditionDefinitionOptions = ref(undefined);
 
 const data = reactive({
   form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 50,
-    diseaseName: undefined, // 疾病名称
-    status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
-  },
   rules: {
     name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
     conditionCode: [
diff --git a/openhis-ui-vue3/src/views/catalog/device/index.vue b/openhis-ui-vue3/src/views/catalog/device/index.vue
index 79e655c5..f44e1eca 100644
--- a/openhis-ui-vue3/src/views/catalog/device/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/index.vue
@@ -377,7 +377,7 @@
         <pagination
           v-show="total > 0"
           :total="total"
-          v-model:page="queryParams.pageNum"
+          v-model:page="queryParams.pageNo"
           v-model:limit="queryParams.pageSize"
           @pagination="getList"
         />
@@ -436,7 +436,7 @@ const viewData = ref({});
 const data = reactive({
   form: {},
   queryParams: {
-    pageNum: 1,
+    pageNo: 1,
     pageSize: 50,
     searchKey: undefined, // 品名/商品名/英文品名/编码/拼音
     typeEnum: undefined, // 类型（包括 1：中药，2：成药）
@@ -472,6 +472,7 @@ function getDiseaseTreatmentList() {
 }
 /** 查询器材目录列表 */
 function getList() {
+  console.log(getList, "getList");
   loading.value = true;
   getDeviceList(queryParams.value).then((res) => {
     loading.value = false;
@@ -486,7 +487,7 @@ function handleNodeClick(data) {
 }
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1;
+  queryParams.value.pageNo = 1;
   getList();
 }
 
@@ -558,7 +559,8 @@ function openAddDevice() {
 }
 /** 打开编辑弹窗 */
 function openEditDevice(row) {
-  console.log("打开新增弹窗");
+  currentData.value = {}
+  console.log("打开编辑弹窗");
   currentData.value = row;
   console.log(currentData.value, "currentData");
   title.value = "编辑";
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentDialog.vue b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentDialog.vue
index 85399565..758803b0 100644
--- a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentDialog.vue
@@ -30,7 +30,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="拼音码(项目名称)" prop="pyStr" class="custom-label-spacing">
+            <el-form-item
+              label="拼音码(项目名称)"
+              prop="pyStr"
+              class="custom-label-spacing"
+            >
               <el-input v-model="form.pyStr" placeholder="" maxlength="30" />
             </el-form-item>
           </el-col>
@@ -59,7 +63,11 @@
         <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="使用单位" prop="permittedUnitCode">
-              <el-input v-model="form.permittedUnitCode" placeholder="" maxlength="30" />
+              <el-input
+                v-model="form.permittedUnitCode"
+                placeholder=""
+                maxlength="30"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -75,7 +83,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-      
+
         <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="医保对码标记" prop="ybMatchFlag">
@@ -94,14 +102,22 @@
           <el-col :span="8">
             <el-form-item label="身体部位" prop="bodySiteCode">
               <!-- <el-input v-model="form.ybFlag" placeholder="" maxlength="30" /> -->
-              <el-input v-model="form.bodySiteCode" placeholder="" maxlength="30" />
+              <el-input
+                v-model="form.bodySiteCode"
+                placeholder=""
+                maxlength="30"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="所需标本" prop="specimenCode">
-              <el-input v-model="form.specimenCode" placeholder="" maxlength="30" />
+              <el-input
+                v-model="form.specimenCode"
+                placeholder=""
+                maxlength="30"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -109,7 +125,6 @@
               <el-checkbox v-model="form.ruleId"></el-checkbox>
             </el-form-item>
           </el-col>
-
         </el-row>
         <el-row :gutter="24">
           <el-col :span="16">
@@ -124,7 +139,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <template #footer v-if="title !='查看'">
+      <template #footer v-if="title != '查看'">
         <div class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
@@ -156,12 +171,6 @@ const emits = defineEmits(["submit"]); // 声明自定义事件
 
 const data = reactive({
   form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 50,
-    diseaseName: undefined, // 疾病名称
-    status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
-  },
   rules: {
     // busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
     // name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
@@ -188,17 +197,17 @@ const props = defineProps({
 function show() {
   // queryParams.roleId = props.roleId;
   // getList();
-  title.value = ''
-  title.value = props.title
-  console.log(props, "22222",title.value);
+  title.value = "";
+  title.value = props.title;
+  console.log(props, "22222", title.value);
   visible.value = true;
 }
 // 显示弹框
 function edit() {
   // queryParams.roleId = props.roleId;
   // getList();
-  title.value = ''
-  title.value = props.title
+  title.value = "";
+  title.value = props.title;
   form.value = props.item;
   visible.value = true;
 }
@@ -229,6 +238,8 @@ function reset() {
 function submitForm() {
   if (form.value.id != undefined) {
     editDiagnosisTreatment(form.value).then((response) => {
+      // 触发自定义事件，并传递数据给父组件
+      emits("submit");
       proxy.$modal.msgSuccess("修改成功");
       visible.value = false;
       reset(); // 重置表单数据
@@ -243,6 +254,11 @@ function submitForm() {
     });
   }
 }
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
 defineExpose({
   show,
   edit,
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentViewDialog.vue b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentViewDialog.vue
index aa29e8f9..a0087d0e 100644
--- a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentViewDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentViewDialog.vue
@@ -304,12 +304,6 @@ const conditionDefinitionOptions = ref(undefined);
 
 const data = reactive({
   form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 50,
-    diseaseName: undefined, // 疾病名称
-    status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
-  },
   rules: {
     name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
     conditionCode: [
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/index.vue b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/index.vue
index 43ef5ce2..af8bd373 100644
--- a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/index.vue
@@ -309,7 +309,7 @@
         <pagination
           v-show="total > 0"
           :total="total"
-          v-model:page="queryParams.pageNum"
+          v-model:page="queryParams.pageNo"
           v-model:limit="queryParams.pageSize"
           @pagination="getList"
         />
@@ -368,7 +368,7 @@ const viewData = ref({});
 const data = reactive({
   form: {},
   queryParams: {
-    pageNum: 1,
+    pageNo: 1,
     pageSize: 50,
     searchKey: undefined, // 品名/商品名/英文品名/编码/拼音
     typeCode: undefined, // 类型（包括 1：中药，2：成药）
@@ -419,7 +419,7 @@ function handleNodeClick(data) {
 }
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1;
+  queryParams.value.pageNo = 1;
   getList();
 }
 
diff --git a/openhis-ui-vue3/src/views/catalog/disease/index.vue b/openhis-ui-vue3/src/views/catalog/disease/index.vue
index ee774f9f..07b8d462 100644
--- a/openhis-ui-vue3/src/views/catalog/disease/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/disease/index.vue
@@ -239,7 +239,7 @@
         <pagination
           v-show="total > 0"
           :total="total"
-          v-model:page="queryParams.pageNum"
+          v-model:page="queryParams.pageNo"
           v-model:limit="queryParams.pageSize"
           @pagination="getList"
         />
@@ -331,7 +331,7 @@ const statusFlagOptions = ref(undefined);
 const data = reactive({
   form: {},
   queryParams: {
-    pageNum: 1,
+    pageNo: 1,
     pageSize: 50,
     searchKey: undefined, // 疾病名称
     statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用）
@@ -385,7 +385,7 @@ function handleNodeClick(data) {
 }
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1;
+  queryParams.value.pageNo = 1;
   getList();
 }
 // /** 重置按钮操作 */
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 dbafe3cb..4fab61bb 100644
--- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
@@ -541,12 +541,6 @@ const emits =  defineEmits(['submit']); // 声明自定义事件
 
 const data = reactive({
   form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 50,
-    diseaseName: undefined, // 疾病名称
-    status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
-  },
   rules: {
     // busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
     // name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
diff --git a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineViewDialog.vue b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineViewDialog.vue
index aa29e8f9..a0087d0e 100644
--- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineViewDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineViewDialog.vue
@@ -304,12 +304,6 @@ const conditionDefinitionOptions = ref(undefined);
 
 const data = reactive({
   form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 50,
-    diseaseName: undefined, // 疾病名称
-    status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
-  },
   rules: {
     name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
     conditionCode: [
diff --git a/openhis-ui-vue3/src/views/catalog/medicine/index.vue b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
index e52d9e0c..6eae4300 100644
--- a/openhis-ui-vue3/src/views/catalog/medicine/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
@@ -417,7 +417,7 @@
         <pagination
           v-show="total > 0"
           :total="total"
-          v-model:page="queryParams.pageNum"
+          v-model:page="queryParams.pageNo"
           v-model:limit="queryParams.pageSize"
           @pagination="getList"
         />
@@ -521,7 +521,7 @@ const viewData = ref({});
 const data = reactive({
   form: {},
   queryParams: {
-    pageNum: 1,
+    pageNo: 1,
     pageSize: 50,
     searchKey: undefined, // 品名/商品名/英文品名/编码/拼音
     statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用）
@@ -571,7 +571,7 @@ function handleNodeClick(data) {
 }
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1;
+  queryParams.value.pageNo = 1;
   getList();
 }