diff --git a/src/components/customerOrg/ContactPerson.vue b/src/components/customerOrg/ContactPerson.vue
index 191515d..b452833 100644
--- a/src/components/customerOrg/ContactPerson.vue
+++ b/src/components/customerOrg/ContactPerson.vue
@@ -1,18 +1,10 @@
 <template>
   <div>
-    <div style="display: flex">
-      <div style="width: 95%">
-        <el-table
-          :data="data.contactPerson"
-          border
-          style="height: 175px"
-          row-key="id"
-          size="small"
-          class="el-table__body-wrapper tbody"
-          highlight-current-row
-          @row-click="rowickContactPerson"
-          ref="data.contactPerson"
-        >
+    <div style="display:flex">
+      <div style="width: 95%;">
+        <el-table :data="data.contactPerson" border style="height: 175px" row-key="id" size="small"
+          class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowickContactPerson"
+          ref="data.contactPerson">
           <el-table-column prop="display_name" label="姓名" />
           <el-table-column prop="title" label="职务" />
           <el-table-column prop="remark" label="备注" />
@@ -23,27 +15,15 @@
             </template>
           </el-table-column>
           <el-table-column prop="lastModifierName" label="修改者" />
-          <el-table-column
-            prop="lastModificationTime"
-            label="修改时间"
-            width="200"
-          >
+          <el-table-column prop="lastModificationTime" label="修改时间" width="200">
             <template slot-scope="scope">
               {{ scope.row.lastModificationTime | dateFormat }}
             </template>
           </el-table-column>
-        </el-table>
-        <el-table
-          :data="data.contactPerson"
-          border
-          style="height: 175px"
-          row-key="id"
-          size="small"
-          class="el-table__body-wrapper tbody"
-          highlight-current-row
-          @row-click="rowickContactPerson"
-          ref="data.contactPerson"
-        >
+        </el-table>        
+        <el-table :data="data.contactPerson" border style="height: 175px" row-key="id" size="small"
+          class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowickContactPerson"
+          ref="data.contactPerson">
           <el-table-column prop="contact_method_type" label="类型" />
           <el-table-column prop="contact_method_value" label="联系方式" />
           <el-table-column prop="creatorName" label="创建者" width="" />
@@ -53,11 +33,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="lastModifierName" label="修改者" />
-          <el-table-column
-            prop="lastModificationTime"
-            label="修改时间"
-            width="200"
-          >
+          <el-table-column prop="lastModificationTime" label="修改时间" width="200">
             <template slot-scope="scope">
               {{ scope.row.lastModificationTime | dateFormat }}
             </template>
@@ -78,17 +54,17 @@
     </div>
     <!-- 联系人 -->
     <el-dialog title="新增" :visible.sync="dialogContactPerson" width="80%">
-      <el-form
-        :model="formContactPerson"
-        ref="formContactPerson"
-        label-width="100px"
-      >
+      <el-form :model="formContactPerson" ref="formContactPerson" label-width="100px">
         <el-row>
+
           <el-col :span="8">
             <el-form-item label="结果">
               <el-input v-model="formContactPerson.result"></el-input>
             </el-form-item>
           </el-col>
+
+
+
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -96,6 +72,7 @@
         <el-button type="primary" @click="">确 定</el-button>
       </span>
     </el-dialog>
+
   </div>
 </template>
 <script>
@@ -114,9 +91,9 @@ import {
 import { unitlist } from "@/request/systemapi";
 import Sortable from "sortablejs";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import CustomerOrgTree from "../../components/customerOrg/customerOrgTree.vue";
-import CustomerOrgEdit from "../../components/customerOrg/customerOrgEdit.vue";
-import CustomerOrgRegister from "../../components/customerOrg/customerOrgRegister.vue";
+import CustomerOrgTree from '../../components/customerOrg/customerOrgTree.vue'
+import CustomerOrgEdit from '../../components/customerOrg/customerOrgEdit.vue'
+import CustomerOrgRegister from '../../components/customerOrg/customerOrgRegister.vue'
 export default {
   components: {
     CustomerOrgTree,
@@ -125,8 +102,8 @@ export default {
   },
   data() {
     return {
-      data: {
-        contactPerson: [],
+      data:{
+        contactPerson:[]
       },
       form: {
         displayName: "",
@@ -149,12 +126,18 @@ export default {
         isActive: "",
       },
 
+
       dialogContactPerson: false, //联系人弹窗 显示控制
       dialogContactMethod: false, //联系方式弹窗 显示控制
 
-      formContactPerson: {}, //联系人form表单数据
+     
+      formContactPerson: {
 
-      formContactMethod: {}, //联系方式form表单数据
+      },  //联系人form表单数据
+
+      formContactMethod: {
+
+      },  //联系方式form表单数据
 
       rules: {
         displayName: [
@@ -215,12 +198,16 @@ export default {
     };
   },
 
-  created() {},
+  created() {    
+  },
 
   //挂载完成
-  mounted() {},
+  mounted() {
+
+  },
 
   methods: {
+
     //联系人 相关操作
     addContactPerson() {
       this.$message.success("新增 addContactPerson");
@@ -232,7 +219,7 @@ export default {
       this.$message.success("删除 delContactPerson");
     },
 
-    rowickContactPerson() {
+    rowickContactPerson(){
       this.$message.success("rowickContactPerson");
     },
   },
diff --git a/src/components/unitGrouping/unitGroupCategory.vue b/src/components/unitGrouping/unitGroupCategory.vue
new file mode 100644
index 0000000..4a01804
--- /dev/null
+++ b/src/components/unitGrouping/unitGroupCategory.vue
@@ -0,0 +1,43 @@
+<template>
+  <div class="examinationcategory">
+    <div>
+      <span>项目类别</span>
+      <el-select v-model="value" placeholder="请选择" style="margin-left: 20px">
+        <el-option
+          v-for="item in options"
+          :key="item.id"
+          :label="item.displayName"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class=""></div>
+  </div>
+</template>
+<script>
+import { getapi } from "@/api/api";
+export default {
+  data() {
+    return {
+      options: [],
+      value: "",
+    };
+  },
+  created(){
+    this.getitemtype()
+  },
+  methods: {
+    getitemtype() {
+      getapi("/api/app/item-type/by-code-all").then((res) => {
+        this.options = res.data;
+      });
+    },
+  },
+};
+</script>
+<style scoped>
+.examinationcategory {
+  margin-top: 30px;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/unitGrouping/unitGroupingTable.vue b/src/components/unitGrouping/unitGroupingTable.vue
new file mode 100644
index 0000000..d40deab
--- /dev/null
+++ b/src/components/unitGrouping/unitGroupingTable.vue
@@ -0,0 +1,52 @@
+<template>
+  <div style="display: flex">
+    <el-table :data="tableData" style="width: 100%">
+      <el-table-column prop="index" label="序号" width=""> </el-table-column>
+      <el-table-column prop="groupnumber" label="分组编号" width="">
+      </el-table-column>
+      <el-table-column prop="groupname" label="分组名称"> </el-table-column>
+      <el-table-column prop="sex" label="性别"> </el-table-column>
+      <el-table-column prop="maritalstatus" label="婚姻状况"> </el-table-column>
+      <el-table-column prop="price" label="价格"> </el-table-column>
+    </el-table>
+    <div style="margin-top: 3%; margin-left: 10px">
+      <div style="margin-left: 10px; margin-top: 5%">
+        <div style="margin-top: 10px">
+          <el-button type="primary">新增</el-button>
+        </div>
+        <div style="margin-top: 10px">
+          <el-button type="success">编辑</el-button>
+        </div>
+        <div style="margin-top: 10px">
+          <el-button type="danger">删除</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      tableData: [
+        {
+          index: "2",
+          groupnumber: "33",
+          groupname: "全部",
+          sex: "男",
+          maritalstatus: "未婚",
+          price: "0",
+        },
+        {
+          index: "1",
+          groupnumber: "2fd",
+          groupname: "全部",
+          sex: "女",
+          maritalstatus: "已婚",
+          price: "0",
+        },
+      ],
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 120f378..295bdbd 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -5,9 +5,9 @@ Vue.use(Vuex);
 
 export default new Vuex.Store({
   state: {
-    set:'qqqq',
-    customerOrg:{ //体检单位设置
-      customerOrgTree:[], //体检单位列表
+    set: 'qqqq',
+    customerOrg: { //体检单位设置
+      customerOrgTree: [], //体检单位列表
       treeprops: {
         label: "displayName",
         value: "id",
@@ -20,24 +20,24 @@ export default new Vuex.Store({
     }
   },
   getters: {},
-  
+
   mutations: {//同步更改状态      
-      //通用设置 state 值 option  {key-value} add by pengjun 
-      setData(state, option){
-          let array = option.key.split('.')
-          switch(array.length){
-              case 1:
-                  state[array[0]] = option.value;break;
-              case 2:
-                  state[array[0]][array[1]] = option.value;break;
-              case 3:
-                  state[array[0]][array[1]][array[2]] = option.value;break;
-              case 4:
-                  state[array[0]][array[1]][array[2]][array[3]] = option.value;break;
-          }
+    //通用设置 state 值 option  {key-value} add by pengjun 
+    setData(state, option) {
+      let array = option.key.split('.')
+      switch (array.length) {
+        case 1:
+          state[array[0]] = option.value; break;
+        case 2:
+          state[array[0]][array[1]] = option.value; break;
+        case 3:
+          state[array[0]][array[1]][array[2]] = option.value; break;
+        case 4:
+          state[array[0]][array[1]][array[2]][array[3]] = option.value; break;
       }
+    }
   },
-  
+
   actions: {},
   modules: {},
 });
diff --git a/src/views/customerOrg/customerOrgGroup.vue b/src/views/customerOrg/customerOrgGroup.vue
index ef38bd1..347d454 100644
--- a/src/views/customerOrg/customerOrgGroup.vue
+++ b/src/views/customerOrg/customerOrgGroup.vue
@@ -1,1670 +1,56 @@
 <template>
-  <div class="box">
-    <div style="width: 150%">
+  <div style="display: flex">
+    <div class="box">
       <el-card>
-        <el-row style="margin-top: 20px; margin-left: 15px">
-          <el-col :span="4">
-            <el-autocomplete
-              class="inline-input"
-              v-model="pages.Filter"
-              :fetch-suggestions="querySearch"
-              placeholder="请输入内容"
-              @select="handleSelect"
-            >
-              <template slot-scope="{ item }">
-                <div
-                  class="name"
-                  @click="selsearch(item.id, item.medicalConclusionTypeId)"
-                >
-                  {{ item.displayName }}
-                </div>
-              </template></el-autocomplete
-            >
-          </el-col>
-          <el-col :span="7" style="margin-left: 5%">
-            <el-col :span="6" style="margin-top: 10px; margin-left: 10px"
-              >类别选择</el-col
-            >
-            <el-select
-              filterable
-              v-model="Selectvalue"
-              placeholder="请选择"
-              @change="isselctvalue"
-            >
-              <el-option
-                v-for="item in Selectacategory"
-                :key="item.id"
-                :label="item.displayName"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
-          </el-col>
-        </el-row>
-        <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: 95%; 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="结果类别"
-                prop="resultTemplateTypeFlag"
-              ></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>
+        <span>单位</span>
+        <el-select v-model="value" placeholder="请选择" style="margin-left:20px">
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.displayName"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+        <div>
+          <CustomerOrgTree></CustomerOrgTree>
+          <UnitGroupCategory></UnitGroupCategory>
         </div>
+        
       </el-card>
     </div>
-    <el-dialog
-      :title="title == 1 ? '新增' : '编辑'"
-      :visible.sync="dialogVisible"
-      width="70%"
-    >
-      <el-form ref="form" :model="form" label-width="110px" :rules="rules">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="名称" prop="displayName">
-              <el-input v-model="form.displayName"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="英文缩写" prop="englishShortName">
-              <el-input v-model="form.englishShortName"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="项目类别" prop="itemTypeId">
-              <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"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
-                </el-option>
-              </el-select> -->
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="价格" prop="price">
-              <el-input v-model="form.price"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="价表项目编码" prop="priceItemId">
-              <el-select v-model="form.priceItemId" placeholder="请选择">
-                <el-option
-                  v-for="item in priceItemId"
-                  :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="单位" prop="unitId">
-              <el-select v-model="form.unitId" placeholder="请选择">
-                <el-option
-                  v-for="item in unitId"
-                  :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="默认结果" prop="defaultResult">
-              <el-input v-model="form.defaultResult"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="参考范围类别" prop="referenceRangeTypeFlag">
-              <el-input v-model="form.referenceRangeTypeFlag"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="生成小结" prop="isProduceSummary">
-              <el-input v-model="form.isProduceSummary"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="名称进入小结" prop="isNameIntoSummary">
-              <el-select v-model="form.isNameIntoSummary" placeholder="请选择">
-                <el-option
-                  v-for="item in isNameIntoSummary"
-                  :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="启用诊断函数" prop="isDiagnosisFunction">
-              <el-select
-                v-model="form.isDiagnosisFunction"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in isDiagnosisFunction"
-                  :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="诊断函数" prop="diagnosisFunction">
-              <el-input v-model="form.diagnosisFunction"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="是计算项目" prop="isCalculationItem">
-              <el-select v-model="form.isCalculationItem" placeholder="请选择">
-                <el-option
-                  v-for="item in isCalculationItem"
-                  :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="计算函数" prop="calculationFunction">
-              <el-input v-model="form.calculationFunction"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="继续处理" prop="isContinueProcess">
-              <el-select v-model="form.isContinueProcess" placeholder="请选择">
-                <el-option
-                  v-for="item in isContinueProcess"
-                  :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="结果模板" prop="resultTemplateTypeFlag">
-              <el-input v-model="form.resultTemplateTypeFlag"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="输入结果校验" prop="inputCheck">
-              <el-input v-model="form.inputCheck"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="启用" prop="isActive">
-              <el-select v-model="form.isActive" placeholder="请选择">
-                <el-option
-                  v-for="item in isActive"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!--  -->
-        <el-divider></el-divider>
-        <el-row>
-          <el-col :span="5">
-            <el-form-item label="创建者">
-              <el-input v-model="form.creatorName" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="创建时间" style="margin-left: -5%">
-              <el-input
-                :value="form.creationTime | dateFormat"
-                disabled
-                style="width: 90%"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="5">
-            <el-form-item label="修改者" style="margin-left: -25%">
-              <el-input v-model="form.creatorName" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="修改时间" style="margin-left: -5%">
-              <el-input
-                :value="form.lastModificationTime | dateFormat"
-                disabled
-                style="width: 90%"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="Onsubmit">确 定</el-button>
-      </span>
-    </el-dialog>
-    <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 5%">
-      <el-button type="primary" @click="add">新增</el-button>
-      <el-button
-        type="primary"
-        @click="editpopup"
-        style="margin-left: 0; margin-top: 10px"
-        >编辑</el-button
-      >
-      <div style="margin-top: 10px">
-        <el-button type="danger" @click="delsrts">删除</el-button>
-      </div>
-      <div style="margin-top: 10px">
-        <el-button type="primary" @click="topping">置顶</el-button>
-      </div>
-      <div style="margin-top: 10px">
-        <el-button type="primary" @click="toppings">置底</el-button>
-      </div>
-      <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="assertion"
-          >排序</el-button
-        >
-      </div>
-      <div style="margin-top: 5px">
-        <el-button type="primary" :disabled="isshow" @click="cancellation"
-          >取消</el-button
-        >
-      </div>
-      <div style="margin-top: 5px">
-        <el-button
-          type="primary"
-          size="mini"
-          @click="resulttemplate"
-          style="width: 70px; height: 50px"
-          >结果模板</el-button
-        >
-      </div>
-      <div style="margin-top: 5px">
-        <el-button
-          type="primary"
-          size="mini"
-          @click="referencerange"
-          style="width: 70px; height: 50px"
-          >参考范围</el-button
-        >
-      </div>
-    </div>
-    <!-- 结果模板弹框 -->
-    <el-dialog title="结果模板" :visible.sync="rurestdialogVisible" width="80%">
-      <div style="display: flex">
-        <div style="width: 95%">
-          <el-table
-            border=""
-            :data="reusttableData"
-            @row-click="reustclick"
-            highlight-current-row
-          >
-            <el-table-column label="编号" prop="id"></el-table-column>
-            <el-table-column label="项目编号" prop="itemId"></el-table-column>
-            <el-table-column label="创建时间" width="200">
-              <template slot-scope="scope">
-                {{ scope.row.creationTime | dateFormat }}
-              </template>
-            </el-table-column>
-            <el-table-column label="修改时间" width="200">
-              <template slot-scope="scope">
-                {{ scope.row.lastModificationTime | dateFormat }}
-              </template>
-            </el-table-column>
-            <el-table-column label="结果" prop="result"></el-table-column>
-            <el-table-column label="项目结果">
-              <template slot-scope="scope">
-                {{ scope.row.id }}
-              </template>
-            </el-table-column>
-          <el-table-column label="诊断">
-              <template>
-              
-            </template>
-          </el-table-column>
-          </el-table>
-        </div>
-        <div style="margin-top: 5px; margin-left: 15px">
-          <el-button type="primary" @click="increase">添加1</el-button>
-          <div style="margin-top: 5px">
-            <el-button type="primary" @click="resultediting">编辑</el-button>
-          </div>
-          <div style="margin-top: 5px">
-            <el-button type="primary" @click="delemtdelite">删除</el-button>
-          </div>
-          <!-- <div style="margin-top: 5px">
-            <el-button type="primary" @click="templatecategory"
-              >模板类别</el-button
-            >
-          </div> -->
-          <div style="margin-top: 5px">
-            <el-button type="primary" @click="diagnosticmatching"
-              >诊断匹配</el-button
-            >
-          </div>
-        </div>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="rurestdialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="rurestdialogVisible = false"
-          >确 定</el-button
-        >
-      </span>
-    </el-dialog>
-    <!-- 结果模板添加或者修改弹框 -->
-    <el-dialog
-      :title="ruesttiele == 1 ? '新增' : '修改'"
-      :visible.sync="ruesttieledialogVisible"
-      width="80%"
-    >
-      <el-form :model="rusetform" ref="rusetform" label-width="100px">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="项目">
-              <el-select v-model="rusetform.itemId" placeholder="请选择">
-                <el-option
-                  v-for="item in itemId"
-                  :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-input v-model="rusetform.result"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="诊断编号">
-              <el-select v-model="rusetform.diagnosisId" placeholder="请选择">
-                <el-option
-                  v-for="item in diagnosisId"
-                  :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="rusetform.isNameIntoSummary"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in isNameIntoSummary"
-                  :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="rusetform.isResultIntoSummary"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in isResultIntoSummary"
-                  :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="rusetform.resultStatusId"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in resultStatusId"
-                  :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="ruesttieledialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="rusteronsubmit">确 定</el-button>
-      </span>
-    </el-dialog>
-    <!-- 参考范围弹框 -->
-    <el-dialog
-      title="参考范围"
-      :visible.sync="referencerangedialogVisible"
-      width="80%"
-    >
-      <el-row>
-        <el-col :span="8">
-          <span>参考范围类型</span>
-          <el-select
-            v-model="referencerangevalue"
-            filterable
-            placeholder="请选择"
-            @change="selecttype"
-          >
-            <el-option
-              v-for="item in referencerangedata"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- //无参考范围 2223456-->
-      <el-card
-        v-if="referencerangevalue == 0"
-        style="margin-top: 20px"
-      ></el-card>
-      <!-- 数字型参考范围 -->
-      <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">
-                <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 slot-scope="item">
-                  <el-input
-                    v-model="item.row.name"
-                    @blur="blurInput(item.row.id, 'name', item.row.name)"
-                  ></el-input>
-                </template>
-              </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>
-              <el-table-column label="偏低诊断"></el-table-column>
-              <el-table-column label="偏高诊断"></el-table-column>
-            </el-table>
-          </el-card>
-        </div>
-        <div style="margin-left: 10px; margin-top: 30px">
-          <el-button type="primary" @click="digitaladdion">添加</el-button>
-          <div style="margin-top: 5px">
-            <el-button
-              type="primary"
-              size="mini"
-              @click="diagnosticsettings"
-              style="width: 70px; height: 50px"
-              >诊断设置</el-button
-            >
-          </div>
-        </div>
-      </div>
-      <!-- 字符型参考范围 -->
-      <div v-if="referencerangevalue == 2">
-        <div style="margin: 20px 0; display: flex">
-          <div style="width: 90%">
-            <el-input
-              type="textarea"
-              placeholder="请输入内容"
-              v-model="fssubdex"
-              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"
-          >取 消</el-button
-        >
-        <el-button type="primary" @click="determinetype">确 定</el-button>
-      </span>
-    </el-dialog>
-    <!-- 项目结果模板弹框 -->
-    <el-dialog
-      title="结果模板"
-      :visible.sync="projectdialogVisible"
-      width="80%"
-    >
-      <div style="display: flex">
-        <div style="width: 95%">
-          <el-table :data="projectdata">
-            <el-table-column label="编号" prop="id"> </el-table-column>
-            <el-table-column label="结果" prop="result"> </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: 5%">
-          <el-button type="primary" @click="resultaddition">添加</el-button>
-        </div>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="projectdialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="projectdialogVisible = false"
-          >确 定</el-button
-        >
-      </span>
-    </el-dialog>
-    <!--诊断匹配弹框-->
-    <el-dialog
-      title="诊断匹配"
-      :visible.sync="diagnosdialogVisible"
-      width="80%"
-    >
-      <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"
-          >确 定</el-button
-        >
-      </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-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>
-    <!--诊断设置弹框  -->
-    <el-dialog title="诊断建议设置" :visible.sync="diagnostisbox" width="80%">
-      <div style="display: flex">
-        <div style="width: 95%">
-          <el-card>
-            <el-row>
-              <el-col :span="8">
-                <el-select v-model="value" placeholder="请选择">
-                  <el-option
-                    v-for="item in itemTypeId"
-                    :key="item.id"
-                    :label="item.displayName"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </el-col>
-              <el-col :span="8"> 2122 </el-col>
-            </el-row>
-            <!-- table部分 -->
-            <el-row> </el-row>
-          </el-card>
-        </div>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="diagnostisbox = false">取 消</el-button>
-        <el-button type="primary" @click="diagnostisbox = false"
-          >确 定</el-button
-        >
-      </span>
-    </el-dialog>
-
-    <!--  -->
+   
   </div>
 </template>
 <script>
-import { yzstr } from "@/utlis/validate";
-import {
-  getporjectlists,
-  projectlist,
-  addproject,
-  priceitemlist,
-  posjrctid,
-  projectedit,
-  projectdeleft,
-  projttitem,
-  projectdreog,
-} from "@/request/commonapi";
-import { unitlist } from "@/request/systemapi";
-import Sortable from "sortablejs";
-import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import CustomerOrgTree from "../../components/unitGrouping/unitGroupingTable.vue";
+import  UnitGroupCategory from "../../components/unitGrouping/unitGroupCategory.vue"
+import { getapi } from "@/api/api";
 export default {
+  components: {
+    CustomerOrgTree,
+    UnitGroupCategory
+  },
   data() {
     return {
+      options: [],
       value: "",
-      diagnostisbox: false, //诊断设置弹框的方法
-      // 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: [], //结果模板
-      projectdialogVisible: false,
-      itemId: [], //项目id
-      diagnosisId: [], //诊断
-      rusetform: {
-        itemId: "",
-        result: "",
-        diagnosisId: "",
-        isNameIntoSummary: "",
-        isResultIntoSummary: "",
-        resultStatusId: "",
-        simpleCode: "",
-      }, //项目结果模板需要的数据
-      resultStatusId: [], //结果状态
-      isNameIntoSummary: [
-        {
-          value: "Y",
-          label: "是",
-        },
-        {
-          value: "N",
-          label: "否",
-        },
-      ], //小结名称
-      isResultIntoSummary: [
-        {
-          value: "Y",
-          label: "是",
-        },
-        {
-          value: "N",
-          label: "否",
-        },
-      ], //进入小结
-
-      ruesttiele: 1,
-      ruesttieledialogVisible: false,
-      referencerangedata: [
-        {
-          value: "0",
-          label: "无参考范围",
-        },
-        {
-          value: "1",
-          label: "数字型参考范围",
-        },
-        {
-          value: "2",
-          label: "字符型参考范围",
-        },
-        {
-          value: "3",
-          label: "性激素参考范围",
-        },
-      ], //参考范围下拉框
-      referencerangevalue: "0",
-      referencerangedialogVisible: false, //参考范围弹框
-      Selectvalue: "",
-      Selectacategory: [],
-      rurestdialogVisible: false,
-      isshow: true,
-      reusttableData: [],
-      tableData: [],
-      initTableData: [],
-      pages: {
-        Filter: "",
-        Sorting: "",
-        SkipCount: 0,
-        MaxResultCount: 100,
-      },
-      title: 1,
-      form: {
-        displayName: "",
-        englishShortName: "",
-        itemTypeId: "",
-        price: "",
-        priceItemId: "",
-        unitId: "",
-        defaultResult: "",
-        referenceRangeTypeFlag: "",
-        isProduceSummary: "",
-        isNameIntoSummary: "",
-        isDiagnosisFunction: "",
-        diagnosisFunction: "",
-        isCalculationItem: "",
-        calculationFunction: "",
-        isContinueProcess: "",
-        resultTemplateTypeFlag: "",
-        inputCheck: "",
-        isActive: "",
-      },
-      isProduceSummary: [
-        {
-          value: "Y",
-          label: "是",
-        },
-        {
-          value: "N",
-          label: "否",
-        },
-      ], //生成小结
-      isNameIntoSummary: [
-        {
-          value: "Y",
-          label: "是",
-        },
-        {
-          value: "N",
-          label: "否",
-        },
-      ], //名称进入小结
-      isDiagnosisFunction: [
-        {
-          value: "Y",
-          label: "是",
-        },
-        {
-          value: "N",
-          label: "否",
-        },
-      ], //启用诊断函数
-      isCalculationItem: [
-        {
-          value: "Y",
-          label: "是",
-        },
-        {
-          value: "N",
-          label: "否",
-        },
-      ], //是计算项目
-      isContinueProcess: [
-        {
-          value: "Y",
-          label: "是",
-        },
-        {
-          value: "N",
-          label: "否",
-        },
-      ], //是继续处理
-      inputCheck: [
-        {
-          value: "Y",
-          label: "是",
-        },
-        {
-          value: "N",
-          label: "否",
-        },
-      ], //输入结果校验公式
-      isActive: [
-        {
-          value: "Y",
-          label: "是",
-        },
-        {
-          value: "N",
-          label: "否",
-        },
-      ], //启用
-      dialogVisible: false,
-      rules: {
-        displayName: [
-          { required: true, message: "请输入名称", trigger: "blur" },
-        ],
-        englishShortName: [
-          { required: true, message: "请输入英文缩写", trigger: "blur" },
-        ],
-        itemTypeId: [
-          { required: true, message: "请输入项目类别", trigger: "blur" },
-        ],
-        price: [{ required: true, message: "请输入价格", trigger: "blur" }],
-        priceItemId: [
-          { required: true, message: "请输入价表项目编码", trigger: "blur" },
-        ],
-        unitId: [{ required: true, message: "请输入单位", trigger: "blur" }],
-        defaultResult: [
-          { required: true, message: "请输入默认结果", trigger: "blur" },
-        ],
-        referenceRangeTypeFlag: [
-          { required: true, message: "请输入参考范围类别", trigger: "blur" },
-        ],
-        isProduceSummary: [
-          { required: true, message: "请选择是生成小结", trigger: "blur" },
-        ],
-        isNameIntoSummary: [
-          { required: true, message: "请输择称进入小结", trigger: "blur" },
-        ],
-        isDiagnosisFunction: [
-          { required: true, message: "请选择启用诊断函数", trigger: "blur" },
-        ],
-        diagnosisFunction: [
-          { required: true, message: "请输入诊断函数", trigger: "blur" },
-        ],
-        isCalculationItem: [
-          { required: true, message: "请选择计算项目", trigger: "blur" },
-        ],
-        calculationFunction: [
-          { required: true, message: "请输入计算函数", trigger: "blur" },
-        ],
-        isContinueProcess: [
-          { required: true, message: "请选择继续处理", trigger: "blur" },
-        ],
-        resultTemplateTypeFlag: [
-          {
-            required: true,
-            message: "请输入结果模板类别标志",
-            trigger: "blur",
-          },
-        ],
-        inputCheck: [
-          { required: true, message: "请选择结果校验公式", trigger: "blur" },
-        ],
-        isActive: [{ required: true, message: "请选择启用", trigger: "blur" }],
-      },
-      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",
-      }, //左侧树形结构
-      newssdate: [
-        {
-          id: "1",
-          name: "",
-        },
-        {
-          id: "2",
-          name: "",
-        },
-      ],
-      ssdate: [],
-      fssubdex: "",
-      resultitemtype: [], //项目类别
     };
   },
   created() {
-    this.getlist();
-    this.getmedicalconclusionlist();
-  },
-  mounted() {
-    this.rowDrop();
-    this.typeid();
+    this.getitemtype();
   },
   methods: {
-    //参考范围确定类型
-    determinetype() {
-      if (this.referencerangevalue == 2) {
-        console.log(this.form.id);
-        let obj = {
-          itemId: this.form.id,
-          referenceRangeValue: this.fssubdex,
-          referenceRangeTypeFlag: this.referencerangevalue,
-        };
-        postapi("/api/app/reference-range/text", obj).then((res) => {
-          this.$message.success("新增成功");
-          this.fssubdex = res.data.referenceRangeValue;
-          this.diagnosdialogVisible = false;
-        });
-      }
-    },
-    async blurInput(id, name, value) {
-      var isdate = false; //是否存在
-      for (var i = 0; i < this.newssdate.length; i++) {
-        if (this.newssdate[i].id == id) {
-          isdate = true;
-          console.log("888");
-          console.log(this.newssdate[i][name]);
-
-          this.newssdate[i][name] = value;
-        }
-      }
-
-      if (!isdate) {
-        for (var j = 0; j < this.ssdate.length; j++) {
-          if (this.ssdate[j].id == id) {
-            this.newssdate.push(this.ssdate[j]);
-          }
-        }
-      }
-      //
-    },
-    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.diagnosdialogVisible);
-      // postapi("/api/app/diagnosis/getlistinfilter").then((res) => {
-      //   this.diagnosticdata = res.data.items;
-      //   console.log(res);
-      // });
-      this.$router.push({ path: "/diagnosis" });
-    },
-    //结果模板添加
-    resultaddition() {},
-    //模板类别弹框
-    // templatecategory() {
-    //   getapi("/api/app/item-result-template").then((res) => {
-    //     this.projectdata = res.data.items;
-    //     console.log(res);
-    //   });
-    //   this.projectdialogVisible = true;
-    // },
-    //项目模板置底
-    bottoming() {
-      if (this.rusetform.id == undefined) {
-        this.$message.warning("请选择操作的数据");
-      } else {
-        putapi(
-          `/api/app/itemresulttemplate/updatemanysort?id=${this.rusetform.id}&SortType=2`
-        ).then((res) => {
-          this.$message.success("操作成功");
-          this.resultlist();
-        });
-      }
-    },
-    //项目模板置顶
-    toppingqq() {
-      console.log(this.rusetform.id);
-      if (this.rusetform.id == undefined) {
-        this.$message.warning("请选择操作的数据");
-      } else {
-        putapi(
-          `/api/app/itemresulttemplate/updatemanysort?id=${this.rusetform.id}&SortType=1`
-        ).then((res) => {
-          this.$message.success("操作成功");
-          this.resultlist();
-        });
-      }
-    },
-    //结果模板删除
-    delemtdelite() {
-      if (this.rusetform.id == undefined) {
-        this.$message.warning("请选择操作的数据");
-      } else {
-        deletapi(`/api/app/item-result-template/${this.rusetform.id}`).then(
-          (res) => {
-            this.$message.success("删除成功");
-            this.resultlist();
-          }
-        );
-      }
-    },
-    reustclick(row) {
-      // this.rusetform = row;
-      getapi(`/api/app/item-result-template/${row.id}`).then((res) => {
-        this.rusetform = res.data;
-      });
-      console.log(row);
-    },
-    //项目结果模板新增弹框
-    resultediting() {
-      if (this.rusetform.id == undefined) {
-        this.$message.warning("请选择操作的数据");
-      } else {
-        this.addoredit();
-        this.ruesttiele = 2;
-        this.ruesttieledialogVisible = true;
-      }
-    },
-    //结果模板新增或者修改
-    rusteronsubmit() {
-      if (this.ruesttiele == 1) {
-        postapi("/api/app/item-result-template", this.rusetform).then((res) => {
-          this.$message.success("新增成功");
-          this.ruesttieledialogVisible = false;
-          this.resultlist();
-        });
-      } else if (this.ruesttiele == 2) {
-        putapi(
-          `/api/app/item-result-template/${this.rusetform.id}`,
-          this.rusetform
-        ).then((res) => {
-          this.$message.success("修改成功");
-          this.ruesttieledialogVisible = false;
-          this.resultlist();
-        });
-      }
-    },
-    //诊断设置弹框新增
-    diagnosticsettings() {
-      // this.diagnostisbox = true;
-      // console.log("1");
-      this.$router.push({ path: "/diagnosis" });
-    },
-    digitaladdion() {
-      this.referencerangedata.push({
-        gender: "全部",
-        agewise: "200",
-        underage: "下",
-        onreference: "0",
-        underreference: "上",
-      });
-    },
-    //参考范围下拉选择
-    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");
-      }
-    },
-    //结果模板添加或者修改需要的列
-    addoredit() {
-      getapi("/api/app/item/in-filter").then((res) => {
-        this.itemId = res.data.items;
-      });
-      getapi("/api/app/result-status").then((res) => {
-        // this.result = res.data.items;
-        this.resultStatusId = res.data.items;
-      });
-      postapi("/api/app/diagnosis/getlistinfilter").then((res) => {
-        console.log(res);
-        this.diagnosisId = res.data.items;
-      });
-    },
-    //结果模板添加
-    increase() {
-      this.addoredit();
-      this.ruesttiele = 1;
-      this.ruesttieledialogVisible = true;
-      this.rusetform = {};
-    },
-    //获取项目类别列表
-    getmedicalconclusionlist() {
-      getapi("/api/app/item-type").then((res) => {
-        this.Selectacategory = res.data.items;
-        console.log(res);
-      });
-    },
-    isselctvalue(v) {
-      this.pages.TypeId = v;
-      console.log(v);
-      console.log(this.pages.TypeId);
-      this.getlist();
-    },
-    handleSelect(item) {
-      this.pages.Filter = item.displayName;
-      this.item = item;
-      this.formid = item.id;
-      console.log(this.item);
-      //console.log(item);
-      //    quersmedicalid(item.id).then((res) => {
-      //   console.log(res);
-      //   this.form = res.data;
-      // });
-    },
-    getlistM(rowsid) {
-      getporjectlists(this.pages).then((res) => {
-        console.log("数据", res);
-        this.initTableData = [...res.data.items];
-        this.tableData = res.data.items;
-        if (rowsid != null && rowsid != "") {
-          var row = this.tableData.filter((item) => item.id == rowsid);
-          this.$refs.tableData.setCurrentRow(row[0]);
-          getapi(`/api/app/item/${rowsid}`).then((res) => {
-            this.form = res.data;
-          });
-        }
-      });
-    },
-    selsearch(id, typeid) {
-      this.Selectvalue = typeid;
-      this.pages.TypeId = typeid;
-      this.getlistM(id);
-    },
-    createFilter(queryString) {
-      return (tableData) => {
-        return (
-          tableData.displayName
-            .toLowerCase()
-            .indexOf(queryString.toLowerCase()) != -1
-        );
-      };
-    },
-    querySearch(queryString, cb) {
-      var tableData = this.tableData;
-      var tableDatas = queryString
-        ? tableData.filter(this.createFilter(queryString))
-        : tableData;
-      // 调用 callback 返回建议列表的数据
-      cb(tableDatas);
-    },
-    resultlist() {
-      getapi("/api/app/item-result-template").then((res) => {
-        this.reusttableData = res.data.items;
-
-        console.log(res);
+    getitemtype() {
+      getapi("/api/app/item-type/by-code-all").then((res) => {
+        this.options = res.data;
       });
     },
-    resulttemplate() {
-      if (this.form.id == undefined) {
-        this.$message.warning("请选择操作的数据");
-      } else {
-        this.rurestdialogVisible = true;
-        getapi("/api/app/item-result-template").then((res) => {
-          this.reusttableData = res.data.items;
-          console.log("2222222222222222");
-          console.log(res);
-        });
-        //// 获取项目类别
-        getapi("/api/app/item-type/by-code-all").then((res) => {
-          this.resultitemtype = res.data;
-          console.log(res);
-        });
-      }
-    },
-    //取消排序
-    cancellation() {
-      this.$message.info("取消操作");
-      this.isshow = true;
-      this.getlist();
-    },
-    //确定拖拽
-    assertion() {
-      const result = [];
-      this.tableData.forEach((item, index) => {
-        // index 从0开始的， displayOrder从大到小排
-        console.log(item.id);
-        // const currentDisplayOrder = this.tableData.length -1
-        const currentDisplayOrder = this.initTableData[index].displayOrder;
-        if (item.displayOrder != currentDisplayOrder) {
-          // 如果它的displayOrder和它当前所在的位置不同代表挪动过位置
-          result.push({ id: item.id, displayOrder: currentDisplayOrder });
-        }
-      });
-      projectdreog({ itemList: result }).then((res) => {
-        this.$message.success("操作成功");
-        this.isshow = true;
-        this.getlist();
-      });
-    },
-    //初始化
-    rowDrop() {
-      this.$nextTick(() => {
-        const tbody = document.querySelector(".el-table__body-wrapper tbody");
-        const _this = this;
-        Sortable.create(tbody, {
-          handle: ".move",
-          animation: 300,
-          onEnd({ newIndex, oldIndex }) {
-            _this.isshow = false;
-            const currRow = _this.tableData.splice(oldIndex, 1)[0];
-            _this.tableData.splice(newIndex, 0, currRow);
-            _this.tableData.map((item, index) => {
-              if (index == newIndex && index == oldIndex) {
-                // console.log(item, "新数据");
-              } else if (index == oldIndex) {
-              } else if (index == newIndex) {
-              }
-            });
-            console.log(_this.tableData.map((item) => item.displayOrder));
-          },
-        });
-      });
-    },
-    //置低
-    toppings() {
-      if (this.form.id == undefined) {
-        this.$message.success("请点击选择操作的数据");
-      } else {
-        projttitem(this.form.id, 2).then((res) => {
-          this.$message.success("操作成功");
-          this.getlist();
-        });
-      }
-    },
-    //置顶
-    topping() {
-      if (this.form.id == undefined) {
-        this.$message.warning("请点击选择操作的数据");
-      } else {
-        projttitem(this.form.id, 1).then((res) => {
-          this.$message.success("操作成功");
-          this.getlist();
-        });
-      }
-    },
-    //删除
-    delsrts() {
-      if (this.form.id == undefined) {
-        this.$message.warning("请选择删除的数据");
-      } else {
-        this.$confirm("是否确认删除,是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            projectdeleft(this.form.id).then((res) => {
-              this.$message.success("删除成功");
-              this.getlist();
-              this.form = {};
-            });
-          })
-          .catch(() => {});
-      }
-    },
-    //点击列表通过id查询
-    rowick(row) {
-      posjrctid(row.id).then((res) => {
-        console.log(res);
-        this.form = res.data;
-      });
-      console.log(row);
-    },
-    //编辑弹框
-    editpopup() {
-      if (this.form.id == undefined) {
-        this.$message.warning("请选择操作的数据");
-      } else {
-        this.form.price = Number(this.form.price);
-        this.addorgropdata();
-        this.title = 2;
-        this.dialogVisible = true;
-        posjrctid(this.form.id).then((res) => {
-          console.log(res);
-          this.form = res.data;
-        });
-      }
-    },
-    //确定新增或者编辑
-    Onsubmit() {
-      this.$refs.form.validate((v) => {
-        if (v) {
-          if (this.title == 1) {
-            addproject(this.form).then((res) => {
-              this.$message.success("新增成功");
-              this.getlist();
-              this.dialogVisible = false;
-            });
-          } else if (this.title == 2) {
-            projectedit(this.form.id, this.form).then((res) => {
-              this.$message.success("修改成功");
-              this.getlist();
-              this.dialogVisible = false;
-            });
-          }
-        }
-      });
-      //  addproject(this.form)
-    },
-    //新增弹框
-    add() {
-      this.form.price = Number(this.form.price);
-      this.title = 1;
-      this.dialogVisible = true;
-      this.form = {};
-      this.addorgropdata();
-    },
-    //新增或者编辑弹框需要的下拉框接口数据
-    addorgropdata() {
-      //获取项目id
-      projectlist().then((res) => {
-        this.itemTypeId = res.data;
-        this.tcdate(this.itemTypeId);
-      });
-      //获取单位
-      unitlist().then((res) => {
-        this.unitId = res.data.items;
-      });
-      //获取价格Id
-      priceitemlist().then((res) => {
-        this.priceItemId = res.data.items;
-      });
-    },
-    getlist() {
-      this.getlistM();
-      // getporjectlists(this.pages).then((res) => {
-      //   this.initTableData = [...res.data.items];
-      //   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>
 <style scoped>
 .box {
-  display: flex;
+  width: 100%;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/fee-settings/SysParmType.vue b/src/views/fee-settings/SysParmType.vue
index 39cf86d..f321972 100644
--- a/src/views/fee-settings/SysParmType.vue
+++ b/src/views/fee-settings/SysParmType.vue
@@ -33,8 +33,7 @@
           </el-table-column>
           <el-table-column prop="simpleCode" label="快捷码" width="">
           </el-table-column>
-          <el-table-column prop="parmValue" label="参数值" width="">
-          </el-table-column>
+         
           <el-table-column prop="remark" label="备注" width="360">
           </el-table-column>
           <el-table-column label="创建者" prop="creatorName"></el-table-column>
@@ -79,20 +78,19 @@
         </el-input>
       </div>
       <!-- table区域 -->
-      <el-table :data="tableData" style="width: 100%;margin-top:50px">
-          <el-table-column label="创建者" prop="creatorName"></el-table-column>
-          <el-table-column label="创建时间">
-            <template slot-scope="scope">
-              {{ scope.row.creationTime | dateFormat }}
-            </template>
-          </el-table-column>
-         <el-table-column label="修改者" prop="creatorName"></el-table-column>
-          <el-table-column label="修改时间">
-            <template slot-scope="scope">
-              {{ scope.row.creationTime | dateFormat }}
-            </template>
-          </el-table-column>
-      
+      <el-table :data="tableData" style="width: 100%; margin-top: 50px">
+        <el-table-column label="创建者" prop="creatorName"></el-table-column>
+        <el-table-column label="创建时间">
+          <template slot-scope="scope">
+            {{ scope.row.creationTime | dateFormat }}
+          </template>
+        </el-table-column>
+        <el-table-column label="修改者" prop="creatorName"></el-table-column>
+        <el-table-column label="修改时间">
+          <template slot-scope="scope">
+            {{ scope.row.creationTime | dateFormat }}
+          </template>
+        </el-table-column>
       </el-table>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
@@ -116,6 +114,7 @@ export default {
       form: {
         id: "",
       },
+      organizationid:''
     };
   },
   created() {
@@ -128,6 +127,8 @@ export default {
       this.form = row;
       this.dialogVisible = true;
       console.log(row);
+    
+      // getapi('')
     },
     //c每一列点击
     rowclick(row) {
@@ -146,6 +147,7 @@ export default {
     },
     //组织下拉框值发生变化
     changvalue(v) {
+      this.organizationid=v
       getapi(`/api/app/sys-parm/in-sys-parm-value-name/${v}`).then((res) => {
         this.tableData = res.data;
         console.log(res);