修改签约协议及健康券页面样式

src/api/signing/signing.js

@@ -89,3 +89,12 @@ export function getSignInfoBySignId (params) {
     params: params
   })
 }
+
+// 根据身份证号查询信息
+export function getManualByPriKey (params) {
+  return request({
+    url: '/v1/voucher/wd/getManualByPriKey',
+    method: 'GET',
+    params: params
+  })
+}

src/components/cardItem.vue

@@ -101,12 +101,12 @@ export default {
   width: 13em; */
 }
 .card-item > .card-item-content > .card-item-table > .info .title{
-  font-size: 1.3em;
+  font-size: 1em;
   font-weight:bold;
   /* margin-bottom:0.5em; */
   margin-bottom: 0;
   white-space: nowrap;
   max-width: 13.2em;
-  overflow: hidden;
+  /* overflow: hidden; */
 }
 </style>

src/views/signing/index.vue

@@ -541,7 +541,7 @@ import { getOrgInfo, getSignInfo, getAreaList, getVillages, getOrgsByAreaCode, c
 import { validatename, cardid, isvalidatemobile } from '@/util/validate'
 import { SubtractDay, getBirthByIdNumber, getSexByIdCard, getAgeByBirth } from '@/util/index'
 import _defaultPicture from '../../assets/images/org-default-picture.png'
-import _noticePicture from '../../assets/images/notice-img.png'
+import _noticePicture from '../../assets/images/notice-img1.png'
 import _signatureBg from '../../assets/images/signature-bg.png'
 import { wxpermission } from '@/wxpermission'
 const wx = require('weixin-js-sdk')

src/views/signingWD/index.vue

@@ -24,6 +24,13 @@
       <div class="form">
         <div class="table">
           <div class="tr">
+            <div class="td label">身份证号</div>
+            <div class="td text-right">
+              <input type="text" class="form-control" placeholder="请输入有效的女性身份证号" @blur="BaseValidateIdCard" v-model="BaseForm.idCard" :disabled="signStatus=='update'"/>
+              <span v-show="!BaseValidate.idCardState" class="small-hint">请输入有效的女性身份证号</span>
+            </div>
+          </div>
+          <div class="tr">
             <div class="td label">姓名</div>
             <div class="td text-right">
               <input type="text" class="form-control" maxlength="15" v-model="BaseForm.name" @blur="BaseValidateName" placeholder="请输入姓名" :disabled="signStatus=='update'"/>
@@ -38,13 +45,6 @@
             </div>
           </div>
           <div class="tr">
-            <div class="td label">身份证号</div>
-            <div class="td text-right">
-              <input type="text" class="form-control" placeholder="请输入有效的女性身份证号" @blur="BaseValidateIdCard" v-model="BaseForm.idCard" :disabled="signStatus=='update'"/>
-              <span v-show="!BaseValidate.idCardState" class="small-hint">请输入有效的女性身份证号</span>
-            </div>
-          </div>
-          <div class="tr">
             <div class="td label">末次月经时间</div>
             <div class="td text-right">
               <input type="text" class="form-control" v-model="BaseForm.lastMensesTime" v-if="signStatus=='update'" :disabled="signStatus=='update'"/>
@@ -95,7 +95,7 @@
           </div>
         </div>
       </div>
-      <div class="form">
+      <!-- <div class="form">
         <div class="table">
           <div class="tr">
             <div class="td label">保健手册编码</div>
@@ -112,7 +112,7 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- <div class="form">
         <div class="table">
           <div class="tr">
@@ -198,7 +198,7 @@
             </div>
           </div>
           <div class="tr">
-            <div class="td label">出生年月</div>
+            <div class="td label">出生日期</div>
             <div class="td text-right">
               <div class="td-table" @click="openPickerBirth(index)" v-if="item.editor">
                 <div class="td-table-cell text">
@@ -454,11 +454,11 @@
 
 <script>
 import store from '@/store'
-import { getOrgInfo, getSignInfo, getAreaList, getVillages, getOrgsByAreaCode, createSignWD, extendSignWD } from '@/api/signing/signing'
+import { getOrgInfo, getSignInfo, getAreaList, getVillages, getOrgsByAreaCode, createSignWD, extendSignWD, getManualByPriKey } from '@/api/signing/signing'
 import { validatename, cardid, isvalidatemobile } from '@/util/validate'
 import { SubtractDay, getBirthByIdNumber, getSexByIdCard, getAgeByBirth } from '@/util/index'
 import _defaultPicture from '../../assets/images/org-default-picture.png'
-import _noticePicture from '../../assets/images/notice-img.png'
+import _noticePicture from '../../assets/images/notice-img1.png'
 import _signatureBg from '../../assets/images/signature-bg.png'
 import { wxpermission } from '@/wxpermission'
 const wx = require('weixin-js-sdk')
@@ -839,18 +839,37 @@ export default {
     BaseValidateIdCard () { // 身份证验证
       if (cardid(this.BaseForm.idCard)[0]) {
         this.BaseValidate.idCardState = false
+        console.log('不通过')
       } else {
         if (getSexByIdCard(this.BaseForm.idCard) === '2') {
           this.BaseValidate.idCardState = true
         } else {
           this.BaseValidate.idCardState = false
         }
+        console.log('通过')
+        this.getManualPriKey()
       }
       if (this.pageType === 0) {
         this.BaseFormIntoTab1()
       }
       this.saveSignInfoToCookie() // 储存用户签约录入信息
     },
+    // 根据身份证号查询身份信息
+    getManualPriKey() {
+      let params = {
+        idCard: this.BaseForm.idCard
+      }
+      getManualByPriKey(params).then(res => {
+        if(res.code === 200) {
+          if(res.records.name) {
+            this.BaseForm.name = res.records.name
+          }
+          if(res.records.lastMensesTime) {
+            this.BaseForm.lastMensesTime = res.records.lastMensesTime
+          }
+        }
+      })
+    },
     // BaseValidateIdCardKid () { // 子女身份证验证
     //   if (cardid(this.userData.idCardKid)[0]) {
     //     this.BaseValidate.idCardKidState = false