Ver código fonte

批量打印

XMLWAN 4 anos atrás
pai
commit
3fddff6249

+ 1 - 1
config/index.js Ver arquivo

@@ -30,7 +30,7 @@ module.exports = {
30 30
     //  host: 'xt.test.sgjyun.com',
31 31
     //  host: 'xt.kuyicloud.com',
32 32
     // host: 'xt.test.sgjyun.com',
33
-    host: 'localhost',
33
+    host: 'xt.test.sgjyun.com',
34 34
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
35 35
     autoOpenBrowser: true,
36 36
     errorOverlay: true,

+ 1 - 1
package-lock.json Ver arquivo

@@ -7943,7 +7943,7 @@
7943 7943
     },
7944 7944
     "normalize-wheel": {
7945 7945
       "version": "1.0.1",
7946
-      "resolved": "http://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
7946
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
7947 7947
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
7948 7948
     },
7949 7949
     "normalize.css": {

+ 4 - 4
src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue Ver arquivo

@@ -1399,8 +1399,8 @@ export default {
1399 1399
 
1400 1400
         this.prescription = response.data.data.dialysisPrescription;
1401 1401
 
1402
-        this.receiverTreatmentAccess =
1403
-          response.data.data.receiverTreatmentAccess;
1402
+        this.receiverTreatmentAccess =response.data.data.receiverTreatmentAccess;
1403
+        console.log("透析监测",this.receiverTreatmentAccess)
1404 1404
         this.prescription.mode = this.modeName(this.prescription.mode_id);
1405 1405
         var rwLen = this.replacementWays.length;
1406 1406
         this.prescription.replacement = "";
@@ -1738,10 +1738,10 @@ export default {
1738 1738
       }
1739 1739
     },
1740 1740
     "patientInfo.source": function() {
1741
-      if (this.patientInfo.source == 1) {
1741
+      if (this.receiverTreatmentAccess.condition == 2 ) {
1742 1742
         this.patientInfo_source_1 = true;
1743 1743
         this.patientInfo_source_2 = false;
1744
-      } else if (this.patientInfo.source == 2) {
1744
+      } else if (this.receiverTreatmentAccess.condition == 1) {
1745 1745
         this.patientInfo_source_2 = true;
1746 1746
         this.patientInfo_source_1 = false;
1747 1747
       } else {

+ 3 - 3
src/xt_pages/outpatientCharges/treatTemplate/printOne.vue Ver arquivo

@@ -46,7 +46,7 @@
46 46
                     </div>
47 47
                     <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
48 48
                         <p style="width:50%;">现金支付</p>
49
-                        <p style="width:50%;"></p>
49
+                        <p style="width:50%;">{{list.order_info.psn_cash_pay}}</p>
50 50
                     </div>
51 51
                 </div>
52 52
                 <div style="width:80%;display:flex;height:600px;">
@@ -71,8 +71,8 @@
71 71
             
72 72
         </div>
73 73
         <div class="moneyBox">
74
-            <p>实收金:</p>
75
-            <p>记账前金额:</p>
74
+            <p>实收金:{{list.order_info.medfee_sumamt}}</p>
75
+            <p>记账前金额:{{list.order_info.preselfpay_amt}}</p>
76 76
             <p>扣款金额:</p>
77 77
             <p>记账后金额:</p>
78 78
             <p>找赎金:</p>

+ 4 - 4
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Ver arquivo

@@ -370,15 +370,16 @@
370 370
         })
371 371
       },
372 372
       open(index) {
373
-        if(this.prescriptions.length == 0){
373
+        console.log("index0999999",this.prescriptions)
374
+         if(this.prescriptions[0].advices.length == 0){
374 375
            this.$message.error("请先开处方")
375 376
            return
376
-        }
377
+          }
377 378
         this.index = index
378 379
         if (index == 1) {
379 380
           this.$refs.prescriptions.open(1)
380 381
         } else if (index == 2) {
381
-
382
+         
382 383
           this.getPrescriptionList(this.patientid)
383 384
           // this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id)
384 385
         } else if (index == 3) {
@@ -387,7 +388,6 @@
387 388
           this.$refs.prescriptions.open(4)
388 389
         }else if(index == 6){
389 390
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
390
-
391 391
           this.getPrescriptionList(this.patientid)
392 392
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
393 393
 

+ 3 - 3
src/xt_pages/outpatientDoctorStation/template/printOne.vue Ver arquivo

@@ -30,10 +30,10 @@
30 30
             <p>日期:{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
31 31
         </div>
32 32
         <div class="actionBar">
33
-            <p>审核:{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</p>
33
+            <p>审核:{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
34 34
             <p>配对:{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</p>
35
-            <p>核对:{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</p>
36
-            <p>发药:{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</p>
35
+            <p>核对:{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
36
+            <p>发药:{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
37 37
             <p>药费:</p>
38 38
         </div>
39 39
     </div>

+ 16 - 2
src/xt_pages/outpatientRegistration/index.vue Ver arquivo

@@ -117,7 +117,7 @@
117 117
                         </el-select>
118 118
                     </el-form-item>
119 119
                     <el-form-item label="医生:"  prop="doctor" :validate-event="is_Name" >
120
-                        <el-select v-model="form.doctor" placeholder="请选择">
120
+                        <el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">
121 121
                             <el-option
122 122
                             v-for="item in doctorList"
123 123
                             :key="item.admin_user_id"
@@ -394,6 +394,7 @@ export default {
394 394
            getAllDoctorList().then(response=>{
395 395
              if(response.data.state == 1){
396 396
                var doctor =  response.data.data.doctor
397
+               console.log("doctor-----",doctor)
397 398
                this.doctorList = doctor
398 399
                var department = response.data.data.department
399 400
                console.log("department",department)
@@ -520,8 +521,21 @@ export default {
520 521
        },
521 522
        getDictionaryDataConfig(module, filed_name) {
522 523
         return getDictionaryDataConfig(module, filed_name)
523
-
524 524
       },
525
+
526
+      changeDoctor(id){
527
+          
528
+         for(let i=0;i<this.doctorList.length;i++){
529
+            if(this.doctorList[i].admin_user_id == id){
530
+              if(this.doctorList[i].department_id == 0){
531
+                 this.form.department = this.departmentList[0].id
532
+              }else{
533
+                this.form.department = this.doctorList[i].department_id
534
+              }
535
+             
536
+            }
537
+         }
538
+      }
525 539
     },
526 540
     created(){
527 541
       //获取当前机构有人员信息