duy 2 yıl önce
ebeveyn
işleme
ffbed20281

+ 2 - 1
src/views/data-fill/wbs.vue

@@ -1204,7 +1204,8 @@ const NodeStatus = ref('1')
 const queryNodeStatus = async () => {
     const info = nodeDataInfo.value;
     const {error, code, data} = await wbsApi.queryNodeStatus({
-        primaryKeyId: info['contractIdRelation'] ? info['id'] : info['primaryKeyId'],
+        // primaryKeyId: info['contractIdRelation'] ? info['id'] : info['primaryKeyId'],
+          primaryKeyId: authBtnTabKey.value==1 ? info['id'] : info['primaryKeyId'],
         classify: authBtnTabKey.value
     })
     //1 未填报,2待上报,3已上报

+ 14 - 3
src/views/other-file/image-view.vue

@@ -135,11 +135,22 @@ const fileType = parseInt(routerQuery?.fileType + '') || 2;
 
 //监听
 watch(() => [
-    useAppState.getCollapse
-], ([Collapse]) => {
+    useAppState.getCollapse,
+    useAppState.getContractId
+], ([Collapse,ContractId]) => {
     isCollapse.value = Collapse
+    contractId.value=ContractId
 })
-
+watch(contractId, (val) => {
+    if(val){
+        console.log(val)
+        router.push({
+            path: '/other-file/image-data',
+     })
+    }
+      
+   
+    })
 //自动展开缓存
 const TreeAutoExpandKeys = ref([])
 const TreeExpandedKeys = ref([])