bug修改

src/components/processSubmitDialog/processSubmitDialog.vue

@@ -266,7 +266,7 @@ export default {
         this.form.pcHandle = '/bpm/handleTask/components/doc/submit.vue';
         this.form.pcView = '/bpm/handleTask/components/doc/index.vue';
       }
-      this.form.formCreateUserId = user.info.userId;
+      this.form.formCreateUserId = this.user.info.userId;
       this.form.businessId = row.id;
       this.form.businessKey = row.businessKey;
       // this.variables = variables;

src/views/doc/components/file-editAll.vue

@@ -112,7 +112,7 @@
     </template>
     <!-- <getCode ref="getCode" @success="success"></getCode> -->
 
-    <ele-modal
+    <!-- <ele-modal
       width="80%"
       :visible.sync="templateVisible"
       :close-on-click-modal="false"
@@ -125,7 +125,7 @@
         <el-button @click="templateVisible = false">取消</el-button>
         <el-button type="primary" @click="addTemplate"> 确认 </el-button>
       </template>
-    </ele-modal>
+    </ele-modal> -->
   </ele-modal>
 </template>
 
@@ -203,6 +203,8 @@ export default {
         this.form.businessCodeId=this.options[0].id
       }
       this.setTree(this.list);
+      
+      console.log(this.list)
     },
     setTree(data) {
       data.forEach((item) => {

src/views/doc/components/main.vue

@@ -41,6 +41,7 @@
               </el-button> -->
             </div>
           </ele-toolbar>
+
           <div class="ele-border-lighter sys-organization-list">
             <el-tree
               ref="tree"
@@ -49,7 +50,7 @@
               :draggable="true"
               node-key="id"
               :props="{ label: 'name', children: 'sonDirectoryList' }"
-              :expand-on-click-node="false"
+              :expand-on-click-node="true"
               :default-expand-all="true"
               @node-click="onNodeClick"
               @node-drop="nodeDrop"
@@ -58,56 +59,63 @@
               <span
                 class="custom-tree-node"
                 slot-scope="{ node, data }"
-                @contextmenu.prevent="onRightClick(data)"
+                @contextmenu.prevent="onRightClick(data, $event)"
                 @click.prevent="clicka"
               >
+                <el-popover
+                  style="position: fixed; z-index: 2000"
+                  placement="top-start"
+                  width="130"
+                  ref="popoverRef"
+                  :popper-append-to-body="true"
+                  v-model="visible"
+                  @click.native="visible = false"
+                  :popper-options="{
+                    boundariesElement: 'viewport',
+                    removeOnDestroy: true
+                  }"
+                  v-if="data.id == rightData.id && fileType === 0 && !isPop"
+                >
+                  <div>
+                    <el-link
+                      v-if="lcyStatus == 1 && isPower(current)"
+                      :underline="false"
+                      @click.native="setPower(data)"
+                      >更改权限
+                    </el-link></div
+                  >
+                  <div>
+                    <el-link
+                      v-if="lcyStatus != 1"
+                      :underline="false"
+                      @click.native="goTo('文档工作区', data)"
+                      >转到文档工作区
+                    </el-link></div
+                  >
+                  <div>
+                    <el-link
+                      v-if="lcyStatus != '2'"
+                      :underline="false"
+                      @click.native="goTo('文档归档区', data)"
+                      >转到文档归档区
+                    </el-link></div
+                  >
+                  <div>
+                    <el-link
+                      v-if="lcyStatus != '3'"
+                      :underline="false"
+                      @click.native="goTo('文档发布区', data)"
+                      >转到文档发布区
+                    </el-link></div
+                  >
+                </el-popover>
+
                 <ElementTreeLine
                   :node="node"
                   :showLabelLine="true"
                   :indent="20"
                 >
                   <img src="../../../assets/wjj.png" />
-                  <el-popover
-                    placement="right"
-                    width="130"
-                    v-model="visible"
-                    @click.native="visible = false"
-                    v-if="data.id == rightData.id && fileType === 0 && !isPop"
-                    :offset="30"
-                  >
-                    <div>
-                      <el-link
-                        v-if="lcyStatus == 1 && isPower(current)"
-                        :underline="false"
-                        @click.native="setPower(data)"
-                        >更改权限
-                      </el-link></div
-                    >
-                    <div>
-                      <el-link
-                        v-if="lcyStatus != 1"
-                        :underline="false"
-                        @click.native="goTo('文档工作区', data)"
-                        >转到文档工作区
-                      </el-link></div
-                    >
-                    <div>
-                      <el-link
-                        v-if="lcyStatus != '2'"
-                        :underline="false"
-                        @click.native="goTo('文档归档区', data)"
-                        >转到文档归档区
-                      </el-link></div
-                    >
-                    <div>
-                      <el-link
-                        v-if="lcyStatus != '3'"
-                        :underline="false"
-                        @click.native="goTo('文档发布区', data)"
-                        >转到文档发布区
-                      </el-link></div
-                    >
-                  </el-popover>
 
                   <span>{{ node.label }}</span>
                 </ElementTreeLine>
@@ -262,9 +270,16 @@ export default {
       this.visible = false;
     },
 
-    onRightClick(data) {
+    onRightClick(data, e) {
       this.rightData = data;
       this.visible = true;
+      this.$nextTick(() => {
+        let y = e.pageY;
+        if (e.screenY >= e.view.innerHeight) {
+          y -= 80;
+        }
+        this.$refs.popoverRef.$el.style.top = y+'px'
+      });
     },
     setPower(data) {
       this.powerVisible = true;
@@ -363,6 +378,9 @@ export default {
 :deep(.el-link--inner) {
   padding: 3px 0;
 }
+:deep(.el-tree .el-tree-node__content) {
+  // position: static;
+}
 // :deep(.element-tree-node-line-hor) {
 //   border-bottom: 1px solid #dcdfe6;
 // }