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

src/lang/en.js

@@ -128,6 +128,7 @@ export default {
     dialysis_batch_print: 'Batch Print Order',
     user_detail: 'user_detail',
     objectRegistration:'objectRegistration',
+    Dialysisanalysis:'Dialysisanalysis',
   },
   navbar: {
     logOut: 'Log Out',

src/router/modules/Dialysisanalysis.js

@@ -9,7 +9,8 @@ export default {
   name: 'Dialysisanalysis',
   alwaysShow: true,
   meta: {
-    title: '专业质控',
+    // title: '专业质控',
+    title:'Dialysisanalysis',
     icon: 'statistics'
   },
   children: [
@@ -25,7 +26,7 @@ export default {
     {//新专业质控
       path: '/Dialysisanalysis/qualitycontrol/new_otherIndicators',
       component: () => import('@/xt_pages/Dialysisanalysis/new_otherIndicators/index'),
-      name: 'otherIndicators',
+      name: 'new_otherIndicators',
       meta: {
         title: '透析分析',
         noCache: true

src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue

@@ -597,14 +597,13 @@
                   style="width: 100px; text-align: center"
                 > 
                   <span style="display: inline-block;height: 30px;"></span>
-                  <span v-if="setAdminUserES(record.prescription.creater) == ''">
-                    {{ getAdminUser(record.prescription.creater)}}
+                  <span v-if="setAdminUserES(record.prescription,'creater') == ''">
+                    {{ getAdminUser(record.prescription,'creater')}}
                   </span>
                   <span style="display: inline-block;" v-else>
-                    <img style="height:30px;" :src="setAdminUserES(record.prescription.creater)" alt srcset />
+                    <img style="height:30px;" :src="setAdminUserES(record.prescription,'creater')" alt srcset />
                   </span>
                 </div>
-
               </div>
             </div>
             <!-- 特殊医嘱 -->
@@ -937,7 +936,7 @@
                   alt=""
                   srcset=""
                   v-else
-                  style="height: 40px"
+                  style="height: 30px"
                 />
                 </div>
               </div>
@@ -1182,7 +1181,7 @@
           </div>
           <!-- 透析小结 -->
           <div  style="width: 99%;border: 1px solid black;white-space: normal;padding:5px ;">
-            <div style="width: 100%;">
+            <div style="width: 100%;margin-bottom: 6px;">
               <div style="margin-bottom: 10px;">
                 宣教知识：
                 <span style="white-space: normal;border-bottom: 1px solid black;">
@@ -1405,15 +1404,19 @@ export default {
             for(let j=0;j<this.records[i].monitor_records.length;j++){
               this.records[i].monitor_records[j].end = ""
               if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
-              this.records[i].monitor_records[j].end = "【结束透析】";
-              tempmonitorflag = false;
-            }
-            // if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
-            //   this.records[i].monitor_records[j].end = "【结束透析】";
-            //  }
-            //  if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
-            //    this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
-            //  }
+                console.log('1111111',this.records[i].dialysis_order.end_time);
+                
+                this.records[i].monitor_records[j].end = "【结束透析】";
+                tempmonitorflag = false;
+              }
+              if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
+                console.log('222222');
+                this.records[i].monitor_records[j].end = "【结束透析】";
+              }
+              // if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
+              //   console.log('33333',this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end);
+              //   this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
+              // }
             }
           }
           for (const recordIndex in this.records) {

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -633,7 +633,8 @@
               <div class="under_line"
                 style="width: 90px; text-align: center"
               >
-                <span style="height: 30px; display: inline-block"
+              <span style="height: 30px;display: inline-block;"></span>
+                <span style="display: inline-block"
                   v-if="
                     setAdminUserES(
                       dialysisOrder == null
@@ -670,7 +671,8 @@
               <div class="under_line"
                 style="width: 90px; text-align: center"
               >
-                <span style="height: 30px; display: inline-block"
+                <span style="height: 30px;display: inline-block;"></span>
+                <span style="display: inline-block"
                   v-if="
                     setAdminUserES(
                       dialysisOrder == null
@@ -707,7 +709,8 @@
               <div class="under_line"
                 style="width: 90px; text-align: center"
               >
-                <span style="height: 30px; display: inline-block" v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
+                <span style="height: 30px;display: inline-block;"></span>
+                <span style=" display: inline-block" v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                   {{ getAdminUser(check == null ? 0 : check.modifier) ? getAdminUser(check == null ? 0 : check.modifier) : "" }}
                 </span>
                 <img :src="setAdminUserES(check == null ? 0 : check.modifier)" alt="" srcset="" style="height:30px" v-else />

src/xt_pages/outpatientTool/components/pdetail.vue

@@ -71,7 +71,7 @@
               highlight-current-row
               show-summary>
 
-      <el-table-column align="center" prop="name" label="患者名字">
+      <el-table-column align="center" prop="name" label="患者名字" fixed>
         <template slot-scope="scope">{{ scope.row.name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="处方日期">

src/xt_pages/outpatientTool/components/settle.vue

@@ -58,7 +58,7 @@
                 :summary-method="getTotal"
                 highlight-current-row>
 
-          <el-table-column align="center" prop="name" label="患者名字">
+          <el-table-column align="center" prop="name" label="患者名字" fixed>
               <template slot-scope="scope">{{ scope.row.other_name }}</template>
           </el-table-column>
         <el-table-column align="center" prop="item_name" label="身份证">