diff --git a/src/components/customerOrg/ContactPerson.vue b/src/components/customerOrg/ContactPerson.vue
index b452833..191515d 100644
--- a/src/components/customerOrg/ContactPerson.vue
+++ b/src/components/customerOrg/ContactPerson.vue
@@ -1,10 +1,18 @@
 <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="备注" />
@@ -15,15 +23,27 @@
             </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="" />
@@ -33,7 +53,11 @@
             </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>
@@ -54,17 +78,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">
@@ -72,7 +96,6 @@
         <el-button type="primary" @click="">确 定</el-button>
       </span>
     </el-dialog>
-
   </div>
 </template>
 <script>
@@ -91,9 +114,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,
@@ -102,8 +125,8 @@ export default {
   },
   data() {
     return {
-      data:{
-        contactPerson:[]
+      data: {
+        contactPerson: [],
       },
       form: {
         displayName: "",
@@ -126,18 +149,12 @@ export default {
         isActive: "",
       },
 
-
       dialogContactPerson: false, //联系人弹窗 显示控制
       dialogContactMethod: false, //联系方式弹窗 显示控制
 
-     
-      formContactPerson: {
+      formContactPerson: {}, //联系人form表单数据
 
-      },  //联系人form表单数据
-
-      formContactMethod: {
-
-      },  //联系方式form表单数据
+      formContactMethod: {}, //联系方式form表单数据
 
       rules: {
         displayName: [
@@ -198,16 +215,12 @@ export default {
     };
   },
 
-  created() {    
-  },
+  created() {},
 
   //挂载完成
-  mounted() {
-
-  },
+  mounted() {},
 
   methods: {
-
     //联系人 相关操作
     addContactPerson() {
       this.$message.success("新增 addContactPerson");
@@ -219,7 +232,7 @@ export default {
       this.$message.success("删除 delContactPerson");
     },
 
-    rowickContactPerson(){
+    rowickContactPerson() {
       this.$message.success("rowickContactPerson");
     },
   },
diff --git a/src/components/customerOrg/customerOrgTree.vue b/src/components/customerOrg/customerOrgTree.vue
index a55cd70..f3fe121 100644
--- a/src/components/customerOrg/customerOrgTree.vue
+++ b/src/components/customerOrg/customerOrgTree.vue
@@ -1,27 +1,35 @@
 <template>
+<<<<<<< HEAD
   <el-tree :data="customerOrg.customerOrgTree" :props="customerOrg.treeprops" @node-click="treeclick"></el-tree>
+=======
+  <el-tree
+    :data="$store.state.customerOrg.customerOrgTree"
+    :props="$store.state.customerOrg.treeprops"
+    @node-click="treeclick"
+  >
+    </el-tree>
+  
+>>>>>>> f9d318d580e990df8dcef97694425c64af480c32
 </template>
 <script>
 
 import { mapState,mapMutations } from 'vuex'
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 export default {
-  components: {
-    
-  },
+  components: {},
   data() {
-    return {
-      
-    };
+    return {};
   },
+<<<<<<< HEAD
   //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
   computed:{
     ...mapState(['customerOrg']),
   },
+=======
+
+>>>>>>> f9d318d580e990df8dcef97694425c64af480c32
   //创建组件后
-  created() {
-    
-  },
+  created() {},
 
   //挂载组件完成
   mounted() {
@@ -30,38 +38,52 @@ export default {
   },
 
   methods: {
+<<<<<<< HEAD
     ...mapMutations(['setData']),
+=======
+>>>>>>> f9d318d580e990df8dcef97694425c64af480c32
     //获取体检单位列表树信息
     getCustomerOrgTree() {
-      let customerOrgTree = [{
-            displayName: "个人体检",  //
-            id: "00000000-0000-0000-0000-000000000000",  //
-            //treeChildren: [],
-          },
-          {
-            displayName: "组件式",  //
-            id: "10000000-0000-0000-0000-000000000000",  //
-            //treeChildren: [],
-          }
-        ]
+      let customerOrgTree = [
+        {
+          displayName: "个人体检", //
+          id: "00000000-0000-0000-0000-000000000000", //
+          //treeChildren: [],
+        },
+        {
+          displayName: "组件式", //
+          id: "10000000-0000-0000-0000-000000000000", //
+          //treeChildren: [],
+        },
+      ];
       //console.log('this.data.customerOrgTree',this.data.customerOrgTree)
+<<<<<<< HEAD
       this.setData({ key: 'customerOrg.customerOrgTree', value: customerOrgTree})
+=======
+      this.$store.commit("setData", {
+        key: "customerOrg.customerOrgTree",
+        value: customerOrgTree,
+      });
+      
+>>>>>>> f9d318d580e990df8dcef97694425c64af480c32
     },
-    
+
     //点击树节点
     treeclick(data) {
+<<<<<<< HEAD
       this.$message.success(data.id + " 查询单位详情、体检次数、联系人等信息 " + data.displayName);//      
+=======
+      console.log(data);
+      this.$message.success("查询单位详情、体检次数、联系人等信息"); //
+>>>>>>> f9d318d580e990df8dcef97694425c64af480c32
       getapi(`/api/app/item/in-item-type/${data.id}`).then((res) => {
         this.tableData = res.data;
         console.log(res.data, "ress");
         // this.getlist();
       });
     },
-
-    
   },
 };
 </script>
 <style>
-
 </style>
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index c81ea79..7f63e0e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -16,6 +16,7 @@ export default new Vuex.Store({
       customerOrgId:'',//当前单位ID（可根据此值是否为空，判断是新增还是编辑）
       customerOrgRd:{displayName:'单位名称',englishShortName:'简称'}, //单个体检单位记录值
       customerOrgRegister: [], //单位体检次数登记
+    
     }
   },
   getters: {},
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 49d4833..6f3bcd0 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -181,7 +181,7 @@
                 ><i class="el-icon-menu"></i>套餐</el-menu-item
               >
               <el-menu-item index="sys-parm-type"
-                ><i class="el-icon-menu"></i>系统参数类别</el-menu-item
+                ><i class="el-icon-menu"></i>系统参数</el-menu-item
               >
             </el-submenu>
             <el-submenu index="5">
diff --git a/src/views/fee-settings/SysParmType.vue b/src/views/fee-settings/SysParmType.vue
index 4774eef..39cf86d 100644
--- a/src/views/fee-settings/SysParmType.vue
+++ b/src/views/fee-settings/SysParmType.vue
@@ -29,13 +29,13 @@
           style="width: 100%; margin-top: 30px"
           @row-click="rowclick"
         >
-          <el-table-column prop="displayName" label="名称" width="180">
+          <el-table-column prop="displayName" label="名称" width="">
           </el-table-column>
-          <el-table-column prop="simpleCode" label="快捷码" width="180">
+          <el-table-column prop="simpleCode" label="快捷码" width="">
           </el-table-column>
-          <el-table-column prop="parmValue" label="参数值" width="180">
+          <el-table-column prop="parmValue" label="参数值" width="">
           </el-table-column>
-          <el-table-column prop="remark" label="备注" width="180">
+          <el-table-column prop="remark" label="备注" width="360">
           </el-table-column>
           <el-table-column label="创建者" prop="creatorName"></el-table-column>
           <el-table-column label="创建时间">
@@ -47,9 +47,61 @@
             label="修改者"
             prop="lastModifierName"
           ></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button type="primary" @click="paramenterediting(scope.row)"
+                >编辑</el-button
+              >
+            </template>
+          </el-table-column>
         </el-table>
       </el-card>
     </div>
+    <!-- 系统参数编辑弹框-->
+    <el-dialog title="编辑" :visible.sync="dialogVisible" width="50%">
+      <div>
+        <span style="font-size: 20px; line-height: 53px">值:</span>
+        <el-input
+          type="textarea"
+          placeholder="请输入内容"
+          style="width: 50%; margin-left: 20%"
+        >
+        </el-input>
+      </div>
+      <div>
+        <span style="font-size: 20px; line-height: 53px">备注:</span>
+        <el-input
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="form.remark"
+          style="width: 50%; margin-left: 17%; margin-top: 20px"
+        >
+        </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>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+    <!--  -->
   </div>
 </template>
 <script>
@@ -57,6 +109,7 @@ import { getapi } from "@/api/api";
 export default {
   data() {
     return {
+      dialogVisible: false,
       organizationvalue: "",
       organizationdata: [],
       tableData: [],
@@ -70,9 +123,18 @@ export default {
     this.getoraniztion();
   },
   methods: {
+    //系统参数编辑
+    paramenterediting(row) {
+      this.form = row;
+      this.dialogVisible = true;
+      console.log(row);
+    },
     //c每一列点击
     rowclick(row) {
-      console.log(row);
+      // if(row.id==undefined){
+      //   this.$message.warning('请选择操作的数据')
+      // }else if(this.)
+      // console.log(row);
     },
     //获取组织数据
     getoraniztion() {
@@ -88,7 +150,7 @@ export default {
         this.tableData = res.data;
         console.log(res);
       });
-      console.log(v);     
+      console.log(v);
     },
     // getlist() {
     //   getapi("/api/app/sys-parm-type").then((res) => {