Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

src/components/settings/AddUser.vue

@@ -97,7 +97,7 @@ const save = () => {
       return;
     }
     // 如果验证通过，发送请求
-    post("setting/user/save", {userInfo: userInfo.value}).then((res: any) => {
+    post(API."setting/user/save", {userInfo: userInfo.value}).then((res: any) => {
         formDataRef.value?.resetFields();
         close()
     });

src/components/settings/ListChild.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import {onMounted, ref} from 'vue'
 import {post} from "@/utils/request";
+import {API} from "@/assets/config/API.ts";
 
 const emit = defineEmits(['selected', 'close'])
 const handleSelectionChange = (val: any) => {
@@ -8,7 +9,7 @@ const handleSelectionChange = (val: any) => {
 }
 const datalist = ref<any>([])
 const initData = () => {
-  post('item/list', {page: 1, size: 20}).then((res: any) => {
+  post(API.Item.Base.List, {page: 1, size: 20}).then((res: any) => {
     datalist.value = res.list
   })
 }

src/components/settings/MemberEdit.vue

@@ -131,11 +131,9 @@
 <script setup lang="ts">
 import {defineProps, defineEmits, ref, onMounted} from 'vue'
 import {post} from "@/utils/request.ts";
-import {loadConfig} from "@/utils/config.ts";
 import UpLoad from "@/components/UpLoad.vue";
 import {ElMessage} from 'element-plus'
 import Mask from "@/components/common/Mask.vue";
-import {apiConfig} from "@/assets/config/apiConfig.ts";
 import {API} from "@/assets/config/API.ts";
 
 const ganderOptions = [
@@ -296,12 +294,12 @@ onMounted(() => {
 })
 const sectionList = ref<any>([])
 const list = () => {
-  post('organization/section/allList').then((res: any) => {
+  post(API.Organization.Section.AllList).then((res: any) => {
     sectionList.value = res
   })
 }
 const deleteDetail = () => {
-  post("organization/member/delete", {id: memberInfo.value.id}).then(() => {
+  post(API.Organization.Member.Del, {id: memberInfo.value.id}).then(() => {
     exit()
     ElMessage.error('已删除');
   })

src/components/settings/Search.vue

@@ -55,6 +55,7 @@
 import {onMounted, ref, defineProps} from "vue";
 import {post} from '@/utils/request.ts'
 import Mask from "@/components/common/Mask.vue";
+import {API} from "@/assets/config/API.ts";
 
 let current_search_data: any = null;
 let keyword = ref('');
@@ -140,7 +141,7 @@ let confirm = () => {
 let isloading = ref(false);
 let search_social = () => {
   isloading.value = true;
-  post("social/directory/search", {
+  post(API.Social.Directory.Search, {
     keyword: keyword.value,
   }, {catch_error: true}).then((res: any) => {
     init_search_data()

src/components/settings/SectionEdit.vue

@@ -129,6 +129,7 @@ import {post} from "@/utils/request.ts";
 import depts from "@/assets/config/directory/depts.json"
 import Mask from "@/components/common/Mask.vue";
 import {ElMessage} from "element-plus";
+import {API} from "@/assets/config/API.ts";
 
 // do not use same name with ref
 const props = defineProps({
@@ -208,12 +209,12 @@ const save = () => {
   formRef.value.validate((valid: any) => {
     if (valid) {
       if (props.id) {
-        post("organization/section/edit", {data: form.value}).then((res) => {
+        post(API.Organization.Section.Edit, {data: form.value}).then((res) => {
           exit()
           ElMessage.success('已修改')
         })
       } else {
-        post("organization/section/add", {data: form.value}).then((res) => {
+        post(API.Organization.Section.Add, {data: form.value}).then((res) => {
           exit()
           ElMessage.success('已添加')
         })
@@ -237,13 +238,13 @@ const options = Object.entries(depts).map(([key, value]) => {
 });
 const init = (id: any) => {
   form.value = {}
-  post("organization/section/getById", {id}).then((res: any) => {
+  post(API.Organization.Section.Get, {id}).then((res: any) => {
     form.value = res
   })
 
 }
 const deleteDetail = () => {
-  post("organization/section/delete", {id: props.id}).then((res: any) => {
+  post(API.Organization.Section.Del, {id: props.id}).then((res: any) => {
     exit()
     ElMessage.error('已删除');
   })

src/components/settings/item/ItemEdit.vue

@@ -76,6 +76,7 @@ import Mask from "@/components/common/Mask.vue";
 import ItemSearch from "@/components/settings/item/ItemSearch.vue";
 import UnitSelector from "@/components/UnitSelector.vue";
 import {itemUnitList} from "@/utils/unitList.ts"
+import {API} from "@/assets/config/API.ts";
 
 const props = defineProps({
   id: {
@@ -120,23 +121,12 @@ const save = () => {
       return;
     }
     // 如果验证通过，发送请求
-    if (props.add) {
+    if (id) {
-      if (props.menuId) {
+      post(API.Item.Base.Edit, {data: form.value}).then(() => {
-        form.value.name = form.value.itemName
-        post('save', {data: form.value, id: props.menuId}).then(() => {
-          close()
-        })
-      } else {
-        post('save', {data: form.value}).then(() => {
-          close()
-        })
-      }
-    } else if (id) {
-      post("item/edit", {data: form.value}).then(() => {
         close()
       })
     } else {
-      post("item/add", {data: form.value}).then(() => {
+      post(API.Item.Base.Add, {data: form.value}).then(() => {
         close()
       })
     }
@@ -160,7 +150,7 @@ const createConfirm = (data: any) => {
 
 }
 const deleteDetail = () => {
-  post("item/delete", {id: props.id}).then((res: any) => {
+  post(API.Item.Base.Del, {id: props.id}).then((res: any) => {
     ElMessage.success('删除成功')
     close()
   })
@@ -172,7 +162,7 @@ onMounted(() => {
 const init = () => {
   isShow.value = true
   if (props.id) {
-    post("item/getItemById", {id: props.id}).then((res: any) => {
+    post(API.Item.Base.Get, {id: props.id}).then((res: any) => {
       form.value = res
     })
   }

src/components/settings/item/ItemSearch.vue

@@ -45,6 +45,7 @@
 import {onMounted, ref, defineProps} from "vue";
 import {post} from '@/utils/request.ts'
 import Mask from "@/components/common/Mask.vue";
+import {API} from "@/assets/config/API.ts";
 
 let curItem: any = null;
 let keyword = ref('');
@@ -100,7 +101,7 @@ let confirm = () => {
 let isloading = ref(false);
 let searchSocialItem = () => {
   isloading.value = true;
-  post("social/directory/itemSearch", {
+  post(API.Social.Directory.ItemSearch, {
     keyword: keyword.value, pageSize: 20, pageNum: searchResult.value.pageNum
   }, {catch_error: true}).then((res: any) => {
     searchResult.value.totalPage = res.total_page;

src/components/settings/item/group/GroupAdd.vue

@@ -103,6 +103,7 @@ const createSearchRef = ref<any>('')
 import {itemUnitList} from "@/utils/unitList.ts"
 import UnitSelector from "@/components/UnitSelector.vue";
 import {post} from "@/utils/request.ts";
+import {API} from "@/assets/config/API.ts";
 
 const isShow = ref<any>(false)
 const list = ref<any[]>([])
@@ -113,7 +114,7 @@ const init = (row: any) => {
   list.value = []
   if (row != null) {
     id.value = row.id
-    post("item/getGroup",{id: row.id}).then((res: any)=>{
+    post(API.Item.Base.GetGroup,{id: row.id}).then((res: any)=>{
       form.value={...res.info}
       console.log(form.value)
       list.value = res.list
@@ -163,7 +164,7 @@ const calculateTotalPrices = () => {
   form.value.unitPrice = totalPrice.toFixed(2);
 };
 const save = () => {
-  post("item/saveGroup",{info: form.value,list:list.value}).then(
+  post(API.Item.Base.SaveGroup,{info: form.value,list:list.value}).then(
       ()=>{
         close()
       }

src/components/settings/item/group/GroupList.vue

@@ -53,6 +53,7 @@ import {post} from '@/utils/request.ts'
 import Mask from "@/components/common/Mask.vue";
 import GroupAdd from "@/components/settings/item/group/GroupAdd.vue";
 import {ElMessage, ElMessageBox} from "element-plus";
+import {API} from "@/assets/config/API.ts";
 
 let current_page = ref(1)
 const show = ref(false);
@@ -62,7 +63,7 @@ const deleteGroup = (row: any) => {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
   }).then(() => {
-    post("item/deleteGroup", {id: row.id}).then((res: any) => {
+    post(API.Item.Base.DeleteGroup., {id: row.id}).then((res: any) => {
       init();
     })
   }).catch((err) => {
@@ -73,7 +74,7 @@ const deleteGroup = (row: any) => {
 }
 const init = () => {
 
-  post("item/groupList", {
+  post(API.Item.Base.GroupList, {
     page: current_page.value,
     size: 10,
   }).then((res: any) => {

src/components/statistics/over/Revenue.vue

@@ -211,7 +211,7 @@ const getDateRange = () => {
 }
 const initChart = () => {
   const date = getDateRange()
-  post('statistics/getRevenueOverview', {
+  post(API.Statistics.Base.GetRevenueOverview, {
     beginTime: date.begin,
     endTime: date.end
   }).then((res: any) => {

src/views/settings/index.vue

@@ -53,6 +53,7 @@ import {post} from "@/utils/request.ts";
 import Panel from "@/components/common/Panel.vue";
 import UpLoad from "@/components/UpLoad.vue";
 import {loadConfig} from "@/utils/config.ts";
+import {API} from "@/assets/config/API.ts";
 
 const ruleFormRef = ref<FormInstance>()
 const ruleForm = reactive<any>({
@@ -68,7 +69,7 @@ const ruleForm = reactive<any>({
 })
 const uploadRef = ref<any>()
 onMounted(async () => {
-  post("common/config/list", null).then((list: any) => {
+  post(API.Common.Config.List, null).then((list: any) => {
     for (let i = 0; i < list.length; i++) {
       ruleForm[list[i].k] = list[i].val
     }
@@ -88,7 +89,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
   await formEl.validate((valid) => {
     if (valid) {
-      post("common/config/edit", ruleForm).then((res: any) => {
+      post(API.Common.Config.Edit, ruleForm).then((res: any) => {
         ElMessage.success("保存成功")
       })
     }
@@ -108,7 +109,7 @@ const options = Array.from({length: 10000}).map((_, idx) => ({
 const uploadURL = ref<any>()
 const uploadSuccess = (url: any) => {
   ruleForm.logoUrl = url
-  post("common/config/edit", ruleForm).then(() => {
+  post(API.Common.Config.Edit, ruleForm).then(() => {
     ElMessage.success("保存图片成功")
   })
 }

src/views/settings/item.vue

@@ -84,6 +84,7 @@ import ItemEdit from "@/components/settings/item/ItemEdit.vue";
 import GroupList from "@/components/settings/item/group/GroupList.vue";
 import {formatDate} from "@/utils/dateUtils.ts";
 import {Plus} from "@element-plus/icons-vue"
+import {API} from "@/assets/config/API.ts";
 
 
 const isOpenGroup = ref();
@@ -98,7 +99,7 @@ const rowClick = ((row: any) => {
 
 const tableData = ref<any>([])
 const initData = () => {
-  post('item/list', {pageNum: page.value, pageSize: pageSize.value, ...search.value}).then((res: any) => {
+  post(API.Item.Base.List, {pageNum: page.value, pageSize: pageSize.value, ...search.value}).then((res: any) => {
     tableData.value = res.list
     total.value = res.total_count
   })

src/views/settings/log.vue

@@ -61,6 +61,7 @@ import {post} from '@/utils/request.ts'
 import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts";
 import {CopyDocument} from "@element-plus/icons-vue";
 import {ElMessage} from "element-plus";
+import {API} from "@/assets/config/API.ts";
 
 const tableData = ref<any>([])
 onMounted(() => {
@@ -85,7 +86,7 @@ const getData = () => {
     beginTime: selectedDate.value ? selectedDate.value[0] : null,
     endTime: selectedDate.value ? selectedDate.value[1] : null
   }
-  post("common/log/page", {query: params}).then((res: any) => {
+  post(API.Common.Log.List, {query: params}).then((res: any) => {
     tableData.value = res.list
     total.value = res.total_count
   })

src/views/settings/member.vue

@@ -138,7 +138,7 @@ const roleList = [
 ]
 const init = (() => {
   isShow.value = false
-  post('organization/member/list ', {page: page.value, size: pageSize.value, ...search.value}).then((res: any) => {
+  post(API.Organization.Member.List, {page: page.value, size: pageSize.value, ...search.value}).then((res: any) => {
     tableData.value = res.list
     total.value = res.total_count
     list()

src/views/settings/print.vue

@@ -25,6 +25,7 @@ import {post} from "@/utils/request.ts";
 import {useWsStore} from "@/stores/wsStore.ts";
 import type {Request, Response} from "@/utils/ws.ts";
 import {ElMessage} from "element-plus";
+import {API} from "@/assets/config/API.ts";
 
 const pageTypes = [
   {
@@ -43,12 +44,12 @@ const printConfig= ref<any>({
 
 
 const save = () => {
-  post("common/config/savePrinter", {printConfig:printConfig.value}).then((res:any)=>{
+  post(API.Common.Config.SavePrinter, {printConfig:printConfig.value}).then((res:any)=>{
     ElMessage.success("保存成功")
   })
 }
 const getPrintConfig = () => {
-  post("common/config/getPrintConfig").then((res:any)=>{
+  post(API.Common.Config.GetPrintConfig).then((res:any)=>{
     printConfig.value.printName=res.printName
     printConfig.value.pageType=res.pageType
   })

src/views/settings/section.vue

@@ -84,6 +84,7 @@ import {post} from "@/utils/request.ts";
 import deptsObj from '@/assets/config/directory/depts.json'
 import {formatDate} from '@/utils/dateUtils.ts'
 import {Plus} from "@element-plus/icons-vue";
+import {API} from "@/assets/config/API.ts";
 
 const id = ref<any>("")
 const tableData = ref<any>([])
@@ -107,7 +108,7 @@ interface Dept {
 
 const init = () => {
   id.value = ''
-  post('organization/section/list', {
+  post(API.Organization.Section.List, {
     page: page.value,
     size: pageSize.value, ...search.value
   }).then((res: any) => {

src/views/social/directory.vue

@@ -343,7 +343,7 @@ const update1318 = (current_page: number) => {
   if (current_page == 1) {
     tip.value = "开始更新第1页"
   }
-  post('social/directory_limit/get_page', {
+  post(API.Social.Directory_limit.Get_page, {
     updt_time: updt_time.value,
     page: current_page
   }).then((res: any) => {
@@ -365,7 +365,7 @@ const update1319 = (current_page: number) => {
   if (current_page == 1) {
     tip.value = "开始更新第1页"
   }
-  post('social/directory_self/get_page', {
+  post(API.Social.Directory_self.Get_page, {
     updt_time: updt_time.value,
     page: current_page
   }).then((res: any) => {