解决合并冲突

openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js

@@ -1,99 +1,106 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
 
 // 查询诊疗目录列表
-export function getDiagnosisTreatmentList(query) {
-  return request({
+export function getDiagnosisTreatmentList (query) {
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/information-page',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
 }
 
 // 查询诊疗目录详细
-export function getDiagnosisTreatmentOne(id) {
-  return request({
+export function getDiagnosisTreatmentOne (id) {
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/information-one/',
     method: 'get',
-    params: { id } // 确保参数正确传递
-  })
+    params: {id}, // 确保参数正确传递
+  });
+}
+// 查询诊疗目录详细
+export function validateActivityEdit (activityId) {
+  return request ({
+    url: '/data-dictionary/diagnosis-treatment/validate-edit',
+    method: 'get',
+    params: {activityId}, // 确保参数正确传递
+  });
 }
-
 // 新增诊疗目录
-export function addDiagnosisTreatment(data) {
-  return request({
+export function addDiagnosisTreatment (data) {
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/information',
     method: 'post',
-    data: data
-  })
+    data: data,
+  });
 }
 
 // 修改诊疗目录
-export function editDiagnosisTreatment(data) {
-  return request({
+export function editDiagnosisTreatment (data) {
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/information',
     method: 'put',
-    data: data
-  })
+    data: data,
+  });
 }
 
 // 诊疗目录分类查询
-export function getDiseaseTreatmentInit() {
-  return request({
+export function getDiseaseTreatmentInit () {
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/init',
-    method: 'get'
-  })
+    method: 'get',
+  });
 }
 
 // 停用诊疗目录
-export function stopDiseaseTreatment(ids) {
-  console.log(ids)
-  return request({
+export function stopDiseaseTreatment (ids) {
+  console.log (ids);
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/information-stop',
     method: 'put',
-    data: ids
-  })
+    data: ids,
+  });
 }
 
 // 启用诊疗目录
-export function startDiseaseTreatment(ids) {
-  console.log(ids)
-  return request({
+export function startDiseaseTreatment (ids) {
+  console.log (ids);
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/information-start',
     method: 'put',
-    data: ids
-  })
+    data: ids,
+  });
 }
 
 // 查询部门树形数据
-export function deptTreeSelect(queryParams) {
-  return request({
+export function deptTreeSelect (queryParams) {
+  return request ({
     url: '/base-data-manage/organization/organization',
     method: 'get',
-    param: queryParams
-  })
+    param: queryParams,
+  });
 }
 // 查询身体部位树形数据
-export function bodyTreeSelect(queryParams) {
-  return request({
+export function bodyTreeSelect (queryParams) {
+  return request ({
     url: '/base-data-manage/body-structure/body',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }
 // 查询地点树形数据
-export function locationTreeSelect(queryParams) {
-  return request({
+export function locationTreeSelect (queryParams) {
+  return request ({
     url: '/base-data-manage/location/location-page-tree',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }
 
 // 获取医用耗材目录
-export function getYbDiagnosisTreatmentList(queryParams) {
-  return request({
+export function getYbDiagnosisTreatmentList (queryParams) {
+  return request ({
     url: '/catalog/page',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }