Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/components/addDoc/doc_template.vue

@@ -91,10 +91,11 @@ export default {
 
   methods: {
     /* 查询 */
-    async query() {
+    // 0:公司 1：个人
+    async query(type) {
       this.loading = true;
       let query = {
-        type: this.fileType,
+        type,
         currentUserId: this.user.info.userId
       };
       this.data = await getDocTreeListAPI(query);

src/components/addDoc/main.vue

@@ -22,9 +22,12 @@
     >
       <template v-slot:toolbar v-if="type != 'view'">
         <el-button type="primary" @click="fileEditOpen">本地上传</el-button>
-        <el-button type="primary" @click="openFileList">
+        <el-button type="primary" @click="openFileList(0)">
           关联文档库
         </el-button>
+        <el-button type="primary" @click="openFileList(1)">
+          关联个人文档库
+        </el-button>
       </template>
       <!-- 操作列 -->
       <template v-slot:action="{ row }">
@@ -182,10 +185,10 @@
         }
         this.init();
       },
-      openFileList() {
+      openFileList(type) {
         this.fileShow = true;
         this.$nextTick(() => {
-          this.$refs.doc_templateRef.query()
+          this.$refs.doc_templateRef.query(type)
         })
       },
       fileEditOpen() {