xiaochan 1 년 전
부모
커밋
f517397f53

+ 3 - 3
src/api/base-data/report-center.ts

@@ -40,7 +40,7 @@ export function deleteById(id: string) {
     })
 }
 
-export function modifyTheFileName(data: { id: string, name: string }) {
+export function modifyTheFileName(data: { id: string, name: string , type : string }) {
     return request({
         url: '/magicReportCenter/modifyTheFileName',
         method: 'POST',
@@ -48,7 +48,7 @@ export function modifyTheFileName(data: { id: string, name: string }) {
     })
 }
 
-export function saveTheFile(data) {
+export function saveTheFile(data: any) {
     return request({
         url: '/magicReportCenter/saveTheFile',
         method: 'POST',
@@ -73,7 +73,7 @@ export function getPermissionsByUserCode(userCode: string) {
     })
 }
 
-export function setPermissions(data) {
+export function setPermissions(data: any) {
     return request({
         url: '/magicReportCenter/setPermissions',
         method: 'POST',

+ 1 - 2
src/views/clinic/chronicDisease/ChronicDiseaseSearch.vue

@@ -75,9 +75,8 @@ import PageLayer from '@/layout/PageLayer.vue'
 import store from '@/store'
 import {shortcuts, seltYearAndNowLast} from '@/data/shortcuts'
 import {formatDate, getDateRangeFormatDate} from '@/utils/date'
-import {ElMessage, ElMessageBox} from 'element-plus'
+import {ElMessage} from 'element-plus'
 import {selectChronicDisease, getCrmDictionary} from "@/api/chronic-disease/chronic-disease"
-import DeptInformation from '@/views/dictionary/personnel/DeptInformation.vue'
 import {Export} from '@/utils/ExportExcel'
 import {clone} from '@/utils/clone'
 import router from "@/router";

+ 5 - 37
src/views/data-base/page-editor-help-v2/components/left-sidebar/PageTree.vue

@@ -3,10 +3,11 @@ import {onMounted, ref} from "vue";
 import {
   deleteById,
   fileSave,
-  folderSave, getPermissionsByUserCode,
+  folderSave,
+  getPermissionsByUserCode,
   getReportCenterTree,
   modifyTheFileName,
-  move, setPermissions
+  move
 } from "@/api/base-data/report-center";
 import {CyMessageBox} from "@/components/cy/message-box";
 import {SaveFile} from "@/api/base-data/type/magic-api";
@@ -23,8 +24,6 @@ import type {
 } from 'element-plus/es/components/tree/src/tree.type'
 import CyAutoSize from "@/components/cy/auto-size/cy-auto-size.vue";
 import {useElementSize} from "@vueuse/core";
-import XcComboGridV2 from "@/components/xiao-chan/combo-grid/XcComboGridV2.vue";
-import {getRenYuan} from "@/api/public-api";
 
 enum FILE_ENUM {
   FILE = 0,
@@ -45,19 +44,10 @@ const treeData = ref([])
 const treeRef = useCompRef(ElTree)
 const mousePosition = ref()
 const inputValue = ref('')
-const personnelList = ref([])
-const userCode = ref('')
-
 const headerRef = ref()
 
 const {height: headerHeight} = useElementSize(headerRef)
 
-const personnel = [
-  {label: '编码', prop: 'code', width: 70},
-  {label: '名称', prop: 'name', width: 80},
-  {label: '科室', prop: 'deptName', width: 92},
-  {label: '级别', prop: 'empTitName', width: 105},
-]
 
 function generateRandomPath() {
   const characters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
@@ -107,9 +97,9 @@ return {
 }`,
       pageJson: createFile()
     }
-    const save = await fileSave(data)
+    await fileSave(data)
   } else {
-    const folder = await folderSave({name: res.value, path, parentId, type: 'api'})
+    await folderSave({name: res.value, path, parentId, type: 'api'})
   }
   queryData()
 }
@@ -212,20 +202,9 @@ function rowClick(row) {
   })
 }
 
-function saveClick() {
-  const halfCheckKeys = treeRef.value.getHalfCheckedKeys()
-  const checkedKeys = treeRef.value.getCheckedKeys()
-  let temp = [...checkedKeys, ...halfCheckKeys]
-  setPermissions({userCode: userCode.value, ids: temp})
-}
 
 onMounted(() => {
   queryData()
-  if (props.editor) {
-    getRenYuan('').then(res => {
-      personnelList.value = res
-    })
-  }
 })
 </script>
 
@@ -239,17 +218,6 @@ onMounted(() => {
             <el-button @click="createANewReport(FILE_ENUM.FOLDER)"> 文件夹</el-button>
             <el-button @click="createANewReport(FILE_ENUM.FILE)">文件</el-button>
           </el-button-group>
-          <br/>
-          <xc-combo-grid-v2 width="120px"
-                            v-model="userCode"
-                            filterable
-                            select
-                            @rowClick="rowClick"
-                            clearable
-                            :table-header="personnel"
-                            :data="personnelList"/>
-          <el-divider direction="vertical"/>
-          <el-button type="primary" @click="saveClick">保存</el-button>
         </div>
         <div>
           <el-input placeholder="搜索报表" @input="handleInputChange" v-model="inputValue"/>

+ 26 - 3
src/views/hospitalization/zhu-yuan-yi-sheng/PatientInformationInquiry.vue

@@ -81,6 +81,7 @@
         <el-form-item>
           <el-button @click="queryClick" type="primary">查询</el-button>
           <el-button @click="reset" type="warning">重置</el-button>
+          <el-button @click="exportClick" type="success">导出</el-button>
         </el-form-item>
       </el-form>
     </template>
@@ -151,10 +152,12 @@ import {
 } from "@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/emr-init";
 import {subtractTime} from "@/utils/date";
 import {getServerDateApi} from "@/api/public-api";
-import {ref, onMounted,onActivated} from 'vue'
+import {ref, onMounted, onActivated} from 'vue'
 import {userInfoStore} from "@/utils/store-public";
 import router from "@/router";
 import sleep from "@/utils/sleep";
+import {Export} from '@/utils/ExportExcel'
+
 const param = ref({
   patNo: '',
   name: '',
@@ -182,8 +185,8 @@ const empList = ref([])
 
 onActivated(async () => {
   const params = router.currentRoute.value.query
-  console.log('params',params)
-  if (params && params.patNo ) {
+  console.log('params', params)
+  if (params && params.patNo) {
     param.value.patNo = params.patNo
     param.value.name = ''
     param.value.leaveHospital = false
@@ -246,6 +249,26 @@ const openEmr = async (data) => {
   }
 }
 
+const title = {
+  inpatientNo: '住院号',
+  admissTimes: '住院次数',
+  bedNo: '床位',
+  name: '姓名',
+  admissDate: '入院时间',
+  disDate: '出院时间',
+  admissWardName: '入院病区',
+  zkWardName: '小科室',
+  tempAge: '年龄',
+  responceName: '医保身份',
+  totalCharge: '总费用',
+  balance: '余额',
+  admissDiagStr: '入院诊断',
+}
+
+function exportClick() {
+  Export(patInfoList.value, title, '患者信息')
+}
+
 onMounted(async () => {
   getHospWardAndDept().then(res => {
     deptWardList.value = res

+ 1 - 1
src/views/settings/permissions/RoleMenuSettings.vue

@@ -4,7 +4,7 @@
       <el-input style="width: 200px" v-model="searchRoleContent" placeholder="请输入角色名称"></el-input>
       <el-divider direction="vertical"></el-divider>
       <el-button type="primary" icon="Upload" @click="beforeSaveMenus">
-        {{ tabsVal === 'first' ? "菜单" : "报表" }}
+        {{ tabsVal === 'first' ? "菜单保存" : "报表保存" }}
       </el-button>
     </template>
     <template #main>

+ 46 - 0
tsconfig.json

@@ -0,0 +1,46 @@
+{
+  "compilerOptions": {
+    "types": [
+      "vue/ref-macros"
+    ],
+    "noEmit": true,
+    "allowJs": true,
+    "target": "esnext",
+    "useDefineForClassFields": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "strict": true,
+    "jsx": "preserve",
+    "sourceMap": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "experimentalDecorators": true,
+    "lib": [
+      "esnext",
+      "dom"
+    ],
+    "baseUrl": "./",
+    "paths": {
+      "@": [
+        "src"
+      ],
+      "@/*": [
+        "src/*"
+      ]
+    },
+    "skipLibCheck": true
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.d.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.node.json"
+    }
+  ]
+}
+

+ 8 - 0
tsconfig.node.json

@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "module": "esnext",
+    "moduleResolution": "node"
+  },
+  "include": ["vite.config.ts"]
+}