Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1813,7 +1813,7 @@ export default {
             this.$refs.register9504.hide()
             this.loadingone = false
 
-            // this.CheckHISPatient()
+            this.CheckHISPatient()
 
           }
         })
@@ -1846,7 +1846,7 @@ export default {
                   that.changeRadio(1)
                   that.$refs.register9504.hide()
                   that.$message({ message: '挂号成功', type: 'success' })
-                  // that.CheckHISPatient()
+                  that.CheckHISPatient()
 
                 }
               }
@@ -1877,7 +1877,7 @@ export default {
             this.$refs.register.hide()
             this.loadingone = false
 
-            // this.CheckHISPatient(this.record_date,this.patientInfo.id)
+            this.CheckHISPatient(this.record_date,this.patientInfo.id)
 
           }
         })
@@ -3520,7 +3520,6 @@ export default {
         }
         var ids_str = ids.join(',')
         this.temp_ids = ids_str
-        this.newLoading = true
         var that = this
         let form = {}
         form['id'] = this.patientInfo.id
@@ -3574,10 +3573,8 @@ export default {
                   type: 'warning'
                 }).then(() => {
                   that.changeRadioAndPatient(1)
-                  that.newLoading = false
                 }).catch(() => {
                   that.changeRadioAndPatient(1)
-                  that.newLoading = false
                 })
               } else {
                 that.$message({ message: '上传成功', type: 'success', duration: 5000 })

src/xt_pages/outpatientCharges/summary.vue

@@ -145,7 +145,7 @@
           <!--          </el-button-->
           <!--          >-->
 
-          <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
+<!--          <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
           <el-button size="small" type="primary" @click="accounts_click = !accounts_click">门诊结账</el-button>
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
@@ -187,6 +187,35 @@
           align="right"
         ></el-date-picker>
       </div>
+
+      <div style="margin-bottom: 10px;">
+        <el-date-picker
+          size="small"
+          v-model="pay_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          :clearable="false"
+          style="width:250px; "
+          type="datetime"
+          placeholder="选择缴费日期"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          align="right"
+        ></el-date-picker>
+      </div>
+
+      <div style="margin-bottom: 10px;">
+        <el-select size="small" v-model="staff" placeholder="请选择缴费人员"
+                   style="width:150px;margin-left:10px;" >
+          <el-option
+            v-for="item,index in admins"
+            :key="index"
+            :label="item.user_name"
+            :value="item.user_name">
+          </el-option>
+        </el-select>
+      </div>
+
       <el-table
         :data="tableData"
         border
@@ -503,7 +532,7 @@
       width="70%"
       title="打印"
       :visible.sync="accounts_click"
-    > 
+    >
       <div>
         <div id="accounts_print">
           <div style="text-align: center;font-size: 18px;margin-bottom:20px ;">门诊结账</div>
@@ -512,41 +541,41 @@
               <table class="table" border="1" style="border-collapse: collapse;text-align: center;width: 100%;">
                 <tr>
                   <td>起始日期:</td>
-                  <td></td>
+                  <td>{{start_time}}</td>
                   <td>终止日期:</td>
-                  <td></td>
+                  <td>{{end_time}}</td>
                   <td>缴款日期:</td>
-                  <td></td>
+                  <td>{{pay_time}}</td>
                 </tr>
                 <tr>
                   <td>起始单号:</td>
-                  <td></td>
+                  <td>{{tableData2[0].number}}</td>
                   <td>终止单号:</td>
-                  <td></td>
+                  <td>{{tableData2[tableData2.length-1].number}}</td>
                   <td>缴款人员:</td>
-                  <td></td>
+                  <td>{{staff}}</td>
                 </tr>
                 <tr>
                   <td>收费张数:</td>
-                  <td></td>
+                  <td>{{tableData2.length}}</td>
                   <td>作废张数:</td>
-                  <td></td>
+                  <td>0</td>
                   <td>退费张数:</td>
-                  <td></td>
+                  <td>0</td>
                 </tr>
                 <tr>
                   <td>收费金额:</td>
-                  <td></td>
+                  <td>{{getTotal()}}</td>
                   <td>作废金额:</td>
-                  <td></td>
+                  <td>0</td>
                   <td>退费金额:</td>
-                  <td></td>
+                  <td>0</td>
                 </tr>
                 <tr>
                   <td>合计张数:</td>
-                  <td></td>
+                  <td>{{tableData2.length}}</td>
                   <td>合计金额:</td>
-                  <td colspan="3"></td>
+                  <td colspan="3">{{getTotal()}}</td>
                 </tr>
               </table>
             </div>
@@ -556,15 +585,15 @@
                   <td>医保</td>
                   <td>微信</td>
                   <td>现金</td>
-                  <td>门诊预测</td>
+                  <td>门诊预存</td>
                   <td>合计</td>
                 </tr>
                 <tr>
-                  <td></td>
-                  <td></td>
-                  <td></td>
-                  <td></td>
-                  <td></td>
+                  <td>{{getYibao()}}</td>
+                  <td>0</td>
+                  <td>{{getPsnCash()}}</td>
+                  <td>0</td>
+                  <td>{{getTotal()}}</td>
                 </tr>
               </table>
             </div>
@@ -580,14 +609,15 @@
                   <td>收费时间</td>
                   <td>类型</td>
                 </tr>
-                <tr>
-                  <td></td>
-                  <td></td>
-                  <td></td>
-                  <td></td>
-                  <td></td>
-                  <td></td>
-                  <td></td>
+                <tr v-for="item in tableData2">
+                  <td>{{item.number}}</td>
+                  <td>{{item.certno}}</td>
+                  <td>{{item.psn_name}}</td>
+                  <td>{{item.age}}</td>
+                  <td v-if="item.gend == 1">男</td>
+                  <td v-if="item.gend != 1">女</td>
+                  <td>{{item.medfee_sumamt}}</td>
+                  <td>{{item.setl_time}}</td>
                   <td></td>
                 </tr>
               </table>
@@ -609,6 +639,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund } from '@/api/his/his'
 // import NewStatementPrint from './newStatementPrint'
+import { adminMainView} from "@/api/role/admin";
 import NewStatementPrint from './statementPrint.vue'
 import listPrint from './listPrint'
 import allListPrint from './allListPrint'
@@ -650,6 +681,8 @@ export default {
   },
   data() {
     return {
+      staff:"",
+      admins:[],
       orderObj: {},
       batchOrderObj: {},
       med_options: [
@@ -670,6 +703,7 @@ export default {
         { path: false, name: '项目消费明细汇总' }
       ],
       tableData: [],
+      tableData2:[],
       selecting_schs: [],
       limit: 10,
       page: 1,
@@ -679,6 +713,7 @@ export default {
       medTypeVal: 0,
       start_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
       end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+      pay_time:"",
       total: '',
       doctors: [],
       sort_type: 1,
@@ -737,9 +772,49 @@ export default {
     this.fetchAllAdminUsers()
     this.getDoctorList()
     this.getHisOrderList()
+    this.getAllstaff()
   },
 
   methods: {
+    getPsnCash(){
+      let result = 0
+      for(let i = 0;i < this.tableData2.length; i++){
+        result = result + this.tableData2[i].psn_cash_pay
+      }
+      return result.toFixed(2)
+    },
+    getYibao(){
+      let result = 0
+      for(let i = 0;i < this.tableData2.length; i++){
+        result = result + this.tableData2[i].fund_pay_sumamt
+      }
+      return result.toFixed(2)
+    },
+    getTotal(){
+     let result = 0
+      for(let i = 0;i < this.tableData2.length; i++){
+        result = result + this.tableData2[i].medfee_sumamt
+      }
+      return result.toFixed(2)
+    },
+    getAllstaff(){
+      adminMainView()
+        .then(rs => {
+
+          var resp = rs.data;
+          if (resp.state === 1) {
+            var adminData = resp.data.admins
+            this.admins.push(...adminData);
+          } else {
+            this.$message.error(resp.msg);
+          }
+        })
+        .catch(err => {
+          this.$message.error(err);
+        });
+
+
+    },
     // 门诊结账
     accounts_sum(){
       const style = '@media print {#accounts_print{font-size:15px} .table tr td{padding:5px 0;}}'
@@ -3797,6 +3872,7 @@ export default {
           return false
         } else {
           this.tableData = response.data.data.order
+          this.tableData2 =  response.data.data.order2
           this.total = response.data.data.total
         }
       })

src/xt_pages/outpatientDoctorStation/checkTemplate/printThree.vue

@@ -261,7 +261,7 @@ export default {
           console.log("列表", this.projectPrint);
           this.total = total.toFixed(2);
           this.pre_time = this.advicePrint[0].pre_time;
-          this.doctor = this.advicePrint[0].doctor;
+          this.doctor = this.advicePrint[0].creator;
 
           this.singleProjectPrint = data2;
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -741,7 +741,9 @@ export default {
       // })
     },
     changeOther(patient_id) {
-      this.radio = 2
+      if(this.radio != 0) {
+        this.radio = 2
+      }
       let params = {
         'record_date': this.record_date,
         'type': this.radio,

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -222,7 +222,7 @@
                       </div> -->
                   </template>
                 </div>
-                
+
                 <!-------------------------------------------------------------------------->
                 <!-- <template>
                   <div v-for="(ite,indexs) in item.arr" :key="indexs">
@@ -279,7 +279,7 @@
                         <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="item.arr.length>0&&item.arr[0][0].groupno==it.groupno">
                           &nbsp;共{{ it.single_dose }}{{ it.single_dose_unit }}
                         </div>
-                  
+
                     </template>
                   </div>
 
@@ -585,7 +585,7 @@ export default{
               }
             }
           }
-          
+
         //   this.advicePrint[i]['advices'][0]['arr'] = arr
         //  this.advicePrint[i]["arr"]    = arr
         //  console.log('55555',arr);
@@ -598,7 +598,7 @@ export default{
             }
           }
         }
-        
+
           // console.log('4444444',this.advicePrint);
         //  console.log('55555555',this.arr);
 

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -16,8 +16,8 @@
         <!-- 此下条为本地开发下页面 -->
         <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
         <!-- org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0 -->
-        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375" 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>
-        <printThree v-if=" org_id == 10375 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 && org_id != 0" 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>
+        <printThree v-if=" org_id == 10375 ||  org_id == 0 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
         <printTwo v-if="org_id == 10138 || org_id == 10278 || org_id ==4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
       </div>
   </div>

src/xt_pages/outpatientDoctorStation/treatTemplate/printThree.vue

@@ -77,7 +77,7 @@
           </div>
 
           <div style="display: flex; margin-top: 10px; line-height: 24px;padding: 0 10px;">
-              <div style="width: 300px;">开单医生：{{item.doctor?item.doctor:''}}</div>
+              <div style="width: 300px;">开单医生：{{item.creator?item.creator:''}}</div>
               <div style="width: 300px;">签章：</div>
               <div style="width: 300px;">费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
           </div>
@@ -493,7 +493,7 @@ export default {
 
   .prescriptionBox {
       padding: 0 10px;
-      
+
   }
 
   .Rp {

src/xt_pages/outpatientTool/org_export_data.vue

@@ -26,7 +26,7 @@
 
         </div>
 
-        <div v-if="this.$store.getters.xt_user.org_id == 0">
+        <div>
 
           <el-button size="small" type="primary"
                      @click="export_detail_9919('1')">职工月结数据导出