Merge branch 'dev'

@@ -613,17 +613,24 @@
               Agencvy,
               PhotoB64
             } = JSON.parse(res)
-            this.ruleForm.qlrmc = Name;
-            this.ruleForm.zjzl = '1';
-            this.ruleForm.zjh = IdNo;
-            this.ruleForm.xb = getObjectByValue(this.dictData['A43'], Sex);
-            this.ruleForm.dz = Address;
-            this.ruleForm.fzjg = Agencvy;
-            this.ruleForm.avatar = 'data:image/png;base64,' + PhotoB64
-            this.$message({
-              message: '读取成功！',
-              type: 'success'
-            })
+            if (Name) {
+              this.ruleForm.qlrmc = Name;
+              this.ruleForm.zjzl = '1';
+              this.ruleForm.zjh = IdNo;
+              this.ruleForm.xb = getObjectByValue(this.dictData['A43'], Sex);
+              this.ruleForm.dz = Address;
+              this.ruleForm.fzjg = Agencvy;
+              this.ruleForm.avatar = 'data:image/png;base64,' + PhotoB64
+              this.$message({
+                message: '读取成功！',
+                type: 'success'
+              })
+            } else {
+              this.$message({
+                message: '请放置身份证',
+                type: 'warning'
+              })
+            }
           } else {
             if (res.data.code == 0) {
               let data = res.data.IDCardInfo;

@@ -602,17 +602,24 @@
               Agencvy,
               PhotoB64
             } = JSON.parse(res)
-            this.ruleForm.ywrmc = Name;
-            this.ruleForm.zjzl = '1';
-            this.ruleForm.zjh = IdNo;
-            this.ruleForm.xb = getObjectByValue(this.dictData['A43'], Sex);
-            this.ruleForm.txdz = Address;
-            this.ruleForm.fzjg = Agencvy;
-            this.ruleForm.avatar = 'data:image/png;base64,' + PhotoB64
-            this.$message({
-              message: '读取成功！',
-              type: 'success'
-            })
+            if (Name) {
+              this.ruleForm.ywrmc = Name;
+              this.ruleForm.zjzl = '1';
+              this.ruleForm.zjh = IdNo;
+              this.ruleForm.xb = getObjectByValue(this.dictData['A43'], Sex);
+              this.ruleForm.txdz = Address;
+              this.ruleForm.fzjg = Agencvy;
+              this.ruleForm.avatar = 'data:image/png;base64,' + PhotoB64
+              this.$message({
+                message: '读取成功！',
+                type: 'success'
+              })
+            } else {
+              this.$message({
+                message: '请放置身份证',
+                type: 'warning'
+              })
+            }
           } else {
             if (res.data.code == 0) {
               let data = res.data.IDCardInfo

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-12-15 09:10:28
+ * @LastEditTime: 2023-12-15 09:36:45
 -->
 <template>
   <div>
@@ -178,21 +178,14 @@
           let that = this;
           this.$nextTick(() => {
             if (val.length == 0 || !val) {
-              that.tableDataList = _.cloneDeep([
-                // {
-                //   qlrmc: "",
-                //   dlrzjlx: "",
-                //   dlrzjh: "",
-                //   fr: "",
-                // },
-              ]);
+              that.tableDataList = _.cloneDeep([])
             } else {
-              that.tableDataList = _.cloneDeep(val);
+              that.tableDataList = _.cloneDeep(val)
             }
-          });
+          })
         },
         immediate: true,
-        deep: true,
+        deep: true
       },
       gyfs: {
         handler (newVal, oldValue) {
@@ -211,8 +204,8 @@
           }
         },
         immediate: true,
-        deep: true,
-      },
+        deep: true
+      }
     },
     methods: {
       /**
@@ -277,21 +270,21 @@
               Agencvy,
               PhotoB64
             } = JSON.parse(res)
-            row.qlrmc = Name;
-            row.zjzl = '1';
-            row.zjh = IdNo;
-            row.xb = getObjectByValue(this.dictData['A43'], Sex);
-            row.dz = Address;
-            row.fzjg = Agencvy;
-            row.avatar = 'data:image/png;base64,' + PhotoB64
-            if (row.qlrmc) {
+            if (Name) {
+              row.qlrmc = Name;
+              row.zjzl = '1';
+              row.zjh = IdNo;
+              row.xb = getObjectByValue(this.dictData['A43'], Sex);
+              row.dz = Address;
+              row.fzjg = Agencvy;
+              row.avatar = 'data:image/png;base64,' + PhotoB64
               this.$message({
                 message: '读取成功！',
                 type: 'success'
               })
             } else {
               this.$message({
-                message: '请重新放置身份证',
+                message: '请放置身份证',
                 type: 'warning'
               })
             }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-12-15 09:10:42
+ * @LastEditTime: 2023-12-15 09:37:47
 -->
 <template>
   <div>
@@ -270,21 +270,21 @@
               Agencvy,
               PhotoB64
             } = JSON.parse(res)
-            row.ywrmc = Name;
-            row.zjzl = '1';
-            row.zjh = IdNo;
-            row.xb = getObjectByValue(this.dictData['A43'], Sex);
-            row.txdz = Address;
-            row.fzjg = Agencvy;
-            row.avatar = 'data:image/png;base64,' + PhotoB64
-            if (row.ywrmc) {
+            if (Name) {
+              row.ywrmc = Name;
+              row.zjzl = '1';
+              row.zjh = IdNo;
+              row.xb = getObjectByValue(this.dictData['A43'], Sex);
+              row.txdz = Address;
+              row.fzjg = Agencvy;
+              row.avatar = 'data:image/png;base64,' + PhotoB64
               this.$message({
                 message: '读取成功！',
                 type: 'success'
               })
             } else {
               this.$message({
-                message: '请重新放置身份证',
+                message: '请放置身份证',
                 type: 'warning'
               })
             }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-12-14 14:11:53
+ * @LastEditTime: 2023-12-15 09:36:06
 -->
 <template>
   <dialogBox
@@ -617,21 +617,21 @@
               Agencvy,
               PhotoB64
             } = JSON.parse(res)
-            this.ruleForm.sqrmc = Name;
-            this.ruleForm.zjzl = '1';
-            this.ruleForm.zjh = IdNo;
-            this.ruleForm.xb = getObjectByValue(this.dictData['A43'], Sex);
-            this.ruleForm.txdz = Address;
-            this.ruleForm.fzjg = Agencvy;
-            this.ruleForm.avatar = 'data:image/png;base64,' + PhotoB64
-            if (this.ruleForm.sqrmc) {
+            if (Name) {
+              this.ruleForm.sqrmc = Name;
+              this.ruleForm.zjzl = '1';
+              this.ruleForm.zjh = IdNo;
+              this.ruleForm.xb = getObjectByValue(this.dictData['A43'], Sex);
+              this.ruleForm.txdz = Address;
+              this.ruleForm.fzjg = Agencvy;
+              this.ruleForm.avatar = 'data:image/png;base64,' + PhotoB64
               this.$message({
                 message: '读取成功！',
                 type: 'success'
               })
             } else {
               this.$message({
-                message: '请重新放置身份证',
+                message: '请放置身份证',
                 type: 'warning'
               })
             }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-12-15 09:01:05
+ * @LastEditTime: 2023-12-15 09:35:06
 -->
 <template>
   <div>
@@ -15,7 +15,6 @@
   import { mapGetters } from 'vuex'
   import { getIdCardInfo } from '@/utils/operation.js'
   import addQlr from './dialog/addQlr.vue'
-  import { log } from 'bpmn-js-token-simulation'
   export default {
     components: {
       addQlr
@@ -250,21 +249,21 @@
               Agencvy,
               PhotoB64
             } = JSON.parse(res)
-            row.sqrmc = Name;
-            row.zjzl = '1';
-            row.zjh = IdNo;
-            row.xb = getObjectByValue(this.dictData['A43'], Sex);
-            row.txdz = Address;
-            row.fzjg = Agencvy;
-            row.avatar = 'data:image/png;base64,' + PhotoB64
-            if (row.sqrmc) {
+            if (Name != '') {
+              row.sqrmc = Name;
+              row.zjzl = '1';
+              row.zjh = IdNo;
+              row.xb = getObjectByValue(this.dictData['A43'], Sex);
+              row.txdz = Address;
+              row.fzjg = Agencvy;
+              row.avatar = 'data:image/png;base64,' + PhotoB64
               this.$message({
                 message: '读取成功！',
                 type: 'success'
               })
             } else {
               this.$message({
-                message: '请重新放置身份证',
+                message: '请放置身份证',
                 type: 'warning'
               })
             }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-12-15 09:02:50
+ * @LastEditTime: 2023-12-15 09:35:51
 -->
 <template>
   <div>
@@ -221,21 +221,21 @@
               Agencvy,
               PhotoB64
             } = JSON.parse(res)
-            row.sqrmc = Name;
-            row.zjzl = '1';
-            row.zjh = IdNo;
-            row.xb = getObjectByValue(this.dictData['A43'], Sex);
-            row.txdz = Address;
-            row.fzjg = Agencvy;
-            row.avatar = 'data:image/png;base64,' + PhotoB64
-            if (row.sqrmc) {
+            if (Name) {
+              row.sqrmc = Name;
+              row.zjzl = '1';
+              row.zjh = IdNo;
+              row.xb = getObjectByValue(this.dictData['A43'], Sex);
+              row.txdz = Address;
+              row.fzjg = Agencvy;
+              row.avatar = 'data:image/png;base64,' + PhotoB64
               this.$message({
                 message: '读取成功！',
                 type: 'success'
               })
             } else {
               this.$message({
-                message: '请重新放置身份证',
+                message: '请放置身份证',
                 type: 'warning'
               })
             }