提交

src/views/authority/role.vue

@@ -43,10 +43,21 @@
       title="角色权限配置"
       append-to-body
       :visible.sync="box"
-      width="345px"
+      width="567px"
     >
       <el-tabs type="border-card">
-        <el-tab-pane label="菜单权限">
+        <el-tab-pane label="后管菜单权限">
+          <el-tree
+            :data="menuGrantList"
+            show-checkbox
+            node-key="id"
+            ref="treeMenu"
+            :default-checked-keys="menuTreeObj"
+            :props="props"
+          >
+          </el-tree>
+        </el-tab-pane>
+        <el-tab-pane label="客户菜单权限">
           <el-tree
             :data="menuGrantList"
             show-checkbox

src/views/manager/projectinfo/tree.vue

@@ -289,7 +289,7 @@
                 <el-link
                   class="mg-l-10"
                   type="primary"
-                  @click="adjustExcel(scope.row.pkeyId)"
+                  @click="adjustExcel(scope.row.pkeyId,scope.row.excelId)"
                 >调整表单</el-link>
                 <el-link
                   class="mg-l-10"
@@ -1294,8 +1294,8 @@ import { getList, tabLazytreeAll, saveLinkTab, getExcelHtml } from '@/api/exctab
 export default {
   data () {
     return {
-      jiedianId: '',//节点Id
-      //#region 
+      jiedianId: '',
+      //#region
       sortTag: false,
       sortTag2: false,
       sortArray: [],
@@ -1324,7 +1324,7 @@ export default {
       excelHtml: false,
       //#endregion
 
-      //#region 
+      //#region
       id: '',
       projectid: '',
       filterText: '',
@@ -1418,7 +1418,7 @@ export default {
     //console.log(this.userInfo)
   },
   methods: {
-    //#region 
+    //#region
     init () {
       this.id = this.$route.query.wbsid;
       this.projectid = this.$route.query.pid;
@@ -1989,7 +1989,7 @@ export default {
     },
     //#endregion
 
-    //#region  wbs私有树排序 
+    //#region  wbs私有树排序
     async sortpai (data) {
       console.log(data);
       await this.findWbsTreePrivateSameLevel({
@@ -2122,19 +2122,19 @@ export default {
     },
     //#endregion
 
-    //#region 
+    //#region
     async setParameterName () {
       this.namelist.unshift({ name: '', remark: '', k: '' })
     },
     //#endregion
 
     //#region 调整表单
-    adjustExcel (pkeyId) {//调整表单
+    adjustExcel (pkeyId, excelId) {//调整表单
       this.GLExcelFrom.id = pkeyId
-      this.getExcelHtml()
+      this.getExcelHtml(excelId)
     },
-    async getExcelHtml () {
-      const { data: res } = await getExcelHtml()
+    async getExcelHtml (excelId) {
+      const { data: res } = await getExcelHtml({ excelId })
       console.log(res);
       if (res.code === 200) {
         localStorage.setItem('excelHtml', res.data)

src/views/manager/projectinfo/treeTemplate/template/setInputTPT.vue

@@ -176,7 +176,7 @@ export default {
       }
     },
     async getExcelHtml () {
-      const { data: res } = await getExcelHtml()
+      const { data: res } = await getExcelHtml({excelId:this.excelId})
       console.log(res);
       if (res.code === 200) {
         this.from.value = ''
@@ -201,4 +201,4 @@ export default {
   color: #101010;
   font-size: 14px;
 }
-</style>
+</style>