From 18c9326eab6b26383fc73d2a8b7c35917ce6449c Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Fri, 24 Nov 2023 09:37:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/shyqrAdd.vue | 32 ++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/views/homesteadSurvey/shyqrAdd.vue b/src/views/homesteadSurvey/shyqrAdd.vue
index efb2630b..4c59e45c 100644
--- a/src/views/homesteadSurvey/shyqrAdd.vue
+++ b/src/views/homesteadSurvey/shyqrAdd.vue
@@ -392,13 +392,18 @@ export default {
   },
   methods: {
     getList(){
-      queryList({yhzgx:"02",searchValue:"NHDM,HZXM"}).then(response => {
+      queryList({yhzgx:"02",searchValue:"NHDM,HZXM,HZZJHM,nhdm,HZZJLX,TXDZ,dept_id,dept_name"}).then(response => {
         this.nhdmDictionaries = response.rows.map(function(item){
           item.nhValue = item.hzxm + item.nhdm;
           return {
             nhValue:item.nhValue,
             hzxm:item.hzxm,
+            txdz:item.txdz,
             nhdm:item.nhdm,
+            zjhm:item.hzzjhm,
+            zjlx:item.hzzjlx,
+            deptId:item.deptId,
+            deptName:item.deptName
           };
         });
         this.newList = this.nhdmDictionaries;
@@ -423,9 +428,6 @@ export default {
                 hzzjhm:item.zjhm,
                 nhdm:item.nhdm,
                 hzzjlx:item.zjlx,
-                lxdh:item.lxdh,
-                hklx:item.hklx,
-                sfbjtjjzzcy:item.sfbjtjjzzcy,
                 deptId:item.deptId,
                 deptName:item.deptName,
               }
@@ -456,17 +458,29 @@ export default {
     },
     shyqrdmxmChange(val){
       this.$set(this.form, "nhdm", val.nhdm);
-      this.$set(this.form, "shyqrdbzjhm", val.hzzjhm);
+      this.$set(this.form, "shyqrdbzjhm", val.zjhm);
       this.$set(this.form, "shyqrdbxm", val.hzxm);
-      this.$set(this.form, "dh", val.lxdh);
-      this.$set(this.form, "xb", val.sqrxb);
-      this.$set(this.form, "hklx", val.hklx);
-      this.$set(this.form, "sfbncjtjjzzcy", val.sfbjtjjzzcy);
+      this.$set(this.form, "shyqrdbzjlx", val.zjlx);
+      this.$set(this.form, "dz", val.txdz);
+      let sex = this.parseIDCard(val.zjhm);
+      if(sex === 0){
+        sex = 1;
+      }else{
+        sex = 2
+      }
+      this.$set(this.form, "xb", sex);
       listNmfw({zjddm:this.zjdzdxx.zjddm}).then(response => {
         this.nmfwDictionaries = response.rows;
       });
       this.shownhdm = false;
     },
+    parseIDCard(idcard) {
+      if(!idcard)
+        return false;
+      console.info(idcard)
+      let sex = (parseInt(idcard.substr(16, 1)) % 2) ^ 1;
+      return sex;
+    },
     submitzjd(){
       this.$refs.form.validate().then(() => {
       if(this.form.id == null){