diff --git a/src/setting.js b/src/setting.js
index 2518636..8ecc39f 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -11,8 +11,8 @@ if (isDev) {
   jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
   host = 'http://121.37.12.51/'
   // host = 'https://huorantech.cn/'
-  host = 'http://192.168.31.51:9000/'// 榕
-  // host = 'http://192.168.31.137:9000/'// 赓
+  // host = 'http://192.168.31.51:9000/'// 榕
+  host = 'http://192.168.31.116:9000/'// 赓
 } else if (isPro) {
   jumpPath = 'https://www.huorantech.cn/judgmentPoint/'
 }
diff --git a/src/utils/api.js b/src/utils/api.js
index 231096a..d4240dc 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -260,6 +260,8 @@ export default {
     obtainDetails: `users/users/role/obtainDetails`, //获取角色详情
     saveOrUpdate: `users/users/role/saveOrUpdate`, //新增或更新角色
     queryAllMenus: `users/users/permission/queryAllMenus`, //查询所有菜单
+    getSupplierList: `users/users/supplier/getSupplierList`,
+    getSupplierListByRole: `users/users/supplier/getSupplierListByRole`,
 
     // 日志管理
     logAdd: `nakadai/nakadai/log/add`,
diff --git a/src/views/course/AddCurriculum.vue b/src/views/course/AddCurriculum.vue
index 0645255..a5f3913 100644
--- a/src/views/course/AddCurriculum.vue
+++ b/src/views/course/AddCurriculum.vue
@@ -96,7 +96,9 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="供应厂商" prop="supplier">
-                                    <el-input placeholder="请输入供应厂商" v-model.trim="form.supplier"></el-input>
+                                  <el-select v-model="form.supplier" clearable placeholder="请选择供应厂商">
+                                      <el-option v-for="(item, i) in suppliers" :key="i" :label="item.supplierName" :value="item.supplierId"></el-option>
+                                  </el-select>
                                 </el-form-item>
                             </el-col>
 
@@ -451,7 +453,8 @@ export default {
             checkedKeyword: '',
             checkeds: [],
             checkedAll: [],
-            checkAll: false
+            checkAll: false,
+            suppliers: []
         };
     },
     watch: {
@@ -487,6 +490,7 @@ export default {
     mounted() {
       this.getSubject()
       this.getConfig()
+      this.getSupplier()
       this.form.cid && this.getInfoData()
     },
     methods: {
@@ -512,6 +516,12 @@ export default {
             }).catch(err => {
             });
         },
+        // 获取供应厂商
+        getSupplier() {
+          this.$get(this.api.getSupplierListByRole).then(res => {
+            this.suppliers = res.supplierList
+          }).catch(res => {})
+        },
         getSubject() { // 获取学科类别
             this.$get(this.api.courseDiscipline).then(res => {
                 this.subjectList = res.list;
diff --git a/src/views/data/Product.vue b/src/views/data/Product.vue
index 7c94ae3..e9d44fe 100644
--- a/src/views/data/Product.vue
+++ b/src/views/data/Product.vue
@@ -62,7 +62,9 @@
                     </el-input>
                 </el-form-item>
                 <el-form-item label="供应厂商" prop="supplier">
-                    <el-input placeholder="请输入供应厂商" v-model.trim="supplier"></el-input>
+                    <el-select v-model="supplier" clearable placeholder="请选择供应厂商">
+                        <el-option v-for="(item, i) in suppliers" :key="i" :label="item.supplierName" :value="item.supplierId"></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="结算方式" prop="settlementMethod" style="width: 800px">
                   <div class="settlement" style="align-items: center">
@@ -226,6 +228,7 @@ export default {
             previewHead: [],
             previewData: [],
             submited: false,
+            suppliers: []
         };
     },
     watch: {
@@ -253,7 +256,8 @@ export default {
         }
     },
     mounted() {
-        this.getData()
+      this.getData()
+      this.getSupplier()
     },
     methods: {
         // 获取产品列表
@@ -275,6 +279,12 @@ export default {
             this.page = 1
             this.getData()
         },
+        // 获取供应厂商
+        getSupplier() {
+          this.$get(this.api.getSupplierListByRole).then(res => {
+            this.suppliers = res.supplierList
+          }).catch(res => {})
+        },
         // 获取分类下的表
         getTable(n,isConcat){
             this.$post(`${this.api.getIdQueryTable}?categoryId=${n.originId}&showName=&pageNum=${n.typePage}&pageSize=${this.typeUnit}&updateTime=`).then(res => {
diff --git a/src/views/serve/Configure.vue b/src/views/serve/Configure.vue
index 0f43830..d93318e 100644
--- a/src/views/serve/Configure.vue
+++ b/src/views/serve/Configure.vue
@@ -54,6 +54,7 @@
                         {{ systemTypeKeys[scope.row.type] }}
                     </template>
                 </el-table-column>
+                <el-table-column prop="systemName" label="供应商" align="center"></el-table-column>
                 <el-table-column prop="belong" label="系统归属" align="center">
                     <template slot-scope="scope">
                         {{ systemBelongKeys[scope.row.belong] }}
diff --git a/src/views/system/manageLog.vue b/src/views/system/manageLog.vue
index 74144c1..d7c6e01 100644
--- a/src/views/system/manageLog.vue
+++ b/src/views/system/manageLog.vue
@@ -32,7 +32,7 @@
                 </div>
                 <el-timeline class="timeline">
                     <el-timeline-item placement="top" v-for="(item, i) in listData" :key="i" :class="['item' + i, {draft: item.draft}]">
-                        <p class="sign">{{ item.draft ? '未发布' : item.createTime }}</p>
+                        <p class="sign">{{ item.draft ? '未发布' : item.draftTime }}</p>
                         <div class="ver">
                             <div>
                                 {{ item.versionName + (item.draft ? '（草稿）' : '') }}
diff --git a/src/views/system/role.vue b/src/views/system/role.vue
index 85c979a..e3cee05 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -45,14 +45,18 @@
                 <el-form-item prop="role" label="角色权限">
                     <div style="max-height: 300px; overflow: auto">
                         <el-tree
-                            ref="per"
-                            :data="permissions"
-                            show-checkbox
-                            default-expand-all
-                            node-key="id"
-                            :default-expanded-keys="checkedIds"
-                            :default-checked-keys="checkedIds"
-                            :props="defaultProps">
+                          ref="per"
+                          :data="permissions"
+                          show-checkbox
+                          default-expand-all
+                          node-key="id"
+                          :default-expanded-keys="checkedIds"
+                          :default-checked-keys="checkedIds"
+                          :props="defaultProps">
+                          <span class="custom-tree-node" slot-scope="{ node, data }">
+                            <span>{{ node.label }}</span>
+                            <span v-if="datas.includes(node.label)" class="data" @click.stop="showData(data)">数据权限</span>
+                          </span>
                         </el-tree>
                     </div>
                 </el-form-item>
@@ -62,6 +66,18 @@
                 <el-button type="primary" @click="saveData">确 定</el-button>
             </span>
         </el-dialog>
+        
+        <el-dialog title="数据权限设置" :visible.sync="dataVisible" width="500px" class="data-dia" :close-on-click-modal="false">
+            <p class="title">请选择要关联的供应商系统</p>
+            <div class="checks">
+              <el-checkbox v-model="dataCheckAll" @change="checkAll">全部</el-checkbox>
+              <el-checkbox v-for="(item, i) in suppliers" :key="i" v-model="item.check">{{ item.supplierName }}</el-checkbox>
+            </div>
+            <span slot="footer" class="dialog-footer" v-if="!isDetail">
+                <el-button @click="dataVisible = false">取 消</el-button>
+                <el-button type="primary" @click="dataSubmit">确 定</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
@@ -91,7 +107,12 @@ export default {
             roleVisible: false,
             permissions: [],
             checkedIds: [],
-            roleNameReapeat: false // 角色名称是否重复
+            roleNameReapeat: false, // 角色名称是否重复
+            datas: ['客户管理', '订单管理', '课程管理', '服务配置'], // 需要勾选数据权限的模块
+            dataVisible: false,
+            suppliers: [],
+            dataCheckAll: false,
+            curData: {}
         };
     },
     watch: {
@@ -205,6 +226,32 @@ export default {
             this.permissions.length && this.$refs.per.setCheckedNodes([]);
             this.roleVisible = true;
         },
+        // 数据权限全选
+        checkAll(val) {
+          this.suppliers.map(e => e.check = val)
+        },
+        // 展示数据权限弹框
+        showData(data) {
+          this.curData = data
+          this.dataVisible = true
+          this.$get(this.api.getSupplierList).then(res => {
+            const list = res.supplierList
+            const ids = data.supplierIds
+            list.map(e => e.check = ids ? ids.includes(e.supplierId) : false)
+            this.suppliers = list
+            this.dataCheckAll = !list.find(e => !e.check)
+            console.log("🚀 ~ file: role.vue ~ line 235 ~ showData ~ data", data)
+          }).catch(res => {})
+        },
+        // 数据权限确定
+        dataSubmit() {
+          const { id } = this.curData
+          this.permissions[0].children.map(e => {
+            // 给当前选择的权限赋上供应商id，提交的时候一起处理
+            if (e.id == id) e.supplierIds = this.suppliers.filter(e => e.check).map(e => e.supplierId)
+          })
+          this.dataVisible = false
+        },
         // 递归处理勾选的权限
         handleRolePer(data, permissions) {
             let result = data;
@@ -238,33 +285,57 @@ export default {
             this.roleVisible = true;
         },
         async saveData() {
-            if (!this.form.roleName) return this.$message.warning("请填写角色名称");
-            if (!this.form.remark) return this.$message.warning("请填写角色描述");
-            if (!this.$refs.per.getCheckedKeys().length) return this.$message.warning("请选择角色权限");
-            // 获取已勾选的,和半勾选的(即子级没有全部勾选的节点),半勾选的一样要传给后端
-            let permissionId = [...this.$refs.per.getHalfCheckedKeys(), ...this.$refs.per.getCheckedKeys()];
-            let data = {
-                ...this.form,
-                permissionId,
-                platformId: Setting.platformId,
-            };
-            if (this.form.id) {
-                this.$post(this.api.saveOrUpdate, data).then(res => {
-                    this.$message.success("修改成功");
-                    this.getData();
-                    this.roleVisible = false;
-                }).catch(res => {});
+          const { form } = this
+          if (!form.roleName) return this.$message.warning("请填写角色名称");
+          if (!form.remark) return this.$message.warning("请填写角色描述");
+          const tree = this.$refs.per
+          if (!tree.getCheckedKeys().length) return this.$message.warning("请选择角色权限");
+          // 获取已勾选的,和半勾选的(即子级没有全部勾选的节点),半勾选的一样要传给后端
+          const checks = [...this.$refs.per.getHalfCheckedNodes(), ...this.$refs.per.getCheckedNodes()];
+          const ids = []
+          const roleId = form.id
+          checks.map(e => {
+            if (e.supplierIds) {
+              e.supplierIds.map(n => {
+                ids.push({
+                  permissionId: e.id,
+                  roleId,
+                  supplierId: n
+                })
+              })
             } else {
-                this.$post(this.api.saveOrUpdate, data).then(res => {
-                    this.$message.success("新增成功");
-                    this.getData();
-                    this.roleVisible = false;
-                }).catch(res => {});
+              ids.push({
+                permissionId: e.id,
+                roleId
+              })
             }
+          })
+          console.log("🚀 ~ file: role.vue ~ line 296 ~ saveData ~ checks", checks, ids)
+          let data = {
+              ...this.form,
+              dataPermissionList: ids,
+              platformId: Setting.platformId,
+          };
+          debugger
+          this.$post(this.api.saveOrUpdate, data).then(res => {
+              this.$message.success(form.id ? "修改成功" : "新增成功");
+              this.getData();
+              this.roleVisible = false;
+          }).catch(res => {});
         }
     }
 };
 </script>
 <style lang="scss" scoped>
-
+.data {
+  margin-left: 50px;
+  &:hover {
+    color: #9076FF;
+  }
+}
+.data-dia {
+  .title {
+    margin-bottom: 10px;
+  }
+}
 </style>
\ No newline at end of file