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

src/xt_pages/dialysis/template/DialysisPrintOrderThirty.vue

@@ -65,7 +65,7 @@
             <td width="10"></td>
             <td width="70">有/无特殊:</td>
             <td width="200">
-                <div class="under-line" style="text-align:left">&nbsp;</div>
+                <div class="under-line" style="text-align:left">&nbsp;{{ prescription.remark ? prescription.remark : '' }}</div>
             </td>
           </tr>
         </tbody>
@@ -311,31 +311,29 @@
                 <table class="table-box">
                     <tbody>
                     <tr>
-                        <td wdith='70'>下机情况:</td>
-                        <td wdith='30'>凝血:</td>
-                        <td width="240">
-                            <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('无') > -1 ? true : false):false" showValue="无"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('有') > -1 ? true : false):false" showValue="有"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false):false" showValue="Ⅰ"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false):false" showValue="Ⅱ"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false):false" showValue="Ⅲ"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅳ度') > -1 ? true : false):false" showValue="Ⅳ"></label-box>&nbsp;
-                        </td>
-                        <td width="70">静脉管道:</td>
-                        <td width="200">
-                            <label-box :isChecked="afterdialysis.intravenous_tube == 1 ? true : false" showValue="无"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.intravenous_tube == 2 ? true : false" showValue="+"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.intravenous_tube == 3 ? true : false" showValue="+ +"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.intravenous_tube == 4 ? true : false" showValue="+ + +"></label-box>&nbsp;
-                        </td>
-                        <td width="70">动脉管道:</td>
-                        <td width="200">
-                            <label-box :isChecked="afterdialysis.arterial_tube == 1 ? true : false" showValue="无"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.arterial_tube == 2 ? true : false" showValue="+"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.arterial_tube == 3 ? true : false" showValue="+ +"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.arterial_tube == 4 ? true : false" showValue="+ + +"></label-box>&nbsp;
-                        </td>
-                        <td></td>
+                      <td wdith='70'>下机情况:</td>
+                      <td wdith='30'>凝血:</td>
+                      <td width="240">
+                          <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('无凝血') > -1 ? true : false):false" showValue="无"></label-box>&nbsp;
+                          <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('有凝血') > -1 ? true : false):false" showValue="有"></label-box>&nbsp;
+                          <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false):false" showValue="Ⅰ"></label-box>&nbsp;
+                          <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false):false" showValue="Ⅱ"></label-box>&nbsp;
+                          <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false):false" showValue="Ⅲ"></label-box>&nbsp;
+                          <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅳ度') > -1 ? true : false):false" showValue="Ⅳ"></label-box>&nbsp;
+                      </td>
+                      <td width='50'></td>
+                      <td width="70">静脉壶:</td>
+                      <td width="90">
+                        <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('静脉壶凝血-无') > -1 ? true : false):false" showValue="无"></label-box>&nbsp;&nbsp;
+                        <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('静脉壶凝血-有') > -1 ? true : false):false" showValue="有"></label-box>&nbsp;
+                      </td>
+                      <td width='50'></td>
+                      <td width="70">动脉壶:</td>
+                      <td width="90">
+                        <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('动脉壶凝血-无') > -1 ? true : false):false" showValue="无"></label-box>&nbsp;&nbsp;
+                        <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('动脉壶凝血-有') > -1 ? true : false):false" showValue="有"></label-box>&nbsp;
+                      </td>
+                      <td width="160"></td>
                     </tr>
                     </tbody>
                 </table>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1354,7 +1354,8 @@
 
   .tabsBox {
     position: relative;
-    height: 76%;
+    // height: 76%;
+    flex: 1;
     overflow-y: auto;
     margin-bottom: 60px;
     margin-top: 4px;

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -1,4 +1,5 @@
 <template>
+<div>
   <el-dialog
     title="详情"
     width="1000px"
@@ -6,10 +7,10 @@
     :before-close="_close"
     class="detailDialog"
   >
-    <!-- <div style="position: absolute;right:20px;z-index:99">
+    <div style="position: absolute;right:20px;z-index:99">
       <el-button v-if="activeName == 'first'" @click="open(1)" type="primary">打印</el-button>
       <el-button v-if="activeName == 'second'" @click="open(2)" type="primary">打印</el-button>
-    </div> -->
+    </div>
     <el-tabs v-model="activeName">
 
       <el-tab-pane label="处方详情" name="first">
@@ -33,11 +34,11 @@
         <div class="commonCell">
           <p style="color:#409EFF;">基本信息</p>
           <div class="detailMain">
-            <span style="width:260px;">处方号：{{order.prescription_number}}</span>
+            <span style="width:270px;">处方号：{{order.prescription_number}}</span>
             <span style="width:180px;">姓名：{{order.patient.name}}</span>
             <span style="width:240px;">证件号：{{order.patient.id_card_no}}</span>
             <span style="width:180px;">联系电话：{{order.patient.phone}}</span>
-            <span style="width:260px;">医生：{{order.doctor}}</span>
+            <span style="width:270px;">医生：{{order.doctor}}</span>
             <span style="width:180px;">科室：{{getDepartMent(order.departments)}}</span>
             <span style="width:240px;">创建时间： {{getTimes(order.ctime,"{y}-{m}-{d} {h}:{i}")}}</span>
             <!-- <span style="width:180px;">疾病名称：{{case_history.diagnostic}}</span>
@@ -102,7 +103,18 @@
       <el-button @click="hide">取 消</el-button>
       <!--<el-button type="primary" :loading="submitLoading" @click="hide">确定</el-button>-->
     </div>
+    <el-dialog
+      class="centerDialog detailDialog"
+      width="600px"
+      title="打印"
+      :visible.sync="innerVisible"
+      append-to-body>
+
+      <print v-if="activeName == 'first'" :paramsObj='paramsObj'></print>
+      <recordPrint v-if="activeName == 'second'" :patientid="patientid"></recordPrint>
+    </el-dialog>
   </el-dialog>
+</div>
 </template>
 
 
@@ -112,11 +124,13 @@
   import { getHisPrescriptionInfo } from '@/api/his/his'
   import NewPrescriptionTable from './newPrescriptionTable'
   import { uParseTime } from '@/utils/tools'
- import { getAllDoctorList } from "@/api/project/project"
-import moment from 'moment';
+  import { getAllDoctorList } from "@/api/project/project"
+  import moment from 'moment';
+  import print from '../print'
+  import recordPrint from '../recordPrint'
 
   export default {
-    components: { NewPrescriptionTable },
+    components: { NewPrescriptionTable,print,recordPrint },
     data() {
       return {
         visible: false,
@@ -147,7 +161,10 @@ import moment from 'moment';
         case_history:{},
         order:{},
         doctorList:[],
-        departmentList:[]
+        departmentList:[],
+        innerVisible:false,
+        paramsObj:{},
+        patientid:''
       }
     },
     methods: {
@@ -160,11 +177,22 @@ import moment from 'moment';
            var prescription_id = arr[0]
            var record_date = this.format(this.order.record_date)
            var ids = arr.toString()
-           this.$router.push("/outpatientDoctorStation/print?record="+record_date+"&prescription_id="+prescription_id+"&ids="+ids+"&patient_id="+this.patientInfo.id)
+
+           let obj = {
+             record:record_date,
+             prescription_id:prescription_id,
+             ids:ids,
+             patient_id:this.patientInfo.id
+           }
+           this.paramsObj = obj
+           this.innerVisible = true
+          //  this.$router.push("/outpatientDoctorStation/print?record="+record_date+"&prescription_id="+prescription_id+"&ids="+ids+"&patient_id="+this.patientInfo.id)
 
         }else if(index == 2){
-           var record_date = this.format(this.case_history.sick_date)
-          this.$router.push("/outpatientDoctorStation/recordPrint?record="+record_date+"&patient_id="+this.case_history.patient_id)
+          var record_date = this.format(this.case_history.sick_date)
+          this.patientid = this.patientInfo.id
+          this.innerVisible = true
+          // this.$router.push("/outpatientDoctorStation/recordPrint?record="+record_date+"&patient_id="+this.case_history.patient_id)
         }
       },
       getTimes(time,temp) {

src/xt_pages/outpatientDoctorStation/components/recordTemplateDetail.vue

@@ -1,58 +1,44 @@
 <template>
     <el-dialog
-        title="病历模板详情"
-        width="1000px"
-        :visible.sync="visible"
-        :before-close="_close"
-        class="recordDialog"
-        append-to-body
+      title="病历模板详情"
+      width="1000px"
+      :visible.sync="visible"
+      :before-close="_close"
+      class="recordDialog"
+      append-to-body
     >
         <el-form class="recordForm" :model="form" ref="form" label-width="80px">
-            <el-form-item label="模板名称: " prop="name" style="width:100%;">
-                <el-input v-model="form.template_name" placeholder=""></el-input>
-            </el-form-item>
-            <el-form-item label="模板说明: " prop="name" style="width:100%;">
-                <el-input v-model="form.template_remark" placeholder=""></el-input>
-            </el-form-item>
-           <el-row :gutter = "20">
-        <el-col :span="24">
-          <el-form-item label="主诉:">
-              <el-select @change="changeMainTemplate" v-model="value" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledata"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-              </el-select>
+          <el-form-item label="模板名称: " prop="name" style="width:100%;">
+            <el-input v-model="form.template_name" placeholder=""></el-input>
           </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item  prop="name" style="width:100%;">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入内容"
-            v-model="form.chief_conplaint">
-          </el-input>
-        </el-form-item>
-      </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="24">
-           <el-form-item label="现病史:">
-              <el-select @change="changeMainTemplateOne" v-model="valueOne" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataOne"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-              </el-select>
+          <el-form-item label="模板说明: " prop="name" style="width:100%;">
+            <el-input v-model="form.template_remark" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item label="主诉:" class="width50">
+            <el-select @change="changeMainTemplate" v-model="value" style="width:100%;margin-bottom:10px;">
+              <el-option
+                v-for="(item, index) in tabledata"
+                :label="item.title"
+                :value="item.content"
+                :key="index"
+              ></el-option>
+            </el-select>
+            <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="form.chief_conplaint">
+            </el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item  prop="name" style="width:100%;">
+          <el-form-item label="现病史:" class="width50">
+            <el-select @change="changeMainTemplateOne" v-model="valueOne" style="width:100%;margin-bottom:10px;">
+              <el-option
+                v-for="(item, index) in tabledataOne"
+                :label="item.title"
+                :value="item.content"
+                :key="index"
+              ></el-option>
+            </el-select>
             <el-input
               type="textarea"
               :rows="2"
@@ -60,138 +46,95 @@
               v-model="form.history_of_present_illness">
             </el-input>
           </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-         <el-col :span="24">
-           <el-form-item label="既往史:">
-            <el-select @change="changeMainTemplateTwo" v-model="valueTwo" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataTwo"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-             </el-select>
-            </el-form-item>
-         </el-col>
-         <el-col :span="24">
-            <el-form-item  prop="name" style="width:100%;">
-              <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="form.past_history">
-              </el-input>
-           </el-form-item>
-         </el-col>
-      </el-row>
-        <el-row :gutter="24">
-        <el-col :span="20">
-            <el-form-item label="个人史:">
-                <el-select @change="changeMainTemplateThree" v-model="valueThree" style="width:200px">
-                    <el-option
-                        v-for="(item, index) in tabledataThree"
-                        :label="item.title"
-                        :value="item.content"
-                        :key="index"
-                    ></el-option>
-                </el-select>
-                </el-form-item>
-        </el-col>
-        <el-col :span="20">
-            <el-form-item  prop="name" style="width:100%;">
+          <el-form-item label="既往史:" class="width50">
+            <el-select @change="changeMainTemplateTwo" v-model="valueTwo" style="width:100%;margin-bottom:10px;">
+              <el-option
+                v-for="(item, index) in tabledataTwo"
+                :label="item.title"
+                :value="item.content"
+                :key="index"
+              ></el-option>
+            </el-select>
             <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="form.personal_history">
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="form.past_history">
             </el-input>
-            </el-form-item>
-        </el-col>
-        </el-row>
-        <el-row :gutter="24">
-        <el-col :span="20">
-            <el-form-item  label="家族史:">
-                <el-select @change="changeMainTemplateFour" v-model="valueFour" style="width:200px">
-                    <el-option
-                        v-for="(item, index) in tabledataFour"
-                        :label="item.title"
-                        :value="item.content"
-                        :key="index"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </el-col>
-            <el-col :span="20">
-            <el-form-item prop="name" style="width:100%;">
-                <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="form.family_history">
-                </el-input>
-            </el-form-item>
-        </el-col>
-        </el-row>
-        <el-row :gutter="24">
-        <el-col :span="20">
-            <el-form-item label="诊断信息:">
-                <el-select @change="changeMainTemplateFive" v-model="valueFive" style="width:200px">
-                    <el-option
-                        v-for="(item, index) in tabledataFive"
-                        :label="item.title"
-                        :value="item.content"
-                        :key="index"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </el-col>
-        <el-col :span="20">
-            <el-form-item  prop="name" style="width:100%;">
+          </el-form-item>
+          <el-form-item label="个人史:" class="width50">
+            <el-select @change="changeMainTemplateThree" v-model="valueThree" style="width:100%;margin-bottom:10px;">
+              <el-option
+                v-for="(item, index) in tabledataThree"
+                :label="item.title"
+                :value="item.content"
+                :key="index"
+              ></el-option>
+            </el-select>
             <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="form.diagnostic">
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="form.personal_history">
             </el-input>
-        </el-form-item>
-        </el-col>
-        </el-row>
-
-        <el-row :gutter="24">
-        <el-col :span="20">
-            <el-form-item label="医嘱:">
-                <el-select @change="changeMainTemplateSix" v-model="valueSix" style="width:200px">
-                    <el-option
-                        v-for="(item, index) in tabledataSix"
-                        :label="item.title"
-                        :value="item.content"
-                        :key="index"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </el-col>
-        <el-col :span="20">
-            <el-form-item  prop="doctor_advice" style="width:100%;">
+          </el-form-item>
+          <el-form-item  label="家族史:" class="width50">
+            <el-select @change="changeMainTemplateFour" v-model="valueFour" style="width:100%;margin-bottom:10px;">
+              <el-option
+                v-for="(item, index) in tabledataFour"
+                :label="item.title"
+                :value="item.content"
+                :key="index"
+              ></el-option>
+            </el-select>
             <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="form.doctor_advice">
+            type="textarea"
+            :rows="2"
+            placeholder="请输入内容"
+            v-model="form.family_history">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="诊断信息:" class="width50">
+            <el-select @change="changeMainTemplateFive" v-model="valueFive" style="width:100%;margin-bottom:10px;">
+              <el-option
+                v-for="(item, index) in tabledataFive"
+                :label="item.title"
+                :value="item.content"
+                :key="index"
+              ></el-option>
+            </el-select>
+            <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="form.diagnostic">
             </el-input>
-            </el-form-item>
-        </el-col>
-        </el-row>
+          </el-form-item>
+          <el-form-item label="医嘱:" class="width50">
+            <el-select @change="changeMainTemplateSix" v-model="valueSix" style="width:100%;margin-bottom:10px;">
+              <el-option
+                v-for="(item, index) in tabledataSix"
+                :label="item.title"
+                :value="item.content"
+                :key="index"
+              ></el-option>
+            </el-select>
+            <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="form.doctor_advice">
+            </el-input>
+          </el-form-item>
 
-            <el-form-item label ="备注"  prop="name" style="width:100%;">
+          <el-form-item label ="备注"  prop="name" class="width50">
             <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="form.remark">
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="form.remark">
             </el-input>
-            </el-form-item>
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
@@ -421,12 +364,15 @@ export default {
 
 <style lang="scss" scoped>
 .recordForm{
-    display: flex;
-    flex-wrap: wrap;
-    .el-form-item{
-        width:24%;
-        margin-right: 1%;
-    }
+  display: flex;
+  flex-wrap: wrap;
+  .el-form-item{
+    width:24%;
+    margin-right: 1%;
+  }
+  .width50{
+    width: 49%;
+  }
 }
 </style>
 

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -50,7 +50,6 @@ export default {
       educationOptions:[],
       history:{},
       keyword:"",
-      patientid:''
     };
   },
   methods: {

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -108,7 +108,8 @@ export default {
         return{
             educationOptions:[],
             departmentList:[],
-            orgname:''
+            orgname:'',
+            history:{}
         }                   
     },
     methods:{

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -13,7 +13,7 @@
           </div>
           <div class="infoMain">
               <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</div>
-              <div style="margin-bottom: 10px;">科室：{{item.info.departments?getDepart(item.info.departments):''}}</div>
+              <div style="margin-bottom: 10px;">科室：{{item.info?getDepart(item.info.departments):''}}</div>
               <div style="margin-bottom: 10px;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
               <div style="margin-bottom: 10px;">电话：{{item.patient.phone}}</div>
               <div>地址：{{item.patient.home_address}}</div>