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

src/xt_pages/dialysis/details/consumable/dialysisParameterPrint.vue

@@ -25,7 +25,7 @@
             <table class="table">
               <thead>
               <tr>
-                <td width="50">序号</td>
+                <td width="60">序号</td>
                 <td width="100"  v-if="dialysisSett.device_number==1">透析机号</td>
                 <td width="100"  v-if="dialysisSett.name==1">姓名</td>
                 <td width="100"  v-if="dialysisSett.name==1">透析模式</td>
@@ -309,8 +309,7 @@
         }
      },
       printAction: function() {
-        const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .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: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
-
+        const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 0px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 0px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
         printJS({
           printable: 'print_content',
           type: 'html',

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -717,8 +717,8 @@ export default {
 
               } else {
                 that.radio = 2
-                that.getPatientList()
                 that.$message({ message: '上传成功', type: 'success', duration: 5000 })
+                that.getPatientList()
               }
             }
           })

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/outpatientDoctorStation/components/deskPrescription.vue

@@ -3786,7 +3786,7 @@ export default {
             console.log("-=======")
             for (let i = 0; i < this.zuobiao_project.length; i++) {
               for (let b = 0; b < this.tabProject.length; b++) {
-                if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 &&  this.zuobiao_project[i].bby06 == this.tabProject[b].specification_name){
+                if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 &&  this.zuobiao_project[i].bby06 == this.tabProject[b].single_dose){
                   console.log( this.zuobiao_project[i].lsqty)
                   console.log( this.tabProject[b].zuobiao_stock_num)
                   this.tabProject[b].zuobiao_stock_num = this.zuobiao_project[i].lsqty

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -608,11 +608,15 @@
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
           // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
           if (scope.row.prescribing_number > scope.row.drug.total) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+            if(this.$store.getters.xt_user.org_id != 10206) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
           }
         } else {
           if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+            if(this.$store.getters.xt_user.org_id != 10206) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
           }
           // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1829,17 +1829,23 @@ export default {
               // }
 
               var preTime = nowTime
-              if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+              if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
                     if (this.org_id == 10028) {
                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                    } else if(this.org_id == 10206  || this.org_id == 0){
+                      preTime = this.record_date + ' ' + '6:00'
                     } else {
                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
 
                     }
                   } else if (this.schedule.schedule_type == 2) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                     if(this.org_id == 10206  || this.org_id == 0 ){
+                      preTime = this.record_date + ' ' + '10:00'
+                    }else{
+                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                   }
                   } else if (this.schedule.schedule_type == 3) {
                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                   }
@@ -1992,17 +1998,23 @@ export default {
                   tempProject.push(obj)
                 }
                 var preTime = nowTime
-                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+                if (this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                   if (this.schedule.schedule_type == 1) {
                     if (this.org_id == 10028) {
                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                    } else if(this.org_id == 10206  || this.org_id == 0) {
+                      preTime = this.record_date+ ' ' + '6:00'
                     } else {
                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
 
                     }
                     // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                   } else if (this.schedule.schedule_type == 2) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                    if(this.org_id == 10206  || this.org_id == 0){
+                      preTime = this.record_date + ' ' + '6:00'
+                    }else {
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                    }
                   } else if (this.schedule.schedule_type == 3) {
                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                   }
@@ -2321,18 +2333,24 @@ export default {
                     // }
 
                     var preTime = nowTime
-                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+                    if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          } else if(this.org_id == 10206 || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
 
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '10:00'
+                          }else{
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                         }
@@ -2487,17 +2505,25 @@ export default {
 
                       var preTime = nowTime
                       // var preTime = ''
-                      if (this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+                      if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          } else if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
 
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime =this.record_date + ' ' + '10:00'
+                          }else{
+
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+
+                          }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                         }
@@ -4025,18 +4051,27 @@ export default {
 
                     var preTime = nowTime
 
-                    if (this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+                    if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          } else if(this.org_id == 10206 || this.org_id == 0){
+
+                            preTime = this.record_date + ' ' + '6:00'
+
                           } else {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
 
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '10:00'
+
+                          }else {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                         }
@@ -4190,17 +4225,22 @@ export default {
 
                       // var preTime = nowTime
                       var preTime = nowTime
-                      if (this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+                      if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          } else if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date+ ' ' + '6:00'
                           } else {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '10:00'
+                          }else{
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                         }
@@ -4695,19 +4735,25 @@ export default {
 
                     var preTime = nowTime
 
-                    if (this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+                    if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                       if (prescription.pre_time == 0) {
                         // preTime = nowTime
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          } else if(this.org_id == 10206 || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime =this.record_date + ' ' + '10:00'
+                          }else{
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+
+                          }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                         }
@@ -4862,17 +4908,23 @@ export default {
 
                       var preTime = nowTime
                       // var preTime = ''
-                      if (this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+                      if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          } else if(this.org_id == 10206 ||  this.org_id == 0){
+                            preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          if(this.org_id == 10206 ||  this.org_id == 0){
+                            preTime = this.record_date + ' ' + '10:00'
+
+                          }else{
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                         }

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -2036,7 +2036,7 @@
               console.log("-=======")
               for (let i = 0; i < this.zuobiao_project.length; i++) {
                 for (let b = 0; b < this.tabProject.length; b++) {
-                  if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 && this.zuobiao_project[i].bby06 == this.tabProject[b].specification_name){
+                  if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 && this.zuobiao_project[i].bby06 == this.tabProject[b].single_dose){
                     this.tabProject[b]["zuobiao_stock_num"] = this.zuobiao_project[i].lsqty
                     this.tabProject[b].price = this.zuobiao_project[i].price
 

src/xt_pages/workforce/components/beforeweekTable.vue

@@ -14,7 +14,7 @@
             <!-- 拖拽dragstart -->
             <div
                 draggable="true"
-                class="item"
+                class="item_touz"
                 style="font-weight: bolder"
             >
               <span>{{ cur_info.patient_name }}</span>
@@ -2865,14 +2865,16 @@ textarea{
     background-color: #ecf5ff !important;
     color: #3a8ee6;
   }
+  
 }
-.item {
-  // width: 115px;
-  // padding: 6px 5px;
-  // margin: 0px 5px ;
-  // border: solid 1px #eee;
-  // background-color: #409eff;
-  // text-align: left;
-  // color: #fff;
+
+.item_touz {
+  width: 115px;
+  padding: 6px 5px;
+  margin: 0px 5px ;
+  border: solid 1px #eee;
+  background-color: #409eff;
+  text-align: left;
+  color: #fff;
 }
 </style>

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;

src/xt_pages/workforce/scheduleTablePrintTwo.vue

@@ -49,7 +49,7 @@
                   <span v-if="item.Mon_M.patient_id">
                     <span>{{ item.Mon_M.patient }} </span><br/>
                     <span >{{ item.Mon_M.mode_name }}</span><br/>
-                    <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span><br/>
+                    <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span> -->
                     <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}
                    
                     </span>
@@ -59,7 +59,7 @@
                   <span v-if="item.Mon_A.patient_id">
                     <span>{{ item.Mon_A.patient }} </span><br/>
                     <span >{{ item.Mon_A.mode_name }}</span><br/>
-                     <span v-if="org_id == 0">{{getAnticoagulant(item.Mon_A.anticoagulant)  }}</span>
+                     <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Mon_A.anticoagulant)  }}</span> -->
                     <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}
                      
                     </span>
@@ -79,7 +79,7 @@
                     <span v-if="item.Tue_M.patient_id">
                         <span>{{ item.Tue_M.patient }} </span><br/>
                         <span >{{ item.Tue_M.mode_name }}</span><br/>
-                        <span v-if="org_id==0">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span><br/>
+                        <span v-if="org_id==0">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span>
                         <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}
                          
                         </span>
@@ -110,7 +110,7 @@
                     <span v-if="item.Wed_M.patient_id">
                       <span>{{ item.Wed_M.patient }} </span><br/>
                         <span >{{ item.Wed_M.mode_name }}</span><br/>
-                        <span v-if="org_id == 0">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span><br/>
+                        <span v-if="org_id == 0">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span>
                         <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}
                           
                         </span>
@@ -171,7 +171,7 @@
                     <span v-if="item.Fri_M.patient_id">
                       <span>{{ item.Fri_M.patient }} </span><br/>
                         <span >{{ item.Fri_M.mode_name }}</span><br/>
-                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span><br/>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span>
                         <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}}
                           
                         </span>
@@ -1133,7 +1133,7 @@ export default {
       },
       printAction: function() {
           // const style = '@media print {#scheduleTable{font-size:16px;} .scheduleTable tr td{text-align: center;padding: 5px;}}'
-          const style = '@media print {#scheduleTable{font-size:14px;} }'
+          const style = '@media print {#scheduleTable{font-size:12px;} }'
           printJS({
           printable: 'scheduleTable',
           type: 'html',
@@ -1386,7 +1386,6 @@ export default {
 }
 </script>
 
-
 <style lang="scss">
 .scheduleTablePrint{
   width: 100%;