Merge branch 'master-v32-xwx' into 'master'

乙方运维入场资料和月度总结



See merge request !985

@@ -79,7 +79,7 @@ export default {
                 id:docIds.join(','),
             }
             proxy.$http.get('/api-web/bOpsFile/deleteSearch',param, function (res){
-
+                emit('callback',true);
             })
         }
 
@@ -95,8 +95,7 @@ export default {
             };
             proxy.$http.post('/api-web/bOpsFile/fileSynchronization', params, function (res) {
                 if (res && res.code == 0) {
-                    // proxy.$global.showMsg("");
-                    console.log('执行回调成功', res)
+                    emit('callback',true);
                 }
             });
         }

@@ -14,7 +14,7 @@
                           height="500"
                           :docTypeName="docTypeName"
                           :pageSize="pageSize"
-                          :treeNode="treeNode" :parentNode="parentNode" :projectId="projectId"></component>
+                          :treeNode="treeNode" :parentNode="parentNode" :projectId="projectId" @callback="refreshPage"></component>
            </div>
         </template>
     </cm-dialog>

@@ -128,6 +128,8 @@ export default {
                 componentName.value = "DOCUMENT";
                 docType.value = "THREE_PERSONAGE_NDA";
                 docTypeName.value = "入场资料";
+                props.parentNode.id = row.id;
+                props.treeNode.map.nodeType.code ="THREE_PERSONAGE_NDA";
                 showDialog(true);
             },
             render: function (row) {
@@ -148,6 +150,9 @@ export default {
                 componentName.value = "DOCUMENT";
                 docType.value = "THREE_MONTHLY_SUMMARY";
                 docTypeName.value = "月度总结";
+                props.parentNode.id = row.id;
+
+                props.treeNode.map.nodeType.code ="THREE_MONTHLY_SUMMARY";
                 showDialog(true);
             },
             render: function (row) {
@@ -197,7 +202,9 @@ export default {
                 }
             });
         }
-
+        let refreshPage= () => {
+            getPage();
+        }
 
         // 挂载完
         Vue.onMounted(() => {
@@ -225,7 +232,8 @@ export default {
             docTypeName,
             dialogFlg,
             showDialog,
-            componentName
+            componentName,
+            refreshPage
         }
     }
 }

@@ -64,6 +64,7 @@ export default {
             proxy.$http.get("/api-web/bOpsProject/getTree", params, function (res) {
                 if (res && res.data) {
                     dataSource.value = res.data;
+                    projectId.value = res.data[0].dataList[0].id;
                     treeNode.value = res.data[0];
                 } else {
                     proxy.$global.showMsg('暂无数据！');
@@ -110,7 +111,9 @@ export default {
                 pageSize.value = 10;
             }
             getParent(dataSource.value, data.parentId);
-            projectId.value = data.map.nodeType.projectId;
+            if (data.level==1){
+                projectId.value = data.map.nodeType.projectId;
+            }
             treeNode.value = data;
             componentName.value = comName;
         }