Merge branch 'master' of http://git.xiaodongai.com/WechatMiniProgram/XAMJW-Hospita

pages/info1/info1.js

@@ -58,6 +58,7 @@ Page({
     mage: '', // 母亲年龄
     moccupation: '', //母亲职业
     mdegree: '', //母亲文化程度
+    idCard:''
   },
   onLoad: function(options) {
     var that = this;
@@ -176,6 +177,7 @@ Page({
           that.setData({
             username: res.info.name,
             index: res.info.cultural,
+            idCard:res.info.idCard,
             date: res.info.birthday,
             sex: res.info.xingbie,
             home: res.info.house, // 家庭类型
@@ -195,6 +197,7 @@ Page({
             sex: res.info.xingbie ? res.info.xingbie : res.info.sex,
             select: res.info.hunfou,
             username1: res.info.ask_department,
+            idCard:res.info.idCard,
           });
         }
       }
@@ -205,6 +208,11 @@ Page({
       username: e.detail.value,
     })
   },
+  inputIdCard(e){
+    this.setData({
+      idCard: e.detail.value,
+    })
+  },
   people: function(e) {
     this.setData({
       multiIndex: e.detail.value
@@ -251,6 +259,7 @@ Page({
       data.name = this.data.username;
       data.sex = this.data.sex;
       data.birthday = this.data.date;
+      data.idCard=this.data.idCard,
       // 新添加学历功能
       data.edu = this.data.index;
       if (that.data.hosiptiaFlag) { // 非池州市人民医院

pages/info1/info1.wxml

@@ -4,122 +4,127 @@
     <view class='bn'><text>{{content}}</text></view>
   </view>
   <view wx:if='{{hosiptiaFlag}}'>
-  <view class="content">
-     <view class="partyone" wx:if='{{unitid == 775 || unitid == 776}}'>工号
+    <view class="content">
+      <view class="partyone" wx:if='{{unitid == 775 || unitid == 776}}'>工号
         <input type='text' placeholder='请输入您的工号' bindinput="inputChange" value='{{username}}'></input>
       </view>
       <view class="partyone" wx:else>姓名
         <input type='text' placeholder='请输入您的姓名' bindinput="inputChange" value='{{username}}'></input>
       </view>
-    <view class="partyone">性别
-      <radio-group class="radio-group" bindchange="radioChange">
-        <label class="radio" wx:for="{{items}}" wx:key="key">
-          <radio value="{{item.name}}" checked="{{item.name==sex?true : false}}" color='#37c0b8' />{{item.value}}
-        </label>
-      </radio-group>
-    </view>
-    <view class="partyone">生日
-      <view class="section">
-        <picker mode="date" value="{{date}}" start="{{startTime}}" end="{{endTime}}" bindchange="bindDateChange">
-          <view class="">
-            {{date}}
-            <!-- <image src="../../images/down.png"></image> -->
-          </view>
-        </picker>
+      <view class="partyone">性别
+        <radio-group class="radio-group" bindchange="radioChange">
+          <label class="radio" wx:for="{{items}}" wx:key="key">
+            <radio value="{{item.name}}" checked="{{item.name==sex?true : false}}" color='#37c0b8' />{{item.value}}
+          </label>
+        </radio-group>
       </view>
-    </view>
-    <view class='partyone'>文化程度
-      <view class="section">
-        <view class="section__title"></view>
-        <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
-          <view class="picker">
-            {{array[index]}}
-          </view>
-        </picker>
+      <view class="partyone">生日
+        <view class="section">
+          <picker mode="date" value="{{date}}" start="{{startTime}}" end="{{endTime}}" bindchange="bindDateChange">
+            <view class="">
+              {{date}}
+              <!-- <image src="../../images/down.png"></image> -->
+            </view>
+          </picker>
+        </view>
       </view>
-    </view>
-    <view class='partyone'>婚姻状况
-      <view class="section">
-        <view class="section__title"></view>
-        <picker bindchange="bindPickerChange1" value="{{select}}" range="{{array1}}">
-          <view class="picker" mode = "selector">
-            {{array1[select]}}
-          </view>
-        </picker>
+      <view class='partyone'>文化程度
+        <view class="section">
+          <view class="section__title"></view>
+          <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
+            <view class="picker">
+              {{array[index]}}
+            </view>
+          </picker>
+        </view>
       </view>
-    </view>
-        <view class="partyone">编号
+      <view class='partyone'>婚姻状况
+        <view class="section">
+          <view class="section__title"></view>
+          <picker bindchange="bindPickerChange1" value="{{select}}" range="{{array1}}">
+            <view class="picker" mode="selector">
+              {{array1[select]}}
+            </view>
+          </picker>
+        </view>
+      </view>
+      <view class="partyone">编号
         <input type='text' placeholder='请输入编号' bindinput="inputChange2" value='{{usernumber}}'></input>
       </view>
-    <view class="partyone">单位名称
-      <input type='text' placeholder='请输入您的单位名称' bindinput="inputChange1" value='{{username1}}'></input>
+      <view class="partyone">
+        身份证号
+        <input type='text' placeholder='请输入身份证号' bindinput="inputIdCard" maxlength="18" value='{{idCard}}'>
+        </input>
+      </view>
+      <view class="partyone">单位名称
+        <input type='text' placeholder='请输入您的单位名称' bindinput="inputChange1" value='{{username1}}'></input>
+      </view>
     </view>
   </view>
-  </view>
   <view wx:else>
-  <view class="content">
-    <view class="partyone">你的姓名
-      <input type='text' placeholder='请输入您的姓名' bindinput="inputChange" value='{{username}}'></input>
-    </view>
-    <view class="partyone">性别
-      <radio-group class="radio-group" bindchange="radioChange">
-        <label class="radio" wx:for="{{items}}" wx:key="key">
-          <radio value="{{item.name}}" checked="{{item.name==sex?true : false}}" color='#37c0b8' />{{item.value}}
-        </label>
-      </radio-group>
-    </view>
-    <view class="partyone">年龄
-      <view class="section">
-        <picker mode="date" value="{{date}}" start="{{startTime}}" end="{{endTime}}" bindchange="bindDateChange">
-          <view class="">
-            {{date}}
-            <!-- <image src="../../images/down.png"></image> -->
-          </view>
-        </picker>
+    <view class="content">
+      <view class="partyone">你的姓名
+        <input type='text' placeholder='请输入您的姓名' bindinput="inputChange" value='{{username}}'></input>
       </view>
-    </view>
-    <view class='partyone'>年级
-      <view class="section">
-        <view class="section__title"></view>
-        <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
-          <view class="picker">
-            {{array[index]}}
-          </view>
-        </picker>
+      <view class="partyone">性别
+        <radio-group class="radio-group" bindchange="radioChange">
+          <label class="radio" wx:for="{{items}}" wx:key="key">
+            <radio value="{{item.name}}" checked="{{item.name==sex?true : false}}" color='#37c0b8' />{{item.value}}
+          </label>
+        </radio-group>
       </view>
-    </view>
-    <view class="partyone">父亲年龄
-      <input type='number' placeholder='请输入您父亲的年龄' bindinput="fage" value='{{fage}}'></input>
-    </view>
-    <view class="partyone">父亲职业
-      <input type='text' placeholder='请输入您父亲的职业' bindinput="foccupation" value='{{foccupation}}'></input>
-    </view>
-    <view class="partyone">父亲文化程度
-      <input type='text' placeholder='请输入您父亲的文化程度' bindinput="fdegree" value='{{fdegree}}'></input>
-    </view>
-    <view class="partyone">母亲年龄
-      <input type='number' placeholder='请输入您母亲的年龄' bindinput="mage" value='{{mage}}'></input>
-    </view>
-    <view class="partyone">母亲职业
-      <input type='text' placeholder='请输入您母亲的职业' bindinput="moccupation" value='{{moccupation}}'></input>
-    </view>
-    <view class="partyone">母亲文化程度
-      <input type='text' placeholder='请输入您母亲的文化程度' bindinput="mdegree" value='{{mdegree}}'></input>
-    </view>
-     <view class='con-box clearfix' style='margin-top: 40rpx;'>
-          <view class='con-box-title'>家庭类型</view>
-          <view class='con-box-con'>
-            <radio-group class="radio-group-six" bindchange="radioChangeHelp">
-              <label class="radio" wx:for="{{helpArr}}" wx:key="key">
-                <radio value="{{item.name}}" checked="{{item.name==home?true : false}}" color='#fbb040' />{{item.value}}
-              </label>
-            </radio-group>
-          </view>
+      <view class="partyone">年龄
+        <view class="section">
+          <picker mode="date" value="{{date}}" start="{{startTime}}" end="{{endTime}}" bindchange="bindDateChange">
+            <view class="">
+              {{date}}
+              <!-- <image src="../../images/down.png"></image> -->
+            </view>
+          </picker>
         </view>
-  </view>
+      </view>
+      <view class='partyone'>年级
+        <view class="section">
+          <view class="section__title"></view>
+          <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
+            <view class="picker">
+              {{array[index]}}
+            </view>
+          </picker>
+        </view>
+      </view>
+      <view class="partyone">父亲年龄
+        <input type='number' placeholder='请输入您父亲的年龄' bindinput="fage" value='{{fage}}'></input>
+      </view>
+      <view class="partyone">父亲职业
+        <input type='text' placeholder='请输入您父亲的职业' bindinput="foccupation" value='{{foccupation}}'></input>
+      </view>
+      <view class="partyone">父亲文化程度
+        <input type='text' placeholder='请输入您父亲的文化程度' bindinput="fdegree" value='{{fdegree}}'></input>
+      </view>
+      <view class="partyone">母亲年龄
+        <input type='number' placeholder='请输入您母亲的年龄' bindinput="mage" value='{{mage}}'></input>
+      </view>
+      <view class="partyone">母亲职业
+        <input type='text' placeholder='请输入您母亲的职业' bindinput="moccupation" value='{{moccupation}}'></input>
+      </view>
+      <view class="partyone">母亲文化程度
+        <input type='text' placeholder='请输入您母亲的文化程度' bindinput="mdegree" value='{{mdegree}}'></input>
+      </view>
+      <view class='con-box clearfix' style='margin-top: 40rpx;'>
+        <view class='con-box-title'>家庭类型</view>
+        <view class='con-box-con'>
+          <radio-group class="radio-group-six" bindchange="radioChangeHelp">
+            <label class="radio" wx:for="{{helpArr}}" wx:key="key">
+              <radio value="{{item.name}}" checked="{{item.name==home?true : false}}" color='#fbb040' />{{item.value}}
+            </label>
+          </radio-group>
+        </view>
+      </view>
+    </view>
   </view>
   <view class="footer" bindtap="submit">
     <button>开始</button>
   </view>
-    <view class='bottom-line'></view>
+  <view class='bottom-line'></view>
 </block>
\ No newline at end of file