Merge branch 'dev'

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-11-07 08:46:12
+ * @LastEditTime: 2023-12-18 09:24:03
 -->
 -->
 <template>
 <template>
   <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
   <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
@@ -147,21 +147,49 @@
        * @author: renchao
        * @author: renchao
        */
        */
       readClick () {
       readClick () {
-        getIdCardInfo().then(res => {
-          if (res.data.code == 0) {
-            let data = res.data.IDCardInfo
-            this.ruleForm.lzrxm = data.name
-            this.ruleForm.lzrzjlb = '1'
-            this.ruleForm.lzrzjh = data.cardID
-            this.$message({
-              message: '读取成功！',
-              type: 'success'
-            })
+        function getObjectByValue (arrayOfObjects, value) {
+          var name = ''
+          arrayOfObjects.forEach(item => {
+            if (item.dname.includes(value)) name = item.dcode
+          })
+          return name
+        }
+        getIdCardInfo(this.BASE_API.gaopaiyi).then(res => {
+          if (this.BASE_API.gaopaiyi == 'jy') {
+            const {
+              Name,
+              IdNo,
+            } = JSON.parse(res)
+            if (Name) {
+              this.ruleForm.lzrxm = Name;
+              this.ruleForm.lzrzjlb = '1';
+              this.ruleForm.lzrzjh = IdNo;
+              this.$message({
+                message: '读取成功！',
+                type: 'success'
+              })
+            } else {
+              this.$message({
+                message: '请放置身份证',
+                type: 'warning'
+              })
+            }
           } else {
           } else {
-            this.$message({
-              message: res.data.message,
-              type: 'warning'
-            })
+            if (res.data.code == 0) {
+              let data = res.data.IDCardInfo
+              this.ruleForm.lzrxm = data.name
+              this.ruleForm.lzrzjlb = '1'
+              this.ruleForm.lzrzjh = data.cardID
+              this.$message({
+                message: '读取成功！',
+                type: 'success'
+              })
+            } else {
+              this.$message({
+                message: res.data.message,
+                type: 'warning'
+              })
+            }
           }
           }
         })
         })
       },
       },