Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/store/modules/globalConfig.js

@@ -836,7 +836,7 @@ const global_config = {
       },
       42: {
         id: 42,
-        name: 'HD(1)',
+        name: 'HD.',
         dialysis_duration: 1,
         replacement_way: 1,
         hemodialysis_machine: 2,

src/xt_pages/dialysis/batch_print/batch_print_order_seventyeight.vue

@@ -657,7 +657,7 @@
 
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 2">
-                        人工肾装置：
+                       透析器：
                         <div class="under_line" style="width: 50%; text-align: center">
                         {{ record.prescription &&
                             record.prescription.dialysis_irrigation
@@ -667,6 +667,11 @@
                               record.prescription.dialysis_dialyszers
                                 ? record.prescription.dialysis_dialyszers
                                 : ""
+                            }}&nbsp;
+                             {{
+                              record.prescription.dialysis_strainer
+                                ? record.prescription.dialysis_strainer
+                                : ""
                             }}
                         </div>
                       </div>

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -2576,6 +2576,7 @@
                       </div>
                     </div>
                      <div
+                      v-if="org_id!=10677"
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

@@ -568,12 +568,16 @@
                       </div>
                     </div>
                     <div class="inline_block" style="flex: 2">
-                      人工肾装置：
+                      透析器：
                       <div class="under_line" style="width: 50%; text-align: center">
                         {{prescription.dialysis_irrigation?prescription.dialysis_irrigation:""}}&nbsp;
                         {{
                           prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : ""
                         }}
+                        &nbsp;
+                         {{
+                          prescription.dialysis_strainer ? prescription.dialysis_strainer : ""
+                        }}
                       </div>
                     </div>
                     <div class="inline_block" style="flex: 1">

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2221,7 +2221,7 @@
 
 
                       <tr
-                      v-if="org_id ==10206 || org_id == 10644 || org_id == 0 || org_id ==10489"
+                      v-if="org_id ==10206  || org_id ==10489"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -2441,7 +2441,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206 || org_id ==10633 || org_id ==10644 || org_id == 10489"
+                      v-if="org_id == 0 || org_id ==10206 || org_id ==10633 || org_id == 10489"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -5365,7 +5365,7 @@ export default {
 
         console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
 
-        if(this.org_id ==10206 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 0 || this.org_id == 10489){
+        if(this.org_id ==10206 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 10489){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);
@@ -5403,7 +5403,7 @@ export default {
         }
 
         //HIS客户显示临时医嘱的地方
-        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489 || this.org_id == 0 || this.org_id == 10644){
+        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489 || this.org_id ==10644 || this.org_id == 0){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
 
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){
@@ -5413,7 +5413,7 @@ export default {
             }
          }
 
-        console.log("医护哦我我我哦我我哦",this.doctor_advices)
+      
 
          let projects = [];
         response.data.data.projects.map((item) => {
@@ -5424,11 +5424,13 @@ export default {
         this.projects = projects;
 
 
-        console.log("this.projects", this.projects);
+        // console.log("this.projects=========================================", this.projects);
 
 
 
-        if(this.org_id!=10510 && this.org_id!=0&&this.org_id!=10206 && this.org_id!=10478 && this.org_id!=0 && this.org_id!=10489 && this.org_id!=10644){
+        if(this.org_id!=10510 &&this.org_id!=10206 && this.org_id!=10478 && this.org_id!=10489){
+            console.log("列表===================================",this.projects)
+            var newHisArr = []
             if(this.projects!=null && this.projects.length >0){
              for(let i=0;i<this.projects.length;i++){
               if(this.projects[i].type== 2){
@@ -5437,7 +5439,7 @@ export default {
                 this.projects[i].project_team_id = 0
 
                 if(this.projects[i].team!= "undefined" && this.projects[i].team.id >0){
-                  console.log("this.projects[i].project.team", this.projects[i].team)
+                 
                   this.projects[i].project_team = this.projects[i].team.project_team
                   this.projects[i].project_team_id = this.projects[i].team.id
                   this.projects[i].start_time = this.projects[i].start_time
@@ -5448,8 +5450,8 @@ export default {
                   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])
+             
+                  newHisArr.push(this.projects[i])
                   // this.doctor_advices_2.push(this.project[i])
                 }else{
                   this.projects[i].project_team = this.projects[i].project.project_name
@@ -5460,20 +5462,28 @@ export default {
                   this.projects[i].execution_time = this.projects[i].execution_time
                   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])
+                  newHisArr.push(this.projects[i])
+
+
                   // this.doctor_advices_2.push(this.projects[i])
                 }
 
+                
+
               }
 
             }
-          }
+            }
+
+            var ordHisArr = this.getQuChong(newHisArr)
+
+           this.doctor_advices.push(...ordHisArr)
         }
 
 
         }
 
-        console.log("时间我我我哦我我",this.doctor_advices)
+       
 
         //针对内蒙古阿拉善
         if(this.org_id ==10206){
@@ -5575,8 +5585,10 @@ export default {
 
         this.totollength = this.doctor_advices.length + this.monitors.length;
         console.log("this.totollength",this.totollength)
+
+        
         if (this.totollength > 18) {
-          var temp_advice_length = 17 - this.monitors.length;
+          var temp_advice_length = this.doctor_advices.length
           var doctor_advices_1 = [];
           var doctor_advices_2 = [];
           for (let index = 0; index < this.doctor_advices.length; index++) {
@@ -5592,7 +5604,7 @@ export default {
         }
         // console.log(this.advice_groups);
 
-
+        console.log("医嘱列表=--=----------------------------------------------",this.doctor_advices)
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");
@@ -5600,7 +5612,17 @@ export default {
       }
       // })
     },
-
+     getQuChong(tempArr) {
+      let result = [];
+        let obj = {};
+        for (let i = 0; i < tempArr.length; i++) {
+            if (!obj[tempArr[i].project_team]) {
+                result.push(tempArr[i]);
+                obj[tempArr[i].project_team] = true;
+            };
+        };
+        return result;
+    },
     bloodAccessParOperaName(id) {
       if (id in this.bloodAccessParOpera) {
         return this.bloodAccessParOpera[id].name;

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -2203,6 +2203,7 @@
                     </div>
 
                     <div
+                      v-if="org_id!=10677"
                       class="inline_block"
                       style="flex: 1; display: inline-block"
                     >

src/xt_pages/stock/drugs/inventory_record.vue

@@ -57,7 +57,7 @@
             </div>
             <div>
                <el-button size="small" type="primary" @click="print_1">打印</el-button>
-               <el-button size="small" type="primary" @click="print">盘点模版打印</el-button>
+             
             </div>
           
         </div>
@@ -124,7 +124,6 @@
                <template slot-scope="scope">
                  <span v-if="scope.row.reason == 10">盘盈</span>
                  <span v-if="scope.row.reason == 11">盘亏</span>
-                 <span v-else>未盘</span>
                </template>
             </el-table-column>
 

src/xt_pages/stock/inventoryRecord.vue

@@ -114,7 +114,7 @@
                 <template slot-scope="scope">
                    <span v-if="scope.row.befor_count > scope.row.after_count">盘亏</span>
                    <span v-if="scope.row.befor_count < scope.row.after_count">盘盈</span>
-                   <span v-else>未盘</span>
+                 
                 </template>
             </el-table-column>