12.19 患者bug

pages/inquiryForm/inquiryForm.js

@@ -2,18 +2,20 @@
 const app = getApp()
 import {nation,job} from "../../api/common"
 import {sendFields} from "../../api/sickRecord"
+import {throttle} from "../../utils/util"
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    showDialog:false,
     obj:{
       height:'身高',
       weight:'体重',
+      marital_status:'婚姻状态',
       nation_id:'民族',
       job_id:'职业',
-      marital_status:'婚姻状态',
       allergy_history:'是否有过敏史？',
       family_history:'是否有家族病史？',
       is_pregnant:'是否处于备孕、妊娠、哺乳期？',
@@ -100,8 +102,38 @@ Page({
     }
    
  },
+ confirmDialog:throttle(function(event){
+  if(event.detail){
+    this.handleSend();
+  }
+}),
+handleSend(){
+  const {order_inquiry_id,personInfo,obj}=this.data;
+  let dataObj={};
+  for (const key in obj) {
+    if(personInfo[key] || personInfo[key]==0){
+      dataObj[key]=personInfo[key];
+    }
+  }
+ let res=Object.assign({},dataObj,personInfo);
+  sendFields({
+    order_inquiry_id,
+    fields:res,
+  }).then(data=>{
+    wx.showToast({
+      title: '发送成功',
+      icon:'none'
+    }),
+    wx.navigateBack()
+    thi.setData({
+      showDialog:false
+    })
+   
+    
+  })
+},
   handleSendFields(){
-    const {order_inquiry_id,personInfo,list1,list2,marital_name,jobname,nationname}=this.data;
+    const {order_inquiry_id,personInfo,list1,list2,marital_name,jobname,nationname,obj}=this.data;
     console.log(personInfo)
     const fields=[];
   for (let i = 0; i <list1.length; i++) {
@@ -113,7 +145,7 @@ Page({
       return false
    }
    if (list1[i]=='height' && personInfo.height) {
-    if (!/^3[5-9](\.\d+)?$|^[4-9][0-9](\.\d+)?$|^1[0-9][0-9](\.\d+)?$|^2[1-4][0-9](\.\d+)?$|250/.test(personInfo.height)) {
+    if (!/^3[5-9](\.\d+)?$|^[4-9][0-9](\.\d+)?$|^1[0-9][0-9](\.\d+)?$|^2[0-4][0-9](\.\d+)?$|250/.test(personInfo.height)) {
       wx.showToast({
         title: `请输入范围内身高！`,
         icon: 'none',
@@ -285,22 +317,13 @@ for (let i = 0; i < list2.length; i++) {
   }
   
 }
-    
-    sendFields({
-      order_inquiry_id,
-      fields:personInfo,
-    }).then(data=>{
-      wx.showToast({
-        title: '发送成功',
-        icon:'none'
-      }),
-      wx.navigateBack()
-      
-    })
+  this.setData({
+    showDialog:true
+  })
   },
   openMaritalPicker() {
      wx.hideKeyboard();
-      if(showBtn){
+      if(this.data.showBtn){
         this.setData({
           showMarital: true
         })
@@ -387,7 +410,7 @@ for (let i = 0; i < list2.length; i++) {
   },
   showNation() {
     wx.hideKeyboard();
-    if(showBtn){
+    if(this.data.showBtn){
       this.setData({
         showNation: true
       })
@@ -412,7 +435,7 @@ for (let i = 0; i < list2.length; i++) {
   },
   showJob() {
     wx.hideKeyboard();
-    if(showBtn){
+    if(this.data.showBtn){
       this.setData({
         showJob: true
       }) 

pages/inquiryForm/inquiryForm.json

@@ -5,6 +5,7 @@
     "van-datetime-picker": "@vant/weapp/datetime-picker/index",
     "van-popup": "@vant/weapp/popup/index",
     "van-radio-group": "@vant/weapp/radio-group/index",
+    "dialog":"../../components/dialog/dialog",
     "nav":"../../components/nav/nav"
   },
   "navigationStyle":"custom",

pages/inquiryForm/inquiryForm.wxml

@@ -2,7 +2,8 @@
 <wxs src="../../filters/filter.wxs" module="filter"></wxs>
 <nav navName="问诊表"></nav>
 <view class="page">
-   <view class="questionbox">
+  <view class="pagecon">
+    <view class="questionbox">
     <view class="cellbox" wx:if="{{list1.length>0}}">
    <view class="basictitle">基本信息</view>
     <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'height').ISHAS}}">
@@ -33,7 +34,7 @@
             {{filter.formatwenzhenList(list1,'marital_status').NUMBER}}、婚姻状况
           </view>
           <view class="iptbox">
-            <input type="text" value="{{marital_name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择婚姻状况" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
+            <input type="text" value="{{marital_name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择婚姻状况" placeholder-class="placeholder" class="ipt" disabled="{{true}}" />
             <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
 
           </view>
@@ -45,7 +46,7 @@
             {{filter.formatwenzhenList(list1,'nation_id').NUMBER}}、民族
           </view>
           <view class="iptbox">
-            <input type="text" value="{{nationname}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择民族" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
+            <input type="text" value="{{nationname}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择民族" placeholder-class="placeholder" class="ipt" disabled="{{true}}" />
             <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
           </view>
         </view>
@@ -56,7 +57,7 @@
             {{filter.formatwenzhenList(list1,'job_id').NUMBER}}、职业
           </view>
           <view class="iptbox">
-            <input type="text" value="{{jobname}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请选择职业" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
+            <input type="text" value="{{jobname}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请选择职业" placeholder-class="placeholder" class="ipt" disabled="{{true}}" />
             <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
           </view>
         </view>
@@ -229,6 +230,7 @@
    <view class="bottom" wx:if="{{showBtn}}">
      <view class="btn" bindtap="handleSendFields">发送给医生</view>
    </view>
+  </view>
 
 </view>
 
@@ -248,3 +250,4 @@
   <van-popup show="{{ showJob }}" position="bottom" custom-style="height: auto">
     <van-picker show-toolbar title="选择职业" columns="{{ jobcolumns }}" value-key="job_name" bind:cancel="onCancelJob" bind:confirm="onConfirmJob" />
   </van-popup>
+  <dialog bind:confirm="confirmDialog" showDialog="{{showDialog}}" message="是否发送问诊表给问诊医生？"></dialog>

pages/inquiryForm/inquiryForm.wxss

@@ -1,10 +1,15 @@
 /* pages/inquiryForm/inquiryForm.wxss */
 .page {
-  
+
   display: flex;
   flex-direction: column;
   overflow: hidden;
 }
+.pagecon{
+  height:100%;
+  display: flex;
+  flex-direction: column;
+}
 .cellbox{
   background-color: #fff;
 }
@@ -37,7 +42,7 @@
  .iptbox{
    display: flex;
    flex:1;
-  
+   margin-top:4rpx;
    justify-content: flex-end;
  }
  .righticon{
@@ -62,6 +67,8 @@
    width:100%;
    text-align: right;
    color: #666666;
+   line-height: 48rpx;
+    margin-left: 160rpx;
    font-size: 28rpx;
  }
  .basictitle{
@@ -161,10 +168,16 @@ color: #FFFFFF;
   align-items: center;
   background: #3CC7C0;
 border-radius: 8rpx;
-  margin:40rpx 32rpx;
+  margin:50rpx 32rpx;
+}
+.van-radio__icon--disabled{
+  background-color: #fff!important;
 }
 .van-radio__icon--disabled.van-radio__icon--checked{
-  color:#3cc7c0!important;
-  background-color: #fff;
+  color:#fff!important;
+  background-color: #3cc7c0!important;
   border-color:#3cc7c0 ;
+}
+.van-radio__label--disabled{
+  color:#000!important;
 }