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

package-lock.json

@@ -3190,6 +3190,11 @@
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
       "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
     },
+    "default-passive-events": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-passive-events/-/default-passive-events-2.0.0.tgz",
+      "integrity": "sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ=="
+    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",

package.json

@@ -43,6 +43,7 @@
     "clipboard": "^1.7.1",
     "codemirror": "5.32.0",
     "connect": "3.6.6",
+    "default-passive-events": "^2.0.0",
     "driver.js": "0.5.2",
     "dropzone": "5.2.0",
     "echarts": "3.8.5",

src/api/device/device.js

@@ -120,12 +120,14 @@ export function getDeviceNumbers() {
     })
 }
 
-export function createDeviceNumber(number, zone_id, group_id) {
+export function createDeviceNumber(number, zone_id, group_id,sort) {
     const params = {
         number: number,
         zone: zone_id,
         group: group_id,
+        sort:sort,
     }
+   
     return request({
         url: '/api/device/number/create',
         method: 'post',
@@ -133,12 +135,13 @@ export function createDeviceNumber(number, zone_id, group_id) {
     })
 }
 
-export function modifyDeviceNumber(id, number, zone_id, group_id) {
+export function modifyDeviceNumber(id, number, zone_id, group_id,sort) {
     const params = {
         id: id,
         number: number,
         zone: zone_id,
         group: group_id,
+        sort:sort
     }
     return request({
         url: '/api/device/number/modify',

src/api/dialysis.js

@@ -241,7 +241,7 @@ export function postDelMonitorInfo(params) {
 }
 
 export function CreateGroupAdvice(id, groupno, advices) {
-  console.log('中国人名', advices)
+ 
   return request({
     url: '/api/advice_remind/create?id=' + id + '&groupno=' + groupno,
     method: 'post',
@@ -290,3 +290,5 @@ export function GetDialysisGoodStatistics(params) {
 
   })
 }
+
+

src/main.js

@@ -29,6 +29,8 @@ import VueClipboard from 'vue-clipboard2'
 import * as filters from './filters' // global filters
 
 import * as voicePromptFun from './utils/voicePrompt' 
+
+import 'default-passive-events'
 Vue.prototype.voicePrompt = voicePromptFun.voicePrompt  //语音提醒
 
 Vue.use(Element, {

src/views/layout/components/Navbar.vue

@@ -312,7 +312,7 @@ export default {
               this.showWsErr = false;
             }
             this.websocket.send("1");
-          }, 3000);
+          }, 55000);
         }
         
       }).catch(error => {

src/xt_pages/data/druguseTemplate.vue

@@ -1817,7 +1817,7 @@
             var arr = this.templateForm.advice_name.split("(自备药)")
             this.templateForm.advice_name = arr[0]
         }
-        console.log("2222",this.templateForm)
+        // console.log("2222",this.templateForm)
 
         this.$refs[formName].validate(valid => {
           this.templateForm.single_dose = parseFloat(this.templateForm.single_dose)

src/xt_pages/device/number_main.vue

@@ -36,6 +36,11 @@
               label="所属分组"
               align="center"
             ></el-table-column>
+            <el-table-column prop="sort" label="排序" align="center">
+                <template slot-scope="scope">
+                    {{scope.row.sort?scope.row.sort:""}}
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-tooltip
@@ -133,6 +138,9 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="排序:">
+              <el-input style="width:220px" v-model="number_form.sort"></el-input>
+          </el-form-item>
           <!-- <el-form-item>
                     <el-button @click="cancelModifyDeviceNumber">取 消</el-button>
                     <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="editDeviceNumberSubmitAction">保存</el-button>
@@ -176,7 +184,8 @@ export default {
         id: 0,
         number: "",
         zone: "",
-        group: ""
+        group: "",
+        sort:"",
       },
       formLabelWidth: "110px",
       showEditDeviceNumber: false,
@@ -194,10 +203,10 @@ export default {
       this.loading = false;
       var resp = rs.data;
       if (resp.state === 1) {
-        // console.log(resp)
         this.zones.push(...resp.data.zones);
         this.groups.push(...resp.data.groups);
         this.device_numbers.push(...resp.data.numbers);
+        
       } else {
         this.$message.error(resp.msg);
       }
@@ -212,6 +221,13 @@ export default {
       this.number_form.number = row.number;
       this.number_form.zone = row.zone_id;
       this.number_form.group = row.group_id;
+      if(row.sort == 0){
+        this.number_form.sort = ""
+      }
+      if(row.sort != 0){
+        this.number_form.sort = row.sort
+      }
+     
       this.showEditDeviceNumber = true;
     },
     cancelModifyDeviceNumber() {
@@ -219,6 +235,7 @@ export default {
       this.number_form.number = "";
       this.number_form.zone = "";
       this.number_form.group = "";
+      this.number_form.sort = ""
       this.$refs.form_number.clearValidate();
       this.showEditDeviceNumber = false;
     },
@@ -229,13 +246,14 @@ export default {
             createDeviceNumber(
               this.number_form.number,
               this.number_form.zone,
-              this.number_form.group
+              this.number_form.group,
+              this.number_form.sort
             ).then(rs => {
               var resp = rs.data;
               if (resp.state === 1) {
                 var newNumber = resp.data.number;
                 this.device_numbers.push(newNumber);
-                this.cancelModifyDeviceNumber();
+                this.cancelModifyDeviceNumber();           
               } else {
                 this.$message.error("床位号/机号已存在!");
               }
@@ -245,7 +263,8 @@ export default {
               this.number_form.id,
               this.number_form.number,
               this.number_form.zone,
-              this.number_form.group
+              this.number_form.group,
+              this.number_form.sort
             ).then(rs => {
               var resp = rs.data;
               // console.log(resp.data)
@@ -262,6 +281,7 @@ export default {
                     number.group_id = resp.data.number.group_id;
                     number.zone_name = resp.data.number.zone_name;
                     number.group_name = resp.data.number.group_name;
+                    number.sort = resp.data.number.sort;
                     break;
                   }
                 }

src/xt_pages/dialysis/components/allSummary.vue

@@ -298,7 +298,7 @@ export default {
               }
 
 
-             console.log("2222222",arr)
+            //  console.log("2222222",arr)
 
 
               let newObj = {
@@ -323,7 +323,7 @@ export default {
 
               }
               }
-              console.log("list22222",this.list)
+              // console.log("list22222",this.list)
              }
           })
         },

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -3218,11 +3218,9 @@
         const res = new Map();
         return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 1));
       },
+     
     },
-    // created(){
-    //   var org_id =  this.$store.getters.xt_user.template_info.org_id
-    //   console.log("org_id-----",org_id)
-    // },
+  
     watch: {
       'dialysisPrescription.dialysis_duration_hour': function() {
         let dialysis_duration_minute = 0

src/xt_pages/dialysis/details/index.vue

@@ -970,7 +970,7 @@ export default {
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
-          // console.log("患者排班信息99999999",schedual)
+          console.log("患者排班信息99999999",schedual)
           var prescription = resp.data.prescription // 透析处方
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
@@ -1118,8 +1118,9 @@ export default {
           
           this.his_is_open = resp.data.is_open_config.is_open
           console.log(this.his_is_open)
-
-
+          
+          // var stockType =  resp.data.stockType
+          // console.log("stockTYPW",stockType)
           for (let i = 0; i <  this.doctor_advices.length; i++){
             this.doctor_advices[i]['origin'] = 1
           }

src/xt_pages/dialysis/schedualPatient.vue

@@ -346,17 +346,13 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         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)
     },
     beforeDestroy(){
-      clearInterval(this.timers);　　// 清除定时器
-      this.timers = null
 
       let unObj = {
           cmd: "queue/unjoin",
@@ -380,7 +376,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         this.websocket.onmessage = e => {
           let res = JSON.parse(e.data);
           // let res = re.data;
-          // console.log('res3333333333',res)
+          console.log('res3333333333',res)
           if(res.channel == 'queue/join'){
             if(res.data.fisrtQueueInfo != null){
               if(res.data.fisrtQueueInfo.create_time){

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -535,14 +535,17 @@
                       </td>
                       <td>{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}
                       </td>
-                      <td v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time ) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">
-                        {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}
-                      </td>
-                      <td v-if="(dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time)">
-                        {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }}
+                      <td>
+                        <span v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time ) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">
+                          {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}
+                        </span>
+                        <span v-if="(dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time)">
+                          {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }}
+                        </span>
                       </td>
                       <td>{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
-                      <td>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</td>
+                      <td>{{ monitor.conductivity ? monitor.conductivity : "" }}
+                      </td>
                       <td v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">
                         {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
                       </td>
@@ -1340,7 +1343,7 @@ export default {
           this.predialysis.blood_access_part_opera_id
         )
         this.afterdialysis = response.data.data.AssessmentAfterDislysis
-        console.log('透后体重', this.afterdialysis)
+        // console.log('透后体重', this.afterdialysis)
         this.lastafterdialysis = response.data.data.assessmentAfterDislysis
         this.operators = response.data.data.operators
         console.log('operators', this.operators)

src/xt_pages/dialysis/template/DialysisPrintOrderThirty.vue

@@ -146,7 +146,7 @@
                 <td width="80">透析前体重:</td>
                 <td width="70">
                   <div class="under-line">
-                    &nbsp;{{ predialysis.weight_before ? predialysis.weight_before : "" }}
+                    &nbsp;{{ predialysis.weight_before ? predialysis.weight_before : "未称重" }}
                   </div>
                 </td>
                 <td width="35">kg</td>
@@ -430,7 +430,7 @@
                     <td width="30"></td>
                     <td width='70'>透后体重:</td>
                     <td width="50">
-                      <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }}</div>
+                      <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "未称重" }}</div>
                     </td>
                     <td width="10">Kg</td>
                     <td></td>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="dialysis-print-box">
     <div id='new-dialysis-1' class="dialysis-print-order">
-      <div class="order-yy-name"></div>
-      <div class="order-title">{{ orgname }} 血液净化治疗记录单</div>
-      <table class="table-box" style="margin-top: 10px;">
+      <div class="order-yy-name" style="font-size:28px;font-weight:bold;">{{ orgname }}</div>
+      <div class="order-title">血液净化治疗记录单</div>
+      <table class="table-box">
         <tbody>
           <tr>
             <td width="50">姓 名:</td>
@@ -93,12 +93,10 @@
             </td>
             <td width='30'></td>
             <td width="30">机位</td>
-            <td width="50">
+            <td width="120">
                 <div class="under-line">&nbsp;{{ getNumber() }}</div>
             </td>
             <td width="20">号</td>
-            
-            <td width="20"></td>
 
             <td></td>
 
@@ -168,7 +166,7 @@
                       </div>
                     </td>
                     <td width="100">
-                        <div class="under-line">{{ predialysis.hemorrhage_other ? predialysis.hemorrhage_other : '' }}</div>
+                        <div class="under-line">&nbsp;{{ predialysis.hemorrhage_other ? predialysis.hemorrhage_other : '' }}</div>
                     </td>
                     <td></td>
                   </tr>
@@ -376,12 +374,12 @@
                     <td width='50'>血流量</td>
                     <td width="220">
                       <div>
-                        <label-box :isChecked="predialysis.catheter.indexOf('血流量-好') > -1 ? true : false" showValue="干洁"></label-box>
+                        <label-box :isChecked="predialysis.catheter.indexOf('血流量-好') > -1 ? true : false" showValue="好"></label-box>
                         &nbsp;
                         <label-box :isChecked="predialysis.catheter.indexOf('血流量差-A') > -1 ? true : false" showValue="A"></label-box>
-                        &nbsp;
+                        /
                         <label-box :isChecked="predialysis.catheter.indexOf('血流量差-V') > -1 ? true : false" showValue="V"></label-box>
-                        &nbsp;
+                        差&nbsp;
                         <label-box :isChecked="predialysis.catheter.indexOf('血流量-AV反接') > -1 ? true : false" showValue="AV反接"></label-box>
                       </div>
                     </td>

src/xt_pages/sign/lineUp.vue

@@ -43,7 +43,7 @@
                 <div class="lineUpMain">
                     <div class="lineUpMainLeft">
                         <div class="lineUpMainLeftTitle">
-                            <p style="width:12%">排号</p>
+                            <p style="width:12%">排队号</p>
                             <p style="width:14%">姓名</p>
                             <p style="width:14%">病例号</p>
                             <p style="width:14%">床位号</p>
@@ -53,7 +53,12 @@
                         </div>
                         <div class="lineUpList">
                             <div class="lineUpListOne" v-for="(item,index) in lineUpList" :key="index">
-                                <p style="width:12%">{{ item.queue_no }}</p>
+                                <p style="width:12%">
+                                    <span v-if="item.schedule_type == 1">上午</span>
+                                    <span v-if="item.schedule_type == 2">下午</span>
+                                    <span v-if="item.schedule_type == 3">晚上</span>
+                                    {{ item.queue_no }}号
+                                </p>
                                 <p style="width:14%">{{ item.patient_name }}</p>
                                 <p style="width:14%">{{ item.dialysis_no }}</p>
                                 <p style="width:14%">{{ item.partition_name + item.bed_name }}</p>
@@ -76,15 +81,15 @@
                                 <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>
+                                        <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>
                                 </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>
+                                        <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>
                                 </div>
                             </div>
@@ -95,15 +100,15 @@
                                 <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>
+                                        <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>
                                 </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>
+                                        <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>
                                 </div>
                             </div>
@@ -122,7 +127,7 @@
                 <div class="lineUpMain">
                     <div class="lineUpMainLeft">
                         <div class="lineUpMainLeftTitle">
-                            <p style="width:12%">排号</p>
+                            <p style="width:12%">排队号</p>
                             <p style="width:14%">姓名</p>
                             <p style="width:14%">病例号</p>
                             <p style="width:14%">床位号</p>
@@ -132,7 +137,12 @@
                         </div>
                         <div class="lineUpList">
                             <div class="lineUpListOne" v-for="(item,index) in lineUpList" :key="index">
-                                <p style="width:12%">{{ item.queue_no }}</p>
+                                <p style="width:12%">
+                                    <span v-if="item.schedule_type == 1">上午</span>
+                                    <span v-if="item.schedule_type == 2">下午</span>
+                                    <span v-if="item.schedule_type == 3">晚上</span>
+                                    {{ item.queue_no }}号
+                                </p>
                                 <p style="width:14%">{{ item.patient_name }}</p>
                                 <p style="width:14%">{{ item.dialysis_no }}</p>
                                 <p style="width:14%">{{ item.partition_name + item.bed_name }}</p>
@@ -155,15 +165,15 @@
                                 <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>
+                                        <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>
                                 </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>
+                                        <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>
                                 </div>
                             </div>
@@ -174,15 +184,15 @@
                                 <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>
+                                        <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>
                                 </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>
+                                        <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>
                                 </div>
                             </div>
@@ -284,7 +294,7 @@ export default {
                 this.page++
                 let obj = {
                     cmd: "queue/queuelist",
-                    data: {page:this.page,size:6}
+                    data: {page:this.page,size:6,sort:0}
                 };
                 this.websocketSend(obj)
                 setTimeout(() => {
@@ -295,7 +305,7 @@ export default {
                 this.page = 1
                 let a = {
                     cmd: "queue/queuelist",
-                    data: {page:this.page,size:6}
+                    data: {page:this.page,size:6,sort:0}
                 };
                 this.websocketSend(a)
                 setTimeout(() => {

src/xt_pages/sign/signIn.vue

@@ -44,14 +44,19 @@
                     <div style="display: flex;justify-content: space-between;padding:10px;">
                         <div class="signInMainLeft">
                             <div class="signInMainLeftTitle">
-                                <p>排号</p>
+                                <p>排队号</p>
                                 <p>姓名</p>
                                 <p>病历号</p>
                                 <p>签到时间</p>
                             </div>
                             <div class="signInList">
                                 <div class="signInListOne" v-for="(item,index) in signInList" :key="index">
-                                    <p>{{ item.queue_no }}</p>
+                                    <p>
+                                        <span v-if="item.schedule_type == 1">上午</span>
+                                        <span v-if="item.schedule_type == 2">下午</span>
+                                        <span v-if="item.schedule_type == 3">晚上</span>
+                                        {{ item.queue_no }}号
+                                    </p>
                                     <p>{{ item.patient_name }}</p>
                                     <p>{{ item.dialysis_no }}</p>
                                     <p>{{ item.create_time }}</p>
@@ -61,7 +66,7 @@
                         <div class="signInMainRight">
                             <div class="signInMainRightTitle"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>{{ queueInfo.patient_name }}</span></div>
                             <div class="signInMainRightContent">
-                                <p style="margin: 0 auto;display:flex;align-items: center;" v-if='Object.keys(queueInfo).length>0'><span>排号&nbsp;</span><span style="font-size:180px;">{{ queueInfo.queue_no }}</span></p>
+                                <p style="margin: 0 auto;display:flex;align-items: center;" v-if='Object.keys(queueInfo).length>0'><span>排队号&nbsp;</span><span style="font-size:180px;">{{ queueInfo.queue_no }}</span></p>
                             </div>
                             <div class="signInMianRightBottom"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>签到成功</span></div>
                         </div>
@@ -82,14 +87,19 @@
                     <div style="display: flex;justify-content: space-between;padding:10px;">
                         <div class="signInMainLeft">
                             <div class="signInMainLeftTitle">
-                                <p>排号</p>
+                                <p>排队号</p>
                                 <p>姓名</p>
                                 <p>病历号</p>
                                 <p>签到时间</p>
                             </div>
                             <div class="signInList">
                                 <div class="signInListOne" v-for="(item,index) in signInList" :key="index">
-                                    <p>{{ item.queue_no }}</p>
+                                    <p>
+                                        <span v-if="item.schedule_type == 1">上午</span>
+                                        <span v-if="item.schedule_type == 2">下午</span>
+                                        <span v-if="item.schedule_type == 3">晚上</span>
+                                        {{ item.queue_no }}号
+                                    </p>
                                     <p>{{ item.patient_name }}</p>
                                     <p>{{ item.dialysis_no }}</p>
                                     <p>{{ item.create_time }}</p>
@@ -99,7 +109,7 @@
                         <div class="signInMainRight">
                             <div class="signInMainRightTitle"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>{{ queueInfo.patient_name }}</span></div>
                             <div class="signInMainRightContent">
-                                <p style="margin: 0 auto;display:flex;align-items: center;" v-if='Object.keys(queueInfo).length>0'><span>排号&nbsp;</span><span style="font-size:180px;">{{ queueInfo.queue_no }}</span></p>
+                                <p style="margin: 0 auto;display:flex;align-items: center;" v-if='Object.keys(queueInfo).length>0'><span>排队号&nbsp;</span><span style="font-size:180px;">{{ queueInfo.queue_no }}</span></p>
                             </div>
                             <div class="signInMianRightBottom"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>签到成功</span></div>
                         </div>
@@ -155,23 +165,25 @@ export default {
         this.websocketMess();
     },
     mounted(){
-        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.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,sort:1}
+                };
+                this.websocketSend(obj)
+            }else{
+                console.log('执行2222')
+                this.page = 1
+                let newobj = {
+                    cmd: "queue/queuelist",
+                    data: {page:this.page,size:10,sort:1}
+                };
+                this.websocketSend(newobj)
+            }
+        }, 20000);
         
         this.timerID = setInterval(() => {
             this.updateTime()
@@ -179,6 +191,7 @@ export default {
         // this.updateTime();
     },
     beforeDestroy(){
+        clearInterval(this.timer);　　// 清除定时器
         clearInterval(this.timerID);　　// 清除定时器
         let obj = {
             cmd: "queue/unjoin",
@@ -211,9 +224,10 @@ export default {
                 }else if(res.channel == "patientQueueInfo"){
 
                     this.queueInfo = res.data.queueInfo
+                    this.page = 1
                     let obj = {
                         cmd: "queue/queuelist",
-                        data: {page:1,size:10}
+                        data: {page:1,size:10,sort:1}
                     };
                     this.websocketSend(obj)
                     
@@ -295,7 +309,7 @@ export default {
         
     }
     .signInMainLeft{
-        width:65%;
+        width:69%;
         height: 980px;
         border-radius: 15px;
     }
@@ -317,6 +331,15 @@ export default {
     .signInList{
         font-size: 36px;
         font-weight: 600;
+        >div:nth-child(1){
+            font-size: 50px;
+        }
+        >div:nth-child(2){
+            font-size: 50px;
+        }
+        >div:nth-child(3){
+            font-size: 50px;
+        }
         >div:nth-child(odd){
             background: #F9FDFF;
         }
@@ -339,7 +362,7 @@ export default {
         }
     }
     .signInMainRight{
-        width: 34%;
+        width: 30%;
         height: 980px;
     }
     .signInMainRightTitle{

src/xt_pages/stock/Dialog/goodTypeDialog.vue

@@ -9,11 +9,20 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col>
+          <el-form-item label="耗材属性">
+              <el-radio v-model="formValue.stock_attribute" label="1">无</el-radio>
+              <el-radio v-model="formValue.stock_attribute" label="2">透析器</el-radio>
+              <el-radio v-model="formValue.stock_attribute" label="3">灌流器</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col>
           <el-form-item label="耗材出库" prop="out_stock">
-             <el-radio v-model="out_stock" label="1">是</el-radio>
-             <el-radio v-model="out_stock" label="2">否</el-radio>
+             <el-radio v-model="formValue.out_stock" label="1">是</el-radio>
+             <el-radio v-model="formValue.out_stock" label="2">否</el-radio>
           </el-form-item>     
         </el-col>
       </el-row>
@@ -57,7 +66,8 @@ export default {
           { required: true, message: "请输入类型名称", trigger: "blur" }
         ]
       },
-       out_stock: '1'
+       out_stock: '1',
+       stock_attribute:"1"
     };
   },
   props: {
@@ -96,7 +106,8 @@ export default {
       form["type_name"] = this.formValue.type_name;
       form["remark"] = this.formValue.remark;
       form["isCreated"] = this.isCreated;
-      form['out_stock'] = this.out_stock;
+      form['out_stock'] = this.formValue.out_stock;
+      form["stock_attribute"] = this.formValue.stock_attribute
       return form;
     }
   },
@@ -107,6 +118,8 @@ export default {
           this.$refs["formValue"].resetFields();
           this.formValue.remark = "";
           this.formValue.type_name = "";
+          this.formValue.stock_attribute="1";
+          this.formValue.out_stock = "1"
         }, 0);
     }
   }

src/xt_pages/stock/config/goodType.vue

@@ -228,7 +228,9 @@ export default {
           isCreated: 1, //1.创建 2.编辑 3.查看详情
           formValue: {
             type_name: "",
-            remark: ""
+            remark: "",
+            stock_attribute:"1",
+            out_stock:"1",
           },
           isVisibility: false
         }
@@ -251,13 +253,15 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          this.goodType.goodTypeDialog.formValue.remark =
-            response.data.data.goodType.remark;
-          this.goodType.goodTypeDialog.formValue.type_name =
-            response.data.data.goodType.type_name;
+          console.log("response.data.data",response.data.data.goodType)
+          this.goodType.goodTypeDialog.formValue.remark = response.data.data.goodType.remark;
+          this.goodType.goodTypeDialog.formValue.type_name =response.data.data.goodType.type_name;
+          this.goodType.goodTypeDialog.formValue.stock_attribute = response.data.data.goodType.stock_attribute.toString()
+          this.goodType.goodTypeDialog.formValue.out_stock = response.data.data.goodType.out_stock.toString()
           this.goodType.goodTypeDialog.isCreated = 2;
           this.$refs.dialog.show();
           this.goodType.type_code = response.data.data.goodType.type_code;
+
         }
       });
     },
@@ -315,6 +319,7 @@ export default {
           type_code: this.goodType.type_code,
           id: this.goodType.editTypeId,
           out_stock:val.out_stock,
+          stock_attribute:val.stock_attribute,
         };
       
         modifyGoodType(params).then(response => {
@@ -334,6 +339,7 @@ export default {
         });
       } else if (val.isCreated == 1) {
         //新增
+        console.log("val22222",val)
        
         createGoodType(val).then(response => {
           

src/xt_pages/upload/fast/basicInfo.vue

@@ -198,7 +198,7 @@ export default {
     watch:{
         patient:{
             handler:function(val) {
-                console.log(1111111111111,val)
+                // console.log(1111111111111,val)
                 Object.keys(val).map((item,index) => {
                     this.$set(this.form, item, val[item])
                     this.$forceUpdate()