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

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -121,6 +121,7 @@
             </el-form-item>
           </el-col>
 
+
           <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')" >
             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-if="anticoagulant.weichi != -1" >
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1" v-model="dialysisPrescription.anticoagulant_weichi" ></el-input>
@@ -1217,6 +1218,10 @@ export default {
         'dialyzer_perfusion_apparatus'
       )
       console.log('灌流器', this.dialyzerPerfusionApparatus)
+
+
+
+
       if (this.$route.query && this.$route.query.date) {
         var date = this.$route.query && this.$route.query.date
         this.record_date = uParseTime(date, '{y}-{m}-{d}')
@@ -1280,6 +1285,8 @@ export default {
           this.totalShow = false
         }
         this.dialysisPrescription.mode_id = schedual.mode_id
+
+
       }
       var thismode = parseInt(this.dialysisPrescription.anticoagulant)
       if (isNaN(thismode) || thismode <= 0) {
@@ -1292,6 +1299,19 @@ export default {
         return false
       }
       this.anticoagulant = this.$store.getters.anticoagulants_confit[thismode]
+
+
+      for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
+        if (this.dialysisPrescription.dialyzer_perfusion_apparatus == this.dialyzerPerfusionApparatus[i].name) {
+          this.dialysisPrescription.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
+            i
+            ].id
+        }
+      }
+
+
+
+
     },
     menuMsgTip: function() {
       this.msgtip_visibility = false
@@ -3047,6 +3067,14 @@ export default {
         this.huShow = true
         this.totalShow = true
       }
+
+      for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
+        if (this.dialysisPrescription.dialyzer_perfusion_apparatus == this.dialyzerPerfusionApparatus[i].name) {
+          this.dialysisPrescription.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
+            i
+            ].id
+        }
+      }
     },
     handlePatientInfo() {
       this.isVisibility = false

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -159,7 +159,8 @@
                   template_id == 12 ||
                   template_id == 13 ||
                   template_id == 17 ||
-                  template_id == 18)
+                  template_id == 18 || 
+                  template_id == 19)
             "
           >
             <template slot-scope="scope">
@@ -183,7 +184,8 @@
                 template_id != 12 &&
                 template_id != 13 &&
                 template_id != 17 &&
-                template_id != 18
+                template_id != 18 &&
+                template_id != 19
             "
           >
             <template slot-scope="scope">
@@ -320,7 +322,7 @@
             align="center"
             label="超滤率(ml/h)"
             width="100"
-            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18) "
+            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19) "
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -331,7 +333,7 @@
             align="center"
             label="超滤率(L/h)"
             width="100"
-            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18"
+            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19"
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -468,12 +470,12 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18) ">
+          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19) ">
             <el-form-item label="超滤率(ml/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18">
+          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19">
             <el-form-item label="超滤率(L/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
@@ -481,7 +483,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18) " >
+            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -489,7 +491,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18" >
+            v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,8 +14,8 @@
           <th width="76px">静脉压/动脉压(mmHg)</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmhg)</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19"  width="76px"> 超滤量(L) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11) " width="92px" > 置换率(ml/min) </th>
@@ -26,8 +26,8 @@
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量')" width="92px">置换液流量(ml/h)</th>
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
           <th v-if="isShow('处理')" width="92px">处理</th>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -233,6 +233,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 19">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -409,6 +419,10 @@
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 18"
           ></DialysisPrintOrderEighteen>
+          <DialysisPrintOrderNineteen
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 19"
+          ></DialysisPrintOrderNineteen>
         </div>
       </el-container>
     </div>
@@ -446,10 +460,12 @@ import DialysisPrintOrderFifteen from "./template/DialysisPrintOrderFifteen";
 import DialysisPrintOrderSixteen from "./template/DialysisPrintOrderSixteen";
 import DialysisPrintOrderSeventeen from "./template/DialysisPrintOrderSeventeen";
 import DialysisPrintOrderEighteen from "./template/DialysisPrintOrderEighteen";
+import DialysisPrintOrderNineteen from "./template/DialysisPrintOrderNineteen";
 
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderNineteen,
     DialysisPrintOrderEighteen,
     DialysisPrintOrderSeventeen,
     DialysisPrintOrderSixteen,
@@ -760,6 +776,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 19) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/upload/fast/dialysisParams.vue

@@ -106,9 +106,11 @@
                 <el-table-column prop="zip" label="症状及处理" width="300">
                     <template slot-scope="scope">
                         <div v-if="scope.$index == 1">
-                        <div v-for="item in doctor" :key="item">
-                            <p>{{ item }}</p>
-                            <el-button size="mini" type="primary" v-clipboard:copy="item" v-clipboard:success="onCopy" v-clipboard:error="onError">复制</el-button>
+                        <div v-for="item in monitor_records" :key="item">
+                            <div v-if='item.symptom || item.dispose || item.result'>
+                                <p>{{ item.symptom }} &nbsp;{{ item.dispose }} &nbsp;{{ item.result }}</p>
+                                <el-button size="mini" type="primary" v-clipboard:copy="item" v-clipboard:success="onCopy" v-clipboard:error="onError">复制</el-button>
+                            </div>
                         </div>
                         </div>
                     </template>
@@ -331,33 +333,33 @@ export default {
             console.log(22222222222222222,this.monitor_records)
         }
         
-        if(this.prescription.mode_id){
-            this.modeId = this.getMode(this.prescription.mode_id)
-        }
-        if(this.doctor_advices.length > 0){
-            let str = ''
-            let arr = []
-            this.advices = this.doctor_advices
-            this.advices.map(item => {
-                str = item.advice_name + (item.advice_desc ? ('(' +  item.advice_desc + item.drug_spec_unit + ')') : '' )  + '  ' + item.prescribing_number + item.prescribing_number_unit + '  ' + 
-                item.single_dose + item.single_dose_unit + '  ' + item.delivery_way + item.execution_frequency + item.remark
-                arr.push(str)
-            })
-            this.doctor = arr
+        // if(this.prescription.mode_id){
+        //     this.modeId = this.getMode(this.prescription.mode_id)
+        // }
+        // if(this.doctor_advices.length > 0){
+        //     let str = ''
+        //     let arr = []
+        //     this.advices = this.doctor_advices
+        //     this.advices.map(item => {
+        //         str = item.advice_name + (item.advice_desc ? ('(' +  item.advice_desc + item.drug_spec_unit + ')') : '' )  + '  ' + item.prescribing_number + item.prescribing_number_unit + '  ' + 
+        //         item.single_dose + item.single_dose_unit + '  ' + item.delivery_way + item.execution_frequency + item.remark
+        //         arr.push(str)
+        //     })
+        //     this.doctor = arr
             
-            // this.textarea = ''
-            // arr.map(item => {
-            //     this.textarea += item + "\n"
-            // })
-        }else if(this.doctor_advices.length == 0){
-            this.textarea = ''
-            this.textarea = '1.开始' + this.modeId + '治疗' + '\n' +
-                            '2.结束' + this.modeId + '治疗' + '\n' +
-                            '3.患者离开血透室'
-            let str = this.textarea
-            this.doctor = []
-            this.doctor.push(this.textarea)
-        }
+        //     // this.textarea = ''
+        //     // arr.map(item => {
+        //     //     this.textarea += item + "\n"
+        //     // })
+        // }else if(this.doctor_advices.length == 0){
+        //     this.textarea = ''
+        //     this.textarea = '1.开始' + this.modeId + '治疗' + '\n' +
+        //                     '2.结束' + this.modeId + '治疗' + '\n' +
+        //                     '3.患者离开血透室'
+        //     let str = this.textarea
+        //     this.doctor = []
+        //     this.doctor.push(this.textarea)
+        // }
     },
     methods:{
         chooseDay(day) {
@@ -435,6 +437,7 @@ export default {
     watch:{
         monitor_records:{
             handler:function(val) {
+                console.log(333333333333,this.monitor_records)
                 if(this.monitor_records.length > 5){
                     this.monitor_records = this.monitor_records
                 }else{
@@ -442,7 +445,7 @@ export default {
                     for(let i =0; i<num;i++){
                         this.monitor_records.push({id:1})
                     }
-                    console.log(333333333333,this.monitor_records)
+                    
                 }
             }
         },
@@ -450,63 +453,63 @@ export default {
             handler:function(val) {
             }
         },
-        doctor_advices:{
-            handler:function(val) {
-                if(this.doctor_advices.length > 0){
-                    let str = ''
-                    let arr = []
-                    this.advices = this.doctor_advices
-                    this.advices.map(item => {
-                        str = item.advice_name + (item.advice_desc ? ('(' +  item.advice_desc + item.drug_spec_unit + ')') : '' )  + '  ' + item.prescribing_number + item.prescribing_number_unit + '  ' + 
-                        item.single_dose + item.single_dose_unit + '  ' + item.delivery_way + item.execution_frequency + item.remark
-                        arr.push(str)
-                    })
-                    this.doctor = arr
-                    // this.textarea = ''
-                    // arr.map(item => {
-                    //     this.textarea += item + "\n"
-                    // })
-                }else if(this.doctor_advices.length == 0){
-                    this.textarea = ''
-                    this.textarea = '1.开始' + this.modeId + '治疗' + '\n' +
-                                    '2.结束' + this.modeId + '治疗' + '\n' +
-                                    '3.患者离开血透室'
-                    let str = this.textarea
-                    this.doctor = []
-                    this.doctor.push(this.textarea)
-                }
-            }
-        },
-        prescription:{
-          handler:function(val) {
-                if(this.prescription.mode_id){
-                    this.modeId = this.getMode(this.prescription.mode_id)
-                }
-                if(this.doctor_advices.length > 0){
-                    let str = ''
-                    let arr = []
-                    this.advices = this.doctor_advices
-                    this.advices.map(item => {
-                        str = item.advice_name + (item.advice_desc ? ('(' +  item.advice_desc + item.drug_spec_unit + ')') : '' )  + '  ' + item.prescribing_number + item.prescribing_number_unit + '  ' + 
-                        item.single_dose + item.single_dose_unit + '  ' + item.delivery_way + item.execution_frequency + item.remark
-                        arr.push(str)
-                    })
-                    this.doctor = arr
-                    // this.textarea = ''
-                    // arr.map(item => {
-                    //     this.textarea += item + "\n"
-                    // })
-                }else if(this.doctor_advices.length == 0){
-                    this.textarea = ''
-                    this.textarea = '1.开始' + this.modeId + '治疗' + '\n' +
-                                    '2.结束' + this.modeId + '治疗' + '\n' +
-                                    '3.患者离开血透室'
-                    let str = this.textarea
-                    this.doctor = []
-                    this.doctor.push(this.textarea)
-                }
-            }  
-        },
+        // doctor_advices:{
+        //     handler:function(val) {
+        //         if(this.doctor_advices.length > 0){
+        //             let str = ''
+        //             let arr = []
+        //             this.advices = this.doctor_advices
+        //             this.advices.map(item => {
+        //                 str = item.advice_name + (item.advice_desc ? ('(' +  item.advice_desc + item.drug_spec_unit + ')') : '' )  + '  ' + item.prescribing_number + item.prescribing_number_unit + '  ' + 
+        //                 item.single_dose + item.single_dose_unit + '  ' + item.delivery_way + item.execution_frequency + item.remark
+        //                 arr.push(str)
+        //             })
+        //             this.doctor = arr
+        //             // this.textarea = ''
+        //             // arr.map(item => {
+        //             //     this.textarea += item + "\n"
+        //             // })
+        //         }else if(this.doctor_advices.length == 0){
+        //             this.textarea = ''
+        //             this.textarea = '1.开始' + this.modeId + '治疗' + '\n' +
+        //                             '2.结束' + this.modeId + '治疗' + '\n' +
+        //                             '3.患者离开血透室'
+        //             let str = this.textarea
+        //             this.doctor = []
+        //             this.doctor.push(this.textarea)
+        //         }
+        //     }
+        // },
+        // prescription:{
+        //   handler:function(val) {
+        //         if(this.prescription.mode_id){
+        //             this.modeId = this.getMode(this.prescription.mode_id)
+        //         }
+        //         if(this.doctor_advices.length > 0){
+        //             let str = ''
+        //             let arr = []
+        //             this.advices = this.doctor_advices
+        //             this.advices.map(item => {
+        //                 str = item.advice_name + (item.advice_desc ? ('(' +  item.advice_desc + item.drug_spec_unit + ')') : '' )  + '  ' + item.prescribing_number + item.prescribing_number_unit + '  ' + 
+        //                 item.single_dose + item.single_dose_unit + '  ' + item.delivery_way + item.execution_frequency + item.remark
+        //                 arr.push(str)
+        //             })
+        //             this.doctor = arr
+        //             // this.textarea = ''
+        //             // arr.map(item => {
+        //             //     this.textarea += item + "\n"
+        //             // })
+        //         }else if(this.doctor_advices.length == 0){
+        //             this.textarea = ''
+        //             this.textarea = '1.开始' + this.modeId + '治疗' + '\n' +
+        //                             '2.结束' + this.modeId + '治疗' + '\n' +
+        //                             '3.患者离开血透室'
+        //             let str = this.textarea
+        //             this.doctor = []
+        //             this.doctor.push(this.textarea)
+        //         }
+        //     }  
+        // },
         deep:true,
     }
 }

src/xt_pages/user/components/PatientForm.vue

@@ -1139,7 +1139,7 @@ export default {
       }
       if (
         !value.match(
-          /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/
+          /^1\d{10}$/
         )
       ) {
         return callback(new Error("请填写正确的电话（手机号码）"));
@@ -1152,7 +1152,7 @@ export default {
       }
       if (
         !value.match(
-          /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/
+          /^1\d{10}$/
         )
       ) {
         return callback(new Error("请填写正确的电话（手机号码）"));