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

src/router/modules/weight_sign.js

@@ -61,5 +61,17 @@ export default {
       icon: 'Contextowner',
       noCache: true
     }
-  }]
+  },
+   // 测试
+  //  {
+  //   path: '/ceshi',
+  //   component: () => import('@/xt_pages/sign/ceshi'),
+  //   name: 'ceshi',
+  //   meta: {
+  //     title: '排班测试',
+  //     icon: 'ceshi',
+  //     noCache: true
+  //   }
+  // },
+]
 }

src/xt_pages/outpatientDoctorStation/template/printFive.vue

@@ -41,7 +41,9 @@
           </div>
           <div class="prescriptionBox" style="border-top: 1px solid #000;border-bottom: 1px solid #000;">
               <div class="Rp">Rp:</div>
-              <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
+              <div class="drugsBox" v-for="(it,index) in item.advices" :key="index"
+                :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
+              >
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
@@ -103,6 +105,7 @@ export default {
       return {
         doctorList:[],
         advicePrint:{},
+        yi:4,
         patient:{},
         tableData:[],
         prescriptionInfo:[],

src/xt_pages/outpatientDoctorStation/template/printFour.vue

@@ -21,7 +21,9 @@
           </div>
           <div class="prescriptionBox">
               <div class="Rp">Rp:</div>
-              <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
+              <div class="drugsBox" v-for="(it,index) in item.advices" :key="index"
+                :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
+              >
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
                   <div style="margin-left:100px;"><span>{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</span></div>
@@ -84,6 +86,7 @@ export default {
       return {
         doctorList:[],
         advicePrint:{},
+        yi:4,
         patient:{},
         tableData:[],
         prescriptionInfo:[],

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -52,13 +52,15 @@
             临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
           </div>
         </div>
-        <div class="prescriptionBox">
+        <div class="prescriptionBox" >
           <div class="Rp">Rp:</div>
           <div
             class="drugsBox"
             v-for="(it, index) in item.advices"
             :key="index"
+            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
           >
+          <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  'page-break-after':item.advices.length>=3&& item.advices[2]?'always':'auto'-->
             <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
             <div class="drugsOne">
               <span style="font-weight: bold">{{ index + 1 + "." }}</span
@@ -79,6 +81,7 @@
               >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
             </div>
           </div>
+
           <div
             class="drugsBox"
             v-for="(it, i) in item.additionalcharge"
@@ -113,6 +116,7 @@
               >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
             </div>
           </div>
+          
           <div
             class="drugsBox"
             v-for="(it, i) in item.additionalcharge"
@@ -222,6 +226,7 @@ export default{
       doc_name:"",
       doctorList: [],
       advicePrint: {},
+      yi:4,
       patient: {},
       tableData: [],
       prescriptionInfo: [],

src/xt_pages/outpatientDoctorStation/template/printSix.vue

@@ -72,6 +72,7 @@
             class="drugsBox"
             v-for="(it, index) in item.advices"
             :key="index"
+            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
           >
             <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
             <div class="drugsOne">
@@ -234,6 +235,7 @@ export default {
     return {
       doctorList: [],
       advicePrint: {},
+      yi:4,
       patient: {},
       tableData: [],
       prescriptionInfo: [],

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -147,6 +147,7 @@
                 pageIndex * 5 + item.pageArr[pageIndex]
               )"
               :key="index"
+              :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
             >
               <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
               <div class="drugsOne">
@@ -285,6 +286,7 @@ export default {
       operatorMaps: {},
       doctorList: [],
       advicePrint: {},
+      yi:4,
       patient: {},
       tableData: [],
       prescriptionInfo: [],

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -15,6 +15,7 @@
       <div class='dialysisPage' style="padding-top:40px;">
         <!-- 此下条为本地开发下页面 -->
         <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
+        <!-- org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0 -->
         <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
         <printTwo v-else v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
       </div>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -15,10 +15,10 @@
 
             <div class="printTitle">{{orgname}}</div>
             <div class="printTitle">处方、治疗单</div>
-
-            <div class="infoTitle">
-                <div>门诊编号：</div>
-                <div>电脑号：</div>
+<!-- class="infoTitle" -->
+            <div style="display: flex; margin-top: 10px; line-height: 24px;padding: 0 10px;">
+                <div style="width: 300px;">门诊编号：</div>
+                <div style="width: 300px;">电脑号：</div>
             </div>
 
             <div class="infoMain">
@@ -75,9 +75,9 @@
                 </table>
             </div>
 
-            <div class="infoTitle">
-                <div>开单医生：{{item.doctor?item.doctor:''}}</div>
-                <div>签章：</div>
+            <div style="display: flex; margin-top: 10px; line-height: 24px;padding: 0 10px;">
+                <div style="width: 300px;">开单医生：{{item.doctor?item.doctor:''}}</div>
+                <div style="width: 300px;">签章：</div>
             </div>
 
             <div class="actionBar">
@@ -471,7 +471,7 @@
 
     .infoTitle {
         display: flex;
-        border-bottom: 2px solid #000;
+        // border-bottom: 2px solid #000;
         margin-top: 10px;
         line-height: 24px;
         padding: 0 10px;

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -32,7 +32,7 @@
           >精二</span
         >
       </div>
-      <div style="display: flex">
+      <div style="display: flex;border: none;">
         <div style="width: 33%; display: flex">
           费别：
           <span class="under_line">
@@ -58,9 +58,9 @@
           }}</span>
         </div>
       </div>
-
-      <div class="infoTitle">
-        <div>
+<!-- class="infoTitle" -->
+      <div style="display: flex;margin-top: 10px;line-height: 24px;" >
+        <div style="width: 200px;">
           姓名：{{
             item.patient.name
               ? item.patient.name.indexOf("（") > -1
@@ -72,12 +72,12 @@
               : ""
           }}
         </div>
-        <div>
+        <div style="width: 200px;">
           性别：
           <span v-if="item.patient.gender == 1">男</span>
           <span v-if="item.patient.gender == 2">女</span>
         </div>
-        <div>
+        <div style="width: 200px;">
           年龄：{{
             getNewAge(item.patient.birthday)
               ? getNewAge(item.patient.birthday)
@@ -408,8 +408,9 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 1px;padding:0 10px;}.infoTitle p{width: 200px;}.otherInfo{display: flex;margin-top:10px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle p{width: 200px;}}";
-      printJS({
+        // "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitles{display: flex;margin-top:10px;line-height: 1px;padding:0 10px;}.infoTitles p{width: 200px;}.otherInfo{display: flex;margin-top:10px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle p{width: 200px;}}";
+        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitles{display: flex;margin-top:10px;line-height: 1px;padding:0 10px;border:none}.infoTitles div{width: 200px;}.otherInfo{display: flex;margin-top:10px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle p{width: 200px;}}";
+        printJS({
         printable: "prescription-print",
         type: "html",
         style: style,
@@ -737,13 +738,15 @@ export default {
   font-weight: bold;
   margin-bottom: 10px;
 }
-.infoTitle {
+.infoTitles {
   display: flex;
   margin-top: 10px;
   line-height: 24px;
+  border: none;
 }
-.infoTitle div {
+.infoTitles div {
   width: 200px;
+  border: none;
 }
 .infoMain {
   display: flex;

src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue

@@ -21,7 +21,7 @@
           v-for="item in item_columns"
           :key="item.id"
           :label="item.item_name"
-          :value="item.id"
+          :value="item.item_id"
         ></el-option>
       </el-select>
 
@@ -308,14 +308,14 @@
           }
         }
         this.item_columns = item_inspection_reference
-        
-        var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].id)
+
+        var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].item_id)
         console.log("projectInfo",projectInfo)
         this.query.project_id = projectInfo.project_id
-        this.query.item_id = projectInfo.id
+        this.query.item_id = projectInfo.item_id
         this.item_name = projectInfo.item_name
         this.query.range_type = projectInfo.range_type
-        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
 
       }, changeItem(val) {
         this.query.page = 1
@@ -324,7 +324,7 @@
         console.log(projectInfo)
         this.item_name = projectInfo.item_name
 
-        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
 
       }, changeRangeValue(val) {
         this.query.range_value = val
@@ -362,11 +362,11 @@
               this.item_columns = item
               this.item_name = item[0].item_name
 
-              var projectInfo = this.getPojectInfo(this.project_columns[0].project_id, this.item_columns[0].id)
+              var projectInfo = this.getPojectInfo(this.project_columns[0].project_id, this.item_columns[0].item_id)
               this.query.project_id = projectInfo.project_id
-              this.query.item_id = projectInfo.id
+              this.query.item_id = projectInfo.item_id
               this.query.range_type = projectInfo.range_type
-              this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+              this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
             } else {
               this.$message.error(resp.msg)
 
@@ -379,7 +379,7 @@
       },
       getPojectInfo(project_id, item_id) {
         for (let i = 0; i < this.all_inspection_reference.length; i++) {
-          if (this.all_inspection_reference[i].project_id == project_id && this.all_inspection_reference[i].id == item_id) {
+          if (this.all_inspection_reference[i].project_id == project_id && this.all_inspection_reference[i].item_id == item_id) {
             return this.all_inspection_reference[i]
           }
         }

src/xt_pages/sign/Contextowner.vue

@@ -11,7 +11,7 @@
             >
         </div>
         <!-- 全屏状态 -->
-        <div id="fullscreenbroad" v-show="dialogTableVisible">
+        <!-- <div id="fullscreenbroad" v-show="dialogTableVisible">
             <el-row class="fullRow">
                 <el-button
                 @click="openSetting"
@@ -61,7 +61,7 @@
                 
              </div>
         
-        </div>
+        </div> -->
         <div class="app-container">
             <div class="page_lineUp">
                 <div class="lineUpTitle">
@@ -205,13 +205,25 @@ export default {
             }
             else{
                 console.log('执行22223333')
-                this.page = 1
+                // this.page = 4
+                const counts = this.deviceNumberList.length;
+                console.log('sdfasdfdas',Math.ceil(counts / 6));
+                
+                if(this.page <= Math.ceil(counts / 6)){
+                  console.log('执行444444444',this.page)
+                  this.page ++
+                }else{
+                  console.log('执行55555555',this.page)
+                  this.page = 1
+                }
+                // this.page++
                 this.getlist()
                 setTimeout(() => {
                     // this.websocketMess();
                     this.lineUpList
                 }, 1000);
                 
+                
             }
             console.log('切换时间',this.queueConfig)
         }, 1000 * parseInt(this.queueConfig.qhsj));
@@ -261,6 +273,7 @@ export default {
                             this.waitDoctorList = res.data.waitDoctorList
                             this.upPatientList = res.data.upPatientList
                             this.count = res.data.patientQueueList.count
+                           
                             // this.lineUpList.map(item => {
                             //     item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
                             //     // item.start_time = moment(item.start_time * 1000).format('HH:mm')
@@ -268,6 +281,7 @@ export default {
                         }
                     }else if(res.channel == 'queue/queuelist'){
                         this.lineUpList = res.data.patientQueueList.data
+                        
                         this.count = res.data.patientQueueList.count
                         // this.lineUpList.map(item => {
                         //     item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
@@ -567,7 +581,7 @@ export default {
                this.patientList = patients
 
                this.deviceNumberList =  response.data.data.devicenumber
-
+              //  this.count = response.data.data.devicenumber 
 
              }
           })  
@@ -793,7 +807,7 @@ export default {
         padding:10px;
     }
     .lineUpMainLeft{
-        height: 60%;
+        height: 8%;
         border-radius: 15px;
         display: flex;
         flex-direction: column;
@@ -831,16 +845,15 @@ export default {
         .lineUpListOne{
             height:16%;
             padding: 0.5%;
-            // 
-            // display: flex;
-            // justify-content: space-between;
+            display: flex;
+            justify-content: space-between;
             align-items: center;
             color:#1C6895;
             >p{
-                
                 width:25%;
                 text-align: center;
                 display: inline-block;
+                padding: 5px 0px;
             }
         }
     }

src/xt_pages/user/evaluationtool/Fallassessment.vue

@@ -387,7 +387,7 @@
           title="内容详情"
           :visible.sync="dialogVisible"
           width="50%"
-          :before-close="handleClose"
+          
           class="status_change">
           <div>
               <Falloutbedprint></Falloutbedprint>
@@ -438,7 +438,8 @@
       methods: {
         add(){
           this.centerDialogVisible =true
-        }
+        },
+        
       }
     }
   </script>

src/xt_pages/user/evaluationtool/dailyLife.vue

@@ -402,6 +402,8 @@ export default {
         return{
             patientID:0,
             value:'',
+            input:'',
+            value1:'',
             options:[],
         }
     }

src/xt_pages/user/evaluationtool/pediatricFallAssessment.vue

@@ -205,7 +205,7 @@
                 title="内容详情"
                 :visible.sync="dialogVisible"
                 width="50%"
-                :before-close="handleClose"
+                
                 class="status_change">
                 <div>
                     <Falloutbedprint></Falloutbedprint>