From eb9e7b4dc4afd96efe09f14672e77f7013cd7370 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Mon, 4 Sep 2023 14:39:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  3 +
 src/assets/css/global.css                     |  3 +
 src/assets/stayle.css                         |  0
 src/views/Home.vue                            |  2 +-
 src/views/common-settings/ItemType.vue        | 35 ++++++---
 src/views/common-settings/SampleGroup.vue     | 24 ++++--
 src/views/fee-settings/Asbitem.vue            | 19 ++++-
 src/views/fee-settings/Diagnosis.vue          | 26 ++++---
 src/views/fee-settings/DiagnosisTemplate.vue  | 12 +--
 src/views/fee-settings/ItemResultTemplate.vue | 14 ++--
 src/views/user-list/OrganizationUnits.vue     | 77 +++++++++++++++----
 src/views/user-list/Role.vue                  | 13 +++-
 src/views/workload/tollcollector.vue          | 15 +++-
 13 files changed, 181 insertions(+), 62 deletions(-)
 create mode 100644 src/assets/stayle.css

diff --git a/src/App.vue b/src/App.vue
index dbf12fa..ebd9e77 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,6 +9,9 @@
 </template>
 
 <style lang="scss">
+.publiccss{
+  font-size: 18px;
+}
 * {
   margin: 0;
   padding: 0;
diff --git a/src/assets/css/global.css b/src/assets/css/global.css
index 42871c3..396757b 100644
--- a/src/assets/css/global.css
+++ b/src/assets/css/global.css
@@ -8,4 +8,7 @@
 
 .el-table .purple-row {
   background: rgb(255, 0, 255);
+}
+.publicfontsize{
+  font-size: 18px;
 }
\ No newline at end of file
diff --git a/src/assets/stayle.css b/src/assets/stayle.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/Home.vue b/src/views/Home.vue
index a498a9b..6f6fffd 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -8,7 +8,7 @@
             <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link">用户权限管理</span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="organization-units">组织架构</el-dropdown-item>
+                <el-dropdown-item command="organization-units">科室设置</el-dropdown-item>
                 <el-dropdown-item command="role">角色管理</el-dropdown-item>
                 <el-dropdown-item command="user-list">用户管理</el-dropdown-item>
                 <el-dropdown-item command="audit-log">安全日志</el-dropdown-item>
diff --git a/src/views/common-settings/ItemType.vue b/src/views/common-settings/ItemType.vue
index e726010..c7bb9d7 100644
--- a/src/views/common-settings/ItemType.vue
+++ b/src/views/common-settings/ItemType.vue
@@ -62,14 +62,13 @@
           :title="title == 1 ? '新增' : '修改'"
           :visible.sync="dialogVisible"
           width="40%"
-            :close-on-click-modal="false"
+          :close-on-click-modal="false"
         >
           <el-form
             :model="form"
             label-width="80px"
             :rules="rules"
             ref="ruleForm"
-             
           >
             <el-row>
               <el-col :span="12">
@@ -285,9 +284,23 @@ export default {
     },
     // 删除
     deleates(node, data) {
-      projecteditid(data.id).then((res) => {
-        this.$message.success("删除成功");
-        this.getlist();
+      // projecteditid(data.id).then((res) => {
+      //   this.$message.success("删除成功");
+      //   this.getlist();
+      // });
+      this.$confirm("是否删除, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        projecteditid(data.id).then((res) => {
+          if (res.code == 1) {
+            this.$message.success("删除成功");
+            this.getlist();
+          }else{
+           
+          }
+        });
       });
       console.log(node, data);
     },
@@ -296,9 +309,9 @@ export default {
       this.form = {};
       this.form.parentId = data.id;
       this.dialogVisible = true;
-      this.$nextTick(()=>{
-        this.$refs.refinput.focus()
-      })
+      this.$nextTick(() => {
+        this.$refs.refinput.focus();
+      });
       basicsetings().then((res) => {
         this.guideoptions = res.data.items;
       });
@@ -311,9 +324,9 @@ export default {
       this.form = {};
       this.dialogVisible = true;
       this.title = 1;
-      this.$nextTick(()=>{
-        this.$refs.refinput.focus()
-      })
+      this.$nextTick(() => {
+        this.$refs.refinput.focus();
+      });
       basicsetings().then((res) => {
         console.log(res);
         this.guideoptions = res.data.items;
diff --git a/src/views/common-settings/SampleGroup.vue b/src/views/common-settings/SampleGroup.vue
index 613db82..0980a9d 100644
--- a/src/views/common-settings/SampleGroup.vue
+++ b/src/views/common-settings/SampleGroup.vue
@@ -4,7 +4,8 @@
       <el-card style="height: 800px">
         <el-table
           :data="tableData"
-          width="100%" height="350px"
+          width="100%"
+          height="350px"
           v-loading="loading"
           row-key="id"
           class="el-table__body-wrapper tbody"
@@ -610,11 +611,24 @@ export default {
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
-        barcodedeleteid(this.form.id).then((res) => {
-          console.log(res);
-          this.$message.success("删除成功");
-          this.getlist();
+        this.$confirm("是否确认删除, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          barcodedeleteid(this.form.id).then((res) => {
+            console.log(res);
+            if (res.code == 0) {
+              this.$message.success("删除成功");
+              this.getlist();
+            }
+          });
         });
+        // barcodedeleteid(this.form.id).then((res) => {
+        //   console.log(res);
+        //   this.$message.success("删除成功");
+        //   this.getlist();
+        // });
       }
     },
     //编辑弹框
diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index b05e16b..fc6bbbe 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -1053,10 +1053,23 @@ export default {
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
-        deletescombinationprojectid(this.form.id).then((res) => {
-          this.$message.success("删除成功");
-          this.getlist();
+        this.$confirm("是否确认删除, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          deletescombinationprojectid(this.form.id).then((res) => {
+            console.log(res);
+            if (res.code == 1) {
+              this.$message.success("删除成功");
+              this.getlist();
+            }
+          });
         });
+        // deletescombinationprojectid(this.form.id).then((res) => {
+        //   this.$message.success("删除成功");
+        //   this.getlist();
+        // });
       }
     },
     //编辑弹框
diff --git a/src/views/fee-settings/Diagnosis.vue b/src/views/fee-settings/Diagnosis.vue
index 8f266fe..ea51bf1 100644
--- a/src/views/fee-settings/Diagnosis.vue
+++ b/src/views/fee-settings/Diagnosis.vue
@@ -140,7 +140,7 @@
         :title="title == 1 ? '新增' : '编辑'"
         :visible.sync="dialogVisible"
         width="75%"
-          :close-on-click-modal="false"
+        :close-on-click-modal="false"
       >
         <el-form ref="form" :model="form" label-width="100px" :rules="rules">
           <el-row>
@@ -343,7 +343,7 @@ export default {
       ary1: [],
       ary2: [],
       nums: 0,
-      curRow:{}
+      curRow: {},
     };
   },
   created() {
@@ -512,7 +512,7 @@ export default {
       });
     },
     toppings() {
-          this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -525,7 +525,7 @@ export default {
       }
     },
     topping() {
-          this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -539,7 +539,7 @@ export default {
     },
     //删除
     delets(row) {
-          this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择删除的数据");
       } else {
@@ -550,8 +550,10 @@ export default {
         })
           .then(() => {
             deletapi(`/api/app/diagnosis/${this.form.id}`).then((res) => {
-              this.$message.success("删除成功");
-              this.getlist();
+              if (res.code == 0) {
+                this.$message.success("删除成功");
+                this.getlist();
+              }
             });
           })
           .catch(() => {
@@ -561,7 +563,7 @@ export default {
     },
     //编辑弹框
     edit(row) {
-      this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -613,9 +615,9 @@ export default {
       this.dialogVisible = true;
       this.title = 1;
       this.form = {};
-      this.$nextTick(()=>{
-        this.$refs.refinput.focus()
-      })
+      this.$nextTick(() => {
+        this.$refs.refinput.focus();
+      });
       //项目类别
       projectlist().then((res) => {
         this.itemTypeId = res.data;
@@ -637,7 +639,7 @@ export default {
     rowick(row) {
       getapi(`/api/app/diagnosis/${row.id}`).then((res) => {
         // this.form = res.data;
-        this.curRow={...res.data}
+        this.curRow = { ...res.data };
       });
       getapi(
         `/api/app/item-template-detail/item-template-in-item?ItemTemplateId=${row.id}`
diff --git a/src/views/fee-settings/DiagnosisTemplate.vue b/src/views/fee-settings/DiagnosisTemplate.vue
index cd41d35..1247ab5 100644
--- a/src/views/fee-settings/DiagnosisTemplate.vue
+++ b/src/views/fee-settings/DiagnosisTemplate.vue
@@ -67,7 +67,7 @@
         </el-select>
         <span style="margin-left: 10%; padding: 5px">搜索选择</span>
         <el-select
-        value-key="id"
+          value-key="id"
           filterable
           v-model="flitvalues"
           placeholder="请选择"
@@ -290,9 +290,7 @@ export default {
   },
   methods: {
     diagnosisitem(v) {
-      this.rightdata.forEach(item=>{
-        
-      })
+      this.rightdata.forEach((item) => {});
       console.log(v);
       this.rightdata.push({ displayName: v.displayName });
     },
@@ -504,8 +502,10 @@ export default {
           .then(() => {
             deletapi(`/api/app/diagnosis-template/${this.form.id}`).then(
               (res) => {
-                this.$message.success("删除成功");
-                this.getlist();
+                if (res.code == 0) {
+                  this.$message.success("删除成功");
+                  this.getlist();
+                }
               }
             );
           })
diff --git a/src/views/fee-settings/ItemResultTemplate.vue b/src/views/fee-settings/ItemResultTemplate.vue
index d45067c..cd76f37 100644
--- a/src/views/fee-settings/ItemResultTemplate.vue
+++ b/src/views/fee-settings/ItemResultTemplate.vue
@@ -346,7 +346,7 @@ export default {
       });
     },
     toppings() {
-        this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -361,7 +361,7 @@ export default {
       }
     },
     topping() {
-        this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -377,7 +377,7 @@ export default {
     },
     //删除
     delets(row) {
-        this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择删除的数据");
       } else {
@@ -389,8 +389,10 @@ export default {
           .then(() => {
             deletapi(`/api/app/item-result-template/${this.form.id}`).then(
               (res) => {
-                this.$message.success("删除成功");
-                this.getlist();
+                if (res.code == 0) {
+                  this.$message.success("删除成功");
+                  this.getlist();
+                }
               }
             );
           })
@@ -399,7 +401,7 @@ export default {
     },
     //编辑弹框
     editpopup() {
-      this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请点击选择操作的数据");
       } else {
diff --git a/src/views/user-list/OrganizationUnits.vue b/src/views/user-list/OrganizationUnits.vue
index a7af01c..aa3c2bd 100644
--- a/src/views/user-list/OrganizationUnits.vue
+++ b/src/views/user-list/OrganizationUnits.vue
@@ -2,13 +2,13 @@
   <div>
     <el-card>
       <!-- <el-button type="primary" @click="addorginiztiom">新增组织</el-button> -->
-
+      <div class="publicfontsize">科室设置</div>
       <div class="allC">
-        <i
+        <!-- <i
           class="el-icon-link"
           v-if="natureoptions.length == '0' ? false : true"
         ></i
-        ><span>组织架构</span>
+        ><span>组织架构</span> -->
         <div
           v-if="natureoptions.length == '0' ? true : false"
           @click="append(node, data)"
@@ -36,36 +36,43 @@
                 style="font-size:15px"
               ></i> -->
               <el-button
-                type="danger"
-                icon="el-icon-plus"
+                type="primary"
+                size="small"
+                style="padding: 3px; font-size: 15px;margin-left:5%"
+                @click="() => addorginiztiom(node, data)"
+                >新增同级</el-button
+              >
+              <el-button
+                type="primary"
                 size="mini"
-                style="padding: 3px; font-size: 15px; margin-left: 10%"
+                style="padding: 3px; font-size: 15px;"
                 @click="append(node, data)"
-              ></el-button>
+                >新增子级</el-button
+              >
               <!-- <i class="el-icon-delete" @click="() => deleates(node, data)" style="font-size:15px"></i>   -->
               <el-button
                 type="danger"
-                icon="el-icon-delete"
                 size="mini"
                 style="padding: 3px; font-size: 15px"
                 @click="() => deleates(node, data)"
-              ></el-button>
+                >删除</el-button
+              >
 
               <!-- <i class="el-icon-edit" @click="() => rena(node, data)" style="font-size:15px">编辑</i> -->
               <el-button
-                type="danger"
-                icon="el-icon-edit"
+                type="primary"
                 size="small"
                 style="padding: 3px; font-size: 15px"
                 @click="() => rena(node, data)"
-              ></el-button>
+                >编辑</el-button
+              >
             </span>
           </span>
         </el-tree>
         <!-- 弹框 -->
-        <el-button type="primary" @click="addorginiztiom" style="height: 40px"
+        <!-- <el-button type="primary" @click="addorginiztiom" style="height: 40px"
           >新增组织</el-button
-        >
+        > -->
       </div>
       <!-- 新增组织弹框 -->
       <el-dialog
@@ -75,6 +82,28 @@
         @close="closethiebox"
         :close-on-click-modal="false"
       >
+        <div>
+          <span>上级部门</span>
+          <!-- <el-cascader
+            :options="selecttable"
+            :props="{
+              checkStrictly: true,
+              children: 'treeChildren',
+              label: 'displayName',
+            }"
+            clearable
+          ></el-cascader> -->
+          <el-tree
+            :data="selecttable"
+            :props="defaultProp"
+            show-checkbox
+            ref="terr"
+               node-key="id"
+            :default-checked-keys="defaultKeys"
+            @check="iscrentd"
+          >
+          </el-tree>
+        </div>
         <el-row>
           <el-col :span="8">
             是否为体检中心
@@ -110,6 +139,8 @@ import { postapi, putapi, getapi } from "@/api/api";
 export default {
   data() {
     return {
+      defaultKeys: [],
+      selecttable: [],
       form: {
         parentId: "",
         displayName: "",
@@ -118,6 +149,10 @@ export default {
       title: 1,
       dialogVisible: false,
       natureoptions: [],
+      defaultProp: {
+        children: "treeChildren",
+        label: "displayName",
+      },
       defaultProps: {
         children: "treeChildren",
         label: "displayName",
@@ -130,6 +165,13 @@ export default {
     this.getonorganization();
   },
   methods: {
+    //选中的组织
+    iscrentd() {
+      console.log("222", this.$refs.terr.getCheckedKeys(true));
+      this.defaultKeys = this.$refs.terr.getCheckedKeys(true);
+      console.log(this.defaultKeys);
+      //  console.log("222", this.$refs.tree.defaultKeys(true));
+    },
     //close弹框关闭事件
     closethiebox() {},
     //关闭弹框
@@ -261,8 +303,11 @@ export default {
     rena(node, data) {
       this.dialogVisible = true;
       this.title = 2;
+      this.selecttable.push(data);
+      console.log(this.selecttable, 5555);
       getapi(`/api/app/organization-units?Id=${data.id}`).then((res) => {
         this.form = res.data;
+        // this.selecttable.push(res.data)
         console.log(res);
       });
       // this.form = data;
@@ -286,6 +331,10 @@ export default {
 };
 </script>
 <style scoped>
+.publicfontsize {
+  font-size: 18px;
+}
+
 .el-icon-plus {
   margin-left: 10%;
 }
diff --git a/src/views/user-list/Role.vue b/src/views/user-list/Role.vue
index 1219cfd..313338a 100644
--- a/src/views/user-list/Role.vue
+++ b/src/views/user-list/Role.vue
@@ -1,11 +1,15 @@
 <template>
   <div>
     <el-card>
-      <el-button type="primary" @click="newlyincreased">新增</el-button>
+      <div class="publiccss">角色管理</div>
+      <el-button type="primary" @click="newlyincreased" style="margin-top: 20px"
+        >新增</el-button
+      >
       <el-table
         :data="tableData"
         style="width: 100%; margin-top: 10px"
         border=""
+        height="500"
       >
         <el-table-column prop="name" label="角色名称" width="180">
         </el-table-column>
@@ -117,7 +121,12 @@
         </span>
       </el-dialog>
       <!-- x新增弹框 -->
-      <el-dialog title="新增角色" :visible.sync="adddialogVisible" width="30%"   :close-on-click-modal="false">
+      <el-dialog
+        title="新增角色"
+        :visible.sync="adddialogVisible"
+        width="30%"
+        :close-on-click-modal="false"
+      >
         <el-form ref="form" :model="form" label-width="120px">
           <el-form-item label="角色名称">
             <el-input v-model="form.name"></el-input>
diff --git a/src/views/workload/tollcollector.vue b/src/views/workload/tollcollector.vue
index 6a746af..9544ae2 100644
--- a/src/views/workload/tollcollector.vue
+++ b/src/views/workload/tollcollector.vue
@@ -49,7 +49,7 @@
         <h3 class="tabtile">收费员支付方式统计报表</h3>
       </el-form>
       <div>
-        <el-table :data="tableData" style="width: 100%">
+        <el-table :data="tableData" style="width: 100%" :height="tableHeight">
           <el-table-column prop="tollcollector" label="收费员" width="180">
           </el-table-column>
           <el-table-column prop="paymentmethod" label="支付方式" width="180">
@@ -73,6 +73,7 @@
 export default {
   data() {
     return {
+      tableHeight: 0,
       tableData: [
         {
           tollcollector: "张三",
@@ -113,7 +114,17 @@ export default {
       ],
     };
   },
-  mounted() {},
+  created() {
+    this.tableHeight = window.innerHeight - 100;
+  },
+  mounted() {
+    this.tableHeight = window.innerHeight - 100;
+    window.onresize = () => {
+      return () => {
+        this.tableHeight = window.innerHeight - 100;
+      };
+    };
+  },
   methods: {},
 };
 </script>