11月14日 库存扣减更新

src/xt_pages/data/components/addConsumable.vue

@@ -124,7 +124,7 @@
                         <el-form-item label="库存警戒 : " prop="name">
                             <el-input v-model="form.stock_warn_count" style="width:160px;" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="医保编码 : " prop="name">
+                        <el-form-item label="国家编码 : " prop="name">
                             <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="是否特病目录:" prop="name">

src/xt_pages/data/components/addDrugs.vue

@@ -263,7 +263,7 @@
                         </el-form-item>
 
 
-                        <el-form-item label="医保编码 : " prop="medical_insurance_number">
+                        <el-form-item label="国家编码 : " prop="medical_insurance_number">
                             <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>

src/xt_pages/data/components/addProject.vue

@@ -91,7 +91,7 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="医保编码 : " prop="medical_code">
+                        <el-form-item label="国家编码 : " prop="medical_code">
                             <el-input v-model="form.medical_code" style="width:160px;" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="试管颜色 : " prop="tube_color">

src/xt_pages/data/components/consumables.vue

@@ -110,7 +110,7 @@
           {{ scope.row.packing_price }}
         </template>
       </el-table-column>
-       <el-table-column label="社保目录编码" width="110" align="center">
+       <el-table-column label="国家编码" width="110" align="center">
         <template slot-scope="scope">
           {{ scope.row.social_security_directory_code }}
         </template>

src/xt_pages/data/components/drugs.vue

@@ -100,7 +100,7 @@
           <div>{{scope.row.retail_price}}</div>
         </template>
       </el-table-column>
-       <el-table-column prop="date" label="医保编码" width="100" align="center">
+       <el-table-column prop="date" label="国家编码" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.medical_insurance_number}}</div>
         </template>

src/xt_pages/data/components/editProject.vue

@@ -91,7 +91,7 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="医保编码 : " prop="medical_code">
+                        <el-form-item label="国家编码 : " prop="medical_code">
                             <el-input v-model="form.medical_code" style="width:160px;" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="试管颜色 : " prop="tube_color">

src/xt_pages/data/components/project.vue

@@ -98,7 +98,7 @@
                     {{getExecutiveSection(scope.row.executive_section)}}
                 </template>
             </el-table-column>
-            <el-table-column label="医保编码" width="140" align="center">
+            <el-table-column label="国家编码" width="140" align="center">
                 <template  slot-scope="scope">
                    {{scope.row.medical_code}}
                 </template>
@@ -653,10 +653,10 @@ export default {
               }
           }
 
-         if (results[i]['医保编码'] === undefined) {
+         if (results[i]['国家编码'] === undefined) {
                 obj['medical_code'] = ''
               } else {
-         if (key == '医保编码') {
+         if (key == '国家编码') {
                obj['medical_code'] = results[i][key].replace(/\s/g,"")
               }
           }

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -328,8 +328,8 @@
                         <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
                         <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
                         <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
-                        <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率<br /><br />ml/h</td>
-                        <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量<br /><br />ml</td>
+                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换率<br /><br />ml/h</td>
+                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换量<br /><br />ml</td>
                         <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td>
                         <td width="">病情变化及处理</td>
                     </tr>
@@ -714,7 +714,7 @@ export default {
 
           this.records = this.records.concat(resp.data.schedules)
 
-          console.log('记录', this.records)
+          
 
           for (const recordIndex in this.records) {
             var dlegh = 0
@@ -880,6 +880,7 @@ export default {
           var name = resp.data.name
           this.adminSign = name
           console.log('name是', name)
+          console.log('记录', this.records)
           this.loading = false
         } else {
           this.loading = false

src/xt_pages/hospitalStation/template/printOne.vue

@@ -2,66 +2,66 @@
   <div id='prescriptionPrint'>
     <div v-for="(item,index) in advicePrint" :key="index">
       <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
-          <div class="printTitle" v-if="prescriptions[0].med_type == '1111'">{{orgname}}第一类精神药品处方笺</div>
-          <div class="printTitle" v-if="prescriptions[0].med_type == '1112'">{{orgname}}第二类精神药品处方笺</div>
-          <div class="printTitle" v-else>{{orgname}}处方笺</div>
+        <div class="printTitle" v-if="prescriptions[0].med_type == '1111'">{{orgname}}第一类精神药品处方笺</div>
+        <div class="printTitle" v-if="prescriptions[0].med_type == '1112'">{{orgname}}第二类精神药品处方笺</div>
+        <div class="printTitle" v-else>{{orgname}}处方笺</div>
 
 
-          <div class="infoTitle">
-              <p>姓名：{{item.patient.name?item.patient.name:""}}</p>
-              <p>性别：
-                <span v-if="item.patient.gender == 1">男</span>
-                <span v-if="item.patient.gender == 2">女</span>
-              </p>
-              <p>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</p>
+        <div class="infoTitle">
+          <p>姓名：{{item.patient.name?item.patient.name:""}}</p>
+          <p>性别：
+            <span v-if="item.patient.gender == 1">男</span>
+            <span v-if="item.patient.gender == 2">女</span>
+          </p>
+          <p>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</p>
+        </div>
+        <div class="infoMain">
+          <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</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>
+          <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
+        </div>
+        <div class="prescriptionBox">
+          <div class="Rp">Rp:</div>
+          <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
+            <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
+            <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
+            <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
           </div>
-          <div class="infoMain">
-              <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</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>
-              <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
+          <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+            <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
           </div>
-          <div class="prescriptionBox">
-              <div class="Rp">Rp:</div>
-              <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
-                  <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
-                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
-              </div>
-              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
-                <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
-               </div>
-
-              <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.type == 2?getProjectName(it.project_id)?getProjectName(it.project_id):"":it.good_info.good_name}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
-                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
-              </div>
-              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
-                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
-               </div>
-               <div style="text-align:center;" >(以下空白)</div>
 
+          <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
+            <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.type == 2?getProjectName(it.project_id)?getProjectName(it.project_id):"":it.good_info.good_name}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
+            <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
           </div>
-          <div class="doctorBox">
-              <p>医师：{{item.doctor?item.doctor:""}}</p>
-              <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
+          <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+            <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
           </div>
-          <div class="actionBar">
-                 <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
-                 <p>配对：</p>
-                 <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
-                 <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
-                 <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
+          <div style="text-align:center;" >(以下空白)</div>
 
-                 <p>审核：</p>
-                 <p>配对：</p>
-                 <p>核对：</p>
-                 <p>发药：</p>
-                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
-          </div>
-          <div style="page-break-after:always"></div>
+        </div>
+        <div class="doctorBox">
+          <p>医师：{{item.doctor?item.doctor:""}}</p>
+          <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
+        </div>
+        <div class="actionBar">
+          <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+          <p>配对：</p>
+          <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+          <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
+          <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
+
+          <p>审核：</p>
+          <p>配对：</p>
+          <p>核对：</p>
+          <p>发药：</p>
+          <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
+        </div>
+        <div style="page-break-after:always"></div>
       </div>
     </div>
 
@@ -70,10 +70,10 @@
 
 </template>
 <script>
-import { jsGetAge, uParseTime } from '@/utils/tools'
-import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail} from "@/api/project/project"
-import {getInitData} from "@/api/his/his"
-export default {
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail} from "@/api/project/project"
+  import {getInitData} from "@/api/his/his"
+  export default {
     props:{
       patient_id:Number,
       record_date:String,
@@ -95,52 +95,52 @@ export default {
         diagnoses:[],
       }
     },
-   methods:{
-     getAge(patient){
-       var thisLen = patient.id_card_no.length
-       var birth = ''
-       if (thisLen == 15) {
-         birth = '19' + patient.id_card_no.substr(6, 6)
-       } else {
-         birth = patient.id_card_no.substr(6, 8)
-       }
-       var births =
-         birth.substr(0, 4) +
-         '-' +
-         birth.substr(4, 2) +
-         '-' +
-         birth.substr(6, 2)
-       return jsGetAge(births, '-')
+    methods:{
+      getAge(patient){
+        var thisLen = patient.id_card_no.length
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + patient.id_card_no.substr(6, 6)
+        } else {
+          birth = patient.id_card_no.substr(6, 8)
+        }
+        var births =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+        return jsGetAge(births, '-')
 
-     },
+      },
 
-     getAllDoctorList(){
-      getAllDoctorList().then(response=>{
-        if(response.data.state == 1){
-               var doctor =  response.data.data.doctor
+      getAllDoctorList(){
+        getAllDoctorList().then(response=>{
+          if(response.data.state == 1){
+            var doctor =  response.data.data.doctor
 
-               this.doctorList = doctor
-             }
-         })
-     },
+            this.doctorList = doctor
+          }
+        })
+      },
 
       getDoctor(id){
         var name = ""
         for(let i=0;i<this.doctorList.length;i++){
           if(id == this.doctorList[i].admin_user_id){
-              name = this.doctorList[i].user_name
+            name = this.doctorList[i].user_name
           }
         }
         return name
       },
       getTime(value, temp) {
         if (value != undefined) {
-            return uParseTime(value, temp)
+          return uParseTime(value, temp)
         }
         return ''
-     },
-       getPrescriptionPrint(){
-         var params = {
+      },
+      getPrescriptionPrint(){
+        var params = {
           // patient_id:this.patient_id,
           // record_date:this.record_date,
           // prescription_id:this.prescription_id,
@@ -150,8 +150,8 @@ export default {
           ids:this.ids
         }
         console.log("params",params)
-       getPrescriptionPrint(params).then(response=>{
-         if(response.data.state == 1){
+        getPrescriptionPrint(params).then(response=>{
+          if(response.data.state == 1){
             var advicePrint =  response.data.data.advicePrint
             console.log("adviceprint9999",advicePrint)
             this.advicePrint = advicePrint
@@ -164,39 +164,39 @@ export default {
             console.log("所有项目列表",projectlist)
             this.projectList = projectlist
           }
-       })
-     },
-     getHisPatientDetail(){
-          const params = {
-              patient_id:this.patient_id
-          }
-       getHisPatientDetail(params).then(response=>{
+        })
+      },
+      getHisPatientDetail(){
+        const params = {
+          patient_id:this.patient_id
+        }
+        getHisPatientDetail(params).then(response=>{
           if(response.data.state == 1){
-             var hisPatient =  response.data.data.hisPatient
-             console.log("挂号病人",hisPatient)
-             this.hisPatient = hisPatient
+            var hisPatient =  response.data.data.hisPatient
+            console.log("挂号病人",hisPatient)
+            this.hisPatient = hisPatient
           }
-       })
-     },
-     getInitData(){
-       getInitData().then(response=>{
+        })
+      },
+      getInitData(){
+        getInitData().then(response=>{
           if(response.data.state == 1){
             this.department = response.data.data.department
             this.diagnoses = response.data.data.diagnose
             console.log("争端",this.diagnoses)
           }
-       })
-     },
-     getDepart(id){
-         var name = ""
-       for(let i=0;i<this.department.length;i++){
-           if(id == this.department[i].id){
-               name = this.department[i].name
-           }
-       }
-       return name
-     },
-    getTotalOne(id) {
+        })
+      },
+      getDepart(id){
+        var name = ""
+        for(let i=0;i<this.department.length;i++){
+          if(id == this.department[i].id){
+            name = this.department[i].name
+          }
+        }
+        return name
+      },
+      getTotalOne(id) {
 
         var total = 0
         var addtotal = 0
@@ -213,12 +213,12 @@ export default {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
               }
             }
-              addtotal =  Math.floor(addtotal * 100) / 100
-        }
+            addtotal =  Math.floor(addtotal * 100) / 100
+          }
 
-       }
+        }
 
-      for (let i = 0; i < this.prescriptions.length; i++) {
+        for (let i = 0; i < this.prescriptions.length; i++) {
           if(id == this.prescriptions[i].id){
             if (this.prescriptions[i].advices != null) {
               for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
@@ -231,35 +231,36 @@ export default {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
               }
             }
-              addtotal =  Math.floor(addtotal * 100) / 100
+            addtotal =  Math.floor(addtotal * 100) / 100
+          }
         }
-       }
 
         return total + addtotal
       },
 
-     getProjectName(id){
+      getProjectName(id){
         var project_name = ""
         for(let i=0;i<this.projectList.length;i++){
-           if(id == this.projectList[i].id){
-               project_name = this.projectList[i].project_name
-           }
+          if(id == this.projectList[i].id){
+            project_name = this.projectList[i].project_name
+          }
         }
         return project_name
-     },
+      },
 
-     getDiagnosis(id){
-        var name = ""
-        for(let i=0;i<this.diagnoses.length;i++){
-          if(id == this.diagnoses[i].id){
-             name = this.diagnoses[i].class_name
+      getDiagnosis(id) {
+        let arr = id.split(',')
+        var name = ''
+        for (let i = 0; i < this.diagnoses.length; i++) {
+          if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
+            name += this.diagnoses[i].class_name + ' '
           }
         }
         return name
-     }
+      },
 
-   },
-   created(){
+    },
+    created(){
       this.getAllDoctorList()
       this.getInitData()
       this.getPrescriptionPrint()
@@ -267,85 +268,85 @@ export default {
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
 
-   },
-   watch:{
-     ids:function(val){
-      this.ids = val
-      this.getPrescriptionPrint()
+    },
+    watch:{
+      ids:function(val){
+        this.ids = val
+        this.getPrescriptionPrint()
+      }
     }
-   }
-}
+  }
 </script>
 
 
 <style lang="scss" scoped>
-.prescription-print{
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+  .prescription-print{
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;
-}
-.printTitle{
+  }
+  .printTitle{
     font-size: 22px;
     text-align: center;
     font-weight: bold;
-}
-.infoTitle{
+  }
+  .infoTitle{
     display: flex;
     border-bottom: 2px solid #000;
     margin-top:10px;
     line-height: 24px;
     padding:0 10px;
-}
-.infoTitle p{
+  }
+  .infoTitle p{
     width: 200px;
-}
-.infoMain{
+  }
+  .infoMain{
     display: flex;
     flex-wrap: wrap;
     border-bottom: 2px solid #000;
     padding:0 10px;
-}
-.infoMain div{
+  }
+  .infoMain div{
     width: 50%;
     line-height: 24px;
-}
-.prescriptionBox{
+  }
+  .prescriptionBox{
     padding:0 10px;
     min-height:450px;
-}
-.Rp{
+  }
+  .Rp{
     font-size: 22px;
     font-weight: bold;
-}
-.drugsBox{
+  }
+  .drugsBox{
     padding-left: 40px;
     margin-bottom: 10px;
-}
-.drugsBox div{
+  }
+  .drugsBox div{
     line-height: 20px;
-}
-.drugsOne{
+  }
+  .drugsOne{
     line-height: 24px;
-}
-.drugsOne span{
+  }
+  .drugsOne span{
     margin-right: 20px;
-}
-.doctorBox{
+  }
+  .doctorBox{
     display: flex;
     justify-content: space-between;
     padding:0 10px;
     line-height: 24px;
     border-bottom: 2px solid #000;
-}
-.actionBar{
+  }
+  .actionBar{
     display: flex;
     justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
-}
-.actionBar p{
+  }
+  .actionBar p{
     width:150px;
-}
+  }
 </style>

src/xt_pages/hospitalStation/treatTemplate/printOne.vue

@@ -1,223 +1,223 @@
 <template>
-    <div id='prescriptionPrint'>
-        <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
-
-            <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;">
-                <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
-                    <span>费别</span>
-                    <span>自费</span>
-                    <span>公费</span>
-                    <span>保险</span>
-                    <span>其他</span>
-                </div>
-                <div>就诊日期：{{getTime(item.ctime,'{y}-{m}-{d}')}}</div>
-            </div>
-
-            <div class="printTitle">{{orgname}}</div>
-            <div class="printTitle">处方、治疗单</div>
-
-            <div class="infoTitle">
-                <div>门诊编号：</div>
-                <div>电脑号：</div>
-            </div>
-
-            <div class="infoMain">
-                <div style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</div>
-                <div style="margin-bottom: 10px;width:25%">性别：
-                    <span v-if="item.patient.gender == 1">男</span>
-                    <span v-if="item.patient.gender == 2">女</span>
-                </div>
-                <div style="margin-bottom: 10px;width:25%">年龄：
-                    <span>{{getAge(item.patient)?getAge(item.patient):""}}</span>
-                </div>
-                <div style="margin-bottom: 10px;width:25%">参保类型：{{hisPatient.social_type?hisPatient.social_type:''}}
-                </div>
-                <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
-                <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
-                <div style="width:100%;">诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
-            </div>
-
-            <div class="prescriptionBox">
-                <table style="width:100%;text-align:center;line-height:25px;">
-                    <tr>
-                        <td>序号</td>
-                        <td>项目名称</td>
-                        <td>数量</td>
-                        <td>单位</td>
-                        <td>单价</td>
-                        <td>部位</td>
-                        <td>备注</td>
-                        <td>天数</td>
-                    </tr>
-                    <tr v-for="(it,index) in item.project" :key="index">
-                        <td>{{index+1}}</td>
-                        <td>{{it.type == 2 ? it.project.project_name : it.good_info.good_name}}</td>
-                        <td>{{it.count}}</td>
-                        <td>{{getUnit(it.unit)}}</td>
-                        <td>{{it.price}}</td>
-                        <td></td>
-                        <td>{{it.remark}}</td>
-                        <td>{{it.day}}</td>
-
-                    </tr>
-
-                    <tr v-for="(it,index) in item.advices" :key="index">
-                        <td>{{index+1}}</td>
-                        <td>{{it.advice_name?it.advice_name:''}}</td>
-                        <td>{{it.single_dose?it.single_dose:''}}</td>
-                        <td>{{it.single_dose_unit?it.single_dose_unit:''}}</td>
-                        <td>{{it.price}}</td>
-                        <td></td>
-                        <td>{{it.remark}}</td>
-                        <td>{{it.day}}</td>
-
-                    </tr>
-                </table>
-            </div>
-
-            <div class="infoTitle">
-                <div>开单医生：{{item.doctor?item.doctor:''}}</div>
-                <div>签章：</div>
-            </div>
-
-            <div class="actionBar">
-                <div>执行医生：{{item.doctor?item.doctor:''}}</div>
-                <div>费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
-            </div>
-
-            <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
-                <tr>
-                    <td style="width:16%;">治疗时间</td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                </tr>
-                <tr>
-                    <td style="width:16%;">医生签字</td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                </tr>
-                <tr>
-                    <td style="width:16px;">患者签字</td>
-                    <td style="width:16px;"></td>
-                    <td style="width:16px;"></td>
-                    <td style="width:16px;"></td>
-                    <td style="width:16px;"></td>
-                    <td style="width:16px;"></td>
-                </tr>
-            </table>
+  <div id='prescriptionPrint'>
+    <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
+
+      <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;">
+        <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
+          <span>费别</span>
+          <span>自费</span>
+          <span>公费</span>
+          <span>保险</span>
+          <span>其他</span>
+        </div>
+        <div>就诊日期：{{getTime(item.ctime,'{y}-{m}-{d}')}}</div>
+      </div>
+
+      <div class="printTitle">{{orgname}}</div>
+      <div class="printTitle">处方、治疗单</div>
+
+      <div class="infoTitle">
+        <div>门诊编号：</div>
+        <div>电脑号：</div>
+      </div>
+
+      <div class="infoMain">
+        <div style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</div>
+        <div style="margin-bottom: 10px;width:25%">性别：
+          <span v-if="item.patient.gender == 1">男</span>
+          <span v-if="item.patient.gender == 2">女</span>
+        </div>
+        <div style="margin-bottom: 10px;width:25%">年龄：
+          <span>{{getAge(item.patient)?getAge(item.patient):""}}</span>
         </div>
+        <div style="margin-bottom: 10px;width:25%">参保类型：{{hisPatient.social_type?hisPatient.social_type:''}}
+        </div>
+        <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
+        <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
+        <div style="width:100%;">诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
+      </div>
+
+      <div class="prescriptionBox">
+        <table style="width:100%;text-align:center;line-height:25px;">
+          <tr>
+            <td>序号</td>
+            <td>项目名称</td>
+            <td>数量</td>
+            <td>单位</td>
+            <td>单价</td>
+            <td>部位</td>
+            <td>备注</td>
+            <td>天数</td>
+          </tr>
+          <tr v-for="(it,index) in item.project" :key="index">
+            <td>{{index+1}}</td>
+            <td>{{it.type == 2 ? it.project.project_name : it.good_info.good_name}}</td>
+            <td>{{it.count}}</td>
+            <td>{{getUnit(it.unit)}}</td>
+            <td>{{it.price}}</td>
+            <td></td>
+            <td>{{it.remark}}</td>
+            <td>{{it.day}}</td>
+
+          </tr>
+
+          <tr v-for="(it,index) in item.advices" :key="index">
+            <td>{{index+1}}</td>
+            <td>{{it.advice_name?it.advice_name:''}}</td>
+            <td>{{it.single_dose?it.single_dose:''}}</td>
+            <td>{{it.single_dose_unit?it.single_dose_unit:''}}</td>
+            <td>{{it.price}}</td>
+            <td></td>
+            <td>{{it.remark}}</td>
+            <td>{{it.day}}</td>
+
+          </tr>
+        </table>
+      </div>
+
+      <div class="infoTitle">
+        <div>开单医生：{{item.doctor?item.doctor:''}}</div>
+        <div>签章：</div>
+      </div>
+
+      <div class="actionBar">
+        <div>执行医生：{{item.doctor?item.doctor:''}}</div>
+        <div>费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
+      </div>
+
+      <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
+        <tr>
+          <td style="width:16%;">治疗时间</td>
+          <td style="width:16%;"></td>
+          <td style="width:16%;"></td>
+          <td style="width:16%;"></td>
+          <td style="width:16%;"></td>
+          <td style="width:16%;"></td>
+        </tr>
+        <tr>
+          <td style="width:16%;">医生签字</td>
+          <td style="width:16%;"></td>
+          <td style="width:16%;"></td>
+          <td style="width:16%;"></td>
+          <td style="width:16%;"></td>
+          <td style="width:16%;"></td>
+        </tr>
+        <tr>
+          <td style="width:16px;">患者签字</td>
+          <td style="width:16px;"></td>
+          <td style="width:16px;"></td>
+          <td style="width:16px;"></td>
+          <td style="width:16px;"></td>
+          <td style="width:16px;"></td>
+        </tr>
+      </table>
+    </div>
 
 
-        <!-- <div id='prescriptionPrint'>
+    <!-- <div id='prescriptionPrint'>
 
-            <div v-for="(item,index) in advicePrint" :key="index">
-                <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
-                    <div style="display:flex;justify-content: space-between;font-weight:bold;">
-                        <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
-                            <span>费别</span>
-                            <span>自费</span>
-                            <span>公费</span>
-                            <span>保险</span>
-                            <span>其他</span>
-                        </div>
-                        <div>就诊日期：{{getTime(item.ctime)}}</div>
+        <div v-for="(item,index) in advicePrint" :key="index">
+            <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
+                <div style="display:flex;justify-content: space-between;font-weight:bold;">
+                    <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
+                        <span>费别</span>
+                        <span>自费</span>
+                        <span>公费</span>
+                        <span>保险</span>
+                        <span>其他</span>
                     </div>
+                    <div>就诊日期：{{getTime(item.ctime)}}</div>
+                </div>
 
-                    <div class="printTitle">血液透析中心</div>
-
-                    <div class="printTitle">处方、治疗单</div>
+                <div class="printTitle">血液透析中心</div>
 
-                    <div class="infoTitle">
-                        <div>门诊编号：</div>
-                        <div>电脑号：</div>
-                    </div>
+                <div class="printTitle">处方、治疗单</div>
 
-                    <div class="infoMain">
-                        <div style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</div>
-                        <div style="margin-bottom: 10px;width:25%">性别：
-                            <span v-if="item.patient.gender == 1">男</span>
-                            <span v-if="item.patient.gender == 2">女</span>
-                        </div>
-                        <div style="margin-bottom: 10px;width:25%">年龄：
-                            <span>{{item.patient.age}}</span>
-                        </div>
-                        <div style="margin-bottom: 10px;width:25%">参保类型：</div>
-                        <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
-                        <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
-                        <div style="width:100%;">诊断：{{item.patient.diagnose}}</div>
-                    </div>
+                <div class="infoTitle">
+                    <div>门诊编号：</div>
+                    <div>电脑号：</div>
+                </div>
 
-                    <div class="prescriptionBox">
-                        <table style="width:100%;text-align:center;line-height:25px;">
-                            <tr>
-                                <td>序号</td>
-                                <td>项目名称</td>
-                                <td>数量</td>
-                                <td>单位</td>
-                                <td>单价</td>
-                                <td>部位</td>
-                                <td>备注</td>
-                                <td>天数</td>
-                            </tr>
-                            <tr v-for="(it,index) in item.project" :key="index">
-                                <td>{{index+1}}</td>
-                                <td>{{getProjectName(it.project_id)}}</td>
-                                <td>{{it.single_dose}}</td>
-                                <td>{{getUnit(it.unit)}}</td>
-                                <td>{{it.price}}</td>
-                                <td></td>
-                                <td>{{it.remark}}</td>
-                                <td>{{it.day}}</td>
-
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="infoTitle">
-                        <div>开单医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
-                        <div>签章：</div>
+                <div class="infoMain">
+                    <div style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</div>
+                    <div style="margin-bottom: 10px;width:25%">性别：
+                        <span v-if="item.patient.gender == 1">男</span>
+                        <span v-if="item.patient.gender == 2">女</span>
                     </div>
-                    <div class="actionBar">
-                        <div>执行医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
-                        <div>费用：</div>
+                    <div style="margin-bottom: 10px;width:25%">年龄：
+                        <span>{{item.patient.age}}</span>
                     </div>
-                    <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
-                        <tr>
-                            <td style="width:16%;">治疗时间</td>
-                            <td style="width:16%;"></td>
-                            <td style="width:16%;"></td>
-                            <td style="width:16%;"></td>
-                            <td style="width:16%;"></td>
-                            <td style="width:16%;"></td>
-                        </tr>
+                    <div style="margin-bottom: 10px;width:25%">参保类型：</div>
+                    <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
+                    <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
+                    <div style="width:100%;">诊断：{{item.patient.diagnose}}</div>
+                </div>
+
+                <div class="prescriptionBox">
+                    <table style="width:100%;text-align:center;line-height:25px;">
                         <tr>
-                            <td style="width:16%;">医生签字</td>
-                            <td style="width:16%;"></td>
-                            <td style="width:16%;"></td>
-                            <td style="width:16%;"></td>
-                            <td style="width:16%;"></td>
-                            <td style="width:16%;"></td>
+                            <td>序号</td>
+                            <td>项目名称</td>
+                            <td>数量</td>
+                            <td>单位</td>
+                            <td>单价</td>
+                            <td>部位</td>
+                            <td>备注</td>
+                            <td>天数</td>
                         </tr>
-                        <tr>
-                            <td style="width:16px;">患者签字</td>
-                            <td style="width:16px;"></td>
-                            <td style="width:16px;"></td>
-                            <td style="width:16px;"></td>
-                            <td style="width:16px;"></td>
-                            <td style="width:16px;"></td>
+                        <tr v-for="(it,index) in item.project" :key="index">
+                            <td>{{index+1}}</td>
+                            <td>{{getProjectName(it.project_id)}}</td>
+                            <td>{{it.single_dose}}</td>
+                            <td>{{getUnit(it.unit)}}</td>
+                            <td>{{it.price}}</td>
+                            <td></td>
+                            <td>{{it.remark}}</td>
+                            <td>{{it.day}}</td>
+
                         </tr>
                     </table>
                 </div>
-
+                <div class="infoTitle">
+                    <div>开单医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
+                    <div>签章：</div>
+                </div>
+                <div class="actionBar">
+                    <div>执行医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
+                    <div>费用：</div>
+                </div>
+                <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
+                    <tr>
+                        <td style="width:16%;">治疗时间</td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                    </tr>
+                    <tr>
+                        <td style="width:16%;">医生签字</td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                    </tr>
+                    <tr>
+                        <td style="width:16px;">患者签字</td>
+                        <td style="width:16px;"></td>
+                        <td style="width:16px;"></td>
+                        <td style="width:16px;"></td>
+                        <td style="width:16px;"></td>
+                        <td style="width:16px;"></td>
+                    </tr>
+                </table>
             </div>
 
-        </div> -->
-    </div>
+        </div>
+
+    </div> -->
+  </div>
 </template>
 <script>
   import { jsGetAge, uParseTime } from '@/utils/tools'
@@ -403,10 +403,11 @@
         })
       },
       getDiagnosis(id) {
+        let arr = id.split(',')
         var name = ''
         for (let i = 0; i < this.diagnoses.length; i++) {
-          if (id == this.diagnoses[i].id) {
-            name = this.diagnoses[i].class_name
+          if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
+            name += this.diagnoses[i].class_name + ' '
           }
         }
         return name
@@ -436,84 +437,84 @@
 
 
 <style lang="scss" scoped>
-    .prescription-print {
-        -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-        -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-        box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-        margin-bottom: 20px;
-        padding: 20px 10px;
-    }
+  .prescription-print {
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding: 20px 10px;
+  }
 
-    .prescription-print {
-        font-size: 14px;
-    }
+  .prescription-print {
+    font-size: 14px;
+  }
 
-    .printTitle {
-        font-size: 18px;
-        text-align: center;
-        font-weight: bold;
-        margin-top: 10px;
-    }
+  .printTitle {
+    font-size: 18px;
+    text-align: center;
+    font-weight: bold;
+    margin-top: 10px;
+  }
 
-    .infoTitle {
-        display: flex;
-        border-bottom: 2px solid #000;
-        margin-top: 10px;
-        line-height: 24px;
-        padding: 0 10px;
-    }
+  .infoTitle {
+    display: flex;
+    border-bottom: 2px solid #000;
+    margin-top: 10px;
+    line-height: 24px;
+    padding: 0 10px;
+  }
 
-    .infoTitle div {
-        width: 300px;
-    }
+  .infoTitle div {
+    width: 300px;
+  }
 
-    .infoMain {
-        display: flex;
-        flex-wrap: wrap;
-        border-bottom: 2px solid #000;
-        padding: 0 10px;
-    }
+  .infoMain {
+    display: flex;
+    flex-wrap: wrap;
+    border-bottom: 2px solid #000;
+    padding: 0 10px;
+  }
 
-    .infoMain div {
-        width: 50%;
-        line-height: 24px;
-    }
+  .infoMain div {
+    width: 50%;
+    line-height: 24px;
+  }
 
-    .prescriptionBox {
-        padding: 0 10px;
-        min-height: 600px;
-    }
+  .prescriptionBox {
+    padding: 0 10px;
+    min-height: 600px;
+  }
 
-    .Rp {
-        font-size: 22px;
-        font-weight: bold;
-    }
+  .Rp {
+    font-size: 22px;
+    font-weight: bold;
+  }
 
-    .drugsBox {
-        padding-left: 40px;
-        margin-bottom: 10px;
-    }
+  .drugsBox {
+    padding-left: 40px;
+    margin-bottom: 10px;
+  }
 
-    .drugsBox p {
-        line-height: 30px;
-    }
+  .drugsBox p {
+    line-height: 30px;
+  }
 
-    .drugsOne {
-        line-height: 24px;
-    }
+  .drugsOne {
+    line-height: 24px;
+  }
 
-    .drugsOne span {
-        margin-right: 20px;
-    }
+  .drugsOne span {
+    margin-right: 20px;
+  }
 
-    .actionBar {
-        display: flex;
-        justify-content: space-between;
-        line-height: 24px;
-        padding: 0 10px;
-    }
+  .actionBar {
+    display: flex;
+    justify-content: space-between;
+    line-height: 24px;
+    padding: 0 10px;
+  }
 
-    .actionBar div {
-        width: 150px;
-    }
+  .actionBar div {
+    width: 150px;
+  }
 </style>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -1,204 +1,204 @@
 <template>
-    <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility"
-               :close-on-click-modal="isClose"
-               :close-on-press-escape="isClose">
-
-        <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
-            <el-form-item label="患者姓名：" prop="name" :validate-event="is_Name">
-                <el-autocomplete
-                        class="checkSearch"
-                        popper-class="my-autocomplete"
-                        v-model="form.name"
-                        :fetch-suggestions="querySearchAsync"
-                        :trigger-on-focus="false"
-                        placeholder="请输入病人名字"
-                        @select="handleSelect"
-                        style="width:160px;"
-                >
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                    <template slot-scope="{ item }">
-                        <div class="name">{{ item.name }}</div>
-                    </template>
-                </el-autocomplete>
-            </el-form-item>
-
-            <el-form-item label="性别：" prop="gender" :validate-event="is_Name">
-                <el-select v-model="form.gender" placeholder="请选择" style="width:100%;">
-                    <el-option
-                            v-for="item in sex"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-
-
-            </el-form-item>
-
-            <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
-                <el-input v-model="form.age"></el-input>
-            </el-form-item>
-
-
-            <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
-                <el-date-picker v-model="form.birthday" type="date" format="yyyy-MM-dd"
-                                value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%;"></el-date-picker>
-            </el-form-item>
-
-            <el-form-item label="手机号码：" prop="phone">
-                <el-input v-model="form.phone"></el-input>
-            </el-form-item>
-
-
-            <!--<el-form-item label="医疗类别：">-->
-                <!--<el-select v-model="form.medical_care" placeholder="请选择" style="width:100%;">-->
-                    <!--<el-option-->
-                            <!--v-for="(item,index) in medical_care"-->
-                            <!--:key="index"-->
-                            <!--:label="item.label"-->
-                            <!--:value="item.value">-->
-                    <!--</el-option>-->
-                <!--</el-select>-->
-            <!--</el-form-item>-->
-
-
-            <el-form-item label="证件类型：" prop="certificates" :validate-event="is_Name">
-                <el-select v-model="form.certificates" placeholder="请选择" style="width:100%;">
-                    <el-option
-                            v-for="item in certificates"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="证件号码：" prop="id_card" :validate-event="is_Name">
-                <el-input v-model="form.id_card"></el-input>
-            </el-form-item>
-
-            <!--<el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">-->
-                <!--<el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""-->
-                <!--&gt;-->
-                    <!--<el-option-->
-                            <!--v-for="(item,index) in registers"-->
-                            <!--:key="index"-->
-                            <!--:label="item.label"-->
-                            <!--:value="item.value">-->
-                    <!--</el-option>-->
-                <!--</el-select>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">-->
-                <!--<el-select style="margin-right:5px;width:100px;" v-model="form.sick_type" placeholder="">-->
-                    <!--<el-option-->
-                            <!--v-for="(item,index) in sick"-->
-                            <!--:key="index"-->
-                            <!--:label="item.class_name"-->
-                            <!--:value="item.id">-->
-                    <!--</el-option>-->
-                <!--</el-select>-->
-            <!--</el-form-item>-->
-
-            <!--<el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">-->
-                <!--<el-select style="margin-right:5px;width:100px;" v-model="form.diagnosis" placeholder="">-->
-                    <!--<el-option-->
-                            <!--v-for="(item,index) in diagnoses"-->
-                            <!--:key="index"-->
-                            <!--:label="item.class_name"-->
-                            <!--:value="item.id">-->
-                    <!--</el-option>-->
-                <!--</el-select>-->
-            <!--</el-form-item>-->
-
-
-            <el-form-item label="结算类型：">
-                <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
-                    <el-option
-                            v-for="item in settlement"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-
-
-            <el-form-item label="社保类型：">
-                <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
-                    <el-option
-                            v-for="item in medicalCare"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-
-
-            <el-form-item label="读卡类型：" prop="id_card_type" :validate-event="is_Name">
-                <el-select v-model="form.id_card_type" placeholder="请选择">
-                    <el-option
-                            v-for="item in IDCardTypes"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-
-
-            <el-form-item class="specialFormItem" label="医保卡号：">
-                <div style="display:flex;">
-                    <el-input v-model="form.medical_insurance_card"></el-input>
-                    <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
-
-                </div>
-            </el-form-item>
-
-            <el-form-item label="挂号类型：" :validate-event="is_Name">
-                <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
-                    <el-option
-                            v-for="item in register"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="挂号费：">
-                <el-input v-model="form.registration_fee"></el-input>
-            </el-form-item>
-            <el-form-item label="诊疗费：">
-                <el-input v-model="form.medical_expenses"></el-input>
-            </el-form-item>
-
-            <el-form-item label="医生：" prop="doctor">
-                <el-select v-model="form.doctor" placeholder="请选择">
-                    <el-option
-                            v-for="(item,index) in doctors"
-                            :key="index"
-                            :label="item.user_name"
-                            :value="item.admin_user_id">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="科室：" prop="department">
-                <el-select v-model="form.department" placeholder="请选择">
-                    <el-option
-                            v-for="(item,index) in departments"
-                            :key="index"
-                            :label="item.name"
-                            :value="item.id">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-        </el-form>
-
-        <span slot="footer" class="dialog-footer">
+  <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility"
+             :close-on-click-modal="isClose"
+             :close-on-press-escape="isClose">
+
+    <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
+      <el-form-item label="患者姓名：" prop="name" :validate-event="is_Name">
+        <el-autocomplete
+          class="checkSearch"
+          popper-class="my-autocomplete"
+          v-model="form.name"
+          :fetch-suggestions="querySearchAsync"
+          :trigger-on-focus="false"
+          placeholder="请输入病人名字"
+          @select="handleSelect"
+          style="width:160px;"
+        >
+          <i class="el-icon-search el-input__icon" slot="suffix"></i>
+          <template slot-scope="{ item }">
+            <div class="name">{{ item.name }}</div>
+          </template>
+        </el-autocomplete>
+      </el-form-item>
+
+      <el-form-item label="性别：" prop="gender" :validate-event="is_Name">
+        <el-select v-model="form.gender" placeholder="请选择" style="width:100%;">
+          <el-option
+            v-for="item in sex"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+
+
+      </el-form-item>
+
+      <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
+        <el-input v-model="form.age"></el-input>
+      </el-form-item>
+
+
+      <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
+        <el-date-picker v-model="form.birthday" type="date" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%;"></el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="手机号码：" prop="phone">
+        <el-input v-model="form.phone"></el-input>
+      </el-form-item>
+
+
+      <!--<el-form-item label="医疗类别：">-->
+      <!--<el-select v-model="form.medical_care" placeholder="请选择" style="width:100%;">-->
+      <!--<el-option-->
+      <!--v-for="(item,index) in medical_care"-->
+      <!--:key="index"-->
+      <!--:label="item.label"-->
+      <!--:value="item.value">-->
+      <!--</el-option>-->
+      <!--</el-select>-->
+      <!--</el-form-item>-->
+
+
+      <el-form-item label="证件类型：" prop="certificates" :validate-event="is_Name">
+        <el-select v-model="form.certificates" placeholder="请选择" style="width:100%;">
+          <el-option
+            v-for="item in certificates"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="证件号码：" prop="id_card" :validate-event="is_Name">
+        <el-input v-model="form.id_card"></el-input>
+      </el-form-item>
+
+      <!--<el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">-->
+      <!--<el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""-->
+      <!--&gt;-->
+      <!--<el-option-->
+      <!--v-for="(item,index) in registers"-->
+      <!--:key="index"-->
+      <!--:label="item.label"-->
+      <!--:value="item.value">-->
+      <!--</el-option>-->
+      <!--</el-select>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">-->
+      <!--<el-select style="margin-right:5px;width:100px;" v-model="form.sick_type" placeholder="">-->
+      <!--<el-option-->
+      <!--v-for="(item,index) in sick"-->
+      <!--:key="index"-->
+      <!--:label="item.class_name"-->
+      <!--:value="item.id">-->
+      <!--</el-option>-->
+      <!--</el-select>-->
+      <!--</el-form-item>-->
+
+      <!--<el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">-->
+      <!--<el-select style="margin-right:5px;width:100px;" v-model="form.diagnosis" placeholder="">-->
+      <!--<el-option-->
+      <!--v-for="(item,index) in diagnoses"-->
+      <!--:key="index"-->
+      <!--:label="item.class_name"-->
+      <!--:value="item.id">-->
+      <!--</el-option>-->
+      <!--</el-select>-->
+      <!--</el-form-item>-->
+
+
+      <el-form-item label="结算类型：">
+        <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
+          <el-option
+            v-for="item in settlement"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
+      <el-form-item label="社保类型：">
+        <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
+          <el-option
+            v-for="item in medicalCare"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
+      <el-form-item label="读卡类型：" prop="id_card_type" :validate-event="is_Name">
+        <el-select v-model="form.id_card_type" placeholder="请选择">
+          <el-option
+            v-for="item in IDCardTypes"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
+      <el-form-item class="specialFormItem" label="医保卡号：">
+        <div style="display:flex;">
+          <el-input v-model="form.medical_insurance_card"></el-input>
+          <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
+
+        </div>
+      </el-form-item>
+
+      <el-form-item label="挂号类型：" :validate-event="is_Name">
+        <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
+          <el-option
+            v-for="item in register"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="挂号费：">
+        <el-input v-model="form.registration_fee"></el-input>
+      </el-form-item>
+      <el-form-item label="诊疗费：">
+        <el-input v-model="form.medical_expenses"></el-input>
+      </el-form-item>
+
+      <el-form-item label="医生：" prop="doctor">
+        <el-select v-model="form.doctor" placeholder="请选择">
+          <el-option
+            v-for="(item,index) in doctors"
+            :key="index"
+            :label="item.user_name"
+            :value="item.admin_user_id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="科室：" prop="department">
+        <el-select v-model="form.department" placeholder="请选择">
+          <el-option
+            v-for="(item,index) in departments"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
     <el-button @click="cancel('formValue')">取 消</el-button>
     <el-button type="primary" @click="confirm('formValue')">挂 号</el-button>
   </span>
-    </el-dialog>
+  </el-dialog>
 
 </template>
 
@@ -470,23 +470,23 @@
               var patient = response.data.data.patient
 
               if (that.form.id_card_type == 1) {
-                this.form.id = patient.id
+                that.form.id = patient.id
                 that.form.name = patient.name
-                that.form.sex = patient.gender
+                that.form.gender = patient.gender
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
-                that.form.idCard = patient.id_card_no
-                that.form.medicalInsuranceCard = response.data.data.number
+                that.form.id_card = patient.id_card_no
+                that.form.medical_insurance_card = response.data.data.number
 
               } else if (that.form.id_card_type == 2) {
-                this.form.id = patient.id
+                that.form.id = patient.id
                 that.form.name = patient.name
-                that.form.sex = patient.gender
+                that.form.gender = patient.gender
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
-                that.form.idCard = patient.id_card_no
+                that.form.id_card = patient.id_card_no
               }
               that.$message({ message: '读卡成功', type: 'success' })
             }
@@ -494,7 +494,6 @@
           .catch(function(error) {
 
           })
-
       },
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
@@ -574,16 +573,16 @@
 </script>
 
 <style lang="scss" scoped>
-    .registerDialog {
+  .registerDialog {
 
-    .el-form {
-        display: flex;
-        flex-wrap: wrap;
-    }
+  .el-form {
+    display: flex;
+    flex-wrap: wrap;
+  }
 
-    .el-form-item {
-        width: 50%;
-    }
+  .el-form-item {
+    width: 50%;
+  }
 
-    }
+  }
 </style>

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -148,7 +148,7 @@
               </el-checkbox-group>
             </el-form-item>
 
-            <el-form-item label="社保目录编码:" >
+            <el-form-item label="国家编码:" >
                <el-input v-model="form.social_security_directory_code" style="width:180px"></el-input>
             </el-form-item>
 

src/xt_pages/workforce/appointment.vue

@@ -546,6 +546,8 @@
           }
           
           if(this.export_type == 1){
+            console.log("进来了吗22323323223",this.tableList,this.newDay[0])
+            
             //  const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
             //  const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
             //  const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
@@ -581,18 +583,29 @@
               data.push(Object.values(item))
 
             })
-            console.log("data",this.$refs.tableData)
+           
             
             const filename = '排班模版'
-           
-            excel.export_json_to_excel1({
-              multiHeader,
-              header,
-              merges,
-              data,
-              filename,
-              ref: this.$refs['tableData'].$refs['table'].$el
-            })
+            console.log("multiHeaders", this.$store.getters.xt_user.org.id,)
+
+            if(this.$store.getters.xt_user.org.id == 10234){
+              excel.export_json_to_excel1({
+                multiHeader,
+                header,
+                merges,
+                data,
+                filename,
+                ref: this.$refs['tableData'].$refs['table'].$el
+              })
+            }else{
+              excel.export_json_to_excel({
+                multiHeader,
+                header,
+                merges,
+                data,
+                filename
+              })
+            }
             this.downloadLoading = false
           }
         })
@@ -2148,7 +2161,7 @@
               partition_id:this.partition_id,
               schedule_type:this.schedule_type
             }
-          //  console.log("params2222",params)
+        console.log("params2222",params)
          getThreeWeekList(params).then(response=>{
            if(response.data.state == 1){
              var partitions =  response.data.data.partitions
@@ -2651,12 +2664,14 @@
                   }
                 }
              }
+             console.log("list23233223232323232323",list)
              this.tableList = list
            }
          })
        },
 
        getTimestamp(time) { //把时间日期转成时间戳
+         console.log("日期",new Date(time))
           return (new Date(time)).getTime() / 1000 - 28800
        },
 
@@ -2675,9 +2690,9 @@
        changeWeek(val){
        
          var start = this.getTimestamp(val) - 57600
-       
+         console.log("val23232332323232",start)
          this.start_time = this.getTime(start)
-       
+         
          this.newDay.push(this.start_time)  
          var next = start + 86400
          var nest_day = this.getTime(next)
@@ -2707,10 +2722,6 @@
          this.end_time = this.getTime(end)
        
          this.newDay.push(this.end_time)
-      
-     
-
-        //  console.log("33333333",this.newDay)
          this.export_type = 1
          this.getThreeWeekList()
        },

src/xt_pages/workforce/next_remind_print.vue

@@ -156,7 +156,7 @@
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
       this.week_type = this.$route.query.week_type
       var now_time = parseInt(this.week_type) * 86400 + this.start_time
-      console.log("now_time23233232322323",now_time)
+      // console.log("now_time23233232322323",now_time)
       this.now_time = now_time
       this.week_time  = this.$route.query.week_time
       this.zone = this.$route.query.zone
@@ -173,7 +173,7 @@
           zone:this.zone,
           record_date:this.getTime(now_time)
         }
-     console.log("下周打印时间",params)
+    //  console.log("下周打印时间",params)
       getNextScheduleWeekDay(params).then(rs => {
         var resp = rs.data
         console.log(resp)