接口url变更对应对应修正，采购入库画面提交 up by dh

2025-03-18 18:10:32 +08:00
parent f4f7ca21fe
commit d8f16b1b51
13 changed files with 2335 additions and 571 deletions
--- a/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js
+++ b/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js
@@ -13,8 +13,9 @@ export function getSupplierList(query) {
 // 查询厂商详细
 export function getSupplierOne(id) {
  return request({
-    url: '/data-dictionary/supplier/get-supplier-detail/' + parseStrEmpty(id),
-    method: 'get'
+    url: '/data-dictionary/supplier/get-supplier-detail',
+    method: 'get',
+    params:  {id} 
  })
 }

--- a/openhis-ui-vue3/src/views/basicservices/registrationfee/components/registrationfee.js
+++ b/openhis-ui-vue3/src/views/basicservices/registrationfee/components/registrationfee.js
@@ -47,7 +47,7 @@ export function getInit() {
 // 查询部门树形数据
 export function deptTreeSelect(queryParams) {
  return request({
-    url: '/basedatamanage/organization/organization',
+    url: '/base-data-manage/organization/organization',
    method: 'get',
    param: queryParams
  })
@@ -56,7 +56,7 @@ export function deptTreeSelect(queryParams) {
 // 查询地点树形数据
 export function locationTreeSelect(queryParams) {
  return request({
-    url: '/basedatamanage/cabinet-location/cabinet-location',
+    url: '/base-data-manage/cabinet-location/cabinet-location',
    method: 'get',
    param: queryParams
  })
--- a/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue
+++ b/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue
@@ -522,7 +522,7 @@ const data = reactive({
 const { queryParams, form, rules } = toRefs(data);

 /** 挂号收费查询下拉树结构 */
-function getregistrationfeeTypeList() {
+function getRegistrationfeeTypeList() {
  getInit().then((response) => {
    console.log(response, "response");
    activeFlagOptions.value = response.data.activeFlagOptions; // 活动标记
@@ -842,7 +842,7 @@ const transformFormEditData = (form) => {
    },
  };
 };
-getregistrationfeeTypeList();
+getRegistrationfeeTypeList();
 getDeptTree();
 getLocationTree();
 getList();
--- a/openhis-ui-vue3/src/views/catalog/device/components/device.js
+++ b/openhis-ui-vue3/src/views/catalog/device/components/device.js
@@ -5,7 +5,7 @@ import { parseStrEmpty } from "@/utils/openhis";
 export function getDeviceList(query) {
  console.log(query,'aaaaa')
  return request({
-    url: '/datadictionary/device/information-page',
+    url: '/data-dictionary/device/information-page',
    method: 'get',
    params: query
  })
@@ -14,7 +14,7 @@ export function getDeviceList(query) {
 // 查询器材目录详细
 export function getDeviceOne(id) {
  return request({
-    url: '/datadictionary/device/information-one/' + parseStrEmpty(id),
+    url: '/data-dictionary/device/information-one/' + parseStrEmpty(id),
    method: 'get'
  })
 }
@@ -22,7 +22,7 @@ export function getDeviceOne(id) {
 // 新增器材目录
 export function addDevice(data) {
  return request({
-    url: '/datadictionary/device/information',
+    url: '/data-dictionary/device/information',
    method: 'post',
    data: data
  })
@@ -31,7 +31,7 @@ export function addDevice(data) {
 // 修改器材目录
 export function editDevice(data) {
  return request({
-    url: '/datadictionary/device/information',
+    url: '/data-dictionary/device/information',
    method: 'put',
    data: data
  })
@@ -48,7 +48,7 @@ export function editDevice(data) {
 // 器材目录分类查询
 export function getDiseaseTreatmentInit() {
  return request({
-    url: '/datadictionary/device/init',
+    url: '/data-dictionary/device/init',
    method: 'get'
  })
 }
@@ -57,7 +57,7 @@ export function getDiseaseTreatmentInit() {
 export function stopDevice(ids) {
  console.log(ids)
  return request({
-    url: '/datadictionary/device/information-stop',
+    url: '/data-dictionary/device/information-stop',
    method: 'put',
    data: ids
  })
@@ -67,7 +67,7 @@ export function stopDevice(ids) {
 export function startDevice(ids) {
  console.log(ids)
  return request({
-    url: '/datadictionary/device/information-start',
+    url: '/data-dictionary/device/information-start',
    method: 'put',
    data: ids
  })
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatment.js
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatment.js
@@ -4,7 +4,7 @@ import { parseStrEmpty } from "@/utils/openhis";
 // 查询诊疗目录列表
 export function getDiagnosisTreatmentList(query) {
  return request({
-    url: '/datadictionary/diagnosistreatment/information-page',
+    url: '/data-dictionary/diagnosistreatment/information-page',
    method: 'get',
    params: query
  })
@@ -13,7 +13,7 @@ export function getDiagnosisTreatmentList(query) {
 // 查询诊疗目录详细
 export function getDiagnosisTreatmentOne(id) {
  return request({
-    url: '/datadictionary/diagnosistreatment/information-one/' + parseStrEmpty(id),
+    url: '/data-dictionary/diagnosistreatment/information-one/' + parseStrEmpty(id),
    method: 'get'
  })
 }
@@ -21,7 +21,7 @@ export function getDiagnosisTreatmentOne(id) {
 // 新增诊疗目录
 export function addDiagnosisTreatment(data) {
  return request({
-    url: '/datadictionary/diagnosistreatment/information',
+    url: '/data-dictionary/diagnosistreatment/information',
    method: 'post',
    data: data
  })
@@ -30,7 +30,7 @@ export function addDiagnosisTreatment(data) {
 // 修改诊疗目录
 export function editDiagnosisTreatment(data) {
  return request({
-    url: '/datadictionary/diagnosistreatment/information',
+    url: '/data-dictionary/diagnosistreatment/information',
    method: 'put',
    data: data
  })
@@ -47,7 +47,7 @@ export function editDiagnosisTreatment(data) {
 // 诊疗目录分类查询
 export function getDiseaseTreatmentInit() {
  return request({
-    url: '/datadictionary/diagnosistreatment/init',
+    url: '/data-dictionary/diagnosistreatment/init',
    method: 'get'
  })
 }
@@ -56,7 +56,7 @@ export function getDiseaseTreatmentInit() {
 export function stopDiseaseTreatment(ids) {
  console.log(ids)
  return request({
-    url: '/datadictionary/diagnosistreatment/information-stop',
+    url: '/data-dictionary/diagnosistreatment/information-stop',
    method: 'put',
    data: ids
  })
@@ -66,7 +66,7 @@ export function stopDiseaseTreatment(ids) {
 export function startDiseaseTreatment(ids) {
  console.log(ids)
  return request({
-    url: '/datadictionary/diagnosistreatment/information-start',
+    url: '/data-dictionary/diagnosistreatment/information-start',
    method: 'put',
    data: ids
  })
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
@@ -149,7 +149,7 @@ import {
  addDiagnosisTreatment,
  getDiseaseTreatmentInit,
  getDiagnosisTreatmentOne,
-} from "./diagnosisTreatment";
+} from "./diagnosistreatment";

 const router = useRouter();
 const { proxy } = getCurrentInstance();
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue
@@ -323,45 +323,45 @@
        :viewFlg="viewFlg"
      /> -->
    </div>
-</template>
+  </template>
  
-<script setup name="DiagnosisTreatment">
-import {
+  <script setup name="DiagnosisTreatment">
+  import {
    getDiagnosisTreatmentList,
    stopDiseaseTreatment,
    startDiseaseTreatment,
    getDiseaseTreatmentInit,
    getDiagnosisTreatmentOne,
-} from "./components/diagnosisTreatment";
-import diagnosisTreatmentDialog from "./components/diagnosisTreatmentDialog";
-import diagnosisTreatmentViewDialog from "./components/diagnosisTreatmentViewDialog";
-import { nextTick } from "vue";
+  } from "./components/diagnosistreatment";
+  import diagnosisTreatmentDialog from "./components/diagnosisTreatmentDialog";
+  import diagnosisTreatmentViewDialog from "./components/diagnosisTreatmentViewDialog";
+  import { nextTick } from "vue";
  
-const router = useRouter();
-const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict(
+  const router = useRouter();
+  const { proxy } = getCurrentInstance();
+  const { sys_normal_disable, sys_user_sex } = proxy.useDict(
    "sys_normal_disable",
    "sys_user_sex"
-);
+  );
  
-const diagnosisTreatmentList = 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 diseaseTreatmentCategoryList = ref(undefined);
-const statusFlagOptions = ref(undefined);
-const exeOrganizations = ref(undefined);
-// 使用 ref 定义当前器材数据
-const currentData = ref({});
-// 使用 ref 定义当前查看器材数据
-const viewData = ref({});
+  const diagnosisTreatmentList = 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 diseaseTreatmentCategoryList = ref(undefined);
+  const statusFlagOptions = ref(undefined);
+  const exeOrganizations = ref(undefined);
+  // 使用 ref 定义当前器材数据
+  const currentData = ref({});
+  // 使用 ref 定义当前查看器材数据
+  const viewData = ref({});
  
-const data = reactive({
+  const data = reactive({
    form: {},
    queryParams: {
      pageNo: 1,
@@ -379,18 +379,18 @@ const data = reactive({
      //   { required: true, message: "编码不能为空", trigger: "blur" },
      // ],
    },
-});
+  });
  
-const { queryParams, form, rules } = toRefs(data);
+  const { queryParams, form, rules } = toRefs(data);
  
-/** 通过条件过滤节点  */
-const filterNode = (value, data) => {
+  /** 通过条件过滤节点  */
+  const filterNode = (value, data) => {
    if (!value) return true;
    return data.label.indexOf(value) !== -1;
-};
+  };
  
-/** 诊断目录分类查询下拉树结构 */
-function getDiseaseTreatmentList() {
+  /** 诊断目录分类查询下拉树结构 */
+  function getDiseaseTreatmentList() {
    getDiseaseTreatmentInit().then((response) => {
      console.log(response, "response器材目录分类查询下拉树结构");
      diseaseTreatmentCategoryList.value =
@@ -398,9 +398,9 @@ function getDiseaseTreatmentList() {
      statusFlagOptions.value = response.data.statusFlagOptions;
      exeOrganizations.value = response.data.exeOrganizations;
    });
-}
-/** 查询诊断目录列表 */
-function getList() {
+  }
+  /** 查询诊断目录列表 */
+  function getList() {
    loading.value = true;
    getDiagnosisTreatmentList(queryParams.value).then((res) => {
      loading.value = false;
@@ -408,23 +408,23 @@ function getList() {
      console.log(diagnosisTreatmentList, "res.data");
      total.value = res.data.total;
    });
-}
-/** 节点单击事件 */
-function handleNodeClick(data) {
+  }
+  /** 节点单击事件 */
+  function handleNodeClick(data) {
    console.log(data, "节点单击事件");
    queryParams.value.categoryEnum = data.value;
    console.log(queryParams, "queryParams节点单击事件");
    handleQuery();
-}
-/** 搜索按钮操作 */
-function handleQuery() {
+  }
+  /** 搜索按钮操作 */
+  function handleQuery() {
    queryParams.value.pageNo = 1;
    console.log(queryParams, "queryParams搜索");
    getList();
-}
+  }
  
-/** 启用按钮操作 */
-function handleStart() {
+  /** 启用按钮操作 */
+  function handleStart() {
    const stardIds = ids.value;
    //   selectedData
    proxy.$modal
@@ -437,9 +437,9 @@ function handleStart() {
        proxy.$modal.msgSuccess("启用成功");
      })
      .catch(() => {});
-}
-/** 停用按钮操作 */
-function handleClose() {
+  }
+  /** 停用按钮操作 */
+  function handleClose() {
    const stopIds = ids.value;
    proxy.$modal
      .confirm("是否确认停用数据！")
@@ -451,9 +451,9 @@ function handleClose() {
        proxy.$modal.msgSuccess("停用成功");
      })
      .catch(() => {});
-}
-/** 导出按钮操作 */
-function handleExport() {
+  }
+  /** 导出按钮操作 */
+  function handleExport() {
    proxy.download(
      "system/user/export",
      {
@@ -461,36 +461,36 @@ function handleExport() {
      },
      `user_${new Date().getTime()}.xlsx`
    );
-}
+  }
  
-/** 选择条数  */
-function handleSelectionChange(selection) {
+  /** 选择条数  */
+  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() {
+  /** 下载模板操作 */
+  function importTemplate() {
    proxy.download(
      "system/user/importTemplate",
      {},
      `user_template_${new Date().getTime()}.xlsx`
    );
-}
+  }
  
-/** 打开新增弹窗 */
-function openAddDiagnosisTreatment() {
+  /** 打开新增弹窗 */
+  function openAddDiagnosisTreatment() {
    console.log("打开新增弹窗");
    title.value = "新增";
    nextTick(() => {
      proxy.$refs.diagnosisTreatmentRef.show();
    });
-}
-/** 打开编辑弹窗 */
-function openEditDiagnosisTreatment(row) {
+  }
+  /** 打开编辑弹窗 */
+  function openEditDiagnosisTreatment(row) {
    console.log("打开新增弹窗");
    currentData.value = JSON.parse(JSON.stringify(row));
    currentData.value.ybFlag == 1
@@ -506,9 +506,9 @@ function openEditDiagnosisTreatment(row) {
      proxy.$refs["diagnosisTreatmentRef"].edit();
    });
    // proxy.$refs["diagnosisTreatmentRef"].edit();
-}
-/** 打开查看弹窗 */
-function openViewDiagnosisTreatment(row) {
+  }
+  /** 打开查看弹窗 */
+  function openViewDiagnosisTreatment(row) {
    // viewData.value = row;
    getDiagnosisTreatmentOne(row.id).then((response) => {
      currentData.value = response.data;
@@ -530,15 +530,16 @@ function openViewDiagnosisTreatment(row) {
    //   proxy.$refs["diagnosisTreatmentViewRef"].edit();
    // });
    // proxy.$refs["diagnosisTreatmentRef"].edit();
-}
+  }
  
-getDiseaseTreatmentList();
-getList();
-</script>
-<style scoped>
-.el-form--inline .el-form-item {
+  getDiseaseTreatmentList();
+  getList();
+  </script>
+  <style scoped>
+  .el-form--inline .el-form-item {
    display: inline-flex;
    vertical-align: middle;
    margin-right: 10px !important;
-}
-</style>
+  }
+  </style>
+  
--- a/openhis-ui-vue3/src/views/catalog/disease/components/disease.js
+++ b/openhis-ui-vue3/src/views/catalog/disease/components/disease.js
@@ -4,7 +4,7 @@ import { parseStrEmpty } from "@/utils/openhis";
 // 查询病种目录列表
 export function getDiseaseList(query) {
  return request({
-    url: '/datadictionary/disease/information-page',
+    url: '/data-dictionary/disease/information-page',
    method: 'get',
    params: query
  })
@@ -13,7 +13,7 @@ export function getDiseaseList(query) {
 // 查询病种目录详细
 export function getDiseaseOne(id) {
  return request({
-    url: '/datadictionary/disease/information-one/' + parseStrEmpty(id),
+    url: '/data-dictionary/disease/information-one/' + parseStrEmpty(id),
    method: 'get'
  })
 }
@@ -21,7 +21,7 @@ export function getDiseaseOne(id) {
 // 新增病种目录
 export function addDisease(data) {
  return request({
-    url: '/datadictionary/disease/information',
+    url: '/data-dictionary/disease/information',
    method: 'post',
    data: data
  })
@@ -30,7 +30,7 @@ export function addDisease(data) {
 // 修改病种目录
 export function editDisease(data) {
  return request({
-    url: '/datadictionary/disease/information',
+    url: '/data-dictionary/disease/information',
    method: 'put',
    data: data
  })
@@ -47,7 +47,7 @@ export function editDisease(data) {
 // 病种目录分类查询
 export function getDiseaseCategory() {
  return request({
-    url: '/datadictionary/disease/information-init',
+    url: '/data-dictionary/disease/information-init',
    method: 'get'
  })
 }
@@ -55,7 +55,7 @@ export function getDiseaseCategory() {
 // 停用病种目录
 export function stopDisease(ids) {
  return request({
-    url: '/datadictionary/disease/information-stop',
+    url: '/data-dictionary/disease/information-stop',
    method: 'put',
    data: ids
  })
@@ -64,7 +64,7 @@ export function stopDisease(ids) {
 // 启用病种目录
 export function startDisease(ids) {
  return request({
-    url: '/datadictionary/disease/information-start',
+    url: '/data-dictionary/disease/information-start',
    method: 'put',
    data: ids
  })
--- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js
@@ -4,7 +4,7 @@ import { parseStrEmpty } from "@/utils/openhis";
 // 查询药品目录列表
 export function getMedicationList(query) {
  return request({
-    url: '/datadictionary/medication/information-page',
+    url: '/data-dictionary/medication/information-page',
    method: 'get',
    params: query
  })
@@ -13,7 +13,7 @@ export function getMedicationList(query) {
 // 查询药品目录详细
 export function getMedicationOne(id) {
  return request({
-    url: '/datadictionary/medication/information-one/' + parseStrEmpty(id),
+    url: '/data-dictionary/medication/information-one/' + parseStrEmpty(id),
    method: 'get'
  })
 }
@@ -21,7 +21,7 @@ export function getMedicationOne(id) {
 // 新增药品目录
 export function addMedication(data) {
  return request({
-    url: '/datadictionary/medication/information',
+    url: '/data-dictionary/medication/information',
    method: 'post',
    data: data
  })
@@ -30,7 +30,7 @@ export function addMedication(data) {
 // 修改药品目录
 export function editMedication(data) {
  return request({
-    url: '/datadictionary/medication/information',
+    url: '/data-dictionary/medication/information',
    method: 'put',
    data: data
  })
@@ -47,7 +47,7 @@ export function delUser(userId) {
 // 药品目录分类查询
 export function getMedicationCategory() {
  return request({
-    url: '/datadictionary/medication/information-init',
+    url: '/data-dictionary/medication/information-init',
    method: 'get'
  })
 }
@@ -57,7 +57,7 @@ export function getMedicationCategory() {
 export function stopMedication(ids) {
  console.log(ids)
  return request({
-    url: '/datadictionary/medication/information-stop',
+    url: '/data-dictionary/medication/information-stop',
    method: 'put',
    data: ids
  })
@@ -67,7 +67,7 @@ export function stopMedication(ids) {
 export function startMedication(ids) {
  console.log(ids)
  return request({
-    url: '/datadictionary/medication/information-start',
+    url: '/data-dictionary/medication/information-start',
    method: 'put',
    data: ids
  })
--- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
@@ -17,7 +17,6 @@
                  <el-input
                    v-model="form.name"
                    placeholder=""
-                    @input="generateCodes"
                  />
                </el-form-item>
              </el-col>
@@ -55,7 +54,6 @@
                  <el-input
                    v-model="form.name"
                    placeholder=""
-                    @input="generateCodes"
                  />
                </el-form-item>
              </el-col>
@@ -650,7 +648,6 @@
 //   getDiseaseCategory,
 //   getDiseaseOne,
 // } from "./components/medicine";
-import pinyin from "pinyin"; // 需要安装 pinyin 库

 const router = useRouter();
 const { proxy } = getCurrentInstance();
@@ -700,14 +697,6 @@ const data = reactive({
  },
 });

-// 生成拼音码和五笔码
-const generateCodes = () => {
-  form.value.pyStr = pinyin(form.value.name, {
-    style: pinyin.STYLE_FIRST_LETTER,
-  }).join(""); // 生成拼音首字母
-  console.log(form.value.pyStr, "form.pyStr", form.value.name);
-  // form.wbStr = wubi(form.name).join(''); // 如果有五笔库，可以生成五笔码
-};
 const { queryParams, form, antibioticForm, rules } = toRefs(data);

 const props = defineProps({
--- a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue
--- a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/purchaseinventory.js
+++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/purchaseinventory.js
@@ -0,0 +1,73 @@
+import request from '@/utils/request'
+import { parseStrEmpty } from "@/utils/openhis";
+
+// 查询服务管理列表
+export function getPurchaseinventoryList(query) {
+  return request({
+    url: '/inventory-manage/purchase/inventory-receipt-page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询服务管理详细
+export function getPurchaseinventoryOne(id) {
+  return request({
+    url: '/basic-service/healthcare/healthcare-service-detail/' + parseStrEmpty(id),
+    method: 'get'
+  })
+}
+
+// 新增服务管理
+export function addPurchaseinventory(data) {
+  return request({
+    url: '/basic-service/healthcare/healthcare-service',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改服务管理
+export function editPurchaseinventory(data) {
+  return request({
+    url: '/basic-service/healthcare/healthcare-service',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询厂商类型
+export function getInit() {
+  return request({
+    url: '/basic-service/healthcare/init',
+    method: 'get'
+  })
+}
+
+// 查询部门树形数据
+export function deptTreeSelect(queryParams) {
+  return request({
+    url: '/base-data-manage/organization/organization',
+    method: 'get',
+    param: queryParams
+  })
+}
+
+// 查询地点树形数据
+export function locationTreeSelect(queryParams) {
+  return request({
+    url: '/base-data-manage/cabinet-location/cabinet-location',
+    method: 'get',
+    param: queryParams
+  })
+}
+
+// 删除收费挂号项目
+export function delPurchaseinventory(param) {
+  console.log(param,'aaaa')
+  return request({
+    url: '/basic-service/healthcare/healthcare-service',
+    method: 'delete',
+    params: param
+  })
+}
--- a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/index.vue
@@ -0,0 +1,683 @@
+<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: 150px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item
+        label="审批状态："
+        prop="statusEnum"
+        label-width="100px"
+      >
+        <el-select
+          v-model="queryParams.statusEnum"
+          placeholder=""
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in appointmentRequiredFlagOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="供应商：" prop="supplierId">
+        <el-input
+          v-model="queryParams.supplierId"
+          placeholder="回车查询"
+          clearable
+          style="width: 150px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门：" prop="categoryEnum">
+        <el-select
+          v-model="queryParams.categoryEnum"
+          placeholder=""
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in activeFlagOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="部门经手人：" prop="applicantId" label-width="120px">
+        <el-select
+          v-model="queryParams.applicantId"
+          placeholder=""
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in activeFlagOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="查询时间">
+        <el-date-picker
+          v-model="dateRange"
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="openAddInventoryReceiptDialog"
+          v-hasPermi="['system:user:add']"
+          >添加记录</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['monitor:job: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="CircleClose"
+          @click="handleClear"
+          v-hasPermi="['system:user:export']"
+          >重置</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="purchaseinventoryList"
+      @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="statusEnum_enumText"
+        prop="statusEnum_enumText"
+      />
+      <el-table-column
+        label="供应商"
+        align="center"
+        key="supplierId"
+        prop="supplierId"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="部门"
+        align="center"
+        key="purposeLocationId"
+        prop="purposeLocationId"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="部门经手人"
+        align="center"
+        key="approverId"
+        prop="approverId"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="制单人"
+        align="center"
+        key="applicantId"
+        prop="applicantId"
+      />
+      <el-table-column
+        label="审核人"
+        align="center"
+        key="approverId"
+        prop="approverId"
+      />
+      <el-table-column
+        label="制单日期"
+        align="center"
+        key="applyTime"
+        prop="applyTime"
+      />
+      <el-table-column
+        label="审核日期 "
+        align="center"
+        key="approvalTime"
+        prop="approvalTime"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        width="140"
+        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"
+    />
+    <inventory-receipt-dialog
+      ref="inventoryReceiptRef"
+      :item="currentData"
+      :domainEnum="domainEnumOptions"
+      :status="statusFlagOptions"
+      @submit="submitForm"
+    />
+  </div>
+</template>
+
+<script setup name="Purchaseinventory">
+import {
+  getPurchaseinventoryList,
+  editPurchaseinventory,
+  addPurchaseinventory,
+  getPurchaseinventoryOne,
+  getInit,
+  deptTreeSelect,
+  locationTreeSelect,
+  delPurchaseinventory,
+} from "./components/purchaseinventory";
+
+import inventoryReceiptDialog from "./components/inventoryReceiptDialog";
+
+const router = useRouter();
+const { proxy } = getCurrentInstance();
+const purchaseinventoryRef = ref(null); // 初始化 ref
+const {
+  adm_location,
+  category_code,
+  service_type_code,
+  specialty_code,
+  med_chrgitm_type,
+  financial_type_code,
+} = proxy.useDict(
+  "adm_location",
+  "category_code",
+  "service_type_code",
+  "specialty_code",
+  "med_chrgitm_type",
+  "financial_type_code"
+);
+
+const purchaseinventoryList = 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 activeFlagOptions = ref(undefined);
+const appointmentRequiredFlagOptions = ref(undefined);
+const deptOptions = ref(undefined); // 部门树选项
+const locationOptions = ref(undefined); // 地点树选项
+const dateRange = ref([]);
+
+// 是否停用
+const statusFlagOptions = ref(undefined);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined, // 供应商名称
+    busNo: undefined, // 编码
+    statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用）
+    sourceEnum: undefined, // 来源（包括 1：厂商/产地目录分类，2：自定义）
+  },
+  rules: {
+    offeredOrgId: [
+      { required: true, message: "提供部门不能为空", trigger: "blur" },
+    ],
+    categoryCode: [
+      { required: true, message: "服务分类不能为空", trigger: "blur" },
+    ],
+    fwTypeCode: [
+      { required: true, message: "服务类型不能为空", trigger: "blur" },
+    ],
+    specialtyCode: [
+      { required: true, message: "服务专业不能为空", trigger: "blur" },
+    ],
+    locationId: [{ required: true, message: "地点不能为空", trigger: "blur" }],
+    name: [{ required: true, message: "服务名称不能为空", trigger: "blur" }],
+    contact: [
+      { required: true, message: "联系人电话不能为空", trigger: "blur" },
+    ],
+    appointmentRequiredFlag: [
+      { required: true, message: "预约要求不能为空", trigger: "blur" },
+    ],
+    activeFlag: [
+      { required: true, message: "活动标识不能为空", trigger: "blur" },
+    ],
+    chargeName: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+    description: [{ required: true, message: "描述不能为空", trigger: "blur" }],
+    cwTypeCode: [
+      { required: true, message: "财务类别不能为空", trigger: "blur" },
+    ],
+    ybType: [{ required: true, message: "医保类别不能为空", trigger: "blur" }],
+    price: [{ required: true, message: "基础价格不能为空", trigger: "blur" }],
+  },
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 挂号收费查询下拉树结构 */
+function getPurchaseinventoryTypeList() {
+  getInit().then((response) => {
+    console.log(response, "response");
+    activeFlagOptions.value = response.data.activeFlagOptions; // 活动标记
+    appointmentRequiredFlagOptions.value =
+      response.data.appointmentRequiredFlagOptions; // 预约必填标记
+  });
+}
+
+/** 查询部门下拉树结构 */
+function getDeptTree() {
+  deptTreeSelect().then((response) => {
+    console.log(response, "response查询部门下拉树结构");
+
+    deptOptions.value = response.data.records;
+    console.log(deptOptions.value, "部门下拉树结构");
+  });
+}
+
+/** 查询地点下拉树结构 */
+function getLocationTree() {
+  locationTreeSelect().then((response) => {
+    console.log(response, "response查询部门下拉树结构");
+    locationOptions.value = response.data.records;
+    console.log(locationOptions.value, "部门下拉树结构");
+  });
+}
+
+/** 查询挂号收费项目列表 */
+function getList() {
+  loading.value = true;
+  // // queryParams.value.statusEnum = +queryParams.value.statusEnum
+  // console.log(queryParams.value, "queryParams.value");
+  // getPurchaseinventoryList(queryParams.value).then((res) => {
+  loading.value = false;
+  //   console.log(res, "res");
+  //   purchaseinventoryList.value = res.data.records;
+  //   total.value = res.data.total;
+  //   console.log(total.value, "total.value");
+  // });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.applyTimeStart = dateRange.value[0];
+  queryParams.value.applyTimeEnd = dateRange.value[1];
+  queryParams.value.pageNo = 1;
+  getList();
+}
+
+/** 清空条件按钮操作 */
+function handleClear() {
+  // 清空查询条件
+  proxy.resetForm("queryRef");
+  getList();
+}
+
+/** 选择条数  */
+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 openAddInventoryReceiptDialog() {
+  proxy.$refs["inventoryReceiptRef"].show();
+}
+/** 重置操作表单 */
+function reset() {
+  form.value = {
+    id: undefined,
+    name: undefined,
+    categoryCode: undefined,
+    cwTypeCode: undefined,
+    fwTypeCode: undefined,
+    specialtyCode: undefined,
+    locationId: undefined,
+    offeredOrgId: undefined,
+    activeFlag: undefined,
+    extraDetails: undefined,
+    contact: undefined,
+    appointmentRequiredFlag: undefined,
+    chargeName: undefined,
+    price: undefined,
+    description: undefined,
+    ybType: undefined,
+    title: undefined,
+    comment: undefined,
+  };
+  proxy.resetForm("purchaseinventoryRef");
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "新增";
+}
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  form.value = JSON.parse(JSON.stringify(row));
+  form.value.fwTypeCode = form.value.typeCode;
+  open.value = true;
+  title.value = "编辑";
+}
+/** 提交按钮 */
+function submitForm() {
+  if (form.value.id != undefined) {
+    // 移除规则
+    rules.value.chargeName = [];
+    rules.value.description = [];
+    rules.value.cwTypeCode = [];
+    rules.value.ybType = [];
+    rules.value.price = [];
+  } else {
+    // 恢复规则
+    rules.value.cwTypeCode = [
+      { required: true, message: "财务类别不能为空", trigger: "blur" },
+    ];
+    rules.value.ybType = [
+      { required: true, message: "医保类别不能为空", trigger: "blur" },
+    ];
+    rules.value.price = [
+      { required: true, message: "基础价格不能为空", trigger: "blur" },
+    ];
+
+    rules.value.chargeName = [
+      { required: true, message: "名称不能为空", trigger: "blur" },
+    ];
+    rules.value.description = [
+      { required: true, message: "描述不能为空", trigger: "blur" },
+    ];
+  }
+
+  // const nameData = name || chargeName;
+  // 服务名称
+  form.value.name = getName();
+  // 收费名称
+  form.value.chargeName = getName();
+  proxy.$refs["purchaseinventoryRef"].validate((valid) => {
+    if (valid) {
+      if (form.value.id != undefined) {
+        // 调用转换函数
+        const transformFormEditParam = transformFormEditData(form);
+        console.log(transformFormEditData, "transformFormEditData");
+        console.log(form.value, "editPurchaseinventory", form.value.statusEnum);
+        editPurchaseinventory(transformFormEditParam).then((response) => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          reset();
+          getList();
+        });
+      } else {
+        // 调用转换函数
+        const transformedData = transformFormData(form);
+        console.log(transformedData, "transformedData");
+        addPurchaseinventory(transformedData).then((response) => {
+          reset();
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+// 获取完整地址字符串
+function getName() {
+  console.log(service_type_code.value, "service_type_code.value");
+  // 服务类型
+  const serviceTypeText = proxy.selectDictLabel(
+    service_type_code.value,
+    form.value.fwTypeCode
+  );
+  // 服务分类
+  const categoryCodeText = proxy.selectDictLabel(
+    category_code.value,
+    form.value.categoryCode
+  );
+  // 服务专业
+  const specialtyCodeText = proxy.selectDictLabel(
+    specialty_code.value,
+    form.value.specialtyCode
+  );
+  console.log(
+    serviceTypeText,
+    "serviceTypeText",
+    categoryCodeText,
+    specialtyCodeText
+  );
+  const nameParts = [
+    serviceTypeText,
+    form.value.addressCity,
+    categoryCodeText,
+    specialtyCodeText,
+  ];
+
+  // 使用 reduce 方法拼接地址，非空字段之间用 '-' 连接
+  return nameParts.reduce((acc, part) => {
+    if (part) {
+      if (acc) {
+        acc += " - "; // 在非空字段之间添加 '-'
+      }
+      acc += part;
+    }
+    return acc;
+  }, "");
+}
+/** 详细按钮操作 */
+function handleView(row) {
+  reset();
+  title.value = "查看";
+  open.value = true;
+  getPurchaseinventoryOne(row.id).then((response) => {
+    console.log(response, "responsebbbb", row.id);
+    form.value = response.data;
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const delId = row.id || ids.value;
+  proxy.$modal
+    .confirm("是否确认删除以上数据?")
+    .then(function () {
+      return delPurchaseinventory({ ids: delId.join(",") });
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
+    })
+    .catch(() => {});
+}
+// 转换insert参数函数
+const transformFormData = (form) => {
+  const {
+    id,
+    name,
+    categoryCode,
+    // typeCode,
+    cwTypeCode,
+    fwTypeCode,
+    specialtyCode,
+    locationId,
+    offeredOrgId,
+    activeFlag,
+    extraDetails,
+    contact,
+    appointmentRequiredFlag,
+    chargeName,
+    price,
+    description,
+    ybType,
+    title,
+    comment,
+  } = form.value;
+
+  return {
+    healthcareServiceFormData: {
+      id,
+      activeFlag,
+      offeredOrgId,
+      categoryCode,
+      typeCode: fwTypeCode,
+      specialtyCode,
+      locationId,
+      name,
+      contact,
+      appointmentRequiredFlag,
+      extraDetails,
+      comment,
+    },
+    chargeItemDefinitionFormData: {
+      id,
+      chargeName,
+      title,
+      orgId: offeredOrgId,
+      description,
+      typeCode: cwTypeCode,
+      ybType,
+      price,
+    },
+  };
+};
+
+// 转换insert参数函数
+const transformFormEditData = (form) => {
+  const {
+    id,
+    name,
+    categoryCode,
+    // typeCode,
+    cwTypeCode,
+    fwTypeCode,
+    specialtyCode,
+    locationId,
+    offeredOrgId,
+    activeFlag,
+    extraDetails,
+    contact,
+    appointmentRequiredFlag,
+    chargeName,
+    price,
+    description,
+    ybType,
+    title,
+    comment,
+  } = form.value;
+
+  return {
+    healthcareServiceFormData: {
+      id,
+      activeFlag,
+      offeredOrgId,
+      categoryCode,
+      typeCode: fwTypeCode,
+      specialtyCode,
+      locationId,
+      name,
+      contact,
+      appointmentRequiredFlag,
+      extraDetails,
+      comment,
+    },
+  };
+};
+getPurchaseinventoryTypeList();
+getDeptTree();
+getLocationTree();
+getList();
+</script>
+<style scoped>
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+}
+
+.title {
+  font-weight: bold;
+  font-size: large;
+  margin-bottom: 10px;
+}
+</style>