Merge branch '20200710_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20200710_pc_vue_new_branch

src/store/modules/globalConfig.js

@@ -617,6 +617,21 @@ const global_config = {
         zongliang_unit: 'iu',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
+      },
+      9: {
+        id: 9,
+        name: '达肝素',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'iu',
+        weichi_unit: 'iu/h',
+        zongliang_unit: 'iu',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
       }
     },
     anticoagulants_set: {

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -231,6 +231,7 @@
           v-model="patient_search_keyword"
           style="width: 250px;"
           placeholder="病人名字、透析号"
+          @keyup.enter.native='searchPatientAction'
         >
           <el-button
             slot="append"

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -52,6 +52,8 @@
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5">{{ anticoagulant_zongliang != "0" ? "ml" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 8">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 9">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
         </li>
 
         <li v-if="isShow('透析器/灌流器')">
@@ -116,6 +118,8 @@
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span >
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 8" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 9" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
         </li>
 
         <li v-if="isShow('钙')">
@@ -204,6 +208,8 @@
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5">{{ anticoagulant_weichi != "0" ? "ml/h" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 8">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 9">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
         </li>
 
         <li

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyOne.vue

@@ -573,13 +573,15 @@
                     <td width="40">mg</td>
 
 
-                    <td width='80'>
-                      <label-box :isChecked="prescription.anticoagulant == 6 ? true : prescription.anticoagulant == 7 ? true : false" showValue="低分子"></label-box>
+                    <td width='300'>
+                      <label-box :isChecked="prescription.anticoagulant == 6 ? true:false" showValue="低分子肝素钙"></label-box>
+                      <label-box :isChecked="prescription.anticoagulant == 8 ? true:false" showValue="依诺肝素"></label-box>
+                      <label-box :isChecked="prescription.anticoagulant == 9 ? true:false" showValue="达肝素"></label-box>
                     </td>
                     <td width="60">
                       <div class="under-line">
                         &nbsp;
-                        <span v-if="prescription.anticoagulant == 6 || prescription.anticoagulant == 7">{{ prescription.anticoagulant_zongliang }}</span>
+                        <span v-if="prescription.anticoagulant == 6 || prescription.anticoagulant == 8|| prescription.anticoagulant == 9">{{ prescription.anticoagulant_zongliang }}</span>
                       </div>
                     </td>
                     <td width="20">iu</td>
@@ -961,7 +963,7 @@
       <table class="print-table" border="1">
         <tr>
           <td>时间</td>
-          <td width='430'>临时医嘱</td>
+          <td width='470'>临时医嘱</td>
           <td>医生签名</td>
           <td>执行护士</td>
           <td>执行时间</td>

src/xt_pages/home/index.vue

@@ -6,7 +6,7 @@
     <section class="app-container app-main-bg">
       <div class="home-page">
         <div class="search clearfix">
-          <input type="text" class="search-input" placeholder="病人姓名/透析号" v-model="searchKey" />
+          <input type="text" class="search-input" placeholder="病人姓名/透析号" v-model="searchKey" @keyup.enter='clickSearch' />
           <button class="search-button" @click="clickSearch">搜索</button>
         </div>
         <div class="ui-step clearfix">

src/xt_pages/management/index.vue

@@ -20,6 +20,7 @@
           class="filter-item"
           placeholder="输入序列号/设备名/型号搜索"
           size="small"
+          @keyup.enter.native='seahcerMacherInfo'
         />
         <el-button
           class="filter-item"

src/xt_pages/sign/index.vue

@@ -9,7 +9,7 @@
             <el-col :span="8">
                 <div class="dataTitle">患者列表</div>
                 <div style="margin-bottom: 10px;">
-                    <el-input v-model.trim="queryParams.keywords" placeholder="姓名/透析号" style="width: 150px;" @change="changeSearch"></el-input>&nbsp;
+                    <el-input v-model.trim="queryParams.keywords" @keyup.enter.native='changeSearch' placeholder="姓名/透析号" style="width: 150px;" @change="changeSearch"></el-input>&nbsp;
                     <el-button type="primary" @change="changeSearch" icon="el-icon-search">搜索</el-button>&nbsp;&nbsp;&nbsp;&nbsp;
                     <el-select v-model="queryParams.schedule_type" style="width: 100px;" @change="changeSearch">
                     <el-option v-for="item in shiftOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>

src/xt_pages/user/components/PatientForm.vue

@@ -1396,8 +1396,14 @@ export default {
           if (this.isEdit) {
             this.form.age = parseInt(this.form.age);
             this.form.user_sys_before_count = this.form.user_sys_before_count.toString();
-
+            if(this.form.avatar.indexOf('?imageView2/2/w/500/h/500/q/90')!=-1){
+               this.form.avatar = this.form.avatar
+            }else{
+              this.form.avatar = this.form.avatar + "?imageView2/2/w/500/h/500/q/90"
+            }
+            console.log("form",this.form)
             editPatient(this.patientID, this.form)
+
               .then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg);
@@ -1472,7 +1478,8 @@ export default {
     },
     handleAvatarSuccess(res, file) {
       // this.imageUrl = URL.createObjectURL(file.raw);
-      this.form.avatar = this.qiniuDomain + res.url;
+      this.form.avatar = this.qiniuDomain + res.url +"?imageView2/2/w/500/h/500/q/90";
+      console.log("上传成功地址",this.form.avatar)
       this.avatarFlag = true;
       this.loading.close();
     },

src/xt_pages/user/patients.vue

@@ -141,6 +141,7 @@
           class="filter-item"
           placeholder="病人姓名/透析号"
           size="small"
+          @keyup.enter.native='search'
         />
         <el-button
           class="filter-item"

src/xt_pages/workforce/components/tableData.vue

@@ -7,6 +7,7 @@
         class="filter-item"
         v-model.trim="keywords"
         placeholder="病人名称/透析号"
+        @keyup.enter.native='search'
       />
       <el-button
         size="small"