xiaochan 1 年之前
父節點
當前提交
12b26b763b

+ 0 - 24
src/api/public-api.js

@@ -1,13 +1,6 @@
 import request from '@/utils/request'
 import axios from "axios";
 
-export function getRoleCode() {
-    return request({
-        url: '/publicApi/getRoleCode',
-        method: 'get',
-    })
-}
-
 export function getRenYuan(code, deptCode = '') {
     return request({
         url: '/publicApi/getRenYuan',
@@ -24,7 +17,6 @@ export function getRenYuanPage(code, curPage) {
     })
 }
 
-
 export function getChargeCode(pyCode) {
     return request({
         url: '/publicApi/getChargeCode',
@@ -151,7 +143,6 @@ export function idVerificationApi(idCard) {
     });
 }
 
-
 export function getSystemAnnouncement() {
     return request({
         url: '/getSystemAnnouncement',
@@ -170,21 +161,6 @@ export function getUuid() {
     })
 }
 
-export function getOperationGuide(folderName) {
-    return new Promise((resolve, reject) => {
-        axios({
-            url: 'http://172.16.32.160:8706/publicApi/getOperationGuide',
-            method: 'get',
-            params: {folderName}
-        }).then(res => {
-            resolve(res.data.data)
-        }).catch(err => {
-            reject(err)
-        })
-    })
-}
-
-
 export function getPersonnelAll() {
     return request({
         url: '/publicApi/getPersonnelAll',

+ 4 - 1
src/components/cy/date-range/CyDateRange.vue

@@ -4,6 +4,7 @@ import {listNotBlank} from "@/utils/blank-utils";
 import {DATEFORMAT, elDateRangeAddTime, formatDateToStr} from "@/utils/moment-utils";
 import moment from "moment/moment";
 import XEUtils from "xe-utils";
+import {ComputedRef, WritableComputedRef} from "vue";
 
 const shortcuts = [
   {
@@ -57,10 +58,11 @@ const props = withDefaults(defineProps<{
 const model = defineModel<string[] | object>();
 const isArr = XEUtils.isArray(model)
 
-const dateRange = computed({
+const dateRange: WritableComputedRef<string[]> = computed({
   get() {
     if (isArr) {
       if (listNotBlank(model.value)) {
+        // @ts-ignore
         const [start, end] = model.value;
         return [formatDateToStr(start, DATEFORMAT.DATE), formatDateToStr(end, DATEFORMAT.DATE)]
       }
@@ -85,6 +87,7 @@ const dateRange = computed({
 
 onMounted(() => {
   if (props.shortcutsIndex != null) {
+    // @ts-ignore
     dateRange.value = shortcuts[props.shortcutsIndex].value
   }
 })

+ 1 - 4
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr_control_rule/EmrControlRule.vue

@@ -8,24 +8,21 @@
           active-text="质控时间"
           inactive-text="入院时间"
       />
+      <el-divider direction="vertical"></el-divider>
       <CyDateRange v-model="queryParams"
                    start="startDate"
                    end="endDate"
                    :shortcuts-index="2"/>
-
       <SystemDeptSelect v-model="queryParams.deptCode" clearable placeholder="入院科室"/>
       <SystemStaffSelect v-model="queryParams.approver" clearable placeholder="审核人"/>
-
       <el-button type="primary"
                  @click="querySearch">
         查询质控数据
       </el-button>
-
       <el-button @click="queryScale">
         {{ proportion }} 比例
       </el-button>
     </header>
-
     <div>
       <el-progress :percentage="percentage"/>
     </div>