Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/home/login.vue

@@ -37,9 +37,9 @@
           >
             登录
           </button>
-          <router-link to="/forgetPassword">
-            <div class="newForget">忘记密码</div>
-          </router-link>
+          <!-- <router-link to="/forgetPassword"> -->
+          <div class="newForget" @click="ok">忘记密码</div>
+          <!-- </router-link> -->
           <!-- </router-link> -->
           <!-- <div class="forget">
           <a href="">免密码登录</a>
@@ -55,6 +55,7 @@
 import { loginByPwd } from "@/api/login";
 import { hex_md5 } from "@/utils/md5";
 import { getLoginInfoCache, cacheLoginInfo } from "@/utils/admin_info_cache";
+import { Toast } from "vant";
 
 export default {
   name: "Home",
@@ -115,6 +116,9 @@ export default {
     },
     to: function() {
       this.$router.push({ path: "/forgetPassword" });
+    },
+    ok() {
+      Toast.success("程序员还在开发中");
     }
   }
 };

src/pages/main/dialog/DoubleDialog.vue

@@ -30,7 +30,7 @@
         </el-form>
         <el-form
           :inline="true"
-          class="demo-form-inline"
+          class="demo-form-inline doubleForm"
           :model="doubleReview"
           label-width="3.4rem"
         >
@@ -51,7 +51,7 @@
         </el-form>
         <el-form
           :inline="true"
-          class="demo-form-inline"
+          class="demo-form-inline doubleForm"
           :model="doubleReview"
           label-width="3.4rem"
         >
@@ -80,7 +80,7 @@
         </el-form>
         <el-form
           :inline="true"
-          class="demo-form-inline"
+          class="demo-form-inline doubleForm"
           :model="doubleReview"
           label-width="3.4rem"
         >
@@ -117,7 +117,7 @@
 
         <el-form
           :inline="true"
-          class="demo-form-inline"
+          class="demo-form-inline doubleForm"
           :model="doubleReview"
           label-width="3.4rem"
         >

src/pages/main/dialog/MonitDialog.vue

@@ -18,17 +18,17 @@
           <div style="width:100%;overflow:hildden;">
             <table class="table" style="">
               <tr @click="selectRow(-1, null)">
-                <th v-if="isShow('监测时间')" width="124px">时间</th>
-                <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
-                <th v-if="isShow('脉搏')" width="80px">脉搏(次/分)</th>
-                <th v-if="isShow('体温')" width="80px">体温(℃)</th>
-                <th v-if="isShow('呼吸频率')" width="110px">呼吸频率(次/分)</th>
-                <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
+                <th v-if="isShow('监测时间')" width="60px">时间</th>
+                <th v-if="isShow('血压')" width="60px">血压(mmHg)</th>
+                <th v-if="isShow('脉搏')" width="50px">脉搏(次/分)</th>
+                <th v-if="isShow('体温')" width="50px">体温(℃)</th>
+                <th v-if="isShow('呼吸频率')" width="80px">呼吸频率(次/分)</th>
+                <th v-if="isShow('血流量')" width="70px">血流量(ml/min)</th>
                 <th width="76px">静脉压/动脉压(mmHg)</th>
-                <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmHg)</th>
-                <th v-if="isShow('超滤量') && template_id ==6" width="76px">超滤量(ml)</th>
-                <th v-if="isShow('超滤量') && template_id !=6" width="76px">超滤量(L)</th>
-                <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
+                <th v-if="isShow('跨膜压')" width="70px">跨膜压(mmHg)</th>
+                <th v-if="isShow('超滤量') && template_id ==6" width="60px">超滤量(ml)</th>
+                <th v-if="isShow('超滤量') && template_id !=6" width="60px">超滤量(L)</th>
+                <th v-if="isShow('钠浓度')" width="82px">钠浓度(mmol/L)</th>
                 <th v-if="isShow('透析液温度')" width="82px">透析液温度(℃)</th>
                 <th v-if="isShow('置换率') && template_id ==6" width="92px">置换率(ml/min)</th>
                 <th v-if="isShow('置换率') && template_id !=6" width="92px">置换率(L/h)</th>

src/pages/main/dialog/PrescriptionDialog.vue

@@ -287,7 +287,7 @@
         <div class="PrescSubmit">
           <button style="display: none" class="tj" @click="sign()">医生签名</button>
           <button class="tjcq" @click="commitSolutionInfo" v-if="isPermission()">保存并设为长期处方</button>
-          <button class="tj" style="visibility: hidden;" @click="commitInfo" v-if="isPermission()">保存</button>
+          <button class="tj" style="display:none;" @click="commitInfo" v-if="isPermission()">保存</button>
         </div>
       </div>
     </div>
@@ -1049,6 +1049,7 @@
         }
       },
       GetModeByModeId: function (val) {
+        console.log("val",val)
         let treatment_mode_name = ''
         let treatment_mode = this.modeOption
 
@@ -1060,7 +1061,8 @@
         for (let keys in treatment_mode) {
           if (treatment_mode[keys].id == val) {
             treatment_mode_name = treatment_mode[keys].name
-            if (treatment_mode_name == 'HD') {
+            console.log("treatment_mode_name",treatment_mode_name)
+            if (treatment_mode_name == 'HD' || treatment_mode_name == 'HD+HP' || treatment_mode_name == 'HP' || treatment_mode_name == 'HF' || treatment_mode_name == 'SCUF' || treatment_mode_name == 'IUF' || treatment_mode_name == 'HFHD' || treatment_mode_name == 'HFHD +HP' || treatment_mode_name == 'PHF'|| treatment_mode_name == 'HFR' || treatment_mode_name == 'CRRT' || treatment_mode_name == '腹水回收' || treatment_mode_name == 'HD前置换' || treatment_mode_name == 'HD后置换') {
               this.zhiShow = false
               this.totalShow = false
               this.huShow = false

src/pages/main/dialog/new_order/AddNewOrders.vue

@@ -18,12 +18,7 @@
         <div style="overflow: hidden;">
           <div class="cell" style="margin-top: 0;">
             <label>医嘱类型</label>
-            <el-input
-              class="typeInput"
-              ref="advice_type"
-              value="临时"
-              disabled
-            ></el-input>
+            <el-input class="typeInput" ref="advice_type" value="临时" disabled></el-input>
           </div>
           <div class="cell" style="margin-top: 0;">
             <label>开始时间</label>
@@ -43,11 +38,7 @@
             <label>开嘱时间 {{ record_date_str }}</label>
           </div>
         </div>
-        <div
-          id="newDialogContent"
-          class="DialogContent choose"
-          style="height: 6.2rem;"
-        >
+        <div id="newDialogContent" class="DialogContent choose" style="height: 6.2rem;">
           <div class="newAddTable">
             <table class="table">
               <tr>
@@ -70,20 +61,16 @@
                 >
                   <td
                     style="text-align: left; padding-left: 5px; padding-right: 5px;"
-                  >
-                    {{ advice.title }}
-                  </td>
-                  <td v-if="advice.advice_desc">
-                    {{ advice.advice_desc }}{{ advice.drug_spec_unit }}
-                  </td>
+                  >{{ advice.title }}</td>
+                  <td v-if="advice.advice_desc">{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</td>
                   <td v-if="advice.prescribing_number">
                     {{ advice.prescribing_number
                     }}{{ advice.prescribing_number_unit }}
                   </td>
                   <td v-else></td>
-                  <td v-if="advice.single_dose">
-                    {{ advice.single_dose }} {{ advice.single_dose_unit }}
-                  </td>
+                  <td
+                    v-if="advice.single_dose"
+                  >{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
                   <td v-else></td>
                   <td>{{ advice.delivery_way }}</td>
                   <td>{{ advice.execution_frequency }}</td>
@@ -100,23 +87,19 @@
                 >
                   <td
                     style="text-align: left; padding-right: 5px; padding-left: 25px;"
-                  >
-                    {{ subdrug.title }}
-                  </td>
+                  >{{ subdrug.title }}</td>
+                  <td>{{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}</td>
                   <td>
-                    {{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}
+                    <span v-if="subdrug.prescribing_number">
+                      {{ subdrug.prescribing_number
+                      }}{{ subdrug.prescribing_number_unit }}
+                    </span>
                   </td>
                   <td>
-                    <span v-if="subdrug.prescribing_number"
-                      >{{ subdrug.prescribing_number
-                      }}{{ subdrug.prescribing_number_unit }}</span
-                    >
-                  </td>
-                  <td>
-                    <span v-if="subdrug.single_dose"
-                      >{{ subdrug.single_dose }}
-                      {{ subdrug.single_dose_unit }}</span
-                    >
+                    <span v-if="subdrug.single_dose">
+                      {{ subdrug.single_dose }}
+                      {{ subdrug.single_dose_unit }}
+                    </span>
                   </td>
                   <!--<td v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>-->
                   <td></td>
@@ -171,7 +154,7 @@
 import SingleOptionDialog from "./single_option_dialog";
 import OrderFormDialog from "./order_form";
 import AdviceTemplate from "./select_advice_template_dialog";
-import { Toast } from "vant";
+import { Toast, Dialog } from "vant";
 import { parseTime } from "@/utils";
 import { batchCreateAdvices } from "@/api/advice";
 import { setTimeout } from "timers";
@@ -290,19 +273,24 @@ export default {
       }
     },
     deleteOrderAction: function() {
-      if (this.selecting_advice_index >= 0) {
-        if (this.selecting_subdrug_index < 0) {
-          this.advices.splice(this.selecting_advice_index, 1);
-          this.selecting_advice_index = -1;
+      Dialog.confirm({
+        title: "删除医嘱",
+        message: "确认删除医嘱吗?"
+      }).then(() => {
+        if (this.selecting_advice_index >= 0) {
+          if (this.selecting_subdrug_index < 0) {
+            this.advices.splice(this.selecting_advice_index, 1);
+            this.selecting_advice_index = -1;
+          } else {
+            var advice = this.advices[this.selecting_advice_index];
+            advice.subdrugs.splice(this.selecting_subdrug_index, 1);
+            this.selecting_advice_index = -1;
+            this.selecting_subdrug_index = -1;
+          }
         } else {
-          var advice = this.advices[this.selecting_advice_index];
-          advice.subdrugs.splice(this.selecting_subdrug_index, 1);
-          this.selecting_advice_index = -1;
-          this.selecting_subdrug_index = -1;
+          Toast.fail("请先选择医嘱内容");
         }
-      } else {
-        Toast.fail("请先选择医嘱内容");
-      }
+      });
     },
     selectStartTimeAction: function() {
       this.$refs.start_time_picker.open();

src/pages/personal/index.vue

@@ -72,7 +72,7 @@
         <img class="bannerOne" src="../../assets/my/myBanner.png" alt />
         <div class="avatar">
           <img src="../../assets/my/avatar.png" alt />
-          <p>{{user_name}}</p>
+          <p>{{ user_name }}</p>
         </div>
       </div>
       <div class="list">
@@ -85,15 +85,15 @@
             <span class="iconfont jiantou">&#xe6f9;</span>
           </div>
         </router-link>
-        <router-link to="/ChangePassword">
-          <div class="name">
-            <div class="left">
-              <img src="../../assets/my/modification.png" alt />
-              <span>修改密码</span>
-            </div>
-            <span class="iconfont jiantou">&#xe6f9;</span>
+        <!-- <router-link to="/ChangePassword"> -->
+        <div class="name" @click="okk">
+          <div class="left">
+            <img src="../../assets/my/modification.png" alt />
+            <span>修改密码</span>
           </div>
-        </router-link>
+          <span class="iconfont jiantou">&#xe6f9;</span>
+        </div>
+        <!-- </router-link> -->
         <div class="name" @click="logout">
           <div class="left">
             <img src="../../assets/my/exit.png" alt />
@@ -111,6 +111,7 @@
 import SideBar from "@/pages/layout/SideBar";
 import EditPersonal from "./EditPersonal";
 import { GetMyInfo } from "@/api/admin_user";
+import { Toast } from "vant";
 
 export default {
   name: "PersonalIndex",
@@ -150,6 +151,9 @@ export default {
     logout: function() {
       // TODO 请求退出登录接口
       this.$router.push("/");
+    },
+    okk() {
+      Toast.success("程序员还在开发中");
     }
   }
 };

src/styles/style.scss

@@ -542,7 +542,7 @@ body {
       button {
         padding: 0 0.32rem;
         border: $main-color;
-        font-size: 0.36rem;
+        font-size: 0.45rem;
         text-align: center;
         height: 1rem;
         line-height: 0.7rem;