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

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

@@ -3,7 +3,21 @@
     <div class="dialysis-print-order">
       <div class="order-yy-name">{{ orgname }}</div>
       <div class="order-title">血液透析（滤过）记录表单</div>
-      <div class="order-name">姓 名:&nbsp;{{ patientInfo.name }}</div>
+      <div style="display:flex;justify-content: space-between;">
+        <div class="order-name" style="margin: 0;">姓 名:&nbsp;{{ patientInfo.name }}</div>
+            <div class="order-name" style="margin: 0;">门诊/住院号:&nbsp;
+            <span v-if="receiverTreatmentAccess.admission_number">
+              {{ receiverTreatmentAccess.admission_number }}
+            </span>
+            <span v-else-if="patientInfo.admission_number">
+              {{ patientInfo.admission_number }}
+            </span>
+            <span v-else>
+              {{ "/" }}
+            </span>
+            </div>
+          </div>
+      
       <table class="print-table" border="1">
         <tbody>
           <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -100,19 +100,6 @@
                       class="under_line"
                       style="width: 50px; text-align: center"
                     >
-                      <!-- <span>{{
-                        (dialysisOrder &&
-                          dialysisOrder != null &&
-                          dialysisOrder.DeviceNumber &&
-                          dialysisOrder.DeviceNumber.number.length > 0) ||
-                        (dialysisOrder &&
-                          dialysisOrder != null &&
-                          receiverTreatmentAccess.condition &&
-                          receiverTreatmentAccess.condition != 1)
-                          ? patientInfo.DialysisSchedule.device_number.number
-                          : dialysisOrder.DeviceNumber.number
-                      }}</span> -->
-
                       <span
                         v-if="
                           dialysisOrder == null ||
@@ -1424,17 +1411,6 @@
                                 </td>
                                 <td width="200">病情变化及处理</td>
 
-                                <!-- <td width="100">时间</td>
-                    <td width="30">T<br>C°</td>
-                    <td width="30">P<br/>次/分</td>
-                    <td width="30">R<br/>次/分</td>
-                    <td width="100">BP<br/>mmHg</td>
-                    <td width="60">静脉压/动脉压<br/>mmHg</td>
-                    <td width="80">血流量<br/>ml/min</td>
-                    <td width="90">超滤量累计L</td>
-                    <td width="80">钠浓度<br/>mmol/L</td>
-                    <td width="240">病情特殊情况处理<br/>及专科护理措施记录</td>
-                    <td  width="100">护士签名</td> -->
                               </tr>
 
                               <tr

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -586,10 +586,13 @@
                         </td>
                         <td height="30px" colspan="2" class="advice-name" style="padding:4px 5px;">
                           <span v-if="advice.parent_id > 0">---></span>
-                          <span>{{ advice.advice_name }}</span>
+                          
+                          <span v-if="advice.project&&advice.project.project_name">{{ advice.project.project_name }}</span>
+                          <span v-else>{{ advice.advice_name }}</span>
+                          <span v-if="advice.project&&advice.count">{{ advice.count }}{{ advice.unit }}</span>
                           <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
                           <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
-                          <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                          <span v-if="advice.single_dose != 0&&!advice.project">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
                           <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
                           <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
                           <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
@@ -1398,12 +1401,27 @@ export default {
           ].name
           this.AlPanel = this.anticoagulantsConfit[thisALID]
         }
-
+        // this.advices = response.data.data.projects
         this.advices = response.data.data.advices
         console.log("医嘱数据2222222222",this.advices)
-
-        var doctorAdevieInfo = JSON.parse(JSON.stringify(response.data.data.advices))
+        let doctorAdevieInfo = []
+        let ad_arr = JSON.parse(JSON.stringify(response.data.data.projects))
+        ad_arr.forEach(el => {
+          if(el.project&&el.project.project_name!=""){
+            doctorAdevieInfo.push(el)
+          }
+        });
+        let ad_arr2= JSON.parse(JSON.stringify(response.data.data.advices))
+        ad_arr2.forEach(el => {
+          doctorAdevieInfo.push(el)
+        });
+        console.log(doctorAdevieInfo,'doctorAdevieInfo')
+        // doctorAdevieInfo.push(JSON.parse(JSON.stringify(response.data.data.advices)))
         this.tableAdvice = doctorAdevieInfo;
+        // console.log(this.tableAdvice,'this.tableAdvice')
+        // if(!this.tableAdvice[0].advice_name){
+        //   console.log("不存在")
+        // }
         if (this.tableAdvice.length < 7) {
           var nl = 6 - this.tableAdvice.length;
           for (let index = 0; index < nl; index++) {
@@ -1524,6 +1542,7 @@ export default {
           this.doctor_advices[index]['isShow'] = 2
         }
 
+
         // if (this.doctor_advices.length > 0) {
         //   var group = this.newAdviceGroupObject()
         //   var initGroupBlock = function(group, advice) {

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -872,7 +872,7 @@
             </td>
           </tr>
 
-          <tr>
+          <!-- <tr>
             <td style="text-align: left" colspan="8">
               <span style="display: inline-block; margin-left: 15px"
                 >出血影响因素:</span
@@ -925,7 +925,7 @@
               >其他:
               <span>{{ predialysis.hemorrhage_other }}</span>
             </td>
-          </tr>
+          </tr> -->
         </table>
 
         <table class="print-table" border="1" style="line-height: 30px">

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -491,6 +491,12 @@
         })
       },
       getNextScheduleWeekDay() {
+       const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         const start = moment().weekday(1).format('YYYY-MM-DD') // 本周一
         const end = moment().weekday(7).format('YYYY-MM-DD')
         var zone = this.zone
@@ -532,6 +538,7 @@
         getNextScheduleWeekDayOne(params).then(response => {
           this.scheduleData = []
           if (response.data.state == 1) {
+            loading.close()
             var scheduleData = response.data.data.schedule
 
             for (let i = 0; i < scheduleData.length; i++) {

src/xt_pages/workforce/template.vue

@@ -4233,6 +4233,12 @@ export default {
 
     },
     submitAction() {
+     const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       var template
       if (this.form.firstWeek == 1) {
         template = this.first_template
@@ -4262,6 +4268,7 @@ export default {
       }
       synchroSchedule(params).then(response => {
         if (response.data.state == 1) {
+          loading.close()
           var msg = response.data.data.msg
           this.$message.success("同步成功!")
           this.newVisible = false