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

src/store/modules/globalConfig.js

@@ -924,6 +924,21 @@ const global_config = {
         zongliang_unit: 'mg',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
+      },
+      16: {
+        id: 16,
+        name: '低分子量肝素钙',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'iu',
+        weichi_unit: 'iu/h',
+        zongliang_unit: 'iu',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
       }
     },
     anticoagulants_set: {

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1123,9 +1123,12 @@
                           <span v-if="record.prescription.anticoagulant == 5"
                             >&nbsp;枸橼酸钠</span
                           >
-                          <span v-if="record.prescription.anticoagulant == 6"
+                          <span v-if="record.prescription.anticoagulant == 6 && org_id!=0 && org_id!=10206"
                             >&nbsp;低分子肝素钙</span
                           >
+                          <span v-if="record.prescription.anticoagulant == 6 || org_id ==0 || org_id ==10206"
+                            >&nbsp;低分子量肝素钙</span
+                          >
                           <span v-if="record.prescription.anticoagulant == 7"
                             >&nbsp;低分子肝素钠</span
                           >
@@ -1400,7 +1403,7 @@
                             v-if="
                              (record.prescription.mode_id == 2 ||
                               record.prescription.mode_id == 5 ||
-                              record.prescription.mode_id == 12 || org_id == 0)&&org_id!=10478
+                              record.prescription.mode_id == 12 || org_id == 0)&&org_id!=10478 && org_id!=10206
                             "
                             width="50"
                           >
@@ -1613,13 +1616,13 @@
                               (record.prescription.mode_id == 2 ||
                               record.prescription.mode_id == 5 ||
                               record.prescription.mode_id == 12 || org_id == 0)
-                              && org_id!=10478
+                              && org_id!=10478 && org_id!=10206
                             "
                             style="width: 50px"
                           >
                             {{
-                              monitor_record.displacement_quantity
-                                ? monitor_record.displacement_quantity
+                              monitor_record.replacement_total
+                                ? monitor_record.replacement_total
                                 : ""
                             }}
                           </td>
@@ -1794,7 +1797,7 @@
                             执行人签名
                           </td>
                           <td style="font-size: 16px" width="10%">时间</td>
-                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375">核对护士</td>
+                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375 || org_id == 0 || org_id ==10206">核对护士</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
 
@@ -1902,7 +1905,7 @@
                                 getTime(advice[0].execution_time, " {h}:{i}")
                               }}</span>
                             </td>
-                            <td height="35px" v-if="org_id == 10375">
+                            <td height="35px" v-if="org_id == 10375 || org_id ==0||org_id ==10206">
                               <span
                                 v-if="
                                   setAdminUserES(
@@ -2799,7 +2802,7 @@
                           />
                         </div>
                       </div>
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex: 1" v-if="org_id!=0&&org_id!=10206">
                         治疗护士：
                         <div
                           class="under_line"

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button type="primary" @click="checkData">一键核对</el-button>
     <el-button type="primary" @click="toUpload">一键上传</el-button>
-
+    
     <div id="dialysis-print-box-1"  ref="pdfContent">
       <div
         id="dialysis-print-box-1-1"
@@ -753,7 +753,7 @@
                       </div>
                     </div>
                     <div
-
+                     
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
                     >
@@ -763,8 +763,8 @@
                         style="width: 70px; text-align: center"
                       >
                         {{
-                          prescription.displace_liqui_value
-                            ? prescription.displace_liqui_value
+                          prescription.replacement_total
+                            ? prescription.replacement_total
                             : "/"
                         }}
                       </div>
@@ -993,7 +993,7 @@
                       kg
                     </div>
                     <div class="inline_block" style="flex: 1" v-if="org_id!=10469 && org_id!=0">
-                      计划超滤量：
+                      计划超滤量： 
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
@@ -1004,13 +1004,13 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">ml</span>
+                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">ml</span> 
                       <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">L</span>
                     </div>
 
 
                     <div class="inline_block" style="flex: 1" v-if="org_id == 10469 || org_id == 0">
-                      处方脱水量：
+                      处方脱水量： 
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
@@ -1104,11 +1104,16 @@
                         class="under_line"
                         style="width: 150px; text-align: center"
                       >
-                        {{
+                       <span v-if="org_id != 0 && org_id !=10206"> {{
                           prescription.anticoagulant_name
                             ? prescription.anticoagulant_name
                             : "/"
                         }}
+                        </span>
+                        <span v-if="org_id == 0 || org_id == 10206">
+                           <span v-if="prescription.anticoagulant_name== '低分子肝素钙'">低分子量肝素钙</span>
+                           <span v-if="prescription.anticoagulant_name!= '低分子肝素钙'">{{prescription.anticoagulant_name}}</span>
+                        </span>
                       </div>
                     </div>
                     <div
@@ -1127,7 +1132,7 @@
                             : "/"
                         }}
                       </div>
-
+                     
                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
@@ -1147,7 +1152,7 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
-
+                    
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
@@ -1303,8 +1308,8 @@
                         }}
                       </div>
                       <span>ml/h</span>
-
-
+                   
+                  
                     </div>
                     <div
                       class="inline_block"
@@ -1323,8 +1328,8 @@
                         }}
                       </div>
                       <span>ml/h</span>
-
-
+                   
+                  
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
                       碳酸氢钠流速：
@@ -1338,13 +1343,13 @@
                             : ""
                         }}
                       </div>
-
-
+                     
+                     
                     </div>
                     <span>ml/h</span>
-
-
-
+                   
+              
+                  
                   </div>
 
                    <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id ==10469 || org_id == 9671">
@@ -1359,7 +1364,7 @@
                       >
                        {{predialysis.machine_type ? predialysis.machine_type : ""}}
                       </div>
-
+                    
                     </div>
                     <div
                       class="inline_block"
@@ -1458,27 +1463,27 @@
                               : "mmHg"
                           }})
                         </td>
-
+                        
                         <td width="60" v-if="org_id == 9836">体温(°C)</td>
                         <td width="60" v-if="org_id == 9919">血温(°C)</td>
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671">透析液温度(°C)</td>
                         <td width="50" v-if="org_id != 10121">
-                          <span v-if="org_id != 0 && org_id !=10469 && org_id!=10490"> 电导度<br />(ms/cm)</span>
-                          <span v-if="org_id ==10469"> 钠浓度<br />(mmol/L)</span>
-                          <span v-if="org_id == 0 || org_id == 10490"> 置换液的速度<br />(ml/h)</span>
+                          <span v-if="org_id != 0 && org_id !=10469 && org_id!=10490"> 电导度<br />(ms/cm)</span> 
+                          <span v-if="org_id ==10469"> 钠浓度<br />(mmol/L)</span> 
+                          <span v-if="org_id == 0 || org_id == 10490"> 置换液的速度<br />(ml/h)</span> 
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
                         <td width="50" v-if="org_id == 10375 || org_id == 0">置换率<br />(ml/h)</td>
                         <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 0">超滤量<br />(ml)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
-                        <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0" width="50">
+                        <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0 && org_id!=10206" width="50">
                           置换量<br />(ml)
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
                         <td width="50" v-if="org_id == 9538">KT/V</td>
-                        <td width="50" v-if="org_id == 9919">在线尿素监测</td>
-                        <td width="50" v-if="org_id == 9671">在线尿素监测</td>
+                        <td width="50" v-if="org_id == 9919">在线尿素监测</td>  
+                        <td width="50" v-if="org_id == 9671">在线尿素监测</td>  
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
                         <td width="50" v-if="org_id == 10490 || org_id == 0">碳酸氢钠<br />(ml)</td>
                         <td width="200">病情变化及处理</td>
@@ -1513,7 +1518,7 @@
                               : ""
                             }}
                           </span>
-
+                          
                         </td>
                         <td>
                           <span
@@ -1577,7 +1582,7 @@
                           <span v-if="org_id==0||org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}</span>
                         </td>
 
-
+                      
                         <td v-if="org_id == 10375 || org_id == 0"><br />
                           {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
                         </td>
@@ -1598,7 +1603,7 @@
                             (prescription.mode_id == 2 ||
                             prescription.mode_id == 5 ||
                             prescription.mode_id == 12)
-                            && org_id!=0 && org_id!=10478
+                            && org_id!=0 && org_id!=10478 && org_id!=10206
                           "
                           style="width: 50px"
                         >
@@ -1648,7 +1653,7 @@
                                 "
                                 >【开始透析】
                                 </template>
-
+                              
                               {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{
                                 monitor.dispose
                               }}
@@ -1888,7 +1893,7 @@
               <span v-if="prescription.mode_id!=13">血液净化治疗记录单</span>
               <span v-if="prescription.mode_id==13">连续性肾脏替代治疗（CRRT）记录单</span>
              </span>
-
+            
             </div>
           </div>
           <div class="row">
@@ -2410,7 +2415,7 @@
                             : "未称重"
                         }}
                       </span>
-
+                       
                       </div>
                       kg
                     </div>
@@ -2723,7 +2728,7 @@
                       >
                         {{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "/" }}
                       </div>ml
-
+                      
                     </div>
                   </div>
                 </td>
@@ -2735,8 +2740,8 @@
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
                    <div v-if="org_id == 0 || org_id == 10440">
-
-
+                    
+                  
 
                     <div class="inline_block" style="flex: 1">
                       上机护士：
@@ -2777,8 +2782,8 @@
                         />
                       </div>
                     </div>
-
-
+                  
+                  
                   </div>
                   <div v-if="org_id!=0 && org_id!=10440">
                     <div class="inline_block" style="flex: 1">
@@ -2821,18 +2826,18 @@
                       </div>
                     </div>
                   </div>
-
+                   
                   <div v-if="org_id==0||org_id==10440">
-
-                    <div class="inline_block" style="flex: 1">
+                    
+                    <div class="inline_block" style="flex: 1">                 
                      <div>
-                      <span>责任护士：</span>
+                      <span>责任护士：</span> 
                       <div
                         class="under_line"
                         style="width: 80px; text-align: center"
-
+                       
                       >
-
+                    
                         <span
                           style="height: 35px; display: inline-block"
                           v-if="
@@ -2871,11 +2876,11 @@
 
                   </div>
 
-                  <div v-if="org_id!=0&&org_id!=10440">
+                  <div v-if="org_id!=0&&org_id!=10440&&org_id!= 10206">
                     <div class="inline_block" style="flex: 1">
-                      <span v-if="org_id==10414">责任护士：</span>
-                      <span v-else>治疗护士：</span>
-
+                      <span v-if="org_id==10414">责任护士：</span> 
+                      <span v-else>治疗护士：</span> 
+                      
                       <div
                         class="under_line"
                         style="width: 80px; text-align: center"
@@ -2914,12 +2919,12 @@
                       </div>
                     </div>
                   </div>
-
+                  
 
 
                     <div class="inline_block" style="flex: 1">
-                      <span v-if="org_id==10387" >核对护士：</span>
-                      <span v-else >核对人员：</span>
+                      <span v-if="org_id==10387 || org_id ==10206 || org_id == 0" >核对护士：</span> 
+                      <span v-else >核对人员：</span> 
                       <div
                         class="under_line"
                         style="width: 80px; text-align: center"
@@ -3198,7 +3203,7 @@
                           核对护士
                         </td>
                       </tr>
-
+                     
 
                       <tr
                         v-for="(advice, advice_index) in doctor_advices"
@@ -3208,7 +3213,7 @@
                           <span v-if="advice.start_time">
                             {{ getTime(advice.start_time, "{h}:{i}") }}
                           </span>
-
+                          
                         </td>
                         <td
                           height="32px"
@@ -3243,7 +3248,7 @@
                             >({{ advice.remark }})</span
                           >
                         </td>
-
+                    
                         <td height="32px">
                           <span
                             v-if="setAdminUserES(advice.advice_doctor) == ''"
@@ -3257,7 +3262,7 @@
                             v-else
                           />
                         </td>
-
+                      
                         <td height="32px">
                           <span
                             v-if="setAdminUserES(advice.execution_staff) == ''"
@@ -3289,15 +3294,15 @@
                           />
                         </td>
                       </tr>
-
+                     
                     </tbody>
      </table>
 
 
+    
+     
 
-
-
-
+     
     </div>
   </div>
 </template>
@@ -3444,7 +3449,7 @@ export default {
   },
   methods: {
     toUpload() {
-
+         
          let dom = document.getElementById("dialysis-print-box-1")
          //调用方法下载
          html2canvas(dom, {
@@ -3458,14 +3463,14 @@ export default {
          }).then((canvas) => {
            //返回图片dataURL，参数：图片格式和清晰度(0-1)
            var pageData = canvas.toDataURL('image/jpeg', 1.0);
-
+ 
            //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
            var pdf = new jsPDF('', 'pt', 'a4');
-
+ 
            //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
            //  pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
            pdf.addImage(pageData, 'JPEG', 0, 0, 555.28, 592.28 / canvas.width * canvas.height);
-
+           
            console.log("pdf222222222222222222",pdf)
 
            var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
@@ -3473,7 +3478,7 @@ export default {
            const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
            console.log("blobwoowowowwo",blob)
            this.openPdf(blob);
-
+           
            // var data = {
            //   name:newBase64Data,
            // }
@@ -3488,14 +3493,14 @@ export default {
            //     this.openPdf(blob);
            //   }
            // })
-
+           
            // this.viewPdf(newBase64Data)
            //保存到pdf，名字是stone
            // pdf.save('stone.pdf');
-
+          
          });
        },
-
+    
      viewPdf(content) {
        console.log("content",content);
        const blob = this.base64ToBlob(content);
@@ -3514,7 +3519,7 @@ export default {
            return value1 - value2
        }
      },
-
+ 
      openPdf(blob) {
        const objectUrl = URL.createObjectURL(blob);
        const a = document.createElement('a');
@@ -3530,23 +3535,23 @@ export default {
        const bytesLength = byteCharacters.length;
        const slicesCount = Math.ceil(bytesLength / sliceSize);
        const byteArrays = new Array(slicesCount);
-
+ 
        for (let sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
          const begin = sliceIndex * sliceSize;
          const end = Math.min(begin + sliceSize, bytesLength);
-
+ 
          const bytes = new Array(end - begin);
          for (let offset = begin, i = 0; offset < end; ++i, ++offset) {
            bytes[i] = byteCharacters[offset].charCodeAt(0);
          }
          byteArrays[sliceIndex] = new Uint8Array(bytes);
        }
-
+ 
        return new Blob(byteArrays, {
          type: contentType
        });
      },
-
+    
      UploadPdf(res) {
        let pdfBase64Str = res;
        let title = "上传给后端的个人报告";
@@ -4184,7 +4189,7 @@ export default {
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
-
+   
         // if (this.doctor_advices.length > 0) {
         //   var group = this.newAdviceGroupObject()
         //   var initGroupBlock = function(group, advice) {
@@ -4265,7 +4270,7 @@ export default {
         // }
 
 
-
+        
 
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
         if(this.org_id ==10515 || this.org_id == 0){
@@ -4285,15 +4290,15 @@ export default {
         });
         this.projects = projects;
 
-
+      
         console.log("this.projects", this.projects);
 
         // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
-
+      
         if(this.projects!=null && this.projects.length >0){
            for(let i=0;i<this.projects.length;i++){
              if(this.projects[i].type== 2){
-
+            
               this.projects[i].project_team_name = ""
               this.projects[i].project_team_id = 0
               console.log("this.projects[i].project.team",this.projects[i].project.team)
@@ -4304,11 +4309,11 @@ export default {
                 this.projects[i].single_dose = this.projects[i].single_dose
                 this.projects[i].single_dose_unit = this.projects[i].unit
                 this.projects[i].execution_time = this.projects[i].execution_time
-                this.projects[i].execution_staff= this.projects[i].execution_staff
+                this.projects[i].execution_staff= this.projects[i].execution_staff 
                 this.projects[i].advice_name =  this.projects[i].team.project_team
                 this.projects[i].advice_doctor = this.projects[i].doctor
-
-
+              
+               
                 this.doctor_advices.push(this.projects[i])
                 // this.doctor_advices_2.push(this.project[i])
               }else{
@@ -4318,19 +4323,19 @@ export default {
                 this.projects[i].single_dose = this.projects[i].single_dose
                 this.projects[i].single_dose_unit = this.projects[i].unit
                 this.projects[i].execution_time = this.projects[i].execution_time
-                this.projects[i].execution_staff= this.projects[i].execution_staff
+                this.projects[i].execution_staff= this.projects[i].execution_staff 
                 this.projects[i].advice_doctor = this.projects[i].doctor
                 this.doctor_advices.push(this.projects[i])
                 // this.doctor_advices_2.push(this.projects[i])
               }
-
+             
              }
-
+             
            }
         }
-
+         
         }
-
+      
         console.log("时间我我我哦我我",this.doctor_advices)
         if (this.doctor_advices.length <= 6) {
           var nl = 6;
@@ -4367,7 +4372,7 @@ export default {
         }
         // console.log(this.advice_groups);
 
-
+       
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");
@@ -4403,7 +4408,7 @@ export default {
     //   }
     // },
     getAge: function(val) {
-
+     
       if (val.id_card_no) {
         var thisLen = val.id_card_no.length
 
@@ -4513,7 +4518,7 @@ export default {
       "vascular_access_desc"
     );
     this.org_id = this.$store.getters.xt_user.org.id;
-
+   
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
 
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -18,7 +18,7 @@
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
-          <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive>
+          <printFive v-if="org_id == 10188 || org_id == 0" :paramsObj="invoiceParams"></printFive>
           <!-- <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen> -->
 <!--         <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
@@ -137,7 +137,7 @@
           });
         }else{
           const style =
-            '@media print {#invoice-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
+            '@media print {#invoice-print{font-size:15px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
           printJS({
             printable: "invoice-print",
             type: "html",

src/xt_pages/outpatientCharges/invoiceTemplate/printFive.vue

@@ -2,6 +2,7 @@
     <div id='invoice-print'>
         <div v-for='(i,index) in pageArr.length' :key="index">
             <div :style="{position: 'absolute',top:(10 + (index * 400))  + 'px',left:70+ 'px',}">{{ list.order_number }}</div>
+            <div :style="{position: 'absolute',top:(10 + (index * 400))  + 'px',left:400+ 'px',}">{{list.order.fa_piao_number}}</div>
             <div style="display:flex;justify-content: space-between;">
                 <div :style="{position: 'absolute',top:(40 + (index * 400))  + 'px',left:80+ 'px',}"> {{ paramsObj.name }}</div>
             </div>
@@ -44,22 +45,21 @@
             <div :style="{position: 'absolute',top:(315 + (index * 400))  + 'px',left:460+ 'px'}">{{ list.medfee_sumamt }}</div>
             <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(330 + (index * 400))  + 'px',left:110+ 'px',width:100 + '%'}">
                 <div style="display:flex;">
-                  <div style="width:150px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
-                  <div style="width:150px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
+                  <div style="width:160px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
+                  <div style="width:170px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
                   <div style="width:150px">统筹支出：{{ list.order.hifp_pay }}</div>
-                  <div style="width:150px">大病支出：{{list.order.hifmi_pay}}</div>
+                  <div style="width:160px">大病支出：{{list.order.hifmi_pay}}</div>
 
                 </div>
                 <div style="display:flex;">
-                  <div style="width:150px">个人账户支付：{{ list.order.acct_pay }}</div>
-                  <div style="width:150px">现金支出：{{ list.order.psn_cash_pay }}</div>
+                  <div style="width:170px">个人账户支付：{{ list.order.acct_pay }}</div>
+                  <div style="width:160px">现金支出：{{ list.order.psn_cash_pay }}</div>
                   <div style="width:150px">本次账户：0</div>
                   <div style="width:150px">上次账户：0</div>
                 </div>
               <div style="display:flex;">
-                <div style="width:150px">账户余额：{{ list.order.balc }}</div>
-                <div style="width:150px">其他支出：{{ list.order.oth_pay }}</div>
-                <div style="width:150px">大病补充保险支出：0</div>
+                <div style="width:170px">账户余额：{{ list.order.balc }}</div>
+                <div style="width:170px">其他支出：{{ list.order.oth_pay }}</div>
                 <div style="width:150px">民政支出：0</div>
               </div>
               <div style="display:flex;">
@@ -69,15 +69,15 @@
 
             </div>
             <div>
-                <div :style="{position: 'absolute',top:(390 + (index * 400))  + 'px',left:100+ 'px'}">{{ org_name }}</div>
-                <div :style="{position: 'absolute',top:(390 + (index * 400))  + 'px',left:360+ 'px'}">{{ paramsObj.chargeName }}</div>
-                <div :style="{position: 'absolute',top:(390 + (index * 400))  + 'px',left:520+ 'px'}">
+                <div :style="{position: 'absolute',top:(405 + (index * 400))  + 'px',left:100+ 'px'}">{{ org_name }}</div>
+                <div :style="{position: 'absolute',top:(405 + (index * 400))  + 'px',left:360+ 'px'}">{{ paramsObj.chargeName }}</div>
+                <div :style="{position: 'absolute',top:(405 + (index * 400))  + 'px',left:520+ 'px'}">
                     <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
                 </div>
-                <div :style="{position: 'absolute',top:(390 + (index * 400))  + 'px',left:560+ 'px'}">
+                <div :style="{position: 'absolute',top:(405 + (index * 400))  + 'px',left:560+ 'px'}">
                     <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
                 </div>
-                <div :style="{position: 'absolute',top:(390 + (index * 400))  + 'px',left:600+ 'px'}">
+                <div :style="{position: 'absolute',top:(405 + (index * 400))  + 'px',left:600+ 'px'}">
                     <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
                 </div>
             </div>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -433,7 +433,7 @@
                                             <span v-else> {{ scope.row.total }}</span> -->
                                             <span v-if="org_id != 10206 && scope.row.type == 3 && scope.row.good_info.sum_count > 0">{{scope.row.good_info.sum_count}}</span>
 <!--                                            //针对坐标系统的库存数据-->
-                                            <span v-if="org_id == 10206 && scope.row.type == 3">{{scope.row.zuobiao_stock_num}}</span>
+                                            <span v-if="org_id == 10206 && scope.row.type == 3">{{scope.row.good_info.zuobiao_stock_num}}</span>
 
                                           </template>
                                       </el-table-column>
@@ -531,13 +531,13 @@ import { uParseTime } from '@/utils/tools'
 import NextOrLastPrescription from './nextOrLastPrescription'
 import CallPrescription from './callPrescription'
 import DayPrescriptionTable from '../../outpatientCharges/components/dayPrescriptionTable'
-import axios from 'axios'
 
 const moment = require('moment')
 
 export default {
   props: {
     zuobiao_drug:Array,
+    zuobiao_project:Array,
     drugs:Array,
     allDrugs:Array,
     advices_template:Array,
@@ -574,9 +574,7 @@ export default {
     additionalCharges
   },
   data() {
-
     return {
-      zuobiao_project:[],
       start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
       end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
       register10206: [
@@ -1624,20 +1622,24 @@ export default {
       this.$refs.additionalCharges.hide()
 
     }, searchProjectAction() {
+      console.log('~~~~',this.search_project_keyword)
+      console.log('5555',this.tabProject)
+      console.log('6666',this.allProject)
       // console.log('4444',this.tabProject[1].first_letter.indexOf(this.search_project_keyword) != -1)
       if (this.search_project_keyword.length == 0) {
         this.tabProject = this.allProject
       } else {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
-
-
-            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
+            // console.log('4444',this.tabProject[i].first_letter.indexOf(this.search_project_keyword) != -1)
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+            this.allProject[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
               arr = arr.concat(this.allProject[i])
             }
 
         }
         this.tabProject = arr
+        console.log('kkkk',this.tabProject);
       }
 
     }, searchProjectTeamAction() {
@@ -1886,6 +1888,7 @@ export default {
     },
 
     tabclickEvent(val) {
+      console.log("li3333333333333li")
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].name == val.name) {
           this.prescription_id = this.prescriptions[i].id
@@ -1953,6 +1956,7 @@ export default {
 
     },
     setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses,patient_diagnose) {
+      console.log("诊断23333333333333",this.diagnose)
       this.sick = sick
       this.diagnoses = diagnoses
       this.department = department
@@ -2068,6 +2072,7 @@ export default {
 
 
       this.diagnose = []
+      console.log("处方----------------------------------------------",info.id)
       if (info.id == 0) {
         if (last_info.diagnosis.length == 0) {
           this.diagnose = []
@@ -2119,6 +2124,8 @@ export default {
 
       }
 
+      // console.log("info233333333333333333333",info.id)
+      // console.log("LAST_INFO2323232323WO",last_info.patient_diagnosis)
       this.patient_diagnose = []
       if(info.id == 0){
         if (last_info.patient_diagnosis.length == 0) {
@@ -2147,6 +2154,7 @@ export default {
           }
 
         }
+        console.log("hhahahahah",this.patient_diagnose)
       }
 
       this.state1 = info.sick_type
@@ -2278,6 +2286,7 @@ export default {
     },
 
     moreState(tab, event) {
+      console.log("li222222222")
       if (tab == 'more') {
         return false
       }
@@ -2385,6 +2394,7 @@ export default {
           //   }
           // }
           if (index == 1) {
+            console.log(this.prescriptions)
 
             if (this.org_id != 10206 && this.org_id != 0) {
               for (let i = 0; i < this.prescriptions.length; i++) {
@@ -2464,6 +2474,7 @@ export default {
                   this.$emit('editKeepLoad', false)
                   return
                 }
+                console.log("2o23o23o23o2o23",this.prescriptions[i].advices[b])
                 if(this.prescriptions[i].advices[b].day == NaN){
                   this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}天数未填写`)
                   this.$emit('editKeepLoad', false)
@@ -2537,6 +2548,8 @@ export default {
               'prescriptions': this.prescriptions
             }
             isLoading = true
+            console.log('this.prescriptionsthis.prescriptions', this.prescriptions)
+            console.log('this.prescriptionsthis.prescriptions', params)
             let num = 0
             // this.prescriptions.map(item => {
             //   if (item.advices.length > 0) {
@@ -2555,6 +2568,7 @@ export default {
               var arr_one = []
               var arr_Two = []
 
+              console.log("ooo233323233232323232",this.prescriptions)
 
              //药品
               for(let i=0;i<this.prescriptions.length;i++){
@@ -3610,7 +3624,6 @@ export default {
               }
             }
 
-
             let obj = {
               id: good_info[i].id,
               project_name: good_info[i].good_name,
@@ -3635,10 +3648,8 @@ export default {
             }
             this.tabProject.push(obj)
           }
-
-
           //跟坐标数据进行匹配，如果bbx01相等的话则，替换库存数量
-          if(this.org_id == 10206) {
+          if(this.org_id == 10206 ) {
             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){
@@ -3810,45 +3821,12 @@ export default {
     },
     clearSelection() {
       this.$refs.tabProjectTeam.clearSelection()
-    },getstock(){
-      if(this.org_id == 10206){
-        var that = this
-        axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystock', {
-
-        })
-          .then(function(response) {
-            if (response.data.state == 0) {
-              that.$message.error(response.data.msg)
-              that.loadingtwo = false
-              return false
-            } else {
-              if (response.data.data.failed_code == -10) {
-                that.$confirm(response.data.data.msg, '医保错误信息', {
-                  confirmButtonText: '确 定',
-                  type: 'warning'
-                }).then(() => {
-
-                }).catch(() => {
-                })
-
-              } else {
-                that.zuobiao_project  = response.data.data.project
-              }
-            }
-          })
-          .catch(function(error) {
-          })
-      }
-
-
-    },
+    }
   }, mounted() {
     this.request_record_date = this.record_date
     // this.getInitData()
-    this.getstock()
     //获取所有项目
     this.getlist()
-
     //获取所以项目组套
     this.getAllProjectTeam()
 
@@ -3859,25 +3837,7 @@ export default {
 
   },
   watch: {
-    // tabProject:{//深度监听，可监听到对象、数组的变化
-    //   handler(val, oldVal) {
-    //     if(this.org_id == 10206 ) {
-    //       console.log("~~~~~~~")
-    //       console.log(this.zuobiao_project)
-    //       console.log(this.tabProject)
-    //       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.tabProject[b].zuobiao_stock_num = this.zuobiao_project[i].lsqty
-    //           }
-    //         }
-    //       }
-    //       console.log(this.tabProject)
-    //
-    //     }
-    //   },
-    //   deep: true
-    // },
+
     fullHeight(val) {
       if (!this.timer) {
         this.fullHeight = val

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -683,7 +683,7 @@ export default {
             path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
           })
           }
-        if(this.org_id!=9671 && this.org_id!=9675 && this.org_id!=10340 && this.org_id !=10375 && this.org_id !=10469  && this.org_id !=0 ){
+        if(this.org_id!=9671 && this.org_id!=9675 && this.org_id!=10340 && this.org_id !=10375 && this.org_id !=10469){
           var zone = this.zone
         var newArr = []
         for(let i=0;i<this.zoneList.length;i++){
@@ -701,7 +701,7 @@ export default {
           path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
         })
         }
-        else if(this.org_id==10469 || this.org_id==0){
+        else if(this.org_id==10469){
           var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []

src/xt_pages/workforce/components/tableWeeks.vue

@@ -905,7 +905,7 @@
             path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
           })
         }
-        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340 && this.org_id != 0 && this.org_id!=10375 && this.org_id!=10469){
+        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340  && this.org_id!=10375 && this.org_id!=10469){
           var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []
@@ -923,7 +923,7 @@
           this.$router.push({
             path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
           })
-        }else if(this.org_id==10469 || this.org_id==0){
+        }else if(this.org_id==10469){
           var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []

src/xt_pages/workforce/remind_print_setting.vue

@@ -118,6 +118,13 @@
                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                    </span>
                 </div>
+
+                <div v-if="org_id==0 || org_id ==10460">
+                  目标超滤量:
+                  <span>
+                   {{main_collection.prescription.target_ultrafiltration}}ml
+                  </span>
+                </div>
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>