From ac7d6e0a049c793eb5931a18be6e5fa0dc565312 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Tue, 18 Jun 2024 16:50:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=9B=AE=E5=BD=95=E3=80=81?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E3=80=81?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=90=88=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dangan-ui/src/views/dangan/birthDJ/index.vue  |  1 +
 dangan-ui/src/views/dangan/catalog/index.vue  | 30 +++++++++++++++----
 .../src/views/dangan/pictureRecard/index.vue  |  1 +
 dangan-ui/src/views/dangan/qyz/index.vue      |  1 +
 dangan-ui/src/views/dangan/ytzm/index.vue     |  1 +
 dangan-ui/src/views/dangan/zfnyhkcg/index.vue |  1 +
 dangan-ui/src/views/dangan/zqz/index.vue      |  1 +
 7 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/dangan-ui/src/views/dangan/birthDJ/index.vue b/dangan-ui/src/views/dangan/birthDJ/index.vue
index 7f50a9e..eb5cd8d 100644
--- a/dangan-ui/src/views/dangan/birthDJ/index.vue
+++ b/dangan-ui/src/views/dangan/birthDJ/index.vue
@@ -859,6 +859,7 @@ export default {
     };
   },
   created() {
+    this.queryParams.muId = this.$route.query.muId
     this.getList();
   },
   methods: {
diff --git a/dangan-ui/src/views/dangan/catalog/index.vue b/dangan-ui/src/views/dangan/catalog/index.vue
index c3d79a2..6949362 100644
--- a/dangan-ui/src/views/dangan/catalog/index.vue
+++ b/dangan-ui/src/views/dangan/catalog/index.vue
@@ -65,6 +65,7 @@
           <el-link type="primary" @click="handleDAXX(scope.row)">{{ scope.row.muName }}</el-link>
         </template>
       </el-table-column>
+      <el-table-column label="ID" align="center" prop="id"/>
       <el-table-column label="业务类型" align="center" prop="ywType" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
@@ -435,7 +436,7 @@ export default {
     },
     // 档案上传记录
     handleSCJL(row){
-      this.$router.push("/pictureRecard?muId=" + row.id);
+      this.$router.push("/pictureRecard?muId=" + row.id+"&ywType=" + row.ywType);
     },
     // 上级类目选择
     selectPid(){
@@ -487,12 +488,29 @@ export default {
     },
     // 档案信息
     handleDAXX(row){
-      if(row.ywType==='option1'|| row.ywType==='option3'|| row.ywType==='option9'){
+      // 常住人口登记表
+      if(row.ywType==='option1'|| row.ywType==='option3'|| row.ywType==='option9'|| row.ywType==='option2'){
         this.$router.push("/dangan/czrkdj?muId=" + row.id);
-      }else {
-        this.$alert(`暂无相关页面！`, `提示`, {
-          type: 'warning'
-        });
+      }
+      // 出生医学证明
+      if(row.ywType==='option4'){
+        this.$router.push("/dangan/birthDJ?muId=" + row.id);
+      }
+      // 迁移证
+      if(row.ywType==='option5'){
+        this.$router.push("/dangan/qyz?muId=" + row.id);
+      }
+      // 一胎证明
+      if(row.ywType==='option6'){
+        this.$router.push("/dangan/ytzm?muId=" + row.id);
+      }
+      // 转非农业人口批复存根
+      if(row.ywType==='option7'){
+        this.$router.push("/dangan/zfnyhkcg?muId=" + row.id);
+      }
+      // 准迁证
+      if(row.ywType==='option8'){
+        this.$router.push("/dangan/zqz?muId=" + row.id);
       }
     },
   }
diff --git a/dangan-ui/src/views/dangan/pictureRecard/index.vue b/dangan-ui/src/views/dangan/pictureRecard/index.vue
index 7bd66f1..688a5ce 100644
--- a/dangan-ui/src/views/dangan/pictureRecard/index.vue
+++ b/dangan-ui/src/views/dangan/pictureRecard/index.vue
@@ -208,6 +208,7 @@ export default {
   },
   created() {
     this.queryParams.muId = this.$route.query.muId || undefined
+    this.queryParams.ywType = this.$route.query.ywType || 'option1'
     this.getList();
   },
   methods: {
diff --git a/dangan-ui/src/views/dangan/qyz/index.vue b/dangan-ui/src/views/dangan/qyz/index.vue
index 12c8add..5fcbe95 100644
--- a/dangan-ui/src/views/dangan/qyz/index.vue
+++ b/dangan-ui/src/views/dangan/qyz/index.vue
@@ -885,6 +885,7 @@ export default {
     };
   },
   created() {
+    this.queryParams.muId = this.$route.query.muId
     this.getList();
   },
   methods: {
diff --git a/dangan-ui/src/views/dangan/ytzm/index.vue b/dangan-ui/src/views/dangan/ytzm/index.vue
index 52aac91..36b38ac 100644
--- a/dangan-ui/src/views/dangan/ytzm/index.vue
+++ b/dangan-ui/src/views/dangan/ytzm/index.vue
@@ -778,6 +778,7 @@ export default {
     };
   },
   created() {
+    this.queryParams.muId = this.$route.query.muId
     this.getList();
   },
   methods: {
diff --git a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue b/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
index 552089f..4bdf53d 100644
--- a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
+++ b/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
@@ -924,6 +924,7 @@ export default {
     };
   },
   created() {
+    this.queryParams.muId = this.$route.query.muId
     this.getList();
   },
   methods: {
diff --git a/dangan-ui/src/views/dangan/zqz/index.vue b/dangan-ui/src/views/dangan/zqz/index.vue
index 4c2d4f1..cf92b69 100644
--- a/dangan-ui/src/views/dangan/zqz/index.vue
+++ b/dangan-ui/src/views/dangan/zqz/index.vue
@@ -1035,6 +1035,7 @@ export default {
     };
   },
   created() {
+    this.queryParams.muId = this.$route.query.muId
     this.getList();
   },
   methods: {