人员新增信息维护

src/components/settings/permissions/PersonnelInformationEditing.vue

@@ -70,6 +70,20 @@
       <el-form-item prop="ybCode" label="医保">
         <el-input v-model="userInfo.ybCode" clearable></el-input>
       </el-form-item>
+      <el-form-item prop="doctorZy" label="中医处方权">
+        <el-switch v-model="userInfo.doctorZy"
+                   active-color="#ff4949"
+                   active-text="是" :active-value="1"
+                   inactive-color="#13ce66" inactive-text="否" :inactive-value="0"
+        />
+      </el-form-item>
+      <el-form-item prop="doctorYpZl" label="肿瘤药物分级限制">
+
+        <el-select v-model="userInfo.doctorYpZl" style="width: 120px">
+          <el-option v-for="item in peopleAddData.doctorYpZl" :value="item.code" :label="item.name"/>
+        </el-select>
+
+      </el-form-item>
       <el-form-item label="兼诊科室">
         <el-select v-model="userInfo.partTimeDept"
                    multiple

src/utils/public.ts

@@ -2,7 +2,6 @@
 import {xcMessage} from "./xiaochan-element-plus";
 import XEUtils, {isFunction, isObject} from "xe-utils";
 import {useUserStore} from "@/pinia/user-store";
-import {LocationQueryValue} from "vue-router";
 
 export function needRule(...val: number[]) {
     const userRoles = useUserStore().userInfo.roles

src/views/single-page/InpatientBoardV2/BoardInfo.vue

@@ -33,19 +33,27 @@ const {store} = inject(InpatientBoardKey)!
         <BoardCard/>
       </div>
       <div class="右边宽度">
-        <div class="深度边框">
-          <b>护理信息:</b>
-          <div class="护理信息">
-            <dv-scroll-board v-bind="store.dvTableData.huli" class="layout_h-w_max"/>
-          </div>
-        </div>
 
-        <div class="深度边框" style="margin-top: 0.63rem">
-          <b>今日手术:</b>
-          <div class="护理信息">
-            <dv-scroll-board v-bind="store.dvTableData.operation" class="layout_h-w_max"/>
+        <div class="layout_display_flex_y">
+          <div class="深度边框 layout_display_flex_y">
+            <div>
+              <b>护理信息:</b>
+            </div>
+            <div class="layout_display_flex_y">
+              <dv-scroll-board v-bind="store.dvTableData.huli" class="layout_h-w_max"/>
+            </div>
+          </div>
+          <div style="height: 1.1rem"></div>
+          <div class="深度边框 layout_display_flex_y">
+            <div>
+              <b>今日手术:</b>
+            </div>
+            <div class="layout_display_flex_y">
+              <dv-scroll-board v-bind="store.dvTableData.operation" class="layout_h-w_max"/>
+            </div>
           </div>
         </div>
+
       </div>
     </div>
   </div>
@@ -54,12 +62,6 @@ const {store} = inject(InpatientBoardKey)!
 <style lang="scss">
 .info_main {
 
-  .护理信息 {
-    height: 12.50rem;
-    padding-top: 0.63rem;
-    overflow: hidden;
-  }
-
   .右边宽度 {
     width: 23%;
   }
@@ -71,6 +73,8 @@ const {store} = inject(InpatientBoardKey)!
   }
 
   .深度边框 {
+    height: 0;
+    flex: 1;
     border-radius: 0.63rem;
     padding: 0.31rem;
     background-color: #1c2641;

src/views/single-page/InpatientBoardV2/index.ts

@@ -4,11 +4,10 @@ import moment from "moment/moment";
 import {useEventListener} from "@vueuse/core";
 import {documentVisibilityEnum} from "@/utils/cy-use/useChangeToken";
 import {getServerDate} from "@/utils/moment-utils";
-import {selectInpatientBriefs, selectInpatientBriefsV2} from "@/api/dashboard";
+import {selectInpatientBriefsV2} from "@/api/dashboard";
 import router from "@/router";
 import {getAllWards} from "@/api/login";
 import sleep from "@/utils/sleep";
-import {isDev} from "@/utils/public";
 
 
 function getWeek(date: any): string { // 参数时间戳
@@ -135,6 +134,7 @@ export function useInpatientBoard() {
             config: {
                 align: 'left',
                 columnWidth: [200],
+                rowNum: 8,
                 header: ['名称', '数量'],
                 data: [],
             },
@@ -143,7 +143,7 @@ export function useInpatientBoard() {
 
     function setDvTableData(res: any) {
         dvTableData.operation.config.data = []
-        dvTableData.huli.config.data = []
+        dvTableData.huli.config.data = res.huli || []
 
         data.value.forEach(item => {
             if (item.surgery) {
@@ -153,11 +153,11 @@ export function useInpatientBoard() {
 
         })
 
-        for (let key in res.huli) {
-            // @ts-ignore
-            dvTableData.huli.config.data.push([key, res.huli[key]])
-        }
-
+        console.log(res.huli)
+        // for (let key in res.huli) {
+        //     // @ts-ignore
+        //     dvTableData.huli.config.data.push([key, res.huli[key]])
+        // }
 
     }