Quellcode durchsuchen

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

XMLWAN vor 3 Jahren
Ursprung
Commit
cf0f35bc6b

+ 2 - 2
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Datei anzeigen

@@ -406,9 +406,9 @@
406 406
           </el-table-column>
407 407
 
408 408
           <el-table-column
409
-            prop="heparin"
409
+            prop="heparin_amount"
410 410
             align="center"
411
-            label="肝素量(ml)"
411
+            label="肝素量(mg)"
412 412
             width="140"
413 413
             v-if="isShow('肝素量')"
414 414
           >

+ 16 - 7
src/xt_pages/hospitalStation/chargeDetailManagement.vue Datei anzeigen

@@ -930,13 +930,13 @@ export default {
930 930
                   if (this.hisPatientInfo.patient_id == this.patientTableData[i].patient_id) {
931 931
                     this.current_index = i
932 932
                     this.$refs.tab.setCurrentRow(this.patientTableData[i])
933
-                    this.getPatientInformation(this.patientTableData[0].patient_id, this.patientTableData[0].id)
933
+                    this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].patient_id)
934 934
 
935 935
                   }
936 936
                 }
937 937
               }else{
938 938
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
939
-                this.getPatientInformation(this.patientTableData[0].patient_id, this.patientTableData[0].id)
939
+                this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
940 940
               }
941 941
               break
942 942
             case 2:
@@ -944,10 +944,19 @@ export default {
944 944
               this.patientTableData = response.data.data.list_two
945 945
 
946 946
 
947
+              if (this.hisPatientInfo.id > 0){
948
+                for (let i = 0; i < this.patientTableData.length; i++) {
949
+                  if (this.hisPatientInfo.patient_id == this.patientTableData[i].patient_id) {
950
+                    this.current_index = i
951
+                    this.$refs.tab.setCurrentRow(this.patientTableData[i])
952
+                    this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].patient_id)
947 953
 
948
-
949
-              this.$refs.tab.setCurrentRow(this.patientTableData[0])
950
-              this.getPatientInformation(this.chargePatientTableData[0].patient_id, this.patientTableData[0].id)
954
+                  }
955
+                }
956
+              }else{
957
+                this.$refs.tab.setCurrentRow(this.patientTableData[0])
958
+                this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
959
+              }
951 960
               break
952 961
 
953 962
           }
@@ -1004,7 +1013,7 @@ export default {
1004 1013
                   if (this.hisPatientInfo.patient_id == this.patientTableData[i].patient_id) {
1005 1014
                     this.current_index = i
1006 1015
                     this.$refs.tab.setCurrentRow(this.patientTableData[i])
1007
-                    this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
1016
+                    this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].patient_id)
1008 1017
 
1009 1018
                   }
1010 1019
                 }
@@ -1021,7 +1030,7 @@ export default {
1021 1030
                   if (this.hisPatientInfo.patient_id == this.patientTableData[i].patient_id) {
1022 1031
                     this.current_index = i
1023 1032
                     this.$refs.tab.setCurrentRow(this.patientTableData[i])
1024
-                    this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
1033
+                    this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].patient_id)
1025 1034
 
1026 1035
                   }
1027 1036
                 }

+ 3 - 3
src/xt_pages/hospitalStation/invoiceTemplate/printOne.vue Datei anzeigen

@@ -23,8 +23,8 @@
23 23
         </div>
24 24
         <div style="display:flex;justify-content: space-between;">
25 25
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
26
-            <div style="position: absolute;top:110px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
27
-            <div style="position: absolute;top:110px;left:440px;">{{ list.psn_cash_money }}</div>
26
+            <div style="position: absolute;top:110px;left:260px;">{{ (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
27
+            <div style="position: absolute;top:110px;left:440px;">{{ list.psn_cash_money  }}</div>
28 28
             <div style="position: absolute;top:110px;left:580px;">门特</div>
29 29
         </div>
30 30
         <div style="display:flex;justify-content: space-between;">
@@ -196,7 +196,7 @@ export default {
196 196
             }
197 197
 
198 198
             var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
199
-            n += "00";  
199
+            n += "00";
200 200
 
201 201
             var indexpoint = n.indexOf('.');  // 如果是小数,截取小数点前面的位数
202 202
 

+ 60 - 4
src/xt_pages/hospitalStation/summary.vue Datei anzeigen

@@ -21,6 +21,16 @@
21 21
                         :value="item.value">
22 22
                     </el-option>
23 23
                   </el-select>
24
+
25
+                  <el-select size="small" v-model="p_type" placeholder="请选择"
26
+                             style="width:150px;margin-left:10px;" @change="changePType">
27
+                    <el-option
28
+                        v-for="(item,index) in p_types"
29
+                        :key="index"
30
+                        :label="item.label"
31
+                        :value="item.value">
32
+                    </el-option>
33
+                  </el-select>
24 34
                     <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
25 35
                                     @change="handleStartTimeChange" :editable="false" :clearable="false"
26 36
                                     style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
@@ -103,9 +113,13 @@
103 113
 <!--                            退费-->
104 114
 <!--                        </el-button>-->
105 115
                         <el-button size="mini" type="primary" @click="uploadInfo(scope.row)"
106
-                                   v-if="scope.row.order_status == 2 && scope.row.result.id == 0">
116
+                                   v-if="scope.row.order_status == 2 && scope.row.result.id == 0 && p_type == 1">
107 117
                             上传结算清单
108 118
                         </el-button>
119
+                        <el-button size="mini" type="primary" @click="uploadOtherInfo(scope.row)"
120
+                                   v-if="scope.row.order_status == 2 && scope.row.result.id == 0 && p_type == 2">
121
+                          上传结算清单
122
+                        </el-button>
109 123
                         <el-button size="mini" type="primary" @click="invoicePrint(scope.row)">打印发票</el-button>
110 124
 
111 125
 <!--                        <el-button size="mini" type="primary" @click="refundOne(scope.row)">-->
@@ -179,7 +193,7 @@
179 193
                 width="1200px"
180 194
                 title="打印"
181 195
                 :visible.sync="invoiceVisible">
182
-            <invoice-print ref="print" :invoiceParams='invoiceParams'></invoice-print>
196
+            <invosuice-print ref="print" :invoiceParams='invoiceParams'></invosuice-print>
183 197
         </el-dialog>
184 198
         <!-- <el-dialog
185 199
                 class="centerDialog"
@@ -244,14 +258,56 @@
244 258
         invoiceParams: {},
245 259
         settlementVisible: false,
246 260
         sort_type:1,
261
+        p_type:1,
247 262
         sort_types: [
248 263
           { value: 1, label: '处方时间' },
249 264
           { value: 2, label: '结算时间' }
250 265
         ],
266
+        p_types:[
267
+          { value: 1, label: '住院' },
268
+          { value: 2, label: '门诊' }
269
+        ],
251 270
 
252 271
       }
253 272
     },
254 273
     methods: {
274
+      uploadOtherInfo(row) {
275
+        var that = this
276
+        axios.get('http://127.0.0.1:9532/api/settlelist/get', {
277
+          params: {
278
+            order_id: row.id,
279
+            admin_user_id: this.$store.getters.xt_user.user.id
280
+          }
281
+        }).then(function(response) {
282
+          if (response.data.state == 0) {
283
+            that.$message.error(response.data.msg)
284
+            return false
285
+          } else {
286
+
287
+            if (response.data.data.failed_code == -10) {
288
+              // that.$message.error(response.data.data.msg)
289
+              that.$confirm(response.data.data.msg, '医保错误信息', {
290
+                confirmButtonText: '确 定',
291
+                type: 'warning'
292
+              }).then(() => {
293
+
294
+              }).catch(() => {
295
+              })
296
+
297
+            } else {
298
+              that.$message.success('上传成功')
299
+              row.result.id = response.data.data.result.id
300
+            }
301
+
302
+          }
303
+        }).catch(function(error) {
304
+        })
305
+      },
306
+      changePType(){
307
+        this.page = 1
308
+        this.keywords = ''
309
+        this.getHisOrderList()
310
+      },
255 311
       changeSortType(){
256 312
         this.page = 1
257 313
         this.keywords = ''
@@ -595,7 +651,7 @@
595 651
         let params = {
596 652
           start_time: this.start_time,
597 653
           end_time: this.end_time,
598
-          p_type: 1
654
+          p_type: this.p_type
599 655
         }
600 656
         getExportConsumeDetailList(params).then(response => {
601 657
           if (response.data.state == 0) {
@@ -758,7 +814,7 @@
758 814
           start_time: this.start_time,
759 815
           end_time: this.end_time,
760 816
           type: this.admin_user_id,
761
-          p_type: 1,
817
+          p_type: this.p_type,
762 818
           sort_type: this.sort_type
763 819
 
764 820
         }

+ 1 - 1
src/xt_pages/outpatientCharges/components/chargeDialog.vue Datei anzeigen

@@ -21,7 +21,7 @@
21 21
       </el-form-item>
22 22
 
23 23
       <el-form-item label="个账支出:" prop="age" :validate-event="is_Name" style="width:33%;">
24
-        <el-input type="number" v-model="form.acc_pay" :disabled="true"></el-input>
24
+        <el-input type="number" v-model="form.acct_pay" :disabled="true"></el-input>
25 25
       </el-form-item>
26 26
 
27 27
 

+ 2 - 2
src/xt_pages/outpatientCharges/invoicePrint.vue Datei anzeigen

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

+ 21 - 14
src/xt_pages/outpatientCharges/invoiceTemplate/printFive.vue Datei anzeigen

@@ -44,22 +44,29 @@
44 44
             <div :style="{position: 'absolute',top:(315 + (index * 400))  + 'px',left:460+ 'px'}">{{ list.medfee_sumamt }}</div>
45 45
             <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(330 + (index * 400))  + 'px',left:110+ 'px',width:100 + '%'}">
46 46
                 <div style="display:flex;">
47
-                    <div style="width:140px">医疗总费用:{{ list.medfee_sumamt }}</div>
48
-                    <div style="width:140px">现金支出:{{ list.psn_cash_money }}</div>
49
-                    <div style="width:140px">上次账户:0</div>
50
-                    <div style="width:140px">本次账户:0</div>
51
-                </div>
52
-                <div style="display:flex;">
53
-                    <div style="width:140px">账户余额:{{ list.order.balc }}</div>
54
-                    <div style="width:140px">统筹支出:{{ list.order.hifp_pay }}</div>
55
-                    <div style="width:140px">大病支出:0</div>
56
-                    <div style="width:140px">民政支出:0</div>
47
+                  <div style="width:150px">医疗总费用:{{ list.order.medfee_sumamt }}</div>
48
+                  <div style="width:150px">基金支付总额:{{ list.order.fund_pay_sumamt }}</div>
49
+                  <div style="width:150px">统筹支出:{{ list.order.hifp_pay }}</div>
50
+                  <div style="width:150px">大病支出:{{list.order.hifmi_pay}}</div>
51
+
57 52
                 </div>
58 53
                 <div style="display:flex;">
59
-                    <div style="width:140px">大病补充保险支出:0</div>
60
-                    <div style="width:280px">企业补充医疗保险基金支出:{{ list.order.hifes_pay }}</div>
61
-                    <div style="width:140px">其他支出:{{ list.order.oth_pay }}</div>
54
+                  <div style="width:150px">个人账户支付:{{ list.order.acct_pay }}</div>
55
+                  <div style="width:150px">现金支出:{{ list.order.psn_cash_pay }}</div>
56
+                  <div style="width:150px">本次账户:0</div>
57
+                  <div style="width:150px">上次账户:0</div>
62 58
                 </div>
59
+              <div style="display:flex;">
60
+                <div style="width:150px">账户余额:{{ list.order.balc }}</div>
61
+                <div style="width:150px">其他支出:{{ list.order.oth_pay }}</div>
62
+                <div style="width:150px">大病补充保险支出:0</div>
63
+                <div style="width:150px">民政支出:0</div>
64
+              </div>
65
+              <div style="display:flex;">
66
+                <div style="width:220px">医疗救助基金支出:{{ list.order.maf_pay }}</div>
67
+                <div style="width:280px">企业补充医疗保险基金支出:{{ list.order.hifes_pay }}</div>
68
+              </div>
69
+
63 70
             </div>
64 71
             <div>
65 72
                 <div :style="{position: 'absolute',top:(390 + (index * 400))  + 'px',left:100+ 'px'}">{{ org_name }}</div>
@@ -157,7 +164,7 @@ export default {
157 164
             }
158 165
 
159 166
             var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
160
-            n += "00";  
167
+            n += "00";
161 168
 
162 169
             var indexpoint = n.indexOf('.');  // 如果是小数,截取小数点前面的位数
163 170
 

+ 1 - 1
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Datei anzeigen

@@ -126,7 +126,7 @@
126 126
                           >
127 127
 
128 128
                             <el-button
129
-                                v-if="radio == 1"
129
+                           su     v-if="radio == 1"
130 130
                                 size="small"
131 131
                                 @click="openDialog(item)"
132 132
                                 type="primary"

+ 1 - 1
src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/index.vue Datei anzeigen

@@ -13,7 +13,7 @@
13 13
       </template> -->
14 14
 
15 15
       <div class='dialysisPage' style="padding-top:40px;">
16
-        <prisntOne :printData="printData"></prisntOne>
16
+        <printOne :printData="printData"></printOne>
17 17
       </div>
18 18
   </div>
19 19
 </template>

+ 4 - 6
src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/printOne.vue Datei anzeigen

@@ -2,8 +2,8 @@
2 2
     <div>
3 3
         <div id='prescription-print3' class="prescription-print">
4 4
           <div v-for="(i,index) in printData">
5
-            <img style="width:100%;height:80px" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
6
-             <img style="width:100%;height:80px" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
5
+<!--            <img style="width:100%;height:80px" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">-->
6
+<!--/*             <img style="width:100%;height:80px" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">*/-->
7 7
             <div class="printTitle">检验申请单</div>
8 8
 
9 9
             <div style="border:1px solid #000;">
@@ -49,8 +49,8 @@
49 49
                     <div>医生签字:{{ i.info.doctor ? i.info.doctor : '' }}</div>
50 50
                 </div>
51 51
             </div>
52
-            <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
53
-            <img style="width:100%;" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
52
+<!--            <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">-->
53
+<!--            <img style="width:100%;" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">-->
54 54
         </div>
55 55
       </div>
56 56
     </div>
@@ -140,8 +140,6 @@ export default {
140 140
         })
141 141
 
142 142
         this.total = total.toFixed(2)
143
-        this.pre_time = prescriptions[0].pre_time
144
-        this.doctor = prescriptions[0].doctor
145 143
         this.projectPrint = data
146 144
         return data
147 145
      },

+ 2 - 2
src/xt_pages/outpatientDoctorStation/pastInquiries.vue Datei anzeigen

@@ -14,9 +14,9 @@
14 14
                         format="yyyy-MM-dd"
15 15
                         value-format="yyyy-MM-dd"
16 16
                         placeholder="选择日期时间" align="right"></el-date-picker>
17
-        <!-- <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(1)">处方筏批量打印</el-button>
17
+       <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(1)">处方筏批量打印</el-button>
18 18
         <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(2)">治疗单批量打印</el-button>
19
-        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(3)">检验单批量打印</el-button> -->
19
+        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(3)">检验单批量打印</el-button>
20 20
       </div>
21 21
       <el-table :data="tableData" border ref="table" style="width: 100%;" :row-style="{ color: '#303133' }" @selection-change="handleSelectionChange"
22 22
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>