档案检索同音选择修改

dangan-ui/src/api/dangan/retrieval.js

@@ -1,9 +1,14 @@
 import request from '@/utils/request'
 
+
+// ------------------------------------------   不同音 ----------------------------------------------
+
+
 // 查询常住人口登记列表
 export function listCzrkdj(query) {
   return request({
     url: '/dangan/search/czrk',
+    timeout: 120000,
     method: 'get',
     params: query
   })
@@ -13,6 +18,7 @@ export function listCzrkdj(query) {
 export function listBirthDJ(query) {
   return request({
     url: '/dangan/search/cszm',
+    timeout: 120000,
     method: 'get',
     params: query
   })
@@ -22,6 +28,7 @@ export function listBirthDJ(query) {
 export function listQyz(query) {
   return request({
     url: '/dangan/search/qyz',
+    timeout: 120000,
     method: 'get',
     params: query
   })
@@ -31,6 +38,7 @@ export function listQyz(query) {
 export function listYtzm(query) {
   return request({
     url: '/dangan/search/ytzm',
+    timeout: 120000,
     method: 'get',
     params: query
   })
@@ -40,6 +48,7 @@ export function listYtzm(query) {
 export function listZfnyhkcg(query) {
   return request({
     url: '/dangan/search/zfny',
+    timeout: 120000,
     method: 'get',
     params: query
   })
@@ -49,6 +58,70 @@ export function listZfnyhkcg(query) {
 export function listZqz(query) {
   return request({
     url: '/dangan/search/zqz',
+    timeout: 120000,
+    method: 'get',
+    params: query
+  })
+}
+
+
+// ------------------------------------------   不同音 ----------------------------------------------
+
+// 查询常住人口登记列表
+export function listCzrkdj1(query) {
+  return request({
+    url: '/dangan/search/czrk1',
+    timeout: 120000,
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询常住人口登记列表
+export function listBirthDJ1(query) {
+  return request({
+    url: '/dangan/search/cszm1',
+    timeout: 120000,
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询常住人口登记列表
+export function listQyz1(query) {
+  return request({
+    url: '/dangan/search/qyz1',
+    timeout: 120000,
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询常住人口登记列表
+export function listYtzm1(query) {
+  return request({
+    url: '/dangan/search/ytzm1',
+    timeout: 120000,
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询常住人口登记列表
+export function listZfnyhkcg1(query) {
+  return request({
+    url: '/dangan/search/zfny1',
+    timeout: 120000,
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询常住人口登记列表
+export function listZqz1(query) {
+  return request({
+    url: '/dangan/search/zqz1',
+    timeout: 120000,
     method: 'get',
     params: query
   })

dangan-ui/src/views/dangan/retrieval/index.vue

@@ -8,6 +8,9 @@
       <div style="border:1px dashed #e8e8e8; border-radius: 10px; padding: 10px">
         <div style="width:100%; text-align:left">
           <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+
+          <el-checkbox v-model="isTongYin" @change="handleTongYinChange">同音</el-checkbox>
+
         </div>
         <el-checkbox-group v-model="checkList" @change="handleCheckboxGroupChange">
           <el-checkbox v-for="dict in dict.type.yw_type"
@@ -423,7 +426,8 @@
 </template>
 
 <script>
-import { listCzrkdj, listBirthDJ, listQyz, listZfnyhkcg, listYtzm, listZqz } from "@/api/dangan/retrieval";
+import { listCzrkdj, listBirthDJ, listQyz, listZfnyhkcg, listYtzm, listZqz,
+  listCzrkdj1, listBirthDJ1, listQyz1, listZfnyhkcg1, listYtzm1, listZqz1 } from "@/api/dangan/retrieval";
 
 export default {
   name: "Retrieval",
@@ -435,6 +439,8 @@ export default {
       checkList: [],
       // 是否全选
       checkAll: false,
+      // 是否同音
+      isTongYin: false,
       // 常住人口登记表1
       option1: {
         // 遮罩层
@@ -682,83 +688,155 @@ export default {
     // 常住人口登记表1
     option1Query(){
       this.option1.loading = true;
+      if(this.isTongYin){
         listCzrkdj(this.option1.qParams).then(response => {
           this.option1.list = response.rows;
           this.option1.total = response.total;
           this.option1.loading = false;
         })
+      }else {
+        listCzrkdj1(this.option1.qParams).then(response => {
+          this.option1.list = response.rows;
+          this.option1.total = response.total;
+          this.option1.loading = false;
+        })
+      }
     },
     // 常住人口登记表2
     option3Query(){
       this.option3.loading = true;
+      if(this.isTongYin){
         listCzrkdj(this.option3.qParams).then(response => {
           this.option3.list = response.rows;
           this.option3.total = response.total;
           this.option3.loading = false;
         })
+      }else {
+        listCzrkdj1(this.option3.qParams).then(response => {
+          this.option3.list = response.rows;
+          this.option3.total = response.total;
+          this.option3.loading = false;
+        })
+      }
     },
     // 常住人口登记表3
     option9Query(){
       this.option9.loading = true;
+      if(this.isTongYin){
         listCzrkdj(this.option9.qParams).then(response => {
           this.option9.list = response.rows;
           this.option9.total = response.total;
           this.option9.loading = false;
         })
+      }else {
+        listCzrkdj1(this.option9.qParams).then(response => {
+          this.option9.list = response.rows;
+          this.option9.total = response.total;
+          this.option9.loading = false;
+        })
+      }
     },
     // 常住卡
     option2Query(){
       this.option2.loading = true;
+      if(this.isTongYin){
         listCzrkdj(this.option2.qParams).then(response => {
           this.option2.list = response.rows;
           this.option2.total = response.total;
           this.option2.loading = false;
         })
+      }else {
+        listCzrkdj1(this.option2.qParams).then(response => {
+          this.option2.list = response.rows;
+          this.option2.total = response.total;
+          this.option2.loading = false;
+        })
+      }
     },
     // 出生医学证明
     option4Query(){
       this.option4.loading = true;
+      if(this.isTongYin){
         listBirthDJ(this.option4.qParams).then(response => {
           this.option4.list = response.rows;
           this.option4.total = response.total;
           this.option4.loading = false;
         })
+      }else {
+        listBirthDJ1(this.option4.qParams).then(response => {
+          this.option4.list = response.rows;
+          this.option4.total = response.total;
+          this.option4.loading = false;
+        })
+      }
     },
     // 一胎证明
     option6Query(){
       this.option6.loading = true;
+      if(this.isTongYin){
         listYtzm(this.option6.qParams).then(response => {
           this.option6.list = response.rows;
           this.option6.total = response.total;
           this.option6.loading = false;
         })
+      }else {
+        listYtzm1(this.option6.qParams).then(response => {
+          this.option6.list = response.rows;
+          this.option6.total = response.total;
+          this.option6.loading = false;
+        })
+      }
     },
     // 迁移证
     option5Query(){
       this.option5.loading = true;
+      if(this.isTongYin){
         listQyz(this.option5.qParams).then(response => {
           this.option5.list = response.rows;
           this.option5.total = response.total;
           this.option5.loading = false;
         })
+      }else {
+        listQyz1(this.option5.qParams).then(response => {
+          this.option5.list = response.rows;
+          this.option5.total = response.total;
+          this.option5.loading = false;
+        })
+      }
     },
     // 准迁证
     option8Query(){
       this.option8.loading = true;
+      if(this.isTongYin){
         listZqz(this.option8.qParams).then(response => {
           this.option8.list = response.rows;
           this.option8.total = response.total;
           this.option8.loading = false;
         })
+      }else {
+        listZqz1(this.option8.qParams).then(response => {
+          this.option8.list = response.rows;
+          this.option8.total = response.total;
+          this.option8.loading = false;
+        })
+      }
     },
     // 转非农业人口批复存根
     option7Query(){
       this.option7.loading = true;
+      if(this.isTongYin){
         listZfnyhkcg(this.option7.qParams).then(response => {
           this.option7.list = response.rows;
           this.option7.total = response.total;
           this.option7.loading = false;
         })
+      }else {
+        listZfnyhkcg1(this.option7.qParams).then(response => {
+          this.option7.list = response.rows;
+          this.option7.total = response.total;
+          this.option7.loading = false;
+        })
+      }
     },
     handleCheckAllChange(val) {
       if(val){
@@ -776,6 +854,10 @@ export default {
       }else {
         this.checkAll = false;
       }
+    },
+    // 同音选择
+    handleTongYinChange(){
+
     }
   }
 }

dangan-ui/src/views/index.vue

@@ -8,6 +8,9 @@
       <div style="border:1px dashed #e8e8e8; border-radius: 10px; padding: 10px">
         <div style="width:100%; text-align:left">
           <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+
+          <el-checkbox v-model="isTongYin" @change="handleTongYinChange">同音</el-checkbox>
+
         </div>
         <el-checkbox-group v-model="checkList" @change="handleCheckboxGroupChange">
           <el-checkbox v-for="dict in dict.type.yw_type"
@@ -423,7 +426,8 @@
 </template>
 
 <script>
-import { listCzrkdj, listBirthDJ, listQyz, listZfnyhkcg, listYtzm, listZqz } from "@/api/dangan/retrieval";
+import { listCzrkdj, listBirthDJ, listQyz, listZfnyhkcg, listYtzm, listZqz,
+  listCzrkdj1, listBirthDJ1, listQyz1, listZfnyhkcg1, listYtzm1, listZqz1 } from "@/api/dangan/retrieval";
 
 export default {
   name: "Retrieval",
@@ -435,6 +439,8 @@ export default {
       checkList: [],
       // 是否全选
       checkAll: false,
+      // 是否同音
+      isTongYin: false,
       // 常住人口登记表1
       option1: {
         // 遮罩层
@@ -682,83 +688,155 @@ export default {
     // 常住人口登记表1
     option1Query(){
       this.option1.loading = true;
+      if(this.isTongYin){
         listCzrkdj(this.option1.qParams).then(response => {
           this.option1.list = response.rows;
           this.option1.total = response.total;
           this.option1.loading = false;
         })
+      }else {
+        listCzrkdj1(this.option1.qParams).then(response => {
+          this.option1.list = response.rows;
+          this.option1.total = response.total;
+          this.option1.loading = false;
+        })
+      }
     },
     // 常住人口登记表2
     option3Query(){
       this.option3.loading = true;
+      if(this.isTongYin){
         listCzrkdj(this.option3.qParams).then(response => {
           this.option3.list = response.rows;
           this.option3.total = response.total;
           this.option3.loading = false;
         })
+      }else {
+        listCzrkdj1(this.option3.qParams).then(response => {
+          this.option3.list = response.rows;
+          this.option3.total = response.total;
+          this.option3.loading = false;
+        })
+      }
     },
     // 常住人口登记表3
     option9Query(){
       this.option9.loading = true;
+      if(this.isTongYin){
         listCzrkdj(this.option9.qParams).then(response => {
           this.option9.list = response.rows;
           this.option9.total = response.total;
           this.option9.loading = false;
         })
+      }else {
+        listCzrkdj1(this.option9.qParams).then(response => {
+          this.option9.list = response.rows;
+          this.option9.total = response.total;
+          this.option9.loading = false;
+        })
+      }
     },
     // 常住卡
     option2Query(){
       this.option2.loading = true;
+      if(this.isTongYin){
         listCzrkdj(this.option2.qParams).then(response => {
           this.option2.list = response.rows;
           this.option2.total = response.total;
           this.option2.loading = false;
         })
+      }else {
+        listCzrkdj1(this.option2.qParams).then(response => {
+          this.option2.list = response.rows;
+          this.option2.total = response.total;
+          this.option2.loading = false;
+        })
+      }
     },
     // 出生医学证明
     option4Query(){
       this.option4.loading = true;
+      if(this.isTongYin){
         listBirthDJ(this.option4.qParams).then(response => {
           this.option4.list = response.rows;
           this.option4.total = response.total;
           this.option4.loading = false;
         })
+      }else {
+        listBirthDJ1(this.option4.qParams).then(response => {
+          this.option4.list = response.rows;
+          this.option4.total = response.total;
+          this.option4.loading = false;
+        })
+      }
     },
     // 一胎证明
     option6Query(){
       this.option6.loading = true;
+      if(this.isTongYin){
         listYtzm(this.option6.qParams).then(response => {
           this.option6.list = response.rows;
           this.option6.total = response.total;
           this.option6.loading = false;
         })
+      }else {
+        listYtzm1(this.option6.qParams).then(response => {
+          this.option6.list = response.rows;
+          this.option6.total = response.total;
+          this.option6.loading = false;
+        })
+      }
     },
     // 迁移证
     option5Query(){
       this.option5.loading = true;
+      if(this.isTongYin){
         listQyz(this.option5.qParams).then(response => {
           this.option5.list = response.rows;
           this.option5.total = response.total;
           this.option5.loading = false;
         })
+      }else {
+        listQyz1(this.option5.qParams).then(response => {
+          this.option5.list = response.rows;
+          this.option5.total = response.total;
+          this.option5.loading = false;
+        })
+      }
     },
     // 准迁证
     option8Query(){
       this.option8.loading = true;
+      if(this.isTongYin){
         listZqz(this.option8.qParams).then(response => {
           this.option8.list = response.rows;
           this.option8.total = response.total;
           this.option8.loading = false;
         })
+      }else {
+        listZqz1(this.option8.qParams).then(response => {
+          this.option8.list = response.rows;
+          this.option8.total = response.total;
+          this.option8.loading = false;
+        })
+      }
     },
     // 转非农业人口批复存根
     option7Query(){
       this.option7.loading = true;
+      if(this.isTongYin){
         listZfnyhkcg(this.option7.qParams).then(response => {
           this.option7.list = response.rows;
           this.option7.total = response.total;
           this.option7.loading = false;
         })
+      }else {
+        listZfnyhkcg1(this.option7.qParams).then(response => {
+          this.option7.list = response.rows;
+          this.option7.total = response.total;
+          this.option7.loading = false;
+        })
+      }
     },
     handleCheckAllChange(val) {
       if(val){
@@ -776,6 +854,10 @@ export default {
       }else {
         this.checkAll = false;
       }
+    },
+    // 同音选择
+    handleTongYinChange(){
+
     }
   }
 }