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

src/lang/zh.js

@@ -204,6 +204,7 @@ export default {
     scrm: 'SCRM',
     shop: '分销商城',
 
+    incomeStatistics:'收入统计',
     outpatientRegistration:'门诊挂号',
     outpatientRegistrationIndex:'门诊挂号',
     outpatientRegistrationRegistrationHistory:'挂号历史',

src/router/modules/outpatientCharges.js

@@ -42,6 +42,12 @@ export default {
         name: 'summary',
         meta: { title: 'summary', noCache: true }
     },
+    {
+        path: '/outpatientCharges/incomeStatistics',
+        component: () => import('@/xt_pages/outpatientCharges/incomeStatistics'),
+        name: 'incomeStatistics',
+        meta: { title: 'incomeStatistics', noCache: true }
+    },
     {
         path: '/outpatientCharges/summaryDetail',
         component: () => import('@/xt_pages/outpatientCharges/summaryDetail'),

src/xt_pages/dialysis/details/index.vue

@@ -758,13 +758,11 @@ export default {
       clearInterval(timer)
     })
 
-    this.timers = setInterval(() => {
-      let obj = {
-        cmd: "queue/join",
-        data: {type:3,page:0,size:0},
-      };
-      this.websocketSend(obj)
-    }, 1000*50);
+    let obj = {
+      cmd: "queue/join",
+      data: {type:3,page:0,size:0},
+    };
+    this.websocketSend(obj)
   },
   computed: {
     websocket() {
@@ -882,8 +880,6 @@ export default {
     }
   },
   beforeDestroy(){
-    clearInterval(this.timers);　　// 清除定时器
-    this.timers = null
 
     let unObj = {
       cmd: "queue/unjoin",

src/xt_pages/outpatientCharges/incomeStatistics.vue

@@ -0,0 +1,320 @@
+<template>
+  <div class="main-contain incomeStatistics">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+        <div>
+          <el-input size="small" style="width:150px;"  v-model="keywords"
+                    class="filter-item"/>
+          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @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 type"
+              :key="index"
+              :label="item.user_name"
+              :value="item.admin_user_id">
+            </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="选择开始日期"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          align="right"></el-date-picker>
+
+          <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date"
+                          @change="handleEndTimeChange" :editable="false" :clearable="false"
+                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择结束日期"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          align="right"></el-date-picker>
+          <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+          <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+        </div>
+        <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+      </div>
+      <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+        <el-table-column
+          prop="date"
+          label="序号"
+          width="60"
+          align="center"
+          type="index"
+        >
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="就诊号">
+          <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="患者名字">
+          <template slot-scope="scope">{{ scope.row.patient.name }}</template>
+        </el-table-column>
+        <!--<el-table-column align="center" prop="name" label="患者类型">-->
+          <!--<template slot-scope="scope"></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.reality_price}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="科室">
+          <template slot-scope="scope">{{scope.row.p_info.department.name}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="收费日期">
+          <template slot-scope="scope">  {{getTimes(scope.row.settle_accounts_date)}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="收费员">
+          <template slot-scope="scope">{{ scope.row.p_info.doctor }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="状态">
+          <template slot-scope="scope">
+            <div v-if="scope.row.order_status == 1">待结算</div>
+            <div v-if="scope.row.order_status == 2">已结算</div>
+            <div v-if="scope.row.order_status == 3">已退费</div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="操作">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+
+      >
+      </el-pagination>
+    </div>
+
+
+  </div>
+</template>
+
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getHisOrderList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+
+  export default {
+    components: {
+      BreadCrumb
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '门诊收费' },
+          { path: false, name: '项目消费明细汇总' }
+        ],
+        tableData: [],
+        limit:10,
+        page:1,
+        keywords:"",
+        start_time:"",
+        end_time:"",
+        total:"",
+        doctors:[],
+        admin_user_id:"",
+
+      }
+    },
+    methods: {
+      export_detail(){
+        let params= {
+          start_time:this.start_time,
+          end_time: this.end_time,
+        }
+        getExportConsumeDetailList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+
+            let list = []
+            for (let i =0; i < response.data.data.order.length; i++){
+            let order =   response.data.data.order[i]
+              let number = ""
+              let name = ""
+              let department = ""
+              let doctor_name = ""
+              let balance_accounts = ""
+
+              let order_status = ""
+
+
+
+              if(order.his_patient != null && order.his_patient.number.length > 0){
+                number = order.his_patient.number
+
+              }
+
+              if(order.his_patient != null ){
+                if(order.his_patient.balance_accounts_type == 1){
+                  balance_accounts = "自费"
+                }
+
+                if(order.his_patient.balance_accounts_type == 2){
+                  balance_accounts = "医保"
+                }
+              }
+
+              if(order.patient != null && order.patient.name.length > 0){
+                name = order.patient.name
+
+              }
+
+              if(order.p_info != null && order.p_info.department != null && order.p_info.department.name.length > 0){
+                department = order.p_info.department.name
+
+              }
+
+              if(order.p_info != null && order.p_info.doctor.length > 0){
+                doctor_name = order.p_info.doctor
+              }
+
+              if(order.order_status == 1){
+                order_status = "待结算"
+              }
+
+              if(order.order_status == 2){
+                order_status = "已结算"
+              }
+
+              if(order.order_status == 3){
+                order_status = "已退费"
+              }
+
+
+              let obj = {
+                "就诊号":number,
+                "患者姓名":name,
+                "应收金额":order.medfee_sumamt,
+                "实收金额":order.medfee_sumamt,
+                "科室":department,
+                "医生姓名":doctor_name,
+                "收费类别":balance_accounts,
+                "收费者姓名":doctor_name,
+                "总金额":order.medfee_sumamt,
+                "现金支付":"",
+                "账户支付":"",
+                "支付宝支付":"",
+                "微信支付":"",
+                "其他支付":"",
+                "收费日期":"",
+                "收费状态":order_status,
+                "退费日期":"",
+              }
+              list.push(obj)
+            }
+            import('@/vendor/Export2Excel').then(excel => {
+              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室',"医生姓名","收费类别","收费者姓名","总金额","现金支付","账户支付","支付宝支付","微信支付","其他支付","收费日期","收费状态","退费日期"]
+              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室',"医生姓名","收费类别","收费者姓名","总金额","现金支付","账户支付","支付宝支付","微信支付","其他支付","收费日期","收费状态","退费日期"]
+              const data = this.formatJson(filterVal, list)
+              excel.export_json_to_excel({
+                header: tHeader,
+                data,
+                filename: "消费明细"
+              })
+            })
+
+          }
+        })
+
+      },  formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+      },
+      changeDoctor(){
+        this.page = 1
+        this.keywords=""
+        this.getHisOrderList()
+      },
+      handleSizeChange(limit){
+        this.limit = limit;
+        this.getHisOrderList()
+
+      },handleCurrentChange(page){
+        this.page = page;
+        this.getHisOrderList()
+
+
+      },
+      handleStartTimeChange(){
+        this.page = 1
+        this.keywords=""
+        this.getHisOrderList()
+      },handleEndTimeChange(){
+        this.page = 1
+        this.keywords=""
+        this.getHisOrderList()
+      },
+      searchAction(){
+        this.page = 1
+        this.getHisOrderList()
+
+
+      },
+      getTimes(time) {
+        return uParseTime(time, "{y}-{m}-{d}");
+      },
+      toDetail(row) {
+        this.$router.push('/outpatientCharges/summaryDetail?patient_id='+row.patient.id+"&number="+row.number)
+      }, getTime(value, temp) {
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },getHisOrderList(){
+        let params= {
+          page : this.page,
+          limit: this.limit,
+          keywords:this.keywords,
+          start_time:this.start_time,
+          end_time: this.end_time,
+          type: this.admin_user_id
+        }
+        getHisOrderList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.order
+            this.total = response.data.data.total
+          }
+        })
+
+      },getDoctorList(){
+        getDoctorList().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.doctors = response.data.data.doctors
+          }
+        })
+
+
+      }
+    }, created() {
+     this.getDoctorList()
+     this.getHisOrderList()
+
+
+    }
+  }
+</script>

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -4,6 +4,7 @@
     :visible.sync="isLastOrNextVisible"
     @close="hide"
     width="1010px"
+    class="callPrescription"
     :modal-append-to-body="false"
   >
     <el-date-picker
@@ -36,15 +37,15 @@
 
 
     <div v-for="(item,index) in allPrescription" :key="index">
-      <div>引用 {{getTime(item.record_date, '{y}年{m}月{d}日')}} 的处方</div>
+      <div class="quote" v-if="item.prescriptions.length > 0">引用 {{getTime(item.record_date, '{y}年{m}月{d}日')}} 的处方</div>
       <el-checkbox-group v-model="item.check_group">
         <div v-for="(subItem,index2) in item.prescriptions" :key="index2">
-          <el-checkbox :label="subItem.id">{{'处方' + (index2+ 1)}}</el-checkbox>
+          <el-checkbox style="margin:10px 0;" :label="subItem.id">{{'处方' + (index2+ 1)}}</el-checkbox>
           <el-table v-if="subItem.type  == 1" :data="subItem.doctor_advice" border style="width: 99%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
-            <el-table-column align="center" prop="drug_name"  width="100" label="名称">
+            <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
+            <el-table-column align="center" prop="drug_name"  width="160" label="名称">
               <template slot-scope="scope">
                 <span>{{ scope.row.advice_name }}</span>
               </template>
@@ -52,9 +53,7 @@
 
             <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
-                <div style="display:flex;align-items:center;">
-                  <div>{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</div>
-                </div>
+                <div>{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="delivery_way" width="100" label="用法">
@@ -68,7 +67,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column align="center" prop="day" width="50" label="天数">
+            <el-table-column align="center" prop="day" width="60" label="天数">
               <template slot-scope="scope">
                 {{scope.row.day}}
               </template>
@@ -76,9 +75,7 @@
 
             <el-table-column align="center" prop="prescribing_number" width="100" label="总量">
               <template slot-scope="scope">
-                <div style="display:flex;align-items:center;">
-                  <div>{{scope.row.prescribing_number}} {{scope.row.prescribing_number_unit}}</div>
-                </div>
+                <div>{{scope.row.prescribing_number}} {{scope.row.prescribing_number_unit}}</div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="retail_price" width="80" label="单价">
@@ -86,7 +83,7 @@
                 <div>{{scope.row.retail_price}}</div>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="remark" width="200" label="备注">
+            <el-table-column align="center" prop="remark" label="备注">
               <template slot-scope="scope">
                 <div>{{scope.row.remark}}</div>
               </template>
@@ -95,8 +92,8 @@
           <el-table v-if="subItem.type == 2" :data="subItem.project" border style="width: 99%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
-            <el-table-column align="center" prop="project_name" width="100" label="名称">
+            <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
+            <el-table-column align="center" prop="project_name" width="160" label="名称">
               <template slot-scope="scope">
                 <span>{{ scope.row.project.project_name }}</span>
               </template>
@@ -104,7 +101,7 @@
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
               <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
             </el-table-column>
-            <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+            <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
                 <!--<el-input v-model="scope.row.single_dose" placeholder=""></el-input>-->
                 <span>{{ scope.row.single_dose }}</span>
@@ -134,20 +131,17 @@
             </el-table-column>
             <el-table-column align="center" prop="total" width="70" label="总量">
               <template slot-scope="scope">
-                <div style="display:flex;align-items:center;">
-                  <!--<el-input v-model="scope.row.total" style="width:60%" placeholder=""></el-input>-->
-                  <div>{{ scope.row.total }}{{scope.row.unit}}</div>
-                </div>
+                <div>{{ scope.row.total }}{{scope.row.unit}}</div>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="name" width="50" label="单价">
+            <el-table-column align="center" prop="name" width="60" label="单价">
               <template slot-scope="scope">
                 <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
                 <span>{{ scope.row.price }}</span>
 
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="name" width="100" label="备注">
+            <el-table-column align="center" prop="name" label="备注">
               <template slot-scope="scope">
                 <!--<el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>-->
                 <span>{{ scope.row.remark }}</span>
@@ -349,6 +343,14 @@
   }
 </script>
 
-<style scoped>
-
+<style lang="scss">
+.callPrescription{
+  .el-dialog__body{
+    padding:0px 20px 30px;
+  }
+  .quote{
+    margin-top: 10px;
+    font-size: 14px;
+  }
+}
 </style>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -84,22 +84,26 @@
             </el-tab-pane>
             <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span>
             </el-tab-pane>
-            <div class="RP">Rp</div>
-
-            <div style="float: right">
-              <el-button
-                round
-                @click="openLast(3)"
-              >上一方
-              </el-button>
-
-              <el-button
-                round
-                @click="openNext(4)"
-              >下一方
-              </el-button>
+            <div class="RP">Rp
+              <div style="float: right;margin-bottom:5px;margin-right:1%;">
+                <el-button
+                  round
+                  size="small"
+                  @click="openLast(3)"
+                >上一方
+                </el-button>
+
+                <el-button
+                  round
+                  size="small"
+                  @click="openNext(4)"
+                >下一方
+                </el-button>
+              </div>
             </div>
 
+            
+
             <prescription-table ref="prescription_tables" :prescription="curPrescriptions" :preDrugs="preDrugs"
                                 :activeType="customTabIndex"></prescription-table>
           </el-tabs>

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -5,8 +5,9 @@
     @close="hide"
     width="1010px"
     :modal-append-to-body="false"
+    class="isLastOrNext"
   >
-    <div class="txsj">
+    <div class="txsj" style="text-align:center;">
       <el-button
         round
 
@@ -22,15 +23,15 @@
     </div>
 
     <div v-for="(item,index) in allPrescription" :key="index">
-      <div>引用 {{getTime(item.record_date, '{y}年{m}月{d}日')}} 的处方</div>
+      <div class="quote">引用 {{getTime(item.record_date, '{y}年{m}月{d}日')}} 的处方</div>
       <el-checkbox-group v-model="item.check_group">
         <div v-for="(subItem,index2) in item.prescriptions" :key="index2">
-          <el-checkbox :label="subItem.id">{{'处方' + (index2+ 1)}}</el-checkbox>
+          <el-checkbox style="margin:10px 0;" :label="subItem.id">{{'处方' + (index2+ 1)}}</el-checkbox>
           <el-table v-if="subItem.type  == 1" :data="subItem.doctor_advice" border style="width: 99%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
-            <el-table-column align="center" prop="drug_name"  width="100" label="名称">
+            <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
+            <el-table-column align="center" prop="drug_name"  width="160" label="名称">
               <template slot-scope="scope">
                 <span>{{ scope.row.advice_name }}</span>
               </template>
@@ -38,9 +39,7 @@
 
             <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
-                <div style="display:flex;align-items:center;">
                   <div>{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</div>
-                </div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="delivery_way" width="100" label="用法">
@@ -54,7 +53,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column align="center" prop="day" width="50" label="天数">
+            <el-table-column align="center" prop="day" width="60" label="天数">
               <template slot-scope="scope">
                 {{scope.row.day}}
               </template>
@@ -62,9 +61,7 @@
 
             <el-table-column align="center" prop="prescribing_number" width="100" label="总量">
               <template slot-scope="scope">
-                <div style="display:flex;align-items:center;">
-                  <div>{{scope.row.prescribing_number}} {{scope.row.prescribing_number_unit}}</div>
-                </div>
+                <div>{{scope.row.prescribing_number}} {{scope.row.prescribing_number_unit}}</div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="retail_price" width="80" label="单价">
@@ -72,7 +69,7 @@
                 <div>{{scope.row.retail_price}}</div>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="remark" width="200" label="备注">
+            <el-table-column align="center" prop="remark" label="备注">
               <template slot-scope="scope">
                 <div>{{scope.row.remark}}</div>
               </template>
@@ -81,8 +78,8 @@
           <el-table v-if="subItem.type == 2" :data="subItem.project" border style="width: 99%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
-            <el-table-column align="center" prop="project_name" width="100" label="名称">
+            <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
+            <el-table-column align="center" prop="project_name" width="160" label="名称">
               <template slot-scope="scope">
                 <span>{{ scope.row.project.project_name }}</span>
               </template>
@@ -90,7 +87,7 @@
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
               <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
             </el-table-column>
-            <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+            <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
                 <!--<el-input v-model="scope.row.single_dose" placeholder=""></el-input>-->
                 <span>{{ scope.row.single_dose }}</span>
@@ -120,20 +117,17 @@
             </el-table-column>
             <el-table-column align="center" prop="total" width="70" label="总量">
               <template slot-scope="scope">
-                <div style="display:flex;align-items:center;">
-                  <!--<el-input v-model="scope.row.total" style="width:60%" placeholder=""></el-input>-->
                   <div>{{ scope.row.total }}{{scope.row.unit}}</div>
-                </div>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="name" width="50" label="单价">
+            <el-table-column align="center" prop="name" width="60" label="单价">
               <template slot-scope="scope">
                 <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
                 <span>{{ scope.row.price }}</span>
 
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="name" width="100" label="备注">
+            <el-table-column align="center" prop="name" label="备注">
               <template slot-scope="scope">
                 <!--<el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>-->
                 <span>{{ scope.row.remark }}</span>
@@ -410,6 +404,14 @@
   }
 </script>
 
-<style scoped>
-
+<style lang="scss">
+.isLastOrNext{
+  .el-dialog__body{
+    padding:0px 20px 30px;
+  }
+  .quote{
+    margin-top: 10px;
+    font-size: 14px;
+  }
+}
 </style>

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -85,17 +85,13 @@ export default {
         }
     },
     mounted(){
-        this.timer = setInterval(() => {
-            let obj = {
-                cmd: "queue/join",
-                data: {type:3,page:0,size:0},
-            };
-            this.websocketSend(obj)
-        }, 1000*50);
+        let obj = {
+            cmd: "queue/join",
+            data: {type:3,page:0,size:0},
+        };
+        this.websocketSend(obj)
     },
     beforeDestroy(){
-        clearInterval(this.timer);　　// 清除定时器
-        this.timer = null
 
         let unObj = {
             cmd: "queue/unjoin",

src/xt_pages/sign/components/computerCalling.vue

@@ -63,17 +63,13 @@ export default {
         this.websocketMess();
     },
     mounted(){
-        this.timer = setInterval(() => {
-            let obj = {
-                cmd: "queue/join",
-                data: {type:4,page:0,size:0},
-            };
-            this.websocketSend(obj)
-        }, 1000*50);
+        let obj = {
+            cmd: "queue/join",
+            data: {type:4,page:0,size:0},
+        };
+        this.websocketSend(obj)
     },
     beforeDestroy(){
-        clearInterval(this.timer);　　// 清除定时器
-        this.timer = null
         let unObj = {
             cmd: "queue/unjoin",
             data: {type:4},

src/xt_pages/sign/signIn.vue

@@ -155,25 +155,23 @@ export default {
         this.websocketMess();
     },
     mounted(){
-        this.timer = setInterval(() => {
-            if(this.page < Math.ceil(this.count / 10)){
-                console.log('执行')
-                this.page++
-                let obj = {
-                    cmd: "queue/queuelist",
-                    data: {page:this.page,size:10}
-                };
-                this.websocketSend(obj)
-            }else{
-                console.log('执行2222')
-                this.page = 1
-                let newobj = {
-                    cmd: "queue/queuelist",
-                    data: {page:this.page,size:10}
-                };
-                this.websocketSend(newobj)
-            }
-        }, 5000);
+        if(this.page < Math.ceil(this.count / 10)){
+            console.log('执行')
+            this.page++
+            let obj = {
+                cmd: "queue/queuelist",
+                data: {page:this.page,size:10}
+            };
+            this.websocketSend(obj)
+        }else{
+            console.log('执行2222')
+            this.page = 1
+            let newobj = {
+                cmd: "queue/queuelist",
+                data: {page:this.page,size:10}
+            };
+            this.websocketSend(newobj)
+        }
         
         this.timerID = setInterval(() => {
             this.updateTime()
@@ -181,9 +179,7 @@ export default {
         // this.updateTime();
     },
     beforeDestroy(){
-        clearInterval(this.timer);　　// 清除定时器
         clearInterval(this.timerID);　　// 清除定时器
-        this.timer = null;
         let obj = {
             cmd: "queue/unjoin",
             data: {type:1},