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

src/views/bpm/documents/documentTemplate/components/file-table-list.vue

@@ -201,15 +201,15 @@
           },
           {
             label: '文档位置',
-            prop: 'typeName',
+            prop: 'directoryPath',
             width: 180,
             align: 'center',
             fixed: 'left',
             showOverflowTooltip: true,
-            formatter: () => {
-              // 优先使用fullPath，如果没有则回退到name
-              return this.parentData?.fullPath || this.parentData?.name || '';
-            }
+            // formatter: () => {
+            //   // 优先使用fullPath，如果没有则回退到name
+            //   return this.parentData?.fullPath || this.parentData?.name || '';
+            // }
           },
           {
             label: '编码',

src/views/bpm/documents/documentTemplate/components/folder-edit.vue

@@ -38,7 +38,7 @@
               style="width: 100%"
               v-model="form.parentId"
               :options="folderList"
-              :disabled="this.type == 'edit'"
+              :disabled="this.form.id == 99"
               :props="{
                 value: 'id',
                 label: 'name',

src/views/bpm/documents/noticeIssuance/components/documentDialog.vue

@@ -118,15 +118,15 @@
           },
           {
             label: '文档位置',
-            prop: 'typeName',
+            prop: 'directoryPath',
             width: 180,
             align: 'center',
             fixed: 'left',
             showOverflowTooltip: true,
-            formatter: () => {
-              // 优先使用fullPath，如果没有则回退到name
-              return this.curNodeData?.fullPath || this.curNodeData?.name || '';
-            }
+            // formatter: () => {
+            //   // 优先使用fullPath，如果没有则回退到name
+            //   return this.curNodeData?.fullPath || this.curNodeData?.name || '';
+            // }
           },
           {
             label: '编码',

src/views/home/index.vue

@@ -328,6 +328,7 @@ export default {
     },
     handleNotificationsClick(item) {
       console.log('item~~~', item);
+      if(this.activeTab === 'system') return;
       this.$router.push({
         path: '/documents/noticeIssuance/add-or-edit',
         // query