From f40e0e6935cb229271b72fff14297018f89b91f6 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Mon, 16 Oct 2023 15:01:27 +0800
Subject: [PATCH] mm

---
 src/App.vue                                   | 17 +++++++
 .../basic-dictionary/MedicalReportType.vue    |  2 +-
 src/views/common-settings/ItemType.vue        |  6 +--
 src/views/fee-settings/Asbitem.vue            |  1 +
 src/views/fee-settings/Diagnosis.vue          |  7 +--
 src/views/report/report.vue                   | 42 +++++++++++----
 src/views/user-list/OrganizationUnits.vue     | 51 ++++++++++++++++---
 src/views/user-list/Role.vue                  | 27 +++++++++-
 src/views/user-list/UserList.vue              | 12 +++--
 9 files changed, 132 insertions(+), 33 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 429ca1f..a3140d7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -32,10 +32,27 @@
   // background: rgb(235, 235, 235);
   // opacity: 0.3;
 }
+.addbottom {
+  color: rgb(65, 137, 104);
+}
+.editnottom {
+  color: rgb(65, 137, 104);
+}
+.determinebottom {
+  color: rgb(65, 137, 104);
+}
+.deletebottom {
+  color: rgb(65, 137, 104);
+}
+.cancellationbottom {
+  color: rgb(65, 137, 104);
+}
+
 .bulletcommit {
   background: rgb(203, 236, 226) !important;
   color: rgb(65, 137, 104) !important;
   border: 1px solid rgb(65, 137, 104) !important;
+  border: 2px solid rgb(65, 137, 104);
 }
 .el-dialog__title {
   color: rgb(31, 148, 96) !important;
diff --git a/src/views/basic-dictionary/MedicalReportType.vue b/src/views/basic-dictionary/MedicalReportType.vue
index 9fb74d8..1b847e4 100644
--- a/src/views/basic-dictionary/MedicalReportType.vue
+++ b/src/views/basic-dictionary/MedicalReportType.vue
@@ -57,7 +57,7 @@
             <el-table-column prop="id" label="编号" width="300">
             </el-table-column>
             <el-table-column prop="displayName" label="名称"> </el-table-column>
-            <el-table-column prop="createUserName" label="创建者">
+            <el-table-column prop="creatorName" label="创建者">
             </el-table-column>
             <el-table-column prop="creationTime" label="创建时间" width="180">
               <template slot-scope="scope">
diff --git a/src/views/common-settings/ItemType.vue b/src/views/common-settings/ItemType.vue
index b3adb4c..53e283c 100644
--- a/src/views/common-settings/ItemType.vue
+++ b/src/views/common-settings/ItemType.vue
@@ -32,7 +32,7 @@
             <span slot-scope="{ node, data }">
               <span style="padding: 5px">{{ node.label }}</span>
               <span>
-                 <el-button
+                <el-button
                   type="primary"
                   size="mini"
                   style="padding: 5px; font-size: 15px; margin-left: 10%"
@@ -76,9 +76,9 @@
           width="40%"
           :close-on-click-modal="false"
         >
-          <span  v-if="title==2?true:false">上级部门</span>
+          <span v-if="title == 2 ? true : false">上级部门</span>
           <el-cascader
-           v-if="title==2"
+            v-if="title == 2"
             ref="depref"
             @change="cascaderchang"
             :show-all-levels="false"
diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index ebe1b8e..2b00415 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -1273,6 +1273,7 @@ export default {
   height: 240px;
   border: 1px solid #ccc;
   margin-left: 6%;
+  overflow-y: scroll;
 }
 .Selectbutton {
   margin-left: 3%;
diff --git a/src/views/fee-settings/Diagnosis.vue b/src/views/fee-settings/Diagnosis.vue
index b25ad94..46b480a 100644
--- a/src/views/fee-settings/Diagnosis.vue
+++ b/src/views/fee-settings/Diagnosis.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div style="width: 95%">
-      <el-card class="elcard" style="border-radius: 15px">
+      <el-card class="elcard" style="border-radius: 15px; height: 800px">
         <div class="publiccss">诊断</div>
         <div class="" style="display: flex">
           <div style="margin-left: 5px; margin-top: 15px; width: 15%">
@@ -14,7 +14,7 @@
           <div style="width: 80%">
             <el-table
               :data="tableData"
-              style="width: 100%; margin-top: 20px"
+              style="width: 100%; margin-top: 20px; height: 500px"
               row-key="id"
               class="el-table__body-wrapper tbody"
               @row-click="rowick"
@@ -488,7 +488,7 @@ export default {
       getapi("/api/app/item-type/by-code-all").then((res) => {
         this.projectid = res.data;
         // this.tableData = res.data;
-        
+
         console.log(res);
       });
     },
@@ -599,6 +599,7 @@ export default {
     //删除
     delets(row) {
       this.form = { ...this.curRow };
+      console.log(row);
       if (this.form.id == undefined) {
         this.$message.warning("请选择删除的数据");
       } else {
diff --git a/src/views/report/report.vue b/src/views/report/report.vue
index 0c4b974..e582f55 100644
--- a/src/views/report/report.vue
+++ b/src/views/report/report.vue
@@ -3,17 +3,37 @@
     <el-card>
       <div class="publiccss">体检报告</div>
       <div style="display: flex; margin-top: 20px">
-        <div :style="'display: block; width:' + (window.pageWidth - 120 - 80) + 'px;'">
+        <div
+          :style="
+            'display: block; width:' + (window.pageWidth - 120 - 80) + 'px;'
+          "
+        >
           <PatientRegisterQueryNobtn orgEnable="Y" />
           <div style="display: flex">
-            <div :style="'width:' + Math.floor((window.pageWidth - 120 - 80) * 3 / 4) + 'px;'">
+            <div
+              :style="
+                'width:' +
+                Math.floor(((window.pageWidth - 120 - 80) * 3) / 4) +
+                'px;'
+              "
+            >
               <PatientRegisterListNobtn />
             </div>
-            <div :style="'margin-left: 2px;width:' + Math.floor((window.pageWidth - 120 - 80 - 8) / 4) + 'px;'">
-              <RegisterCheckStatus :patientRegisterId="patientRegister.patientRegisterId"/>
+            <div
+              :style="
+                'margin-left: 2px;width:' +
+                Math.floor((window.pageWidth - 120 - 80 - 8) / 4) +
+                'px;'
+              "
+            >
+              <RegisterCheckStatus
+                :patientRegisterId="patientRegister.patientRegisterId"
+              />
             </div>
           </div>
-          <SumAsbItemStatus :patientRegisterId="patientRegister.patientRegisterId" />
+          <SumAsbItemStatus
+            :patientRegisterId="patientRegister.patientRegisterId"
+          />
         </div>
         <div style="margin-left: 10px; width: 110px">
           <BtnReport />
@@ -57,7 +77,7 @@ export default {
   },
 
   //挂载完成
-  mounted() { },
+  mounted() {},
   computed: {
     ...mapState(["window", "dict", "patientRegister"]),
   },
@@ -183,10 +203,10 @@ export default {
 </script>
 <style scoped>
 /* 表格 表头 列间距控制 */
-::v-deep .el-table th.el-table__cell>.cell{
-  text-align: center;  /* 表格 表头 对齐方式，默认 left */
-  padding-right: 2px;  /* 表格 表头 列间距控制，默认 10px */
-  padding-left: 2px;  /* 表格 表头 列间距控制，默认 10px */
+::v-deep .el-table th.el-table__cell > .cell {
+  text-align: center; /* 表格 表头 对齐方式，默认 left */
+  padding-right: 2px; /* 表格 表头 列间距控制，默认 10px */
+  padding-left: 2px; /* 表格 表头 列间距控制，默认 10px */
 }
 
 /* 表格 表体 首列左间距控制 */
@@ -196,7 +216,7 @@ export default {
 
 /* 表格 行列间距控制 ，默认 10 px*/
 ::v-deep .el-table__cell {
-  padding: 2px 2px 2px 2px;   /* 上，右，下，左 */
+  padding: 2px 2px 2px 2px; /* 上，右，下，左 */
 }
 
 ::v-deep .cell {
diff --git a/src/views/user-list/OrganizationUnits.vue b/src/views/user-list/OrganizationUnits.vue
index 3ca9be8..5726e3c 100644
--- a/src/views/user-list/OrganizationUnits.vue
+++ b/src/views/user-list/OrganizationUnits.vue
@@ -115,10 +115,15 @@
         <el-row>
           <el-col :span="8" style="line-height: 40px">
             是否为体检中心
-            <el-radio-group v-model="form.isPeis">
+            <el-checkbox
+              v-model="isPeis"
+              :checked="isPeis"
+              @change="checkboxchange"
+            ></el-checkbox>
+            <!-- <el-radio-group v-model="form.isPeis">
               <el-radio label="Y">是</el-radio>
               <el-radio label="N">否</el-radio>
-            </el-radio-group>
+            </el-radio-group> -->
             <!-- <el-radio v-model="form.isPeis" label="Y">是</el-radio>
             <el-radio v-model="form.isPeis" label="N">否</el-radio> -->
           </el-col>
@@ -132,7 +137,10 @@
         </el-row>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="organizationtreeaddoredit" class="bulletcommit"
+          <el-button
+            type="primary"
+            @click="organizationtreeaddoredit"
+            class="bulletcommit"
             >确 定</el-button
           >
         </span>
@@ -152,6 +160,7 @@ export default {
   data() {
     return {
       showcheckbox: false,
+      isPeis: true,
       defaultKeys: [],
       selecttable: [], //科室的选择选中
       form: {
@@ -183,6 +192,14 @@ export default {
     this.getonorganization();
   },
   methods: {
+    checkboxchange(v) {
+      if (v == true) {
+        this.form.isPeis = "Y";
+      } else {
+        this.form.isPeis = "N";
+      }
+      console.log(this.isPeis);
+    },
     cascaderchang(v) {
       console.log(this.departmentname);
       this.departmentnames = v[v.length - 1];
@@ -207,7 +224,7 @@ export default {
     closethebulletbox() {
       this.dialogVisible = false;
       this.form = {};
-      this.form.isPeis = "N";
+      // this.form.isPeis = "N";
     },
     //确定新增或者编辑
     organizationtreeaddoredit() {
@@ -266,7 +283,7 @@ export default {
             this.dialogVisible = false;
             // this.form = {};
             this.form.displayName = "";
-            this.form.isPeis = "N";
+            // this.form.isPeis = "N";
             this.getonorganization();
           });
         }
@@ -324,6 +341,8 @@ export default {
         console.log(this.form);
       }
 
+      // 弹出是这里打开的不编辑哪里  那个事件是打开弹出的
+
       // if(this.natureoptions)
       // console.log(node, data);
       // if (this.natureoptions.length == 0) {
@@ -373,8 +392,16 @@ export default {
         console.log(data);
       });
     },
-    //编辑组织
+    //编辑组织这里
     rena(node, data) {
+      console.log(data, "11111111111111111");
+
+      if (data.parentId == null) {
+        this.isPeis = true;
+      } else {
+        this.isPeis = false;
+      }
+
       let a = this.$refs.tree.getNode(data.id).parent.data.displayName;
       if (a == undefined) {
         this.departmentname = "已是最上级";
@@ -391,11 +418,19 @@ export default {
       this.title = 2;
       console.log(this.form.isPeis);
       // this.selecttable.push(data);
-      
+
       this.showcheckbox = true;
       this.form = data;
       this.form.isPeis = "N";
-      // console.log(this.selecttable, 5555);
+
+      this.isPeis = false;
+      //体检中心
+      getapi(`/api/app/organization-units?Id=${data.id}`).then((res) => {
+        if (res.data.isPeis == "Y") {
+          this.isPeis = true;
+        }
+        // console.log(res,'查询');
+      });
       getapi(
         `/api/app/organizationunit/getbycodeparent?OrganizationUnitId=${data.id}`
       ).then((res) => {
diff --git a/src/views/user-list/Role.vue b/src/views/user-list/Role.vue
index a1c3be5..90a6983 100644
--- a/src/views/user-list/Role.vue
+++ b/src/views/user-list/Role.vue
@@ -9,7 +9,7 @@
         :data="tableData"
         style="width: 100%; margin-top: 10px"
         border=""
-        height="500"
+        :height="tableHeight"
       >
         <el-table-column prop="name" label="角色名称" width="180">
         </el-table-column>
@@ -134,7 +134,12 @@
         </el-form>
         <span slot="footer" class="dialog-footer">
           <el-button @click="adddialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="Confirmaddition" class="bulletcommit">确 定</el-button>
+          <el-button
+            type="primary"
+            @click="Confirmaddition"
+            class="bulletcommit"
+            >确 定</el-button
+          >
         </span>
       </el-dialog>
     </el-card>
@@ -154,6 +159,8 @@ import { getapi } from "@/api/api";
 export default {
   data() {
     return {
+      tableHeight: window.innerHeight - 220, //表格动态高度
+      screenHeight: window.innerHeight, //内容区域高度
       allChecked: false, //所有权限
       allIndeterminate: false,
       allCheckedLength: 0,
@@ -190,6 +197,22 @@ export default {
   created() {
     this.getbolkeall();
   },
+  mounted() {
+    window.onresize(() => {
+      return (() => {
+        // window.innerHeight:浏览器的可用高度
+        window.screenHeight = window.innerHeight;
+        this.screenHeight = window.screenHeight;
+      })();
+    });
+  },
+  watch: {
+    // 监听screenHeight从而改变table的高度
+    screenHeight(val) {
+      this.screenHeight = val;
+      this.tableHeight = this.screenHeight - 220;
+    },
+  },
   methods: {
     //新增角色弹框
     newlyincreased() {
diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue
index ddb29a2..78c47c5 100644
--- a/src/views/user-list/UserList.vue
+++ b/src/views/user-list/UserList.vue
@@ -391,7 +391,7 @@
               >
               </el-tree> -->
             </el-tab-pane>
-            <el-tab-pane label="科室设置">
+            <el-tab-pane label="科室操作权限">
               <el-tree
                 :data="newdepartment"
                 show-checkbox
@@ -692,14 +692,16 @@ export default {
     handleNodeClick(data) {
       this.department = data.displayName;
       console.log(this.department);
-      getapi(`/api/identity/users/getlistinorganizationunit?OrganizationUnitId=${data.id}`).then(res=>{
+      getapi(
+        `/api/identity/users/getlistinorganizationunit?OrganizationUnitId=${data.id}`
+      ).then((res) => {
         console.log(res);
-        this.tableData=res.data
-      })
+        this.tableData = res.data;
+      });
     },
     iscrentddepartment() {
       this.department = this.$refs.department.getCheckedKeys(true);
-      console.log(this.department, "www");
+      console.log(this.department, "wwww");
     },
     //修改密码确定按钮
     Changepassword() {