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

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -14,7 +14,7 @@
     <div class="app-container" style="padding-top:40px;">
         <div class='dialysisPage'>
             <printOne v-if="org_id != 10215 && org_id != 10265 && org_id !=0" :paramsObj="invoiceParams"></printOne>
-            <printTwo v-if="org_id == 10215  " :paramsObj="invoiceParams"></printTwo>
+            <printTwo v-if="org_id == 10215  || org_id == 0 " :paramsObj="invoiceParams"></printTwo>
             <printThree v-if="org_id == 10265" :paramsObj="invoiceParams"></printThree>
         </div>
     </div>

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -6,14 +6,14 @@
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
-            <div  style="position: absolute;top:50px;left:260px">{{ list.his_hospital_record.id_card_no?list.order.certno:''}}</div>
+            <div  style="position: absolute;top:50px;left:260px">{{id_card_no?id_card_no:list.order.certno}}</div>
             <div></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
             <div  style="position: absolute;top:70px;left:90px">门诊</div>
             <div></div>
-            <div  style="position: absolute;top:70px;left:240px">{{ list.his_hospital_record.number?list.order.mdtrt_id:''}}</div>
+            <div  style="position: absolute;top:70px;left:240px">{{ number?number:list.order.mdtrt_id}}</div>
             <div  style="position: absolute;left:470px;top:70px;">
                 <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
             </div>
@@ -33,10 +33,11 @@
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
-            <div v-if="paramsObj.gend == 1" style="position: absolute;top:110px;left:100px;">√</div>
+            <div v-if=" gend == 1" style="position: absolute;top:110px;left:100px;">√</div>
             <div v-else style="position: absolute;top:110px;left:140px;">√</div>
-            <div style="position: absolute;top:110px;left:260px;">{{ list.his_hospital_record.number.length <= 13 ? (totalPrice - list.order.psn_cash_pay).toFixed(2) : '0.00' }}</div>
-            <div style="position: absolute;top:110px;left:420px;">{{ list.his_hospital_record.number.length <= 13 ? list.order.psn_cash_pay.toFixed(2) : (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
+
+            <div style="position: absolute;top:110px;left:260px;">{{ number.length <= 13 ? (totalPrice - list.order.psn_cash_pay).toFixed(2) : '0.00' }}</div>
+            <div style="position: absolute;top:110px;left:420px;">{{ number.length <= 13 ? list.order.psn_cash_pay.toFixed(2) : (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
             <div style="position: absolute;top:110px;left:540px;">现金</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
@@ -73,8 +74,10 @@
             <div style="position: absolute;top:210px;left:50px"></div>
             <div style="position: absolute;top:210px;left:130px"></div>
             <div style="position: absolute;top:210px;left:180px"></div>
-            <div style="position: absolute;top:210px;left:260px">{{ list.psn_cash_money ? list.psn_cash_money.toFixed(2) : '' }}</div>
-            <div style="position: absolute;top:210px;left:340px"></div>
+            <div style="position: absolute;top:210px;left:260px" v-if="balance_accounts_type != 2">{{ list.psn_cash_money ? list.psn_cash_money.toFixed(2) : '' }}</div>
+          <div style="position: absolute;top:210px;left:260px" v-else>{{ list.order.medfee_sumamt ? list.order.medfee_sumamt : '' }}</div>
+
+          <div style="position: absolute;top:210px;left:340px"></div>
             <div style="position: absolute;top:210px;left:420px"></div>
             <div style="position: absolute;top:210px;left:480px"></div>
             <div style="position: absolute;top:210px;left:540px"></div>
@@ -157,7 +160,12 @@ export default {
             org_id:'',
             org_name:'',
             in_hosptial_time:'',
-            out_hosptial_time:''
+            out_hosptial_time:'',
+            id_card_no:'',
+           number:'',
+          balance_accounts_type:"",
+          gend:"",
+
         }
     },
     created(){
@@ -188,8 +196,18 @@ export default {
                 var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
                 var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
                 this.printDate = data.getFullYear() + "-" + month + "-" + date;
-                this.in_hosptial_time = this.list.his_hospital_record.in_hosptial_time.split(' ')[0]
-                this.out_hosptial_time = this.list.his_hospital_record.out_hosptial_time.split(' ')[0]
+                if(this.list.his.id > 0){
+                  this.in_hosptial_time = this.getTime()
+                  this.out_hosptial_time = this.list.order.setl_time.split(' ')[0]
+                }else{
+                  this.in_hosptial_time = this.list.his_hospital_record.in_hosptial_time.split(' ')[0]
+                  this.out_hosptial_time = this.list.his_hospital_record.out_hosptial_time.split(' ')[0]
+                }
+
+              this.id_card_no = this.list.his_hospital_record.id_card_no
+              this.number = this.list.his_hospital_record.number
+              this.balance_accounts_type = this.list.his_hospital_record.balance_accounts_type
+              this.gend= this.list.his_hospital_record.gend
             })
         },
         smalltoBIG(n) {

src/xt_pages/hospitalStation/statementTemplate/printOne.vue

@@ -365,14 +365,14 @@
         let yy = new Date().getFullYear();
         let mm = new Date().getMonth() + 1;
         let dd = new Date().getDate();
-        let hh = new Date().getHours();
-        let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
-          :
-          new Date().getMinutes();
-        let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
-          :
-          new Date().getSeconds();
-        dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss;
+        // let hh = new Date().getHours();
+        // let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
+        //   :
+        //   new Date().getMinutes();
+        // let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
+        //   :
+        //   new Date().getSeconds();
+        dateTime = yy + '-' + mm + '-' + dd
         return dateTime
       },
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -46,7 +46,7 @@
           </el-button>
         </div>
         <div>
-          <el-table  :data="patientTableData" :height="tableHeight" border style="width: 100%;"
+          <el-table :data="patientTableData" :height="tableHeight" border style="width: 100%;"
                     :row-style="{ color: '#303133' }"
 
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -61,20 +61,20 @@
             </el-table-column>
           </el-table>
 
-<!--          <el-table v-else :data="monthChargePatientTableData" :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-column align="center" prop="name" label="就诊号" width="110">-->
-<!--              <template slot-scope="scope">{{ scope.row.number ? scope.row.number : '' }}-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-<!--          </el-table>-->
+          <!--          <el-table v-else :data="monthChargePatientTableData" :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-column align="center" prop="name" label="就诊号" width="110">-->
+          <!--              <template slot-scope="scope">{{ scope.row.number ? scope.row.number : '' }}-->
+          <!--              </template>-->
+          <!--            </el-table-column>-->
+          <!--          </el-table>-->
 
         </div>
       </div>
@@ -85,6 +85,22 @@
 
 
           <div>
+<!--            <el-button size="small"-->
+<!--                       @click="openZb(1)"-->
+<!--                       type="primary">登记-->
+<!--            </el-button>-->
+
+<!--            <el-button  size="small"-->
+<!--                       @click="openZb(2)"-->
+<!--                       type="primary">记账-->
+<!--            </el-button>-->
+
+<!--            <el-button   size="small"-->
+<!--                       @click="openZb(3)"-->
+<!--                       type="primary">撤销记账-->
+<!--            </el-button>-->
+
+
             <el-button v-loading="loadingone" size="small"
                        @click="open(6)"
                        type="primary">挂号
@@ -381,10 +397,10 @@
                               </el-button>
 
                               <el-button
-                                         v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1 ||  items.curMonthPrescriptions.order.order_status == 3"
-                                         size="small"
-                                         @click="open(4,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions)"
-                                         type="primary">收费
+                                  v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1 ||  items.curMonthPrescriptions.order.order_status == 3"
+                                  size="small"
+                                  @click="open(4,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions)"
+                                  type="primary">收费
                               </el-button>
                             </div>
                           </div>
@@ -575,32 +591,32 @@
                                 type="primary"
                             >修改医疗类型
                             </el-button>
-<!--                            <div style="margin-bottom:10px;float: right">-->
-<!--                              <div>-->
-<!--                                <el-button-->
-<!--                                    v-if="(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"-->
-<!--                                >预结算-->
-<!--                                </el-button>-->
-<!--                                <el-button-->
-<!--                                    v-if="items.curPrescriptions.order.order_status == 1 && hisPatientInfo.balance_accounts_type != 2"-->
-<!--                                    size="small"-->
-<!--                                    @click="open(11,items.med_type,items.prescriptions[0].order,items.prescriptions)"-->
-<!--                                    type="primary"-->
-<!--                                >撤销明细-->
-<!--                                </el-button>-->
-
-
-<!--                                <el-button v-loading="loadingtwo"-->
-<!--                                           v-if="(hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3"-->
-<!--                                           size="small"-->
-<!--                                           @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"-->
-<!--                                           type="primary">收费-->
-<!--                                </el-button>-->
-<!--                              </div>-->
-<!--                            </div>-->
+                            <!--                            <div style="margin-bottom:10px;float: right">-->
+                            <!--                              <div>-->
+                            <!--                                <el-button-->
+                            <!--                                    v-if="(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"-->
+                            <!--                                >预结算-->
+                            <!--                                </el-button>-->
+                            <!--                                <el-button-->
+                            <!--                                    v-if="items.curPrescriptions.order.order_status == 1 && hisPatientInfo.balance_accounts_type != 2"-->
+                            <!--                                    size="small"-->
+                            <!--                                    @click="open(11,items.med_type,items.prescriptions[0].order,items.prescriptions)"-->
+                            <!--                                    type="primary"-->
+                            <!--                                >撤销明细-->
+                            <!--                                </el-button>-->
+
+
+                            <!--                                <el-button v-loading="loadingtwo"-->
+                            <!--                                           v-if="(hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3"-->
+                            <!--                                           size="small"-->
+                            <!--                                           @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"-->
+                            <!--                                           type="primary">收费-->
+                            <!--                                </el-button>-->
+                            <!--                              </div>-->
+                            <!--                            </div>-->
                           </el-tab-pane>
 
 
@@ -746,7 +762,8 @@
         width="30%"
     >
       <span>是否修改医疗类型</span>
-      <el-select v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217" style="width:50%;" v-model="temp_med_type"
+      <el-select v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217"
+                 style="width:50%;" v-model="temp_med_type"
                  placeholder="医疗类型" @change="changevalue">
         <el-option
             v-for="(item,index) in registerThree"
@@ -756,7 +773,8 @@
         </el-option>
       </el-select>
 
-      <el-select v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217" style="width:50%;" v-model="temp_med_type"
+      <el-select v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217"
+                 style="width:50%;" v-model="temp_med_type"
                  placeholder="医疗类型" @change="changevalue">
         <el-option
             v-for="(item,index) in register"
@@ -855,8 +873,7 @@ import {
   Refund,
   refundNumber,
   register,
-  upload,
-
+  upload
 } from '@/api/his/his'
 import RegisterDialog from './components/registerDialog'
 import treatPrint from './treatPrint'
@@ -890,9 +907,9 @@ export default {
   },
   data() {
     return {
-      monthChargePatientTableData:[],
-      invoiceVisible:false,
-      invoiceParams:null,
+      monthChargePatientTableData: [],
+      invoiceVisible: false,
+      invoiceParams: null,
       temp_med_type: '',
       dialogVisible: false,
       pwdFormVisible: false,
@@ -957,7 +974,6 @@ export default {
         { value: '1402', label: '门诊特殊病(1402)' },
         { value: '0', label: '自费' }
 
-
       ],
       register_two: [
         { value: '11', label: '普通门诊' },
@@ -986,7 +1002,7 @@ export default {
 
       other_start_time_two: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
       other_end_time_two: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
-      adminUserOptions:[],
+      adminUserOptions: [],
       curMonthPrescriptions: null,
       newCurMonthPrescriptions: null,
       big_month_prescriptions: [],
@@ -1310,8 +1326,6 @@ export default {
         }
       })
 
-
-
     },
     changeEndTime(val) {
       const params = {
@@ -2673,6 +2687,151 @@ export default {
       if (tab == 'more') {
         return false
       }
+    }, openZb(index) {
+      switch (index) {
+        case 1:
+          if(this.patientInfo.id == 0){
+            this.$message.error("请需要选择挂号的患者")
+            return
+          }
+          if(this.big_prescriptions.length == 0){
+            this.$message.error("处方不能为空")
+            return
+          }
+          if(this.form.diagnosis.length == 0){
+            this.$message.error("诊断不能为空")
+            return
+          }
+          var that = this
+          let obj = {
+            patient_id: this.patientInfo.id,
+            diagnosis_time: this.form.diagnosis_time,
+            record_date: this.record_date,
+            admin_user_id: this.$store.getters.xt_user.user.id,
+            org_id: this.$store.getters.xt_user.org_id
+
+          }
+          axios.get(process.env.BASE_API +'/coordinate/register', {
+            params: obj
+          })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg)
+                  that.loadingtwo = false
+                  return false
+                } else {
+                  if (response.data.data.failed_code == -10) {
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+
+                  } else {
+                    that.radio = 1
+                    that.changeRadioAndPatient(1)
+                    that.$message({ message: '挂号成功', type: 'success', duration: 5000 })
+                  }
+
+                }
+              })
+              .catch(function(error) {
+
+              })
+
+          break
+        case 2:
+          var that = this
+          var obj2 = {
+            id: this.patientInfo.id,
+            record_time: this.record_date,
+            his_patient_id: this.hisPatientInfo.id,
+            org_id: this.$store.getters.xt_user.org_id,
+            p_type:14,
+
+          }
+          obj2['diagnosis'] = this.form.diagnosis.join(',')
+          obj2['sick_type'] = this.form.sick_type
+          if (this.activeName == 'first') {
+            obj2['settle_accounts_type'] = 1
+          } else if (this.activeName == 'second') {
+            obj2['start_time'] = this.other_start_time
+            obj2['end_time'] = this.other_end_time
+            obj2['settle_accounts_type'] = 2
+          }
+          axios.get(process.env.BASE_API  + '/coordinate/opKeepAccounts', {
+            params: obj2
+          })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg)
+                  that.loadingtwo = false
+                  return false
+                } else {
+                  if (response.data.data.failed_code == -10) {
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+
+                  } else {
+                    that.radio = 1
+                    that.changeRadioAndPatient(1)
+                    that.$message({ message: '记账成功', type: 'success', duration: 5000 })
+                  }
+
+                }
+              })
+              .catch(function(error) {
+
+              })
+
+          break
+        case 3:
+          var that = this
+          let obj3 = {
+            order_id:this.order.id,
+            admin_user_id: this.$store.getters.xt_user.user.id,
+            org_id: this.$store.getters.xt_user.org_id
+          }
+          axios.get(process.env.BASE_API + '/coordinate/opCancelKeepAccounts', {
+            params: obj3
+          })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg)
+                  that.loadingtwo = false
+                  return false
+                } else {
+                  if (response.data.data.failed_code == -10) {
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+
+                  } else {
+                    that.radio = 1
+                    that.changeRadioAndPatient(1)
+                    that.$message({ message: '撤销记账成功', type: 'success', duration: 5000 })
+                  }
+
+                }
+              })
+              .catch(function(error) {
+
+              })
+
+          break
+
+      }
     },
     open(index, med_type, order, prescriptions) {
       this.other_prescriptions = prescriptions
@@ -2937,7 +3096,6 @@ export default {
         // this.$refs.print.getInfo(this.order.id)
       } else if (index == 10) {
 
-
         if (this.hisPatientInfo.balance_accounts_type == 2) {
           this.$confirm('是否退号', '退号', {
             confirmButtonText: '确 定',
@@ -2960,8 +3118,8 @@ export default {
           }).catch(() => {
           })
         } else {
-          if(this.$store.getters.xt_user.org_id == 10215 && this.order.id > 0){
-            this.$message.error("该就诊号尚未撤销明细或者退费无法进行退号操作")
+          if (this.$store.getters.xt_user.org_id == 10215 && this.order.id > 0) {
+            this.$message.error('该就诊号尚未撤销明细或者退费无法进行退号操作')
             return
           }
           var that = this
@@ -3058,7 +3216,7 @@ export default {
             .catch(function(error) {
             })
 
-      } else if(index == 30){
+      } else if (index == 30) {
 
         let paramsObj = {
           order_id: this.order.id,
@@ -3572,11 +3730,11 @@ export default {
         num = num.substring(0)
       }
       return parseFloat(num).toFixed(decimal)
-    },getMonthChargePatientList(){
+    }, getMonthChargePatientList() {
       let params = {
         'record_date': this.record_date,
-        'start_time':this.other_start_time,
-        'end_time':this.other_end_time,
+        'start_time': this.other_start_time,
+        'end_time': this.other_end_time
       }
       getChargeHisPatientList(params).then(response => {
         if (response.data.state == 0) {
@@ -3593,7 +3751,7 @@ export default {
     getPatientList() {
       let params = {
         'record_date': this.record_date,
-        'type': this.radio,
+        'type': this.radio
       }
       getChargeHisPatientList(params).then(response => {
         if (response.data.state == 0) {
@@ -4198,7 +4356,7 @@ export default {
             } else {
               this.form.p_type = 14
               this.form.sick_type = this.sick[0].id
-              if (response.data.data.last_info.diagnoses.length == 0) {
+              if (response.data.data.last_info.id == 0) {
                 this.form.diagnosis = []
               } else {
                 for (let i = 0; i < response.data.data.last_info.diagnosis.split(',').length; i++) {

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -128,7 +128,9 @@
 
                             </div>
                             <div style="display:flex;flez-wrap:wrap;font-size:16px;">
-                                <div style="width:33%;">个人支付金额：{{ info.psn_pay?info.psn_pay:0 }}元</div>
+                              <div style="width:33%;">医疗救助基金金额：{{info.maf_pay?info.maf_pay:0}}元</div>
+
+                              <div style="width:33%;">个人支付金额：{{ info.psn_pay?info.psn_pay:0 }}元</div>
                                 <div style="width:33%;">个人账户金额：{{info.balc >= 0 ? info.balc : 0 }}元</div>
                             </div>
                         </td>
@@ -149,7 +151,7 @@
         <div v-else id='prescription-print' class="prescription-print" style="position: relative;">
             <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
             <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id == 10278" src="https://kuyi.shengws.com/beierlog.png" alt="">
-           
+
             <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
             <div style="display:flex;">
                 <div>单据号：<span style="display:inline-block;width:200px;">{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</span>
@@ -269,7 +271,8 @@
 
                             </div>
                             <div style="display:flex;flez-wrap:wrap;">
-                                <div style="width:33%;">
+                              <div style="width:33%;">医疗救助基金金额：0元</div>
+                              <div style="width:33%;">
                                     个人支付金额：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元
                                 </div>
                                 <div style="width:33%;">个人账户金额：0元</div>

src/xt_pages/outpatientCharges/statementTemplate/privateChargePrint.vue

@@ -299,14 +299,14 @@ export default {
       let yy = new Date().getFullYear();
       let mm = new Date().getMonth() + 1;
       let dd = new Date().getDate();
-      let hh = new Date().getHours();
-      let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
-          :
-          new Date().getMinutes();
-      let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
-          :
-          new Date().getSeconds();
-      dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss;
+      // let hh = new Date().getHours();
+      // let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
+      //     :
+      //     new Date().getMinutes();
+      // let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
+      //     :
+      //     new Date().getSeconds();
+      dateTime = yy + '-' + mm + '-' + dd
       return dateTime
     },
 

src/xt_pages/outpatientDoctorStation/checkPrint.vue

@@ -11,9 +11,9 @@
           >打印</el-button
         >
       </template> -->
-            
+
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <printOne :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
       </div>
   </div>
 </template>
@@ -66,16 +66,16 @@ export default {
                 scanStyles: false
             });
         },500)
-        
+
     },
     getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
     getAllHisPatientList(){
          const params = {
@@ -101,7 +101,7 @@ export default {
             // console.log(this.patientTableData[0])
             // this.choosePatient(this.patientTableData[0])
             this.cal_one = cal_one
-            this.cal_two = cal_two   
+            this.cal_two = cal_two
          }
       })
     },
@@ -135,7 +135,7 @@ export default {
     searchAction(){
 
     }
-    
+
   },
 
   created() {
@@ -159,7 +159,7 @@ export default {
         var prescription_id = this.paramsObj.prescription_id
         this.prescription_id = prescription_id
         this.ids = this.paramsObj.ids
-        
+
       },
       deep:true
     }
@@ -332,7 +332,7 @@ export default {
   .dialysisPage::-webkit-scrollbar {
     height: 15px;
   }
-  
+
   .el-date-editor{
     .el-input__inner{
       padding-right:0px;

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1860,6 +1860,10 @@
           this.order_status = '已退费'
         }
 
+        if (this.curPrescriptions.order_status == 5) {
+          this.order_status = '已记账'
+        }
+
       },
       clearData() {
         this.curPrescriptions = []
@@ -2490,8 +2494,8 @@
 
       },
       removeTab(targetName) {
-        if (this.curPrescriptions.order_status == 2) {
-          this.$message.error('该处方已经结算，无法删除')
+        if (this.curPrescriptions.order_status == 2 || this.curPrescriptions.order_status == 5) {
+          this.$message.error('该处方已经结算或者记账，无法删除')
           return
         }
         this.$confirm('处方删除后不可恢复，是否确认删除', '删除', {

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -275,8 +275,8 @@
         cb(results)
       },
       delAddition(index, addition) {
-        if (this.prescription.order_status == 2) {
-          this.$message.error('该处方已经结算，无法删除')
+        if (this.prescription.order_status == 2 || this.prescription.order_status == 5) {
+          this.$message.error('该处方已经结算或记账，无法删除')
           return
         }
         this.$confirm('附加费删除后不可恢复，是否确认删除', '删除', {
@@ -323,8 +323,8 @@
         })
 
       }, deleteDrug: function(index, row) {
-        if (this.prescription.order_status == 2) {
-          this.$message.error('该处方已经结算，无法删除')
+        if (this.prescription.order_status == 2 ||  this.prescription.order_status ==5) {
+          this.$message.error('该处方已经结算或记账，无法删除')
           return
         }
         this.$confirm('药品删除后不可恢复，是否确认删除', '删除', {
@@ -394,8 +394,8 @@
         return name
       },
       deleteProject(row, i) {
-        if (this.prescription.order_status == 2) {
-          this.$message.error('该处方已经结算，无法删除')
+        if (this.prescription.order_status == 2  || this.prescription.order_status == 5) {
+          this.$message.error('该处方已经结算或记账，无法删除')
           return
         }
         this.$confirm('项目删除后不可恢复，是否确认删除', '删除', {