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

package.json

@@ -59,11 +59,12 @@
     "jszip": "3.1.5",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
-    "node-sass": "4.14.1",
+    "node-sass": "^5.0.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "print-js": "^1.0.50",
     "qrcodejs2": "0.0.2",
+    "sass-loader": "^7.0.0",
     "screenfull": "4.2.0",
     "serve-static": "1.13.2",
     "showdown": "1.8.5",
@@ -110,7 +111,6 @@
     "html-webpack-plugin": "2.30.1",
     "lint-staged": "7.2.0",
     "node-notifier": "5.1.2",
-    "node-sass": "^4.14.1",
     "optimize-css-assets-webpack-plugin": "3.2.0",
     "ora": "1.3.0",
     "portfinder": "1.0.13",
@@ -120,7 +120,6 @@
     "qiniu-webpack-plugin": "^0.4.2",
     "quill-image-extend-module": "^1.1.2",
     "rimraf": "2.6.2",
-    "sass-loader": "^6.0.7",
     "sass-resources-loader": "^1.3.4",
     "script-loader": "^0.7.2",
     "semver": "5.4.1",

src/router/modules/dialysis.js

@@ -413,6 +413,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/sixtyeight',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_sixtyeight',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/sixtyFive',
       component: () =>

src/router/modules/patient.js

@@ -74,7 +74,7 @@ export default {
       noCache: true
     }
   },
-  
+
 
   {
     path: '/patients/patient/:mid/vascularAccessDetail/:pid',
@@ -325,7 +325,7 @@ export default {
       noCache: true
     }
   },
-  
+
   // {//评估工具/跌倒评估
   //   path: '/patients/patient/:id/Fallassessment',
   //   component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
@@ -480,16 +480,16 @@ export default {
   //     noCache: true
   //   }
   // },
-  // {//血管通路图
-  //   path: '/patients/patient/:id/angiogram',
-  //   component: () => import('@/xt_pages/user/angiogram'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'angiogram',
-  //   meta: {
-  //     title: 'angiogram',
-  //     noCache: true
-  //   }
-  // },
+  {//血管通路图
+    path: '/patients/patient/:id/angiogram',
+    component: () => import('@/xt_pages/user/angiogram'),
+    hidden: true,
+    is_menu: false,
+    name: 'angiogram',
+    meta: {
+      title: 'angiogram',
+      noCache: true
+    }
+  },
   ]
 }

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -419,6 +419,15 @@
           type="primary"
           >批量打印</el-button>
       </template>
+      <template v-if="this.template_id == 68">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -2170,6 +2179,9 @@ export default {
       else if (this.template_id == 67) {
         this.$router.push({ path: "/dialysis/print/batch/sixtyseven" });
       }
+      else if (this.template_id == 68) {
+        this.$router.push({ path: "/dialysis/print/batch/sixtyeight" });
+      }
     },
     batchPrintActionOne: function() {
       if (this.selecting_schs.length === 0) {

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -111,7 +111,8 @@
           org_template_info.template_id == 50 ||
           org_template_info.template_id == 52 ||
           org_template_info.template_id == 53  ||
-          org_template_info.template_id == 64)
+          org_template_info.template_id == 64 ||
+          org_template_info.template_id == 68)
         "
       >
       <div>
@@ -1293,6 +1294,11 @@
             v-if="org_template_info.template_id == 67">
 
           </DialysisPrintOrdersixtySeven>
+          <DialysisPrintOrderSixtyeight
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 68"
+          >
+          </DialysisPrintOrderSixtyeight>
         </div>
       </el-container>
     </div>
@@ -1378,6 +1384,7 @@ import DialysisPrintOrderSixtyfour from './template/DialysisPrintOrderSixtyfour'
 import DialysisPrintOrderSixtyFive from "./template/DialysisPrintOrderSixtyFive.vue"
 import DialysisPrintOrderSixtysix from './template/DialysisPrintOrderSixtysix.vue'
 import DialysisPrintOrdersixtySeven from './template/DialysisPrintOrdersixtySeven.vue'
+import DialysisPrintOrderSixtyeight from './template/DialysisPrintOrderSixtyeight.vue'
 export default {
   name: "dialysisPrintOrder",
   components: {
@@ -1448,6 +1455,7 @@ export default {
     DialysisPrintOrderSixtyfour,
     DialysisPrintOrderSixtyFive,
     DialysisPrintOrderSixtysix,
+    DialysisPrintOrderSixtyeight,
     LabelBox,
     BreadCrumb,
     // DialysisPrintOrderSixtyFive
@@ -1695,7 +1703,8 @@ export default {
         this.org_template_info.template_id == 58 ||
         this.org_template_info.template_id == 60 ||
         this.org_template_info.template_id == 61 ||
-        this.org_template_info.template_id == 66
+        this.org_template_info.template_id == 66 ||
+        this.org_template_info.template_id == 68
 
       ) {
         printJS({

src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue

@@ -5,6 +5,7 @@
       <div :style="{position: 'absolute',top:(18 + (index * 420))  + 'px',left:117+ 'px',}">{{ list.order_number }}</div>
       <div >
           <div :style="{position: 'absolute',top:(38 + (index * 420))  + 'px',left:92+ 'px',}">{{ paramsObj.name }}</div>
+          <div :style="{position: 'absolute',top:(38 + (index * 420))  + 'px',left:492+ 'px',}">晁海燕 123456789011234</div>
       </div>
       <div :style="{position: 'absolute',top:(95 + (index * 420))  + 'px',left:76+ 'px',}">
           <div v-if="list.westernMedicineCostTotal">西药 {{ list.westernMedicineCostTotal }}</div>

src/xt_pages/workforce/Patientshift.vue

@@ -43,6 +43,9 @@
               inactive-text="OFF">
             </el-switch>
           </div>
+          <div style="display: inline-block;position: relative;right: -30%;">
+            <el-button type="primary"  @click="quan_ping">全屏</el-button>
+          </div>
         </div>
         <div class="table_panel"  v-for="(item, index) in tableData" :key="index">
           <table class="table">
@@ -86,6 +89,7 @@
           </table>
           
         </div>
+       
         <!-- 双击弹窗 -->
         <el-dialog
           title="提示"
@@ -218,6 +222,93 @@
         </el-dialog>
       </div>
     </div>
+    <!-- 全屏 -->
+    <div id="patient_quan" style="width: 100%;background: #fff;" v-if="quanping==true">
+       <div style="margin: 20px 0;">
+          <div class="content_top">日期：
+            <el-date-picker
+              @change="date_picker"
+              v-model="date"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </div>
+          <div class="content_top">排班班次：
+            <el-select v-model="classes" placeholder="请选择" @change="banci_select">
+              <el-option
+                v-for="item in schedulArr"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+          <div class="content_top">病区选择：
+            <el-select v-model="bingqu" placeholder="请选择" @change="bingqu_select">
+              <el-option
+                v-for="item in partitionArr"
+                :key="item.value"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+          <div class="content_top">隐藏备注：
+            <el-switch
+              v-model="hidder"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              active-text="ON"
+              inactive-text="OFF">
+            </el-switch>
+          </div>
+          <div style="display: inline-block;position: relative;right: -30%;">
+            <el-button type="primary"  @click="quan_ping">取消全屏</el-button>
+          </div>
+        </div>
+        <div class="table_panel"  v-for="(item, index) in tableData" :key="index">
+          <table class="table">
+            <thead>
+              <tr>
+                <td :width="td_1_width">分区</td>
+                <td :width="td_3_width">病人姓名</td>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(ite,index) in item.zones" :key="index">
+                <td style="text-align: center;">{{ getZoneName(ite.partition_id) }}</td>
+                <td>
+                  <div v-for="(it,index) in numberlist" style="display: inline-block;position: relative;" >
+                    <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais" :style="{'height':!hidder ? '110px': '30px','line-height':hidder ? '30px':''}" @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" @dragstart="curInfoDragStart($event,item)" draggable="true"   @dragover="allowDrop"> 
+                      <div class="huanzhekuai">
+                        <div v-for="(item2) in item.list"   draggable="true" >
+                          <template >
+                            <div v-if="it.id==item2.bed_id" style="display: inline-block;">
+                              <div>
+                                <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
+                                <span v-if="!hidder" >
+                                  <span style="font-size: 14px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
+                                  <span style="font-size: 14px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
+                                  <span style="font-size: 13px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
+                                </span> 
+                              </div>
+                            </div>
+                          </template> 
+                        </div>
+                      </div> 
+                                        
+                    </div>
+                    <div v-if="ite.partition_id==it.zone_id" style="display: inline-block;width: 125px;text-align: center;">
+                      {{ it.number }}
+                    </div>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          
+        </div>
+    </div>
   </div>
 </template>
 
@@ -244,6 +335,7 @@ export default {
       tipDialogVisibleTwo:false,
       tipDialogVisibleThree:false,
       hidder: false,
+      quanping:false,
       td_1_width: '8%',
       td_3_width: '90%',
       date:'',
@@ -651,7 +743,15 @@ export default {
     // console.log('8888',this.huanzhe.order.DeviceNumber.zone.name);
   },
   methods:{
-   
+    quan_ping(){
+      if(this.quanping==false){
+        // console.log('ttttt');
+        return this.quanping=true
+      }else{
+        // console.log('fffff');
+        return this.quanping=false
+      }
+    },
     drop(e,val,value){
       this.allowDrop(e)
       var bedid = ''
@@ -1396,4 +1496,67 @@ export default {
   }
 }
 </style>
+<style lang="scss" scoped>
+#patient_quan{
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  overflow: auto;
+  margin: 0;
+  background: #fff;
+  padding: 20px;
+  height: 100%;
+  z-index: 2000;
+  .content_top{
+    display: inline-block;
+  }
+  .table_panel {
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+
+      thead {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 20px;
+            padding: 15px 5px;
+          }
+        }
+      }
+      tbody {
+        tr {
+          td {
+            border: 1px solid;
+            // text-align: center;
+            font-size: 18px;
+            padding: 5px 5px;
+
+           .huanzhekuai{
+            width: 125px;
+            display: inline-block;
+            text-align: center;
+            // margin:0 10px;
+           }
+           .huanzhekuais{
+            width: 125px;
+            // display: inline-block;
+            text-align: center;
+            margin:0 10px;
+            // line-height: 110px;
+            background: #30b8e394;
+           }
+           
+          }
+        }
+      }
+    }
+  }
+}
+</style>