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

src/api/his/his.js

@@ -642,4 +642,14 @@ export function getMonthHisHospitalDetailInfo(params) {
 
 
 
+export function getYidiClearRecord(params) {
+  return request({
+    url: '/api/his/getyidiclear',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
 

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -13,12 +13,13 @@
     </template>
     <div class="app-container" style="padding-top:40px;">
         <div class='dialysisPage'>
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4" >
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188" >
             <printOne v-if="org_id != 10088" :paramsObj="invoiceParams"></printOne>
             <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4" :paramsObj="invoiceParams"></printFour>
+          <printFive v-if="org_id == 10188" :paramsObj="invoiceParams"></printFive>
         </div>
     </div>
   </div>
@@ -29,13 +30,15 @@ import printOne from './invoiceTemplate/printOne'
 import printTwo from './invoiceTemplate/printTwo'
 import printThree from './invoiceTemplate/printThree'
 import printFour from './invoiceTemplate/printFour'
+import printFive from './invoiceTemplate/printFive'
 export default {
    name: "invoicePrint",
   components: {
     printOne,
     printTwo,
     printThree,
-    printFour
+    printFour,
+    printFive
   },
   props:{
     invoiceParams:Object

src/xt_pages/outpatientCharges/invoiceTemplate/printFive.vue

@@ -0,0 +1,203 @@
+<template>
+    <div id='invoice-print'>
+        <div style="display:flex;">
+            <div style="position: absolute;top:80px;left:70px;">{{ list.order_number }}</div>
+            <!-- <div>{{ list.id_card_no }}</div> -->
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div style="position: absolute;top:100px;left:80px;"> {{ paramsObj.name }}</div>
+        </div>
+        <div style="position: absolute;top:120px;left:80px">
+            <div v-if="list.westernMedicineCostTotal">西药 {{ list.westernMedicineCostTotal }}</div>
+            <div v-if="list.treatCostTotal">治疗费 {{ list.treatCostTotal }}</div>
+            <div v-if="list.bedCostTotal">床位费 {{ list.bedCostTotal }}</div>
+            <div v-if="list.chineseTraditionalMedicineCostTotal">中成药 {{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div v-if="list.laboratoryCostTotal">化验费 {{ list.laboratoryCostTotal }}</div>
+            <div v-if="list.operationCostTotal">手术费 {{ list.operationCostTotal }}</div>
+            <div v-if="list.otherCostTotal">其他费 {{ list.otherCostTotal }}</div>
+            <div v-if="list.materialCostTotal">材料费 {{ list.materialCostTotal }}</div>
+        </div>
+        <div style="position: absolute;top:120px;left:300px">
+            <div v-for="(item,index) in list.order_info" :key="index">
+                <span style="display:inline-block;width:240px;">
+                    <span v-if="item.advice.id == 0">
+                        <span v-if="item.project.type == 2">{{ item.project.project.project_name }}</span>
+                        <span v-if="item.project.type == 3">{{ item.project.good_info.good_name }}</span>
+                    </span>
+                    <span v-else>{{ item.advice.advice_name }}</span>
+                </span>
+                <span style="display:inline-block;width:50px;">
+                    <span v-if="item.advice.id == 0">
+                        <span v-if="item.project.type == 2">{{ item.project.count }}{{ item.project.unit }}</span>
+                        <span v-if="item.project.type == 3">{{ item.project.count }}{{ item.project.unit }}</span>
+                    </span>
+                    <span v-else>{{ item.advice.prescribing_number }}{{ item.advice.prescribing_number_unit }}</span>
+                </span>
+                <span>
+                    <span v-if="item.advice.id == 0">
+                        <span v-if="item.project.type == 2">{{ (item.project.count * item.pric).toFixed(2) }}</span>
+                        <span v-if="item.project.type == 3">{{ (item.project.count * item.pric).toFixed(2) }}</span>
+                    </span>
+                    <span v-else>{{ (item.advice.prescribing_number * item.pric).toFixed(2) }}</span>
+                </span>
+            </div>
+        </div>
+        <div style="position: absolute;top:300px;left:80px">{{ zhongwen }}</div>
+        <div style="position: absolute;top:300px;left:300px">{{ list.psn_cash_money ? list.psn_cash_money : list.medfee_sumamt }}</div>
+        <div style="position: absolute;top:320px;left:80px;width:100%">
+            <div style="display:flex;">
+                <div style="width:160px">医疗总费用：{{ list.psn_cash_money ? list.psn_cash_money : list.medfee_sumamt }}</div>
+                <div style="width:160px">现金支出：{{ list.psn_cash_money ? list.psn_cash_money : list.medfee_sumamt }}</div>
+                <div style="width:160px">上次账户：0</div>
+                <div style="width:160px">本次账户：0</div>
+            </div>
+            <div style="display:flex;">
+                <div style="width:160px">账户余额：{{ list.order.balc }}</div>
+                <div style="width:160px">统筹支出：{{ list.order.hifp_pay }}</div>
+                <div style="width:160px">大病支出：0</div>
+                <div style="width:160px">民政支出：0</div>
+            </div>
+            <div style="display:flex;">
+                <div style="width:160px">大病补充保险支出：0</div>
+                <div style="width:320px">企业补充医疗保险基金支出：{{ list.order.hifes_pay }}</div>
+                <div style="width:160px">其他支出：{{ list.order.oth_pay }}</div>
+            </div>
+        </div>
+        <div>
+            <div style="position: absolute;top:380px;left:120px">{{ org_name }}</div>
+            <div style="position: absolute;top:380px;left:300px">{{ paramsObj.chargeName }}</div>
+             <div  style="position: absolute;left:470px;top:380px;">
+                <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
+            </div>
+            <div  style="position: absolute;left:530px;top:380px;">
+                <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
+            </div>
+            <div  style="position: absolute;left:560px;top:380px;">
+                <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
+            </div>
+        </div>
+    </div>
+</template>
+
+
+<script>
+import { getInvoice } from '@/api/project/project'
+import { uParseTime } from '@/utils/tools'
+export default {
+    props:{
+        paramsObj:Object
+    },
+    data(){
+        return{
+            list:{},
+            printDate:'',
+            zhongwen:'',
+            totalPrice:0.0,
+            org_id:'',
+            org_name:''
+        }
+    },
+    created(){
+        console.log('paramsObj',this.paramsObj)
+        let params = {
+            order_id: this.paramsObj.order_id,
+            patient_id: this.paramsObj.patient_id,
+        }
+        this.getInvoice(params)
+        // var data = new Date();
+        // var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+        // var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+        // this.printDate = data.getFullYear() + "-" + month + "-" + date;
+        // this.smalltoBIG(982732.21)
+        this.org_id = this.$store.getters.xt_user.org_id
+        this.org_name = this.$store.getters.xt_user.org.org_name
+    },
+    methods:{
+        getInvoice(params){
+            getInvoice(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.smalltoBIG(this.list.psn_cash_money ? this.list.psn_cash_money : this.list.medfee_sumamt)
+                var data = new Date(res.data.data.date * 1000);
+                var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+                var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+                this.printDate = data.getFullYear() + "-" + month + "-" + date;
+            })
+        },
+        smalltoBIG(n) {
+            // let fraction = ['角', '分'];
+            // let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+            // let unit = [['元.', '万,', '亿,'], ["元",'拾', '佰', '仟']];
+            // let head = price < 0 ? '欠' : '';
+            // price = Math.abs(price);
+            // let upper = '';
+            // for (let i = 0; i < fraction.length; i++) {
+            // upper += (digit[Math.floor(price * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
+            // }
+            // upper = upper || '整';
+            // price = Math.floor(price);
+            // for (let i = 0; i < unit[0].length && price > 0; i++) {
+            // let p = '';
+            // for (let j = 0; j < unit[1].length && price > 0; j++) {
+            //     p = digit[price % 10] + unit[1][j] + p;
+            //     price = Math.floor(price / 10);
+            // }
+            // upper = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + upper;
+            // }
+            // this.zhongwen = head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整')
+            // console.log('6666',head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整'))
+            if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)){
+                return "数据非法";  //判断数据是否大于0
+            }
+
+            var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
+            n += "00";  
+
+            var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
+
+            if (indexpoint >= 0){
+
+                n = n.substring(0, indexpoint) + n.substr(indexpoint+1, 2);   // 若为小数，截取需要使用的unit单位
+            }
+
+            unit = unit.substr(unit.length - n.length);  // 若为整数，截取需要使用的unit单位
+            for (var i=0; i < n.length; i++){
+                str += "零壹贰叁肆伍陆柒捌玖".charAt(n.charAt(i)) + unit.charAt(i);  //遍历转化为大写的数字
+            }
+            console.log("str",str)
+            if(str == '零元零角零分'){
+                this.zhongwen = '零'
+            }else{
+                this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
+            }
+
+            console.log(this.zhongwen)
+        },
+        getTime(value, temp) {
+            if (value == 0) {
+                return ''
+            }
+            if (value != undefined) {
+                return uParseTime(value, temp)
+            }
+            return ''
+        },
+
+    },
+    watch:{
+        paramsObj:{//深度监听，可监听到对象、数组的变化
+            handler(val, oldVal){
+                let params = {
+                    order_id: val.order_id,
+                    patient_id: val.patient_id,
+                }
+                this.getInvoice(params)
+
+            },
+            deep:true
+        }
+    }
+}
+</script>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -172,10 +172,25 @@
                         <span>医疗费总额：<span style="color:red;">{{
                             items.curPrescriptions.order.medfee_sumamt ? items.curPrescriptions.order.medfee_sumamt.toFixed(2) : getTotalFour(items.prescriptions) ? getTotalFour(items.prescriptions) : ''
                           }}元</span></span>
-                        <span>基金支付金额：<span
+                        <span>基金支付总额：<span
+                            style="color:red;">{{
+                            items.curPrescriptions.order.fund_pay_sumamt ? items.curPrescriptions.order.fund_pay_sumamt.toFixed(2) : ''
+                          }}元</span></span>
+
+                        <span>基本医疗保险统筹基金支出：<span
                             style="color:red;">{{
                             items.curPrescriptions.order.hifp_pay ? items.curPrescriptions.order.hifp_pay.toFixed(2) : ''
                           }}元</span></span>
+
+                        <span>医疗救助基金支出：<span
+                            style="color:red;">{{
+                            items.curPrescriptions.order.maf_pay ? items.curPrescriptions.order.maf_pay.toFixed(2) : ''
+                          }}元</span></span>
+
+<!--                        <span>基金支付金额：<span-->
+<!--                            style="color:red;">{{-->
+<!--                            items.curPrescriptions.order.hifp_pay ? items.curPrescriptions.order.hifp_pay.toFixed(2) : ''-->
+<!--                          }}元</span></span>-->
                         <span>个人账户支付金额：<span
                             style="color:red;">{{
                             items.curPrescriptions.order.acct_pay ? items.curPrescriptions.order.acct_pay.toFixed(2) : ''
@@ -368,10 +383,21 @@
                         <span>医疗费总额：<span style="color:red;">{{
                             items.curMonthPrescriptions.order.medfee_sumamt ? items.curMonthPrescriptions.order.medfee_sumamt.toFixed(2) : getTotalFour(items.month_prescriptions) ? getTotalFour(items.month_prescriptions) : ''
                           }}元</span></span>
-                        <span>基金支付金额：<span
+                        <span>基金支付总额：<span
+                            style="color:red;">{{
+                            items.curMonthPrescriptions.order.fund_pay_sumamt ? items.curMonthPrescriptions.order.fund_pay_sumamt.toFixed(2) : ''
+                          }}元</span></span>
+
+                        <span>基本医疗保险统筹基金支出：<span
                             style="color:red;">{{
                             items.curMonthPrescriptions.order.hifp_pay ? items.curMonthPrescriptions.order.hifp_pay.toFixed(2) : ''
                           }}元</span></span>
+
+                        <span>医疗救助基金支出：<span
+                            style="color:red;">{{
+                            items.curMonthPrescriptions.order.maf_pay ? items.curMonthPrescriptions.order.maf_pay.toFixed(2) : ''
+                          }}元</span></span>
+
                         <span>个人账户支付金额：<span
                             style="color:red;">{{
                             items.curMonthPrescriptions.order.acct_pay ? items.curMonthPrescriptions.order.acct_pay.toFixed(2) : ''

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -301,7 +301,7 @@ export default {
           id: obj.order_id,
 
         }
-        if(this.org_id == 10138 || this.org_id == 0 || this.$store.getters.xt_user.org_id == 4){
+        if(this.org_id == 10138 || this.org_id == 0 || this.$store.getters.xt_user.org_id == 4 || this.org_id == 10278){
           getPrivateExpenses(params).then(response => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -1,6 +1,8 @@
 <template>
   <div id="statement-print" class="statement-print">
-    <div class="statementTitle">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="info.fixmedins_code == 'H32092103007'">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-else>广东省社会医疗保险医疗费用结算单</div>
+
     <table class="statementTable" border="1">
       <tr>
         <td width="80">机构名称</td>

src/xt_pages/outpatientCharges/summary.vue

@@ -17,19 +17,29 @@
                                @click="searchAction">
                         搜索
                     </el-button>
-                    <el-select size="small" v-model="admin_user_id" placeholder="请选择"
-                               style="width:150px;margin-left:10px;" @change="changeDoctor">
-                        <el-option
-                                label="全部"
-                                value="0">
-                        </el-option>
-                        <el-option
-                                v-for="item,index in doctors"
-                                :key="index"
-                                :label="item.user_name"
-                                :value="item.admin_user_id">
-                        </el-option>
-                    </el-select>
+<!--                    <el-select size="small" v-model="admin_user_id" placeholder="请选择"-->
+<!--                               style="width:150px;margin-left:10px;" @change="changeDoctor">-->
+<!--                        <el-option-->
+<!--                                label="全部"-->
+<!--                                value="0">-->
+<!--                        </el-option>-->
+<!--                        <el-option-->
+<!--                                v-for="(item,index) in doctors"-->
+<!--                                :key="index"-->
+<!--                                :label="item.user_name"-->
+<!--                                :value="item.admin_user_id">-->
+<!--                        </el-option>-->
+<!--                    </el-select>-->
+
+                  <el-select size="small" v-model="sort_type" placeholder="请选择"
+                             style="width:150px;margin-left:10px;" @change="changeSortType">
+                    <el-option
+                        v-for="(item,index) in sort_types"
+                        :key="index"
+                        :label="item.label"
+                        :value="item.value">
+                    </el-option>
+                  </el-select>
                     <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
                                     @change="handleStartTimeChange" :editable="false" :clearable="false"
                                     style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
@@ -247,6 +257,11 @@
         end_time: '',
         total: '',
         doctors: [],
+        sort_type:1,
+        sort_types: [
+          { value: 1, label: '处方时间' },
+          { value: 2, label: '结算时间' }
+        ],
         admin_user_id: '',
         listVisible: false,
         allListVisible: false,
@@ -615,6 +630,10 @@
 
       }, formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
+      },changeSortType(){
+        this.page = 1
+        this.keywords = ''
+        this.getHisOrderList()
       },
       changeDoctor() {
         this.page = 1
@@ -725,7 +744,8 @@
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.admin_user_id,
-          p_type: 2
+          p_type: 2,
+          sort_type: this.sort_type
         }
         getHisOrderList(params).then(response => {
           if (response.data.state == 0) {

src/xt_pages/outpatientDoctorStation/components/dialysisIndex.vue

@@ -145,7 +145,7 @@
           title="治疗小结"
         ></treatment-of>
       </div>
-      
+
     </div>
     <div style="padding-top: 56px;width:100%;text-align:center;font-size:22px;color:red;" v-else>该患者未排班，请先去排班</div>
   </div>
@@ -319,8 +319,8 @@ export default {
     var date = this.record_date
     this.patient_id = patient_id
     this.date = date
-    var ymd = parseTime(new Date(), '{y}-{m}-{d}')
-    getDialysisSchedules(ymd).then(rs => {
+    // var ymd = parseTime(new Date(), '{y}-{m}-{d}')
+    getDialysisSchedules(this.date).then(rs => {
       var resp = rs.data
       if (resp.state == 1) {
         var schedules = resp.data.schedules
@@ -343,22 +343,22 @@ export default {
       }
     })
 
-    
+
 
   },
   mounted() {
     if(this.dialysisShow == true){
-      
+
       this.getScheduleDetail()
       this.getLongAdvice()
     }
-    
+
   },
   watch:{
         patientid:{
             handler(newVal){
-              var ymd = parseTime(new Date(), '{y}-{m}-{d}')
-              getDialysisSchedules(ymd).then(rs => {
+              // var ymd = parseTime(new Date(), '{y}-{m}-{d}')
+              getDialysisSchedules(this.record_date).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
                   var schedules = resp.data.schedules
@@ -574,7 +574,7 @@ export default {
       }
     },
     getScheduleDetail: function() {
-      
+
       this.loading = true
     //   var dateStr = parseTime(this.date, '{y}-{m}-{d}')
       // if(this.$route.query.showView == true){
@@ -590,7 +590,7 @@ export default {
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
-         
+
           var prescription = resp.data.prescription // 透析处方
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
@@ -599,7 +599,7 @@ export default {
           }
 
           var solution = resp.data.solution // 透析方案
-         
+
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
 
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估

src/xt_pages/outpatientTool/yidiClear.vue

@@ -0,0 +1,168 @@
+<template>
+  <!-- <div class="main-contain outpatientChargesManagement">
+      <div class="position">
+          <bread-crumb :crumbs='crumbs'></bread-crumb>
+      </div> -->
+  <div>
+    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+      <div>
+
+        <el-date-picker
+            v-model="year"
+            type="year"
+            placeholder="选择年">
+        </el-date-picker>
+        <el-date-picker
+            v-model="month"
+            type="month"
+            placeholder="选择月">
+        </el-date-picker>
+      </div>
+      <div>
+        <el-button size="small" type="primary" @click="getYidiClear()">提取异地清分</el-button>
+        <el-button size="small" type="primary" @click="comfirmClear()">异地清分确认</el-button>
+      </div>
+    </div>
+    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+              show-summary
+              max-height="600"
+              highlight-current-row>
+      <el-table-column align="center" prop="name" label="清分机构">
+        <template slot-scope="scope">{{scope.row.org_name}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="清分时间">
+        <template slot-scope="scope">{{getTime(scope.row.ctime) ? getTime(scope.row.ctime): ''}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="清分流水号">
+        <template slot-scope="scope">{{scope.row.msg_id}}</template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog title="异地清分明细" :visible.sync="dialogTableVisible">
+      <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                show-summary
+                max-height="600"
+                highlight-current-row>
+        <el-table-column align="center" prop="name" label="身份证号码">
+          <template slot-scope="scope">{{scope.row.certno}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="就诊登记号">
+          <template slot-scope="scope">{{scope.row.mdtrt_id}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="就诊结算时间">
+          <template slot-scope="scope">{{scope.row.mdtrt_setl_time}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="就诊流水号">
+          <template slot-scope="scope">{{scope.row.setl_sn}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="全额垫付标志">
+          <template slot-scope="scope" v-if="scope.row.fulamt_advpay_flag == 0">{{医院报销}}</template>
+          <template slot-scope="scope" v-if="scope.row.fulamt_advpay_flag == 1">{{零星报销}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="总费用">
+          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="经办机构支付总额">
+          <template slot-scope="scope">{{scope.row.optins_pay_sumamt}}</template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+
+  <!-- </div> -->
+</template>
+
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { getYidiClearRecord } from '@/api/his/his'
+import { uParseTime } from '@/utils/tools'
+import axios from 'axios'
+const moment = require('moment')
+export default {
+  components: {
+    BreadCrumb
+
+  },
+  data() {
+    return {
+      dialogTableVisible:false,
+      year:'',
+      month:'',
+      tableData:[],
+    }
+  },
+  methods: {
+    getYidiClear(){
+      var that = this;
+      let params = {
+        'year':year,
+        'month':month,
+        'admin_user_id':this.$store.getters.xt_user.user.id,
+      };
+      axios.get('http://127.0.0.1:9532/api/allopatry/get',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          this.dialogTableVisible = true
+          this.tableData = []
+          for(let i = 0; i < response.data.data.list.length; i++){
+            let obj = {
+              certno: response.data.data.list[i].certno,
+              mdtrt_id:response.data.data.list[i].mdtrt_id,
+              mdtrt_setl_time:response.data.data.list[i].mdtrt_setl_time,
+              setl_sn:response.data.data.list[i].setl_sn,
+              fulamt_advpay_flag:response.data.data.list[i].fulamt_advpay_flag,
+              medfee_sumamt:response.data.data.list[i].medfee_sumamt,
+              optins_pay_sumamt:response.data.data.list[i].optins_pay_sumamt,
+            }
+            this.tableData.push(obj)
+          }
+        }
+      }).catch(function(error) {
+      })
+    },comfirmClear(){
+      var that = this;
+      let params = {
+        'year':year,
+        'month':month,
+        'admin_user_id':this.$store.getters.xt_user.user.id,
+      };
+      axios.post('http://127.0.0.1:9532/api/comfirmallopatry/post',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          that.$message.success("异地清分确认成功");
+        }
+      }).catch(function(error) {
+      })
+
+    },
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp)
+      }
+      return ''
+    },
+    getYidiClearRecord() {
+      getYidiClearRecord({}).then(response => {
+        if (response.data.state == 1) {
+
+
+
+        } else {
+          this.$message.error(response.data.msg)
+        }
+      })
+    },
+  },
+  created() {
+    this.getYidiClearRecord()
+
+  }
+}
+</script>

src/xt_pages/sign/lineUp.vue

@@ -77,38 +77,46 @@
                     <div class="callingBox">
                         <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
-                            <div style="flex: 1;">
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
                                 <div class="callingTop" style="margin-bottom:10px;">
                                     <div class="callingTopTip"><span style="margin: 0 auto;">正在<br />接诊</span></div>
                                     <div class="callingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="callingTop" style="border-radius: 0 0 15px 0;">
                                     <div class="callingTopTip"><span style="margin: 0 auto;">等待<br />接诊</span></div>
                                     <div class="callingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (waitDoctorList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (waitDoctorList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (waitDoctorList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (waitDoctorList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
                         <div :class="(queueConfig.jzjhyc == 0 && queueConfig.sjjhyc == 1) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.sjjhyc == 1">
                             <div class="callingTitle newCallingTitle"><span style="margin: 0 auto;">上<br />机<br />叫<br />号</span></div>
-                            <div style="flex: 1;">
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
                                 <div class="callingTop" style="margin-bottom:10px;">
                                     <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">正在<br />叫号</span></div>
                                     <div class="callingContent newCallingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (upPatientList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (upPatientList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (upPatientList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (upPatientList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="callingTop" style="border-radius: 0 0 15px 0;">
                                     <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">等待<br />叫号</span></div>
                                     <div class="callingContent newCallingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -117,6 +125,91 @@
                 </div>
                 
             </div>
+        
+            <!-- <div class="page_lineUp">
+                <div class="lineUpTitle">
+                    <div>{{ this.$store.getters.xt_user.org.org_name }}<span>&nbsp;&nbsp;温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合</span></div>
+                    <div>{{ newdate }}&nbsp;&nbsp;{{ time }}</div>
+                </div>
+                <div class="lineUpMain">
+                    <div class="lineUpMainLeft">
+                        <div class="lineUpMainLeftTitle">
+                            <p style="width:12%">排队号</p>
+                            <p style="width:14%">姓名</p>
+                            <p style="width:14%">病例号</p>
+                            <p style="width:14%">床位号</p>
+                            <p style="width:14%">治疗状态</p>
+                            <p style="width:14%">上机时间</p>
+                            <p style="width:16%">预计下机时间</p>
+                        </div>
+                        <div class="lineUpList">
+                            <div class="lineUpListOne" v-for="(item,index) in 6" :key="index">
+                                <p style="width:12%">
+                                    <span>上午</span>
+                                    {{ 89 }}号
+                                </p>
+                                <p style="width:14%">{{ '张三' }}</p>
+                                <p style="width:14%">{{ 3023 }}</p>
+                                <p style="width:14%">{{ 'A区' + '098' }}</p>
+                                <p style="width:14%">
+                                    <span>待接诊</span>
+                                </p>
+                                <p style="width:14%">07:38:00</p>
+                                <p style="width:16%">07:38:00</p>
+                            </div>
+                        </div>
+                    </div> 
+                    <div class="callingBox">
+                        <div class="callingBoxLeft">
+                            <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
+                                <div class="callingTop">
+                                    <div class="callingTopTip"><span style="margin: 0 auto;">正在<br />接诊</span></div>
+                                    <div class="callingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="callingTop" style="border-radius: 0 0 15px 0;">
+                                    <div class="callingTopTip"><span style="margin: 0 auto;">等待<br />接诊</span></div>
+                                    <div class="callingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="callingBoxLeft">
+                            <div class="callingTitle newCallingTitle"><span style="margin: 0 auto;">上<br />机<br />叫<br />号</span></div>
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
+                                <div class="callingTop">
+                                    <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">正在<br />叫号</span></div>
+                                    <div class="callingContent newCallingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="callingTop" style="border-radius: 0 0 15px 0;">
+                                    <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">等待<br />叫号</span></div>
+                                    <div class="callingContent newCallingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                
+            </div> -->
         </div>
         <div class="app-container">
             <div class="page_lineUp">
@@ -161,38 +254,46 @@
                     <div class="callingBox">
                         <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
-                            <div style="flex: 1;">
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
                                 <div class="callingTop" style="margin-bottom:10px;">
                                     <div class="callingTopTip"><span style="margin: 0 auto;">正在<br />接诊</span></div>
                                     <div class="callingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="callingTop" style="border-radius: 0 0 15px 0;">
                                     <div class="callingTopTip"><span style="margin: 0 auto;">等待<br />接诊</span></div>
                                     <div class="callingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (waitDoctorList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (waitDoctorList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (waitDoctorList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (waitDoctorList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
                         <div :class="(queueConfig.jzjhyc == 0 && queueConfig.sjjhyc == 1) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.sjjhyc == 1">
                             <div class="callingTitle newCallingTitle"><span style="margin: 0 auto;">上<br />机<br />叫<br />号</span></div>
-                            <div style="flex: 1;">
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
                                 <div class="callingTop" style="margin-bottom:10px;">
                                     <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">正在<br />叫号</span></div>
                                     <div class="callingContent newCallingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (upPatientList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (upPatientList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (upPatientList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (upPatientList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="callingTop" style="border-radius: 0 0 15px 0;">
                                     <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">等待<br />叫号</span></div>
                                     <div class="callingContent newCallingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -201,6 +302,91 @@
                 </div>
                 
             </div>
+        
+            <!-- <div class="page_lineUp">
+                <div class="lineUpTitle">
+                    <div>{{ this.$store.getters.xt_user.org.org_name }}<span>&nbsp;&nbsp;温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合</span></div>
+                    <div>{{ newdate }}&nbsp;&nbsp;{{ time }}</div>
+                </div>
+                <div class="lineUpMain">
+                    <div class="lineUpMainLeft">
+                        <div class="lineUpMainLeftTitle">
+                            <p style="width:12%">排队号</p>
+                            <p style="width:14%">姓名</p>
+                            <p style="width:14%">病例号</p>
+                            <p style="width:14%">床位号</p>
+                            <p style="width:14%">治疗状态</p>
+                            <p style="width:14%">上机时间</p>
+                            <p style="width:16%">预计下机时间</p>
+                        </div>
+                        <div class="lineUpList">
+                            <div class="lineUpListOne" v-for="(item,index) in 6" :key="index">
+                                <p style="width:12%">
+                                    <span>上午</span>
+                                    {{ 89 }}号
+                                </p>
+                                <p style="width:14%">{{ '张三' }}</p>
+                                <p style="width:14%">{{ 3023 }}</p>
+                                <p style="width:14%">{{ 'A区' + '098' }}</p>
+                                <p style="width:14%">
+                                    <span>待接诊</span>
+                                </p>
+                                <p style="width:14%">07:38:00</p>
+                                <p style="width:16%">07:38:00</p>
+                            </div>
+                        </div>
+                    </div> 
+                    <div class="callingBox">
+                        <div class="callingBoxLeft">
+                            <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
+                                <div class="callingTop">
+                                    <div class="callingTopTip"><span style="margin: 0 auto;">正在<br />接诊</span></div>
+                                    <div class="callingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="callingTop" style="border-radius: 0 0 15px 0;">
+                                    <div class="callingTopTip"><span style="margin: 0 auto;">等待<br />接诊</span></div>
+                                    <div class="callingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="callingBoxLeft">
+                            <div class="callingTitle newCallingTitle"><span style="margin: 0 auto;">上<br />机<br />叫<br />号</span></div>
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
+                                <div class="callingTop">
+                                    <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">正在<br />叫号</span></div>
+                                    <div class="callingContent newCallingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="callingTop" style="border-radius: 0 0 15px 0;">
+                                    <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">等待<br />叫号</span></div>
+                                    <div class="callingContent newCallingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                
+            </div> -->
         </div>
     </div>
 </template>
@@ -505,26 +691,32 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.main-contain{
+    height: 100%;
+}
 .page_lineUp{
+    height: 100%;
     .lineUpTitle{
-        height: 50px;
+        height: 4vh;
         background: #1A82BF;
         display: flex;
         justify-content: space-between;
         align-items: center;
         padding: 0 20px;
         color:#fff;
-        font-size: 20px;
+        font-size: 2vh;
         font-weight: 600;
     }
     .lineUpMain{
         background: linear-gradient(0deg, #76ECEC, #479CD2);
-        height: 1080px;
+        height: 95%;
         padding:10px;
     }
     .lineUpMainLeft{
-        height: 620px;
+        height: 60%;
         border-radius: 15px;
+        display: flex;
+        flex-direction: column;
         
     }
     .lineUpMainLeftTitle{
@@ -532,9 +724,9 @@ export default {
         justify-content: space-between;
         align-items: center;
         color:#fff;
-        font-size: 38px;
+        font-size: 4vh;
         font-weight: 600;
-        height:80px;
+        height:7vh;
         background: #1A82BF;
         border-radius: 15px 15px 0 0;
         >p{
@@ -542,8 +734,9 @@ export default {
         }
     }
     .lineUpList{
-        font-size: 35px;
+        font-size: 3vh;
         font-weight: 600;
+        flex: 1;
         >div:nth-child(odd){
             background: #F9FDFF;
         }
@@ -554,7 +747,7 @@ export default {
             border-radius: 0 0 15px 15px;
         }
         .lineUpListOne{
-            height:90px;
+            height:16%;
             display: flex;
             justify-content: space-between;
             align-items: center;
@@ -566,7 +759,7 @@ export default {
         }
     }
     .callingBox{
-        height: 430px;
+        height: 39%;
         margin-top: 10px;
         display: flex;
         justify-content: space-between;
@@ -577,16 +770,16 @@ export default {
             justify-content: space-between;
         }
         .callingBoxLeft1{
-            width: 99.5%;
+            width: 100%;
             height: 100%;
             display: flex;
             justify-content: space-between;
         }
         .callingTitle{
-            width: 130px;
+            width: 10vh;
             height: 100%;
             border-radius: 15px 0 0 15px;
-            font-size: 66px;
+            font-size: 5vh;
             font-weight:600;
             text-align: center;
             color: #fff;
@@ -599,16 +792,16 @@ export default {
             background: #1aa680;
         }
         .callingTop{
-            height: 210px;
+            height: 49.5%;
             border-radius: 0 15px 0 0;
             background: #F9FDFF;
             display: flex;
             justify-content: space-between;
             .callingTopTip{
-                width: 130px;
+                width: 10vh;
                 height: 100%;
                 color: #fff;
-                font-size: 40px;
+                font-size: 3vh;
                 font-weight: 600;
                 background: #1A82BF;
                 display: flex;
@@ -621,15 +814,19 @@ export default {
                 flex: 1;
                 display: flex;
                 flex-direction: column;
-                font-size: 50px;
+                font-size: 4vh;
                 color:#1C6895;
                 font-weight: 600;
                 padding-left: 20px;
+                justify-content: space-around;
                 >p{
                     width:100%;
                     text-align: left;
                     line-height: 50px;
                 }
+                div>:first-child{
+                    margin-bottom: 10px;
+                }
             }
             .newCallingContent{
                 color:#1aa680;
@@ -648,6 +845,7 @@ export default {
   background: #fff;
   padding: 20px;
   z-index:5000;
+  height: 100%;
 }
 #fullscreenbroad #fullscreenbroad-setting {
   float: right;

src/xt_pages/sign/signIn.vue

@@ -41,7 +41,7 @@
                     <div>{{ newdate }}&nbsp;&nbsp;{{ time }}</div>
                 </div>
                 <div class="signInMain">
-                    <div style="display: flex;justify-content: space-between;padding:10px;">
+                    <div style="display: flex;justify-content: space-between;padding:10px;height:100%;">
                         <div :class="Object.keys(queueInfo).length>0 ? 'signInMainLeft' : 'signInMainLeft100'">
                             <div class="signInMainLeftTitle">
                                 <p>排队号</p>
@@ -71,7 +71,7 @@
                                     <span v-if="queueInfo.schedule_type == 1">上午</span>
                                     <span v-if="queueInfo.schedule_type == 2">下午</span>
                                     <span v-if="queueInfo.schedule_type == 3">晚上</span>
-                                    <span style="font-size:180px;">{{ queueInfo.queue_no }}号</span>
+                                    <span style="font-size:10vh;">{{ queueInfo.queue_no }}号</span>
                                 </p>
                             </div>
                             <div class="signInMianRightBottom"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>签到成功</span></div>
@@ -82,6 +82,50 @@
                     </div>
                 </div>
             </div>
+        
+            <!-- <div class="page_signIn">
+                <div class="signInTitle">
+                    <div>{{ this.$store.getters.xt_user.org.org_name }}</div>
+                    <div>{{ newdate }}&nbsp;&nbsp;{{ time }}</div>
+                </div>
+                <div class="signInMain">
+                    <div style="display: flex;justify-content: space-between;padding:10px;height:100%;">
+                        <div class="signInMainLeft">
+                            <div class="signInMainLeftTitle">
+                                <p>排队号</p>
+                                <p>姓名</p>
+                                <p>病历号</p>
+                                <p>签到时间</p>
+                            </div>
+                            <div class="signInList">
+                                <div class="signInListOne" v-for="(item,index) in 10" :key="index">
+                                    <p>
+                                        上午2号
+                                    </p>
+                                    <p>张三张</p>
+                                    <p>400001</p>
+                                    <p>07:00</p>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="signInMainRight">
+                            <div class="signInMainRightTitle"><span style="margin:0 auto;">张三</span></div>
+                            <div class="signInMainRightContent">
+                                <p style="margin: 0 auto;display:flex;align-items: center;"><span>排队号</span></p>
+                                <p style="margin: 0 auto;display:flex;align-items: center;">
+                                    <span>上午</span>
+                                    <span style="font-size:10vh">69号</span>
+                                </p>
+                            </div>
+                            <div class="signInMianRightBottom"><span style="margin:0 auto;">签到成功</span></div>
+                        </div>
+                    </div>
+                    <div class="signInTip">
+                        温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合
+                    </div>
+                </div>
+            </div> -->
+        
         </div>
         <div class="app-container">
             <div class="page_signIn">
@@ -90,7 +134,7 @@
                     <div>{{ newdate }}&nbsp;&nbsp;{{ time }}</div>
                 </div>
                 <div class="signInMain">
-                    <div style="display: flex;justify-content: space-between;padding:10px;">
+                    <div style="display: flex;justify-content: space-between;padding:10px;height:100%;">
                         <div :class="Object.keys(queueInfo).length>0 ? 'signInMainLeft' : 'signInMainLeft100'">
                             <div class="signInMainLeftTitle">
                                 <p>排队号</p>
@@ -120,7 +164,7 @@
                                     <span v-if="queueInfo.schedule_type == 1">上午</span>
                                     <span v-if="queueInfo.schedule_type == 2">下午</span>
                                     <span v-if="queueInfo.schedule_type == 3">晚上</span>
-                                    <span style="font-size:180px;">{{ queueInfo.queue_no }}号</span>
+                                    <span style="font-size:10vh;">{{ queueInfo.queue_no }}号</span>
                                 </p>
                             </div>
                             <div class="signInMianRightBottom"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>签到成功</span></div>
@@ -131,6 +175,49 @@
                     </div>
                 </div>
             </div>
+        
+            <!-- <div class="page_signIn">
+                <div class="signInTitle">
+                    <div>{{ this.$store.getters.xt_user.org.org_name }}</div>
+                    <div>{{ newdate }}&nbsp;&nbsp;{{ time }}</div>
+                </div>
+                <div class="signInMain">
+                    <div style="display: flex;justify-content: space-between;padding:10px;height:100%;">
+                        <div class="signInMainLeft">
+                            <div class="signInMainLeftTitle">
+                                <p>排队号</p>
+                                <p>姓名</p>
+                                <p>病历号</p>
+                                <p>签到时间</p>
+                            </div>
+                            <div class="signInList">
+                                <div class="signInListOne" v-for="(item,index) in 10" :key="index">
+                                    <p>
+                                        上午2号
+                                    </p>
+                                    <p>张三张</p>
+                                    <p>400001</p>
+                                    <p>07:00</p>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="signInMainRight">
+                            <div class="signInMainRightTitle"><span style="margin:0 auto;">张三张</span></div>
+                            <div class="signInMainRightContent">
+                                <p style="margin: 0 auto;display:flex;align-items: center;"><span>排队号</span></p>
+                                <p style="margin: 0 auto;display:flex;align-items: center;">
+                                    <span>上午</span>
+                                    <span style="font-size:10vh">69号</span>
+                                </p>
+                            </div>
+                            <div class="signInMianRightBottom"><span style="margin:0 auto;">签到成功</span></div>
+                        </div>
+                    </div>
+                    <div class="signInTip">
+                        温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合
+                    </div>
+                </div>
+            </div> -->
         </div>
     </div>
 </template>
@@ -341,42 +428,50 @@ export default {
 
 
 <style lang="scss" scoped>
+.main-contain{
+    height: 100%;
+}
 .page_signIn{
+    height: 98%;
     .signInTitle{
-        height: 50px;
+        height: 4vh;
         background: #1A82BF;
         display: flex;
         justify-content: space-between;
         align-items: center;
         padding: 0 20px;
         color:#fff;
-        font-size: 20px;
+        font-size: 2vh;
         font-weight: 600;
     }
     .signInMain{
         background: linear-gradient(0deg, #76ECEC, #479CD2);
-        height: 1040px;
+        height: 86%;
         
         
     }
     .signInMainLeft{
-        width:69%;
-        height: 980px;
+        width:70%;
+        // height: 100%;
         border-radius: 15px;
+        display: flex;
+        flex-direction: column;
     }
     .signInMainLeft100{
         width:100%;
-        height: 980px;
+        height: 100%;
         border-radius: 15px;
+        display: flex;
+        flex-direction: column;
     }
     .signInMainLeftTitle{
         display: flex;
         justify-content: space-between;
         align-items: center;
         color:#fff;
-        font-size: 38px;
+        font-size: 4vh;
         font-weight: 600;
-        height:80px;
+        height:7vh;
         background: #1A82BF;
         border-radius: 15px 15px 0 0;
         >p{
@@ -385,16 +480,17 @@ export default {
         }
     }
     .signInList{
-        font-size: 36px;
+        font-size: 3vh;
         font-weight: 600;
+        flex: 1;
         >div:nth-child(1){
-            font-size: 50px;
+            font-size: 4.5vh;
         }
         >div:nth-child(2){
-            font-size: 50px;
+            font-size: 4.5vh;
         }
         >div:nth-child(3){
-            font-size: 50px;
+            font-size: 4.5vh;
         }
         >div:nth-child(odd){
             background: #F9FDFF;
@@ -406,7 +502,7 @@ export default {
             border-radius: 0 0 15px 15px;
         }
         .signInListOne{
-            height:90px;
+            height:10%;
             display: flex;
             justify-content: space-between;
             align-items: center;
@@ -419,16 +515,17 @@ export default {
     }
     .signInMainRight{
         width: 30%;
-        height: 980px;
+        // height: 100%;
+        margin-left: 10px;
     }
     .noneSignInMainRight{
         display: none;
     }
     .signInMainRightTitle{
-        height: 260px;
+        height: 27.5%;
         border-radius: 15px 15px 0 0;
         background: #1A82BF;
-        font-size: 120px;
+        font-size: 10vh;
         font-weight: 600;
         color:#fff;
         display: flex;
@@ -437,22 +534,22 @@ export default {
     }
     .signInMainRightContent{
         background: #F9FDFF;
-        height: 450px;
+        height: 54.5%;
         text-align: center;
         font-weight: 600;
         color:#1C6895;
         box-sizing: border-box;
-        font-size:90px;
+        font-size:6vh;
         display:flex;
         align-items:center;
         flex-direction: column;
         justify-content: space-around;
     }
     .signInMianRightBottom{
-        height: 270px;
+        height: 18%;
         background: #1A82BF;
         border-radius: 0 0 15px 15px;
-        font-size: 90px;
+        font-size: 8vh;
         font-weight: 600;
         color:#fff;
         display: flex;
@@ -461,14 +558,13 @@ export default {
     }
     .signInTip{
         color:#fff;
-        font-size: 18px;
+        font-size: 1.5vw;
         font-weight: 600;
         display: flex;
         align-items: center;
-        height: 50px;
+        height: 3vw;
         background: linear-gradient(0deg, #42A9E7, #3686B9, #42A9E7);
-        margin-top: 1px;
-        padding-left:20px;
+        padding-left:2vw;
     }
 }
 #fullscreenbroad {
@@ -482,6 +578,7 @@ export default {
   background: #fff;
   padding: 20px;
   z-index:5000;
+  height: 100%;
 }
 #fullscreenbroad #fullscreenbroad-setting {
   float: right;