Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

@@ -169,9 +169,12 @@
           <div style="flex: 1;">
             透析机
            <span class="under-line" style="display: inline-block;width: 50%">
-            {{ dialysisOrder &&dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0
+            {{
+              predialysis.machine_type ? predialysis.machine_type : ""
+           }}
+            <!-- {{ dialysisOrder &&dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0
                ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number
-            }}
+            }} -->
            </span>
           </div>
           <div style="flex: 1;">
@@ -191,8 +194,9 @@
           <div style="flex: 1;display: flex">
             透析液：
             <div style="">
-              <check-box text="碳酸" :checked="prescription_dialyzate1"></check-box>&nbsp;
-              <check-box text="醋酸" :checked="prescription_dialyzate2"></check-box>
+              碳酸
+              <!-- <check-box text="碳酸" :checked="prescription_dialyzate1"></check-box>&nbsp;
+              <check-box text="醋酸" :checked="prescription_dialyzate2"></check-box> -->
               <!-- <check-box :checked="patientInfo_gender_2"></check-box>&nbsp; -->
             </div>
               <!-- <div class="under_line" style="width: 100px; text-align: center;display: inline-block;" v-if="prescription.dialyzate.indexOf('碳酸')>-1">
@@ -244,7 +248,7 @@
           <tr>
             <td style="width: 60px;text-align: center;" rowspan="2" >时间</td>
             <td colspan="6" style="text-align: center;">透析参数</td>
-            <td colspan="4" style="text-align: center;">生命体征</td>
+            <td colspan="5" style="text-align: center;">生命体征</td>
             <td colspan="2" style="text-align: center;">治疗中病情变化</td>
           </tr>
           <tr>
@@ -268,7 +272,7 @@
               <p style="height: 20px; line-height: 20px">脱水量</p>
               <p style="height: 20px; line-height: 20px">ml</p>
             </th>
-            <th style="width: 120px; font-weight: normal">
+            <th style="width: 130px; font-weight: normal">
               <p style="height: 20px; line-height: 30px">透析液温度</p>
               <p style="height: 20px; line-height: 20px">℃</p>
             </th>
@@ -276,6 +280,10 @@
               <p style="height: 20px; line-height: 20px">HR</p>
               <p style="height: 20px; line-height: 20px">bpm</p>
             </th>
+            <th style="width: 60px; font-weight: normal">
+              <p style="height: 20px; line-height: 30px">T</p>
+              <p style="height: 20px; line-height: 20px">℃</p>
+            </th>
             <th style="width: 60px; font-weight: normal">
               <p style="height: 20px; line-height: 20px">R</p>
               <p style="height: 20px; line-height: 20px">bpm</p>
@@ -360,6 +368,11 @@
               </span>
             </td>
             <!-- R -->
+            <td>
+              <span v-if="getTime(monitor.operate_time) != ''">
+                {{ monitor.temperature ? monitor.temperature : "/" }}
+              </span>
+            </td>
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
                 {{ monitor.breathing_rate ? monitor.breathing_rate : "/" }}

src/xt_pages/medicalScheduling/index.vue

@@ -42,8 +42,8 @@
             </div>
             <div class="schedulingTable" style="display:flex;justify-content: space-between;">
                 <div style="width: 70%">
-                    <el-table :data="tableData" border
-                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
+                    <el-table :data="tableData" border 
+                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" 
                     :row-style="{ color: '#303133' }"  @cell-click="clickThis" :cell-style="tableCellStyle"
                     @cell-mouse-enter="hoverMouse" @cell-mouse-leave="leavemouse">
                     <!-- @cell-mouse-enter="hoverMouse" @cell-mouse-leave="leavemouse" -->
@@ -56,14 +56,11 @@
                             <template slot-scope="scope">
                                 <div v-if="name==scope.row.user_name&&column_lie =='周一' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true" >
-                                    <el-button type="danger" size="mini" icon="el-icon-close"
-                                      circle @click.stop=""
+                                    <el-button type="danger" size="mini" icon="el-icon-close" 
+                                      circle @click.stop="toClick(scope.row,scope.$index)"   
                                     ></el-button>
                                   </div>
                                 </div>
-                                <div class="del_table_btn" v-show="scope.row.user_name=='合计'? false : true">
-                                  <el-button type="danger" size="mini" icon="el-icon-close" circle @click.stop="toClick(scope.row,scope.$index)"></el-button>
-                                </div>
                                 <div @click="hangdleClick(scope.row,scope.$index,0)">
                                     <el-dropdown trigger="click" @command="changeSchedule" >
                                         <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,1) == 2' style="color:red">
@@ -83,12 +80,12 @@
                              <template slot-scope="scope">
                               <div v-if="name==scope.row.user_name&&column_lie =='周二' ? true:false">
                                 <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
-                                  <el-button type="danger" size="mini" icon="el-icon-close"
-                                    circle @click.stop=""
+                                  <el-button type="danger" size="mini" icon="el-icon-close" 
+                                    circle @click.stop=""   
                                   ></el-button>
                                 </div>
                               </div>
-
+                                
                                 <div @click="hangdleClick(scope.row,scope.$index,1)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,2) == 2' style="color:red">
@@ -108,8 +105,8 @@
                              <template slot-scope="scope">
                                 <div v-if="name==scope.row.user_name&&column_lie =='周三' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
-                                    <el-button type="danger" size="mini" icon="el-icon-close"
-                                      circle @click.stop=""
+                                    <el-button type="danger" size="mini" icon="el-icon-close" 
+                                      circle @click.stop=""   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -132,8 +129,8 @@
                              <template slot-scope="scope">
                                 <div v-if="name==scope.row.user_name&&column_lie =='周四' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
-                                    <el-button type="danger" size="mini" icon="el-icon-close"
-                                      circle @click.stop=""
+                                    <el-button type="danger" size="mini" icon="el-icon-close" 
+                                      circle @click.stop=""   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -156,8 +153,8 @@
                              <template slot-scope="scope">
                                 <div v-if="name==scope.row.user_name&&column_lie =='周五' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
-                                    <el-button type="danger" size="mini" icon="el-icon-close"
-                                      circle @click.stop=""
+                                    <el-button type="danger" size="mini" icon="el-icon-close" 
+                                      circle @click.stop=""   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -180,8 +177,8 @@
                              <template slot-scope="scope">
                                 <div v-if="name==scope.row.user_name&&column_lie =='周六' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
-                                    <el-button type="danger" size="mini" icon="el-icon-close"
-                                      circle @click.stop=""
+                                    <el-button type="danger" size="mini" icon="el-icon-close" 
+                                      circle @click.stop=""   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -204,8 +201,8 @@
                              <template slot-scope="scope">
                                 <div v-if="name==scope.row.user_name&&column_lie =='周日' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
-                                    <el-button type="danger" size="mini" icon="el-icon-close"
-                                      circle @click.stop=""
+                                    <el-button type="danger" size="mini" icon="el-icon-close" 
+                                      circle @click.stop=""   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -399,7 +396,6 @@
     </div>
 </template>
 
-
 <script>
 const moment = require('moment')
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -2078,6 +2074,7 @@ export default {
          })
        },
 
+
        hoverMouse(row,column, cell, event){
         this.name=row.user_name
         this.column_lie= column.label.split('\n')[0]

src/xt_pages/stock/stockNewQuery.vue

@@ -10,9 +10,9 @@
               <GoodNewQuery></GoodNewQuery>
             </el-tab-pane>
           
-            <el-tab-pane label="进销存查询" name="second">
+            <!-- <el-tab-pane label="进销存查询" name="second">
                <PurchaseStockQuery ref="mychild"></PurchaseStockQuery>
-            </el-tab-pane>
+            </el-tab-pane> -->
 
              <el-tab-pane label="进销存查询" name="five">
                <PurchaseNewStockQuery ref="mychildfive"></PurchaseNewStockQuery>