diff --git a/anrui-system-ui/src/views/organizationManage/organizationManage.vue b/anrui-system-ui/src/views/organizationManage/organizationManage.vue
index 440b37c113..7f5f08576a 100644
--- a/anrui-system-ui/src/views/organizationManage/organizationManage.vue
+++ b/anrui-system-ui/src/views/organizationManage/organizationManage.vue
@@ -1,4 +1,4 @@
-<template xmlns="" xmlns="" xmlns="">
+<template>
   <div class="container" style="display: flex;">
     <div class="org-tree">
       <el-tree :data="treedata" node-key="sid" :props="props" :default-expanded-keys="['fd6435f2-0005-11ec-a033-48452053aa33']" @node-click="handleNodeClick">
@@ -34,48 +34,39 @@
           </td>
         </tr>
         <tr>
-          <td>组织地址</td>
+          <td>组织简称</td>
           <td>
-            <el-input v-model="form.addrs" style="width:300px"></el-input>
+            <el-input v-model="form.orgAbbre" style="width: 30%"></el-input>
           </td>
-          <td>组织属性</td>
+          <td>分管人员</td>
           <td>
-            <el-select v-model="form.orgAttributeValue" placeholder="请选择" filterable @change="changeOrgAttribute">
-              <el-option v-for="item in orgAttribute_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+            <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
+              <el-option v-for="item in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
             </el-select>
           </td>
         </tr>
         <tr>
-<!--          <td>主管人员</td>-->
-<!--          <td>-->
-<!--            <el-select v-model="form.zgStaffSid" style="width:300px" clearable>-->
-<!--              <el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">-->
-<!--              </el-option>-->
-<!--            </el-select>-->
-<!--          </td>-->
-          <td>组织简称</td>
+          <td>管理层级</td>
           <td>
-            <el-input v-model="form.orgAbbre" style="width: 30%"></el-input>
+            <el-select v-model="form.orgLevelValue" style="width:300px" placeholder="请选择" filterable @change="changeOrgLevel">
+              <el-option v-for="item in orgLevel_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+            </el-select>
           </td>
-          <td>分管人员</td>
+          <td>其他编码</td>
           <td>
-            <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
-              <el-option v-for="(item,index) in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
+            <el-input v-model="form.otherCode" style="width:300px" placeholder="与财务中客户编码相同"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>组织地址</td>
+          <td>
+            <el-input v-model="form.addrs" style="width:300px"></el-input>
+          </td>
+          <td>组织属性</td>
+          <td>
+            <el-select v-model="form.orgAttributeValue" placeholder="请选择" filterable @change="changeOrgAttribute">
+              <el-option v-for="item in orgAttribute_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
             </el-select>
-            <!--            <el-autocomplete v-model="form.fgStaffName" :fetch-suggestions="querySearchAsync" class="addinputw"-->
-            <!--                             placeholder="请选择" @select="handleSelect">-->
-            <!--              <i slot="suffix" class="el-icon-edit el-input__icon" @click="inputclear"/>-->
-            <!--              <template slot-scope="{ item }">-->
-            <!--                <div style="paddingg:5px;background-color:Azure;">-->
-            <!--                  <span>分管人员：</span>-->
-            <!--                  <span style="color:red">{{ item.name }}</span><br>-->
-            <!--                </div>-->
-            <!--              </template>-->
-            <!--            </el-autocomplete>-->
-            <!--            <el-select v-model="form.fgStaffSid" style="width:300px">-->
-            <!--              <el-option v-for="(item, i) in staffdata2" :key="i" :label="item.name" :value="item.sid">-->
-            <!--              </el-option>-->
-            <!--            </el-select>-->
           </td>
         </tr>
         <tr>
@@ -122,10 +113,8 @@
           </el-row>
         </el-form>
       </div>
-
       <!-- table -->
       <el-table :data="tableData" default-expand-all border style="width: 100%;">
-        <!--<el-table-column label="序号" type="index" width="40px" align="center"></el-table-column>-->
         <el-table-column label="操作" align="center" width="160px">
           <template slot-scope="scope">
             <el-button type="primary" size="mini" @click="editRow(scope.row)">
@@ -136,7 +125,6 @@
             </el-button>
           </template>
         </el-table-column>
-
         <el-table-column prop="name" label="组织名称" align="center"></el-table-column>
         <el-table-column prop="orgCode" label="组织编码" align="center"></el-table-column>
 <!--        <el-table-column prop="zgNames" label="主管" align="center"></el-table-column>-->
@@ -150,9 +138,7 @@
         </el-table-column>
         <el-table-column prop="qrText" label="二维码" align="center" width="80px">
           <template slot-scope="scope">
-            <el-button @click.native.prevent="lookRow(scope.row)" type="text" size="small">
-              查看
-            </el-button>
+            <el-button @click.native.prevent="lookRow(scope.row)" type="text" size="small">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -214,33 +200,38 @@
             </td>
           </tr>
           <tr>
-            <td>组织地址</td>
+            <td>组织简称</td>
             <td>
-              <el-input v-model="form.addrs" style="width:300px"></el-input>
+              <el-input v-model="form.orgAbbre" style="width: 300px"></el-input>
             </td>
-            <td>组织属性</td>
+            <td>分管人员</td>
             <td>
-              <el-select v-model="form.orgAttributeValue" placeholder="请选择" filterable @change="changeOrgAttribute">
-                <el-option v-for="item in orgAttribute_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+              <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
+                <el-option v-for="item in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
               </el-select>
             </td>
           </tr>
           <tr>
-<!--            <td>主管人员</td>-->
-<!--            <td>-->
-<!--              <el-select v-model="form.zgStaffSid" clearable style="width:300px" @change="zgStaffSidChange">-->
-<!--                <el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </td>-->
-            <td>组织简称</td>
+            <td>管理层级</td>
             <td>
-              <el-input v-model="form.orgAbbre" style="width: 300px"></el-input>
+              <el-select v-model="form.orgLevelValue" style="width:300px" placeholder="请选择" filterable @change="changeOrgLevel">
+                <el-option v-for="item in orgLevel_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+              </el-select>
             </td>
-            <td>分管人员</td>
+            <td>其他编码</td>
             <td>
-              <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
-                <el-option v-for="(item,index) in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
+              <el-input v-model="form.otherCode" style="width:300px" placeholder="与财务中客户编码相同"></el-input>
+            </td>
+          </tr>
+          <tr>
+            <td>组织地址</td>
+            <td>
+              <el-input v-model="form.addrs" style="width:300px"></el-input>
+            </td>
+            <td>组织属性</td>
+            <td>
+              <el-select v-model="form.orgAttributeValue" placeholder="请选择" filterable @change="changeOrgAttribute">
+                <el-option v-for="item in orgAttribute_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
               </el-select>
             </td>
           </tr>
@@ -249,7 +240,6 @@
             <td>
               <el-input v-model="form.linkPerson" style="width:300px"></el-input>
             </td>
-
             <td>联系电话</td>
             <td>
               <el-input v-model="form.linkPhone" style="width:300px"></el-input>
@@ -279,7 +269,6 @@ import {
   addOrgTree,
   delOrgtree,
   getQrCode,
-  getStaff,
   getStaffName,
   orgList,
   pageList,
@@ -313,6 +302,7 @@ export default {
         address: ''
       },
       orgAttribute_list: [],
+      orgLevel_list: [],
       form: {
         sid: '',
         name: '',
@@ -329,7 +319,10 @@ export default {
         isDept: '',
         orgAbbre: '',
         orgAttributeValue: '',
-        orgAttributeKey: ''
+        orgAttributeKey: '',
+        orgLevelValue: '',
+        orgLevelKey: '',
+        otherCode: ''
       },
       fgStaffSid: [],
       formBackup: Object.assign({}, this.form),
@@ -346,29 +339,13 @@ export default {
       },
       tableData: [],
       treedata: [],
-      staffdata: [],
       staffdata2: [],
-      rules: {
-        name: [{ required: true, message: '请输入', trigger: 'blur' }],
-        orgCode: [{ required: true, message: '请输入', trigger: 'blur' }],
-        /* jwd: [
-           {required: true, message: '请输入', trigger: 'blur'}
-         ],*/
-        addrs: [{ required: true, message: '请输入', trigger: 'blur' }],
-        zgStaffSid: [{ required: true, message: '请输入', trigger: 'blur' }],
-        fgStaffSid: [{ required: true, message: '请输入', trigger: 'blur' }],
-        linkPerson: [{ required: true, message: '请输入', trigger: 'blur' }],
-        linkPhone: [{ required: true, message: '请输入', trigger: 'blur' }],
-        sort: [{ required: true, message: '请输入', trigger: 'blur' }]
-      }
+      rules: {}
     }
   },
   mounted() {
     this.getOrgTree()
     this.init()
-    // this.getStaff()
-    // this.getStaff2()
-//    this.getPageList()
   },
   methods: {
     init() {
@@ -377,6 +354,24 @@ export default {
           this.orgAttribute_list = res.data
         }
       })
+      typeValues({ type: 'orgLevel' }).then((res) => {
+        if (res.success) {
+          this.orgLevel_list = res.data
+        }
+      })
+    },
+    changeOrgLevel(value) {
+      let bb = null
+      this.orgLevel_list.forEach((e) => {
+        if (e.dictValue === value) {
+          bb = {
+            value: e.dictValue,
+            key: e.dictKey
+          }
+        }
+      })
+      this.form.orgLevelValue = bb.value
+      this.form.orgLevelKey = bb.key
     },
     changeOrgAttribute(value) {
       let bb = null
@@ -426,23 +421,27 @@ export default {
       if (this.form.sid) {
 //      	console.log(this.form)
         putOrgtree(this.form).then(res => {
-          this.isshow = 'table'
-          this.getOrgTree()
-          this.handleNodeClick({sid: this.form.psid})
-          this.$message({
-            message: res.msg,
-            type: 'success'
-          })
+          if (res.success) {
+            this.isshow = 'table'
+            this.getOrgTree()
+            this.handleNodeClick({ sid: this.form.psid })
+            this.$message({
+              message: res.msg,
+              type: 'success'
+            })
+          }
         })
       } else {
         addOrgTree(this.form).then(res => {
-          this.isshow = 'table'
-          this.getOrgTree()
-          this.handleNodeClick({ sid: this.form.psid })
-          this.$message({
-            message: res.msg,
-            type: 'success'
-          })
+          if (res.success) {
+            this.isshow = 'table'
+            this.getOrgTree()
+            this.handleNodeClick({ sid: this.form.psid })
+            this.$message({
+              message: res.msg,
+              type: 'success'
+            })
+          }
         })
       }
     },
@@ -450,19 +449,19 @@ export default {
       console.log(123456789, data)
       this.dialogTitle = '新增'
       this.isshow = 'edit'
+      this.fgStaffSid = []
       this.form = Object.assign({}, this.formBackup)
       this.form.psid = data.sid || 0
       this.form.organizationSid = this.$store.getters.userInfo.orgSid
       this.form.address = data.orgAddress || data.address
       this.form.dlxx = data.gisInfo || data.dlxx
-      this.getStaff(data.sid)
       this.getStaff2(data.sid)
     },
     editRow(row) {
-      this.getStaff(row.sid)
       this.getStaff2(row.sid)
       this.dialogTitle = '编辑'
       this.isshow = 'edit'
+      this.fgStaffSid = []
       selectBySid(row.sid).then((response) => {
         if (response.success) {
           this.form = response.data
@@ -476,29 +475,11 @@ export default {
           console.log('编辑回显的数据', this.form)
         }
       })
-//       console.log('点击编辑', row)
-//       this.dialogTitle = '编辑'
-//       this.isshow = 'edit'
-// //      this.form = Object.assign({}, row)
-// //      console.log(row)
-//       this.form.psid = row.psid
-//       this.form.sid = row.sid
-//       this.form.name = row.name
-//       this.form.orgCode = row.orgCode
-//       /* this.form.jwd = row.jwd*/
-//       this.form.addrs = row.addrs
-//       this.form.linkPerson = row.linkPerson
-//       this.form.linkPhone = row.linkPhone
-//       this.form.sort = row.sort
-//       this.form.zgStaffSid = row.zgSids
-//       this.form.fgStaffSid = row.fgSids
     },
     deit(data) { // 节点编辑保存
-      this.getStaff(data.sid)
       this.getStaff2(data.sid)
       console.log(data, 8888)
       this.dialogVisible = true
-//      this.form = Object.assign({}, data)
       this.form.sid = data.sid
       // this.form.psid = null
       this.form.name = data.name
@@ -561,64 +542,13 @@ export default {
       this.page.params.name = ''
       this.getPageList(this.page)
     },
-    // 主管人员
-    getStaff(orgSid) {
-      let params = {
-        deptSid: orgSid
-      }
-      console.log('这里是主管人员请求参数', params)
-      getStaff(params).then(res => {
-        console.log('这里是主管人员请求参数', params)
-        this.staffdata = res.data
-        console.log('这里是主管人员下拉框', res.data)
-      })
-    },
-    // 选择主管人员
-    zgStaffSidChange(val) {
-      // const choosetItem = this.payType_list.filter((item) => item.dictKey == val)
-      // this.temp.payType = choosetItem[0].dictValue
-      // console.log('name:', this.temp.payType, 'key:', this.temp.payTypeKey)
-    },
     // 分管人员
     getStaff2(orgSid) {
       getStaffName({ deptSid: orgSid }).then(res => {
         this.staffdata2 = res.data
         console.log('分管人员', this.staffdata2)
       })
-    },
-
-    querySearchAsync(queryString, cb) {
-      console.log('查询条件：', queryString)
-      if (
-        queryString !== null &&
-        queryString !== undefined &&
-        queryString !== ''
-      ) {
-        // this.searchData({ name: queryString })
-        getStaffName({staffName: queryString}).then(res => {
-          if (res.code === '200') {
-            this.staffdata2 = res.data
-            console.log('分管人员', this.staffdata2)
-            cb(res.data)
-          }
-        })
-      } else {
-        console.log('无请求参数', this.staffdata2)
-        this.getStaff2()
-        cb(this.staffdata2)
-      }
-    },
-    handleSelect(e) {
-      console.log('分管选择',e)
-      this.form.fgStaffSid = e.sid
-      this.form.fgStaffName = e.name
-    },
-    // 清空信息
-    inputclear() {
-      this.form.fgStaffName = ''
-      this.form.fgStaffSid = ''
     }
-
   }
 }
 </script>