提交代码

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -79,19 +79,9 @@
       <div class="mainRight">
 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
-          <div v-if="org_id == 10454">
-            <el-button  size="small"
-                        @click="openZb(1)"
-                        v-if=" this.order.id == 0"
-                        type="primary">记账
-            </el-button>
-            <el-button   size="small"
-                         @click="openZb(2)"
-                         type="primary">撤销记账
-            </el-button>
-          </div>
 
-          <div v-if="org_id == 10206">
+
+          <div v-if="org_id == 10206  || org_id == 0">
             <el-button  size="small"
                         @click="openZb(1)"
                         v-if=" this.order.id == 0"
@@ -103,7 +93,7 @@
             </el-button>
           </div>
 
-          <div  v-if="org_id != 10206 && org_id != 10340 && org_id != 10454">
+          <div  v-if="org_id != 10206 && org_id != 10340 && org_id != 0">
             <!--            <el-button size="small"-->
             <!--                       @click="openZb(1)"-->
             <!--                       type="primary">登记-->
@@ -244,7 +234,7 @@
                                            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">收费  
+                                           type="primary">收费
                                 </el-button>
                               </div>
                             </div>
@@ -252,7 +242,7 @@
                             <prescription-table ref="prescription_tables"
                                               :prescription="items.curPrescriptions"
                                               :manufacturers="manufacturers"></prescription-table>
-                          
+
                         </el-tabs>
 
                       <div class="costBox">
@@ -325,7 +315,7 @@
                   <div>
                     <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
 
-                      <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
+                      <el-form-item label="大病类别：" prop="sick_type" >
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.sick_type" placeholder="">
                           <el-option
@@ -337,7 +327,7 @@
                         </el-select>
                       </el-form-item>
 
-                      <el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">
+                      <el-form-item label="诊断：" prop="diagnosis" >
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.diagnosis" multiple placeholder="">
                           <el-option
@@ -551,7 +541,7 @@
                     <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
 
 
-                      <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
+                      <el-form-item label="大病类别：" prop="sick_type" >
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.sick_type" placeholder="">
                           <el-option
@@ -563,7 +553,7 @@
                         </el-select>
                       </el-form-item>
 
-                      <el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">
+                      <el-form-item label="诊断：" prop="diagnosis" >
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.diagnosis" multiple placeholder="">
                           <el-option
@@ -781,7 +771,7 @@
                   <div>
                     <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
 
-                      <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
+                      <el-form-item label="大病类别：" prop="sick_type" >
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.sick_type" placeholder="">
                           <el-option
@@ -793,7 +783,7 @@
                         </el-select>
                       </el-form-item>
 
-                      <el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">
+                      <el-form-item label="诊断：" prop="diagnosis" >
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.diagnosis" multiple placeholder="">
                           <el-option
@@ -4468,18 +4458,36 @@ export default {
           let two_count = 0
 
           for (let i = 0; i < response.data.data.list.length; i++) {
-            if (response.data.data.list[i].his_patient.length > 0) {
-              let obj = {
-                id: response.data.data.list[i].id,
-                name: response.data.data.list[i].name,
-                number: response.data.data.list[i].his_patient[0].number,
-                order_status: 0,
-                his_patient_id: response.data.data.list[i].his_patient[0].id,
-                order_number: '',
-                order_id: 0,
-                prescription: response.data.data.list[i].prescription
+            if (this.org_id == 10206 || this.org_id == 0){
+                let obj = {
+                  id: response.data.data.list[i].id,
+                  name: response.data.data.list[i].name,
+                  order_status: 0,
+                  order_number: '',
+                  order_id: 0,
+                  prescription: response.data.data.list[i].prescription
+                }
+                if(response.data.data.list[i].his_patient&& response.data.data.list[i].his_patient.length > 0){
+                  obj["his_patient_id"] = response.data.data.list[i].his_patient[0].id
+                  obj["number"] = response.data.data.list[i].his_patient[0].number
+                }
+
+                this.all_table_data.push(obj)
+            }else{
+              if (response.data.data.list[i].his_patient.length > 0) {
+                let obj = {
+                  id: response.data.data.list[i].id,
+                  name: response.data.data.list[i].name,
+                  number: response.data.data.list[i].his_patient[0].number,
+                  order_status: 0,
+                  his_patient_id: response.data.data.list[i].his_patient[0].id,
+                  order_number: '',
+                  order_id: 0,
+                  prescription: response.data.data.list[i].prescription
+                }
+                this.all_table_data.push(obj)
               }
-              this.all_table_data.push(obj)
+
             }
 
           }