Domů Procházet Nápověda
Registrovat se Přihlásit se
elizebath
/
elizebeth
rozštěpen z csx/Vue_New
Sledovat 1
Oblíbit 0
Rozštěpit 0
Zdrojový kód Úkoly 0 Požadavky na natažení 0 Vydání 0 Wiki Activity
Procházet zdrojové kódy

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

csx před 3 roky
rodič
0f95c59f6d e28be8b886
revize
dad2051ddf
4 změnil soubory, kde provedl 81 přidání a 66 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 7 0
      src/components/Editor/index.vue
  2. 1 1
      src/xt_pages/outpatientCharges/invoicePrint.vue
  3. 62 62
      src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue
  4. 11 3
      src/xt_pages/workforce/components/tableData.vue

+ 7 - 0
src/components/Editor/index.vue Zobrazit soubor 

@@ -30,6 +30,10 @@
30 30 
             'justifycenter', //居中对齐
31 31 
             'justifyright', //居右对齐
32 32 
             'justifyjustify', //两端对齐
33 
+            'formatmatch', //格式刷
34 
+            'fontsize', //字体大小
35 
+            'fontfamily', //字体
36 
+            'forecolor', //字体颜色
33 37 
           ]]
34 38 
           // scaleEnabled: true,
35 39 
         })
 
@@ -85,4 +89,7 @@
85 89 
   .edui-editor {
86 90 
     z-index: 60 !important;
87 91 
   }
92 
+  #edui_fixedlayer{
93 
+    z-index: 5000 !important;
94 
+  }
88 95 
 </style>

+ 1 - 1
src/xt_pages/outpatientCharges/invoicePrint.vue Zobrazit soubor 

@@ -74,7 +74,7 @@ export default {
74 74 
     },
75 75 
     printThisPage() {
76 76 
         const style =
77 
-        '@media print {#invoice-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
77 
+        '@media print {#invoice-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
78 78 
         printJS({
79 79 
             printable: "invoice-print",
80 80 
             type: "html",

+ 62 - 62
src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue Zobrazit soubor 

@@ -1,141 +1,141 @@
1 1 
 <template>
2 
-    <div id='invoice-print' style="font-size:14px;">
2 
+    <div id='invoice-print' style="font-size:12px;">
3 3 
         <div style="display:flex;">
4 
-            <div style="position: absolute;top:65px;left:60px;">{{ list.order_number }}</div>
4 
+            <div style="position: absolute;top:50px;left:60px;">{{ list.order_number }}</div>
5 5 
             <!-- <div>{{ list.id_card_no }}</div> -->
6 6 
         </div>
7 7 
         <div style="display:flex;justify-content: space-between;">
8 8 
             <!-- <div>{{ list.department_name }}</div> -->
9 
-            <div  style="position: absolute;top:65px;left:280px">{{ list.id_card_no }}</div>
9 
+            <div  style="position: absolute;top:50px;left:260px">{{ list.id_card_no }}</div>
10 10 
             <div></div>
11 11 
         </div>
12 12 
         <div style="display:flex;justify-content: space-between;">
13 13 
             <!-- <div>{{ list.department_name }}</div> -->
14 
-            <div  style="position: absolute;top:85px;left:90px">门诊</div>
14 
+            <div  style="position: absolute;top:70px;left:90px">门诊</div>
15 15 
             <div></div>
16 
-            <div  style="position: absolute;top:85px;left:240px">{{ list.number }}</div>
17 
-            <div  style="position: absolute;left:480px;top:85px;">
16 
+            <div  style="position: absolute;top:70px;left:240px">{{ list.number }}</div>
17 
+            <div  style="position: absolute;left:470px;top:70px;">
18 18 
                 <span>{{ printDate.slice(0,4) }}</span>
19 19 
             </div>
20 
-            <div  style="position: absolute;left:530px;top:85px;">
21 
-                <span>{{ printDate.slice(5,7) }}</span>
20 
+            <div  style="position: absolute;left:530px;top:70px;">
21 
+                <span>{{ parseInt(printDate.slice(5,7)) }}</span>
22 22 
             </div>
23 
-            <div  style="position: absolute;left:580px;top:85px;">
24 
-                <span>{{ printDate.slice(8,11) }}</span>
23 
+            <div  style="position: absolute;left:560px;top:70px;">
24 
+                <span>{{ parseInt(printDate.slice(8,11)) }}</span>
25 25 
             </div>
26 26 
         </div>
27 27 
         <div style="display:flex;justify-content: space-between;">
28 
-            <div style="position: absolute;top:100px;left:120px;"> {{ paramsObj.name }}</div>
29 
-            <div style="position: absolute;top:100px;left:200px;">√</div>
28 
+            <div style="position: absolute;top:85px;left:100px;"> {{ paramsObj.name }}</div>
29 
+            <div style="position: absolute;top:85px;left:180px;">√</div>
30 30 
             <!-- <div>{{ list.pay_way }}</div> -->
31 
-            <div style="position: absolute;top:100px;left:400px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
32 
-            <div style="position: absolute;top:100px;left:580px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
31 
+            <div style="position: absolute;top:85px;left:380px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
32 
+            <div style="position: absolute;top:85px;left:530px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
33 33 
         </div>
34 34 
         <div style="display:flex;justify-content: space-between;">
35 35 
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
36 
-            <div v-if="paramsObj.gend == 1" style="position: absolute;top:120px;left:60px;">√</div>
37 
-            <div v-else style="position: absolute;top:120px;left:100px;">√</div>
38 
-            <div style="position: absolute;top:130px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
39 
-            <div style="position: absolute;top:130px;left:420px;">{{ list.psn_cash_money }}</div>
40 
-            <div style="position: absolute;top:130px;left:580px;">现金</div>
36 
+            <div v-if="paramsObj.gend == 1" style="position: absolute;top:110px;left:100px;">√</div>
37 
+            <div v-else style="position: absolute;top:110px;left:140px;">√</div>
38 
+            <div style="position: absolute;top:110px;left:260px;">{{ (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
39 
+            <div style="position: absolute;top:110px;left:420px;">{{ list.psn_cash_money.toFixed(2) }}</div>
40 
+            <div style="position: absolute;top:110px;left:540px;">现金</div>
41 41 
         </div>
42 42 
         <div style="display:flex;justify-content: space-between;">
43 
-            <div style="position: absolute;top:165px;left:50px">西药</div>
44 
-            <div style="position: absolute;top:165px;left:130px">{{ list.westernMedicineCostTotal }}</div>
45 
-            <div style="position: absolute;top:165px;left:210px">检查费</div>
46 
-            <div style="position: absolute;top:165px;left:280px">{{ list.checkCostTotal }}</div>
47 
-            <div style="position: absolute;top:165px;left:340px">治疗费</div>
48 
-            <div style="position: absolute;top:165px;left:420px">{{ list.treatCostTotal }}</div>
49 
-            <div style="position: absolute;top:165px;left:480px">床位费</div>
50 
-            <div style="position: absolute;top:165px;left:580px">{{ list.bedCostTotal }}</div>
43 
+            <div style="position: absolute;top:145px;left:50px">西药</div>
44 
+            <div style="position: absolute;top:145px;left:130px">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
45 
+            <div style="position: absolute;top:145px;left:180px">检查费</div>
46 
+            <div style="position: absolute;top:145px;left:260px">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
47 
+            <div style="position: absolute;top:145px;left:340px">治疗费</div>
48 
+            <div style="position: absolute;top:145px;left:420px">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
49 
+            <div style="position: absolute;top:145px;left:480px">床位费</div>
50 
+            <div style="position: absolute;top:145px;left:540px">{{ list.bedCostTotal ? list.bedCostTotal.toFixed(2) : '' }}</div>
51 51 
         </div>
52 52 
         <div style="display:flex;justify-content: space-between;">
53 
-            <div style="position: absolute;top:185px;left:50px">中成药</div>
54 
-            <div style="position: absolute;top:185px;left:130px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
55 
-            <div style="position: absolute;top:185px;left:210px">化验费</div>
56 
-            <div style="position: absolute;top:185px;left:280px">{{ list.laboratoryCostTotal }}</div>
57 
-            <div style="position: absolute;top:185px;left:340px">手术费</div>
58 
-            <div style="position: absolute;top:185px;left:420px">{{ list.operationCostTotal }}</div>
59 
-            <div style="position: absolute;top:185px;left:480px">其他费</div>
60 
-            <div style="position: absolute;top:185px;left:580px">{{ list.otherCostTotal }}</div>
53 
+            <div style="position: absolute;top:170px;left:50px">中成药</div>
54 
+            <div style="position: absolute;top:170px;left:130px">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
55 
+            <div style="position: absolute;top:170px;left:180px">化验费</div>
56 
+            <div style="position: absolute;top:170px;left:260px">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
57 
+            <div style="position: absolute;top:170px;left:340px">手术费</div>
58 
+            <div style="position: absolute;top:170px;left:420px">{{ list.operationCostTotal ? list.operationCostTotal.toFixed(2) : '' }}</div>
59 
+            <div style="position: absolute;top:170px;left:480px">其他费</div>
60 
+            <div style="position: absolute;top:170px;left:540px">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
61 61 
         </div>
62 62 
         <div style="display:flex;justify-content: space-between;">
63 
-            <div style="position: absolute;top:205px;left:50px"></div>
64 
-            <div style="position: absolute;top:205px;left:130px"></div>
65 
-            <div style="position: absolute;top:205px;left:210px"></div>
66 
-            <div style="position: absolute;top:205px;left:280px"></div>
67 
-            <div style="position: absolute;top:205px;left:340px">材料费</div>
68 
-            <div style="position: absolute;top:205px;left:420px">{{ list.materialCostTotal }}</div>
69 
-            <div style="position: absolute;top:205px;left:480px"></div>
70 
-            <div style="position: absolute;top:205px;left:580px"></div>
63 
+            <div style="position: absolute;top:190px;left:50px"></div>
64 
+            <div style="position: absolute;top:190px;left:130px"></div>
65 
+            <div style="position: absolute;top:190px;left:180px"></div>
66 
+            <div style="position: absolute;top:190px;left:260px"></div>
67 
+            <div style="position: absolute;top:190px;left:340px">材料费</div>
68 
+            <div style="position: absolute;top:190px;left:420px">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
69 
+            <div style="position: absolute;top:190px;left:480px"></div>
70 
+            <div style="position: absolute;top:190px;left:540px"></div>
71 71 
         </div>
72 72 
         <div style="display:flex;justify-content: space-between;">
73 
-            <div style="position: absolute;top:225px;left:50px"></div>
74 
-            <div style="position: absolute;top:225px;left:130px"></div>
75 
-            <div style="position: absolute;top:225px;left:210px"></div>
76 
-            <div style="position: absolute;top:225px;left:280px">{{ list.psn_cash_money }}</div>
77 
-            <div style="position: absolute;top:225px;left:340px"></div>
78 
-            <div style="position: absolute;top:225px;left:420px"></div>
79 
-            <div style="position: absolute;top:225px;left:480px"></div>
80 
-            <div style="position: absolute;top:225px;left:580px"></div>
73 
+            <div style="position: absolute;top:210px;left:50px"></div>
74 
+            <div style="position: absolute;top:210px;left:130px"></div>
75 
+            <div style="position: absolute;top:210px;left:180px"></div>
76 
+            <div style="position: absolute;top:210px;left:260px">{{ list.psn_cash_money ? list.psn_cash_money.toFixed(2) : '' }}</div>
77 
+            <div style="position: absolute;top:210px;left:340px"></div>
78 
+            <div style="position: absolute;top:210px;left:420px"></div>
79 
+            <div style="position: absolute;top:210px;left:480px"></div>
80 
+            <div style="position: absolute;top:210px;left:540px"></div>
81 81 
         </div>
82 82 
         <div>
83 83 
             <span>
84 
-            <span  style="position: absolute;top:250px;left:200px">
84 
+            <span  style="position: absolute;top:235px;left:190px">
85 85 
                 <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
86 86 
                     {{ zhongwen.substring(0,1) }}
87 87 
                 </span>
88 88 
                 <span v-else>零</span>
89 89 
             </span>
90 
-            <span  style="position: absolute;top:250px;left:230px">
90 
+            <span  style="position: absolute;top:235px;left:220px">
91 91 
                 <span v-if="zhongwen.indexOf('万') > -1">
92 92 
                     {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
93 93 
                 </span>
94 94 
                 <span v-else>零</span>
95 95 
             </span>
96 
-            <span  style="position: absolute;top:250px;left:260px">
96 
+            <span  style="position: absolute;top:235px;left:250px">
97 97 
                 <span v-if="zhongwen.indexOf('仟') > -1">
98 98 
                     {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
99 99 
                 </span>
100 100 
                 <span v-else>零</span>
101 101 
             </span>
102 
-            <span  style="position: absolute;top:250px;left:300px">
102 
+            <span  style="position: absolute;top:235px;left:280px">
103 103 
                 <span v-if="zhongwen.indexOf('佰') > -1">
104 104 
                     {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
105 105 
                 </span>
106 106 
                 <span v-else>零</span>
107 107 
             </span>
108 
-            <span style="position: absolute;top:250px;left:330px">
108 
+            <span style="position: absolute;top:235px;left:320px">
109 109 
                 <span v-if="zhongwen.indexOf('拾') > -1">
110 110 
                     {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
111 111 
                 </span>
112 112 
                 <span v-else>零</span>
113 113 
             </span>
114 
-            <span  style="position: absolute;top:250px;left:370px">
114 
+            <span  style="position: absolute;top:235px;left:350px">
115 115 
                 <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) != '拾'">
116 116 
                     {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
117 117 
                 </span>
118 118 
                 <span v-else>零</span>
119 119 
             </span>
120 
-            <span  style="position: absolute;top:250px;left:400px">
120 
+            <span  style="position: absolute;top:235px;left:380px">
121 121 
                 <span v-if="zhongwen.indexOf('角') > -1">
122 122 
                     {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
123 123 
                 </span>
124 124 
                 <span v-else>零</span>
125 125 
             </span>
126 
-            <span  style="position: absolute;top:250px;left:430px">
126 
+            <span  style="position: absolute;top:235px;left:415px">
127 127 
                 <span v-if="zhongwen.indexOf('分') > -1">
128 128 
                     {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
129 129 
                 </span>
130 130 
                 <span v-else>零</span>
131 131 
             </span>
132 132 
             </span>
133 
-            <span style="position: absolute;top:250px;left:500px">{{ totalPrice }}</span>
133 
+            <span style="position: absolute;top:235px;left:500px">{{ totalPrice.toFixed(2) }}</span>
134 134 
         </div>
135 135 
         <!-- <div style="position: absolute;top:300px;left:460px">现金：{{ list.psn_cash_money }}</div> -->
136 136 
         <div>
137 
-            <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div>
138 
-            <div style="position: absolute;top:320px;left:460px">高慧裕</div>
137 
+            <div style="position: absolute;top:300px;left:120px">{{ org_name }}</div>
138 
+            <div style="position: absolute;top:300px;left:460px">高慧裕</div>
139 139 
         </div>
140 140 
     </div>
141 141 
 </template>

+ 11 - 3
src/xt_pages/workforce/components/tableData.vue Zobrazit soubor 

@@ -619,7 +619,7 @@
619 619 
 <script>
620 620 
 import { uParseTime } from "@/utils/tools";
621 621 
 import print from 'print-js'
622 
-
622 
+const moment = require('moment')
623 623 
 import {
624 624 
   CancelSchedule,
625 625 
   ChangeSchedule,
 
@@ -695,6 +695,7 @@ export default {
695 695 
       partitions: [],
696 696 
       jihaos: [],
697 697 
       weekTitle: ["", "", "", "", "", "", ""],
698 
+      weekList: ["", "", "", "", "", "", ""],
698 699 
       weekDays: ["", "", "", "", "", "", ""],
699 700 
       currentData: {
700 701 
         id: 0,
 
@@ -1165,6 +1166,7 @@ export default {
1165 1166 
       getSchedulesOne(params).then(response => {
1166 1167 
         if (response.data.state == 1) {
1167 1168 
           this.weekTitle = response.data.data.weekTitle;
1169 
+
1168 1170 
           this.weekDays = response.data.data.days;
1169 1171 
           this.toDay = response.data.data.today;
1170 1172 
           var theSchedules = response.data.data.schdules;
 
@@ -2110,6 +2112,9 @@ export default {
2110 2112 
     },
2111 2113 
     search: function() {
2112 2114 
       let week_type = 0
2115 
+      var weeklist = moment().format('E');//计算今天是这周第几天
2116 
+      var first_monday = moment().subtract(weeklist-1, 'days').format('YYYY-MM-DD');//周一日期
2117 
+      var end_monday = moment().add(7-weeklist, 'days').format('YYYY-MM-DD')
2113 2118 
       if (this.weekTime == 'thisWeek'){
2114 2119 
         week_type = 1
2115 2120 
       }else if(this.weekTime == 'nextWeek'){
 
@@ -2117,12 +2122,14 @@ export default {
2117 2122 
       }else if(this.weekTime == 'nextTwoWeek'){
2118 2123 
         week_type = 3
2119 2124 
       }
2120 
-
2121 
-
2125 
+
2122 2126 
       const params = {
2123 2127 
         keywords: this.keywords,
2124 2128 
         week_type: week_type,
2129 
+        start_sch:first_monday,
2130 
+        end_sch:end_monday,
2125 2131 
       };
2132 
+      console.log("params",params)
2126 2133 
       getSearchResult(params).then(response => {
2127 2134 
         if (response.data.state == 1) {
2128 2135 
           this.schedulePatients = response.data.data.schdules;
 
@@ -2300,6 +2307,7 @@ export default {
2300 2307 
   //    this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
2301 2308 
   // },
2302 2309 
   created() {
2310 
+
2303 2311 
     this.getAllZones()
2304 2312
2305 2313 
     this.changeScheduleType(1)