huangyw 2 年前
父节点
当前提交
8adb086c2d

+ 1 - 18
src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue 查看文件

@@ -873,8 +873,6 @@
873 873
     methods: {
874 874
       //调试
875 875
       lili(index,row){
876
-        // console.log("==index==",index)
877
-        // console.log("==row==",row)
878 876
         console.log("==doctor_advices==",this.doctor_advices)
879 877
         console.log("==this.form==",this.form)
880 878
       },
@@ -990,8 +988,6 @@
990 988
       },
991 989
       submitEditAdvice() {
992 990
         // console.log()
993
-        console.log("保存22222222222222")
994
-        console.log("==this.src_type==",this.src_type)
995 991
         if (this.form.advice_name.length == 0) {
996 992
           this.$message.error('请填写医嘱名称')
997 993
           return
@@ -1350,6 +1346,7 @@
1350 1346
                     }
1351 1347
                   }
1352 1348
                   this.execTimeDialogVisible = false
1349
+                  
1353 1350
                   return false
1354 1351
               }
1355 1352
 
@@ -1372,7 +1369,6 @@
1372 1369
       }
1373 1370
       ,
1374 1371
       submitAdvice() {
1375
-        console.log("保存111111111111111111111")
1376 1372
         if (this.form.advice_name.length == 0) {
1377 1373
           this.$message.error('请填写医嘱名称')
1378 1374
           return
@@ -1387,9 +1383,6 @@
1387 1383
         }
1388 1384
         let mode = '1'
1389 1385
 
1390
-        console.log("==this.form==",this.form)
1391
-        console.log("==this.src_type==",this.src_type)
1392
-
1393 1386
        if(this.src_type == ""){
1394 1387
           this.form.way = 1
1395 1388
        }
@@ -1400,7 +1393,6 @@
1400 1393
        }
1401 1394
 
1402 1395
         CreateDoctorAdvice(this.patient.id, this.form, mode).then(response => {
1403
-          console("保存!!!!!!!!!!!!!!!this.form")
1404 1396
             this.loading = false
1405 1397
             if (response.data.state == 0) {
1406 1398
               this.$message.error(response.data.msg)
@@ -1417,11 +1409,9 @@
1417 1409
               this.currentRow = null
1418 1410
               this.setCurrent()
1419 1411
               this.hideForm()
1420
-              console.log("保存",this.form.parent_id)
1421 1412
               if (this.form.parent_id > 0) {
1422 1413
                 var spliceIndex = -1
1423 1414
                 for (let index = this.doctor_advices.length - 1; ; index--) {
1424
-                  console.log("====this.doctor_advices[index].origin====",this.doctor_advices[index].origin)
1425 1415
                   if (this.doctor_advices[index].parent_id === this.form.parent_id) {
1426 1416
                     spliceIndex = index
1427 1417
                     break
@@ -1850,7 +1840,6 @@
1850 1840
           })
1851 1841
           .catch(() => {
1852 1842
           })
1853
-        // this.handleSpanTempArr()
1854 1843
       }
1855 1844
       ,
1856 1845
       openDelete(index, row) {
@@ -2027,9 +2016,6 @@
2027 2016
             }
2028 2017
           }
2029 2018
         })
2030
-
2031
-        // this.handleSpanTempArr()
2032
-        // this.handleStyle()
2033 2019
       }
2034 2020
       ,
2035 2021
       getXuserName(id) {
@@ -2061,9 +2047,6 @@
2061 2047
       }
2062 2048
       ,
2063 2049
       show(his_is_open,is_advice_open) {
2064
-        console.log("this.doctor_advices",this.doctor_advices)
2065
-        console.log("++++his_is_open++++++",his_is_open)
2066
-        console.log("++++is_advice_open++++++",is_advice_open)
2067 2050
         this.his_is_open = his_is_open
2068 2051
         this.is_advice_open = is_advice_open
2069 2052
         this.isVisibility = true

+ 10 - 9
src/xt_pages/hospitalStation/components/chargeDialog.vue 查看文件

@@ -100,16 +100,14 @@
100 100
           <el-form-item class="specialFormItem">
101 101
             <div style="display: flex">
102 102
               <!--            这里不要改成el-input,因为使用el-input会导致一个奇怪的bug,千万不要改!!!!!!!!!!!!!!!!!!!!-->
103
-              <el-input v-model="form.tmp_decimal" onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" @change="lilili">
104
-
105
-              </el-input>元
103
+              <input  v-model="form.tmp_decimal" class="input_style" onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" @change="lilili">元
106 104
             </div>
107 105
           </el-form-item>
108 106
         </span>
109 107
       </el-form-item>
110 108
 
111 109
 
112
-      <el-form-item label="付款金额:" prop="id_card" :validate-event="is_Name">
110
+      <el-form-item label="付款金额:" prop="id_card">
113 111
         <el-input
114 112
           style="color: black"
115 113
           type="number"
@@ -119,7 +117,7 @@
119 117
       </el-form-item>
120 118
 
121 119
 
122
-      <el-form-item label="付款卡号:" prop="id_card" :validate-event="is_Name">
120
+      <el-form-item label="付款卡号:" prop="id_card">
123 121
         <el-input v-model="form.pay_card_no"></el-input>
124 122
       </el-form-item>
125 123
 
@@ -347,7 +345,7 @@
347 345
             this.form.acct_pay = this.order.acct_pay
348 346
             this.form.psn_pay = this.order.psn_cash_pay
349 347
             this.form.total = this.order.medfee_sumamt
350
-            this.form.pay_price = this.order.medfee_sumamt
348
+            this.form.pay_price = (this.order.medfee_sumamt).toFixed(2)
351 349
             this.form.medical_insurance_price = this.order.fund_pay_sumamt
352 350
             this.form.private_price = this.order.psn_part_amt
353 351
           }
@@ -449,9 +447,12 @@
449 447
     width: 50%;
450 448
   }
451 449
 }
452
-
453
-.input_style{
450
+.input_style {
454 451
   border-radius: 5px;
455
-  border: 1px solid #dbdbdb;
452
+  border: 1px solid #dddddd;
453
+}
454
+.input_style:focus {
455
+outline:none;
456
+border: 1px solid #66b1ff;
456 457
 }
457 458
 </style>

+ 5 - 5
src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue 查看文件

@@ -23,7 +23,7 @@
23 23
             <!-- <div  style="position: absolute;left:560px;top:70px;">
24 24
 
25 25
             </div> -->
26
-             <div  style="position: absolute;left:650px;top:70px;">
26
+             <div  style="position: absolute;left:400px;top:70px;">
27 27
             <!-- 类别(改成城乡医保或者职工医保,具体对应住院的挂号选的那个医保) -->
28 28
             类别:
29 29
             </div>
@@ -102,7 +102,7 @@
102 102
         <div>
103 103
             <span>
104 104
             <span style="position: absolute;top:280px;left:40px">合计金额(大写):</span>
105
-            <span  style="position: absolute;top:280px;left:180px">
105
+            <!-- <span  style="position: absolute;top:280px;left:180px">
106 106
                 <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
107 107
                     {{ zhongwen.substring(0,1) }}十万
108 108
                 </span>
@@ -128,8 +128,7 @@
128 128
             </span>
129 129
             <span style="position: absolute;top:280px;left:350px">
130 130
                 <span v-if="zhongwen.indexOf('拾') > -1">
131
-<!--                    {{ // zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}拾-->
132
-                        {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
131
+                {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
133 132
 
134 133
                 </span>
135 134
                 <span v-else>零拾</span>
@@ -151,7 +150,8 @@
151 150
                     {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}分
152 151
                 </span>
153 152
                 <span v-else>零分</span>
154
-            </span>
153
+            </span> -->
154
+            <span style="position: absolute;top:280px;left:190px;letter-spacing: 20px;">{{zhongwen}}</span>
155 155
             </span>
156 156
             <span style="position: absolute;top:280px;left:510px">合计:{{ list.order.medfee_sumamt }}</span>
157 157
         </div>

+ 3 - 2
src/xt_pages/outpatientCharges/components/chargeDialog.vue 查看文件

@@ -289,7 +289,7 @@
289 289
           this.form.acct_pay = this.order.acct_pay
290 290
           this.form.psn_pay = this.order.psn_cash_pay
291 291
           this.form.total = this.order.medfee_sumamt
292
-          this.form.pay_price = this.order.medfee_sumamt
292
+          this.form.pay_price = (this.order.medfee_sumamt).toFixed(2)
293 293
           this.form.medical_insurance_price = this.order.fund_pay_sumamt
294 294
           this.form.private_price =  this.order.psn_part_amt
295 295
         }
@@ -347,7 +347,8 @@
347 347
         }
348 348
         this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.discount_price)
349 349
       }
350
-    },mounted() {
350
+    },
351
+    mounted() {
351 352
       var nowDate = new Date()
352 353
       var nowYear = nowDate.getFullYear()
353 354
       var nowMonth = nowDate.getMonth() + 1

+ 2 - 2
src/xt_pages/outpatientTool/gatherPrint.vue 查看文件

@@ -139,7 +139,7 @@
139 139
     methods:{
140 140
       printtpage() {
141 141
       const style =
142
-        '@media print {.list-print{width:960px;margin:0 auto} .listTitle {font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo {display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;}.listTable {width: 100%;text-align: center;border-collapse: collapse;line-height: 25px;font-size: 14px;border-color: #000;text-align: left;} .listTable tr td {padding: 0 5px;}.tableBottom {font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne {margin-right: 40px;}';
142
+        '@media print {.list-print{width:960px;margin:0 auto} .listTitle {font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo {display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listInfo div{width:400px;} .listTable {width: 100%;text-align: center;border-collapse: collapse;line-height: 25px;font-size: 14px;border-color: #000;text-align: left;} .listTable tr td {padding: 0 5px;}.tableBottom {font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne {margin-right: 40px;}';
143 143
       printJS({
144 144
         printable: "list-print",
145 145
         type: "html",
@@ -1143,7 +1143,7 @@
1143 1143
     justify-content: space-between;
1144 1144
     margin: 10px 0;
1145 1145
     div{
1146
-      width: 200px;
1146
+      width: 400px;
1147 1147
     }
1148 1148
 }
1149 1149
 .listTable{