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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                     </table>
                   </td>
                 </tr>
-                <tr v-if="org_id!=10402 && org_id!=10206 && org_id!=0">
+                <tr v-if="org_id!=10402 && org_id!=10206">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
                   </td>
                 </tr>
 
-                 <tr v-if="org_id == 10402 || org_id == 0 || org_id == 10206">
+                 <tr v-if="org_id == 10402 || org_id == 10206">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
             var delghTwo = 0;
             if (
               this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 10
+              this.records[recordIndex].advices.length < 12
             ) {
-              delghTwo = 10 - this.records[recordIndex].advices.length;
+              delghTwo = 12 - this.records[recordIndex].advices.length;
             } else {
               delghTwo = 0;
             }
 
 
           
-            if(this.org_id == 0 || this.org_id == 10206){
+            if(this.org_id == 10206){
               console.log("this.records[recordIndex].his_project", this.records[recordIndex].his_project)
               var delghThree = 0 
              let his_project = []
                 rightIndex in advices ? advices[i + halfLen] : []
               );
             }
-            if (halfLen < 5) {
-              var nl = 5 - leftAdvice.length;
+            if (halfLen < 6) {
+              var nl = 6 - leftAdvice.length;
               for (let index = 0; index < nl; index++) {
                 leftAdvice.push([]);
               }
-              var nl = 5 - rightAdvice.length;
+              var nl = 6 - rightAdvice.length;
               for (let index = 0; index < nl; index++) {
                 rightAdvice.push([]);
               }
               this.records[recordIndex].advices.push(item);
             }
           }
-          console.log(this.records, "this.records");
+          console.log("数据我哦我我", this.records);
           // this.records.forEach(o => {
           //   console.log(o,'jj')
           //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                     </td> -->
                         <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
                         <td height="32px">
-                          <span
-                            v-if="setAdminUserES(advice.advice_doctor) == ''"
-                            >{{ getAdminUser(advice.advice_doctor) }}</span
-                          >
-                          <img
-                            style="height: 30px"
-                            :src="setAdminUserES(advice.advice_doctor)"
-                            alt=""
-                            srcset=""
-                            v-else
-                          />
+                          <span v-if="advice!=null && advice.advice_doctor>0">
+                              <span
+                              v-if="setAdminUserES(advice.advice_doctor) == ''"
+                              >{{ getAdminUser(advice.advice_doctor) }}
+                            </span>
+                            <img
+                              style="height: 30px"
+                              :src="setAdminUserES(advice.advice_doctor)"
+                              alt=""
+                              srcset=""
+                              v-else
+                            />
+                          </span>
+                         
                         </td>
                         <!-- <td height="35px">
                       <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
                       <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
                     </td> -->
                         <td height="32px">
-                          <span
-                            v-if="setAdminUserES(advice.execution_staff) == ''"
-                            >{{ getAdminUser(advice.execution_staff) }}</span
-                          >
-                          <img
-                            style="height: 30px"
-                            :src="setAdminUserES(advice.execution_staff)"
-                            alt=""
-                            srcset=""
-                            v-else
-                          />
+                          <span v-if="advice!=null && advice.execution_staff>0">
+                            <span
+                              v-if="setAdminUserES(advice.execution_staff) == ''"
+                              >{{ getAdminUser(advice.execution_staff) }}</span
+                            >
+                            <img
+                              style="height: 30px"
+                              :src="setAdminUserES(advice.execution_staff)"
+                              alt=""
+                              srcset=""
+                              v-else
+                            />
+                        </span>
                         </td>
                         <td height="32px">
                           <span v-if="advice.execution_time">{{
                           }}</span>
                         </td>
                         <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
-                          <span v-if="setAdminUserES(advice.checker) == ''">{{
-                            getAdminUser(advice.checker)
-                          }}</span>
-                          <img
-                            style="height: 30px"
-                            :src="setAdminUserES(advice.checker)"
-                            alt=""
-                            srcset=""
-                            v-else
-                          />
+                          <span v-if="advice!=null && advice.checker>0">
+                            <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker)}}</span>
+                            <img
+                              style="height: 30px"
+                              :src="setAdminUserES(advice.checker)"
+                              alt=""
+                              srcset=""
+                              v-else
+                            />
+                        </span>
                         </td>
                       </tr>
                       <!-- </template> -->

src/xt_pages/user/Informed/components/Filter_informed.vue

       <div id="print_content">
           <div class="print_page_main_content">
           <div class="content">
-              <h2 style="text-align: center;">血液透析(滤过、灌流)治疗知情同意书</h2>
+              <h2 style="text-align: center;">血液透析(滤过)治疗知情同意书</h2>
 
               <div style="text-align: right;">
                 透析号：{{ patient.dialysis_no }}

src/xt_pages/user/courseOfDisease.vue

             <div class="cell clearfix">
               <label class="title"><span class="name">病程日期</span> : </label>
               <el-date-picker v-model="course_of_disease_time" prefix-icon="el-icon-date" :editable="false"
-                              style="width: 200px;"
+                              style="width: 250px;"
                               type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
                               value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
 

src/xt_pages/workforce/components/editTableData.vue

           week_type: "3",
           week_name: this.editableTabs[2].tableWeekArrage[b].week,
         };
+
         saveOrEditTempData.push(obj);
       }