diff --git a/fuintAdmin_zt/src/views/Site/add.vue b/fuintAdmin_zt/src/views/Site/add.vue
index e228937a0..040eef8fb 100644
--- a/fuintAdmin_zt/src/views/Site/add.vue
+++ b/fuintAdmin_zt/src/views/Site/add.vue
@@ -1,63 +1,52 @@
 <script>
+import {treeselect as menuTreeselect} from "@/api/system/menu";
+import {selectChildByDeptId} from "@/api/system/Site/site";
+
 export default {
   data() {
     return {
+      merchantId:"2",
       ruleForm: {
         name: '',
-        region: '',
+        storeId: '',
         date1: '',
         date2: '',
-        delivery: false,
+        status: 'A',
         type: [],
         resource: '',
-        desc: ''
+        description: ''
       },
       rules: {
         name: [
-          { required: true, message: '请输入活动名称', trigger: 'blur' },
+          { required: true, message: '请输入角色名称', trigger: 'blur' },
           { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
         ],
-        region: [
-          { required: true, message: '请选择活动区域', trigger: 'change' }
+        storeId: [
+          { required: true, message: '请选择机构信息', trigger: 'change' }
         ],
-        date1: [
-          { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
-        ],
-        date2: [
-          { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
-        ],
-        type: [
-          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
-        ],
-        resource: [
-          { required: true, message: '请选择活动资源', trigger: 'change' }
-        ],
-        desc: [
-          { required: true, message: '请填写活动形式', trigger: 'blur' }
-        ]
       },
       tableData: [{
         id: 1,
-        date: '系统首页',
+        label: '系统首页',
 
       }, {
         id: 2,
-        date: '机构管理',
-        children: [
+        label: '机构管理',
+        childrens: [
           {
             id: 3,
-            date: '组织架构',
+            label: '组织架构',
             name: '王小虎',
             address: '上海市普陀区金沙江路 1519 弄',
 
-            children: [{
+            childrens: [{
               id: 31,
-              date: '用户信息',
+              label: '用户信息',
 
               list:[{show:true,name:'新增'},{show:true,name:'修改'},{show:true,name:'重置密码'},]
             }, {
               id: 32,
-              date: '机构信息',
+              label: '机构信息',
 
               list:[{show:true,name:'保存'},]
             }]
@@ -67,24 +56,37 @@ export default {
 
       },  {
         id: 4,
-        date: '财务报表',
-        children:[{
+        label: '财务报表',
+        childrens:[{
           id: 33,
-          date: '交易对账',
+          label: '交易对账',
 
           list:[{show:true,name:'导出订单'}]
         }, {
           id: 34,
-          date: '流水分析',
+          label: '流水分析',
 
           list:[{show:true,name:'导出订单'},]
         }],
 
       }],
-
+      deptListSelect:[],
     };
   },
+  created() {
+    // this.merchantId = this.$route.query.merchantId
+    // this.getMenuTreeselect()
+    this.selectChildByDeptIdApi()
+  },
   methods: {
+    // 查询菜单树结构
+    getMenuTreeselect() {
+      // merchantId 代表deptType
+      menuTreeselect({merchantId:this.merchantId}).then(response => {
+        this.tableData = response.data;
+        console.log(this.tableData)
+      });
+    },
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -97,7 +99,25 @@ export default {
     },
     resetForm(formName) {
       this.$refs[formName].resetFields();
-    }
+    },
+    // 查询
+    selectChildByDeptIdApi() {
+      selectChildByDeptId().then(res=>{
+        this.deptListSelect = res.data
+        this.ruleForm.storeId = res.data[0].deptId
+        this.merchantId = res.data[0].deptType
+        this.getMenuTreeselect()
+      })
+    },
+    // 选择机构信息
+    chooseRegion(deptId){
+      this.deptListSelect.forEach(item => {
+        if (item.deptId == deptId) {
+          this.merchantId = item.deptType
+          this.getMenuTreeselect()
+        }
+      })
+    },
   }
 }
 </script>
@@ -112,21 +132,28 @@ export default {
         </el-form-item>
       </div>
       <div>
-        <el-form-item label="所属机构" prop="region">
-          <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-            <el-option label="区域一" value="shanghai"></el-option>
-            <el-option label="区域二" value="beijing"></el-option>
+        <el-form-item label="所属机构" prop="storeId">
+          <el-select v-model="ruleForm.storeId" placeholder="请选择所属机构"
+                     @change="chooseRegion(ruleForm.storeId)">
+            <el-option
+              v-for="item in deptListSelect"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId"
+            ></el-option>
           </el-select>
         </el-form-item>
       </div>
       <div>
-        <el-form-item label="角色状态" prop="delivery">
-          <el-switch v-model="ruleForm.delivery"></el-switch>
+        <el-form-item label="角色状态" prop="status">
+          <el-switch v-model="ruleForm.status"
+                     active-value="A"
+                     inactive-value="N"></el-switch>
         </el-form-item>
       </div>
       <div>
-        <el-form-item label="角色描述" prop="desc">
-          <el-input  v-model="ruleForm.desc"></el-input>
+        <el-form-item label="角色描述" prop="description">
+          <el-input  v-model="ruleForm.description"></el-input>
         </el-form-item>
       </div>
 
@@ -139,10 +166,10 @@ export default {
       row-key="id"
       border
       default-expand-all
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      :tree-props="{children: 'childrens', hasChildren: 'hasChildren'}">
 
       <el-table-column
-        prop="date"
+        prop="label"
         label="菜单"
 
         width="180">
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 04b0a8aed..0ec859d61 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -666,13 +666,12 @@
               <el-row :gutter="10" class="mb8">
                 <el-col :span="1.5">
                   <el-button
-                    type="primary"
+                    type="warning"
                     plain
-                    icon="el-icon-plus"
                     size="mini"
                     @click="handleAdd1"
 
-                  >新增
+                  >新增角色
                   </el-button>
                 </el-col>
               </el-row>
@@ -1006,6 +1005,7 @@ export default {
         // 显示搜索条件
         showSearch: true,
         openDuty:false,
+        merchantId:"",
         form1: { id: '', status: 'A', roleType: '4', description: '' },
         // 角色表格数据
         roleList: [],
@@ -1230,9 +1230,11 @@ export default {
       async changeMenu() {
         console.log(this.form1.roleType)
         if (this.form1.roleType == '4') {
+          this.merchantId = 2
           this.getMenuTreeselect(2);
         }
         if (this.form1.roleType == '3') {
+          this.merchantId = 1
           await this.getMenuTreeselect(1);
           await this.handleCheckedTreeNodeAll(true, 'menu')
         }
@@ -1316,11 +1318,12 @@ export default {
         }
       },
       handleAdd1(){
-        this.reset1();
-        this.form1.storeId = this.Thetree[0].id
-        this.openDuty = true;
-        this.title = "添加角色";
-        console.log(this.form1)
+        // this.reset1();
+        // this.form1.storeId = this.Thetree[0].id
+        // this.openDuty = true;
+        // this.title = "添加角色";
+        // console.log(this.form1)
+        this.$router.push({path:"/Site/add",query: { merchantId: this.merchantId }})
       },
       // 查询菜单树结构
       getMenuTreeselect(merchantId) {
@@ -1359,6 +1362,7 @@ export default {
           this.title = "修改角色";
           let checkedKeys = response.data.checkedKeys
           this.form1.checkedKeys = checkedKeys
+          this.merchantId = response.data.roleInfo.type
           this.getMenuTreeselect(response.data.roleInfo.type)
 
           // this.$nextTick(() => {
@@ -1506,7 +1510,7 @@ export default {
         // this.getList();
         this.onlyGetUser()
         this.getDutyList()
-
+        this.merchantId = data.deptType
         this.getMenuTreeselect(data.deptType);
       },