代码格式调整 up by dh

2025-03-28 13:53:39 +08:00
parent f81a553c21
commit e6ded12047
8 changed files with 29 additions and 76 deletions
--- a/openhis-ui-vue3/src/views/catalog/device/components/device.js
+++ b/openhis-ui-vue3/src/views/catalog/device/components/device.js
@@ -1,5 +1,4 @@
 import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/openhis";

 // 查询器材目录列表
 export function getDeviceList(query) {
@@ -14,8 +13,9 @@ export function getDeviceList(query) {
 // 查询器材目录详细
 export function getDeviceOne(id) {
  return request({
-    url: '/data-dictionary/device/information-one/' + parseStrEmpty(id),
-    method: 'get'
+    url: '/data-dictionary/device/information-one',
+    method: 'get',
+    params: { id } // 确保参数正确传递
  })
 }

--- a/openhis-ui-vue3/src/views/catalog/device/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/index.vue
@@ -449,7 +449,7 @@ const filterNode = (value, data) => {
 function getDiseaseTreatmentList() {
  getDiseaseTreatmentInit().then((response) => {
    console.log(response, "response器材目录分类查询下拉树结构");
-    deviceCategories.value = response.data.deviceCategories;
+    deviceCategories.value = response.data.deviceCategories.sort((a, b) => { return parseInt(a.value) - parseInt(b.value) });
    statusFlagOptions.value = response.data.statusFlagOptions;
    exeOrganizations.value = response.data.exeOrganizations;
  });
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js
@@ -1,5 +1,4 @@
 import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/openhis";

 // 查询诊疗目录列表
 export function getDiagnosisTreatmentList(query) {
@@ -37,14 +36,6 @@ export function editDiagnosisTreatment(data) {
  })
 }

-// // 删除诊疗目录
-// export function delUser(userId) {
-//   return request({
-//     url: '/system/user/' + userId,
-//     method: 'delete'
-//   })
-// }
-
 // 诊疗目录分类查询
 export function getDiseaseTreatmentInit() {
  return request({
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue
@@ -414,7 +414,7 @@ function getDiseaseTreatmentList() {
  getDiseaseTreatmentInit().then((response) => {
    console.log(response, "response器材目录分类查询下拉树结构");
    diseaseTreatmentCategoryList.value =
-      response.data.diseaseTreatmentCategoryList;
+      response.data.diseaseTreatmentCategoryList.sort((a, b) => { return parseInt(a.value) - parseInt(b.value) });
    statusFlagOptions.value = response.data.statusFlagOptions;
    exeOrganizations.value = response.data.exeOrganizations;
    typeEnumOptions.value = response.data.typeEnumOptions;
--- a/openhis-ui-vue3/src/views/catalog/disease/components/disease.js
+++ b/openhis-ui-vue3/src/views/catalog/disease/components/disease.js
@@ -1,5 +1,4 @@
 import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/openhis";

 // 查询病种目录列表
 export function getDiseaseList(query) {
@@ -13,8 +12,9 @@ export function getDiseaseList(query) {
 // 查询病种目录详细
 export function getDiseaseOne(id) {
  return request({
-    url: '/data-dictionary/disease/information-one/' + parseStrEmpty(id),
-    method: 'get'
+    url: '/data-dictionary/disease/information-one',
+    method: 'get',
+    params: { id } // 确保参数正确传递
  })
 }

--- a/openhis-ui-vue3/src/views/catalog/disease/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/disease/index.vue
@@ -192,14 +192,14 @@
                v-hasPermi="['system:user:edit']"
                >编辑</el-button
              >
-              <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>
@@ -332,7 +332,6 @@ import {
  startDisease,
 } from "./components/disease";

-const router = useRouter();
 const { proxy } = getCurrentInstance();

 const diseaseList = ref([]);
@@ -348,9 +347,6 @@ const conditionDefinitionOptions = ref(undefined);
 const conditionDefinition = ref(undefined);
 // 是否停用
 const statusFlagOptions = ref(undefined);
-// const initPassword = ref(undefined);
-// const postOptions = ref([]);
-// const roleOptions = ref([]);

 const data = reactive({
  form: {},
@@ -366,15 +362,6 @@ const data = reactive({
    conditionCode: [
      { required: true, message: "编码不能为空", trigger: "blur" },
    ],
-    // typeCode: [
-    //   { required: true, message: "编码不能为空", trigger: "blur" },
-    // ],
-    // description: [
-    //   { required: true, message: "编码不能为空", trigger: "blur" },
-    // ],
-    // conditionCode: [
-    //   { required: true, message: "编码不能为空", trigger: "blur" },
-    // ],
  },
 });

@@ -385,29 +372,23 @@ const filterNode = (value, data) => {
  if (!value) return true;
  return data.label.indexOf(value) !== -1;
 };
-// /** 根据名称筛选部门树 */
-// watch(deptName, val => {
-//   proxy.$refs["deptTreeRef"].filter(val);
-// });
+
 /** 病种目录分类查询下拉树结构 */
 function getDiseaseCategoryList() {
  getDiseaseCategory().then((response) => {
    console.log(response, "response病种目录分类查询下拉树结构");
-    conditionDefinitionOptions.value = response.data.diseaseCategoryList;
+    conditionDefinitionOptions.value = response.data.diseaseCategoryList.sort((a, b) => { return parseInt(a.value) - parseInt(b.value) });
    statusFlagOptions.value = response.data.statusFlagOptions;
  });
 }
 /** 查询病种目录列表 */
 function getList() {
  loading.value = true;
-  // queryParams.value.statusEnum = +queryParams.value.statusEnum
-  console.log(queryParams.value, "queryParams.value");
  getDiseaseList(queryParams.value).then((res) => {
    loading.value = false;
-    console.log(res, "res");
    diseaseList.value = res.data.records;
    total.value = res.data.total;
-    console.log(total.value, "total.value");
+    console.log(total.value, "total.value", res, "res");
  });
 }
 /** 节点单击事件 */
@@ -421,14 +402,7 @@ 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;
@@ -467,22 +441,9 @@ function handleExport() {
    `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;
@@ -522,14 +483,19 @@ function handleAdd() {
 /** 修改按钮操作 */
 function handleUpdate(row) {
  reset();
-  console.log(row, "row");
-  form.value = JSON.parse(JSON.stringify(row));
+  getDiseaseOne(row.id).then((response) => {
+    console.log(response, "responsebbbb", row.id);
+    form.value = response.data;
    form.value.ybFlag == 1
      ? (form.value.ybFlag = true)
      : (form.value.ybFlag = false);
    form.value.ybMatchFlag == 1
      ? (form.value.ybMatchFlag = true)
      : (form.value.ybMatchFlag = false);
+    //  getList();
+  });
+  // console.log(row, "row");
+  // form.value = JSON.parse(JSON.stringify(row));
  open.value = true;
  title.value = "病种编辑";
 }
@@ -543,9 +509,6 @@ function submitForm() {
        ? (form.value.ybMatchFlag = 1)
        : (form.value.ybMatchFlag = 0);
      if (form.value.id != undefined) {
-        // form.value.status
-        //   ? (form.value.statusEnum = "3")
-        //   : (form.value.statusEnum = "2");
        console.log(form.value, "editDisease", form.value.statusEnum);
        editDisease(form.value).then((response) => {
          proxy.$modal.msgSuccess("修改成功");
--- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js
@@ -1,5 +1,4 @@
 import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/openhis";

 // 查询药品目录列表
 export function getMedicationList(query) {
--- a/openhis-ui-vue3/src/views/catalog/medicine/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
@@ -732,7 +732,7 @@ const filterNode = (value, data) => {
 function getMedicationCategoryList() {
  getMedicationCategory().then((response) => {
    console.log(response, "response药品目录分类查询下拉树结构");
-    medicationOptions.value = response.data.medicationCategoryCodeOptions;
+    medicationOptions.value = response.data.medicationCategoryCodeOptions.sort((a, b) => { return parseInt(a.value) - parseInt(b.value) });
    statusFlagOptions.value = response.data.statusFlagOptions;
    domainEnumOptions.value = response.data.domainFlagOptions;
    supplierListOptions.value = response.data.supplierListOptions;