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

src/api/his/his_tools.js

@@ -0,0 +1,12 @@
+import request from "@/utils/request";
+
+
+export function GetAllPatients() {
+  return request({
+    url: "/api/his/patient",
+    method: "get",
+  });
+}
+
+
+

src/api/warehouse.js

@@ -131,3 +131,11 @@ export function updatedrugout(params) {
     params: params
   })
 }
+//获取管理员列表()
+export function getusername(params) {
+  return request({
+    url: '/api/secondary/getusername',
+    method: 'get',
+    params: params
+  })
+}

src/views/layout/components/Navbar.vue

@@ -83,6 +83,8 @@
           </el-dropdown-menu>
         </el-dropdown>
       </div>
+
+      <div style="margin-left: 50px" v-if="org_config.code&&org_config.code.length >0">机构编码:{{org_config.code}}</div>
     </div>
     <div class="navRight">
       <!-- <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
@@ -101,6 +103,7 @@
             <i class="el-icon-caret-bottom"></i>
           </div>
           <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item >医师编码: {{role.doctor_number}}</el-dropdown-item>
             <el-dropdown-item command="modifyUserInfoAction"
               >个人信息</el-dropdown-item
             >
@@ -183,7 +186,9 @@ export default {
       is_super_admin: 0,
       wrap1:false,
       wrap2:false,
-      information:{}
+      information:{},
+      org_config:{},
+      role:{},
       // scrm_role_exist: $store.getters.xt_user.scrm_role_exist
     };
   },
@@ -392,6 +397,10 @@ export default {
             this.org_name = this.orgs[i].org_name;
           }
         }
+
+        this.org_config = response.data.data.org_config
+        this.role = response.data.data.role
+
         localStorage.setItem("org_id",creator.org_id);
         sessionStorage.setItem("org_id",creator.org_id);
         sessionStorage.setItem("admin_user_id",creator.admin_user_id);

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -9,24 +9,24 @@
       </el-form-item>
 
       <el-form-item label="总计：" prop="name" :validate-event="is_Name" style="width:33%;">
-        <el-input type="number" v-model="form.total" :disabled="true"></el-input>
+        <el-input style="color: black" type="number" v-model="form.total" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="医保：" prop="name" :validate-event="is_Name" style="width:33%;">
-        <el-input type="number" v-model="form.medical_insurance_price" :disabled="true"></el-input>
+        <el-input style="color: black"  type="number" v-model="form.medical_insurance_price" :disabled="true"></el-input>
       </el-form-item>
 
 
       <el-form-item label="自费：" prop="age" :validate-event="is_Name" style="width:33%;">
-        <el-input type="number" v-model="form.private_price" :disabled="true"></el-input>
+        <el-input style="color: black"  type="number" v-model="form.private_price" :disabled="true"></el-input>
       </el-form-item>
 
       <el-form-item label="个账支出：" prop="age" :validate-event="is_Name" style="width:33%;">
-        <el-input type="number" v-model="form.acct_pay" :disabled="true"></el-input>
+        <el-input style="color: black"  type="number" v-model="form.acct_pay" :disabled="true"></el-input>
       </el-form-item>
 
 
       <el-form-item label="个人现金支出：" prop="age" :validate-event="is_Name" style="width:33%;">
-        <el-input type="number" v-model="form.psn_pay" :disabled="true"></el-input>
+        <el-input style="color: black"  type="number" v-model="form.psn_pay" :disabled="true"></el-input>
       </el-form-item>
 
 
@@ -47,7 +47,7 @@
 
 
       <el-form-item label="付款金额：" prop="id_card" :validate-event="is_Name">
-        <el-input type="number" v-model="form.pay_price" :disabled="true"></el-input>
+        <el-input style="color: black"  type="number" v-model="form.pay_price" :disabled="true"></el-input>
       </el-form-item>
 
 
@@ -57,22 +57,22 @@
 
       <el-form-item class="specialFormItem" label="折扣金额：">
         <div style="display:flex;">
-          <el-input v-model="form.discount_price" :disabled="form.preferential_price != 0" @change="changeDiscountPrice"></el-input>
+          <el-input style="color: black"  v-model="form.discount_price" :disabled="form.preferential_price != 0" @change="changeDiscountPrice"></el-input>
         </div>
       </el-form-item>
       <el-form-item class="specialFormItem" label="优惠金额：">
         <div style="display:flex;">
-          <el-input v-model="form.preferential_price" :disabled="form.discount_price != 0" @change="changePreferentialPrice"></el-input>
+          <el-input style="color: black"  v-model="form.preferential_price" :disabled="form.discount_price != 0" @change="changePreferentialPrice"></el-input>
         </div>
       </el-form-item>
       <el-form-item label="实收金额：">
         <div style="display:flex;">
-          <el-input v-model="form.reality_price" @change="realityPrice"></el-input>
+          <el-input style="color: black"  v-model="form.reality_price" @change="realityPrice"></el-input>
         </div>
       </el-form-item>
       <el-form-item label="找回金额：">
         <div style="display:flex;">
-          <el-input v-model.number="form.found_price"></el-input>
+          <el-input style="color: black"  v-model.number="form.found_price"></el-input>
         </div>
       </el-form-item>
 
@@ -101,7 +101,7 @@
 
 <script>
   import { uParseTime } from '@/utils/tools'
-
+  const moment = require('moment')
   export default {
     name: 'chargeDialog',
 
@@ -182,6 +182,7 @@
     },
     methods: {
       show: function (total,order) {
+        this.record_date = moment(new Date()).add('year',0).format("YYYY-MM-DD HH:mm")
         this.form.total = total
         this.form.private_price = total
         this.form.pay_price = total
@@ -269,7 +270,17 @@
   }
 </script>
 
+
 <style lang="scss" scoped>
+/deep/input::-webkit-input-placeholder {
+  color: red;
+  font-size: 15px;
+}
+
+   /deep/.el-input__inner {
+     background-color: transparent !important;
+     border: 1px solid red;
+   }
 .chargeDialog{
   .el-form{
     display: flex;

src/xt_pages/hospitalStation/components/hospitalRegisterDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog width="854px" title="入院登记" class="chargeDialog" :visible.sync="visibility" :close-on-click-modal="isClose"
+  <el-dialog width="1000px" title="入院登记" class="chargeDialog" :visible.sync="visibility" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
     <div class="nameTitle">患者基本信息:</div>
@@ -161,185 +161,13 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="入院科室：" prop="department" :validate-event="is_Name">
-          <el-select v-model="form.department" placeholder="请选择">
-            <el-option
-                v-for="item in departmentList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-
-        <el-form-item label="入院时间：" prop="start_time" :validate-event="is_Name">
-          <el-date-picker v-model="form.start_time" type="datetime" format="yyyy-MM-dd HH:mm:ss"
+        <el-form-item label="入院时间："  prop="start_time" :validate-event="is_Name">
+          <el-date-picker style="width: 210px" v-model="form.start_time" type="datetime" format="yyyy-MM-dd HH:mm:ss"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           placeholder="请选择入院时间">
           </el-date-picker>
 
         </el-form-item>
-
-      </el-form>
-      <el-button style="float:right" @click="saveHisPatient('form')" v-loading="loadingone" type="primary">登记
-      </el-button>
-    </div>
-    <div class="nameTitle">患者基本信息:</div>
-    <div class="formMain">
-      <el-form class="basicForm" :model="form" :rules="rules" ref="form" 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="phone">
-          <el-input v-model="form.phone"></el-input>
-        </el-form-item>
-
-
-        <el-form-item label="证件类型：" prop="certificates" :validate-event="is_Name">
-          <el-select v-model="form.certificates" placeholder="请选择">
-            <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_no" :validate-event="is_Name">
-          <el-input v-model="form.id_card_no"></el-input>
-        </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 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.insuplc_admdvs" placeholder="请选择" style="width:100%;">
-            <el-option
-                v-for="item in InsuplcAdmdvs"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-
-      </el-form>
-    </div>
-    <div class="nameTitle">患者住院信息:</div>
-    <div class="formMain">
-      <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
-
-        <el-form-item label="疾病类型：" prop="sick_type" :validate-event="is_Name">
-          <el-select filterable 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 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="医疗类别：" prop="med_type" :validate-event="is_Name">
-          <el-select v-model="form.med_type" placeholder=""
-          >
-            <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="社保类型：">
-          <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="人员类别：">
-          <el-select v-model="form.psn_type" placeholder="请选择" style="width:100%;">
-            <el-option
-                v-for="item in PsnTypes"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-
-        <el-form-item label="主治医生：" prop="doctor" :validate-event="is_Name">
-          <el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">
-            <el-option
-                v-for="item in doctorList"
-                :key="item.admin_user_id"
-                :label="item.user_name"
-                :value="item.admin_user_id">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="入院科室：" prop="department" :validate-event="is_Name">
           <el-select v-model="form.department" placeholder="请选择">
             <el-option
@@ -352,24 +180,15 @@
         </el-form-item>
 
 
-        <el-form-item label="入院时间：" prop="start_time" :validate-event="is_Name">
-          <el-date-picker v-model="form.start_time" type="datetime" format="yyyy-MM-dd HH:mm:ss"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="请选择入院时间">
-          </el-date-picker>
 
-        </el-form-item>
 
       </el-form>
-      <el-button style="float:right" @click="saveHisPatient('form')" v-loading="loadingone" type="primary">登记
-      </el-button>
     </div>
 
 
-
     <span slot="footer" class="dialog-footer">
-    <el-button v-loading="loadingtwo" @click="cancel('formValue')">取 消</el-button>
-    <el-button v-loading="loadingtwo" type="primary" @click="confirm('formValue')">确 定</el-button>
+    <el-button v-loading="loadingone" @click="cancel('form')">取 消</el-button>
+    <el-button v-loading="loadingone" type="primary" @click="confirm('form')">登记</el-button>
   </span>
   </el-dialog>
 
@@ -400,6 +219,7 @@ export default {
     return {
       visibility:false,
       isClose:false,
+
       PsnTypes:[
         { value: 11, label: '在职' },
         { value: 21, label: '退休' },
@@ -494,7 +314,7 @@ export default {
         value: 6,
         label: '港澳地区身份证'
       }],
-
+      loadingtwo:false,
       IDCardTypes: [{
         value: 1,
         label: '社保卡'
@@ -520,7 +340,6 @@ export default {
       },
       doctorList: [],
       departmentList: [],
-      show: false,
       is_Name: false,
       patient: [],
       scialType: []
@@ -528,6 +347,14 @@ export default {
   },
 
   methods: {
+    cancel: function (formName) {
+      this.$refs['form'].resetFields()
+      this.$emit('cancel', "");
+
+    },
+    confirm: function (formName) {
+      this.saveHisPatient(formName)
+    },
     check(){
       if(this.form.med_type == 0 || this.form.med_type == ''){
         this.$message.error("医疗类别不能为空")
@@ -585,6 +412,22 @@ export default {
           })
 
     }, show() {
+
+      this.form.id = 0
+      this.form.name = ""
+      this.form.sex = ""
+      this.form.age = ""
+      this.form.birthday = ""
+      this.form.phone = ""
+      this.form.id_card_no = ""
+      this.form.insuplc_admdvs = ""
+      this.form.social_type  = ""
+      this.form.psn_type = ""
+      this.form.doctor = ""
+
+
+
+
       this.visibility = true
       this.form.certificates = 1
       if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
@@ -598,6 +441,8 @@ export default {
       this.getInitData()
       //获取当前机构有人员信息inde
       this.getAllDoctorList()
+    },hide(){
+      this.visibility = false
     },
     handleSelect(val) {
       this.form.id = val.id
@@ -826,12 +671,6 @@ export default {
         this.is_Name = true
         return
       }
-      //
-      // if (this.form.doctor == '') {
-      //   this.$message.error('医生不能为空')
-      //   this.is_Name = true
-      //   return
-      // }
 
       if (this.form.department == '') {
         this.$message.error('科室不能为空')
@@ -875,7 +714,7 @@ export default {
         return
       }
 
-      this.$refs[formName].validate((valid) => {
+      this.$refs['form'].validate((valid) => {
         if (valid) {
           if (this.form.costChecked == true) {
             this.check = 1
@@ -883,9 +722,7 @@ export default {
           if (this.form.costChecked == false) {
             this.check = 2
           }
-          if (this.form.id_card_no == '') {
-            this.show = true
-          }
+
           var nowDate = new Date()
           var nowYear = nowDate.getFullYear()
           var nowMonth = nowDate.getMonth() + 1
@@ -941,10 +778,13 @@ export default {
                 that.form.med_type = 14
                 that.form.sick_type = that.sick[0].id
                 that.form.diagnosis = that.diagnoses[0].id
+                if(that.$store.getters.xt_user.org_id == 10215) {
+                  that.form.sick_type = 421
+                  that.form.diagnosis = 92
+                }
+                that.$emit('confirm', "");
               }
             })
-
-
           } else {
             axios.get('http://127.0.0.1:9532/zh/api/inhopitalcheck/get', {
               params: params,
@@ -979,10 +819,13 @@ export default {
                       that.form.sick_type = that.sick[0].id
                       that.form.diagnosis = that.diagnoses[0].id
                       that.form.certificates = 1
+                      that.$emit('confirm', "");
                       if(that.$store.getters.xt_user.org_id == 10215) {
                         that.form.sick_type = 421
                         that.form.diagnosis = 92
                       }
+
+
                     }
                   }
                 })

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="prescriptionTable">
-    <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;"
+    <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99.9%;"
               :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
       <el-table-column align="center" prop="day" width="70" label="序号">

src/xt_pages/hospitalStation/components/settlePrescriptionTable.vue

@@ -85,7 +85,7 @@
 
       <el-table-column align="center" prop="name" width="80" label="超限价金额">
         <template slot-scope="scope">
-          <div>{{ scope.row.overlmt_amt }}元</div>
+          <div>{{ scope.row.overlmt_amt  }}元</div>
         </template>
       </el-table-column>
 
@@ -107,7 +107,7 @@
         label="符合正常范围金额"
       >
         <template slot-scope="scope">
-          <div>{{ scope.row.inscp_scp_amt }}元</div>
+          <div>{{scope.row.inscp_scp_amt}}元</div>
         </template>
       </el-table-column>
 
@@ -223,13 +223,13 @@
 
       <el-table-column align="center" prop="name" width="80" label="全自费金额">
         <template slot-scope="scope">
-          <div>{{ scope.row.fulamt_ownpay_amt }}元</div>
+          <div>{{ scope.row.fulamt_ownpay_amt}}元</div>
         </template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="80" label="超限价金额">
         <template slot-scope="scope">
-          <div>{{ scope.row.overlmt_amt }}元</div>
+          <div>{{ scope.row.overlmt_amt}}元</div>
         </template>
       </el-table-column>
 
@@ -240,7 +240,7 @@
         label="先行自付金额"
       >
         <template slot-scope="scope">
-          <div>{{ scope.row.preselfpay_amt }}元</div>
+          <div>{{scope.row.preselfpay_amt}}元</div>
         </template>
       </el-table-column>
 
@@ -251,7 +251,7 @@
         label="符合正常范围金额"
       >
         <template slot-scope="scope">
-          <div>{{ scope.row.inscp_scp_amt }}元</div>
+          <div>{{scope.row.inscp_scp_amt }}元</div>
         </template>
       </el-table-column>
 

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -91,6 +91,10 @@
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
           <div>
+            <el-button  size="small"
+                       @click="open(1)"
+                       type="primary">入院登记
+            </el-button>
 
             <el-button v-loading="loadingone" size="small"
                        v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
@@ -125,6 +129,11 @@
                        type="primary">收费
             </el-button>
 
+            <el-button v-loading="loadingtwo"
+                       size="small"
+                       @click="open(3)"
+                       type="primary">收费
+            </el-button>
             <el-button size="small" @click="open(4)" type="primary"
                        v-if="this.activeName == 'third' &&this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
               退费
@@ -217,6 +226,7 @@
                        :addtions_charge="addtions_charge"></additionalCharges>
 
     <charge-dialog ref='charge' v-on:confirm="chargeConfirm" v-on:cancel="chargeCancel"></charge-dialog>
+    <hospital-register-dialog  ref='hrd' v-on:confirm="hospitalRegisterConfirm" v-on:cancel="hospitalRegisterCancel"></hospital-register-dialog>
 
     <el-dialog
         class="centerDialog"
@@ -300,10 +310,12 @@ import RegisterDialog9504 from './components/registerDialog9504'
 import ChargePrescriptionTable from './components/ChargePrescriptionTable'
 import invoicePrint from './invoicePrint'
 import SettlePrescriptionTable from './components/settlePrescriptionTable'
+import HospitalRegisterDialog from './components/hospitalRegisterDialog'
 
 const moment = require('moment')
 export default {
   components: {
+    HospitalRegisterDialog,
     SettlePrescriptionTable,
     ChargePrescriptionTable,
     RegisterDialog9504,
@@ -575,6 +587,13 @@ export default {
         }
       })
 
+    },s(){
+      this.$refs.hrd.hide()
+      this.getPatientList()
+    },hospitalRegisterCancel(){
+      this.$refs.hrd.hide()
+
+
     },
     chargeConfirm(form) {
       form['in_hospital_id'] = this.hisPatientInfo.id
@@ -727,10 +746,10 @@ export default {
                 spec: spec,
                 det_item_fee_sumamt: prescription.advices[b].order_info.det_item_fee_sumamt,
                 name_id: prescription.advices[b].drug.manufacturer,
-                fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
-                overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
-                preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
-                inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt
+                fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt * prescription.advices[b].prescribing_number,
+                overlmt_amt: prescription.advices[b].order_info.overlmt_amt* prescription.advices[b].prescribing_number,
+                preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt* prescription.advices[b].prescribing_number,
+                inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt* prescription.advices[b].prescribing_number
 
               }
               tempAdvice.push(obj)
@@ -751,11 +770,11 @@ export default {
                 unit: prescription.project[b].unit,
 
                 type: prescription.project[b].type,
-                det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt,
-                fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,
-                overlmt_amt: prescription.project[b].order_info.overlmt_amt,
-                preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
-                inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt
+                det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt* prescription.advices[b].prescribing_number,
+                fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt* prescription.advices[b].prescribing_number,
+                overlmt_amt: prescription.project[b].order_info.overlmt_amt * prescription.advices[b].prescribing_number,
+                preselfpay_amt: prescription.project[b].order_info.preselfpay_amt * prescription.advices[b].prescribing_number,
+                inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt * prescription.advices[b].prescribing_number
 
               }
               if (prescription.project[b].type == 2) {
@@ -1058,6 +1077,7 @@ export default {
 
     },
     searchAction() {
+      console.log(this.all_table_data)
       if (this.search_input.length == 0) {
         switch (this.radio) {
           case 1:
@@ -1268,6 +1288,9 @@ export default {
       return jsonData.map(v => filterVal.map(j => v[j]))
     },
     open(index) {
+      if (index == 1){
+        this.$refs.hrd.show()
+      }
       if (index == 40) {
         var form = {}
 
@@ -1397,6 +1420,7 @@ export default {
           type: 'warning'
         }).then(() => {
           this.dialogVisible = true
+          this.out_hospital_time = moment(new Date()).add('year',0).format("YYYY-MM-DD HH:mm:ss")
         }).catch(() => {
 
         })
@@ -1504,7 +1528,8 @@ export default {
       } else if (index == 5) {
         this.statementVisible = true
         let obj = {
-          order_id: this.order.id
+          order_id: this.order.id,
+          balance_accounts_type:this.hisPatientInfo.balance_accounts_type
         }
         this.orderObj = obj
         // this.$refs.print.getInfo(this.order.id)
@@ -2245,70 +2270,35 @@ export default {
             response.data.data.list_two = []
           }
           this.patientTableData = []
-          this.hisPatientDatas = []
           this.all_table_data = []
+          this.hisPatientDatas = []
+
           let one_count = 0
           let two_count = 0
           let three_count = 0
-
-          if (this.activeName == 'first') { //日结
-
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.all_table_data.push(response.data.data.list[i])
-              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
-                one_count = one_count + 1
-              }
-
-            }
-
-          } else { //月结
-
-            for (let i = 0; i < response.data.data.list_two.length; i++) {
-              this.hisPatientDatas.push(response.data.data.list_two[i])
-              if (response.data.data.list_two[i].order.order_status == 0 || response.data.data.list_two[i].order.order_status == 1) {
-                one_count = one_count + 1
-              }
-
-              // if (response.data.data.list_two[i].his_patient.order.order_status == 2) {
-              //   two_count = two_count + 1
-              // }
-              //
-              // if (response.data.data.list_two[i].his_patient.order.order_status == 3) {
-              //   three_count = three_count + 1
-              // }
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.all_table_data.push(response.data.data.list[i])
+            if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
+              one_count = one_count + 1
             }
 
           }
 
+          this.hisPatientDatas = response.data.data.list_two
           this.cal_one = one_count
           this.cal_two = response.data.data.charge_list.length
           // this.all_charge_table_data = response.data.data.charge_list
-          // this.cal_three = three_count;
-
-          switch (temp_id) {
+          this.current_index = 0
 
+          switch (this.radio) {
             case 1:
               this.patientTableData = []
-              if (this.activeName == 'first') {
-
-                for (let i = 0; i < this.all_table_data.length; i++) {
-                  if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1) {
-                    this.patientTableData.push(this.all_table_data[i])
-                  }
-
-                }
-
-              } else {
-                for (let i = 0; i < this.hisPatientDatas.length; i++) {
-                  if (this.hisPatientDatas[i].order.order_status == 0 || this.hisPatientDatas[i].order.order_status == 1) {
-                    this.patientTableData.push(this.hisPatientDatas[i])
-                  }
-
+              for (let i = 0; i < this.all_table_data.length; i++) {
+                if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1 || this.all_table_data[i].order.order_status == 3) {
+                  this.patientTableData.push(this.all_table_data[i])
                 }
-
               }
 
-              this.current_index = 0
               this.$refs.tab.setCurrentRow(this.patientTableData[0])
               this.getPatientInformation(this.patientTableData[0].patient_id, this.patientTableData[0].order.number, this.patientTableData[0].id)
 
@@ -2322,50 +2312,28 @@ export default {
                   number: response.data.data.charge_list[i].number,
                   his_patient_id: response.data.data.charge_list[i].his_patient.id,
                   his_number: response.data.data.charge_list[i].mdtrt_id
-
                 }
                 this.chargePatientTableData.push(obj)
               }
               this.all_charge_table_data = this.chargePatientTableData
 
-              this.current_index = 0
               this.$refs.tab.setCurrentRow(this.chargePatientTableData[0])
               this.getPatientInformation(this.chargePatientTableData[0].id, this.chargePatientTableData[0].number, this.chargePatientTableData[0].his_patient_id)
-
               break
               // case 3:
               //   this.patientTableData = [];
               //
-              //   if (this.activeName == 'first') {
-              //
-              //     for (let i = 0; i < this.all_table_data.length; i++) {
-              //
-              //       if (this.all_table_data[i].his_patient.order.order_status == 3) {
-              //         this.patientTableData.push(this.all_table_data[i])
-              //       }
-              //
-              //     }
-              //   } else {
-              //
-              //     for (let i = 0; i < this.hisPatientDatas.length; i++) {
-              //
-              //       if (this.hisPatientDatas[i].his_patient.order.order_status == 3) {
-              //         this.patientTableData.push(this.hisPatientDatas[i])
-              //       }
+              //   for (let i = 0; i < this.all_table_data.length; i++) {
               //
+              //     if (this.all_table_data[i].his_patient.order.order_status == 3) {
+              //       this.patientTableData.push(this.all_table_data[i])
               //     }
               //
               //   }
               //   break;
               // case 4:
               //   this.patientTableData = [];
-              //   if (this.activeName == 'first') {
-              //
-              //     this.patientTableData = this.all_table_data
-              //   } else {
-              //
-              //     this.patientTableData = this.hisPatientDatas
-              //   }
+              //   this.patientTableData = this.all_table_data;
               //   break
 
           }
@@ -2777,6 +2745,10 @@ export default {
       for (let i = 0; i < drug_ids.length; i++) {
         let obj = {}
         let count = 0
+        let fulamt_ownpay_amt = 0
+        let overlmt_amt = 0
+        let inscp_scp_amt = 0
+        let preselfpay_amt = 0
         for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
           if (drug_ids[i].price == drug_month_prescriptions.advices[a].price && drug_ids[i].id == drug_month_prescriptions.advices[a].drug_id) {
 
@@ -2794,23 +2766,33 @@ export default {
 
 
             obj['code'] = drug_month_prescriptions.advices[a].drug.medical_insurance_number
-            obj['fulamt_ownpay_amt'] = drug_month_prescriptions.advices[a].order_info.fulamt_ownpay_amt
-            obj['overlmt_amt'] = drug_month_prescriptions.advices[a].order_info.overlmt_amt
-            obj['inscp_scp_amt'] = drug_month_prescriptions.advices[a].order_info.inscp_scp_amt
-            obj['preselfpay_amt'] = drug_month_prescriptions.advices[a].order_info.preselfpay_amt
 
 
             count = count + drug_month_prescriptions.advices[a].prescribing_number
+            fulamt_ownpay_amt = fulamt_ownpay_amt + drug_month_prescriptions.advices[a].order_info.fulamt_ownpay_amt
+            overlmt_amt = overlmt_amt + drug_month_prescriptions.advices[a].order_info.overlmt_amt
+            inscp_scp_amt = inscp_scp_amt + drug_month_prescriptions.advices[a].order_info.inscp_scp_amt
+            preselfpay_amt = preselfpay_amt + drug_month_prescriptions.advices[a].order_info.preselfpay_amt
+
 
           }
         }
         obj['prescribing_number'] = count
+        obj['fulamt_ownpay_amt'] = fulamt_ownpay_amt.toFixed(2)
+        obj['overlmt_amt'] = overlmt_amt.toFixed(2)
+        obj['inscp_scp_amt'] = inscp_scp_amt.toFixed(2)
+        obj['preselfpay_amt'] =preselfpay_amt.toFixed(2)
+
         drugs.push(obj)
       }
 
       for (let i = 0; i < project_ids.length; i++) {
         let obj = {}
         let count = 0
+        let fulamt_ownpay_amt = 0
+        let overlmt_amt = 0
+        let inscp_scp_amt = 0
+        let preselfpay_amt = 0
         for (let a = 0; a < project_month_prescriptions.project.length; a++) {
           if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
 
@@ -2828,10 +2810,10 @@ export default {
 
             }
 
-            obj['fulamt_ownpay_amt'] = project_month_prescriptions.project[a].order_info.fulamt_ownpay_amt
-            obj['overlmt_amt'] = project_month_prescriptions.project[a].order_info.overlmt_amt
-            obj['inscp_scp_amt'] = project_month_prescriptions.project[a].order_info.inscp_scp_amt
-            obj['preselfpay_amt'] = project_month_prescriptions.project[a].order_info.preselfpay_amt
+            // obj['fulamt_ownpay_amt'] = project_month_prescriptions.project[a].order_info.fulamt_ownpay_amt
+            // obj['overlmt_amt'] = project_month_prescriptions.project[a].order_info.overlmt_amt
+            // obj['inscp_scp_amt'] = project_month_prescriptions.project[a].order_info.inscp_scp_amt
+            // obj['preselfpay_amt'] = project_month_prescriptions.project[a].order_info.preselfpay_amt
 
 
             // obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
@@ -2846,12 +2828,18 @@ export default {
             count = count + parseFloat(project_month_prescriptions.project[a].count)
             // price = price + project_month_prescriptions.project[a].price
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
-
-
+            fulamt_ownpay_amt = fulamt_ownpay_amt +project_month_prescriptions.project[a].order_info.fulamt_ownpay_amt
+            overlmt_amt = overlmt_amt +project_month_prescriptions.project[a].order_info.overlmt_amt
+            inscp_scp_amt = inscp_scp_amt + project_month_prescriptions.project[a].order_info.inscp_scp_amt
+            preselfpay_amt = preselfpay_amt + project_month_prescriptions.project[a].order_info.preselfpay_amt
 
 
           }
         }
+        obj['fulamt_ownpay_amt'] = fulamt_ownpay_amt.toFixed(2)
+        obj['overlmt_amt'] = overlmt_amt.toFixed(2)
+        obj['inscp_scp_amt'] = inscp_scp_amt.toFixed(2)
+        obj['preselfpay_amt'] = preselfpay_amt.toFixed(2)
         obj['total'] = count
         projects.push(obj)
       }
@@ -3023,10 +3011,10 @@ export default {
                 spec: spec,
                 det_item_fee_sumamt: prescription.advices[b].order_info.det_item_fee_sumamt,
                 name_id: prescription.advices[b].drug.manufacturer,
-                fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
-                overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
-                preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
-                inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt
+                fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt * prescription.advices[b].prescribing_number,
+                overlmt_amt: prescription.advices[b].order_info.overlmt_amt * prescription.advices[b].prescribing_number,
+                preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt * prescription.advices[b].prescribing_number,
+                inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt * prescription.advices[b].prescribing_number
 
 
 
@@ -3050,11 +3038,11 @@ export default {
                 // medical_code: prescription.project[b].project.medical_code,
                 unit: prescription.project[b].project.unit,
                 type: prescription.project[b].type,
-                det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt,
-                fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,
-                overlmt_amt: prescription.project[b].order_info.overlmt_amt,
-                preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
-                inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt
+                det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt * prescription.project[b].count,
+                fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt * prescription.project[b].count,
+                overlmt_amt: prescription.project[b].order_info.overlmt_amt * prescription.project[b].count,
+                preselfpay_amt: prescription.project[b].order_info.preselfpay_amt * prescription.project[b].count,
+                inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt * prescription.project[b].count
 
               }
 

src/xt_pages/hospitalStation/settlementPrint.vue

@@ -24,7 +24,7 @@
 import { jsGetAge, uParseTime } from "@/utils/tools";
 // import LabelBox from "./printItem/LabelBox";
 import print from "print-js";
-import printOne from "./settlementTemplate/printOne"
+import printOne from "./settlementTemplate/hospitalPrintOne"
 export default {
   name: "dialysisPrintOrder",
   components: {

src/xt_pages/hospitalStation/settlementTemplate/printOne.vue

@@ -1,461 +0,0 @@
-<template>
-    <div id="prescription-print" class="print_page_main_content">
-        <div class="title">医疗保障基金结算清单</div>
-        <div style="text-align:right;">清单流水号 <div style="width:120px;" class="under_line"></div></div>
-        <div class="row">
-            <div>定点医疗机构名称<div style="width:120px;" class="under_line"></div></div>
-            <div>定点医疗机构代码<div style="width:120px;" class="under_line"></div></div>
-            <div>医保结算等级<div style="width:120px;" class="under_line"></div></div>
-        </div>
-        <div class="row">
-            <div>医保编号<div style="width:120px;" class="under_line"></div></div>
-            <div>病案号<div style="width:120px;" class="under_line"></div></div>
-            <div>申报时间
-                <div style="width:40px;" class="under_line"></div>年
-                <div style="width:40px;" class="under_line"></div>月
-                <div style="width:40px;" class="under_line"></div>日
-            </div>
-        </div>
-        <div>
-            <table class="proj_table">
-                <tbody>
-                    <tr>
-                        <td style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                            一、基本信息
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <div class="row">
-                                <div class="inline_block">姓名
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                                <div class="inline_block">性别
-                                    <label-box :isChecked="false" showValue="男"></label-box>
-                                    <label-box :isChecked="false" showValue="女"></label-box>
-                                </div>
-                                <div class="inline_block">出生日期
-                                    <div style="width:40px;" class="under_line"></div>年
-                                    <div style="width:40px;" class="under_line"></div>月
-                                    <div style="width:40px;" class="under_line"></div>日
-                                </div>
-                                <div class="inline_block">年龄
-                                    <div style="width:80px;" class="under_line"></div>岁
-                                </div>
-                                <div class="inline_block">国籍
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="inline_block">(年龄不足1周岁)年龄
-                                    <div style="width:80px;" class="under_line"></div>天
-                                </div>
-                                <div class="inline_block">民族
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                                <div class="inline_block">患者证件类别
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                                <div class="inline_block">患者证件号码
-                                    <div style="width:140px;" class="under_line"></div>
-                                </div>
-                            </div>
-                            <div>
-                                <div class="inline_block">职业
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                                <div class="inline_block" style="width:80px;"></div>
-                                <div class="inline_block">现住址
-                                    <div style="width:80px;" class="under_line"></div>省（区、市）
-                                    <div style="width:80px;" class="under_line"></div>市
-                                    <div style="width:80px;" class="under_line"></div>县
-                                    <div style="width:140px;" class="under_line"></div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="inline_block">工作单位名称
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                                <div class="inline_block">工作单位地址
-                                    <div style="width:160px;" class="under_line"></div>
-                                </div>
-                                <div class="inline_block">单位电话
-                                    <div style="width:120px;" class="under_line"></div>
-                                </div>
-                                <div class="inline_block">邮编
-                                    <div style="width:120px;" class="under_line"></div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="inline_block">联系人姓名
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                                <div class="inline_block">关系
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                                <div class="inline_block">地址
-                                    <div style="width:80px;" class="under_line"></div>省（区、市）
-                                    <div style="width:80px;" class="under_line"></div>市
-                                    <div style="width:80px;" class="under_line"></div>县
-                                    <div style="width:140px;" class="under_line"></div>
-                                </div>
-                                <div class="inline_block">电话
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div style="width:33%;">医保类型<div style="width:120px;" class="under_line"></div></div>
-                                <div style="width:33%;">特殊人员类型<div style="width:120px;" class="under_line"></div></div>
-                                <div style="width:33%;">参保地<div style="width:120px;" class="under_line"></div></div>
-                            </div>
-                            <div class="row">
-                                <div style="width:33%;">新生儿入院类型<div style="width:120px;" class="under_line"></div></div>
-                                <div style="width:33%;">新生儿出生体重<div style="width:120px;" class="under_line"></div>克</div>
-                                <div style="width:33%;">新生儿入院体重<div style="width:120px;" class="under_line"></div>克</div>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                            二、门诊慢特病诊疗信息
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <div class="row">
-                                <div class="inline_block">诊断科别
-                                    <div style="width:100px;" class="under_line"></div>
-                                </div>
-                                <div class="inline_block">就诊日期
-                                    <div style="width:100px;" class="under_line"></div>
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="padding:0;line-height:30px;height:30px;">
-                            <table class="inside_table">
-                                <tbody>
-                                    <tr>
-                                        <td style="width:25%;">诊断名称</td>
-                                        <td style="width:25%;">诊断代码</td>
-                                        <td style="width:25%;">手术及操作名称</td>
-                                        <td style="width:25%;">手术及操作代码</td>
-                                    </tr>
-                                    <tr v-for="item in 6">
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                            三、住院诊疗信息
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <div class="inline_block">住院医疗类型
-                                <label-box :isChecked="false" showValue="1.住院"></label-box>
-                                <label-box :isChecked="false" showValue="2.日间手术"></label-box>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <div>
-                                <div class="inline_block">入院途径
-                                    <label-box :isChecked="false" showValue="1.急诊"></label-box>
-                                    <label-box :isChecked="false" showValue="2.门诊"></label-box>
-                                    <label-box :isChecked="false" showValue="3.其他医疗机构转入"></label-box>
-                                    <label-box :isChecked="false" showValue="9.其他"></label-box>
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <div>
-                                <div class="inline_block">治疗类别
-                                    <label-box :isChecked="false" showValue="1.西医"></label-box>
-                                    <label-box :isChecked="false" showValue="2.中医"></label-box>
-                                    （
-                                    <label-box :isChecked="false" showValue="2.1 中医"></label-box>
-                                    <label-box :isChecked="false" showValue="2.2 民族医"></label-box>
-                                    ）
-                                    <label-box :isChecked="false" showValue="3.中西医"></label-box>
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <div class="row">
-                                <div style="width:40%" class="inline_block">入院时间
-                                    <div style="width:40px;" class="under_line"></div>年
-                                    <div style="width:40px;" class="under_line"></div>月
-                                    <div style="width:40px;" class="under_line"></div>日
-                                    <div style="width:40px;" class="under_line"></div>时
-                                </div>
-                                <div style="width:30%" class="inline_block">入院科别
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                                <div style="width:30%" class="inline_block">转科科别
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <div class="row">
-                                <div style="width:40%" class="inline_block">出院时间
-                                    <div style="width:40px;" class="under_line"></div>年
-                                    <div style="width:40px;" class="under_line"></div>月
-                                    <div style="width:40px;" class="under_line"></div>日
-                                    <div style="width:40px;" class="under_line"></div>时
-                                </div>
-                                <div style="width:30%" class="inline_block">出院科别
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                                <div style="width:30%" class="inline_block">实际住院
-                                    <div style="width:80px;" class="under_line"></div>天
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <div class="row">
-                                <div style="width:40%" class="inline_block">门（急）诊诊断（西医诊断）
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                                <div style="width:30%" class="inline_block">疾病代码
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                                <div style="width:30%" class="inline_block">
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div style="width:40%" class="inline_block">门（急）诊诊断（中医诊断）
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                                <div style="width:30%" class="inline_block">疾病代码
-                                    <div style="width:80px;" class="under_line"></div>
-                                </div>
-                                <div style="width:30%" class="inline_block">
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="padding:0;line-height:30px;height:30px;">
-                            <table class="inside_table">
-                                <tbody>
-                                    <tr>
-                                        <td style="width:20%;">出院西医诊断</td>
-                                        <td style="width:15%;">疾病代码</td>
-                                        <td style="width:15%;">入院病情</td>
-                                        <td style="width:20%;">出院中医诊断</td>
-                                        <td style="width:15%;">疾病代码</td>
-                                        <td style="width:15%;">入院病情</td>
-                                    </tr>
-                                    <tr>
-                                        <td style="text-align:left;">&nbsp;主要诊断：</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td style="text-align:left;">&nbsp;主病：</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                    </tr>
-                                    <tr>
-                                        <td style="text-align:left;">&nbsp;其他诊断：</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td style="text-align:left;">&nbsp;主证：</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                    </tr>
-                                    <tr v-for="item in 7">
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <div class="inline_block">诊断代码计数
-                                <div style="width:80px;" class="under_line"></div>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="padding:0;line-height:30px;height:30px;">
-                            <table class="inside_table">
-                                <tbody>
-                                    <tr>
-                                        <td style="width:20%;">手术及操作名称</td>
-                                        <td style="width:20%;">手术及操作代码</td>
-                                        <td style="width:10%;">手术及操作日期</td>
-                                        <td style="width:10%;">麻醉方式*</td>
-                                        <td style="width:10%;">术者医师姓名</td>
-                                        <td style="width:10%;">术者医师代码</td>
-                                        <td style="width:10%;">麻醉医师姓名</td>
-                                        <td style="width:10%;">麻醉医师代码</td>
-                                    </tr>
-                                    <tr>
-                                        <td style="text-align:left;">&nbsp;主要：</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                    </tr>
-                                    <tr>
-                                        <td style="text-align:left;">&nbsp;其他：</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                    </tr>
-                                    <tr v-for="item in 8">
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <div class="inline_block">手术及操作代码计数
-                                <div style="width:80px;" class="under_line"></div>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <div class="inline_block">呼吸机使用时间
-                                <div style="width:40px;" class="under_line"></div>天
-                                <div style="width:40px;" class="under_line"></div>小时
-                                <div style="width:40px;" class="under_line"></div>分钟
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <div>
-                                <div class="inline_block">颅脑损伤患者昏迷时间：
-                                    入院前<div style="width:40px;" class="under_line"></div>
-
-                                    天<div style="width:40px;" class="under_line"></div>
-                                    
-                                    小时<div style="width:40px;" class="under_line"></div>分钟
-                                </div>
-                            </div>
-                            <div>
-                                <div class="inline_block"><span style="visibility: hidden;">颅脑损伤患者昏迷时间：</span>
-                                    入院前<div style="width:40px;" class="under_line"></div>
-
-                                    天<div style="width:40px;" class="under_line"></div>
-                                    
-                                    小时<div style="width:40px;" class="under_line"></div>分钟
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-</template>
-
-<script>
-import LabelBox from '../../dialysis/printItem/LabelBox'
-export default {
-    components:{
-        LabelBox
-    },
-    data(){
-        return{
-
-        }
-    }
-}
-</script>
-
-
-
-<style lang="scss" scoped>
-.title{
-    text-align: center;
-    font-size: 22px;
-    font-weight: bold;
-}
-.row{
-    display: flex;
-    justify-content: space-between;
-}
-.under_line{
-    border-bottom: 1px solid #999;
-    width: 95%;
-    text-align: center;
-    margin-left: 2px;
-    display: inline-block;
-}
-.inline_block{
-    display: inline-block;
-}
-// #prescription-print{
-//     width: 960px;
-// }
-.print_page_main_content .proj_table {
-  width: 100%;
-  border: 1px solid;
-  border-collapse: collapse;
-  padding: 2px;
-}
-
-.print_page_main_content .proj_table tbody tr td {
-  border: 1px solid;
-  /* text-align: center; */
-  font-size: 16px;
-  padding: 5px 8px;
-  line-height: 30px;
-}
-
-.print_page_main_content .proj_table .inside_table {
-  width: 100%;
-  border: hidden; /* 解决边框冲突 */
-  border-collapse: collapse;
-}
-
-.print_page_main_content .proj_table .inside_table tr td {
-  border: 1px solid;
-  text-align: center;
-  font-size: 14px;
-  padding: 6px 5px;
-  line-height: 16px;
-}
-</style>

src/xt_pages/hospitalStation/statementPrint.vue

@@ -1,163 +1,278 @@
 <template>
-    <div>
-        <template>
-            <el-button
-                    style="position:fixed;right:25px;z-index:999"
-                    :loading="loading"
-                    size="small"
-                    icon="el-icon-printer"
-                    @click="printThisPage"
-                    type="primary"
-            >打印
-            </el-button
-            >
-        </template>
-
-        <div class='dialysisPage' style="padding-top:40px;">
-            <printOne :info="info"></printOne>
-            <!-- <printTwo  :info="info" v-if="org_id == 9990"></printTwo> -->
-        </div>
+  <div>
+    <template>
+      <el-button
+          style="position:fixed;right:25px;z-index:999"
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+      >打印
+      </el-button
+      >
+    </template>
+
+    <div class='dialysisPage' style="padding-top:40px;" v-if="this.$store.getters.xt_user.org_id == 10215">
+      <private-charge-print :info="info" v-if="this.paramsObj.balance_accounts_type == 2"></private-charge-print>
+      <printOne :info="info" v-else></printOne>
+    </div>
+    <div class='dialysisPage' style="padding-top:40px;" v-if="this.$store.getters.xt_user.org_id == 10265">
+<!--      <private-charge-print :info="info" v-if="this.paramsObj.balance_accounts_type == 2"></private-charge-print>-->
+<!--      <printOne :info="info" v-else></printOne>-->
+<!--      <print-one :info="info" ></print-one>-->
+      <hospital-settle-print :info="info"></hospital-settle-print>
     </div>
-</template>
 
-<script>
+<!--    <div class='dialysisPage' style="padding-top:40px;" v-else>-->
+<!--      <private-charge-print :info="info" v-if="this.paramsObj.balance_accounts_type == 2"></private-charge-print>-->
+<!--      <printOne :info="info" v-else></printOne>-->
+<!--    </div>-->
 
+  </div>
+</template>
 
-  import { parseTime } from '@/utils'
-  import { getDialysisRecord } from '@/api/dialysis'
-  import { getDataConfig } from '@/utils/data'
-  import { jsGetAge, uParseTime } from '@/utils/tools'
-  import axios from 'axios'
+<script>
 
-  import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import printOne from './statementTemplate/printOne'
-  import printTwo from './statementTemplate/printTwo'
-  import { getAllDoctorList, getAllHisPatientList, getPrescriptionPrint } from '@/api/project/project'
 
-  export default {
-    name: 'dialysisPrintOrder',
-    components: {
-      BreadCrumb,
-      printOne,
-      printTwo
+import { uParseTime } from '@/utils/tools'
+import axios from 'axios'
+import { getPrivateExpensesOrder } from '@/api/his/his'
+
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import printOne from './statementTemplate/printOne'
+// import printOne from './settlementTemplate/hospitalPrintOne'
+import printTwo from './statementTemplate/printTwo'
+import { getAllDoctorList, getAllHisPatientList } from '@/api/project/project'
+import PrivateChargePrint from '../outpatientCharges/statementTemplate/privateChargePrint'
+import HospitalSettlePrint from './settlementTemplate/hospitalSettlePrint'
+
+export default {
+  name: 'dialysisPrintOrder',
+  components: {
+    HospitalSettlePrint,
+    PrivateChargePrint,
+    BreadCrumb,
+    printOne,
+    printTwo
+  },
+  props: {
+    paramsObj: Object
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: '门诊医生站' },
+        { path: false, name: '打印' }
+      ],
+      record_date: '',
+      patientTableData: [],
+      advicePrint: [],
+      hisPatient: {},
+      patient: {},
+      search_input: '',
+      loading: false,
+      patient_id: 0,
+      prescription_id: 0,
+      ids: '',
+      info: null,
+      org_id: ''
+    }
+  },
+  methods: {
+    printThisPage() {
+      var ptime = Math.round(new Date().getTime() / 1000)
+      this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+
+      const style =
+          '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}'
+      printJS({
+        printable: 'statement-print',
+        type: 'html',
+        style: style,
+        scanStyles: false
+      })
+
+      // if (this.org_template_info.template_id == 1) {
+      //   printJS({
+      //     printable: "dialysis-print-box",
+      //     type: "html",
+      //     style: style,
+      //     scanStyles: false
+      //   });
+      // }
     },
-    props: {
-      paramsObj: Object
+    getAllDoctorList() {
+      getAllDoctorList().then(response => {
+        if (response.data.state == 1) {
+          var doctor = response.data.data.doctor
+
+          this.doctorList = doctor
+        }
+      })
     },
-    data() {
-      return {
-        crumbs: [
-          { path: false, name: '门诊医生站' },
-          { path: false, name: '打印' }
-        ],
-        record_date: '',
-        patientTableData: [],
-        advicePrint: [],
-        hisPatient: {},
-        patient: {},
-        search_input: '',
-        loading: false,
-        patient_id: 0,
-        prescription_id: 0,
-        ids: '',
-        info: null,
-        org_id: ''
+    getAllHisPatientList() {
+      const params = {
+        record_date: this.record_date
       }
+      getAllHisPatientList(params).then(response => {
+        if (response.data.state == 1) {
+          this.patientTableData = response.data.data.list
+          this.patientTableDataTwo = response.data.data.list
+
+          console.log('222', this.patientTableData)
+          let cal_one = 0
+          let cal_two = 0
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            if (response.data.data.list[i].prescription == null || response.data.data.list[i].prescription.length == 0) {
+              cal_one = cal_one + 1
+            }
+            if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+              cal_two = cal_two + 1
+            }
+          }
+          // this.$refs.tab.setCurrentRow(this.patientTableData[0])
+          // console.log(this.patientTableData[0])
+          // this.choosePatient(this.patientTableData[0])
+          this.cal_one = cal_one
+          this.cal_two = cal_two
+        }
+      })
     },
-    methods: {
-      printThisPage() {
-        var ptime = Math.round(new Date().getTime() / 1000)
-        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
 
-        const style =
-          '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}'
-        printJS({
-          printable: 'statement-print',
-          type: 'html',
-          style: style,
-          scanStyles: false
-        })
-
-        // if (this.org_template_info.template_id == 1) {
-        //   printJS({
-        //     printable: "dialysis-print-box",
-        //     type: "html",
-        //     style: style,
-        //     scanStyles: false
-        //   });
-        // }
-      },
-      getAllDoctorList() {
-        getAllDoctorList().then(response => {
-          if (response.data.state == 1) {
-            var doctor = response.data.data.doctor
+    changePatient(row) {
+      console.log('row', row)
+      this.patient_id = row.patient_id
+      this.record_date = this.record_date
+      this.prescription_id = this.prescription_id
+      //   var params = {
+      //     patient_id:row.patient_id,
+      //     record_date:this.record_date,
+      //     prescription_id:this.prescription_id,
+      //   }
+      // getPrescriptionPrint(params).then(response=>{
+      //     if(response.data.state == 1){
+      //       var advicePrint =  response.data.data.advicePrint
+      //       console.log("adviceprint",advicePrint)
+      //       this.advicePrint = advicePrint
+      //       // var hisPatient =  response.data.data.hisPatient
+      //       // console.log("hispatient",hisPatient)
+      //       // this.hisPatient = hisPatient
+      //       var patient =  response.data.data.patient
+      //       console.log("patient",patient)
+      //       this.patient = patient
+      //       var doctorPorject = response.data.data.doctorPorject
+      //       console.log("doctorporject",doctorPorject)
+      //     }
+      // })
+    },
+    searchAction() {
 
-            this.doctorList = doctor
-          }
-        })
-      },
-      getAllHisPatientList() {
-        const params = {
-          record_date: this.record_date
+    },
+    getInfo(order_id, balance_accounts_type) {
+      console.log(balance_accounts_type)
+
+      var that = this
+      if (balance_accounts_type == 2) {
+        let params = {
+          id: order_id,
+          order_id: order_id,
+          admin_user_id: this.$store.getters.xt_user.user.id
         }
-        getAllHisPatientList(params).then(response => {
-          if (response.data.state == 1) {
-            this.patientTableData = response.data.data.list
-            this.patientTableDataTwo = response.data.data.list
-
-            console.log('222', this.patientTableData)
-            let cal_one = 0
-            let cal_two = 0
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              if (response.data.data.list[i].prescription == null || response.data.data.list[i].prescription.length == 0) {
-                cal_one = cal_one + 1
-              }
-              if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
-                cal_two = cal_two + 1
-              }
-            }
-            // this.$refs.tab.setCurrentRow(this.patientTableData[0])
-            // console.log(this.patientTableData[0])
-            // this.choosePatient(this.patientTableData[0])
-            this.cal_one = cal_one
-            this.cal_two = cal_two
+        getPrivateExpensesOrder(params).then((response) => {
+          if (response.data.state == 0) {
+            // this.$message.error(response.data.msg)
+
+            return false
+          } else {
+            var that = this
+            that.info = response.data.data.info
+            that.p_admin = response.data.data.printor_admin
+            that.charge_admin = response.data.data.charge_admin
+
+            that.info['p_admin'] = that.p_admin
+            that.info['charge_admin'] = that.charge_admin
+            that.info['order_number'] = response.data.data.order_number
+            that.info['patient'] = response.data.data.patient
+            that.info['date'] = response.data.data.date
+            that.info['number'] = response.data.data.number
+            that.info['order_infos'] = response.data.data.order_infos
+            that.info['diagnosis'] = response.data.data.diagnosis
+            that.info['fixmedins_name'] = response.data.data.org_name
+            that.info['fixmedins_code'] = response.data.data.org_code
+            that.info['his'] = response.data.data.his_hospital
+
+            // that.info["doctor_code"] = response.data.data.doctor_code;
+            // that.info["department"] = response.data.data.department;
+            // that.info["health_card_no"] = response.data.data.health_card_no;
+
+            that.info['bed_cost_total'] = response.data.data.bedCostTotal
+            that.info['bed_cost_self_total'] =
+                response.data.data.bedCostSelfTotal
+            that.info['bed_cost_part_self_total'] =
+                response.data.data.bedCostPartSelfTotal
+
+            that.info['operation_cost_total'] =
+                response.data.data.operationCostTotal
+            that.info['operation_cost_self_total'] =
+                response.data.data.operationCostSelfTotal
+            that.info['operation_cost_part_self_total'] =
+                response.data.data.operationCostPartSelfTotal
+
+            that.info['other_cost_total'] = response.data.data.otherCostTotal
+            that.info['other_cost_self_total'] =
+                response.data.data.otherCostSelfTotal
+            that.info['other_cost_part_self_total'] =
+                response.data.data.otherCostPartSelfTotal
+
+            that.info['material_cost_total'] =
+                response.data.data.materialCostTotal
+            that.info['material_cost_self_total'] =
+                response.data.data.materialCostSelfTotal
+            that.info['material_cost_part_self_total'] =
+                response.data.data.materialCostPartSelfTotal
+
+            that.info['western_medicine_cost_total'] =
+                response.data.data.westernMedicineCostTotal
+            that.info['western_medicine_cost_self_total'] =
+                response.data.data.westernMedicineCostSelfTotal
+            that.info['western_medicine_cost_part_self_total'] =
+                response.data.data.westernMedicineCostPartSelfTotal
+
+            that.info['chinese_traditional_medicine_cost_total'] =
+                response.data.data.chineseTraditionalMedicineCostTotal
+            that.info['chinese_traditional_medicine_cost_self_total'] =
+                response.data.data.chineseTraditionalMedicineCostSelfTotal
+            that.info['chinese_traditional_medicine_cost_part_self_total'] =
+                response.data.data.chineseTraditionalMedicineCostPartSelfTotal
+
+            that.info['check_cost_total'] = response.data.data.checkCostTotal
+            that.info['check_cost_self_total'] =
+                response.data.data.checkCostSelfTotal
+            that.info['check_cost_part_self_total'] =
+                response.data.data.checkCostPartSelfTotal
+
+            that.info['laboratory_cost_total'] =
+                response.data.data.laboratoryCostTotal
+            that.info['laboratory_cost_self_total'] =
+                response.data.data.laboratoryCostSelfTotal
+            that.info['laboratory_cost_part_self_total'] =
+                response.data.data.laboratoryCostPartSelfTotal
+
+            that.info['treat_cost_total'] = response.data.data.treatCostTotal
+            that.info['treat_cost_self_total'] =
+                response.data.data.treatCostSelfTotal
+            that.info['treat_cost_part_self_total'] =
+                response.data.data.treatCostPartSelfTotal
+            that.info['date'] = response.data.data.date
+            // that.info["number"] = response.data.data.number;
+            that.info['order_infos'] = response.data.data.order_infos
+            that.info['diagnosis'] = response.data.data.diagnosis
+
           }
         })
-      },
-
-      changePatient(row) {
-        console.log('row', row)
-        this.patient_id = row.patient_id
-        this.record_date = this.record_date
-        this.prescription_id = this.prescription_id
-        //   var params = {
-        //     patient_id:row.patient_id,
-        //     record_date:this.record_date,
-        //     prescription_id:this.prescription_id,
-        //   }
-        // getPrescriptionPrint(params).then(response=>{
-        //     if(response.data.state == 1){
-        //       var advicePrint =  response.data.data.advicePrint
-        //       console.log("adviceprint",advicePrint)
-        //       this.advicePrint = advicePrint
-        //       // var hisPatient =  response.data.data.hisPatient
-        //       // console.log("hispatient",hisPatient)
-        //       // this.hisPatient = hisPatient
-        //       var patient =  response.data.data.patient
-        //       console.log("patient",patient)
-        //       this.patient = patient
-        //       var doctorPorject = response.data.data.doctorPorject
-        //       console.log("doctorporject",doctorPorject)
-        //     }
-        // })
-      },
-      searchAction() {
-
-      },
-      getInfo(order_id) {
-
-        var that = this
 
+      } else {
         axios.get('http://127.0.0.1:9532/api/settle/query', {
           params: {
             order_id: order_id,
@@ -165,281 +280,279 @@
 
           }
         })
-          .then(function(response) {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
-            } else {
-              console.log('logloglog')
-
-              console.log(response.data.data.info)
-              that.info = response.data.data.info
-              console.log(that.info)
-
-              that.p_admin = response.data.data.printor_admin
-              that.charge_admin = response.data.data.charge_admin
-              that.order_infos = response.data.data
-
-              that.info['p_admin'] = that.p_admin
-              that.info['charge_admin'] = that.charge_admin
-
-              that.info['date'] = response.data.data.date
-              that.info['number'] = response.data.data.number
-              that.info['order_infos'] = response.data.data.order_infos
-              that.info['diagnosis'] = response.data.data.diagnosis
-
-              that.info['bed_cost_total'] = response.data.data.bedCostTotal
-              that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal
-              that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal
-
-              that.info['operation_cost_total'] = response.data.data.operationCostTotal
-              that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal
-              that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal
-
-              that.info['other_cost_total'] = response.data.data.otherCostTotal
-              that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal
-              that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal
-
-              that.info['material_cost_total'] = response.data.data.materialCostTotal
-              that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal
-              that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal
-
-              that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal
-              that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal
-              that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal
-
-              that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal
-              that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal
-              that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal
-
-              that.info['check_cost_total'] = response.data.data.checkCostTotal
-              that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal
-              that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal
-
-              that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal
-              that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal
-              that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal
-
-              that.info['treat_cost_total'] = response.data.data.treatCostTotal
-              that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal
-              that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal
-              that.info['date'] = response.data.data.date
-              that.info['number'] = response.data.data.number
-              that.info['order_infos'] = response.data.data.order_infos
-              that.info['diagnosis'] = response.data.data.diagnosis
-
-            }
-          })
-          .catch(function(error) {
-
-          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                console.log('logloglog')
+
+                console.log(response.data.data.info)
+                that.info = response.data.data.info
+                console.log(that.info)
+
+                that.p_admin = response.data.data.printor_admin
+                that.charge_admin = response.data.data.charge_admin
+                that.order_infos = response.data.data
+
+                that.info['p_admin'] = that.p_admin
+                that.info['charge_admin'] = that.charge_admin
+
+                that.info['date'] = response.data.data.date
+                that.info['number'] = response.data.data.number
+                that.info['order_infos'] = response.data.data.order_infos
+                that.info['diagnosis'] = response.data.data.diagnosis
+
+                that.info['bed_cost_total'] = response.data.data.bedCostTotal
+                that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal
+                that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal
+
+                that.info['operation_cost_total'] = response.data.data.operationCostTotal
+                that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal
+                that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal
+
+                that.info['other_cost_total'] = response.data.data.otherCostTotal
+                that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal
+                that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal
+
+                that.info['material_cost_total'] = response.data.data.materialCostTotal
+                that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal
+                that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal
+
+                that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal
+                that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal
+                that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal
+
+                that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal
+                that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal
+                that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal
+
+                that.info['check_cost_total'] = response.data.data.checkCostTotal
+                that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal
+                that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal
+
+                that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal
+                that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal
+                that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal
+
+                that.info['treat_cost_total'] = response.data.data.treatCostTotal
+                that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal
+                that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal
+                that.info['date'] = response.data.data.date
+                that.info['number'] = response.data.data.number
+                that.info['order_infos'] = response.data.data.order_infos
+                that.info['diagnosis'] = response.data.data.diagnosis
+              }
+            })
+            .catch(function(error) {
+            })
       }
+    }
+  },
 
-    },
+  created() {
+    this.getInfo(this.paramsObj.order_id, this.paramsObj.balance_accounts_type)
+    this.org_id = this.$store.getters.xt_user.org_id
+  },
+  watch: {
+    paramsObj: {//深度监听，可监听到对象、数组的变化
+      handler(val, oldVal) {
+        this.paramsObj = val
+        this.getInfo(this.paramsObj.order_id, this.paramsObj.balance_accounts_type)
 
-    created() {
-      this.getInfo(this.paramsObj.order_id)
-      this.org_id = this.$store.getters.xt_user.org_id
-    },
-    watch: {
-      paramsObj: {//深度监听，可监听到对象、数组的变化
-        handler(val, oldVal) {
-          this.paramsObj = val
-          this.getInfo(this.paramsObj.order_id)
-
-        },
-        deep: true
-      }
+      },
+      deep: true
     }
-
   }
+
+}
 </script>
 
 <style>
-    .dialysis-print-order {
-        width: 960px;
-        margin: 0 auto;
-    }
-
-    .dialysis-print-order .order-yy-name {
-        margin: auto;
-        text-align: center;
-        font-size: 20px;
-        letter-spacing: 5px;
-    }
-
-    .dialysis-print-order .order-title {
-        margin: auto;
-        font-weight: 600;
-        text-align: center;
-        font-size: 22px;
-        padding: 10px;
-    }
-
-    .dialysis-print-order .table-box {
-        width: 100%;
-        line-height: 23px;
-        font-size: 14px;
-    }
-
-    .dialysis-print-order .print-table {
-        width: 100%;
-        text-align: center;
-        border-collapse: collapse;
-        line-height: 40px;
-        font-size: 14px;
-        border-color: #000;
-    }
-
-    .dialysis-print-order .print-table-no {
-        width: 100%;
-        text-align: center;
-        border-collapse: collapse;
-        font-size: 14px;
-    }
-
-    .dialysis-print-order .under-line {
-        border-bottom: 1px solid #999;
-        width: 95%;
-        text-align: center;
-        margin-left: 2px;
-    }
-
-    .dialysis-print-order .title-box {
-        text-align: center;
-        font-size: 16px;
-    }
-
-    .dialysis-print-order .radio-lebel-box {
-        font-weight: 400;
-        cursor: pointer;
-    }
-
-    .dialysis-print-order .radio-no {
-        opacity: 0;
-        outline: none;
-        position: absolute;
-        margin: 0;
-        width: 0;
-        height: 0;
-        z-index: -1;
-    }
-
-    .dialysis-print-order .radio-inner {
-        white-space: nowrap;
-        cursor: pointer;
-        outline: none;
-        display: inline-block;
-        line-height: 1;
-        position: relative;
-        vertical-align: middle;
-    }
-
-    .dialysis-print-order .radio-fang {
-        display: inline-block;
-        position: relative;
-        border: 1px solid #000;
-        box-sizing: border-box;
-        width: 14px;
-        height: 14px;
-        background-color: #fff;
-        z-index: 1;
-        transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
-        background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
-    }
-
-    .dialysis-print-order .is-checked-radio::after {
-        content: "√";
-        font-size: 15px;
-    }
-
-    .dialysis-print-order .print-table-no tr td {
-        padding: 8px 5px;
-        line-height: 25px;
-    }
-
-    .dialysis-print-order .print-table tr td {
-        padding: 1px 1px;
-        /*line-height: 25px;*/
-    }
-
-    .es-img {
-        height: 30px;
-    }
-
-    .advice-name {
-        text-align: left;
-    }
-
-    .advice-children {
-        display: flex;
-    }
-
-    .title-box-pro {
-        border: 0 #fff;
-        line-height: 25px;
-        height: 25px;
-        text-align: left;
-        padding-left: 10px !important;
-    }
-
-    .title-box-pro-tr {
-        border: 0 #fff;
-    }
-
-    .text-align-left {
-        text-align: left !important;
-        padding-left: 10px !important;
-        font-size: 14px !important;
-        line-height: 25px;
-    }
-
-    .print-table-tr-new td {
-        line-height: 20px !important;
-    }
-
-    .border-top-solid {
-        border: solid 1px #000;
-    }
-
-    .print-template-two tr {
-        line-height: 30px;
-    }
-
-    .table-box1 {
-        border: 1px solid #000;
-        width: 100%;
-        line-height: 30px;
-        font-size: 14px;
-        border-collapse: collapse;
-    }
-
-    .table-box1 tr {
-        border-bottom: 1px solid #000;
-    }
+.dialysis-print-order {
+  width: 960px;
+  margin: 0 auto;
+}
+
+.dialysis-print-order .order-yy-name {
+  margin: auto;
+  text-align: center;
+  font-size: 20px;
+  letter-spacing: 5px;
+}
+
+.dialysis-print-order .order-title {
+  margin: auto;
+  font-weight: 600;
+  text-align: center;
+  font-size: 22px;
+  padding: 10px;
+}
+
+.dialysis-print-order .table-box {
+  width: 100%;
+  line-height: 23px;
+  font-size: 14px;
+}
+
+.dialysis-print-order .print-table {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+  border-color: #000;
+}
+
+.dialysis-print-order .print-table-no {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  font-size: 14px;
+}
+
+.dialysis-print-order .under-line {
+  border-bottom: 1px solid #999;
+  width: 95%;
+  text-align: center;
+  margin-left: 2px;
+}
+
+.dialysis-print-order .title-box {
+  text-align: center;
+  font-size: 16px;
+}
+
+.dialysis-print-order .radio-lebel-box {
+  font-weight: 400;
+  cursor: pointer;
+}
+
+.dialysis-print-order .radio-no {
+  opacity: 0;
+  outline: none;
+  position: absolute;
+  margin: 0;
+  width: 0;
+  height: 0;
+  z-index: -1;
+}
+
+.dialysis-print-order .radio-inner {
+  white-space: nowrap;
+  cursor: pointer;
+  outline: none;
+  display: inline-block;
+  line-height: 1;
+  position: relative;
+  vertical-align: middle;
+}
+
+.dialysis-print-order .radio-fang {
+  display: inline-block;
+  position: relative;
+  border: 1px solid #000;
+  box-sizing: border-box;
+  width: 14px;
+  height: 14px;
+  background-color: #fff;
+  z-index: 1;
+  transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
+  background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+}
+
+.dialysis-print-order .is-checked-radio::after {
+  content: "√";
+  font-size: 15px;
+}
+
+.dialysis-print-order .print-table-no tr td {
+  padding: 8px 5px;
+  line-height: 25px;
+}
+
+.dialysis-print-order .print-table tr td {
+  padding: 1px 1px;
+  /*line-height: 25px;*/
+}
+
+.es-img {
+  height: 30px;
+}
+
+.advice-name {
+  text-align: left;
+}
+
+.advice-children {
+  display: flex;
+}
+
+.title-box-pro {
+  border: 0 #fff;
+  line-height: 25px;
+  height: 25px;
+  text-align: left;
+  padding-left: 10px !important;
+}
+
+.title-box-pro-tr {
+  border: 0 #fff;
+}
+
+.text-align-left {
+  text-align: left !important;
+  padding-left: 10px !important;
+  font-size: 14px !important;
+  line-height: 25px;
+}
+
+.print-table-tr-new td {
+  line-height: 20px !important;
+}
+
+.border-top-solid {
+  border: solid 1px #000;
+}
+
+.print-template-two tr {
+  line-height: 30px;
+}
+
+.table-box1 {
+  border: 1px solid #000;
+  width: 100%;
+  line-height: 30px;
+  font-size: 14px;
+  border-collapse: collapse;
+}
+
+.table-box1 tr {
+  border-bottom: 1px solid #000;
+}
 </style>
 
 <style lang="scss">
 
-    .newContainer {
+.newContainer {
 
-    .dialysisPage::-webkit-scrollbar {
-        height: 15px;
-    }
+.dialysisPage::-webkit-scrollbar {
+  height: 15px;
+}
 
-    .el-date-editor {
+.el-date-editor {
 
-    .el-input__inner {
-        padding-right: 0px;
-    }
+.el-input__inner {
+  padding-right: 0px;
+}
 
-    }
-    .el-table td, .el-table th {
-        text-align: center;
-    }
+}
+.el-table td, .el-table th {
+  text-align: center;
+}
 
-    }
-    .newContainer::-webkit-scrollbar {
-        height: 15px !important;
-    }
+}
+.newContainer::-webkit-scrollbar {
+  height: 15px !important;
+}
 </style>

src/xt_pages/hospitalStation/summary.vue

@@ -627,6 +627,7 @@
         }
       },
       toPrint(row) {
+        console.log(row)
         if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || (row.order_status == 2 && this.$store.getters.xt_user.org_id == 10138) || (row.order_status == 2 && this.$store.getters.xt_user.org_id == 10278)) {
           this.statementVisible9504 = true
           let obj = {
@@ -641,11 +642,14 @@
           this.statementVisible = true
           let obj = {
             order_id: row.id,
-            settle_type: row.settle_type,
+            balance_accounts_type: row.his_hospital_patient.balance_accounts_type,
             start_time: row.settle_start_time,
             end_time: row.settle_end_time
           }
+          console.log(obj)
           this.orderObj = obj
+          console.log(this.orderObj)
+
         }
 
       },

src/xt_pages/hospitalStation/template/printOne.vue

@@ -270,9 +270,7 @@ export default {
               );
             }
           }
-          console.log("处方222222", this.prescriptions);
-          var hisPatient = response.data.data.hisHospitalRecord;
-          this.hisPatient = hisPatient;
+          this.hisPatient = response.data.data.hisHospitalRecord;
           var projectlist = response.data.data.projectlist;
           console.log("所有项目列表", projectlist);
           this.projectList = projectlist;
@@ -402,6 +400,7 @@ export default {
     ids: function (val) {
       this.ids = val;
       this.getPrescriptionPrint();
+      this.getHisPatientDetail();
     },
   },
 };

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -663,6 +663,14 @@
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
                 that.form.id_card = patient.id_card_no
+              } else {
+                that.form.id = patient.id
+                that.form.name = patient.name
+                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.id_card = patient.id_card_no
               }
               that.$message({ message: '读卡成功', type: 'success' })
             }

src/xt_pages/outpatientCharges/costComparison.vue

@@ -761,8 +761,8 @@ c<template>
               }
 
               import('@/vendor/Export2Excel').then(excel => {
-                const tHeader = ['序号', '姓名','个人编te号', '门诊号', '挂号日期', '诊断','挂号科室','门诊费用','医保支付','自费', '起付线I', '起付线II','超封顶线费用','合计','统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
-                const filterVal = ['序号', '姓名','个人编号', '门诊号', '挂号日期','诊断','挂号科室','门诊费用','医保支付','自费', '起付线I', '起付线II','超封顶线费用','合计','统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
+                const tHeader = ['序号', '姓名','个人编号', '门诊号', '挂号日期', '诊断','挂号科室','门诊费用','医保支付','自费', '起付线I', '按比例自付II','超封顶线费用','合计','基本统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
+                const filterVal = ['序号', '姓名','个人编号', '门诊号', '挂号日期','诊断','挂号科室','门诊费用','医保支付','自费', '起付线I', '按比例自付II','超封顶线费用','合计','基本统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
                 // const filterVal = [ '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
                 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']
 

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -20,7 +20,6 @@
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4" :paramsObj="invoiceParams"></printFour>
           <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive>
-
           <printSix v-if="org_id == 10217|| org_id == 0" :paramsObj="invoiceParams"></printSix>
         </div>
     </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue

@@ -1,12 +1,12 @@
 <template>
     <div id='invoice-print'>
         <div v-for='(i,index) in pageArr.length' :key="index">
-            <div :style="{position: 'absolute',top:(10 + (index * 400))  + 'px',left:130+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
-            <div :style="{position: 'absolute',top:(40 + (index * 400))  + 'px',left:90+ 'px',}">{{ list.order_number }}</div>
+            <div :style="{position: 'absolute',top:(20 + (index * 400))  + 'px',left:200+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
+            <div :style="{position: 'absolute',top:(80 + (index * 400))  + 'px',left:150+ 'px',}">{{ list.order_number }}</div>
             <div style="display:flex;justify-content: space-between;">
-                <div :style="{position: 'absolute',top:(70 + (index * 400))  + 'px',left:80+ 'px',}">{{ paramsObj.name }}</div>
+                <div :style="{position: 'absolute',top:(130 + (index * 400))  + 'px',left:80+ 'px',}">{{ paramsObj.name }}</div>
             </div>
-            <div :style="{position: 'absolute',top:(130 + (index * 400))  + 'px',left:80+ 'px',}">
+            <div :style="{position: 'absolute',top:(190 + (index * 400))  + 'px',left:80+ 'px',}">
                 <div v-if="list.westernMedicineCostTotal">西药 {{ list.westernMedicineCostTotal }}</div>
                 <div v-if="list.treatCostTotal">治疗费 {{ list.treatCostTotal }}</div>
                 <div v-if="list.bedCostTotal">床位费 {{ list.bedCostTotal }}</div>
@@ -16,7 +16,7 @@
                 <div v-if="list.otherCostTotal">其他费 {{ list.otherCostTotal }}</div>
                 <div v-if="list.materialCostTotal">材料费 {{ list.materialCostTotal }}</div>
             </div>
-            <div :style="{position: 'absolute',top:(130 + (index * 400))  + 'px',left:260+ 'px'}">
+            <div :style="{position: 'absolute',top:(190 + (index * 400))  + 'px',left:260+ 'px'}">
                 <div v-for="item in list.order_info.slice(index * 10,(index * 10) + pageArr[index])">
                     <span style="display:inline-block;width:200px;">
                         <span v-if="item.advice.id == 0">
@@ -41,9 +41,9 @@
                     </span>
                 </div>
             </div>
-            <div :style="{position: 'absolute',top:(345 + (index * 400))  + 'px',left:110+ 'px'}">{{ zhongwen }}</div>
-            <div :style="{position: 'absolute',top:(345 + (index * 400))  + 'px',left:460+ 'px'}">{{ list.medfee_sumamt }}</div>
-            <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(360 + (index * 400))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
+            <div :style="{position: 'absolute',top:(390 + (index * 400))  + 'px',left:110+ 'px'}">{{ zhongwen }}</div>
+            <div :style="{position: 'absolute',top:(390 + (index * 400))  + 'px',left:460+ 'px'}">{{ list.medfee_sumamt }}</div>
+            <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(420 + (index * 400))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
                 <div style="display:flex;">
                   <div style="width:140px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
                   <div style="width:140px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
@@ -70,15 +70,15 @@
 
             </div>
             <div>
-                <div :style="{position: 'absolute',top:(420 + (index * 400))  + 'px',left:100+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
-                <div :style="{position: 'absolute',top:(420 + (index * 400))  + 'px',left:360+ 'px'}">{{ paramsObj.chargeName }}</div>
-                <div :style="{position: 'absolute',top:(420 + (index * 400))  + 'px',left:520+ 'px'}">
+                <div :style="{position: 'absolute',top:(500 + (index * 400))  + 'px',left:100+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
+                <div :style="{position: 'absolute',top:(500 + (index * 400))  + 'px',left:360+ 'px'}">{{ paramsObj.chargeName }}</div>
+                <div :style="{position: 'absolute',top:(500 + (index * 400))  + 'px',left:520+ 'px'}">
                     <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
                 </div>
-                <div :style="{position: 'absolute',top:(420 + (index * 400))  + 'px',left:560+ 'px'}">
+                <div :style="{position: 'absolute',top:(500 + (index * 400))  + 'px',left:560+ 'px'}">
                     <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
                 </div>
-                <div :style="{position: 'absolute',top:(420 + (index * 400))  + 'px',left:600+ 'px'}">
+                <div :style="{position: 'absolute',top:(500 + (index * 400))  + 'px',left:600+ 'px'}">
                     <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
                 </div>
             </div>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -151,7 +151,7 @@
                             <div style="margin-bottom:10px;float: right">
                               <div>
                                 <el-button
-                                    v-if="(hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0)"
+                                    v-if="(hisPatientInfo.id_card_type != 3 && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0)"
                                     size="small"
                                     @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
                                     type="primary"

src/xt_pages/outpatientCharges/settlementTemplate/printOne.vue

@@ -24,7 +24,7 @@
         </div>
         <div class="row">
             <div>医保编号<div style="width:120px;" class="under_line">{{ info.psn_no }}</div></div>
-            <div>病案号<div style="width:120px;" class="under_line">{{ info.certno ? info.certno.substring(info.certno.length-6) : '' }}</div></div>
+            <div>病案号<div style="width:120px;" class="under_line">{{ info.psn_no ? info.psn_no : '' }}</div></div>
             <div>申报时间
                 <div style="width:40px;" class="under_line">{{ info.setl_time ? info.setl_time.split(' ')[0].slice(0,4) : '' }}</div>年
                 <div style="width:40px;" class="under_line">{{ info.setl_time ? info.setl_time.split(' ')[0].slice(5,7) : '' }}</div>月
@@ -63,10 +63,10 @@
                             </div>
                             <div class="row">
                                 <div class="inline_block">(年龄不足1周岁)年龄
-                                    <div style="width:80px;" class="under_line"></div>天
+                                    <div style="width:80px;" class="under_line">{{info.age}}</div>天
                                 </div>
                                 <div class="inline_block">民族
-                                    <div style="width:80px;" class="under_line"></div>
+                                    <div style="width:80px;" class="under_line">{{getNaty(info.naty)}}</div>
                                 </div>
                                 <div class="inline_block">患者证件类别
                                     <div style="width:80px;" class="under_line">身份证</div>
@@ -115,13 +115,14 @@
                                     <div style="width:140px;" class="under_line"></div>
                                 </div>
                                 <div class="inline_block">电话
-                                    <div style="width:80px;" class="under_line"></div>
+                                    <div style="width:80px;" class="under_line">{{info.patinet.phone}}</div>
                                 </div>
                             </div>
                             <div class="row">
-                                <div style="width:33%;">医保类型<div style="width:120px;" class="under_line"></div></div>
-                                <div style="width:33%;">特殊人员类型<div style="width:120px;" class="under_line"></div></div>
-                                <div style="width:33%;">参保地<div style="width:120px;" class="under_line"></div></div>
+                              <div v-if="info.insutype == '310'" style="width:33%;">医保类型<div style="width:120px;" class="under_line">职工基本医疗保险</div></div>
+                              <div v-if="info.insutype == '390'"  style="width:33%;">医保类型<div style="width:120px;" class="under_line">城乡居民基本医疗保险</div></div>
+                              <div  style="width:33%;">特殊人员类型<div style="width:120px;" class="under_line"></div></div>
+                              <div style="width:33%;">参保地<div style="width:120px;" class="under_line"></div></div>
                             </div>
                             <div class="row">
                                 <div style="width:33%;">新生儿入院类型<div style="width:120px;" class="under_line"></div></div>
@@ -391,7 +392,7 @@
                                     入院前<div style="width:40px;" class="under_line"></div>
 
                                     天<div style="width:40px;" class="under_line"></div>
-                                    
+
                                     小时<div style="width:40px;" class="under_line"></div>分钟
                                 </div>
                             </div>
@@ -400,7 +401,7 @@
                                     入院前<div style="width:40px;" class="under_line"></div>
 
                                     天<div style="width:40px;" class="under_line"></div>
-                                    
+
                                     小时<div style="width:40px;" class="under_line"></div>分钟
                                 </div>
                             </div>
@@ -470,7 +471,7 @@
                                 <div style="width:80px;" class="under_line"></div>
                             </div>
                             <div>
-                                <label-box :isChecked="false" showValue="3.转社区，转卫生院机构，拟接收机构名称"></label-box> 
+                                <label-box :isChecked="false" showValue="3.转社区，转卫生院机构，拟接收机构名称"></label-box>
                                 <div style="width:80px;" class="under_line"></div>
                                 拟接收机构代码
                                 <div style="width:80px;" class="under_line"></div>
@@ -729,7 +730,7 @@
                                                 <td>......</td>
                                                 <td>&nbsp;</td>
                                             </tr>
-                                            
+
                                         </tbody>
                                     </table>
                                 </div>
@@ -753,7 +754,7 @@
                                                 <td style="width:36%">个人现金支付</td>
                                                 <td>&nbsp;</td>
                                             </tr>
-                                            
+
                                         </tbody>
                                     </table>
                                 </div>
@@ -830,6 +831,213 @@ export default {
         }
     },
     methods:{
+      getNaty(naty){
+        switch (naty){
+          case "1":
+            return "汉族"
+            break
+          case "2":
+            return "蒙古族"
+
+            break
+          case "3":
+            return "回族"
+
+
+            break
+          case "4":
+            return "藏族"
+
+
+            break
+          case "5":
+            return "维吾尔族"
+
+            break
+          case "6":
+            return "苗族"
+
+            break
+          case "7":
+            return "彝族"
+
+            break
+          case "8":
+            return "壮族"
+
+            break
+          case "9":
+            return "布依族"
+
+            break
+          case "10":
+            return "朝鲜族"
+
+            break
+          case "11":
+            return "满族"
+
+            break
+          case "12":
+            return "侗族"
+
+            break
+          case "13":
+            return "瑶族"
+
+            break
+          case "14":
+            return "白族"
+
+            break
+          case "15":
+            return "土家族"
+
+            break
+          case "16":
+            return "哈尼族"
+            break
+          case "17":
+            return "哈萨克族"
+            break
+          case "18":
+            return "傣族"
+            break
+          case "19":
+            return "黎族"
+            break
+          case "20":
+            return "傈僳族"
+
+            break
+          case "21":
+            return "佤族"
+
+            break
+          case "22":
+            return "畲族"
+            break
+          case "23":
+            return "高山族"
+
+            break
+          case "24":
+            return "拉祜族"
+
+            break
+          case "25":
+            return "水族"
+            break
+          case "26":
+            return "东乡族"
+            break
+          case "27":
+            return "纳西族"
+            break
+          case "28":
+            return "景颇族"
+            break
+          case "29":
+            return "柯尔克孜族"
+            break
+          case "30":
+            return "土族"
+            break
+          case "31":
+            return "达斡尔族"
+            break
+          case "32":
+            return "仫佬族"
+            break
+          case "33":
+            return "羌族"
+            break
+          case "34":
+            return "布朗族"
+            break
+          case "35":
+            return "撒拉族"
+            break
+          case "36":
+            return "毛南族"
+            break
+          case "37":
+            return "仡佬族"
+            break
+          case "38":
+            return "锡伯族"
+            break
+          case "39":
+            return "阿昌族"
+            break
+          case "40":
+            return "普米族"
+            break
+          case "41":
+            return "塔吉克族"
+            break
+          case "42":
+            return "怒族"
+            break
+          case "43":
+            return "乌孜别克族"
+            break
+          case "44":
+            return "俄罗斯族"
+            break
+          case "45":
+            return "鄂温克族"
+
+            break
+          case "46":
+            return "德昂族"
+            break
+          case "47":
+            return "保安族"
+            break
+          case "48":
+            return "裕固族"
+            break
+          case "49":
+            return "京族"
+
+            break
+          case "50":
+            return "塔塔尔族"
+
+            break
+          case "51":
+            return "独龙族"
+
+            break
+          case "52":
+            return "鄂伦春族"
+
+            break
+          case "53":
+            return "赫哲族"
+
+            break
+          case "54":
+            return "门巴族"
+
+            break
+          case "55":
+            return "珞巴族"
+
+            break
+          case "56":
+            return "基诺族"
+            break
+
+
+
+
+
+
+        }
+
+      },
       getNewAge(UUserCard) {
         if (UUserCard != null && UUserCard != '') {
             // 获取年龄
@@ -916,4 +1124,4 @@ export default {
   padding: 6px 5px;
   line-height: 16px;
 }
-</style>
+</style>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -29,7 +29,7 @@
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
           v-if="
-            org_id == 10138 || org_id == 0 || org_id == 4 || org_id == 10278
+            org_id == 10138 || org_id == 4 || org_id == 10278
           "
         ></printThree>
         <printFour
@@ -38,10 +38,11 @@
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
         ></printFour>
+<!--        <privateChargePrint  :info="info" v-if="org_id == 10215 && this.paramsObj.balance_accounts_type == 2"></privateChargePrint>-->
+
       </div>
 <!--      <print-other :info="info" v-if="org_id == 9919"></print-other>-->
 <!--      <printOne :info=" info" v-if="org_id == 10215 && this.paramsObj.balance_accounts_type == 2"></printOne>-->
-      <privateChargePrint  :info="info" v-if="(org_id == 0 || org_id == 10215) && this.paramsObj.balance_accounts_type == 2"></privateChargePrint>
       <printOne :info="info" v-else></printOne>
       <!-- 测试医保环境下表格样式放开以下这条 -->
       <!-- <testVue :info="info" v-else></testVue> -->
@@ -490,7 +491,8 @@ export default {
               console.log(111, this.balanceAccounts);
             }
           });
-        }else if (this.org_id == 10215 || this.org_id == 0) {
+        }else
+          if (this.org_id == 10215 || this.org_id == 0) {
 
           getPrivateExpensesOrder(params).then((response) => {
             if (response.data.state == 0) {

src/xt_pages/outpatientCharges/statementTemplate/privateChargePrint.vue

@@ -16,11 +16,11 @@
       </tr>
       <tr>
         <td width="90">就医登记号</td>
-        <td colspan="11"></td>
+        <td colspan="11">{{info.his.number}}</td>
       </tr>
       <tr>
         <td width="80">姓名</td>
-        <td width="80">{{info.patient.name}}</td>
+        <td width="80">{{info.his.name}}</td>
         <td width="80">性别</td>
         <td width="50" v-if="info.patient.gender == 1">男</td>
         <td width="50" v-if="info.patient.gender == 2">女</td>
@@ -48,11 +48,11 @@
         <td>床号</td>
         <td></td>
         <td>入院日期</td>
-        <td>{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
+        <td>{{info.his.in_hosptial_time ? info.his.in_hosptial_time.split(' ')[0] : ''}}</td>
         <td>出院日期</td>
-        <td width="100">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
+        <td width="100">{{info.his.out_hosptial_time ? info.his.out_hosptial_time.split(' ')[0] : ''}}</td>
         <td>住院天数</td>
-        <td>{{getDay(info.setl_time.split(' ')[0],info.setl_time.split(' ')[0])}}</td>
+        <td>{{getDay(info.his.in_hosptial_time.split(' ')[0] ,info.his.out_hosptial_time.split(' ')[0])}}</td>
 
       </tr>
       <tr>
@@ -291,7 +291,7 @@ export default {
         return 1;
       }
       var days=(endDate - startDate)/(1*24*60*60*1000);
-      return  days;
+      return  days + 1;
 
     },
     getNowTime: function () {

src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/printOne.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="prescriptionPrint" class="prescription-print">
     <div
-      v-for="(i, index) in printData"
-      :key="index"
-      style="
+        v-for="(i, index) in printData"
+        :key="index"
+        style="
         box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
           0 0 40px rgba(0, 0, 0, 0.06) inset;
       "
@@ -11,17 +11,18 @@
       <!--            <img style="width:100%;height:80px" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">-->
       <!--/*             <img style="width:100%;height:80px" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">*/-->
       <div
-        id="prescription-print"
-        class="prescription-print"
-        style="page-break-after: always"
-        v-for="(item, index) in i.prescriptions"
-        :key="index"
+          id="prescription-print"
+          class="prescription-print"
+          style="page-break-after: always"
+          v-for="(item, index) in i.prescriptions"
+          v-if="getTeam(i.prescriptions).length > 0"
+          :key="index"
       >
         <div class="printTitle">检验申请单</div>
 
         <div style="border: 1px solid #000">
           <div
-            style="
+              style="
               display: flex;
               justify-content: space-between;
               border-bottom: 1px solid #000;
@@ -33,22 +34,22 @@
             <div>
               结算方式：{{
                 i.his_patient.id != 0
-                  ? i.his_patient.balance_accounts_type == 1
-                    ? "医保"
-                    : "自费"
-                  : ""
+                    ? i.his_patient.balance_accounts_type == 1
+                        ? '医保'
+                        : '自费'
+                    : ''
               }}
             </div>
             <div
-              v-for="item in getSingleTeam(i.prescriptions)"
-              :key="item"
-              style="margin-bottom: 10px"
+                v-for="item in getSingleTeam(i.prescriptions)"
+                :key="item"
+                style="margin-bottom: 10px"
             >
               金额：{{ item }}
             </div>
           </div>
           <div
-            style="
+              style="
               display: flex;
               justify-content: space-between;
               border-bottom: 1px solid #000;
@@ -70,7 +71,7 @@
                 <span v-if="i.gender == 2">女</span>
               </span>
             </div>
-            <div>年龄：{{ i.age ? i.age : "" }}岁</div>
+            <div>年龄：{{ i.age ? i.age : '' }}岁</div>
           </div>
           <!-- <div style="margin-bottom:20px;padding:10px 10px 0;">病史摘要：{{history.history_of_present_illness?history.history_of_present_illness:''}}</div> -->
           <!-- <div style="margin-bottom:20px;padding:0 10px;">体格检查：
@@ -86,16 +87,16 @@
             <div>检验项目：</div>
             <div>
               <div
-                v-for="item in getTeam(i.prescriptions)"
-                :key="item.id"
-                style="margin-bottom: 10px"
+                  v-for="item in getTeam(i.prescriptions)"
+                  :key="item.id"
+                  style="margin-bottom: 10px"
               >
                 {{ item.team.project_team }}
               </div>
             </div>
           </div>
           <div
-            style="
+              style="
               display: flex;
               justify-content: space-between;
               border-top: 1px solid #000;
@@ -103,14 +104,14 @@
               padding: 0 10px;
             "
           >
-            <div>开单医生：{{ i.info.doctor ? i.info.doctor : "" }}</div>
+            <div>开单医生：{{ i.info.doctor ? i.info.doctor : '' }}</div>
             <div>
               开单日期：
               {{
-                getTime(i.info.ctime) ? getTime(i.info.ctime).split(" ")[0] : ""
+                getTime(i.info.ctime) ? getTime(i.info.ctime).split(' ')[0] : ''
               }}
             </div>
-            <div>医生签字：{{ i.info.doctor ? i.info.doctor : "" }}</div>
+            <div>医生签字：{{ i.info.doctor ? i.info.doctor : '' }}</div>
           </div>
         </div>
         <!--            <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">-->
@@ -120,12 +121,13 @@
   </div>
 </template>
 <script>
-import { jsGetAge, uParseTime } from "@/utils/tools";
-import { getAllDoctorList } from "@/api/project/project";
-import { getInitData } from "@/api/his/his";
+import { uParseTime } from '@/utils/tools'
+import { getAllDoctorList } from '@/api/project/project'
+import { getInitData } from '@/api/his/his'
+
 export default {
   props: {
-    printData: Array,
+    printData: Array
   },
   data() {
     return {
@@ -138,150 +140,149 @@ export default {
       department: [],
       prescriptions: [],
       projectList: [],
-      orgname: "",
+      orgname: '',
       diagnoses: [],
       pageArr: [],
       faber: {},
       total: 0,
       projectPrint: [],
-      time: "",
-      doctor: "",
-      org_id: "",
+      time: '',
+      doctor: '',
+      org_id: '',
       singleProjectPrint: [],
-      total_copy: [],
-    };
+      total_copy: []
+    }
   },
 
   methods: {
     getAllDoctorList() {
       getAllDoctorList().then((response) => {
         if (response.data.state == 1) {
-          var doctor = response.data.data.doctor;
+          var doctor = response.data.data.doctor
 
-          this.doctorList = doctor;
+          this.doctorList = doctor
         }
-      });
+      })
     },
     getDoctor(id) {
-      var name = "";
+      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;
+      return name
     },
     getTime(value, temp) {
       if (value != undefined) {
-        return uParseTime(value, temp);
+        return uParseTime(value, temp)
       }
-      return "";
+      return ''
     },
 
     getTeam(prescriptions, isUpdate = false) {
-      let projectPrint = [];
+      let projectPrint = []
       prescriptions.forEach((item) => {
         // ！此为修改前的处理方法，因考虑到可能有逻辑错误的存在故注释，若后续需求以这个为准可放开此条！
+        if (item.project.length > 0) {
+          item.project.map((it) => {
+            if (it.type == 2) {
+              if (it.project.cost_classify == 3) {
+                projectPrint.push(it)
+              }
+            }
+          })
+        }
         // if (item.project.length > 0) {
         //   item.project.map((it) => {
-        //     if (it.type == 2) {
-        //       if (it.project.cost_classify == 3) {
-        //         projectPrint.push(it);
-        //       }
-        //     }
+        //     projectPrint.push(it);
         //   });
         // }
-
-        if (item.project.length > 0) {
-          item.project.map((it) => {
-            projectPrint.push(it);
-          });
-        }
-      });
-
-      let data = [];
+      })
+      let data = []
       projectPrint.map((item) => {
         // console.log(item, "999");
         if (item.team.id == 0) {
-          data.push(item);
+          data.push(item)
         } else {
-          let status = data.some((it) => it.team.id == item.team.id);
+          let status = data.some((it) => it.team.id == item.team.id)
           if (!status) {
-            data.push(item);
+            data.push(item)
           }
         }
-      });
+      })
       if (isUpdate) {
-        this.projectPrint = data;
+        this.projectPrint = data
       }
-      return data;
+      return data
     },
 
     // 计算金额(单独从上面的方法割开来，防止进入死循环)
     getSingleTeam(prescriptions) {
-      let projectPrint = [];
-      let total = 0;
+      let projectPrint = []
+      let total = 0
       prescriptions.map((item) => {
         if (item.project.length > 0) {
           item.project.map((it) => {
             if (it.type == 2) {
               if (it.project.cost_classify == 3) {
-                projectPrint.push(it);
-                total += it.project.price * parseInt(it.count);
+                projectPrint.push(it)
+                total += it.project.price * parseInt(it.count)
               }
             }
-          });
+          })
         }
-      });
-      let total_copy = [];
-      total_copy.push(total.toFixed(2));
-      return total_copy;
+      })
+      let total_copy = []
+      total_copy.push(total.toFixed(2))
+      console.log(total_copy)
+      return total_copy
     },
 
     getInitData() {
       getInitData().then((response) => {
         if (response.data.state == 1) {
-          this.department = response.data.data.department;
-          this.diagnoses = response.data.data.diagnose.sort(this.compare("id"));
+          this.department = response.data.data.department
+          this.diagnoses = response.data.data.diagnose.sort(this.compare('id'))
         }
-      });
+      })
     },
     getDepart(id) {
-      var name = "";
+      var name = ''
       for (let i = 0; i < this.department.length; i++) {
         if (id == this.department[i].id) {
-          name = this.department[i].name;
+          name = this.department[i].name
         }
       }
-      return name;
+      return name
     },
     getTotalOne(id) {
-      var total = 0;
-      var addtotal = 0;
+      var total = 0
+      var addtotal = 0
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (id == this.prescriptions[i].id) {
           if (this.prescriptions[i].project != null) {
             for (let a = 0; a < this.prescriptions[i].project.length; a++) {
               total =
-                total +
-                this.prescriptions[i].project[a].price *
-                  this.prescriptions[i].project[a].count;
+                  total +
+                  this.prescriptions[i].project[a].price *
+                  this.prescriptions[i].project[a].count
             }
           }
 
           if (this.prescriptions[i].additionalcharge != null) {
             for (
-              let a = 0;
-              a < this.prescriptions[i].additionalcharge.length;
-              a++
+                let a = 0;
+                a < this.prescriptions[i].additionalcharge.length;
+                a++
             ) {
               addtotal =
-                addtotal +
-                this.prescriptions[i].additionalcharge[a].price *
-                  this.prescriptions[i].additionalcharge[a].count;
+                  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
         }
       }
 
@@ -290,180 +291,180 @@ export default {
           if (this.prescriptions[i].advices != null) {
             for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
               total =
-                total +
-                this.prescriptions[i].advices[a].price *
-                  this.prescriptions[i].advices[a].prescribing_number;
+                  total +
+                  this.prescriptions[i].advices[a].price *
+                  this.prescriptions[i].advices[a].prescribing_number
             }
           }
 
           if (this.prescriptions[i].additionalcharge != null) {
             for (
-              let a = 0;
-              a < this.prescriptions[i].additionalcharge.length;
-              a++
+                let a = 0;
+                a < this.prescriptions[i].additionalcharge.length;
+                a++
             ) {
               addtotal =
-                addtotal +
-                this.prescriptions[i].additionalcharge[a].price *
-                  this.prescriptions[i].additionalcharge[a].count;
+                  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;
+      return total + addtotal
     },
 
     getProjectName(id) {
-      var project_name = "";
+      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;
+          project_name = this.projectList[i].project_name
         }
       }
-      return project_name;
+      return project_name
     },
 
     getDiagnosis(ids) {
-      let newIds = ids.split(",").sort(function (a, b) {
-        return a - b;
-      });
+      let newIds = ids.split(',').sort(function(a, b) {
+        return a - b
+      })
 
-      let nameArr = [];
+      let nameArr = []
       for (let i = 0; i < this.diagnoses.length; i++) {
         if (newIds.indexOf(this.diagnoses[i].id.toString()) > -1) {
           // name += diagnoses[i].class_name + ' '
-          nameArr.push(this.diagnoses[i].class_name);
+          nameArr.push(this.diagnoses[i].class_name)
         }
       }
-      let newNameArr = [];
+      let newNameArr = []
       nameArr.map((item, index) => {
-        if (item == "尿毒症") {
-          newNameArr.push(item);
-          nameArr.splice(index, 1, "");
+        if (item == '尿毒症') {
+          newNameArr.push(item)
+          nameArr.splice(index, 1, '')
         }
-      });
-      newNameArr.push(...nameArr);
-      return newNameArr.join(" ");
+      })
+      newNameArr.push(...nameArr)
+      return newNameArr.join(' ')
     },
 
     compare(property) {
-      return function (a, b) {
-        var value1 = a[property];
-        var value2 = b[property];
-        return value1 - value2; //升序排序
-      };
+      return function(a, b) {
+        var value1 = a[property]
+        var value2 = b[property]
+        return value1 - value2 //升序排序
+      }
     },
     getPage() {
-      this.page = 1;
-      this.pageArr = [];
+      this.page = 1
+      this.pageArr = []
 
       this.advicePrint.map((item) => {
-        let arr = [];
-        item.pageArr = [];
+        let arr = []
+        item.pageArr = []
         if (item.advices.length <= 5) {
-          this.page = 1;
-          arr.push(item.advices.length);
-          item.pageArr.push(arr);
+          this.page = 1
+          arr.push(item.advices.length)
+          item.pageArr.push(arr)
         } else if (item.advices.length > 5) {
-          this.page = parseInt(item.advices.length / 5);
-          let num = item.advices.length % 5;
+          this.page = parseInt(item.advices.length / 5)
+          let num = item.advices.length % 5
           for (var i = 0; i < this.page; i++) {
-            item.pageArr.push([5]);
+            item.pageArr.push([5])
           }
           if (num != 0) {
-            item.pageArr.push([num]);
+            item.pageArr.push([num])
           }
         }
-      });
+      })
       // console.log('this.pageArr',this.pageArr)
     },
     getName(list) {
-      console.log("list", list);
-      let new_list = [];
+      console.log('list', list)
+      let new_list = []
       for (let i = 0; i < list.length; i++) {
-        if (list[i].aac031 == "1") {
-          new_list.push(list[i]);
+        if (list[i].aac031 == '1') {
+          new_list.push(list[i])
         }
       }
 
       switch (new_list[0].bcc334) {
-        case "A31001":
-          return "深圳医保1档";
-          break;
-        case "A31002":
-          return "深圳医保2档";
-
-          break;
-        case "A31003":
-          return "深圳医保3档";
-
-          break;
-        case "A31004":
-          return "二档（少儿）";
-
-          break;
-        case "A31005":
-          return "学生二档";
-
-          break;
-        case "A31006":
-          return "大学生二档";
-
-          break;
-        case "A32001":
-          return "在职公务员";
-          break;
-        case "A32002":
-          return "在职驻深公务员";
-
-          break;
-        case "A39301":
-          return "家属统筹医疗";
-
-          break;
-        case "A41001":
-          return "工伤在职";
-
-          break;
-        case "A51001":
-          return "生育在职";
-
-          break;
-        case "A52001":
-          return "生育医疗一档";
-
-          break;
-        case "A52002":
-          return "生育医疗一档";
-
-          break;
-        case "C31001":
-          return "一档医疗退休";
-
-          break;
-        case "C31002":
-          return "二档医疗退休";
-          break;
+        case 'A31001':
+          return '深圳医保1档'
+          break
+        case 'A31002':
+          return '深圳医保2档'
+
+          break
+        case 'A31003':
+          return '深圳医保3档'
+
+          break
+        case 'A31004':
+          return '二档（少儿）'
+
+          break
+        case 'A31005':
+          return '学生二档'
+
+          break
+        case 'A31006':
+          return '大学生二档'
+
+          break
+        case 'A32001':
+          return '在职公务员'
+          break
+        case 'A32002':
+          return '在职驻深公务员'
+
+          break
+        case 'A39301':
+          return '家属统筹医疗'
+
+          break
+        case 'A41001':
+          return '工伤在职'
+
+          break
+        case 'A51001':
+          return '生育在职'
+
+          break
+        case 'A52001':
+          return '生育医疗一档'
+
+          break
+        case 'A52002':
+          return '生育医疗一档'
+
+          break
+        case 'C31001':
+          return '一档医疗退休'
+
+          break
+        case 'C31002':
+          return '二档医疗退休'
+          break
       }
-    },
+    }
   },
   created() {
     // this.getAllDoctorList()
-    this.getInitData();
+    this.getInitData()
     // this.getPrescriptionPrint()
     // this.getHisPatientDetail()
     // this.getPatientCaseHistory()
-    var xtuser = this.$store.getters.xt_user;
-    this.orgname = xtuser.org.org_name;
-    this.org_id = this.$store.getters.xt_user.org_id;
+    var xtuser = this.$store.getters.xt_user
+    this.orgname = xtuser.org.org_name
+    this.org_id = this.$store.getters.xt_user.org_id
   },
   watch: {
-    ids: function (val) {
-      this.ids = val;
-      this.getPrescriptionPrint();
-    },
+    ids: function(val) {
+      this.ids = val
+      this.getPrescriptionPrint()
+    }
     // printData: {
     //   immediate: true,
     //   deep: true,
@@ -474,65 +475,77 @@ export default {
     //     });
     //   },
     // },
-  },
-};
+  }
+}
 </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;
-  // -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;
+ /*-webkit-box-shadow: 0 1 px 4 px rgba(0, 0, 0, 0.27),*/
+/*/ / 0 0 60 px rgba(0, 0, 0, 0.06) inset;*/
+/*/ / -moz-box-shadow: 0 1 px 4 px rgba(0, 0, 0, 0.27),*/
+/*/ / 0 0 40 px rgba(0, 0, 0, 0.06) inset;*/
+/*/ / box-shadow: 0 1 px 4 px rgba(0, 0, 0, 0.27), 0 0 40 px rgba(0, 0, 0, 0.06) inset;*/
   margin-bottom: 20px;
   padding: 20px 10px;
 }
+
 .printTitle {
   font-size: 22px;
   text-align: center;
   font-weight: bold;
   margin-bottom: 10px;
 }
+
 .infoTitle {
   display: flex;
   margin-top: 10px;
   line-height: 24px;
 }
+
 .infoTitle div {
   width: 200px;
 }
+
 .infoMain {
   display: flex;
   flex-wrap: wrap;
   margin-top: 10px;
 }
+
 .infoMain div {
   width: 50%;
   line-height: 24px;
 }
+
 .prescriptionBox {
   padding: 0 10px;
   min-height: 400px;
 }
+
 .Rp {
   font-size: 22px;
   font-weight: bold;
 }
+
 .drugsBox {
   padding-left: 40px;
   margin-bottom: 10px;
 }
+
 .drugsBox div {
   line-height: 20px;
 }
+
 .drugsOne {
   line-height: 24px;
 }
+
 .drugsOne span {
   margin-right: 20px;
 }
+
 .doctorBox {
   display: flex;
   justify-content: space-between;
@@ -540,15 +553,18 @@ export default {
   line-height: 24px;
   border-bottom: 2px solid #000;
 }
+
 .actionBar {
   display: flex;
   justify-content: space-between;
   line-height: 24px;
   padding: 0 10px;
 }
+
 .actionBar p {
   width: 150px;
 }
+
 .under_line {
   display: inline-block;
   border-bottom: 1px solid #000;

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/printOne.vue

@@ -1,251 +1,258 @@
 <template>
-    <div id='prescriptionPrint'>
-      <div v-for="(i,index) in printData">
-        <div id='prescription-print' class="prescription-print" v-for="(item,index) in i.prescriptions" :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(i.info.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%">姓名：{{i.name}}</div>
-                <div style="margin-bottom: 10px;width:25%">性别：
-                  <span >
+  <div id='prescriptionPrint'>
+    <div v-for="(i,index) in printData">
+      <div id='prescription-print' class="prescription-print" v-for="(item,index) in i.prescriptions" :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(i.info.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%">姓名：{{ i.name }}</div>
+          <div style="margin-bottom: 10px;width:25%">性别：
+            <span>
                     <span v-if="i.gender == 1">男</span>
                     <span v-if="i.gender == 2">女</span>
                   </span>
-                </div>
-                <div style="margin-bottom: 10px;width:25%">年龄：
-                    <span>{{i.his_patient.id != 0?getAge(i.his_patient):i.age}}</span>
-                </div>
-                <div style="margin-bottom: 10px;width:25%">参保类型：{{i.his_patient.id != 0?i.his_patient.social_type:''}}
-                </div>
-                <div style="margin-bottom: 10px;width:50%;">联系电话：{{i.his_patient.id != 0 ? i.his_patient.phone : i.phone}}</div>
-                <div style="width:50%;">地址：{{i.home_address}}</div>
-                <div style="width:100%;">诊断：{{getDiagnosis(i.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.toFixed(2)}}</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.toFixed(2)}}</td>
-                        <td></td>
-                        <td>{{it.remark}}</td>
-                        <td>{{it.day}}</td>
-
-                    </tr>
-                </table>
-            </div>
-
-            <div class="infoTitle">
-                <div>开单医生：{{i.info.doctor?i.info.doctor:''}}</div>
-                <div>签章：</div>
-            </div>
-
-            <div class="actionBar">
-                <div>执行医生：{{i.info.doctor?i.info.doctor:''}}</div>
-                <div>费用：{{getTotalOne(item.project).toFixed(2)?getTotalOne(item.project).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 style="margin-bottom: 10px;width:25%">年龄：
+            <span>{{ i.his_patient.id != 0 ? getAge(i.his_patient) : i.age }}</span>
+          </div>
+          <div style="margin-bottom: 10px;width:25%" v-if="i.his_patient.id&&i.his_patient.social_type == 390 ">
+            参保类型：{{ '城乡居民基本医疗保险' }}
+          </div>
+          <div style="margin-bottom: 10px;width:25%" v-if="i.his_patient.id&&i.his_patient.social_type == 310 ">
+            参保类型：{{ '职工基本医疗保险' }}
+          </div>
+          <div style="margin-bottom: 10px;width:25%" v-else>参保类型：{{ '' }}</div>
+
+          <div style="margin-bottom: 10px;width:50%;">联系电话：{{ i.his_patient.id != 0 ? i.his_patient.phone : i.phone }}
+          </div>
+          <div style="width:50%;">地址：{{ i.home_address }}</div>
+          <div style="width:100%;">诊断：{{ getDiagnosis(i.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.toFixed(2) }}</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.toFixed(2) }}</td>
+              <td></td>
+              <td>{{ it.remark }}</td>
+              <td>{{ it.day }}</td>
+
+            </tr>
+          </table>
+        </div>
 
-        <!-- <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>
-
-                    <div class="printTitle">血液透析中心</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>{{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="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>
-                    <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 class="infoTitle">
+          <div>开单医生：{{ i.info.doctor ? i.info.doctor : '' }}</div>
+          <div>签章：</div>
+        </div>
+
+        <div class="actionBar">
+          <div>执行医生：{{ i.info.doctor ? i.info.doctor : '' }}</div>
+          <div>费用：{{ getTotalOne(item.project).toFixed(2) ? getTotalOne(item.project).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 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="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>{{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="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>
+                  <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>
 </template>
 <script>
-  import { jsGetAge, uParseTime } from '@/utils/tools'
-  import { getAllDoctorList, getPrescriptionPrint } from '@/api/project/project'
-  import { getInitData } from '@/api/his/his'
-
-  export default {
-    props: {
-      patient_id: Number,
-      record_date: String,
-      prescription_id: Number,
-      ids: String,
-      printData:Array
-    },
-    data() {
-      return {
-        doctorList: [],
-        advicePrint: {},
-        patient: {},
-        tableData: [],
-        prescriptionInfo: [],
-        projectList: [],
-        prescriptions: [],
-        settlement:
+import { jsGetAge, uParseTime } from '@/utils/tools'
+import { getAllDoctorList, getPrescriptionPrint } from '@/api/project/project'
+import { getInitData } from '@/api/his/his'
+
+export default {
+  props: {
+    patient_id: Number,
+    record_date: String,
+    prescription_id: Number,
+    ids: String,
+    printData: Array
+  },
+  data() {
+    return {
+      doctorList: [],
+      advicePrint: {},
+      patient: {},
+      tableData: [],
+      prescriptionInfo: [],
+      projectList: [],
+      prescriptions: [],
+      settlement:
           [
             { value: 1, label: '医保' },
             { value: 2, label: '自费' },
@@ -257,247 +264,247 @@
             { value: 8, label: '医保自费' }
 
           ],
-        hisPatient: {},
-        diagnoses: []
-      }
-    },
+      hisPatient: {},
+      diagnoses: []
+    }
+  },
 
-    watch:{
-      printData:function(val){
-        console.log(val,'打印props')
+  watch: {
+    printData: function(val) {
+      console.log(val, '打印props')
+    }
+  },
+
+  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)
       }
-    },
-
-    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 =
+      var births =
           birth.substr(0, 4) +
           '-' +
           birth.substr(4, 2) +
           '-' +
           birth.substr(6, 2)
-        return jsGetAge(births, '-')
+      return jsGetAge(births, '-')
 
-      },
-      printThisPage() {
-        var ptime = Math.round(new Date().getTime() / 1000)
-        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+    },
+    printThisPage() {
+      var ptime = Math.round(new Date().getTime() / 1000)
+      this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
 
-        const style =
+      const style =
           '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 1px;padding:0 10px;}.infoTitle p{width: 200px;}.otherInfo{display: flex;margin-top:10px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle p{width: 200px;}}'
-        printJS({
-          printable: 'prescription-print',
-          type: 'html',
-          style: style,
-          scanStyles: false
-        })
-      },
-      getAllDoctorList() {
-        getAllDoctorList().then(response => {
-          if (response.data.state == 1) {
-            var doctor = response.data.data.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
-          }
-        }
-        return name
-      },
-      getTime(value, temp) {
-        if (value != undefined) {
-          return uParseTime(value, temp)
+      printJS({
+        printable: 'prescription-print',
+        type: 'html',
+        style: style,
+        scanStyles: false
+      })
+    },
+    getAllDoctorList() {
+      getAllDoctorList().then(response => {
+        if (response.data.state == 1) {
+          var doctor = response.data.data.doctor
+
+          this.doctorList = doctor
         }
-        return ''
-      },
-      getPrescriptionPrint() {
-        var params = {
-          patient_id: this.patient_id,
-          record_date: this.record_date,
-          prescription_id: this.prescription_id,
-          ids: this.ids
+      })
+    },
+
+    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
         }
-        console.log('999999', params)
-        getPrescriptionPrint(params).then(response => {
-          if (response.data.state == 1) {
-            var advicePrint = response.data.data.advicePrint
-            console.log('adviceprint', advicePrint)
-            this.advicePrint = advicePrint
-            this.prescriptions = advicePrint
-            var projectlist = response.data.data.projectlist
-            console.log('所有项目列表', projectlist)
-            this.projectList = projectlist
-            this.hisPatient = response.data.data.hisPatient
+      }
+      return name
+    },
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp)
+      }
+      return ''
+    },
+    getPrescriptionPrint() {
+      var params = {
+        patient_id: this.patient_id,
+        record_date: this.record_date,
+        prescription_id: this.prescription_id,
+        ids: this.ids
+      }
+      console.log('999999', params)
+      getPrescriptionPrint(params).then(response => {
+        if (response.data.state == 1) {
+          var advicePrint = response.data.data.advicePrint
+          console.log('adviceprint', advicePrint)
+          this.advicePrint = advicePrint
+          this.prescriptions = advicePrint
+          var projectlist = response.data.data.projectlist
+          console.log('所有项目列表', projectlist)
+          this.projectList = projectlist
+          this.hisPatient = response.data.data.hisPatient
 
-          }
-        })
-      },
-      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
-          }
         }
-        return project_name
-      },
-      getUnit(id) {
-        var unit = ''
-        for (let i = 0; i < this.projectList.length; i++) {
-          if (id == this.projectList[i].id) {
-            unit = this.projectList[i].unit
-          }
+      })
+    },
+    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
         }
-        return unit
-      },
-
-      getTotalOne(project) {
-
-        let total = 0
-        project.map(item => {
-          total += item.price * item.count
-        })
-        return total
-      },
-      getInitData() {
-        getInitData().then(response => {
-          if (response.data.state == 1) {
-            this.diagnoses = response.data.data.diagnose
-            console.log('争端', this.diagnoses)
-          }
-        })
-      },
-      getDiagnosis(id) {
-      let id_ = id.split(",");
-      let nameArr = [];
-      let name = "";
+      }
+      return project_name
+    },
+    getUnit(id) {
+      var unit = ''
+      for (let i = 0; i < this.projectList.length; i++) {
+        if (id == this.projectList[i].id) {
+          unit = this.projectList[i].unit
+        }
+      }
+      return unit
+    },
+
+    getTotalOne(project) {
+
+      let total = 0
+      project.map(item => {
+        total += item.price * item.count
+      })
+      return total
+    },
+    getInitData() {
+      getInitData().then(response => {
+        if (response.data.state == 1) {
+          this.diagnoses = response.data.data.diagnose
+          console.log('争端', this.diagnoses)
+        }
+      })
+    },
+    getDiagnosis(id) {
+      let id_ = id.split(',')
+      let nameArr = []
+      let name = ''
       for (let i = 0; i < this.diagnoses.length; i++) {
         for (let j = 0; j < id_.length; j++) {
           if (id_[j] == this.diagnoses[i].id) {
-            nameArr[j] = this.diagnoses[i].class_name;
+            nameArr[j] = this.diagnoses[i].class_name
             name = nameArr.join(',')
           }
         }
       }
-      return name;
-      }
-    },
-    created() {
-      this.getInitData()
-      // this.getAllDoctorList()
-      // this.getPrescriptionPrint()
-      var xtuser = this.$store.getters.xt_user
-      this.orgname = xtuser.org.org_name
-
-    },
-    watch: {
-      // patient_id: function(val) {
-      //   console.log('101000010101010', this.patient_id, this.record_date, this.prescription_id)
-      //   //    this.getPrescriptionPrint()
-      // },
-      // ids: function(val) {
-      //   this.ids = val
-      //   console.log('this.idsids', this.ids)
-      //   this.getPrescriptionPrint()
-      // }
+      return name
     }
+  },
+  created() {
+    this.getInitData()
+    // this.getAllDoctorList()
+    // this.getPrescriptionPrint()
+    var xtuser = this.$store.getters.xt_user
+    this.orgname = xtuser.org.org_name
+
+  },
+  watch: {
+    // patient_id: function(val) {
+    //   console.log('101000010101010', this.patient_id, this.record_date, this.prescription_id)
+    //   //    this.getPrescriptionPrint()
+    // },
+    // ids: function(val) {
+    //   this.ids = val
+    //   console.log('this.idsids', this.ids)
+    //   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;
-        -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;
-    }
-
-    .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 div {
-        width: 300px;
-    }
-
-    .infoMain {
-        display: flex;
-        flex-wrap: wrap;
-        border-bottom: 2px solid #000;
-        padding: 0 10px;
-    }
-
-    .infoMain div {
-        width: 50%;
-        line-height: 24px;
-    }
-
-    .prescriptionBox {
-        padding: 0 10px;
-        min-height: 600px;
-    }
-
-    .Rp {
-        font-size: 22px;
-        font-weight: bold;
-    }
-
-    .drugsBox {
-        padding-left: 40px;
-        margin-bottom: 10px;
-    }
-
-    .drugsBox p {
-        line-height: 30px;
-    }
-
-    .drugsOne {
-        line-height: 24px;
-    }
-
-    .drugsOne span {
-        margin-right: 20px;
-    }
-
-    .actionBar {
-        display: flex;
-        justify-content: space-between;
-        line-height: 24px;
-        padding: 0 10px;
-    }
-
-    .actionBar div {
-        width: 150px;
-    }
+.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;
+}
+
+.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 div {
+  width: 300px;
+}
+
+.infoMain {
+  display: flex;
+  flex-wrap: wrap;
+  border-bottom: 2px solid #000;
+  padding: 0 10px;
+}
+
+.infoMain div {
+  width: 50%;
+  line-height: 24px;
+}
+
+.prescriptionBox {
+  padding: 0 10px;
+  min-height: 600px;
+}
+
+.Rp {
+  font-size: 22px;
+  font-weight: bold;
+}
+
+.drugsBox {
+  padding-left: 40px;
+  margin-bottom: 10px;
+}
+
+.drugsBox p {
+  line-height: 30px;
+}
+
+.drugsOne {
+  line-height: 24px;
+}
+
+.drugsOne span {
+  margin-right: 20px;
+}
+
+.actionBar {
+  display: flex;
+  justify-content: space-between;
+  line-height: 24px;
+  padding: 0 10px;
+}
+
+.actionBar div {
+  width: 150px;
+}
 </style>

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -250,7 +250,7 @@ export default {
               });
             } else {
               const style =
-                "@media print {html {height: auto;margin: 0px;} #prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}";
+                "@media print {html {height: auto;margin: 0px;} #prescription-print{font-size:14px;border:1px solid white;margin-bottom:40px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}";
               printJS({
                 printable: "printMain",
                 type: "html",
@@ -394,7 +394,6 @@ export default {
                 }
               });
             });
-            // console.log(projectPrint, "projectPrint----去重前");
             // 数组去重
             projectPrint = this.split_project(projectPrint);
             // 配对
@@ -411,6 +410,7 @@ export default {
             new_patients = this.split_project_1(new_patients)
           }
           this.printData = new_patients;
+          console.log(this.printData,'this.printData')
         });
       }
       this.innerVisible = true;

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -0,0 +1,401 @@
+<template>
+  <!-- <div class="main-contain outpatientChargesManagement">
+      <div class="position">
+          <bread-crumb :crumbs='crumbs'></bread-crumb>
+      </div> -->
+  <div>
+    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+      <div>
+
+        <el-select size="small" v-model="item_type" placeholder="请选择"
+                   style="width:150px;margin-left:10px;" @change="changeItem">
+          <el-option
+              label="全部"
+              value="0">
+          </el-option>
+          <el-option
+              v-for="(item,index) in items"
+              :key="index"
+              :label="item.name"
+              :value="item.id">
+          </el-option>
+        </el-select>
+
+        <div class="mainCell" style="margin-bottom:10px;">
+          <el-input size="small"  v-model.trim="search_input"
+                    class="filter-item"/>
+          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
+                     @click="searchAction">
+            搜索
+          </el-button>
+        </div>
+
+        <el-date-picker
+            v-model="chargeDate"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            @change="changeDate"
+            end-placeholder="结束日期">
+        </el-date-picker>
+      </div>
+    </div>
+    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+              show-summary
+              max-height="600"
+              v-loading="detail_loading"
+              highlight-current-row>
+      <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
+      <el-table-column align="center" prop="name" label="处方日期">
+        <template slot-scope="scope">{{  }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="费用编码">
+        <template slot-scope="scope">{{scope.row.code}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="项目名称">
+        <template slot-scope="scope">{{scope.row.item_name}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="规格">
+        <template slot-scope="scope">{{scope.row.item_spec}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="数量">
+        <template slot-scope="scope">{{scope.row.count}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="单价">
+        <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="金额">
+        <template slot-scope="scope">
+          <div>{{(scope.row.price.toFixed(2)*scope.row.count).toFixed(2)}}</div>
+        </template>
+      </el-table-column>
+
+    </el-table>
+  </div>
+
+  <!-- </div> -->
+</template>
+
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { GetSummaryDetail } from '@/api/his/his'
+import { uParseTime } from '@/utils/tools'
+import axios from 'axios'
+const moment = require('moment')
+export default {
+  components: {
+    BreadCrumb
+
+  },
+  data() {
+    return {
+      detail_loading: false,
+      tempArr: [],
+      pos: 0,
+      search_input: '',
+
+      sameRowArr: [],
+      keywords: '',
+      tableData: [],
+      chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
+      item_type: '0',
+      items: [
+        { id: 1, name: '药品' },
+        { id: 3, name: '耗材' },
+        { id: 2, name: '项目' }
+
+      ]
+
+    }
+  },
+  methods: {
+    searchAction(){
+
+
+    },
+    changeDate() {
+      this.getSummaryDetailList()
+    },
+    changeItem() {
+      this.getSummaryDetailList()
+    },
+    getSummaryDetailList() {
+      this.detail_loading = true
+      let start_time = this.chargeDate[0]
+      let end_time = this.chargeDate[1]
+      let params = {
+        start_time: start_time,
+        end_time: end_time,
+        type: this.item_type,
+        keyword: this.keywords
+      }
+      GetSummaryDetail(params).then(response => {
+        if (response.data.state == 0) {
+          this.detail_loading = false
+
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.detail_loading = false
+
+          this.tableData = []
+          let tempPatients = []
+          let tempPatientsTwo = []
+
+          let tempData = response.data.data.patients
+          let data = response.data.data.patients
+          let orders = this.unique(tempData)
+          for (let i = 0; i < orders.length; i++) {
+            let obj = {
+              patient_id: orders[i].id,
+              name: orders[i].name,
+              orders: []
+            }
+            for (let b = 0; b < data.length; b++) {
+              if (orders[i].id == data[b].id) {
+                obj.orders = obj.orders.concat(data[b].orders)
+              }
+            }
+            tempPatients.push(obj)
+          }
+
+          for (let i = 0; i < tempPatients.length; i++) {
+            let obj = {
+              patient_id: tempPatients[i].patient_id,
+              name: tempPatients[i].name,
+              order_info: []
+            }
+            let orders = tempPatients[i].orders
+            for (let b = 0; b < orders.length; b++) {
+              for (let c = 0; c < orders[b].order_info.length; c++) {
+                let newObj = {}
+
+                newObj['count'] = orders[b].order_info[c].cnt
+                newObj['price'] = orders[b].order_info[c].pric
+                if (orders[b].order_info[c].advice_id > 0 && orders[b].order_info[c].project_id == 0) {
+                  newObj['type'] = 1
+                  newObj['item_name'] = orders[b].order_info[c].advice.advice_name
+                  newObj['item_id'] = orders[b].order_info[c].advice.drug_id
+
+                  if (orders[b].order_info[c].advice.drug.min_unit != orders[b].order_info[c].advice.drug.dose_unit) {
+                    newObj['item_spec'] =  orders[b].order_info[c].advice.drug.dose + orders[b].order_info[c].advice.drug.dose_unit + '*' + orders[b].order_info[c].advice.drug.min_number + orders[b].order_info[c].advice.drug.min_unit + '/' + orders[b].order_info[c].advice.drug.max_unit
+                  } else {
+
+                    newObj['item_spec'] = ''
+                  }
+
+                }
+                if (orders[b].order_info[c].advice_id == 0 && orders[b].order_info[c].project_id > 0) {
+                  newObj['type'] = 2
+                  newObj['item_id'] = orders[b].order_info[c].project.project_id
+
+                  if (orders[b].order_info[c].project.type == 2) {
+                    newObj['item_spec'] =""
+                    newObj['item_name'] = orders[b].order_info[c].project.project.project_name
+
+
+                  } else if (orders[b].order_info[c].project.type == 3) {
+                    newObj['item_spec'] =    orders[b].order_info[c].project.good_info.specification_name
+                    newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name
+
+
+                  }
+                }
+                obj.order_info.push(newObj)
+              }
+            }
+            tempPatientsTwo.push(obj)
+          }
+
+          for (let d = 0; d < tempPatientsTwo.length; d++) {
+            tempPatientsTwo[d]['new_order_info'] = []
+            let project = []
+            let advice = []
+            for (let b = 0; b < tempPatientsTwo[d].order_info.length; b++) {
+              if (tempPatientsTwo[d].order_info[b].type == 1) {
+                advice.push(tempPatientsTwo[d].order_info[b])
+              } else {
+                project.push(tempPatientsTwo[d].order_info[b])
+              }
+            }
+            project = this.uniqueProjectAndAdvice(project)
+            advice = this.uniqueProjectAndAdvice(advice)
+
+            for (let i = 0; i < project.length; i++) {
+              let obj = {}
+              let count = 0
+              for (let a = 0; a < tempPatientsTwo[d].order_info.length; a++) {
+                if (project[i].item_id == tempPatientsTwo[d].order_info[a].item_id && project[i].price == tempPatientsTwo[d].order_info[a].price) {
+                  count = count + tempPatientsTwo[d].order_info[a].count
+                }
+              }
+
+
+
+              obj['price'] = project[i].price
+              obj['type'] = project[i].type
+              obj['item_name'] = project[i].item_name
+              obj['item_spec'] = project[i].item_spec
+
+              obj['item_id'] = project[i].item_id
+              obj['name'] = tempPatientsTwo[d].name
+              obj['patient_id'] = tempPatientsTwo[d].patient_id
+              obj['count'] = count
+              tempPatientsTwo[d].new_order_info.push(obj)
+            }
+
+            for (let i = 0; i < advice.length; i++) {
+              let obj = {}
+              let count = 0
+              for (let a = 0; a < tempPatientsTwo[d].order_info.length; a++) {
+                if (advice[i].item_id == tempPatientsTwo[d].order_info[a].item_id && advice[i].price == tempPatientsTwo[d].order_info[a].price) {
+                  count = count + tempPatientsTwo[d].order_info[a].count
+                }
+              }
+
+              obj['price'] = advice[i].price
+              obj['type'] = advice[i].type
+              obj['item_name'] = advice[i].item_name
+              obj['item_spec'] = advice[i].item_spec
+              obj['item_id'] = advice[i].item_id
+              obj['name'] = tempPatientsTwo[d].name
+              obj['patient_id'] = tempPatientsTwo[d].patient_id
+              obj['count'] = count
+              tempPatientsTwo[d].new_order_info.push(obj)
+            }
+
+          }
+
+          for (let i = 0; i < tempPatientsTwo.length; i++) {
+            let total = 0
+            for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
+              let new_name = tempPatientsTwo[i].new_order_info[b].item_name
+              // console.log('3 ' + new_name)
+              if (new_name != undefined){
+                // console.log('3 ' + tempPatientsTwo[i].new_order_info[b].patient_id)
+                // console.log('3 ' + tempPatientsTwo[i].new_order_info[b].price)
+                // console.log('3 ' + tempPatientsTwo[i].new_order_info[b].count)
+                //
+                // new_name = new_name.replace('（ ', '')
+                // new_name = new_name.replace(' ）', '')
+                if (new_name.length != 0) {
+                  total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString().toString())).toFixed(2))
+                }
+
+
+
+              }
+
+
+            }
+            tempPatientsTwo[i]['total'] = total
+          }
+          console.log('tempPatientsTwo', tempPatientsTwo)
+          for (let i = 0; i < tempPatientsTwo.length; i++) {
+            // console.log(111,tempPatientsTwo[i].total)
+            if (tempPatientsTwo[i].new_order_info.length > 0) {
+
+              for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
+                // let new_name = tempPatientsTwo[i].new_order_info[b].item_name
+                // console.log('2 ' + new_name)
+                //
+                // new_name = new_name.replace('（ ', '')
+                // new_name = new_name.replace(' ）', '')
+
+                let obj = {
+                  name: tempPatientsTwo[i].name,
+                  patient_id: tempPatientsTwo[i].patient_id,
+                  price: tempPatientsTwo[i].new_order_info[b].price,
+                  type: tempPatientsTwo[i].new_order_info[b].type,
+                  item_name: tempPatientsTwo[i].new_order_info[b].item_name,
+                  item_id: tempPatientsTwo[i].new_order_info[b].item_id,
+                  count: tempPatientsTwo[i].new_order_info[b].count,
+                  item_spec: tempPatientsTwo[i].new_order_info[b].item_spec
+                }
+
+
+                // if(b == 0){
+                obj['total'] = tempPatientsTwo[i].total
+                // }else{
+                //   obj['total'] = 0
+                // }
+                this.tableData.push(obj)
+
+
+              }
+            }
+          }
+          this.handleSpanTempArr()
+          // this.tableData = tempPatientsTwo
+
+          // console.log(tempPatientsTwo.length)
+          //
+
+        }
+        //
+        // console.log('去重前')
+        // console.log(advice)
+        // console.log(project)
+        // //
+        // //
+
+        // //
+        // console.log('去重后')
+        //
+        // console.log(advice.length)
+        // console.log(project.length)
+        //
+        // for (let i = 0; i < project.length; i++) {
+        //   let obj = {}
+        //   let count = 0
+        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+        //     if (project[i].patient_id == tempPatientsTwo[a].patient_id && project[i].item_id == tempPatientsTwo[a].item_id && project[i].price == tempPatientsTwo[a].price) {
+        //       count = count + tempPatientsTwo[a].count
+        //       obj['count'] = count
+        //
+        //     }
+        //     obj['price'] = project[i].price
+        //     obj['type'] = project[i].type
+        //     obj['item_name'] = project[i].item_name
+        //     obj['item_id'] = project[i].item_id
+        //     obj['name'] = project[i].name
+        //     obj['patient_id'] = project[i].patient_id
+        //     obj['count'] = count
+        //     this.tableData.push(obj)
+        //   }
+        // }
+        //
+        //
+        // for (let i = 0; i < advice.length; i++) {
+        //   let obj = {}
+        //   let count = 0
+        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+        //     if (advice[i].patient_id == tempPatientsTwo[a].patient_id && advice[i].item_id == tempPatientsTwo[a].item_id && advice[i].price == tempPatientsTwo[a].price) {
+        //       count = count + tempPatientsTwo[a].count
+        //       obj['count'] = count
+        //
+        //     }
+        //     obj['price'] = advice[i].price
+        //     obj['type'] = advice[i].type
+        //     obj['item_name'] = advice[i].item_name
+        //     obj['item_id'] = advice[i].item_id
+        //     obj['name'] = advice[i].name
+        //     obj['patient_id'] = advice[i].patient_id
+        //     this.tableData.push(obj)
+        //   }
+        // }
+        // console.log(this.tableData.length)
+        // this.tableData = this.sort(this.tableData)
+
+      })
+    },
+  },
+  created() {
+    this.getSummaryDetailList()
+
+  }
+}
+</script>

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: 'gatherStatistics'
+}
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/outpatientTool/statistics.vue

@@ -0,0 +1,335 @@
+<template>
+  <div class="main-contain new-main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
+      <div class="mainLeft">
+        <div>
+          <el-table  :data="patientTableData" :height="tableHeight" border style="width: 100%;"
+                     :row-style="{ color: '#303133' }"
+                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                     highlight-current-row ref="tab"
+                     @current-change="handleCurrentChange">
+            <el-table-column align="center" prop="name" label="姓名" wdith='89'>
+              <template slot-scope="scope">{{ scope.row.name }}</template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div class="mainRight">
+        <el-tabs v-model="titleType">
+          <el-tab-pane label="明细" name="明细"></el-tab-pane>
+          <el-tab-pane label="汇总" name="汇总"></el-tab-pane>
+        </el-tabs>
+        <detail-statistics v-if="titleType == '明细'"></detail-statistics>
+        <gather-statistics v-if="titleType == '汇总'"></gather-statistics>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  GetAllPatients,
+} from '@/api/his/his_tools'
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import DetailStatistics from './components/detailStatistics'
+import GatherStatistics from './components/gatherStatistics'
+export default {
+  components: {
+    GatherStatistics,
+    DetailStatistics,
+
+
+  },
+  data() {
+
+    return {
+      patientTableData:[],
+      tableHeight: '',
+      crumbs: [
+        { path: false, name: 'His工具' },
+        { path: false, name: '明细汇总统计' }
+      ],
+      titleType: '明细'
+    }
+  },
+  methods: {
+    getPatientList(){
+      GetAllPatients().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.patientTableData = response.data.data.list
+        }
+      })
+    },
+    handleCurrentChange(){
+
+    },
+
+  },
+  created() {
+    const tableHeight = document.body.clientHeight - 290
+    this.tableHeight = tableHeight
+    this.getPatientList()
+
+  },
+
+  mounted() {
+
+  },
+  watch: {}
+}
+</script>
+
+<style lang="scss" scoped>
+.new-main-contain {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.app-container {
+  height: 100%;
+}
+
+.mainCell {
+  height: 36px;
+  display: flex;
+  align-items: center;
+}
+
+.mainLeft {
+  width: 200px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+.el-radio {
+  margin-right: 5px;
+}
+
+}
+.mainRight {
+  margin-left: 10px;
+  flex: 1;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow-y: auto;
+
+.cellSpan {
+  min-width: 80px;
+  display: inline-block;
+  margin-right: 10px;
+}
+
+}
+.mainCenter {
+  display: flex;
+  flex: 1;
+}
+
+.centerLeft {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+
+.el-form-item {
+  width: 32%;
+  margin-right: 1%;
+  float: left;
+}
+
+.el-form-item__label {
+  text-align: left;
+}
+
+}
+.backColor {
+  background: #f6f8f9;
+  height: 5px;
+  margin-bottom: 5px;
+}
+
+.tabsBox {
+  position: relative;
+  height: 76%;
+  overflow-y: auto;
+  margin-bottom: 60px;
+
+.el-tabs__item {
+  padding: 0 10px;
+}
+
+}
+.preTabs {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+.el-tabs__content {
+  flex: 1;
+  overflow-y: auto;
+}
+
+}
+
+.costBox {
+  width: 100%;
+  height: 60px;
+  background: #fff;
+  position: absolute;
+  bottom: 0;
+  display: flex;
+  align-items: center;
+}
+
+.addTab {
+  position: absolute;
+  right: 0;
+  top: 14px;
+  z-index: 20;
+}
+
+.centerRight {
+  width: 300px;
+  margin-left: 10px;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+}
+
+.rightTab {
+  height: 40px;
+  width: 100%;
+  border: 1px solid #d2d2d2;
+  box-sizing: border-box;
+
+p {
+  width: 50%;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  background: #eee;
+  float: left;
+}
+
+> p:last-child {
+  border-left: 1px solid #d2d2d2;
+  float: right;
+}
+
+.activeP {
+  background: #409EFF;
+  color: #fff;
+}
+
+}
+.comfirmBox {
+  width: 100%;
+  height: 60px;
+  background: #fff;
+  position: absolute;
+  bottom: 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.mainHeader {
+  width: 100%;
+  background: #fff;
+  position: fixed;
+  z-index: 100;
+  height: 36px;
+}
+
+.titleBox {
+  position: fixed;
+  z-index: 99;
+  background: #fff;
+}
+
+.fixedCell {
+  position: fixed;
+  z-index: 99;
+  right: 30px;
+  background: #fff;
+  width: 300px;
+  display: flex;
+  justify-content: space-between;
+}
+</style>
+
+<style lang="scss">
+.centerLeft {
+
+.el-form-item__label {
+  text-align: left;
+}
+
+}
+.tabsBox {
+
+.el-tabs__item {
+  padding: 0 10px;
+}
+
+.el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2) {
+  padding: 0 10px;
+}
+
+.el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:last-child {
+  padding: 0 10px;
+}
+
+.el-tabs--card > .el-tabs__header .el-tabs__item.is-active.is-closable {
+  padding: 0 10px;
+}
+
+}
+.centerRight {
+
+.el-tabs__nav-scroll {
+  display: flex;
+}
+
+.el-tabs__nav {
+  margin: 0 auto;
+}
+
+.el-table th .cell, .el-table td .cell {
+  padding: 0 2px;
+}
+
+}
+.preTabs {
+
+.el-tabs__content {
+
+}
+
+}
+.rightTabs {
+  height: 100%;
+
+
+.el-tabs__content {
+
+}
+
+}
+.centerDialog {
+
+.el-dialog__body {
+  max-height: calc(100vh - 100px) !important;
+  padding: 0 20px;
+}
+
+}
+</style>

src/xt_pages/stock/warehouseManage/components/AddWareHouse.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="新增仓库信息"
+    :title="title"
     :visible.sync="dialogVisible"
     width="30%"
     :before-close="closePop"
@@ -21,19 +21,25 @@
           <el-input v-model="ruleForm.storehouse_name"></el-input>
         </el-form-item>
         <el-form-item label="仓库地址" prop="address">
-          <el-input type="textarea" v-model="ruleForm.address"></el-input>
+          <el-input type="textarea" v-model="ruleForm.address" @input="aa"></el-input>
         </el-form-item>
         <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="ruleForm.status">
+          <el-radio-group v-model="ruleForm.status"  >
             <el-radio :label="1" >启用</el-radio>
-            <el-radio :label="0" >禁用</el-radio>
+            <el-radio :label="0">禁用</el-radio>
+<!--            <el-radio :label="1" @click.native="toDisable2">启用</el-radio>-->
+<!--            <el-radio :label="0" @click.native="toDisable">禁用</el-radio>-->
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="仓库管理员" ><!--prop="region">-->
-          admin
-<!--          <el-select v-model="ruleForm.region" placeholder="请选择管理员">-->
-<!--            <el-option label="admin" value="0"></el-option>-->
-<!--          </el-select>-->
+        <el-form-item label="仓库管理员" prop="admin_id" >
+          <el-select v-model="ruleForm.admin_id" @select="handleSelect" @change="changeadmin">
+            <el-option
+              v-for="item in adminnamelist"
+              :key="item.user_id"
+              :label="item.user_name"
+              :value="item.user_id"
+            ></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
     </div>
@@ -45,20 +51,22 @@
 </template>
 
 <script>
-import { getcode,addstorehouse,updatestorehouse } from "@/api/warehouse";
+import { getcode,addstorehouse,updatestorehouse,getusername,updatestatus } from "@/api/warehouse";
 import login from '../../../../mock/login'
 export default {
   data() {
     return {
+      title: "",
       show_type: 1,
       storehouse_id: "",
       storehouse_code:"coco",
       dialogVisible: false,
       labelPosition:'left',
+      adminnamelist: [],
       ruleForm: {
-        admin_name:"",
+        admin_name:"",//管理员名字
+        admin_id:"",//管理员id
         storehouse_name: "",
-        region: "",
         date1: "",
         date2: "",
         delivery: false,
@@ -90,24 +98,46 @@ export default {
     };
   },
   methods: {
+
+    aa(){
+      console.log('op')
+    },
+    changeadmin(item) {
+    },
+    handleSelect() {
+
+    },
+    usernamelist(){
+      //获取管理员列表
+      getusername().then((res) => {
+        if (res.data.state == 1){
+          this.adminnamelist = res.data.data.list;
+          // console.log("adminnamelist",this.adminnamelist)
+        }
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+    },
     show(data, type) {
       if (type == 1) {
         this.initstorehouseData();
         this.show_type = 1;
         this.title = "新增仓库";
         this.dialogVisible = true;
+        this.usernamelist()
       } else if (type == 2) {
-        console.log("data:::::::::::",data);
         this.show_type = 2;
-        this.storehouse_id = data.id;
+        this.storehouse_id = data.ID;
         this.title = "编辑仓库";
-        this.storehouse_code = data.storehouse_code;
-        this.ruleForm.address = data.storehouse_address;
-        this.ruleForm.status = data.storehouse_status;
-        this.ruleForm.storehouse_name = data.storehouse_name;
-        this.ruleForm.admin_name = data.storehouse_admin_name;
-        console.log("this.ruleForm.admin_name",this.ruleForm.admin_name);
+        this.storehouse_code = data.StorehouseCode;
+        this.ruleForm.address = data.StorehouseAddress;
+        this.ruleForm.status = data.StorehouseStatus;
+        this.ruleForm.storehouse_name = data.StorehouseName;
+        this.ruleForm.admin_name = data.StorehouseAdminName;
+        this.ruleForm.admin_id = data.StorehouseAdminId;
         this.dialogVisible = true;
+        this.usernamelist()
       }
     },
     // 获取仓库编码接口
@@ -121,10 +151,11 @@ export default {
     },
     //清除表单数据
     closePop() {
-      console.log("this.ruleForm",this.ruleForm)
+      // console.log("this.ruleForm",this.ruleForm)
       this.dialogVisible = false;
+      this.ruleForm.admin_name = "";
+      this.ruleForm.admin_id = "";
       this.ruleForm.storehouse_name = "";
-      this.ruleForm.region = "";
       this.ruleForm.date1 = "";
       this.ruleForm.date2 = "";
       this.ruleForm.type = [];
@@ -132,23 +163,18 @@ export default {
       this.ruleForm.address = "";
     },
 
-
     //  验证表单内容
     submitForm(ruleForm) {
       if (this.show_type == 1) {
         this.$refs[ruleForm].validate((valid) => {
           if (valid) {
-            console.log("this.ruleForm.status",this.ruleForm.status);
             let params = {
               storehouse_code: this.storehouse_code || "",
               storehouse_name: this.ruleForm.storehouse_name || "",
               storehouse_address: this.ruleForm.address || "",
-              storehouse_status:parseInt(this.ruleForm.status)
-              // storehouse_admin_id: this.ruleForm.storehouse_admin_id || "",
-              // storehouse_admin_name: this.ruleForm.storehouse_admin_name || "",
+              storehouse_status:parseInt(this.ruleForm.status),
+              storehouse_admin_id: this.ruleForm.admin_id || "",
             };
-            console.log("params::::",params)
-            console.log("status::::",this.ruleForm.status)
             addstorehouse(params).then((res) => {
               if (res.data.state == 1) {
                 this.$message.success("新增成功");
@@ -168,15 +194,13 @@ export default {
       } else if (this.show_type == 2) {
         this.$refs[ruleForm].validate((valid) => {
           if (valid) {
-            console.log("this.ruleForm.status",this.ruleForm.status);
             let params = {
               storehouse_code: this.storehouse_code || "",
               storehouse_name: this.ruleForm.storehouse_name || "",
               storehouse_address: this.ruleForm.address || "",
               storehouse_status:parseInt(this.ruleForm.status),
-              id: this.storehouse_id
-              // storehouse_admin_id: this.ruleForm.storehouse_admin_id || "",
-              // storehouse_admin_name: this.ruleForm.storehouse_admin_name || "",
+              id: this.storehouse_id,
+              storehouse_admin_id: this.ruleForm.admin_id || "",
             };
             updatestorehouse(params).then((res) => {
               if (res.data.state == 1) {

src/xt_pages/stock/warehouseManage/query.vue

@@ -47,28 +47,28 @@
       >
         <el-table-column label="仓库编号" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.storehouse_code ? scope.row.storehouse_code : "" }}</span>
+            <span>{{ scope.row.StorehouseCode ? scope.row.StorehouseCode : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="仓库名称" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.storehouse_name ? scope.row.storehouse_name : "" }}</span>
+            <span>{{ scope.row.StorehouseName ? scope.row.StorehouseName : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="仓库地址" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.storehouse_address ? scope.row.storehouse_address : "" }}</span>
+            <span>{{ scope.row.StorehouseAddress ? scope.row.StorehouseAddress : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="仓库管理员" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.storehouse_admin_name ? scope.row.storehouse_admin_name : "" }}</span>
+            <span>{{ scope.row.StorehouseAdminName ? scope.row.StorehouseAdminName : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="状态" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.storehouse_status == 1">启用</span>
-            <span v-if="scope.row.storehouse_status == 0">禁用</span>
+            <span v-if="scope.row.StorehouseStatus == 1">启用</span>
+            <span v-if="scope.row.StorehouseStatus == 0">禁用</span>
           </template>
         </el-table-column>
 
@@ -136,13 +136,11 @@ export default {
   name: "stockIn",
   created() {
     var types = getDictionaryDataConfig("system", "drug_type");
-    console.log("44444", types);
     var arr = [];
     var obj = { id: 0, name: "全部" };
     arr.push(obj);
     arr.push(...types);
     this.drugType = arr;
-    console.log("arrr", arr);
     this.getlist();
   },
   components: {
@@ -188,7 +186,6 @@ export default {
         page: this.page,
         limit: this.limit,
       };
-      console.log("params", params);
       //请求分页接口
       storehouselist(params).then((response) => {
         if (response.data.state == 1) {
@@ -231,17 +228,20 @@ export default {
     },
     // 新增仓库
     AddWareHouse(val) {
-      this.$refs.AddWareHouse.show(1, val);
+      this.$nextTick(() => {
+        this.$refs.AddWareHouse.show(1, val);
+      })
     },
     // 编辑仓库
     toEdit(data,val) {
-      console.log("data is :",data)
-      this.$refs.AddWareHouse.show(data,val);
+      this.$nextTick(() => {
+        this.$refs.AddWareHouse.show(data, val);
+      })
     },
     // 禁用仓库
     toDisable(val, index) {
       var params = {
-        id:val.id,
+        id:val.ID,
       };
       this.$confirm("是否确定将此仓库禁用?", "禁用仓库信息", {
         confirmButtonText: "确 定",
@@ -266,7 +266,7 @@ export default {
     //删除仓库
     toDelete(val, index) {
       var params = {
-        id:val.id,
+        id:val.ID,
       };
       this.$confirm("是否确定将此仓库删除?", "删除仓库信息", {
         confirmButtonText: "确 定",

src/xt_pages/stock/warehouseManage/waresetting.vue

@@ -11,7 +11,7 @@
           <div style="line-height: 36px; white-space: nowrap">
             请选择耗材自动入库仓库：
           </div>
-          <el-select v-model="h1" placeholder="请选择" @select="handleSelect1" @change="updateconfig1(h1)" >
+          <el-select v-model="h1" filterable placeholder="请选择" @select="handleSelect1" @change="updateconfig1(h1)" >
             <el-option
               v-for="item in options"
               :key="item.storehouse_name"
@@ -25,7 +25,7 @@
           <div style="line-height: 36px; white-space: nowrap">
             请选择耗材自动出库仓库：
           </div>
-          <el-select v-model="h2" placeholder="请选择" @select="handleSelect2" @change="updateconfig2(h2)">
+          <el-select v-model="h2" filterable placeholder="请选择" @select="handleSelect2" @change="updateconfig2(h2)">
             <el-option
               v-for="item in options"
               :key="item.storehouse_name"
@@ -39,7 +39,7 @@
           <div style="line-height: 36px; white-space: nowrap">
             请选择药品自动入库仓库：
           </div>
-          <el-select v-model="h3" placeholder="请选择" @select="handleSelect3" @change="updateconfig3(h3)">
+          <el-select v-model="h3" filterable placeholder="请选择" @select="handleSelect3" @change="updateconfig3(h3)">
             <el-option
               v-for="item in options"
               :key="item.storehouse_name"
@@ -53,7 +53,7 @@
           <div style="line-height: 36px; white-space: nowrap">
             请选择药品自动出库仓库：
           </div>
-          <el-select v-model="h4" placeholder="请选择" @select="handleSelect4" @change="updateconfig4(h4)">
+          <el-select v-model="h4" filterable placeholder="请选择" @select="handleSelect4" @change="updateconfig4(h4)">
             <el-option
               v-for="item in options"
               :key="item.storehouse_name"
@@ -109,7 +109,6 @@ export default {
       let param ={}
       findstorehouseconfig(param).then((response) => {
         if (response.data.state == 1) {
-          console.log("response",response)
           this.h1 = response.data.data.storehouse_info;
           this.h2 = response.data.data.storehouse_out_info;
           this.h3 = response.data.data.drug_storehouse_info;

src/xt_pages/user/vascularAccess.vue

@@ -190,7 +190,7 @@
                </el-form-item>
             </el-col>
              <el-col :span="8">
-               <el-form-item label="首次启用日期:" :required="true" prop="first_start_time">
+               <el-form-item label="首次启用日期:" prop="first_start_time">
                   <el-date-picker
                     type="datetime"
                     format="yyyy-MM-dd"
@@ -362,7 +362,7 @@
                </el-form-item>
             </el-col>
              <el-col :span="8">
-               <el-form-item label="首次启用日期:" :required="true" prop="first_start_time">
+               <el-form-item label="首次启用日期:" prop="first_start_time">
                   <el-date-picker
                     type="datetime"
                     format="yyyy-MM-dd"
@@ -497,7 +497,7 @@
           access_project: [{ required: true, message: '请选择通路项目' }],
           blood_access_part_opera_id:[{required:true,message:'请选择血管通路类型'}],
           blood_access_part_id:[{required:true,message:"请选择血管通路"}],
-          first_start_time:[{required:true,message:"请选择首次启用日期"}],
+         //  first_start_time:[{required:true,message:"请选择首次启用日期"}],
           user_status:[{required:true,message:"请选择使用状态"}]
         },
         dialogVisible:false,