XMLWAN пре 4 година
родитељ
комит
4b37281439

+ 2 - 2
src/xt_pages/data/medicalTemplate.vue Прегледај датотеку

735
           remark:""  
735
           remark:""  
736
         },
736
         },
737
         rules: {
737
         rules: {
738
-            title: [{ required: true, message: "请输入标题", trigger: "blur" }],
739
-            content: [{ required: true, message: "请输入内容", trigger: "blur" }]
738
+            title: [{ required: true, message: "请输入标题"}],
739
+            content: [{ required: true, message: "请输入内容"}]
740
         },
740
         },
741
         tabledata:[],
741
         tabledata:[],
742
         tabledataOne:[],
742
         tabledataOne:[],

+ 6 - 4
src/xt_pages/outpatientCharges/treatTemplate/printOne.vue Прегледај датотеку

6
             <p class="infoP">名称:血液透析中心</p>
6
             <p class="infoP">名称:血液透析中心</p>
7
             <p class="infoP">医生工号:</p>
7
             <p class="infoP">医生工号:</p>
8
             <p class="infoP">门诊流水号:</p>
8
             <p class="infoP">门诊流水号:</p>
9
-            <p class="infoP">科别:{{list.p_info.departments}}</p>
9
+            <p class="infoP">科别:{{list.p_info.departments?list.p_info.departments:""}}</p>
10
             <p class="infoP">处方单据号:</p>
10
             <p class="infoP">处方单据号:</p>
11
             <p class="infoP">姓名:{{patient.name}}</p>
11
             <p class="infoP">姓名:{{patient.name}}</p>
12
             <p class="infoP">医疗账号:</p>
12
             <p class="infoP">医疗账号:</p>
34
                     </div>
34
                     </div>
35
                     <div class="chargeUl" style="border-top:1px solid #000;"> 
35
                     <div class="chargeUl" style="border-top:1px solid #000;"> 
36
                         <p style="width:50%;">费用合计</p>
36
                         <p style="width:50%;">费用合计</p>
37
-                        <p style="width:50%;"></p>
37
+                        <p style="width:50%;">{{list.order_info.medfee_sumamt?list.order_info.medfee_sumamt:""}}</p>
38
                     </div>
38
                     </div>
39
                     <div class="chargeUl" style="border-top:1px solid #000;">
39
                     <div class="chargeUl" style="border-top:1px solid #000;">
40
                         <p style="width:50%;">记账支付</p>
40
                         <p style="width:50%;">记账支付</p>
71
             
71
             
72
         </div>
72
         </div>
73
         <div class="moneyBox">
73
         <div class="moneyBox">
74
-            <p>实收金:{{list.order_info.medfee_sumamt}}</p>
75
-            <p>记账前金额:{{list.order_info.preselfpay_amt}}</p>
74
+            <p>实收金:{{list.order_info.medfee_sumamt?list.order_info.medfee_sumamt:''}}</p>
75
+            <p>记账前金额:{{list.order_info.preselfpay_amt?list.order_info.preselfpay_amt:""}}</p>
76
             <p>扣款金额:</p>
76
             <p>扣款金额:</p>
77
             <p>记账后金额:</p>
77
             <p>记账后金额:</p>
78
             <p>找赎金:</p>
78
             <p>找赎金:</p>
116
                var patient = response.data.data.patient
116
                var patient = response.data.data.patient
117
                console.log("patient",patient)
117
                console.log("patient",patient)
118
                this.patient  = patient
118
                this.patient  = patient
119
+               var histpatient =   response.data.data.hisPatient
120
+               console.log("hispatient",histpatient)
119
             }
121
             }
120
          })
122
          })
121
        }
123
        }

+ 0 - 3
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Прегледај датотеку

575
             this.doctors = response.data.data.doctors
575
             this.doctors = response.data.data.doctors
576
             this.department = response.data.data.department
576
             this.department = response.data.data.department
577
             this.sick = response.data.data.sick
577
             this.sick = response.data.data.sick
578
-
579
-            this.sick = response.data.data.sick
580
-
581
             this.diagnoses = response.data.data.diagnose
578
             this.diagnoses = response.data.data.diagnose
582
             // var info = response.data.data.info
579
             // var info = response.data.data.info
583
             // if (info.user_type == 2 || info.user_type == 1) {
580
             // if (info.user_type == 2 || info.user_type == 1) {

+ 2 - 1
src/xt_pages/outpatientDoctorStation/components/deskRecord.vue Прегледај датотеку

423
                 this.case_history.personal_history =    templatedetail.personal_history
423
                 this.case_history.personal_history =    templatedetail.personal_history
424
                 this.case_history.family_history = templatedetail.family_history
424
                 this.case_history.family_history = templatedetail.family_history
425
                 this.case_history.diagnostic = templatedetail.diagnostic
425
                 this.case_history.diagnostic = templatedetail.diagnostic
426
-
426
+                this.case_history.doctor_advice = templatedetail.doctor_advice
427
+                this.case_history.remark = templatedetail.remark
427
               }
428
               }
428
           })
429
           })
429
         },
430
         },

+ 1 - 2
src/xt_pages/outpatientDoctorStation/template/printOne.vue Прегледај датотеку

168
             }
168
             }
169
               addtotal =  Math.floor(addtotal * 100) / 100
169
               addtotal =  Math.floor(addtotal * 100) / 100
170
         }
170
         }
171
-        
172
-        return total + addtotal
173
        }
171
        }
172
+       return total + addtotal
174
       }, 
173
       }, 
175
 
174
 
176
 
175
 

+ 3 - 3
src/xt_pages/outpatientRegistration/index.vue Прегледај датотеку

148
                             </el-option>
148
                             </el-option>
149
                         </el-select>
149
                         </el-select>
150
                     </el-form-item>
150
                     </el-form-item>
151
-                    <el-form-item>
151
+                    <!-- <el-form-item>
152
                         <el-checkbox v-model="form.costChecked">是否需要工本费</el-checkbox>
152
                         <el-checkbox v-model="form.costChecked">是否需要工本费</el-checkbox>
153
-                    </el-form-item>
153
+                    </el-form-item> -->
154
                     <el-form-item label="挂号费:">
154
                     <el-form-item label="挂号费:">
155
                         <el-input v-model.number="form.registrationFee"></el-input>
155
                         <el-input v-model.number="form.registrationFee"></el-input>
156
                     </el-form-item>
156
                     </el-form-item>
158
                         <el-input v-model.number="form.medicalExpenses"></el-input>
158
                         <el-input v-model.number="form.medicalExpenses"></el-input>
159
                     </el-form-item>
159
                     </el-form-item>
160
                     <el-form-item label="工本费:">
160
                     <el-form-item label="工本费:">
161
-                        <el-input v-model.number="form.cost" :readonly="!form.costChecked"></el-input>
161
+                        <el-input v-model.number="form.cost"></el-input>
162
                     </el-form-item>
162
                     </el-form-item>
163
                     <el-form-item label="合计:">
163
                     <el-form-item label="合计:">
164
                         <el-input v-model.number="total" readonly></el-input>
164
                         <el-input v-model.number="total" readonly></el-input>

+ 16 - 3
src/xt_pages/outpatientRegistration/registrationHistory.vue Прегледај датотеку

93
                 </el-table-column>
93
                 </el-table-column>
94
                 <el-table-column align="center" prop="name" label="工本费" width="70">
94
                 <el-table-column align="center" prop="name" label="工本费" width="70">
95
                     <template slot-scope="scope">{{ scope.row.cost_of_production }}</template>
95
                     <template slot-scope="scope">{{ scope.row.cost_of_production }}</template>
96
+                </el-table-column>
97
+                 <el-table-column align="center" prop="name" label="结算类型" width="70">
98
+                    <template slot-scope="scope">{{getBanlance(scope.row.balance_accounts_type) }}</template>
96
                 </el-table-column>
99
                 </el-table-column>
97
                 <el-table-column align="center" prop="name" label="操作人" width="70">
100
                 <el-table-column align="center" prop="name" label="操作人" width="70">
98
                     <template slot-scope="scope">{{creator}}</template>
101
                     <template slot-scope="scope">{{creator}}</template>
184
                     <el-form-item label="科室:"  prop="department" :validate-event="is_Name">
187
                     <el-form-item label="科室:"  prop="department" :validate-event="is_Name">
185
                       <div>{{ getDepartMent(form.departments) }}</div>
188
                       <div>{{ getDepartMent(form.departments) }}</div>
186
                     </el-form-item>
189
                     </el-form-item>
187
-                    <el-form-item label="是否需要工本费:"> 
190
+                    <!-- <el-form-item label="是否需要工本费:"> 
188
                       <div v-if="form.is_need_cost_of_production == 1">是</div>
191
                       <div v-if="form.is_need_cost_of_production == 1">是</div>
189
                       <div v-else>否</div>
192
                       <div v-else>否</div>
190
-                    </el-form-item>
193
+                    </el-form-item> -->
194
+                    
191
                     <el-form-item label="挂号费:">
195
                     <el-form-item label="挂号费:">
192
                       <div>{{ form.register_cost }}</div>
196
                       <div>{{ form.register_cost }}</div>
193
                     </el-form-item>
197
                     </el-form-item>
580
         })
584
         })
581
         return str
585
         return str
582
       },
586
       },
583
-
587
+      
588
+      getBanlance(id){
589
+        var label = ""
590
+         for(let i=0;i<this.settlement.length;i++){
591
+            if(id == this.settlement[i].value){
592
+               label = this.settlement[i].label
593
+             }
594
+         }
595
+         return label
596
+      }
584
     }
597
     }
585
 }
598
 }
586
 </script>
599
 </script>