开发分支；

src/util/baseUrl.js

 /**
  * 鉴权地址
  */
-// const authUrl = 'http://test.icareyou.net' //  开发
-const authUrl = 'http://www.icareyou.net' //  正式
+const authUrl = 'http://test.icareyou.net' //  开发
+// const authUrl = 'http://www.icareyou.net' //  正式
 
 /**
  * 项目接口请求地址
  */
-// const voucherUrl = 'http://voucher.check.icaremgt.com' // 开发
-const voucherUrl = 'http://voucher.icaremgt.com' // 正式
+const voucherUrl = 'http://voucher.check.icaremgt.com' // 开发
+// const voucherUrl = 'http://voucher.icaremgt.com' // 正式
 
 /**
  * 机构控件项目接口请求地址
  */
-// const sjkgUrl = 'https://api-wx-service.check.icaremgt.com' // 开发
-const sjkgUrl = 'https://sjkg-wx-service.icaremgt.com' // 正式
+const sjkgUrl = 'https://api-wx-service.check.icaremgt.com' // 开发
+// const sjkgUrl = 'https://sjkg-wx-service.icaremgt.com' // 正式
 // const sjkgUrl = 'http://192.168.1.234:9005'
 
 const defaultUrl = {

src/views/signing/index.vue

@@ -50,7 +50,7 @@
               <input type="text" class="form-control" v-model="BaseForm.lastMensesTime" v-if="signStatus=='update'" :disabled="signStatus=='update'"/>
               <div class="td-table" @click="openPickerLastMensesTime" v-else>
                 <div class="td-table-cell text">
-                  <span v-if="BaseForm.lastMensesTime === ''" style="color:#FF9B44;">领取儿童健康券时可不填写</span>
+                  <span v-if="BaseForm.lastMensesTime === ''" class="text-orange">领取儿童健康券时可不填写</span>
                   <span v-else class="light">{{BaseForm.lastMensesTime}}</span>
                   <!-- {{BaseForm.lastMensesTime !== '' ? BaseForm.lastMensesTime : '请选择末次月经时间'}} -->
                 </div>
@@ -62,6 +62,22 @@
             </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'"/>
+              <div class="td-table" @click="openPupupOrg" v-else>
+                <div class="td-table-cell text">
+                  <span v-if="BaseForm.orgId === ''">请选择确诊机构</span>
+                  <span v-else>{{BaseForm.orgName}}</span>
+                </div>
+                <div class="td-table-cell icon">
+                  <i class="glyphicon glyphicon-menu-right"></i>
+                </div>
+              </div>
+              <span v-show="!BaseValidate.orgState" class="small-hint">请选择确诊机构</span>
+            </div>
+          </div>
+          <div class="tr">
             <div class="td label">现住址</div>
             <div class="td text-right">
               <div v-if="signStatus=='update'">
@@ -93,6 +109,12 @@
               <span v-if="!BaseValidate.streetState" class="small-hint">请输入详细地址</span>
             </div>
           </div>
+          <div class="tr">
+            <div class="td label">备注</div>
+            <div class="td text-right">
+              <textarea v-model="BaseForm.note" class="form-control" rows="3" :disabled="signStatus=='update'" placeholder="备注非必填..." style="border: 1px solid #9aa0a4;"></textarea>
+            </div>
+          </div>
         </div>
       </div>
       <!-- <div class="form">
@@ -134,6 +156,7 @@
       <div class="p-title" v-if="pageType===0">
         <span class="label">上传身份证明资料：身份证正面/反面</span>
       </div>
+      <p class="text-orange m-b-normal">请务必填写真实有效的资料！</p>
       <div class="upload-list" v-if="pageType===0">
         <ul class="nav-pills">
           <li v-for="(item, index) in BaseForm.chooseImages" :key="index">
@@ -157,6 +180,7 @@
       <div class="p-title" v-if="pageType===0">
         <span class="label" style="white-space: initial;">上传怀孕资料：早孕告知书、最近一次化验单（B照、肝功、肾功、血常规、尿常规、心电图）</span>
       </div>
+      <p class="text-orange m-b-normal">请务必填写真实有效的资料！</p>
       <div class="upload-list" v-if="pageType===0">
         <ul class="nav-pills">
           <li v-for="(item, index) in BaseForm.chooseImages2" :key="index">
@@ -490,6 +514,16 @@
       @confirm="lastMensesTimePickerConfirm"
       :endDate="pickerLastMensesTimeEnd">
     </mt-datetime-picker>
+    <!-- 确诊机构列表 -->
+    <mt-popup
+      v-model="OrgPopupVisible"
+      position="bottom"
+      class="full-width">
+      <div class="popup-head">
+        <a class="btn-link pull-right" @click="orgPopupClose">确认</a>
+      </div>
+      <mt-picker :slots="orgSlots" @change="onOrgConfirm" valueKey="name"></mt-picker>
+    </mt-popup>
     <div class="light-box" :class="lightBoxVisible?'show':'hide'" @click="handelLightBoxClose">
       <div class="table">
         <div class="cell">
@@ -565,7 +599,9 @@ export default {
         subAddress: '',
         street: '',
         code: '',
+        orgId: '',
         orgName: '',
+        note: '',
         chooseImages: [], // 身份证图片
         chooseImagesIds: [], // 身份证图片微信本地图片id
         chooseImages2: [], // 怀孕资料图片
@@ -648,7 +684,17 @@ export default {
       Choose2PlusVisible: true,
       modalVisible: false, // 底层透明遮挡显示状态
       addressSearchValue: '',
-      pageH: ''
+      pageH: '',
+      OrgPopupVisible: false,
+      orgSlots: [{
+        defaultIndex: 0,
+        values: [
+          { name: '请选择确诊机构', value: '' },
+          { name: '机构机构机构机构机构1', value: '1' },
+          { name: '机构机构机构机构机构机构2', value: '2' },
+          { name: '机构机构机构机构机构机构3', value: '3' }
+        ]
+      }]
     }
   },
   created () {
@@ -782,7 +828,13 @@ export default {
           this.BaseForm.subAddress = data.townName + ' ' + data.villageName
         }
         this.BaseForm.lastMensesTime = data.pregnantDate && data.pregnantDate !== '' ? data.pregnantDate.split(' ')[0] : ''
+        this.BaseForm.note = data.note
+        this.orgSlots[0].defaultIndex = this.orgSlots[0].values.findIndex(item => {
+          return item.value === data.orgId
+        })
+        // this.BaseForm.orgName = data.orgName
         // this.BaseForm.code = data.healthCode
+
         this.addressForm.province = data.shenName
         this.addressForm.city = data.shiName
         this.addressForm.area = data.xiaName
@@ -896,7 +948,7 @@ export default {
       this.BaseValidatePhone()
       this.BaseValidateAddress()
       this.BaseValidateStreet()
-      // this.BaseValidateOrg()
+      this.BaseValidateOrg()
       if (this.pageType === 0) {
         this.BaseValidateChooseImg()
       }
@@ -1032,6 +1084,16 @@ export default {
       this.BaseForm.lastMensesTime = selectedDate.getFullYear() + '-' + month + '-' + day
       this.saveSignInfoToCookie() // 储存用户签约录入信息
     },
+    openPupupOrg () {
+      this.OrgPopupVisible = true
+    },
+    orgPopupClose () {
+      this.OrgPopupVisible = false
+    },
+    onOrgConfirm (picker, values) {
+      this.BaseForm.orgName = picker.getValues()[0].name
+      this.BaseForm.orgId = picker.getValues()[0].value
+    },
     openPickerBirth (index) { // 打开出生日期控件
       // this.restPageHeight()
       this.pickerOpenIndex = index
@@ -2210,6 +2272,15 @@ export default {
   .tint {
     color: #9aa0a4;
   }
+  .popup-head{
+    overflow: hidden;
+    padding: 1em;
+    border-bottom: 1px solid #9aa0a4;
+  }
+  a.btn-link {
+    color: #333;
+    font-size: 1.1em;
+  }
   .footer {
     margin: 10px 0;
   }