518合并代码

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -230,6 +230,7 @@
                 template_id == 46 ||
                 template_id == 47 ||
                 template_id == 48 ||
+                template_id == 51 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
@@ -281,6 +282,7 @@
               template_id != 46 &&
               template_id != 47 &&
               template_id != 48 &&
+               template_id != 51 &&
               org_id!= 10210 &&
               org_id != 9555
             "
@@ -1061,6 +1063,7 @@
                 template_id == 46 ||
                 template_id == 47 ||
                 template_id == 48 ||
+                template_id == 51 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
@@ -1103,7 +1106,9 @@
               template_id != 44 &&
               template_id != 46 &&
               template_id != 47 &&
+              template_id != 51 &&
               template_id == 48 &&
+             
               org_id !=  10210 &&
               org_id != 9555
             "

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -53,7 +53,7 @@
                     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>
+              <template slot-scope="scope">{{ scope.$index + 1 }}.{{ 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 : '' }}
@@ -83,7 +83,7 @@
 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
-          <div v-if="this.$store.getters.xt_user.org_id == 10340">
+          <div v-if="org_id == 10340">
                         <el-button size="small"
                                    @click="openZb(1)"
                                    type="primary">登记
@@ -102,7 +102,7 @@
           </div>
 
 
-          <div  v-if="this.$store.getters.xt_user.org_id != 10340">
+          <div  v-if="org_id != 10340">
 <!--            <el-button size="small"-->
 <!--                       @click="openZb(1)"-->
 <!--                       type="primary">登记-->
@@ -185,14 +185,14 @@
                             <div style="margin-bottom:10px;float: right">
                               <div>
                                 <el-button
-                                    v-if="(hisPatientInfo.id_card_type != 3 && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && this.$store.getters.xt_user.org_id != 10340)"
+                                    v-if="(hisPatientInfo.id_card_type != 3 && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id != 10340)"
                                     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 && this.$store.getters.xt_user.org_id != 10340"
+                                    v-if="items.curPrescriptions.order.order_status == 1 && hisPatientInfo.balance_accounts_type != 2 && org_id != 10340"
                                     size="small"
                                     @click="open(11,items.med_type,items.prescriptions[0].order,items.prescriptions)"
                                     type="primary"
@@ -203,7 +203,7 @@
 
 
                                 <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)&&this.$store.getters.xt_user.org_id != 10340"
+                                           v-if="((hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3)&& org_id != 10340"
                                            size="small"
                                            @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"
                                            type="primary">收费