ソースを参照

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

csx 3 年 前
コミット
e995e6d8a4

+ 2 - 2
config/index.js ファイルの表示

@@ -29,8 +29,8 @@ module.exports = {
29 29
 
30 30
     // host: 'xt.test.sgjyun.com',
31 31
     //  host: 'xt.kuyicloud.com',
32
-   host: 'xt.test.sgjyun.com',
33
-  //  host: 'localhost',
32
+    host: 'xt.test.sgjyun.com',
33
+    // host: 'localhost',
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,

+ 25 - 1
src/xt_pages/dialysis/dialysisPrintOrder.vue ファイルの表示

@@ -583,6 +583,16 @@
583 583
           >打印</el-button
584 584
         >
585 585
       </template>
586
+      <template v-if="org_template_info.template_id == 43">
587
+        <el-button
588
+          :loading="loading"
589
+          size="small"
590
+          icon="el-icon-printer"
591
+          @click="printThisPage"
592
+          type="primary"
593
+          >打印</el-button
594
+        >
595
+      </template>
586 596
     </div>
587 597
     <div class="app-container" style="min-height:0;">
588 598
       <!--<div class="order-print-btn"-->
@@ -873,6 +883,11 @@
873 883
             v-if="org_template_info.template_id == 42"
874 884
           >
875 885
           </DialysisPrintOrderFortyTwo>
886
+          <DialysisPrintOrderFortyThree
887
+            v-bind:childResponse="childResponse"
888
+            v-if="org_template_info.template_id == 43"
889
+          >
890
+          </DialysisPrintOrderFortyThree>
876 891
         </div>
877 892
       </el-container>
878 893
     </div>
@@ -934,9 +949,11 @@ import DialysisPrintOrderThirtyNine from "./template/DialysisPrintOrderThirtyNin
934 949
 import DialysisPrintOrderForty from "./template/DialysisPrintOrderForty";
935 950
 import DialysisPrintOrderFortyOne from "./template/DialysisPrintOrderFortyOne";
936 951
 import DialysisPrintOrderFortyTwo from "./template/DialysisPrintOrderFortyTwo";
952
+import DialysisPrintOrderFortyThree from "./template/DialysisPrintOrderFortyThree";
937 953
 export default {
938 954
   name: "dialysisPrintOrder",
939 955
   components: {
956
+    DialysisPrintOrderFortyThree,
940 957
     DialysisPrintOrderFortyTwo,
941 958
     DialysisPrintOrderFortyOne,
942 959
     DialysisPrintOrderForty,
@@ -1141,7 +1158,7 @@ export default {
1141 1158
       const style =
1142 1159
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
1143 1160
       const style2 =
1144
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;}';
1161
+        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}';
1145 1162
       const style3 =
1146 1163
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px;border-color: #000;}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #000;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #000;text-align: center;white-space: nowrap; width: 50%;}';
1147 1164
       // const style3 =
@@ -1441,6 +1458,13 @@ export default {
1441 1458
           style: style10,
1442 1459
           scanStyles: false
1443 1460
         });
1461
+      } else if (this.org_template_info.template_id == 43) {
1462
+        printJS({
1463
+          printable: "dialysis-print-box-1",
1464
+          type: "html",
1465
+          style: style2,
1466
+          scanStyles: false
1467
+        });
1444 1468
       }
1445 1469
     },
1446 1470
     printThisOnePage() {

File diff suppressed because it is too large
+ 1447 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue


+ 3 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue ファイルの表示

@@ -124,13 +124,13 @@
124 124
           </td>
125 125
         </tr>
126 126
         <tr>
127
-          <td style="text-align:left;" colspan="1">
127
+          <!-- <td style="text-align:left;" colspan="1">
128 128
             <span style="display:inline-block;margin-left:15px;">
129 129
               净脱水:
130 130
               {{ afterdialysis.weight_loss ? afterdialysis.weight_loss : "/" }}kg
131 131
             </span>
132
-          </td>
133
-          <td style="text-align:left;" colspan="1">
132
+          </td> -->
133
+          <td style="text-align:left;" colspan="2">
134 134
             <span style="display:inline-block;margin-left:15px;">
135 135
               透析时长:
136 136
               {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "0" }}h

+ 6 - 3
src/xt_pages/outpatientCharges/invoicePrint.vue ファイルの表示

@@ -13,9 +13,12 @@
13 13
     </template>
14 14
     <div class="app-container" style="padding-top:40px;">
15 15
         <div class='dialysisPage'>
16
-            <printOne v-if="org_id != 10106" :paramsObj="invoiceParams"></printOne>
17
-            <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
18
-            <!-- <printThree :paramsObj="invoiceParams"></printThree> -->
16
+          <div v-if="org_id != 10106" >
17
+            <printOne v-if="org_id != 10088" :paramsObj="invoiceParams"></printOne>
18
+            <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
19
+          </div>
20
+          <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
21
+            
19 22
         </div>
20 23
     </div>
21 24
   </div>

+ 3 - 3
src/xt_pages/outpatientCharges/statementTemplate/printOne.vue ファイルの表示

@@ -89,9 +89,9 @@
89 89
         <td>床号</td>
90 90
         <td></td>
91 91
         <td>入院日期</td>
92
-        <td>{{info.begndate}}</td>
92
+        <td>{{info.begndate ? info.begndate.split(' ')[0] : ''}}</td>
93 93
         <td>出院日期</td>
94
-        <td width="100">{{info.enddate}}</td>
94
+        <td width="100">{{info.enddate ? info.enddate.split(' ')[0] : ''}}</td>
95 95
         <td>住院天数</td>
96 96
         <td>{{getDay(info.begndate,info.enddate)}}</td>
97 97
 
@@ -123,7 +123,7 @@
123 123
         <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '21'">普通住院</td>
124 124
 
125 125
         <td>结算时间</td>
126
-        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time}}</td>
126
+        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
127 127
       </tr>
128 128
       <tr>
129 129
         <td colspan="12" style="text-align:left;padding-left:10px;">

+ 5 - 3
src/xt_pages/workforce/components/tableWeeks.vue ファイルの表示

@@ -421,7 +421,7 @@
421 421
         prescription_status: false,
422 422
         week: false,
423 423
         name: false,
424
-        zone: false,
424
+        zone_name: false,
425 425
         classes: false,
426 426
         number: false,
427 427
         mode: false,
@@ -874,6 +874,7 @@
874 874
       ,
875 875
       signPrint() {
876 876
         var zone = this.zone
877
+        console.log("zone23232",zone)
877 878
         var newArr = []
878 879
         for(let i=0;i<this.zoneList.length;i++){
879 880
            newArr.push(this.zoneList[i].id)
@@ -1287,6 +1288,7 @@
1287 1288
       }
1288 1289
       ,
1289 1290
       printActionSetting() {
1291
+        this.getAllZoneList()
1290 1292
         this.getlist()
1291 1293
         this.dialogVisible = true
1292 1294
 
@@ -1463,10 +1465,10 @@
1463 1465
               this.week = false
1464 1466
             }
1465 1467
             if (list.zone == 1) {
1466
-              this.zone = true
1468
+              this.zone_name = true
1467 1469
             }
1468 1470
             if (list.zone == 2) {
1469
-              this.zone = false
1471
+              this.zone_name = false
1470 1472
             }
1471 1473
             if (list.mode == 1) {
1472 1474
               this.mode = true

+ 7 - 0
src/xt_pages/workforce/remind_print_setting.vue ファイルの表示

@@ -29,6 +29,8 @@
29 29
                   <span v-if="org_id == 10138">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
30 30
                   <span v-else >{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span>
31 31
                 </div> 
32
+               <div v-if="org_id == 10188">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
33
+                <div v-if="org_id == 10188">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
32 34
                 <div>用量:  
33 35
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
34 36
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
@@ -42,6 +44,9 @@
42 44
                   <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
43 45
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
44 46
                 </div> 
47
+                <div v-if="org_id == 10188">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
48
+                <div v-if="org_id == 10188">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
49
+                <div v-if="org_id == 10188">体重增加:{{main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight}}</div>
45 50
                 <div>用法:静脉注射</div> 
46 51
                 <div>打印时间:{{currentDate}}</div>
47 52
               </div>
@@ -96,6 +101,7 @@
96 101
      this.type = this.$route.query.type
97 102
      this.getPrintList()
98 103
      this.org_id = this.$store.getters.xt_user.org.id
104
+     console.log("机构ID",this.org_id)
99 105
      this.currentDate = this.getCurrentDate()
100 106
    
101 107
      this.modeOptions = this.$store.getters.treatment_mode
@@ -115,6 +121,7 @@
115 121
        getScheduleList(params).then(response=>{
116 122
          if(response.data.state ==1){
117 123
            var list = response.data.data.list
124
+           console.log("本周信息",list)
118 125
            for(let i=0;i<list.length;i++){
119 126
               list[i].sort = list[i].number.sort
120 127
            }

+ 12 - 12
src/xt_permission.js ファイルの表示

@@ -13,18 +13,18 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
13 13
 router.beforeEach((to, from, next) => {
14 14
   // 线上注释
15 15
   // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-  //       store.dispatch('VerifyConfigList', []).then(() => {
17
-  //         next()
18
-  //       })
19
-  //     }
20
-  //     if (store.getters.permission_routers === undefined) {
21
-  //       store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-  //         next()
23
-  //       })
24
-  //     } else {
25
-  //       next()
26
-  //     }
27
-  //   return
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28 28
   // 线上注释
29 29
 
30 30
   NProgress.start()