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

package-lock.json

@@ -3515,9 +3515,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.13.2",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.2.tgz",
-      "integrity": "sha512-r761DRPssMPKDiJZWFlG+4e4vr0cRG/atKr3Eqr8Xi0tQMNbtmYU1QXvFnKiFPFFGkgJ6zS6ASkG+sellcoHlQ==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.0.tgz",
+      "integrity": "sha512-KYsHWsBXYbLELS8cdfvgJTOMSUby3UEjvsPV1V1VmgJ/DdkOAS4z3MiOrPxrT9w2Cc5lZ4eVSQiGhYFR5NVChw==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",

package.json

@@ -46,7 +46,7 @@
     "driver.js": "0.5.2",
     "dropzone": "5.2.0",
     "echarts": "3.8.5",
-    "element-ui": "^2.13.2",
+    "element-ui": "^2.13.0",
     "file-saver": "^1.3.3",
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",

src/router/modules/dialysis.js

@@ -38,6 +38,16 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/calling',
+      component: () => import('@/xt_pages/dialysis/calling'),
+      name: '透析叫号',
+      meta: {
+        title: '透析叫号',
+        noCache: true
+      }
+    },
+
     {
       path: '/dialysis/consumableDrugs',
       component: () => import('@/xt_pages/dialysis/consumableDrugs'),

src/xt_pages/dialysis/bulletinBoard.vue

@@ -10,7 +10,44 @@
         >全屏投影</el-button
       >
     </div>
-    <div
+    <div class="app-container">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="签到窗口" name="first">
+          <sign-in></sign-in>
+        </el-tab-pane>
+        <el-tab-pane label="排队窗口" name="second">
+          <line-up></line-up>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <!-- <div
       class="app-container"
       id="dialysis-board-box"
       v-loading="loading"
@@ -64,9 +101,9 @@
           }}</template>
         </el-table-column>
       </el-table>
-    </div>
+    </div> -->
 
-    <div id="fullscreenbroad" v-show="dialogTableVisible">
+    <!-- <div id="fullscreenbroad" v-show="dialogTableVisible">
       <el-row>
         <el-button
           @click="openSetting"
@@ -138,7 +175,7 @@
           }}</template>
         </el-table-column>
       </el-table>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -148,8 +185,10 @@ import bulletinboard from "./components/bulletinboard";
 import { parseTime } from "@/utils";
 import BreadCrumb from "../components/bread-crumb";
 import screenfull from "screenfull";
+import signIn from './components/signIn'
+import lineUp from './components/lineUp'
 export default {
-  components: { BreadCrumb, bulletinboard },
+  components: { BreadCrumb, bulletinboard, signIn, lineUp },
   name: "bulletinBoard",
   data() {
     return {
@@ -170,7 +209,12 @@ export default {
       loading: true,
       weekDay: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
       roonOptions: { 1: "上午", 2: "下午", 3: "晚上" },
-      modeOptions: {}
+      modeOptions: {},
+
+
+
+      //
+      activeName:"first"
     };
   },
   created() {

src/xt_pages/dialysis/calling.vue

@@ -0,0 +1,53 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+            <bread-crumb :crumbs="crumbs"></bread-crumb>
+        </div>
+        <div class="app-container">
+            <el-tabs v-model="activeName">
+                <el-tab-pane label="透前叫号" name="first">
+                    <before-dialysis-calling></before-dialysis-calling>
+                </el-tab-pane>
+                <el-tab-pane label="上机叫号" name="second">
+                    <computer-calling></computer-calling>
+                </el-tab-pane>
+                <el-tab-pane label="诊台配置" name="third">
+                    <treatment-configure></treatment-configure>
+                </el-tab-pane>
+                <el-tab-pane label="叫号配置" name="fourth">
+                    <calling-configure></calling-configure>
+                </el-tab-pane>
+            </el-tabs>
+        </div>
+    </div>
+</template>
+
+
+<script>
+import BreadCrumb from "../components/bread-crumb";
+import beforeDialysisCalling from './components/beforeDialysisCalling'
+import computerCalling from './components/computerCalling'
+import treatmentConfigure from "./components/treatmentConfigure"
+import callingConfigure from './components/callingConfigure'
+export default {
+    components:{
+       BreadCrumb,
+       beforeDialysisCalling,
+       computerCalling,
+       treatmentConfigure,
+       callingConfigure 
+    },
+    data(){
+        return{
+            crumbs: [
+                { path: false, name: "透析管理" },
+                { path: "dialysis/board", name: "透析叫号" }
+            ],
+            activeName:'first'
+        }
+    },
+    methods:{
+    }
+}
+</script>
+      

src/xt_pages/dialysis/components/allSummary.vue

@@ -43,31 +43,31 @@
       </div>
       <div>
           <el-table
-            :data="list"
-            height="500px"
+            :data="tableData"
             border
             style="width: 100%"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
             @selection-change="handleSelectionChange">
             >
             <el-table-column  align="center" type="selection" width="55">
             </el-table-column>
             <el-table-column align="center" prop="name" label="姓名" width="180">
                <template slot-scope="scope">
-                   <!-- {{scope.row.patient.name}} -->
-                   {{scope.row.patient_name}}
+                   {{scope.row.patient.name}}
                </template>
             </el-table-column>
             <el-table-column align="center" prop="address" label="透析模式">
               <template slot-scope="scope">
-                 <!-- {{scope.row.treatment_mode.name}} -->
-
-                 {{scope.row.mode_id}}
+                 {{scope.row.treatment_mode.name}}
               </template>
             </el-table-column>
             <el-table-column align="center" prop="address" :label="item.type_name" v-for="(item,index) in tableName" :key="index">
                <template slot-scope="scope"> 
-                   <!-- {{getCount(scope.row.patient.id,item.id)?getCount(scope.row.patient.id,item.id):""}} -->
-                   {{scope.row.good_type[index].name}}
+                   {{getCount(scope.row.patient.id,item.good_id)?getCount(scope.row.patient.id,item.good_id):""}}
                </template>
             </el-table-column>
             <el-table-column align="center" prop="address" label="抗凝剂(首剂)(维持)(总量)">
@@ -175,12 +175,7 @@ export default {
             total:0,
             selecting_schs: [],
             prescriptionList:[],
-            reduceList:[],
-            dialysis_gooods:[],
-            allGoodInfo:[],
-            list:[],
-            new_list:[],
-            good_types: [],
+            reduceList:[]
         }
     },
     created(){
@@ -247,64 +242,6 @@ export default {
                this.prescriptionList = prescription
                var reducelist =  response.data.data.reducelist
                this.reduceList = reducelist
-                 var good_type = response.data.data.good_type
-               console.log("godd_type",good_type)
-              this.tableName = good_type
-              this.allGoodInfo = response.data.data.dialysis_goods
-              console.log("1111111",response.data.data.dialysis_goods)
-              this.list = []
-              this.good_types = []
-              this.allGoodInfo = []
-              this.good_types.push("姓名")
-           
-             for (let a = 0; a <  response.data.data.good_type.length; a++){
-                this.good_types.push(response.data.data.good_type[a].type_name)
-              }
-             for(let i = 0; i < response.data.data.dialysis_goods.length; i++){
-              let arr =[]
-              // let obj = {
-              //   id:0,
-              //   name:  response.data.data.dialysis_goods[i].patient.name,
-
-              // }
-              // arr.push(obj)
-              // console.log("arr=========",arr)
-              for (let a = 0; a <  response.data.data.good_type.length; a++){
-                let obj = {
-                  id:response.data.data.good_type[a].id,
-                  name:""
-
-                }
-                arr.push(obj)
-              }
-
-
-             console.log("2222222",arr)
-            
-
-              let newObj = {
-                "patient_id":response.data.data.dialysis_goods[i].patient_id,
-                "patient_name":response.data.data.dialysis_goods[i].patient.name,
-                "mode_id":response.data.data.dialysis_goods[i].mode_id,
-                "good_type":arr,
-                "good_user":response.data.data.dialysis_goods[i].good_user,
-                "last_good_user":response.data.data.dialysis_goods[i].last_good_user,
-                "good_user_detail":response.data.data.dialysis_goods[i].good_user_detail,
-                "last_good_user_detail":response.data.data.dialysis_goods[i].last_good_user_detail,
-              }
-             
-              this.list.push(newObj)
-              }
-              
-            for (let a = 0; a <  this.list.length; a++){
-              for (let b = 0; b <  this.list[a].good_type.length; b++){
-                if(this.list[a].good_type[b].id > 0){
-                  this.list[a].good_type[b].name = this.getGoodUserInfo(this.list[a].good_type[b].id,this.list[a].good_user,this.list[a].last_good_user)
-                }
-
-              }
-              }
-              console.log("list22222",this.list)
              }
           })
         },
@@ -322,7 +259,7 @@ export default {
              if(response.data.state == 1){
                var material =  response.data.data.material
                console.log("material",material)
-              //  this.tableName = material
+               this.tableName = material
              }
           })
         },
@@ -349,7 +286,6 @@ export default {
               page:this.page, 
               keyword:this.search_input,
             }
-          console.log("params====",params)
           getCollectList(params).then(response=>{
              if(response.data.state == 1){
                var schedule = response.data.data.schedule      
@@ -362,75 +298,16 @@ export default {
                this.prescriptionList = prescription
                var reducelist =  response.data.data.reducelist          
                this.reduceList = reducelist
-               console.log("reducelist",reducelist)
-               var good_type = response.data.data.good_type
-               console.log("godd_type",good_type)
-              this.tableName = good_type
-              this.allGoodInfo = response.data.data.dialysis_goods
-              console.log("1111111",response.data.data.dialysis_goods)
-              this.list = []
-              this.good_types = []
-              this.allGoodInfo = []
-              this.good_types.push("姓名")
-           
-             for (let a = 0; a <  response.data.data.good_type.length; a++){
-                this.good_types.push(response.data.data.good_type[a].type_name)
-              }
-             for(let i = 0; i < response.data.data.dialysis_goods.length; i++){
-              let arr =[]
-              // let obj = {
-              //   id:0,
-              //   name:  response.data.data.dialysis_goods[i].patient.name,
-
-              // }
-              // arr.push(obj)
-              // console.log("arr=========",arr)
-              for (let a = 0; a <  response.data.data.good_type.length; a++){
-                let obj = {
-                  id:response.data.data.good_type[a].id,
-                  name:""
-
-                }
-                arr.push(obj)
-              }
-
-
-             console.log("2222222",arr)
-            
-
-              let newObj = {
-                "patient_id":response.data.data.dialysis_goods[i].patient_id,
-                "patient_name":response.data.data.dialysis_goods[i].patient.name,
-                "mode_id":response.data.data.dialysis_goods[i].mode_id,
-                "good_type":arr,
-                "good_user":response.data.data.dialysis_goods[i].good_user,
-                "last_good_user":response.data.data.dialysis_goods[i].last_good_user,
-                "good_user_detail":response.data.data.dialysis_goods[i].good_user_detail,
-                "last_good_user_detail":response.data.data.dialysis_goods[i].last_good_user_detail,
-              }
-             
-              this.list.push(newObj)
-              }
-              
-            for (let a = 0; a <  this.list.length; a++){
-              for (let b = 0; b <  this.list[a].good_type.length; b++){
-                if(this.list[a].good_type[b].id > 0){
-                  this.list[a].good_type[b].name = this.getGoodUserInfo(this.list[a].good_type[b].id,this.list[a].good_user,this.list[a].last_good_user)
-                }
-
-              }
-              }
-              console.log("list22222",this.list)
              }
           })
         },
         getCount(patientid,goodid){
           var count = 0
-          //  for(let i=0;i<this.reduceList.length;i++){
-          //     if(patientid == this.reduceList[i].patient_id && goodid == this.reduceList[i].good_id){
-          //        count = this.reduceList[i].count
-          //     }
-          //  }
+           for(let i=0;i<this.reduceList.length;i++){
+              if(patientid == this.reduceList[i].patient_id && goodid == this.reduceList[i].good_id){
+                 count = this.reduceList[i].count
+              }
+           }
            return count
         },
         handleSelectionChange(val){
@@ -483,32 +360,7 @@ export default {
           }
         } 
        return zongliang
-     },
-     getGoodUserInfo(good_type_id,good_user,last_good_user) {
-        if (good_user != null && good_user.length > 0) {
-          let desc = ""
-          for (let b = 0; b < good_user.length; b++){
-            if(good_type_id == good_user[b].good_type_id)
-              desc = desc + "\n" + good_user[b].info.specification_name +"*" +good_user[b].count
-          }
-         
-
-          return desc
-        } else if (good_user != null && good_user.length <= 0) {
-          if (last_good_user != null && last_good_user.length > 0) {
-            let desc = ""
-            for (let b = 0; b < last_good_user.length; b++){
-              if(good_type_id == last_good_user[b].good_type_id)
-                desc = desc+ "\n" + last_good_user[b].info.specification_name +"*" +last_good_user[b].count
-            }
-          
-
-            return desc
-
-          }
-          return ""
-        }
-      },
+     }
     }
 }
 </script>

src/xt_pages/dialysis/components/beforeDialysisCalling.vue

@@ -0,0 +1,90 @@
+<template>
+    <div class="page_beforeDialysisCalling">
+        <div class="cell clearfix">
+            <label class="title"><span class="name">叫号状态</span> : </label>
+            <div class="time ">
+                <ul class="">
+                    <li v-for="option in patient_state" :key="option.value" @click="handleStateChange(option.value)" :class="patientStateVal == option.value ? 'active' : ''" >{{option.label}}
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div class="callingArea">
+                <waiting-called v-if="patientStateVal == 0"></waiting-called>
+                <called v-if="patientStateVal == 1"></called>
+            </div>
+            <div class="nowCalling" v-if="patientStateVal == 0">
+                <p class="nowCallingTitle">当前叫号</p>
+                <p class="nowCallingName">李小明</p>
+                <p class="nowCallingTime">签到时间：07:20</p>
+                <p class="nowCallingTime">下一位：张三</p>
+                <el-button style="margin: 30px 0 20px 0;">重新叫号</el-button>
+                <el-button type="primary" style="margin-left:0;">&ensp;&ensp;叫号&ensp;&ensp;</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+
+<script>
+import waitingCalled from './waitingCalled'
+import called from './called'
+export default {
+    components:{
+        waitingCalled,
+        called
+    },
+    data(){
+        return{
+            patient_state:[
+                {value: 0,label: '待叫号'},
+                {value: 1,label: '已叫号'},
+            ],
+            patientStateVal: 0,
+        }
+    },
+    methods:{
+        handleStateChange: function(index) {
+            this.patientStateVal = index
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.callingArea{
+    display: flex;
+    flex-wrap: wrap;
+    width: 88%;
+    // @media only screen and (max-width: 1340px) {
+    //     width:750px;
+    // }
+
+    // @media only screen and (min-width: 415px) and (max-width: 767px) {
+    // }
+}
+.nowCalling{
+    height: 313px;
+    border: 1px solid #e5e5ee;
+    // flex: 1;
+    width: 12%;
+    text-align: center;
+    .nowCallingTitle{
+        font-size: 20px;
+        font-weight: 600;
+        margin-top: 20px;
+        text-align: center;
+    }
+    .nowCallingName{
+        color: #338AFB;
+        font-size: 18px;
+        margin-top: 10px;
+        font-weight: 600;
+    }
+    .nowCallingTime{
+        font-size: 16px;
+        margin-top: 30px;
+    }
+}
+</style>

src/xt_pages/dialysis/components/called.vue

@@ -0,0 +1,93 @@
+<template>
+    <div class="page_called">
+        <div class="calledOne" v-for="item in 12" :key="item">
+            <div class="calledOneLeft">
+                <img src="https://images.shengws.com/201809182128111.png?imageView2/2/w/500/h/500/q/90" alt="">
+                <div class="name">
+                    <p>吴保龄</p>
+                    <p>
+                        <span class="nameTips">签到时间：07:00:00</span>
+                        <span class="nameTips" v-if="index == 1">床位号：A区5号床</span>
+                        <span class="nameTips" v-else>叫号时间：07:30:00</span>
+                    </p>
+                    <p>
+                        <span class="nameTips">透前体重：59kg</span>
+                        <span class="nameTips lastNameTips">透前血压：120/110mmHg</span>
+                    </p>
+                </div>
+            </div>
+            <div class="calledOneRight" v-if="index == 1">
+                <img src="../../../assets/img/volume.png" alt="">
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    props:{
+        index:Number
+    },
+    data(){
+        return{
+
+        }
+    },
+}
+</script>
+
+
+<style lang="scss" scoped>
+.page_called{
+    .calledOne{
+        border: 1px #e5e5ee solid;
+        padding: 9px 0;
+        margin: 0 15px 15px 0;
+        float: left;
+        width: 360px;
+        cursor: pointer;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 10px;
+        .calledOneLeft{
+            display: flex;
+            img{
+                width: 45px;
+                height: 45px;
+                border-radius: 50%;
+                margin-right: 15px;
+            }
+            .name{
+                >p:first-child{
+                    font-size: 16px;
+                    font-weight: bold;
+                    color:#000;
+                }
+                >p:nth-of-type(2){
+                    font-size: 12px;
+                    color:#999999;
+                    margin-top: 6px;
+                }
+                >p:nth-of-type(3){
+                    font-size: 12px;
+                    color:#999999;
+                    margin-top: 3px;
+                }
+                .nameTips{
+                    margin-right:10px;
+                    display: inline-block;
+                }
+                
+            }
+            
+        }
+        .calledOneRight{
+            img{
+                width: 30px;
+                margin-top: 8px;
+            }
+        }
+    }
+}
+</style>

src/xt_pages/dialysis/components/callingConfigure.vue

@@ -0,0 +1,160 @@
+<template>
+    <div class="page_callingConfigure">
+        <div class="cell clearfix">
+            就诊状态显示屏幕切换屏幕时长配置(秒) : 
+            <div class="time ">
+                <el-input-number v-model="num" @change="handleChange" :min="1"></el-input-number>
+            </div>
+        </div>
+        <div style="display:flex;">
+            <div class="configureBox">
+                <div class="configureBoxTitle">接诊叫号</div>
+                <div class="configureBoxMain">
+                    <div style="margin-bottom:10px;">单次叫号语音播报次数：<el-input-number v-model="num" @change="handleChange" :min="1"></el-input-number></div>
+                    <div style="margin-bottom:10px;">叫号语音内容设置：</div>
+                    <div style="margin-bottom:10px;">
+                        <p style="width:50px;display: inline-block;">请</p>
+                        <el-select style="width:140px;" v-model="type" placeholder="请选择">
+                            <el-option
+                            v-for="item in typeOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div style="margin-bottom:10px;">
+                        <p style="width:50px;display: inline-block;">到</p>
+                        <el-select style="width:140px;" v-model="state" placeholder="请选择">
+                            <el-option
+                            v-for="item in stateOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div style="margin-bottom:10px;" v-if="state == 2">
+                        <p style="width:50px;display: inline-block;"></p>
+                        <el-input style="width:200px;" v-model="input" placeholder="请输入内容"></el-input>
+                    </div>
+                    <div>就诊</div>
+                </div>
+                
+            </div>
+            <div class="configureBox" style="border-left:none;">
+                <div class="configureBoxTitle">上机叫号</div>
+                <div class="configureBoxMain">
+                    <div style="margin-bottom:10px;">单次叫号语音播报次数：<el-input-number v-model="num" @change="handleChange" :min="1"></el-input-number></div>
+                    <div style="margin-bottom:10px;">叫号语音内容设置：</div>
+                    <div style="margin-bottom:10px;">
+                        <p style="width:50px;display: inline-block;">请</p>
+                        <el-select style="width:140px;" v-model="type" placeholder="请选择">
+                            <el-option
+                            v-for="item in typeOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div style="margin-bottom:10px;">
+                        <p style="width:50px;display: inline-block;">到</p>
+                        <el-select style="width:140px;" v-model="state" placeholder="请选择">
+                            <el-option
+                            v-for="item in stateOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div style="margin-bottom:10px;" v-if="state == 2">
+                        <p style="width:50px;display: inline-block;"></p>
+                        <el-input style="width:200px;" v-model="input" placeholder="请输入内容"></el-input>
+                    </div>
+                    <div>上机</div>
+                </div>
+                
+            </div>
+        </div>
+        <div style="display:flex;margin-top:10px;">
+            <div style="width:480px;">
+                语音播报声音：
+                <el-radio-group v-model="radio">
+                    <el-radio :label="1">男生</el-radio>
+                    <el-radio :label="2">女生</el-radio>
+                </el-radio-group>
+            </div>
+            <div style="width:480px;">
+                隐藏接诊叫号区域：
+                <el-radio-group v-model="radio">
+                    <el-radio :label="1">是</el-radio>
+                    <el-radio :label="2">否</el-radio>
+                </el-radio-group>
+            </div>
+        </div>
+        <div style="display:flex;margin-top:10px;">
+            <div style="width:480px;">
+                隐藏上机叫号区域：
+                <el-radio-group v-model="radio">
+                    <el-radio :label="1">是</el-radio>
+                    <el-radio :label="2">否</el-radio>
+                </el-radio-group>
+            </div>
+            <div style="width:480px;">
+                是否在透析管理页面显示排队叫号：
+                <el-radio-group v-model="radio">
+                    <el-radio :label="1">显示</el-radio>
+                    <el-radio :label="2">不显示</el-radio>
+                </el-radio-group>
+            </div>
+        </div>
+        <div style="display:flex;margin-top:10px;">
+            <div style="width:480px;">
+                是否在透析记录详情页面显示排队叫号：
+                <el-radio-group v-model="radio">
+                    <el-radio :label="1">显示</el-radio>
+                    <el-radio :label="2">不显示</el-radio>
+                </el-radio-group>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    data(){
+        return{
+            num:3,
+            typeOptions:[{ value: 1, label: '姓名'},{ value: 2, label: '透析号'}],
+            type: 1,
+            stateOptions:[{ value: 1, label: '智能匹配诊台'},{ value: 2, label: '自定义内容'}],
+            state: 1,
+            input:'',
+            radio:1
+        }
+    }
+}
+</script>
+
+
+<style lang="scss" scoped>
+.configureBox{
+    width:480px;
+    height: 300px;
+    border: 1px solid #e5e5e5;
+    .configureBoxTitle{
+        height: 40px;
+        text-align: center;
+        line-height: 40px;
+        background: rgb(245, 247, 250);
+        color:rgb(96, 98, 102);
+        font-weight: 600;
+        border-bottom: 1px solid #e5e5e5;
+    }
+    .configureBoxMain{
+        padding: 10px;
+    }
+}
+</style>

src/xt_pages/dialysis/components/computerCalling.vue

@@ -0,0 +1,82 @@
+<template>
+    <div class="page_computerCalling">
+        <div class="cell clearfix">
+            <label class="title"><span class="name">叫号状态</span> : </label>
+            <div class="time ">
+                <ul class="">
+                    <li v-for="option in patient_state" :key="option.value" @click="handleStateChange(option.value)" :class="patientStateVal == option.value ? 'active' : ''" >{{option.label}}
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div class="callingArea">
+                <called v-if="patientStateVal == 0" :index='1'></called>
+                <called v-if="patientStateVal == 1"></called>
+            </div>
+            <div class="nowCalling" v-if="patientStateVal == 0">
+                <p class="nowCallingTitle">当前叫号</p>
+                <p class="nowCallingName">李小明</p>
+                <p class="nowCallingTime">签到时间：07:20</p>
+                <p class="nowCallingTime">下一位：张三</p>
+                <el-button style="margin: 30px 0 20px 0;">重新叫号</el-button>
+                <el-button type="primary" style="margin-left:0;">&ensp;&ensp;叫号&ensp;&ensp;</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import called from './called'
+export default {
+    components:{
+       called 
+    },
+    data(){
+        return{
+            patient_state:[
+                {value: 0,label: '待叫号'},
+                {value: 1,label: '已叫号'},
+            ],
+            patientStateVal: 0,
+        }
+    },
+    methods:{
+        handleStateChange: function(index) {
+            this.patientStateVal = index
+        },
+    }
+}
+</script>
+
+
+<style lang="scss" scoped>
+.callingArea{
+    display: flex;
+    flex-wrap: wrap;
+    width: 86%;
+}
+.nowCalling{
+    height: 351px;
+    border: 1px solid #e5e5ee;
+    // flex: 1;
+    width: 14%;
+    text-align: center;
+    .nowCallingTitle{
+        font-size: 20px;
+        font-weight: 600;
+        margin-top: 20px;
+        text-align: center;
+    }
+    .nowCallingName{
+        color: #338AFB;
+        font-size: 18px;
+        margin-top: 10px;
+        font-weight: 600;
+    }
+    .nowCallingTime{
+        font-size: 16px;
+        margin-top: 30px;
+    }
+}
+</style>

src/xt_pages/dialysis/components/consumables.vue

@@ -49,8 +49,12 @@
     <div>
       <el-table
         :data="list"
-        height="350"
         border
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
       >
         <el-table-column
           align="center"

src/xt_pages/dialysis/components/dialysisParameters.vue

@@ -44,9 +44,13 @@
       <div>
           <el-table
             :data="tableData"
-            height="350"
             border
             style="width: 100%"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
             @selection-change="handleSelectionChange">
             <el-table-column align="center" type="selection" width="55">
             </el-table-column>

src/xt_pages/dialysis/components/lineUp.vue

@@ -0,0 +1,199 @@
+<template>
+    <div class="page_lineUp">
+        <div class="lineUpTitle">
+            <div>唐山朝阳医院<span>温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合</span></div>
+            <div>2020.8.18   07:22(星期四）</div>
+        </div>
+        <div class="lineUpMain">
+            <div class="lineUpMainLeft">
+                <div class="lineUpMainLeftTitle">
+                    <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:14%">上机时间</p>
+                    <p style="width:14%">预计下机时间</p>
+                </div>
+                <div class="lineUpList">
+                    <div class="lineUpListOne" v-for="item in 8" :key="item">
+                        <p style="width:14%">P01</p>
+                        <p style="width:14%">张*等</p>
+                        <p style="width:14%">001</p>
+                        <p style="width:14%">普通区1号床</p>
+                        <p style="width:14%">已下机</p>
+                        <p style="width:14%">09:01</p>
+                        <p style="width:14%">09:01</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;">
+                        <div class="callingTop" style="margin-bottom:4px;">
+                            <div class="callingTopTip"><span style="margin: 0 auto;">正在<br />接诊</span></div>
+                            <div class="callingContent">
+                                <p style="margin-top:13px;">请李四宋到1号诊台就诊</p>
+                                <p>请王岐岐到2号诊台就诊</p>
+                            </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-top:13px;">欧大大、王思思、陈啦啦、吴东汉、</p>
+                                <p>孔豆豆、陈米春、孔豆豆、陈米春、</p>
+                            </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;">
+                        <div class="callingTop" style="margin-bottom:4px;">
+                            <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">正在<br />叫号</span></div>
+                            <div class="callingContent">
+                                <p style="margin-top:13px;">请李四宋到普通区2号床上机</p>
+                                <p>请王岐岐到普通区3号床上机</p>
+                            </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">
+                                <p style="margin-top:13px;">欧大大、王思思、陈啦啦、吴东汉、</p>
+                                <p>孔豆豆、陈米春、孔豆豆、陈米春、</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        
+    </div>
+</template>
+
+<style lang="scss" scoped>
+.page_lineUp{
+    .lineUpTitle{
+        height: 50px;
+        background: #1A82BF;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 20px;
+        color:#fff;
+        font-size: 20px;
+        font-weight: 600;
+    }
+    .lineUpMain{
+        background: linear-gradient(0deg, #76ECEC, #479CD2);
+        height: 550px;
+        padding:10px;
+    }
+    .lineUpMainLeft{
+        height: 370px;
+        border-radius: 15px;
+        
+    }
+    .lineUpMainLeftTitle{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        color:#fff;
+        font-size: 18px;
+        font-weight: 600;
+        height:50px;
+        background: #1A82BF;
+        border-radius: 15px 15px 0 0;
+        >p{
+            text-align: center;
+        }
+    }
+    .lineUpList{
+        font-size: 18px;
+        font-weight: 600;
+        >div:nth-child(odd){
+            background: #F9FDFF;
+        }
+        >div:nth-child(even){
+            background: #CCEBFF;
+        }
+        >div:last-child{
+            border-radius: 0 0 15px 15px;
+        }
+        .lineUpListOne{
+            height:40px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            color:#1C6895;
+            >p{
+                width:25%;
+                text-align: center;
+            }
+        }
+    }
+    .callingBox{
+        height: 150px;
+        margin-top: 10px;
+        display: flex;
+        justify-content: space-between;
+        .callingBoxLeft{
+            width: 49%;
+            height: 100%;
+            display: flex;
+            justify-content: space-between;
+            .callingTitle{
+                width: 60px;
+                height: 100%;
+                border-radius: 15px 0 0 15px;
+                font-size: 30px;
+                font-weight:600;
+                text-align: center;
+                color: #fff;
+                background: #1A82BF;
+                display: flex;
+                align-items: center;
+                margin-right: 5px;
+            }
+            .newCallingTitle{
+                background: linear-gradient(90deg, rgba(66, 231, 167, 1), rgba(26, 191, 84, 1), rgba(157, 254, 31, 1));
+            }
+        } 
+        .callingTop{
+            height: 73px;
+            border-radius: 0 15px 0 0;
+            background: #F9FDFF;
+            display: flex;
+            justify-content: space-between;
+            .callingTopTip{
+                width: 73px;
+                height: 100%;
+                color: #fff;
+                font-size: 18px;
+                font-weight: 600;
+                background: #1A82BF;
+                display: flex;
+                align-items: center;
+            }
+            .newCallingTopTip{
+                background: linear-gradient(90deg, rgba(66, 231, 167, 1), rgba(26, 191, 84, 1), rgba(157, 254, 31, 1));
+            }
+            .callingContent{
+                flex: 1;
+                display: flex;
+                flex-direction: column;
+                font-size: 16px;
+                color:#1C6895;
+                font-weight: 600;
+                padding-left: 20px;
+                >p{
+                    width:100%;
+                    text-align: left;
+                    line-height: 24px;
+                }
+            }
+        }
+    }
+}
+</style>

src/xt_pages/dialysis/components/signIn.vue

@@ -0,0 +1,152 @@
+<template>
+    <div class="page_signIn">
+        <div class="signInTitle">
+            <div>唐山朝阳医院</div>
+            <div>2020.8.18   07:22(星期四）</div>
+        </div>
+        <div class="signInMain">
+             <div style="display: flex;justify-content: space-between;padding:10px;">
+                <div class="signInMainLeft">
+                    <div class="signInMainLeftTitle">
+                        <p>排号</p>
+                        <p>姓名</p>
+                        <p>病历号</p>
+                        <p>签到时间</p>
+                    </div>
+                    <div class="signInList">
+                        <div class="signInListOne" v-for="item in 12" :key="item">
+                            <p>P13</p>
+                            <p>张*等</p>
+                            <p>001</p>
+                            <p>09:01: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>排号&nbsp;&nbsp;</span><span style="font-size:120px;">P06</span></p>
+                    </div>
+                    <div class="signInMianRightBottom"><span style="margin:0 auto;">签到成功</span></div>
+                </div>
+            </div>
+            <div class="signInTip">
+                温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合
+            </div>
+        </div>
+    </div>
+</template>
+
+
+<style lang="scss" scoped>
+.page_signIn{
+    .signInTitle{
+        height: 50px;
+        background: #1A82BF;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 20px;
+        color:#fff;
+        font-size: 20px;
+        font-weight: 600;
+    }
+    .signInMain{
+        background: linear-gradient(0deg, #76ECEC, #479CD2);
+        height: 600px;
+        
+        
+    }
+    .signInMainLeft{
+        width:65%;
+        height: 530px;
+        border-radius: 15px;
+    }
+    .signInMainLeftTitle{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        color:#fff;
+        font-size: 18px;
+        font-weight: 600;
+        height:50px;
+        background: #1A82BF;
+        border-radius: 15px 15px 0 0;
+        >p{
+            width:25%;
+            text-align: center;
+        }
+    }
+    .signInList{
+        font-size: 18px;
+        font-weight: 600;
+        >div:nth-child(odd){
+            background: #F9FDFF;
+        }
+        >div:nth-child(even){
+            background: #CCEBFF;
+        }
+        >div:last-child{
+            border-radius: 0 0 15px 15px;
+        }
+        .signInListOne{
+            height:40px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            color:#1C6895;
+            >p{
+                width:25%;
+                text-align: center;
+            }
+        }
+    }
+    .signInMainRight{
+        width: 34%;
+        height: 530px;
+    }
+    .signInMainRightTitle{
+        height: 130px;
+        border-radius: 15px 15px 0 0;
+        background: #1A82BF;
+        font-size: 80px;
+        font-weight: 600;
+        color:#fff;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+    .signInMainRightContent{
+        background: #F9FDFF;
+        height: 300px;
+        text-align: center;
+        font-weight: 600;
+        color:#1C6895;
+        box-sizing: border-box;
+        font-size:70px;
+        display:flex;
+        align-items:center;
+    }
+    .signInMianRightBottom{
+        height: 100px;
+        background: #1A82BF;
+        border-radius: 0 0 15px 15px;
+        font-size: 40px;
+        font-weight: 600;
+        color:#fff;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .signInTip{
+        color:#fff;
+        font-size: 18px;
+        font-weight: 600;
+        display: flex;
+        align-items: center;
+        height: 50px;
+        background: linear-gradient(0deg, #42A9E7, #3686B9, #42A9E7);
+        margin-top: 1px;
+    }
+}
+</style>

src/xt_pages/dialysis/components/treatmentConfigure.vue

@@ -0,0 +1,84 @@
+<template>
+    <div class="page_configure">
+        <div style="display:flex;align-items:center;margin-bottom:12px;justify-content: space-between;">
+            <div>接诊台列表</div>
+            <el-button type="primary" @click="newVisible = true">新增</el-button>
+        </div>
+        <el-table :data="tableData" border style="width: 100%">
+            <el-table-column prop="date" label="接诊台号" align="center"></el-table-column>
+            <el-table-column label="诊台负责医生" align="center">
+                <template slot-scope="scope">
+                    <el-tag size="medium">{{ scope.row.name }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="primary" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                    <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-dialog title="新增诊台" width="800px" :visible.sync="newVisible" >
+            <el-form :model="form" :rules="rules" ref="form" label-width="140px">
+                <el-form-item label="诊台号 : " required prop="type">
+                    <el-input v-model.trim="form.type" placeholder="" ></el-input>
+                </el-form-item>
+                <el-form-item label="诊台负责医生 : " required  prop="doctor">
+                    <el-select style="width:100%" v-model="form.doctor" placeholder="请选择" multiple filterable allow-create default-first-option>
+                        <el-option
+                        v-for="item in typeOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="newVisible=false">取 消</el-button>
+                <el-button type="primary" @click="submitAction('form')">保 存</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+export default {
+    data(){
+        return{
+            tableData: [{
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+            }],
+            newVisible:false,
+            form: {
+                id: 0,
+                type: "",
+                doctor:[],
+            },
+            rules: {
+              type: [{ required: true, message: "请输入诊台号" }],
+              doctor: [{ required: true, message: "请选择接诊台负责医生"}],  
+            },
+            typeOptions:[{ value: 1, label: '张三'},{ value: 2, label: '李四'}],
+        }
+    },
+    methods:{
+        handleEdit(){},
+        handleDelete(){},
+    }
+}
+</script>

src/xt_pages/dialysis/components/waitingCalled.vue

@@ -0,0 +1,61 @@
+<template>
+    <div class="waitingCalled">
+        <div class="waitingOne" v-for="item in 12" :key="item">
+            <div class="waitingOneLeft">
+                <img src="https://images.shengws.com/201809182128111.png?imageView2/2/w/500/h/500/q/90" alt="">
+                <div class="name">
+                    <p>吴保龄</p>
+                    <p>签到时间：07:00:00</p>
+                </div>
+            </div>
+            <div class="waitingOneRight">
+                <img src="../../../assets/img/volume.png" alt="">
+            </div>
+        </div>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+.waitingCalled{
+    .waitingOne{
+        border: 1px #e5e5ee solid;
+        padding: 9px 0;
+        margin: 0 15px 15px 0;
+        float: left;
+        width: 360px;
+        cursor: pointer;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 10px;
+        .waitingOneLeft{
+            display: flex;
+            img{
+                width: 45px;
+                height: 45px;
+                border-radius: 50%;
+                margin-right: 15px;
+            }
+            .name{
+                >p:first-child{
+                    font-size: 16px;
+                    font-weight: bold;
+                    color:#000;
+                }
+                >p:last-child{
+                    font-size: 12px;
+                    color:#999999;
+                    margin-top: 10px;
+                }
+            }
+            
+        }
+        .waitingOneRight{
+            img{
+                width: 30px;
+                margin-top: 6px;
+            }
+        }
+    }
+}
+</style>

src/xt_pages/dialysis/consumables_print.vue

@@ -16,10 +16,8 @@
                     </div>
                     <div style="display:flex;justify-content: space-between;margin-bottom:10px;">
                         <p>统计时间:{{query.start_time}} - {{query.end_time}}</p>
+                        <p>印单日期:{{print_time}}</p>
                     </div>
-                  <div style="display:flex;justify-content: space-between;margin-bottom:10px;">
-                    <p>印单日期:{{print_time}}</p>
-                  </div>
                     <div class="table_panel">
                         <table class="table">
                             <thead>

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -331,5 +331,9 @@
     color: #bd2c00;
 
   }
+  .el-table__body div > div:hover {
+    background-color: #409eff !important;
+    color: #fff !important;
+  }
 
 </style>

src/xt_pages/stock/stockUserDetail.vue

@@ -46,7 +46,7 @@
               <span >{{scope.row.count}}</span>
             </template>
           </el-table-column>
-          <el-table-column min-width="23" align="center">
+          <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
               <span>使用时间</span>
             </template>