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

src/xt_pages/dialysis/batch_print/batch_print_order_fortyeight.vue

@@ -1203,8 +1203,8 @@ export default {
     printThisPage() {
       
       
-      // var ptime = Math.round(new Date().getTime() / 1000)
-      // this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+      var ptime = Math.round(new Date().getTime() / 1000)
+      this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
       const style =
         '@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:99%;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;}'
       // const style2 =

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyTwo.vue

@@ -2277,10 +2277,11 @@ export default {
       ){
         const obj6 = "穿刺针"
         checkDate.push(obj6)
-      } if (this.predialysis.blood_access_part_opera_name == ''){
-        const obj7 = "血管通路"
-        checkDate.push(obj7)
       } 
+      // if (this.predialysis.blood_access_part_opera_name == ''){
+      //   const obj7 = "血管通路"
+      //   checkDate.push(obj7)
+      // } 
       // if (this.predialysis.internal_fistula =='') {
       //   const obj8 = "内瘘"
       //   checkDate.push(obj8)

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

@@ -807,11 +807,11 @@ export default {
       } if(this.predialysis.puncture_needle == '' && this.org_id == 10612){
         const obj23 = "穿刺针"
         checkDate.push(obj23)
-      } if(this.dialysisOrder.puncture_nurse == '' && this.org_id == 10612 &&
-        this.dialysisOrder != null 
+      } if( this.dialysisOrder != null && this.dialysisOrder.puncture_nurse == 0 && 
+            this.org_id == 10612
       ){
-        const obj23 = "穿刺护士"
-        checkDate.push(obj23)
+        const obj33 = "穿刺护士"
+        checkDate.push(obj33)
       } if(this.assessmentafter.weight_after == '' && 
             this.afterdialysis.last_after_weight == ''
       ){

src/xt_pages/eleFaPiao/fapiao.vue

@@ -122,11 +122,11 @@
             </el-button>
             <el-button size="mini" type="primary" v-if="scope.row.id > 0 && scope.row.is_red_washed == 0"
                        @click="yulan(scope.row)">
-              预览
-            </el-button>
-            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.id > 0 && scope.row.is_red_washed == 0">
               下载
             </el-button>
+<!--            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.id > 0 && scope.row.is_red_washed == 0">-->
+<!--              下载-->
+<!--            </el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -261,6 +261,7 @@ export default {
 
     }, yulan(row){
 
+
     },hongchong(row){
 
     },

src/xt_pages/eleFaPiao/newPrintOne.vue

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

src/xt_pages/eleFaPiao/newSettleDetail.vue

@@ -146,21 +146,29 @@
 
         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
+<!--            <el-button v-if="scope.row.result.id == 0" size="mini" type="primary"-->
+<!--                       @click="blueDailog()">-->
+<!--              开票-->
+<!--            </el-button>-->
             <el-button v-if="scope.row.result.id == 0" size="mini" type="primary"
                        @click="blueDailog()">
               开票
             </el-button>
-            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0" size="mini" type="primary"
+            <el-button v-if="scope.row.result.id == 0 && scope.row.result.fapiao_status == 1" disabled="true" size="mini" type="primary"
+                       >
+              开票审核中
+            </el-button>
+            <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"
                        @click="hongchong(scope.row)">
               红冲
             </el-button>
-            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0"
+            <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"
                        @click="yulan(scope.row)">
-              预览
-            </el-button>
-            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0">
               下载
             </el-button>
+<!--            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0">-->
+<!--              下载-->
+<!--            </el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -359,9 +367,11 @@ export default {
       var that = this;
       axios.get('http://127.0.0.1:9532/api/fapiao/blue',{params:params}).then(function(response) {
         if (response.data.state == 0) {
+          that.settlementVisible = false
           that.$message.error(response.data.data.msg);
           return false
         } else {
+          that.settlementVisible = false
           if(response.data.data.failed_code == -10){
             that.$confirm(response.data.data.msg, '错误信息', {
               confirmButtonText: '确 定',
@@ -371,6 +381,7 @@ export default {
             }).catch(() => {
             })
           }else{
+            that.settlementVisible = false
             that.$message.success(response.data.data.msg)
             that.getHisOrderList()
           }
@@ -475,6 +486,7 @@ export default {
 
     },
     yulan(row){
+      window.open( row.result.pdf_url, "_blank");
 
     },
     getAllstaff(){

src/xt_pages/eleFaPiao/settleDetail.vue

@@ -151,19 +151,18 @@
                         @click="blue(scope.row)">
               开票
             </el-button>
-            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0" size="mini" type="primary"
+            <el-button v-if="scope.row.result.id == 0 && scope.row.result.fapiao_status == 1" disabled="true" size="mini" type="primary"
+                       @click="blue(scope.row)">
+              开票审核中
+            </el-button>
+            <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"
                         @click="hongchong(scope.row)">
               红冲
             </el-button>
-            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0"
+            <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"
                        @click="yulan(scope.row)">
-              预览
-            </el-button>
-            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0">
               下载
             </el-button>
-
-
           </template>
         </el-table-column>
       </el-table>
@@ -242,6 +241,22 @@
       </span>
     </el-dialog>
 
+
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      :visible.sync="settlementVisibletwo">
+      <div>
+        <pdf :src="pdfSrc"></pdf>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="settlementVisibletwo = false">取 消</el-button>
+        <el-button type="primary" @click="settlementVisibletwo = false">确定</el-button>
+      </span>
+    </el-dialog>
+
+
+
   </div>
 </template>
 
@@ -251,7 +266,7 @@ import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund } from '@/api/his/his'
 import { ModifyFapiaoCode } from '@/api/his/his_tools'
 
-
+import pdf from 'vue-pdf'
 // import NewStatementPrint from './newStatementPrint'
 import { adminMainView} from "@/api/role/admin";
 import { fetchAllAdminUsers } from '@/api/doctor'
@@ -259,10 +274,6 @@ import axios from 'axios'
 import { jsGetAge, uParseTime } from '@/utils/tools'
 import {
   getOrderFapiaoList,
-  OpenBlueFapiao,
-  OpenRedFapiao,
-  GetSMSCode,
-  SMSLogin, GetQRCode
 } from '../../api/fapiao'
 
 import { getDialysisRecordInitData } from '@/api/dialysis_record'
@@ -279,12 +290,14 @@ export default {
   },
   data() {
     return {
+      pdfSrc:"",
       staff:"",
       admins:[],
       orderObj: {},
       batchOrderObj: {},
       fapiao_number:"",
       invoiceVisible: false,
+      settlementVisibletwo:false,
       med_options: [
         { id: 0, text: '全部' },
         { id: 11, text: '普通门诊' },
@@ -554,7 +567,7 @@ export default {
             })
           }else{
             if(response.data.data.cus_status == 1){
-              this.$nextTick(() =>{
+              that.$nextTick(() =>{
                 var qrcode = new QRCode(that.$refs.qrCodeUrl, {
                   text: response.data.data.qr_code, // 需要转换为二维码的内容
                   width: 120,
@@ -564,7 +577,7 @@ export default {
                   correctLevel: QRCode.CorrectLevel.H
                 })
               })
-              this.qr_dialogVisible =true
+              that.qr_dialogVisible =true
             }else if(response.data.data.cus_status == -1){
               // this.$message.error(response.data.msg)/*  */
               that
@@ -632,12 +645,14 @@ export default {
       }
 
       var that = this;
-      axios.get('http://127.0.0.1:9532/api/fapiao/blue',{params:params}).then(function(response) {
+      axios.get('http://that:9532/api/fapiao/blue',{params:params}).then(function(response) {
         if (response.data.state == 0) {
           that.$message.error(response.data.data.msg);
           return false
         } else {
           if(response.data.data.failed_code == -10){
+            that.settlementVisible = false
+
             that.$confirm(response.data.data.msg, '错误信息', {
               confirmButtonText: '确 定',
               type: 'warning'
@@ -646,6 +661,7 @@ export default {
             }).catch(() => {
             })
           }else{
+            that.settlementVisible = false
             that.$message.success(response.data.data.msg)
             that.getHisOrderList()
           }
@@ -681,8 +697,10 @@ export default {
 
 
     }, yulan(row){
-
-
+      window.open( row.result.pdf_url, "_blank");
+      // this.settlementVisibletwo = true
+      // this.pdfSrc = row.result.pdf_url
+      // console.log(this.pdfSrc)
 
     },hongchong(row){
       var  id = row.result.id
@@ -707,7 +725,7 @@ export default {
             }).catch(() => {
             })
           }else{
-            that.$message.success(response.data.msg)
+            that.$message.success(response.data.data.msg)
             that.getHisOrderList()
           }
 

src/xt_pages/outpatientCharges/summary.vue

@@ -6,44 +6,54 @@
     <div class="app-container">
       <div style=" display: flex; justify-content: space-between;  margin-bottom: 10px;">
         <div class="content_top" style="margin-right: 10px;">
-          <el-input  style="width: 120px"
-            v-model="keywords" @input="searchAction"
-            @keyup.enter.native="searchAction"
-            class="filter-item" placeholder="请输入患者姓名"
-          />
-          <el-button  class="filter-item" type="primary" @click="searchAction">
-            搜索
-          </el-button>
-          <el-select  v-model="sort_type"
-            placeholder="请选择"
-            style="width: 120px;"
-            @change="changeSortType"
-          >
-            <el-option
-              v-for="(item, index) in sort_types"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
+          <div style="width: 60%;">
+            <el-input  style="width: 60%"
+              v-model="keywords" @input="searchAction"
+              @keyup.enter.native="searchAction"
+              class="filter-item" placeholder="请输入患者姓名"
+            />
+            <el-button  class="filter-item" type="primary" @click="searchAction">
+              搜索
+            </el-button>
+          </div>
+
+          <div>
+            <el-select  v-model="sort_type"
+              placeholder="请选择"
+              style="width: 100%;"
+              @change="changeSortType"
             >
-            </el-option>
-          </el-select>
-          <el-select v-model="sch_type" placeholder="请选择班次" @change="handleSchType" style="width: 120px;">
-            <el-option label="全部" value="0"></el-option>
-            <el-option label="上午" value="1"></el-option>
-            <el-option label="下午" value="2"></el-option>
-            <el-option label="晚上" value="3"></el-option>
-          </el-select>
-
-          <el-select v-model="zoneVal" placeholder="请选择分区" style="width: 120px;" @change="handleZoneChange">
-            <el-option
-              v-for="item in zone_options"
-              :key="item.id"
-              :label="item.text"
-              :value="item.id">
-            </el-option>
-          </el-select>
+              <el-option
+                v-for="(item, index) in sort_types"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </div>
+
+          <div style="margin: 0 5px;">
+            <el-select v-model="sch_type" placeholder="请选择班次" @change="handleSchType" style="width: 100%;">
+              <el-option label="全部" value="0"></el-option>
+              <el-option label="上午" value="1"></el-option>
+              <el-option label="下午" value="2"></el-option>
+              <el-option label="晚上" value="3"></el-option>
+            </el-select>
+          </div>
+
+          <div>
+            <el-select v-model="zoneVal" placeholder="请选择分区" style="width: 100%;" @change="handleZoneChange">
+              <el-option
+                v-for="item in zone_options"
+                :key="item.id"
+                :label="item.text"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
         </div>
-        <div class="content_top">
+        <div class="content_button"  style="">
           <el-button
             size="small" type="primary" @click="query">查询
           </el-button>
@@ -54,73 +64,77 @@
           </el-button>
           <el-button size="small" type="primary" @click="export_detail"
           >报表下载
-          </el-button
-          >
-          <el-button v-if="$store.getters.xt_user.org_id == 10106 || $store.getters.xt_user.org_id == 0" size="small"
+          </el-button>
+          <el-button v-if="$store.getters.xt_user.org_id == 10106 " size="small"
                      type="primary" @click="export_detail_ten">报表下载2
           </el-button>
-          <el-button v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0" size="small"
+          <el-button v-if="$store.getters.xt_user.org_id == 10318" size="small"
                      type="primary" @click="export_detail_ten_two">报表下载3
           </el-button>
 
-          <el-button size="small" type="primary"
-                     @click="export_detail_ten_five">导出就诊凭证类型人员
-          </el-button>
+          
         </div>
       </div>
 
       <div style=" display: flex; justify-content: space-between;  margin-bottom: 10px;">
         <div class="content_top" style="margin-right: 10px;">
-          <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
-            @change="handleStartTimeChange":editable="false" :clearable="false"
-            style="width: 150px;"
-            type="date"
-            placeholder="选择开始日期"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            align="right"
-          ></el-date-picker>
-          <span style="text-align: center;">-</span>
-          <el-date-picker
-            size="small"
-            v-model="end_time"
-            prefix-icon="el-icon-date"
-            @change="handleEndTimeChange"
-            :editable="false"
-            :clearable="false"
-            style="width: 150px; "
-            type="date"
-            placeholder="选择结束日期"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            align="right"
-          ></el-date-picker>
+          <div style="">
+            <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
+              @change="handleStartTimeChange":editable="false" :clearable="false"
+              style="width: 45%;"
+              type="date"
+              placeholder="选择开始日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              align="right"
+            ></el-date-picker>
+            <span style="text-align: center;">-</span>
+            <el-date-picker
+              size="small"
+              v-model="end_time"
+              prefix-icon="el-icon-date"
+              @change="handleEndTimeChange"
+              :editable="false"
+              :clearable="false"
+              style="width: 45%;"
+              type="date"
+              placeholder="选择结束日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              align="right"
+            ></el-date-picker>
+          </div>
+          <div>
+            <el-select  v-model="staff" placeholder="请选择缴费人员"
+                   style="width:100%;" >
+              <el-option
+                v-for="item,index in admins"
+                :key="index"
+                :label="item.user_name"
+                :value="item.user_name">
+              </el-option>
+            </el-select>
+          </div>
+          <div style="margin-left: 5px;">
+            <el-select v-model="medTypeVal" @change="handleMedChange"
+              placeholder="请选择医疗类别" style="width: 100%;"
+            >
+              <el-option
+                v-for="item in med_options"
+                :key="item.id"
+                :label="item.text"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+
 
-          <el-select size="small" v-model="staff" placeholder="请选择缴费人员"
-                   style="width:120px;" >
-            <el-option
-              v-for="item,index in admins"
-              :key="index"
-              :label="item.user_name"
-              :value="item.user_name">
-            </el-option>
-          </el-select>
-
-          <el-select v-model="medTypeVal" @change="handleMedChange"
-            placeholder="请选择医疗类别" style="width: 120px;"
-          >
-            <el-option
-              v-for="item in med_options"
-              :key="item.id"
-              :label="item.text"
-              :value="item.id">
-            </el-option>
-          </el-select>
         </div>
         <div class="content_button">
           <el-button size="small" type="primary" @click="export_detail_three" v-if="$store.getters.xt_user.org_id == 10265 || $store.getters.xt_user.org_id == 0">报表下载12</el-button>
           <el-button size="small" type="primary" @click="accounts_click()">门诊结账</el-button>
           <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>
+          <el-button size="small" type="primary" @click="export_detail_ten_five">导出就诊凭证类型人员</el-button>
         </div>
       </div>
 
@@ -4052,12 +4066,14 @@ export default {
   .content_top{
     flex: 1;
     display: flex;
-    justify-content: space-between;
+    // justify-content: space-between;
   }
   .content_button{
     flex: 1;
     display: flex;
-    justify-content:space-around;
+    text-align: right;
+    justify-content: flex-end;
+    //justify-content:space-around;
   }
   .butt_1{
     margin-left:10px;