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

src/xt_pages/outpatientCharges/invoiceTemplate/printfifteen.vue

@@ -5,14 +5,14 @@
             <!-- <div>{{ list.id_card_no }}</div> -->
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div  style="position: absolute;top:100px;left:250px;">{{ list.department_name }}</div>
+            <div  style="position: absolute;top:80px;left:250px;">{{ list.department_name }}</div>
             <div></div>
             <div>
-                <span style="position: absolute;top:80px;left:80px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,10) }}</span>
+                <span style="position: absolute;top:60px;left:120px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,10) }}</span>
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:100px;left:80px;"> {{ paramsObj.name }}</div>
+            <div style="position: absolute;top:80px;left:80px;"> {{ paramsObj.name }}</div>
 
         </div>
 
@@ -39,7 +39,7 @@
         <div style="position: absolute;top:300px;left:300px">个人自费 {{ list.psn_cash_money }}</div> -->
         <div>
             <!-- <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div> -->
-            <div style="position: absolute;top:340px;left:120px">{{ paramsObj.chargeName }}</div>
+            <div style="position: absolute;top:320px;left:120px">{{ paramsObj.chargeName }}</div>
         </div>
     </div>
 </template>

src/xt_pages/workforce/components/editTableData.vue

@@ -40,7 +40,7 @@
             <!-- 拖拽dragstart -->
             <div
                 draggable="true"
-                class="item"
+                class="item_touz"
                 style="font-weight: bolder"
                 @dragstart="curInfoDragStart()"
             >
@@ -74,6 +74,9 @@
                 <span v-if="scope.row.is_infectious != 2" >
                   {{scope.row.name  }}
                 </span>
+                <!-- <span class="touxi_cishu"  @click="chishuclick(scope.row.name)">
+                  0/4
+                </span> -->
              </template>
             </el-table-column>
           </el-table>
@@ -1760,6 +1763,40 @@
         <el-button @click="tipDialogVisibleThree = false">取 消</el-button>
       </span>
     </el-dialog>
+    <!-- 显示透析日期的弹窗 -->
+    <el-dialog
+      :title="'患者信息（姓名：'+Dialysis_patient+'、透析号：'+20011120+'）'"
+      :visible.sync="cishu_dialogVisible"
+      width="50%"
+      :modal-append-to-body='false'
+      :close-on-click-modal="false">
+      <div>
+        <div style="line-height: 40px;">
+          透析频率：HD(每周2次)
+        </div>
+        <div style="line-height: 40px;">
+          已排详情
+        </div>
+        <div>
+          <el-calendar>
+            <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
+            <template
+              slot="dateCell"
+              slot-scope="{date, data}">
+              <P v-if="data.day.split('-').slice(1).join('-')=='11-27'"
+                style="background: red;color: white;text-align: center;">
+                HD
+              </P>
+              <p :class="data.isSelected ? 'is-selected' : ''" style="text-align: center;">
+                {{ data.day.split('-').slice(2).join('-') }} {{ data.isSelected ? '✔️' : ''}}<br/>
+                <span v-if="data.day.split('-').slice(1).join('-')=='11-27'">上午 门诊</span>
+              </p>
+              
+            </template>
+          </el-calendar>
+        </div>
+      </div>
+    </el-dialog>
 
   </div>
 </template>
@@ -1858,6 +1895,8 @@ export default {
       schedulingTableVisible:true,//全屏
       tipDialogVisibleTwo:false,
       tipDialogVisibleThree:false,
+      cishu_dialogVisible:false,//透析次数
+      Dialysis_patient:'',
       cur_date:"",
       dataloading:false,
       current_patient_data:[],
@@ -2181,6 +2220,12 @@ export default {
     },
   },
   methods: {
+    // 透析次数
+    chishuclick(row){
+      this.cishu_dialogVisible=true
+      console.log('ddddddd',row);
+      this.Dialysis_patient=row
+    },
 
     changeSch(row) {
       let params = {
@@ -5726,6 +5771,13 @@ textarea{
     background-color: #ecf5ff !important;
     color: #3a8ee6;
   }
+  .touxi_cishu{
+    display: inline-block;
+    border: 1px solid #409eff;
+    width: 30px;
+    text-align: center;
+    border-radius: 10px;
+  }
 }
 .el-table td .cell,.el-table th .cell {
     padding: 0 0px ;
@@ -5896,24 +5948,25 @@ textarea{
 .col + .col {
   margin-left: 10px;
 }
-.item {
-  /* width: 115px;
+.item_touz {
+  width: 115px;
   padding: 6px 5px;
   margin: 0px 5px ;
   border: solid 1px #eee;
   background-color: #409eff;
   text-align: left;
-  color: #fff; */
+  color: #fff;
 }
-.item + .item {
+.item_touz + .item_touz {
   border-top: none;
   margin-top: 6px;
 }
 
-.item:hover {
+.item_touz:hover {
   background-color: #5695d4;
   cursor: move;
 }
+
 .item2 {
   padding: 6px 12px;
   margin: 0px 10px 0px 10px;