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

src/store/modules/globalConfig.js

@@ -1829,6 +1829,12 @@ const global_config = {
       },{
         id: 30,
         name: '次'
+      },{
+        id: 31,
+        name: '米'
+      },{
+        id: 32,
+        name: '对'
       },
       {
         id: 31,

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -495,6 +495,34 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 36">
+        <div>
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisPage"
+            type="primary"
+            >打印全部</el-button
+          >
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisOnePage"
+            type="primary"
+            >打印纪录单</el-button
+          >
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisTwoPage"
+            type="primary"
+            >打印医嘱单</el-button
+          >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -750,6 +778,11 @@
             v-if="org_template_info.template_id == 35"
           >
           </DialysisPrintOrderThirtyFive>
+          <DialysisPrintOrderThirtySix
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 36"
+          >
+          </DialysisPrintOrderThirtySix>
         </div>
       </el-container>
     </div>
@@ -804,9 +837,11 @@ import DialysisPrintOrderThirtyTwo from "./template/DialysisPrintOrderThirtyTwo"
 import DialysisPrintOrderThirtyThree from "./template/DialysisPrintOrderThirtyThree";
 import DialysisPrintOrderThirtyFour from "./template/DialysisPrintOrderThirtyFour";
 import DialysisPrintOrderThirtyFive from "./template/DialysisPrintOrderThirtyFive";
+import DialysisPrintOrderThirtySix from "./template/DialysisPrintOrderThirtySix";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderThirtySix,
     DialysisPrintOrderThirtyFive,
     DialysisPrintOrderThirtyFour,
     DialysisPrintOrderThirtyThree,
@@ -1249,6 +1284,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 36) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {
@@ -1301,6 +1343,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if(this.org_template_info.template_id == 36){
+        printJS({
+          printable: "dialysis-print-box-1-1",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisTwoPage() {
@@ -1353,6 +1402,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if(this.org_template_info.template_id == 36){
+        printJS({
+          printable: "dialysis-print-box-1-2",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     getNumber() {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -138,11 +138,11 @@
                         >退号
                         </el-button>
 
-                        <!--<el-button-->
-                        <!--v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 10106"-->
-                        <!--size="small" @click="open(11)" type="primary"-->
-                        <!--&gt;撤销明细-->
-                        <!--</el-button>-->
+                        <el-button
+                        v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 10106"
+                        size="small" @click="open(11)" type="primary"
+                        >撤销明细
+                        </el-button>
 
                     </div>
                     <!--<el-button size="small" @click="query" type="primary"-->

src/xt_pages/outpatientCharges/summary.vue

@@ -1,167 +1,176 @@
 <template>
-  <div class="main-contain outpatientChargesManagement">
-    <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
-    </div>
-    <div class="app-container">
-      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
-        <div>
-          <el-input size="small" style="width:150px;"  v-model="keywords"
-                    class="filter-item"/>
-          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
-            搜索
-          </el-button>
-          <el-select size="small" v-model="admin_user_id" placeholder="请选择" style="width:150px;margin-left:10px;" @change="changeDoctor">
-            <el-option
-              label="全部"
-              value="0">
-            </el-option>
-            <el-option
-              v-for="item,index in doctors"
-              :key="index"
-              :label="item.user_name"
-              :value="item.admin_user_id">
-            </el-option>
-          </el-select>
-          <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
-                          @change="handleStartTimeChange" :editable="false" :clearable="false"
-                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
-                          format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd"
-                          align="right"></el-date-picker>
-
-          <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date"
-                          @change="handleEndTimeChange" :editable="false" :clearable="false"
-                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择结束日期"
-                          format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd"
-                          align="right"></el-date-picker>
-          <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
-          <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+    <div class="main-contain outpatientChargesManagement">
+        <div class="position">
+            <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <div>
-          <!-- <el-popover
-            placement="bottom"
-            width="210"
-            trigger="click">
-            <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
-            <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
-            <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
-
-          </el-popover> -->
-          <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+        <div class="app-container">
+            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+                <div>
+                    <el-input size="small" style="width:150px;" v-model="keywords"
+                              class="filter-item"/>
+                    <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
+                               @click="searchAction">
+                        搜索
+                    </el-button>
+                    <el-select size="small" v-model="admin_user_id" placeholder="请选择"
+                               style="width:150px;margin-left:10px;" @change="changeDoctor">
+                        <el-option
+                                label="全部"
+                                value="0">
+                        </el-option>
+                        <el-option
+                                v-for="item,index in doctors"
+                                :key="index"
+                                :label="item.user_name"
+                                :value="item.admin_user_id">
+                        </el-option>
+                    </el-select>
+                    <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
+                                    @change="handleStartTimeChange" :editable="false" :clearable="false"
+                                    style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
+                                    format="yyyy-MM-dd"
+                                    value-format="yyyy-MM-dd"
+                                    align="right"></el-date-picker>
+
+                    <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date"
+                                    @change="handleEndTimeChange" :editable="false" :clearable="false"
+                                    style="width: 196px;margin-right:10px;" type="date" placeholder="选择结束日期"
+                                    format="yyyy-MM-dd"
+                                    value-format="yyyy-MM-dd"
+                                    align="right"></el-date-picker>
+                    <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+                    <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+                </div>
+                <div>
+                    <!-- <el-popover
+                      placement="bottom"
+                      width="210"
+                      trigger="click">
+                      <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+                      <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+                      <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
+
+                    </el-popover> -->
+                    <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+                </div>
+            </div>
+            <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
+                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                      highlight-current-row>
+                <el-table-column
+                        prop="date"
+                        label="序号"
+                        width="60"
+                        align="center"
+                        type="index"
+                >
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="就诊号">
+                    <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="患者名字">
+                    <template slot-scope="scope">{{ scope.row.patient.name }}</template>
+                </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.medfee_sumamt}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="实收金额">
+                    <template slot-scope="scope">{{scope.row.reality_price}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="科室">
+                    <template slot-scope="scope">{{scope.row.department_name}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="收费日期">
+                    <template slot-scope="scope"> {{scope.row.setl_time}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="收费员">
+                    <template slot-scope="scope">{{ getName(scope.row.creator) }}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="状态">
+                    <template slot-scope="scope">
+                        <div v-if="scope.row.order_status == 1">待结算</div>
+                        <div v-if="scope.row.order_status == 2">已结算</div>
+                        <div v-if="scope.row.order_status == 3">已退费</div>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="操作">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
+                        <el-button size="mini" type="primary" @click="toPrint(scope.row)"
+                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4)">
+                            结算单
+                        </el-button>
+                        <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106)">
+                            退费
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :page-sizes="[10, 50, 100]"
+                    :page-size="10"
+                    background
+                    style="margin-top:20px;float: right"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="total"
+
+            >
+            </el-pagination>
         </div>
-      </div>
-      <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
-                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-        <el-table-column
-          prop="date"
-          label="序号"
-          width="60"
-          align="center"
-          type="index"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="就诊号">
-          <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="患者名字">
-          <template slot-scope="scope">{{ scope.row.patient.name }}</template>
-        </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.medfee_sumamt}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="实收金额">
-          <template slot-scope="scope">{{scope.row.reality_price}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="科室">
-          <template slot-scope="scope">{{scope.row.department_name}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="收费日期">
-          <template slot-scope="scope">  {{getTimes(scope.row.settle_accounts_date)}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="收费员">
-          <template slot-scope="scope">{{ scope.row.doctor_name }}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="状态">
-          <template slot-scope="scope">
-            <div v-if="scope.row.order_status == 1">待结算</div>
-            <div v-if="scope.row.order_status == 2">已结算</div>
-            <div v-if="scope.row.order_status == 3">已退费</div>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="操作">
-          <template slot-scope="scope">
-            <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
-            <el-button size="mini" type="primary" @click="toPrint(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4)">结算单</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
-        background
-        style="margin-top:20px;float: right"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-
-      >
-      </el-pagination>
-    </div>
 
-    <el-dialog
-      class="centerDialog"
-      width="1200px"
-      title="打印"
-      :visible.sync="statementVisible">
-      <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
-    <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
-    </el-dialog>
-    <el-dialog
-      class="centerDialog"
-      width="900px"
-      title="打印"
-      :visible.sync="listVisible">
-      <listPrint></listPrint>
-    </el-dialog>
-    <el-dialog
-      class="centerDialog"
-      width="900px"
-      title="打印"
-      :visible.sync="allListVisible">
-      <allListPrint :paramsObj='paramsObj'></allListPrint>
-    </el-dialog>
-
-    <el-dialog
-            class="centerDialog"
-            width="1200px"
-            title="打印"
-            :visible.sync="statementVisible9504">
-      <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
-      <!--<new-statement-print ref="print" :paramsObj='orderObj9504'></new-statement-print>-->
-      <new-statement-print-two ref="print" :paramsObj='orderObj9504'></new-statement-print-two>
-    </el-dialog>
-
-
-  </div>
+        <el-dialog
+                class="centerDialog"
+                width="1200px"
+                title="打印"
+                :visible.sync="statementVisible">
+            <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
+            <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
+        </el-dialog>
+        <el-dialog
+                class="centerDialog"
+                width="900px"
+                title="打印"
+                :visible.sync="listVisible">
+            <listPrint></listPrint>
+        </el-dialog>
+        <el-dialog
+                class="centerDialog"
+                width="900px"
+                title="打印"
+                :visible.sync="allListVisible">
+            <allListPrint :paramsObj='paramsObj'></allListPrint>
+        </el-dialog>
+
+        <el-dialog
+                class="centerDialog"
+                width="1200px"
+                title="打印"
+                :visible.sync="statementVisible9504">
+            <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
+            <!--<new-statement-print ref="print" :paramsObj='orderObj9504'></new-statement-print>-->
+            <new-statement-print-two ref="print" :paramsObj='orderObj9504'></new-statement-print-two>
+        </el-dialog>
+
+
+    </div>
 </template>
 
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getHisOrderList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
+  import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund} from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
-  import statementPrint from './statementPrint'
   import NewStatementPrint from './newStatementPrint'
   import listPrint from './listPrint'
   import allListPrint from './allListPrint'
   import NewStatementPrintTwo from './newStatementPrintTwo'
-
+  import { fetchAllAdminUsers } from '@/api/doctor'
+  import axios from 'axios'
 
   export default {
     components: {
@@ -175,38 +184,115 @@
       return {
         orderObj: {},
         statementVisible: false,
-        statementVisible9504:false,
-        orderObj9504:{},
+        statementVisible9504: false,
+        orderObj9504: {},
         crumbs: [
           { path: false, name: '门诊收费' },
           { path: false, name: '项目消费明细汇总' }
         ],
         tableData: [],
-        limit:10,
-        page:1,
-        keywords:"",
-        start_time:"",
-        end_time:"",
-        total:"",
-        doctors:[],
-        admin_user_id:"",
-        listVisible:false,
-        allListVisible:false
+        limit: 10,
+        page: 1,
+        keywords: '',
+        start_time: '',
+        end_time: '',
+        total: '',
+        doctors: [],
+        admin_user_id: '',
+        listVisible: false,
+        allListVisible: false,
+        adminUserOptions:[],
 
       }
     },
     methods: {
-      toPrint(row){
-        if(this.$store.getters.xt_user.org_id == 9504 ||this.$store.getters.xt_user.org_id == 10028){
+      fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+
+          }
+        })
+      },
+      getName(admin_user_id) {
+        for (let i = 0; i < this.adminUserOptions.length; i++) {
+          if (this.adminUserOptions[i].id == admin_user_id) {
+            return this.adminUserOptions[i].name
+          }
+        }
+
+      },toRefund(row){
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
+          var that = this
+          this.$confirm('是否退费', '退费', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            let params = {
+              'order_id': row.id,
+              'patient_id': row.patient_id,
+              'record_time': that.getTimes(row.settle_accounts_date),
+              'admin_user_id': that.$store.getters.xt_user.user.id,
+            }
+            axios.get('http://127.0.0.1:9532/api/refund/post', {
+              params: params
+            })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg)
+                  return false
+                } else {
+                  if (response.data.data.failed_code == -10) {
+                    that.$message.error(response.data.data.msg)
+                  } else {
+                    that.$message({ message: '退费成功', type: 'success', duration: 5000 })
+                    that.getHisOrderList()
+
+                  }
+                }
+              })
+              .catch(function(error) {
+              })
+          }).catch(() => {
+          })
+
+        } else {
+          this.$confirm('是否退费', '退费', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            let params = {
+              'order_id': this.order.id,
+              'patient_id': this.patientInfo.id,
+              'record_time': this.record_date
+
+            }
+            Refund(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message({ message: '退费成功', type: 'success' })
+                this.getHisOrderList()
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      },
+      toPrint(row) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
           this.statementVisible9504 = true
           let obj = {
             order_id: row.id,
             patient_id: row.patient_id,
             record_time: this.getTimes(row.settle_accounts_date),
-            admin_user_id: this.$store.getters.xt_user.user.id,
+            admin_user_id: this.$store.getters.xt_user.user.id
           }
           this.orderObj9504 = obj
-        }else {
+        } else {
           this.statementVisible = true
           let obj = {
             order_id: row.id
@@ -215,10 +301,10 @@
         }
 
       },
-      export_detail(){
-        let params= {
-          start_time:this.start_time,
-          end_time: this.end_time,
+      export_detail() {
+        let params = {
+          start_time: this.start_time,
+          end_time: this.end_time
         }
         getExportConsumeDetailList(params).then(response => {
           if (response.data.state == 0) {
@@ -227,144 +313,139 @@
           } else {
 
             let list = []
-            for (let i =0; i < response.data.data.order.length; i++){
-            let order =   response.data.data.order[i]
-              let number = ""
-              let name = ""
-              let department = ""
-              let doctor_name = ""
-              let balance_accounts = ""
+            for (let i = 0; i < response.data.data.order.length; i++) {
+              let order = response.data.data.order[i]
+              let number = ''
+              let name = ''
+              let department = ''
+              let doctor_name = ''
+              let balance_accounts = ''
 
-              let order_status = ""
+              let order_status = ''
 
-
-
-              if(order.his_patient != null && order.his_patient.number.length > 0){
+              if (order.his_patient != null && order.his_patient.number.length > 0) {
                 number = order.his_patient.number
 
               }
 
-              if(order.his_patient != null ){
-                if(order.his_patient.balance_accounts_type == 1){
-                  balance_accounts = "自费"
+              if (order.his_patient != null) {
+                if (order.his_patient.balance_accounts_type == 1) {
+                  balance_accounts = '自费'
                 }
 
-                if(order.his_patient.balance_accounts_type == 2){
-                  balance_accounts = "医保"
+                if (order.his_patient.balance_accounts_type == 2) {
+                  balance_accounts = '医保'
                 }
               }
 
-              if(order.patient != null && order.patient.name.length > 0){
+              if (order.patient != null && order.patient.name.length > 0) {
                 name = order.patient.name
 
               }
 
-              if(order.p_info != null && order.p_info.department != null && order.p_info.department.name.length > 0){
+              if (order.p_info != null && order.p_info.department != null && order.p_info.department.name.length > 0) {
                 department = order.p_info.department.name
 
               }
 
-              if(order.p_info != null && order.p_info.doctor.length > 0){
+              if (order.p_info != null && order.p_info.doctor.length > 0) {
                 doctor_name = order.p_info.doctor
               }
 
-              if(order.order_status == 1){
-                order_status = "待结算"
+              if (order.order_status == 1) {
+                order_status = '待结算'
               }
 
-              if(order.order_status == 2){
-                order_status = "已结算"
+              if (order.order_status == 2) {
+                order_status = '已结算'
               }
 
-              if(order.order_status == 3){
-                order_status = "已退费"
+              if (order.order_status == 3) {
+                order_status = '已退费'
               }
 
-
               let obj = {
-                "就诊号":number,
-                "患者姓名":name,
-                "应收金额":order.medfee_sumamt,
-                "实收金额":order.medfee_sumamt,
-                "科室":department,
-                "医生姓名":doctor_name,
-                "收费类别":balance_accounts,
-                "收费者姓名":doctor_name,
-                "总金额":order.medfee_sumamt,
-                "现金支付":"",
-                "账户支付":"",
-                "支付宝支付":"",
-                "微信支付":"",
-                "其他支付":"",
-                "收费日期":"",
-                "收费状态":order_status,
-                "退费日期":"",
+                '就诊号': number,
+                '患者姓名': name,
+                '应收金额': order.medfee_sumamt,
+                '实收金额': order.medfee_sumamt,
+                '科室': department,
+                '医生姓名': doctor_name,
+                '收费类别': balance_accounts,
+                '收费者姓名': doctor_name,
+                '总金额': order.medfee_sumamt,
+                '现金支付': '',
+                '账户支付': '',
+                '支付宝支付': '',
+                '微信支付': '',
+                '其他支付': '',
+                '收费日期': '',
+                '收费状态': order_status,
+                '退费日期': ''
               }
               list.push(obj)
             }
             import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室',"医生姓名","收费类别","收费者姓名","总金额","现金支付","账户支付","支付宝支付","微信支付","其他支付","收费日期","收费状态","退费日期"]
-              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室',"医生姓名","收费类别","收费者姓名","总金额","现金支付","账户支付","支付宝支付","微信支付","其他支付","收费日期","收费状态","退费日期"]
+              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期']
+              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期']
               const data = this.formatJson(filterVal, list)
               excel.export_json_to_excel({
                 header: tHeader,
                 data,
-                filename: "消费明细"
+                filename: '消费明细'
               })
             })
 
           }
         })
 
-      },  formatJson(filterVal, jsonData) {
+      }, formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
       },
-      changeDoctor(){
+      changeDoctor() {
         this.page = 1
-        this.keywords=""
+        this.keywords = ''
         this.getHisOrderList()
       },
-      handleSizeChange(limit){
-        this.limit = limit;
+      handleSizeChange(limit) {
+        this.limit = limit
         this.getHisOrderList()
 
-      },handleCurrentChange(page){
-        this.page = page;
+      }, handleCurrentChange(page) {
+        this.page = page
         this.getHisOrderList()
 
-
       },
-      handleStartTimeChange(){
+      handleStartTimeChange() {
         this.page = 1
-        this.keywords=""
+        this.keywords = ''
         this.getHisOrderList()
-      },handleEndTimeChange(){
+      }, handleEndTimeChange() {
         this.page = 1
-        this.keywords=""
+        this.keywords = ''
         this.getHisOrderList()
       },
-      searchAction(){
+      searchAction() {
         this.page = 1
         this.getHisOrderList()
 
-
       },
       getTimes(time) {
-        return uParseTime(time, "{y}-{m}-{d}");
+        return uParseTime(time, '{y}-{m}-{d}')
       },
       toDetail(row) {
-        this.$router.push('/outpatientCharges/summaryDetail?patient_id='+row.patient.id+"&number="+row.number+"&id="+row.id)
+        this.$router.push('/outpatientCharges/summaryDetail?patient_id=' + row.patient.id + '&number=' + row.number + '&id=' + row.id)
       }, getTime(value, temp) {
         if (value != undefined) {
           return uParseTime(value, temp)
         }
         return ''
-      },getHisOrderList(){
-        let params= {
-          page : this.page,
+      }, getHisOrderList() {
+        let params = {
+          page: this.page,
           limit: this.limit,
-          keywords:this.keywords,
-          start_time:this.start_time,
+          keywords: this.keywords,
+          start_time: this.start_time,
           end_time: this.end_time,
           type: this.admin_user_id
         }
@@ -378,7 +459,7 @@
           }
         })
 
-      },getDoctorList(){
+      }, getDoctorList() {
         getDoctorList().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -388,16 +469,20 @@
           }
         })
       },
-      open(index){
-        if(index == 1){
+      open(index) {
+        if (index == 1) {
           this.listVisible = true
-        }else if(index == 2){
+        } else if (index == 2) {
           this.allListVisible = true
         }
       }
     }, created() {
-     this.getDoctorList()
-     this.getHisOrderList()
+
+
+      this.fetchAllAdminUsers()
+      this.getDoctorList()
+      this.getHisOrderList()
+
 
 
     }

src/xt_pages/outpatientRegistration/index.vue

@@ -1427,8 +1427,16 @@
 
     },
     created() {
-      this.getInitData()
 
+      if(this.$store.getters.xt_user.org_id == 9504 ||  this.$store.getters.xt_user.org_id == 10028){
+        this.form.certificates = 2
+        this.form.id_card_type = 1
+      }else{
+        this.form.certificates = 1
+        this.form.id_card_type = 2
+      }
+
+      this.getInitData()
       //获取当前机构有人员信息
       this.getAllDoctorList()
       //获取今日排班的患者