9月4日杨青

src/router/modules/workforce.js

@@ -56,6 +56,15 @@ export default {
       noCache: true
     }
   },
+  {//患者调班
+    path: '/workforce/Patientshift',
+    component: () => import('@/xt_pages/workforce/Patientshift'),
+    name: '患者调班',
+    meta: {
+      title: '患者调班',
+      noCache: true
+    }
+  },
   {
     path: '/workforce/schedule/printone',
     component: () => import('@/xt_pages/workforce/printOne'),

src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue

@@ -8,9 +8,9 @@
           <td colspan="4">发票号：</td>
         </tr>
         <tr style="border-bottom: 1px solid black;">
-          <td colspan="4">单据编码：{{info.number}}</td>
-          <td colspan="2">就诊时间：{{info.setl_time}}</td>
-          <td colspan="2">金额单位：{{info.medfee_sumamt}}元</td>
+          <td colspan="2">单据编码：{{info.number}}</td>
+          <td colspan="4">就诊时间：{{info.setl_time}}</td>
+          <td colspan="3">金额单位：{{info.medfee_sumamt}}元</td>
         </tr>
         <tr>
           <td colspan="4">姓名：{{info.patient.name}}</td>

src/xt_pages/user/Sitemap.vue

@@ -18,16 +18,9 @@
         </div>
       </div>
       <div style="margin-top:6px;display:flex;flex-wrap: wrap;position:relative;min-height:480px;">
-        <div style="width:530px;border:1px solid #ddd;padding: 5px;" id="print_mark_img" ref="imageWrapper">
+        <div style="width:47%;border:1px solid #ddd;padding: 5px;" id="print_mark_img" ref="imageWrapper">
           <div id="point_mark_img_wrap1" class="print_main_content" style="width: 520px;padding: 0;border: 0;" >
-            <!-- <template>
-              <div>
-                <quill-editor v-model="content" ref="myQuillEditor" :options="editorOption">
-                  
-                </quill-editor>
-              </div>
-            </template> -->
-            <!-- 背景大图  v-if="fileList.length==0"-->
+            
             <img v-if="fileList.length==0" id="ossPointMarkImg" src="@/assets/evaluate/xgtl_default.png" alt="" srcset="">
             <img v-if="fileList.length>0" id="ossPointMarkImg" :src="fileList[0].img_url" alt="" srcset="">
 
@@ -48,9 +41,10 @@
             </div>
             <!-- 穿刺文字 active  @mousedown="startDrag"   @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)"-->
             <div v-for="(item,index) in text_arr" :key="index" >
-              <div ref="text_cc" class="add-mark-text-wrap active" :style="{width:(item.width + 10)+'px',left:text_left+'%',top:(text_top+(index*4))+'%','font-size':14+'px'}" 
+              <div ref="text_cc" class="add-mark-text-wrap active" 
+              :style="{width:(item.width + 10)+'px',left:text_left+'%',top:(text_top+(index*4))+'%','font-size':14+'px', position: 'absolute'}" 
               @mousedown.self="A_mousedow($event)" @mouseup.self="A_moouseup($event)">
-                <!-- <div  style="width:82px;left:62.17%;top:39.00%;display: inline-block;" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)"> -->
+                <!-- <div  style="width:82px;left:62.17%;top:39.00%;display: inline-block;" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)">position: 'absolute',top: 36+'%',left: 48+'%' -->
                   <!-- {{ item }} -->
                   <el-input v-text:value="item.text" size="mini" :style="{width:item.width+'px', border: 1+'px solid transparent', cursor: 'default'}"></el-input>
                   <!-- <input id="inpu" type="text" :value="item" data-width="82" style="width: 82px; border: 1px solid transparent; cursor: default;" class="mark-text-ipt"> -->
@@ -62,7 +56,7 @@
             <!-- 穿刺方向 -->
             <div v-if="fangxiangA_num==2" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)" 
               title="长按右键调整线条角度" id="jinzhen_fangxiang_A" class="mark-target mark-target-a mark-target-adccz" 
-              :style="{left: fangxiangA_left+'px', top: fangxiangA_top+'px', width: 14+'px', height: 14+'px', background: rgb(231, 53, 53), 'border-radius': 50+'%', position: 'absolute', cursor: 'move',}">
+              :style="{left: fangxiangA_left+'px', top: fangxiangA_top+'px', width: 14+'px', height: 14+'px', background: 'rgb(231, 53, 53)', 'border-radius': 50+'%', position: 'absolute', cursor: 'move',}">
               <span class="mark-line mark-line-ccza" data-rotate="160" style="width:50px;transform:rotate(160deg);">
               <b class="xtgl-ccz-arrow xtgl-ccz-arrow-a" 
                 style="position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);">
@@ -70,27 +64,27 @@
 
             <div v-if="fangxiangV_num==2" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)" 
             title="长按右键调整线条角度" id="jinzhen_fangxiang_V" class="mark-target mark-target-v mark-target-vdccz" 
-            :style="{left: fangxiangV_left+'px', top: fangxiangV_top+'px', width: 14+'px', height: 14+'px', background: rgb(231, 53, 53), 'border-radius': 50+'%', position: 'absolute', cursor: 'move',}">
+            :style="{left: fangxiangV_left+'px', top: fangxiangV_top+'px', width: 14+'px', height: 14+'px', background: 'rgb(53, 162, 231)', 'border-radius': 50+'%', position: 'absolute', cursor: 'move',}">
             <span class="mark-line mark-line-cczv" data-rotate="20" style="width:50px;transform:rotate(20deg);">
               <b class="xtgl-ccz-arrow xtgl-ccz-arrow-v"
               style="position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);">
               </b></span></div>
             <!-- 辅助工具 :style="{transform: rotate(30deg)}"  ,'background-img': 'url(' + require('../../assets/evaluate/tool-a.png') + ')'  -->
             <div v-if="fuzhuA_num==2"  
-             class="jinzhen-jiaodu-target jinzhen-jiaodu-target-A" id="jinzhen-jiaodu-target-A">
+             class="jinzhen-jiaodu-target jinzhen-jiaodu-target-A" id="jinzhen-jiaodu-target-A" style="position: absolute;top: 56px;left: 360px;">
               <div class="frame-box  actives" :style="{'transform': `scale(${scalea_num})`,top:fuzhuA_top+'px',left:fuzhuA_left+'px'}" @mousedown.self="A_mousedow($event)" @mouseup.self="A_moouseup($event)">
                 <div class="frame-image" data-rotate="0" :style="{transform: `rotate(${xuanzhuan_a}deg)`}">
-                  <!-- <img src="../../assets/evaluate/tool-a.png" alt="" srcset="" > -->
+                  <img src="../../assets/evaluate/tool-a.png" alt="" srcset="" style="margin: 6px 0 0 6px;">
                 </div>
                 <div class="drag-elem bottom right" @click="imga_click"></div>
                 <div class="frame-image-toolbar-btn frame-image-toolbar-btn-reset" data-tooltip="" title="调整方向" @click="fuzhuaclick"></div>
               </div>
             </div> 
-            <div v-if="fuzhuV_num==2" 
+            <div v-if="fuzhuV_num==2" style="position: absolute;top: 56px;left: 56px;"
              class="jinzhen-jiaodu-target jinzhen-jiaodu-target-V" id="jinzhen-jiaodu-target-V">
               <div class="frame-box actives" :style="{'transform': `scale(${scalev_num})`,top:fuzhuV_top+'px',left:fuzhuV_left+'px'}" @mousedown.self="A_mousedow($event)" @mouseup.self="A_moouseup($event)">
                 <div id="v_img" class="frame-image" data-rotate="0" :style="{'transform': `rotate(${xuanzhuan_v}deg)`}">
-                  <!-- <img id="image" src="../../assets/evaluate/tool-a.png" alt="" srcset="" > -->
+                  <img id="image" src="../../assets/evaluate/tool-a.png" alt="" srcset="" style="margin: 6px 0 0 6px;">
                 </div>
                 <div class="drag-elem bottom right" @click="imgv_click"></div>
                 <div class="frame-image-toolbar-btn frame-image-toolbar-btn-reset" data-tooltip="" title="调整方向" @click="fuzhu_click"></div>
@@ -98,8 +92,8 @@
             </div> 
           </div>
         </div>
-        <div style="width:50px;"></div>
-        <div style="width:570px;">
+        <div style="width:25px;"></div>
+        <div style="width:49%;">
           <div>
             <p class="point-mark-title">A端：</p>
             <div :class="append == false ? 'point-mark-items' : 'mark-a-items'"> <!-- v-for="(item,index) in 12" :key="index" -->
@@ -241,14 +235,6 @@
 import print from "print-js";
 import { getFileExtension} from '@/utils/tools'
 import { getToken } from '@/api/qiniu'
-// import html2canvas from "html2canvas"
-// import Quill from 'quill';
-// import {quillEditor, Quill} from 'vue-quill-editor'
-// import { container, ImageExtend } from "quill-image-extend-module";
-// Quill.register("modules/ImageExtend", ImageExtend);
-// import 'quill/dist/quill.core.css'
-// import 'quill/dist/quill.snow.css'
-// import 'quill/dist/quill.bubble.css'
 export default{
   components:{
     // quillEditor
@@ -259,6 +245,7 @@ export default{
       centerDialogVisible: false,
       imgDialogVisible:false,
       shiyituDialogVisible:false,
+      hidd:false,
       imgUrl:[],
       a_num:1,//控制a端是否显示和高亮
       v_num:1,//控制v端是否显示和高亮
@@ -479,7 +466,10 @@ export default{
       }
     },
     printtup(){
-      const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;} .mark-target-a{background: #E73535;top: 40px; left: 40px;} .mark-line{background: #E73535;} .mark-target-v{background: rgb(53,162,231);.mark-line{background: #35A2E7;}}  .mark-target-a,.mark-target-v {position: absolute;z-index: 1001;width: 26px;border-radius: 13px;height: 26px;text-align: center;line-height: 26px;font-size: 18px;cursor: move;color: rgb(255,255,255);.mark-line {transform: rotate(160deg);transform-origin: left bottom;}.mark-line {display: inline-block;position: absolute;left: 50%;top: 50%;width: 86px;height: 1px;cursor: default;z-index: -1;} div.add-mark-text-wrap {position: absolute;top: 36%;left: 48%;border-radius: 4px;width: 60px;height: 24px;line-height: 24px;z-index: 1005;display: inline-block;} .remove-mark-text{overflow: hidden;} b.xtgl-ccz-arrow-a {border-left-color: #E73535;border-top-color: #E73535;} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;} b.xtgl-ccz-arrow {position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;}div.frame-image {position: absolute;overflow: hidden;top: 0px;left: 0px;width: 100%;height: 100%;background-image: url('+'../../assets/evaluate/tool-a.png'+');background-position: center center;background-size: 100%; background-repeat: no-repeat;}}}'
+      if(this.hidd==false){
+        this.hidd =true
+      }
+      const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;} .mark-target-a{background: #E73535;top: 40px; left: 40px;} .mark-line{background: #E73535;} .mark-target-v{background: rgb(53,162,231);.mark-line{background: #35A2E7;}}  .mark-target-a,.mark-target-v {position: absolute;z-index: 1001;width: 26px;border-radius: 13px;height: 26px;text-align: center;line-height: 26px;font-size: 18px;cursor: move;color: rgb(255,255,255);.mark-line {transform: rotate(160deg);transform-origin: left bottom;}.mark-line {display: inline-block;position: absolute;left: 50%;top: 50%;width: 86px;height: 1px;cursor: default;z-index: -1;} div.add-mark-text-wrap {border-radius: 4px;width: 60px;height: 24px;line-height: 24px;z-index: 1005;display: inline-block;} .remove-mark-text{color: transparent;opacity: 0;} b.xtgl-ccz-arrow-a {border-left-color: #E73535;border-top-color: #E73535;} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;} b.xtgl-ccz-arrow {position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;}div.frame-image {position: absolute;overflow: hidden;top: 0px;left: 0px;width: 100%;height: 100%;background-image: url('+'../../assets/evaluate/tool-a.png'+')!important;background-position: center center;background-size: 100%; background-repeat: no-repeat;}}}'
       // const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;}  b.xtgl-ccz-arrow-a {border-left-color: #E73535;border-top-color: #E73535;} 
       // b.xtgl-ccz-arrow {position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;} 
       // .mark-target-a{background: #E73535;top: 40px;left: 40px;} .mark-line{background: #E73535;}}}'
@@ -844,7 +834,7 @@ export default{
     left: 5px;
     width: 90%;
     height: 90%;
-    background-image: url('../../assets/evaluate/tool-a.png');
+    // background-image: url('../../assets/evaluate/tool-a.png');
     background-position: center center;
     background-size: 100%;
     background-repeat: no-repeat;
@@ -926,9 +916,9 @@ div.add-mark-text-wrap.active {
   box-shadow: 2px 3px 8px rgba(0,0,0,.2), -3px -2px 8px rgba(0,0,0,.2);
 }
 div.add-mark-text-wrap {
-  position: absolute;
-  top: 36%;
-  left: 48%;
+  // position: absolute;
+  // top: 36%;
+  // left: 48%;
   border-radius: 4px;
   width: 60px;
   height: 25px;

src/xt_pages/workforce/printOne.vue

@@ -489,6 +489,7 @@ export default {
       getSchedualPrintList(params).then((response) => {
         if (response.data.state == 1) {
           this.loading = false
+          console.log('111111',response.data.data);
           var list = response.data.data.list
           this.list = list
           var listOne = response.data.data.listOne