From 86bd05850f7f13380e839bac9cfc40c70cbffeb6 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Tue, 13 Jun 2023 18:04:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E8=80=83=E8=8C=83=E5=9B=B4=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js                            |   4 +-
 src/request/commonapi.js                  | 118 +++---
 src/utlis/validate.js                     |  57 +++
 src/views/fee-settings/Item.vue           | 475 ++++++++++++++++++----
 src/views/login/Login.vue                 |   8 +-
 src/views/user-list/OrganizationUnits.vue | 229 ++++++++---
 6 files changed, 687 insertions(+), 204 deletions(-)
 create mode 100644 src/utlis/validate.js

diff --git a/src/api/api.js b/src/api/api.js
index 7a82e49..94705ec 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -89,13 +89,13 @@ instance.interceptors.response.use(
         if (res.data.code == 1) {
             const { data } = res;
             return data
-        } else if (res.code == -1) {
+        } else if (res.Code == -1) {
             // console.log(res.data.message);
             // this.$message({
             //     message: res.data.message,
             //     type: 'warning'
             //   });
-            Message.error(res.message);
+            Message.error(res.Message);
         }
 
         // const { data } = res;
diff --git a/src/request/commonapi.js b/src/request/commonapi.js
index 7706b23..be16bd7 100644
--- a/src/request/commonapi.js
+++ b/src/request/commonapi.js
@@ -193,138 +193,138 @@ export const newcombination = (data) => {
     })
 }
 // 组合项目通过id获取主键
-export const asbitemgetid=(id)=>{
+export const asbitemgetid = (id) => {
     return request({
-        url:`/api/app/asbitem/${id}`,
-        method:'get'
+        url: `/api/app/asbitem/${id}`,
+        method: 'get'
     })
 }
 //组合项目编辑
-export const updateombination=(id,data)=>{
+export const updateombination = (id, data) => {
     return request({
-        url:`/api/app/asbitem/${id}`,
-        method:'put',
+        url: `/api/app/asbitem/${id}`,
+        method: 'put',
         data
     })
 }
 //根据项目类别获取
-export const itemtypeid=(ItemTypeId)=>{
-  return request({
-    url:`/api/app/asbitem/in-item-type/${ItemTypeId}`,
-    method:'get'
-  })
+export const itemtypeid = (ItemTypeId) => {
+    return request({
+        url: `/api/app/asbitem/in-item-type/${ItemTypeId}`,
+        method: 'get'
+    })
 }
 //条码分组标码分组包含的项目
-export const sampleasbitemid=(SampleGroupId)=>{
+export const sampleasbitemid = (SampleGroupId) => {
     return request({
-        url:`/api/app/sample-group-detail/sample-group-in-asbitem?SampleGroupId=${SampleGroupId}`,
-        method:'get'
+        url: `/api/app/sample-group-detail/sample-group-in-asbitem?SampleGroupId=${SampleGroupId}`,
+        method: 'get'
     })
 }
 //组合项目设置带名称搜索
-export const asbitmfilte=(data)=>{
+export const asbitmfilte = (data) => {
     return request({
-        url:'/api/app/asbitem/in-filter',
-        method:'get',
-        params:data
+        url: '/api/app/asbitem/in-filter',
+        method: 'get',
+        params: data
     })
 }
 //组合项目批量创建删除
-export const batchcreaion=(data)=>{
+export const batchcreaion = (data) => {
     return request({
-        url:'/api/app/sample-group-detail/many',
-        method:'post',
+        url: '/api/app/sample-group-detail/many',
+        method: 'post',
         data
     })
 }
 //组合项目置底顶
-export const samplesetlow=(id,SortType)=>{
+export const samplesetlow = (id, SortType) => {
     return request({
         url: `/api/app/asbitem/updatemanysort?id=${id}&SortType=${SortType}`,
-        method:'put'
+        method: 'put'
     })
 }
 //组合项目删除
-export const deletescombinationprojectid=(id)=>{
+export const deletescombinationprojectid = (id) => {
     return request({
-        url:`/api/app/asbitem/${id}`,
-        method:'delete'
+        url: `/api/app/asbitem/${id}`,
+        method: 'delete'
     })
 }
 //组合项目拖拽排序
-export const combination=(data)=>{
+export const combination = (data) => {
     return request({
-       url:'/api/app/asbitem/updatesortmany', 
-       method:'put',
-       data  
+        url: '/api/app/asbitem/updatesortmany',
+        method: 'put',
+        data
     })
 }
 //获取项目价格
-export const priceitemlist=(data)=>{
+export const priceitemlist = (data) => {
     return request({
-        url:'/api/app/price-item/in-filter',
-        method:'get',
-        params:data
+        url: '/api/app/price-item/in-filter',
+        method: 'get',
+        params: data
     })
 }
 //项目列表
-export const getporjectlists=(data)=>{
+export const getporjectlists = (data) => {
     return request({
-        url:'/api/app/item/in-filter',
-        method:'get',
-        params:data
+        url: '/api/app/item/in-filter',
+        method: 'get',
+        params: data
     })
 }
 //项目新增
-export const addproject=(data)=>{
+export const addproject = (data) => {
     return request({
-        url:'/api/app/item',
-        method:'post',
+        url: '/api/app/item',
+        method: 'post',
         data
     })
 }
 //项目根据id查询
-export const posjrctid=(id)=>{
+export const posjrctid = (id) => {
     return request({
-        url:`/api/app/item/${id}`,
-        method:'get'
+        url: `/api/app/item/${id}`,
+        method: 'get'
     })
 }
 //项目编辑修改
-export const projectedit=(id,data)=>{
+export const projectedit = (id, data) => {
     return request({
-        url:`/api/app/item/${id}`,
-        method:'put',
+        url: `/api/app/item/${id}`,
+        method: 'put',
         data
     })
 }
 //项目删除
-export const projectdeleft=(id)=>{
+export const projectdeleft = (id) => {
     return request({
-        url:`/api/app/item/${id}`,
-        method:'delete'
+        url: `/api/app/item/${id}`,
+        method: 'delete'
     })
 }
 //项目顶底
-export const projttitem=(id,SortType)=>{
+export const projttitem = (id, SortType) => {
     return request({
         url: `/api/app/item/updatemanysort?id=${id}&SortType=${SortType}`,
-        method:'put'
+        method: 'put'
     })
 }
 //项目拖拽排序
-export const projectdreog=(data)=>{
+export const projectdreog = (data) => {
     return request({
-        url:'/api/app/item/updatesortmany', 
-        method:'put',
+        url: '/api/app/item/updatesortmany',
+        method: 'put',
         data
     })
 }
 //参考范围列表
-export const  referencerangelist=(data)=>{
+export const referencerangelist = (data) => {
     return request({
-        url:'/api/app/reference-range',
-        method:'get',
-        params:data
+        url: '/api/app/reference-range',
+        method: 'get',
+        params: data
     })
 }
\ No newline at end of file
diff --git a/src/utlis/validate.js b/src/utlis/validate.js
new file mode 100644
index 0000000..007f68f
--- /dev/null
+++ b/src/utlis/validate.js
@@ -0,0 +1,57 @@
+const reg = /\d+(\.\d+)?$/;  //浮点型正则
+import { Message } from 'element-ui';
+//验证参考范围
+export const yzstr = (value) => {
+
+    let isyz = false;
+    if (value.indexOf("-") != -1) {
+        var sary = value.split('-');
+        if (sary.length == 2) {
+
+            for (var i = 0; i < sary.length; i++) {
+                if (!reg.test(sary[i])) {
+                    isyz = false
+                    return false;
+                }
+            }
+            //成功
+            isyz = true
+        }
+        else {
+            isyz = false
+            Message.error('输入格式不正确');
+            //失败
+        }
+    }
+    else if (value.indexOf(">=") == 0) {
+
+        let s1 = value.substring(2)
+
+        if (!reg.test(s1)) {
+            isyz = false
+
+        }
+        else {
+            isyz = true
+
+        }
+    }
+    else if (value.indexOf("<=") == 0) {
+        let s1 = value.substring(2)
+
+        if (!reg.test(s1)) {
+            isyz = false
+
+        }
+        else {
+            isyz = true
+        }
+    }
+    else {
+        //失败
+        Message.error('输入格式不正确');
+        isyz = false
+    }
+
+    return isyz;
+}
\ No newline at end of file
diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index b75e641..c1de8b3 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -41,52 +41,63 @@
             </el-select>
           </el-col>
         </el-row>
-        <el-table
-          :data="tableData"
-          style="width: 100%; height: 500px"
-          row-key="id"
-          class="el-table__body-wrapper tbody"
-          highlight-current-row
-          @row-click="rowick"
-          ref="tableData"
-        >
-          <el-table-column prop="id" label="编号" width="300">
-          </el-table-column>
-          <el-table-column prop="displayName" label="名称" width="">
-          </el-table-column>
-          <el-table-column prop="creatorName" label="创建者" width="">
-          </el-table-column>
-          <el-table-column prop="creationTime" label="创建时间" width="200">
-            <template slot-scope="scope">
-              {{ scope.row.creationTime | dateFormat }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="lastModifierName" label="修改者" width="">
-          </el-table-column>
-          <el-table-column
-            prop="lastModificationTime"
-            label="修改时间"
-            width="200"
-          >
-            <template slot-scope="scope">
-              {{ scope.row.lastModificationTime | dateFormat }}
-            </template>
-          </el-table-column>
-          <el-table-column label="操作">
-            <template>
-              <el-tag
-                class="move"
-                style="cursor: move; margin-left: 15px"
-                draggable="true"
+        <div style="display: flex">
+          <div style="width: 15%; margin-top: 20px">
+            <el-tree
+              :data="itemTypeId"
+              :props="treeprops"
+              @node-click="treeclick"
+            ></el-tree>
+          </div>
+          <div style="width: 85%">
+            <el-table
+              :data="tableData"
+              style="width: 100%; height: 500px"
+              row-key="id"
+              class="el-table__body-wrapper tbody"
+              highlight-current-row
+              @row-click="rowick"
+              ref="tableData"
+            >
+              <el-table-column prop="id" label="编号" width="300">
+              </el-table-column>
+              <el-table-column prop="displayName" label="名称" width="">
+              </el-table-column>
+              <el-table-column prop="creatorName" label="创建者" width="">
+              </el-table-column>
+              <el-table-column prop="creationTime" label="创建时间" width="200">
+                <template slot-scope="scope">
+                  {{ scope.row.creationTime | dateFormat }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="lastModifierName" label="修改者" width="">
+              </el-table-column>
+              <el-table-column
+                prop="lastModificationTime"
+                label="修改时间"
+                width="200"
               >
-                <i
-                  class="el-icon-d-caret"
-                  style="width: 1rem; height: 1rem"
-                ></i>
-              </el-tag>
-            </template>
-          </el-table-column>
-        </el-table>
+                <template slot-scope="scope">
+                  {{ scope.row.lastModificationTime | dateFormat }}
+                </template>
+              </el-table-column>
+              <el-table-column label="操作">
+                <template>
+                  <el-tag
+                    class="move"
+                    style="cursor: move; margin-left: 15px"
+                    draggable="true"
+                  >
+                    <i
+                      class="el-icon-d-caret"
+                      style="width: 1rem; height: 1rem"
+                    ></i>
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
       </el-card>
     </div>
     <el-dialog
@@ -108,7 +119,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="项目类别" prop="itemTypeId">
-              <el-select v-model="form.itemTypeId" placeholder="请选择">
+              <el-cascader
+                v-model="form.itemTypeId"
+                :options="itemTypeId"
+                :props="props"
+                :show-all-levels="false"
+              >
+              </el-cascader>
+              <!-- <el-select v-model="form.itemTypeId" placeholder="请选择">
                 <el-option
                   v-for="item in itemTypeId"
                   :key="item.id"
@@ -116,7 +134,7 @@
                   :value="item.id"
                 >
                 </el-option>
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -511,25 +529,49 @@
           </el-select>
         </el-col>
       </el-row>
-      <!-- //无参考范围 -->
+      <!-- //无参考范围 2223456-->
       <el-card
-        v-if="referencerangevalue == 1"
+        v-if="referencerangevalue == 0"
         style="margin-top: 20px"
       ></el-card>
-      <div style="display: flex" v-if="referencerangevalue == 2">
+      <div style="display: flex" v-if="referencerangevalue == 1">
         <div style="width: 95%">
           <el-card style="margin-top: 20px">
             <el-table :data="referencerangedata">
-              <el-table-column label="性别" prop="gender"></el-table-column>
-              <el-table-column label="年龄>" prop="agewise"></el-table-column>
-              <el-table-column label="年龄<=" prop="underage"></el-table-column>
-              <el-table-column
-                label="参考下限"
-                prop="onreference"
-              ></el-table-column>
-              <el-table-column
-                label="参考上限"
-                prop="underreference"
+              <el-table-column label="性别" prop="gender">
+                <template slot-scope="scope">
+                  <el-select
+                    v-model="sexname[scope.row.displayName - 1]"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in sexid"
+                      :key="item.id"
+                      :label="item.displayName"
+                      :value="item.id"
+                    >
+                    </el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="年龄>">
+                <template>
+                  <el-input
+                    v-model="tabelform.ageLowerLimit"
+                    @blur="inputbulue"
+                  ></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="年龄<=">
+                <el-input></el-input>
+              </el-table-column>
+              <el-table-column label="参考下限">
+                <template>
+                  <el-input></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="参考上限">
+                <template> <el-input></el-input> </template
               ></el-table-column>
               <el-table-column label="警告下限"></el-table-column>
               <el-table-column label="警告上限"></el-table-column>
@@ -551,7 +593,37 @@
           </div>
         </div>
       </div>
-      <div v-if="referencerangevalue == 3"></div>
+      <div v-if="referencerangevalue == 2">
+        <div style="margin: 20px 0; display: flex">
+          <div style="width: 90%">
+            <el-input
+              type="textarea"
+              placeholder="请输入内容"
+              v-model="form.displayName"
+              maxlength="300"
+              show-word-limit
+              style="height: 50px"
+            >
+            </el-input>
+          </div>
+          <div style="width: 10%">
+            <div style="margin-top: 5px">
+              <el-button
+                type="primary"
+                size="mini"
+                @click="diagnosticsettings"
+                style="width: 70px; height: 50px; margin-left: 10px"
+                >诊断设置</el-button
+              >
+            </div>
+            <div style="margin-top: 10px; margin-left: 10px">
+              <el-button type="primary" @click="adddiagnosis"
+                >增加诊断</el-button
+              >
+            </div>
+          </div>
+        </div>
+      </div>
       <!-- 数字型参考范围 -->
       <span slot="footer" class="dialog-footer">
         <el-button @click="referencerangedialogVisible = false"
@@ -600,7 +672,35 @@
       :visible.sync="diagnosdialogVisible"
       width="80%"
     >
-      <el-table :data="diagnosticdata"></el-table>
+      <div style="display: flex">
+        <div style="width: 95%">
+          <el-table :data="diagnosticdata">
+            <el-table-column label="编号" prop="id"></el-table-column>
+            <el-table-column label="名称" prop="displayName"></el-table-column>
+            <el-table-column
+              label="创建者"
+              prop="creatorName"
+            ></el-table-column>
+            <el-table-column label="创建时间" prop="creationTime">
+              <template slot-scope="scope">
+                {{ scope.row.creationTime | dateFormat }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="修改者"
+              prop="lastModifierName"
+            ></el-table-column>
+            <el-table-column label="修改时间" prop="lastModificationTime">
+              <template slot-scope="scope">
+                {{ scope.row.lastModificationTime | dateFormat }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div style="margin-left: 10px; margin-top: 4%">
+          <el-button type="primary" @click="adddiagnosis">增加诊断</el-button>
+        </div>
+      </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="diagnosdialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="diagnosdialogVisible = false"
@@ -608,10 +708,120 @@
         >
       </span>
     </el-dialog>
+    <!-- 增加诊断弹框 -->
+    <el-dialog title="诊断编辑" :visible.sync="diagnosticediting" width="80%">
+      <el-form :model="editdigoisceditingform">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="名称" label-width="100px">
+              <el-input v-model="editdigoisceditingform.displayName"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7" style="margin-left: 20px">
+            <el-form-item label="项目类别">
+              <el-cascader
+                v-model="editdigoisceditingform.itemTypeId"
+                :options="itemTypeId"
+                :show-all-levels="false"
+                :props="props"
+              ></el-cascader>
+              <!-- <el-select
+                v-model="editdigoisceditingform.itemTypeId"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in itemTypeId"
+                  :key="item.id"
+                  :label="item.displayName"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="建议名称" label-width="100px">
+              <el-input
+                v-model="editdigoisceditingform.suggestionName"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" style="margin-left: 4%">
+            <el-form-item label="是疾病">
+              <el-select
+                v-model="editdigoisceditingform.isIll"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in isIll"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="总监模板">
+              <el-select
+                v-model="editdigoisceditingform.isSummaryTemplate"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in isSummaryTemplate"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="适用性别">
+              <el-select
+                v-model="editdigoisceditingform.forSexId"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in forSexId"
+                  :key="item.id"
+                  :label="item.displayName"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="诊断级别">
+              <el-select
+                v-model="editdigoisceditingform.diagnosisLevelId"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in diagnosisLevelId"
+                  :key="item.id"
+                  :label="item.displayName"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="diagnosticediting = false">取 消</el-button>
+        <el-button type="primary" @click="diagnosticsadd">确 定</el-button>
+      </span>
+    </el-dialog>
     <!--  -->
   </div>
 </template>
 <script>
+import { yzstr } from "@/utlis/validate";
 import {
   getporjectlists,
   projectlist,
@@ -629,6 +839,26 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 export default {
   data() {
     return {
+      tabelform: {
+        ageLowerLimit: "input无法输入",
+      },
+      sexname: [],
+      sexid: [],
+      treeprops: {
+        label: "displayName",
+        value: "id",
+        children: "treeChildren",
+      },
+      editdigoisceditingform: {
+        displayName: "",
+        itemTypeId: "",
+        suggestionName: "",
+        isIll: "",
+        isSummaryTemplate: "",
+        forSexId: "",
+        diagnosisLevelId: "",
+      }, //诊断编辑需要绑定的对象
+      diagnosticediting: false, //诊断编辑
       diagnosdialogVisible: false, //匹配诊断
       diagnosticdata: [], //匹配诊断
       projectdata: [], //结果模板
@@ -670,23 +900,23 @@ export default {
       ruesttieledialogVisible: false,
       referencerangedata: [
         {
-          value: "1",
+          value: "0",
           label: "无参考范围",
         },
         {
-          value: "2",
+          value: "1",
           label: "数字型参考范围",
         },
         {
-          value: "3",
+          value: "2",
           label: "字符型参考范围",
         },
         {
-          value: "4",
+          value: "3",
           label: "性激素参考范围",
         },
       ], //参考范围下拉框
-      referencerangevalue: "1",
+      referencerangevalue: "0",
       referencerangedialogVisible: false, //参考范围弹框
       Selectvalue: "",
       Selectacategory: [],
@@ -847,10 +1077,37 @@ export default {
         ],
         isActive: [{ required: true, message: "请选择启用", trigger: "blur" }],
       },
-      itemTypeId: [], //项目类别id
       unitId: [], //单位Id
       priceItemId: [], //价格id1
       result: [], //结果
+      forSexId: [], //性别
+      itemTypeId: [], //项目类别
+      diagnosisLevelId: [], //诊断级别
+      isIll: [
+        {
+          value: "Y",
+          label: "是",
+        },
+        {
+          value: "N",
+          label: "否",
+        },
+      ], //是疾病
+      isSummaryTemplate: [
+        {
+          value: "Y",
+          label: "是",
+        },
+        {
+          value: "N",
+          label: "否",
+        },
+      ], //总监模板
+      props: {
+        label: "displayName",
+        value: "id",
+        children: "treeChildren",
+      }, //左侧树形结构
     };
   },
   created() {
@@ -859,13 +1116,61 @@ export default {
   },
   mounted() {
     this.rowDrop();
+    this.typeid();
   },
   methods: {
-    //诊断匹配弹框
+    inputbulue() {
+      console.log(yzstr(this.tabelform.ageLowerLimit));
+    },
+    treeclick(data) {
+      getapi(`/api/app/item/in-item-type/${data.id}`).then((res) => {
+        this.tableData = res.data;
+        console.log(res.data, "ress");
+        // this.getlist();
+      });
+    },
+    typeid() {
+      projectlist().then((res) => {
+        this.itemTypeId = res.data;
+      });
+    },
+    //诊断新增
+    diagnosticsadd() {
+      postapi("/api/app/diagnosis", this.editdigoisceditingform).then((res) => {
+        this.$message.success("添加成功");
+        this.diagnosticmatching();
+      });
+    },
+    //增加诊断需要的Id
+    diageoisaddId() {
+      //项目类别id
+      getapi("/api/app/item-type").then((res) => {
+        this.itemTypeId = res.data.items;
+      });
+      //性别
+      getapi("/api/app/sex").then((res) => {
+        this.forSexId = res.data;
+      });
+      //诊断级别
+      getapi("/api/app/diagnosis-level").then((res) => {
+        this.diagnosisLevelId = res.data.items;
+      });
+    },
+    // 增加诊断弹框
+    adddiagnosis() {
+      console.log(1);
+      console.log("诊断的方法");
+      this.diagnosticediting = true;
+      this.diageoisaddId();
+    },
+    //诊断匹配弹框获取诊断数据
     diagnosticmatching() {
       this.diagnosdialogVisible = true;
-      console.log(this.diagnosticdata);
       console.log(this.diagnosdialogVisible);
+      postapi("/api/app/diagnosis/getlistinfilter").then((res) => {
+        this.diagnosticdata = res.data.items;
+        console.log(res);
+      });
     },
     //结果模板添加
     resultaddition() {},
@@ -954,7 +1259,9 @@ export default {
       }
     },
     //诊断设置弹框新增
-    diagnosticsettings() {},
+    diagnosticsettings() {
+      console.log("1");
+    },
     digitaladdion() {
       this.referencerangedata.push({
         gender: "全部",
@@ -968,13 +1275,23 @@ export default {
     selecttype(v) {
       console.log(v);
       this.referencerangevalue = v;
+      if (v == 1) {
+        getapi("/api/app/sex").then((res) => {
+          console.log(res);
+          this.sexid = res.data;
+        });
+        console.log(this.sexid);
+        console.log("我是数字类型");
+      }
     },
     //参考范围
     referencerange() {
+      console.log("我是参考范围");
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
         this.referencerangedialogVisible = true;
+
         console.log("11111111");
       }
     },
@@ -998,6 +1315,7 @@ export default {
       this.ruesttiele = 1;
       this.ruesttieledialogVisible = true;
     },
+    //获取项目类别列表
     getmedicalconclusionlist() {
       getapi("/api/app/item-type").then((res) => {
         this.Selectacategory = res.data.items;
@@ -1106,7 +1424,6 @@ export default {
         Sortable.create(tbody, {
           handle: ".move",
           animation: 300,
-
           onEnd({ newIndex, oldIndex }) {
             _this.isshow = false;
             const currRow = _this.tableData.splice(oldIndex, 1)[0];
@@ -1221,7 +1538,8 @@ export default {
     addorgropdata() {
       //获取项目id
       projectlist().then((res) => {
-        this.itemTypeId = res.data.items;
+        this.itemTypeId = res.data;
+        this.tcdate(this.itemTypeId);
       });
       //获取单位
       unitlist().then((res) => {
@@ -1239,6 +1557,17 @@ export default {
       //   this.tableData = res.data.items;
       // });
     },
+    tcdate(date) {
+      for (var i = 0; i < date.length; i++) {
+        if (date[i].treeChildren.length == 0) {
+          date[i].treeChildren = undefined;
+        } else {
+          this.tcdate(date[i].treeChildren);
+        }
+      }
+    },
+
+    ///
   },
 };
 </script>
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 0630fad..a5a6e9d 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -36,6 +36,7 @@
 </template> 
 <script>
 import { lognis } from "@/request/ruquset";
+import { yzstr } from "@/utlis/validate.js";
 export default {
   data() {
     return {
@@ -96,7 +97,7 @@ export default {
             .then((res) => {
               window.localStorage.setItem("token", res.data.access_token);
               window.localStorage.setItem("tokentype", res.data.token_type);
-              window.localStorage.setItem('user',this.form.Username)
+              window.localStorage.setItem("user", this.form.Username);
               console.log(res);
               this.$message.success("登录成功");
               this.$router.push({ path: "home" });
@@ -135,12 +136,11 @@ export default {
 </script>
 
 <style lang="scss"  scoped >
-
 .bg {
   background-color: black;
   // background: url("https://img.zcool.cn/community/013c8b5b62d108a801206a35bea1eb.jpg@2o.jpg");
- background: url("https://img1.baidu.com/it/u=1097534320,1746985227&fm=253&fmt=auto&app=138&f=JPEG?w=889&h=500");
- height: 100%;
+  background: url("https://img1.baidu.com/it/u=1097534320,1746985227&fm=253&fmt=auto&app=138&f=JPEG?w=889&h=500");
+  height: 100%;
   width: 100%;
   min-height: 100vh;
 }
diff --git a/src/views/user-list/OrganizationUnits.vue b/src/views/user-list/OrganizationUnits.vue
index aa907fa..d48d2a7 100644
--- a/src/views/user-list/OrganizationUnits.vue
+++ b/src/views/user-list/OrganizationUnits.vue
@@ -2,7 +2,7 @@
   <div>
     <el-card>
       <!-- <el-button type="primary" @click="addorginiztiom">新增组织</el-button> -->
-     
+
       <div class="allC">
         <i
           class="el-icon-link"
@@ -14,18 +14,16 @@
           @click="append(node, data)"
         >
           <i class="el-icon-link" @click="append"></i><span> 添加组织</span>
-        
         </div>
         <el-tree
           :default-expand-all="true"
           :expand-on-click-node="false"
           :data="natureoptions"
           :props="defaultProps"
-          :show-checkbox="false"  
+          :show-checkbox="false"
           ref="tree"
           node-key="id"
           style="width: 30%; margin-top: 20px"
-         
           @check="check"
         >
           <span slot-scope="{ node, data }">
@@ -37,18 +35,65 @@
                 @click="append(node, data)"
                 style="font-size:15px"
               ></i> -->
-                  <el-button type="danger" icon="el-icon-plus" size="mini" style="padding:3px;font-size:15px;margin-left:10%" @click="append(node, data)"></el-button>
+              <el-button
+                type="danger"
+                icon="el-icon-plus"
+                size="mini"
+                style="padding: 3px; font-size: 15px; margin-left: 10%"
+                @click="append(node, data)"
+              ></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
+                type="danger"
+                icon="el-icon-delete"
+                size="mini"
+                style="padding: 3px; font-size: 15px"
+                @click="() => deleates(node, data)"
+              ></el-button>
+
               <!-- <i class="el-icon-edit" @click="() => rena(node, data)" style="font-size:15px">编辑</i> -->
-                <el-button type="danger" icon="el-icon-edit" size="small" style="padding:3px;font-size:15px"  @click="() => rena(node, data)" ></el-button>
+              <el-button
+                type="danger"
+                icon="el-icon-edit"
+                size="small"
+                style="padding: 3px; font-size: 15px"
+                @click="() => rena(node, data)"
+              ></el-button>
             </span>
           </span>
         </el-tree>
         <!-- 弹框 -->
-        <el-button type="primary" @click="addorginiztiom" style="height:40px">新增组织</el-button>
+        <el-button type="primary" @click="addorginiztiom" style="height: 40px"
+          >新增组织</el-button
+        >
       </div>
+      <!-- 新增组织弹框 -->
+      <el-dialog
+        :title="title == 1 ? '新增组织' : '修改组织'"
+        :visible.sync="dialogVisible"
+        width="50%"
+      >
+        <el-row>
+          <el-col :span="8">
+            是否为体检中心
+            <el-radio v-model="form.isPeis" label="Y">是</el-radio>
+            <el-radio v-model="form.isPeis" label="N">否</el-radio>
+          </el-col>
+          <el-col :span="12">
+            <el-form :model="form">
+              <el-form-item label="名称" label-width="80px">
+                <el-input v-model="form.displayName"></el-input>
+              </el-form-item>
+            </el-form>
+          </el-col>
+        </el-row>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="organizationtreeaddoredit"
+            >确 定</el-button
+          >
+        </span>
+      </el-dialog>
     </el-card>
   </div>
 </template>
@@ -59,22 +104,63 @@ import {
   deleteschema,
   modifyedit,
 } from "../../request/ruquset";
+import { postapi, putapi } from "@/api/api";
 export default {
   data() {
     return {
+      form: {
+        parentId: "",
+        displayName: "",
+        isPeis: "",
+      },
+      title: 1,
+      dialogVisible: false,
       natureoptions: [],
       defaultProps: {
         children: "treeChildren",
         label: "displayName",
       },
-      checked:false,
+      checked: false,
+      parent: 1,
     };
   },
   mounted() {
     this.getonorganization();
   },
   methods: {
-  
+    //确定新增或者编辑
+    organizationtreeaddoredit() {
+      if (this.title == 1) {
+        if (this.form.displayName != "") {
+          postapi("/api/app/organization-units/creatre", {
+            displayName: this.form.displayName,
+            isPeis: this.form.isPeis,
+          }).then((res) => {
+            this.$message.success("新增成功");
+            this.dialogVisible = false;
+            this.getonorganization();
+          });
+        }
+      } else if (this.title == 2) {
+        putapi(
+          `/api/app/organization-units?Id=${this.form.id}&DisplayName=${this.form.displayName}&IsPeis=${this.form.isPeis}`
+        ).then((res) => {
+          this.$message.success("编辑成功");
+          this.dialogVisible = false;
+          this.getonorganization();
+        });
+      }else if(this.title==3){
+         postapi("/api/app/organization-units/creatre", {
+            displayName: this.form.displayName,
+            isPeis: this.form.isPeis,
+            parentId:this.form.parentId
+          }).then((res) => {
+            this.$message.success("新增成功");
+            this.dialogVisible = false;
+            this.getonorganization();
+          });
+      }
+    },
     check(data) {
       console.log(data);
       localStorage.setItem("dataidkes", data.id);
@@ -88,52 +174,59 @@ export default {
     },
     //添加父级组织
     addorginiztiom() {
-      this.$prompt("组织名称", "新增组织", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        inputPattern: /^[\u4e00-\u9fa5]{0,}$/, //匹配全中文
-        inputErrorMessage: "请输入中文", //不符合正则匹配的提示语句
-      }).then(({ value }) => {
-        //parentId:data.id
-        organizationcaeatre({ displayName: value }).then((res) => {
-          this.getonorganization();
-          this.$message.success("新增成功");
-        });
-      });
+      // this.$prompt("组织名称", "新增组织", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   inputPattern: /^[\u4e00-\u9fa5]{0,}$/, //匹配全中文
+      //   inputErrorMessage: "请输入中文", //不符合正则匹配的提示语句
+      // }).then(({ value }) => {
+      //   //parentId:data.id
+      //   organizationcaeatre({ displayName: value }).then((res) => {
+      //     this.getonorganization();
+      //     this.$message.success("新增成功");
+      //   });
+      // });
+      this.dialogVisible = true;
+      this.title = 1;
+      console.log(this.form);
     },
     //新增组织组织
     append(node, data) {
+      this.title = 3;
+      this.dialogVisible = true;
+      this.form.parentId = data.id;
+      console.log(this.form.parentId);
       // if(this.natureoptions)
       // console.log(node, data);
-      if (this.natureoptions.length == 0) {
-        this.$prompt("组织名称", "增加组织", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          inputPattern: /^[\u4e00-\u9fa5]{0,}$/, //匹配全中文
-          inputErrorMessage: "请输入中文", //不符合正则匹配的提示语句
-        }).then(({ value }) => {
-          //parentId:data.id
-          organizationcaeatre({ displayName: value }).then((res) => {
-            this.getonorganization();
-            this.$message.success("新增成功");
-          });
-        });
-      } else {
-        this.$prompt("组织名称", "增加组织", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          inputPattern: /^[\u4e00-\u9fa5]{0,}$/, //匹配全中文
-          inputErrorMessage: "请输入中文", //不符合正则匹配的提示语句
-        }).then(({ value }) => {
-          //parentId:data.id
-          organizationcaeatre({ displayName: value, parentId: data.id }).then(
-            (res) => {
-              this.getonorganization();
-              this.$message.success("新增成功");
-            }
-          );
-        });
-      }
+      // if (this.natureoptions.length == 0) {
+      //   this.$prompt("组织名称", "增加组织", {
+      //     confirmButtonText: "确定",
+      //     cancelButtonText: "取消",
+      //     inputPattern: /^[\u4e00-\u9fa5]{0,}$/, //匹配全中文
+      //     inputErrorMessage: "请输入中文", //不符合正则匹配的提示语句
+      //   }).then(({ value }) => {
+      //     //parentId:data.id
+      //     organizationcaeatre({ displayName: value }).then((res) => {
+      //       this.getonorganization();
+      //       this.$message.success("新增成功");
+      //     });
+      //   });
+      // } else {
+      //   this.$prompt("组织名称", "增加组织", {
+      //     confirmButtonText: "确定",
+      //     cancelButtonText: "取消",
+      //     inputPattern: /^[\u4e00-\u9fa5]{0,}$/, //匹配全中文
+      //     inputErrorMessage: "请输入中文", //不符合正则匹配的提示语句
+      //   }).then(({ value }) => {
+      //     //parentId:data.id
+      //     organizationcaeatre({ displayName: value, parentId: data.id }).then(
+      //       (res) => {
+      //         this.getonorganization();
+      //         this.$message.success("新增成功");
+      //       }
+      //     );
+      //   });
+      // }
     },
     //删除组织
     deleates(data) {
@@ -146,20 +239,24 @@ export default {
     },
     //编辑组织
     rena(node, data) {
-      console.log(data);
-      this.$prompt("组织名称", "修改组织", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        // inputPattern: /^[\u4e00-\u9fa5]{0,}$/, //匹配全中文
-        // inputErrorMessage: "请输入中文", //不符合正则匹配的提示语句
-      }).then(({ value }) => {
-        console.log(value);
-        modifyedit(data.id, value).then((res) => {
-          this.getonorganization();
-          // console.log(res)
-          this.$message.success("修改成功");
-        });
-      });
+      this.dialogVisible = true;
+      this.title = 2;
+      this.form = data;
+      console.log(this.form);
+      // console.log(data);
+      // this.$prompt("组织名称", "修改组织", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   // inputPattern: /^[\u4e00-\u9fa5]{0,}$/, //匹配全中文
+      //   // inputErrorMessage: "请输入中文", //不符合正则匹配的提示语句
+      // }).then(({ value }) => {
+      //   console.log(value);
+      //   modifyedit(data.id, value).then((res) => {
+      //     this.getonorganization();
+      //     // console.log(res)
+      //     this.$message.success("修改成功");
+      //   });
+      // });
     },
   },
 };