陈少旭 6 månader sedan
förälder
incheckning
1edeb929dd

+ 4 - 3
src/xt_pages/eleFaPiao/fapiao.vue Visa fil

@@ -122,11 +122,11 @@
122 122
             </el-button>
123 123
             <el-button size="mini" type="primary" v-if="scope.row.id > 0 && scope.row.is_red_washed == 0"
124 124
                        @click="yulan(scope.row)">
125
-              预览
126
-            </el-button>
127
-            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.id > 0 && scope.row.is_red_washed == 0">
128 125
               下载
129 126
             </el-button>
127
+<!--            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.id > 0 && scope.row.is_red_washed == 0">-->
128
+<!--              下载-->
129
+<!--            </el-button>-->
130 130
           </template>
131 131
         </el-table-column>
132 132
       </el-table>
@@ -261,6 +261,7 @@ export default {
261 261
 
262 262
     }, yulan(row){
263 263
 
264
+
264 265
     },hongchong(row){
265 266
 
266 267
     },

+ 2 - 2
src/xt_pages/eleFaPiao/newPrintOne.vue Visa fil

@@ -175,8 +175,8 @@ export default {
175 175
       getFaPiaoData(params).then((res) => {
176 176
         console.log('res',res)
177 177
         this.list = res.data.data
178
-        this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
179
-          this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal + this.list.zhenChaCostTotal + this.list.hiliCostTotal
178
+        this.totalPrice = (this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
179
+          this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal + this.list.zhenChaCostTotal + this.list.hiliCostTotal).toFixed(2)
180 180
         if(this.totalPrice == 0){
181 181
 
182 182
           this.totalPrice = this.list.medfee_sumamt

+ 17 - 5
src/xt_pages/eleFaPiao/newSettleDetail.vue Visa fil

@@ -146,21 +146,29 @@
146 146
 
147 147
         <el-table-column align="center" prop="name" label="操作">
148 148
           <template slot-scope="scope">
149
+<!--            <el-button v-if="scope.row.result.id == 0" size="mini" type="primary"-->
150
+<!--                       @click="blueDailog()">-->
151
+<!--              开票-->
152
+<!--            </el-button>-->
149 153
             <el-button v-if="scope.row.result.id == 0" size="mini" type="primary"
150 154
                        @click="blueDailog()">
151 155
               开票
152 156
             </el-button>
153
-            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0" size="mini" type="primary"
157
+            <el-button v-if="scope.row.result.id == 0 && scope.row.result.fapiao_status == 1" disabled="true" size="mini" type="primary"
158
+                       >
159
+              开票审核中
160
+            </el-button>
161
+            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2" size="mini" type="primary"
154 162
                        @click="hongchong(scope.row)">
155 163
               红冲
156 164
             </el-button>
157
-            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0"
165
+            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2"
158 166
                        @click="yulan(scope.row)">
159
-              预览
160
-            </el-button>
161
-            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0">
162 167
               下载
163 168
             </el-button>
169
+<!--            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0">-->
170
+<!--              下载-->
171
+<!--            </el-button>-->
164 172
           </template>
165 173
         </el-table-column>
166 174
       </el-table>
@@ -359,9 +367,11 @@ export default {
359 367
       var that = this;
360 368
       axios.get('http://127.0.0.1:9532/api/fapiao/blue',{params:params}).then(function(response) {
361 369
         if (response.data.state == 0) {
370
+          that.settlementVisible = false
362 371
           that.$message.error(response.data.data.msg);
363 372
           return false
364 373
         } else {
374
+          that.settlementVisible = false
365 375
           if(response.data.data.failed_code == -10){
366 376
             that.$confirm(response.data.data.msg, '错误信息', {
367 377
               confirmButtonText: '确 定',
@@ -371,6 +381,7 @@ export default {
371 381
             }).catch(() => {
372 382
             })
373 383
           }else{
384
+            that.settlementVisible = false
374 385
             that.$message.success(response.data.data.msg)
375 386
             that.getHisOrderList()
376 387
           }
@@ -475,6 +486,7 @@ export default {
475 486
 
476 487
     },
477 488
     yulan(row){
489
+      window.open( row.result.pdf_url, "_blank");
478 490
 
479 491
     },
480 492
     getAllstaff(){

+ 36 - 18
src/xt_pages/eleFaPiao/settleDetail.vue Visa fil

@@ -151,19 +151,18 @@
151 151
                         @click="blue(scope.row)">
152 152
               开票
153 153
             </el-button>
154
-            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0" size="mini" type="primary"
154
+            <el-button v-if="scope.row.result.id == 0 && scope.row.result.fapiao_status == 1" disabled="true" size="mini" type="primary"
155
+                       @click="blue(scope.row)">
156
+              开票审核中
157
+            </el-button>
158
+            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2" size="mini" type="primary"
155 159
                         @click="hongchong(scope.row)">
156 160
               红冲
157 161
             </el-button>
158
-            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0"
162
+            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2"
159 163
                        @click="yulan(scope.row)">
160
-              预览
161
-            </el-button>
162
-            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0">
163 164
               下载
164 165
             </el-button>
165
-
166
-
167 166
           </template>
168 167
         </el-table-column>
169 168
       </el-table>
@@ -242,6 +241,22 @@
242 241
       </span>
243 242
     </el-dialog>
244 243
 
244
+
245
+    <el-dialog
246
+      class="centerDialog"
247
+      width="1200px"
248
+      :visible.sync="settlementVisibletwo">
249
+      <div>
250
+        <pdf :src="pdfSrc"></pdf>
251
+      </div>
252
+      <span slot="footer" class="dialog-footer">
253
+        <el-button @click="settlementVisibletwo = false">取 消</el-button>
254
+        <el-button type="primary" @click="settlementVisibletwo = false">确定</el-button>
255
+      </span>
256
+    </el-dialog>
257
+
258
+
259
+
245 260
   </div>
246 261
 </template>
247 262
 
@@ -251,7 +266,7 @@ import BreadCrumb from '@/xt_pages/components/bread-crumb'
251 266
 import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund } from '@/api/his/his'
252 267
 import { ModifyFapiaoCode } from '@/api/his/his_tools'
253 268
 
254
-
269
+import pdf from 'vue-pdf'
255 270
 // import NewStatementPrint from './newStatementPrint'
256 271
 import { adminMainView} from "@/api/role/admin";
257 272
 import { fetchAllAdminUsers } from '@/api/doctor'
@@ -259,10 +274,6 @@ import axios from 'axios'
259 274
 import { jsGetAge, uParseTime } from '@/utils/tools'
260 275
 import {
261 276
   getOrderFapiaoList,
262
-  OpenBlueFapiao,
263
-  OpenRedFapiao,
264
-  GetSMSCode,
265
-  SMSLogin, GetQRCode
266 277
 } from '../../api/fapiao'
267 278
 
268 279
 import { getDialysisRecordInitData } from '@/api/dialysis_record'
@@ -279,12 +290,14 @@ export default {
279 290
   },
280 291
   data() {
281 292
     return {
293
+      pdfSrc:"",
282 294
       staff:"",
283 295
       admins:[],
284 296
       orderObj: {},
285 297
       batchOrderObj: {},
286 298
       fapiao_number:"",
287 299
       invoiceVisible: false,
300
+      settlementVisibletwo:false,
288 301
       med_options: [
289 302
         { id: 0, text: '全部' },
290 303
         { id: 11, text: '普通门诊' },
@@ -554,7 +567,7 @@ export default {
554 567
             })
555 568
           }else{
556 569
             if(response.data.data.cus_status == 1){
557
-              this.$nextTick(() =>{
570
+              that.$nextTick(() =>{
558 571
                 var qrcode = new QRCode(that.$refs.qrCodeUrl, {
559 572
                   text: response.data.data.qr_code, // 需要转换为二维码的内容
560 573
                   width: 120,
@@ -564,7 +577,7 @@ export default {
564 577
                   correctLevel: QRCode.CorrectLevel.H
565 578
                 })
566 579
               })
567
-              this.qr_dialogVisible =true
580
+              that.qr_dialogVisible =true
568 581
             }else if(response.data.data.cus_status == -1){
569 582
               // this.$message.error(response.data.msg)/*  */
570 583
               that
@@ -632,12 +645,14 @@ export default {
632 645
       }
633 646
 
634 647
       var that = this;
635
-      axios.get('http://127.0.0.1:9532/api/fapiao/blue',{params:params}).then(function(response) {
648
+      axios.get('http://that:9532/api/fapiao/blue',{params:params}).then(function(response) {
636 649
         if (response.data.state == 0) {
637 650
           that.$message.error(response.data.data.msg);
638 651
           return false
639 652
         } else {
640 653
           if(response.data.data.failed_code == -10){
654
+            that.settlementVisible = false
655
+
641 656
             that.$confirm(response.data.data.msg, '错误信息', {
642 657
               confirmButtonText: '确 定',
643 658
               type: 'warning'
@@ -646,6 +661,7 @@ export default {
646 661
             }).catch(() => {
647 662
             })
648 663
           }else{
664
+            that.settlementVisible = false
649 665
             that.$message.success(response.data.data.msg)
650 666
             that.getHisOrderList()
651 667
           }
@@ -681,8 +697,10 @@ export default {
681 697
 
682 698
 
683 699
     }, yulan(row){
684
-
685
-
700
+      window.open( row.result.pdf_url, "_blank");
701
+      // this.settlementVisibletwo = true
702
+      // this.pdfSrc = row.result.pdf_url
703
+      // console.log(this.pdfSrc)
686 704
 
687 705
     },hongchong(row){
688 706
       var  id = row.result.id
@@ -707,7 +725,7 @@ export default {
707 725
             }).catch(() => {
708 726
             })
709 727
           }else{
710
-            that.$message.success(response.data.msg)
728
+            that.$message.success(response.data.data.msg)
711 729
             that.getHisOrderList()
712 730
           }
713 731