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

src/xt_pages/data/components/consumables.vue

         </template>
       </el-table-column>
 
+      <el-table-column label="注册证名称" width="140" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.register_number_name }}
+        </template>
+      </el-table-column>
+
       <!-- <el-table-column label="最小单位" width="60" align="center">
         <template slot-scope="scope">
           {{ getGoodUnit(scope.row.good_unit) }}
               retail_price:'',
               medical_insurance_number:'',
               provinces_code:'',
-
               is_special_diseases:'',
               is_record:'',
               statistics_category:'',
               min_unit:"",
               total:"",
               register_number:"",
+              register_number_name:"",
               is_user:"2",
               number:"",
               is_warehouse:"1",
             this.$message.error(response.data.msg);
             return false
           } else {
+            console.log("respons------------",this.goodInfo.goodInfoDialog.formValue.register_number_name)
+
+            console.log("respon23322323",response.data.data.goodInfo.register_number_name)
 
+            this.goodInfo.goodInfoDialog.formValue.register_number_name = response.data.data.goodInfo.register_number_name
             if (response.data.data.goodInfo.good_unit <= 0) {
               this.goodInfo.goodInfoDialog.formValue.good_unit = ''
             } else {
             this.goodInfo.goodInfoDialog.formValue.default_count_unit = response.data.data.goodInfo.default_count_unit
             this.goodInfo.goodInfoDialog.formValue.register_number = response.data.data.goodInfo.register_number
 
+          
+            // this.goodInfo.goodInfoDialog.formValue.register_number_name = response.data.data.goodInfo.register_number_name
+
             this.goodInfo.goodInfoDialog.formValue.bbx01 = response.data.data.goodInfo.bbx01
             this.goodInfo.goodInfoDialog.formValue.bby01 = response.data.data.goodInfo.bby01
 
               this.goodInfo.goodInfoDialog.formValue.is_zero_flag =  response.data.data.goodInfo.is_zero_flag.toString()
             }
 
-            console.log("hahhhhhhhhhhhhhh",response.data.data.goodInfo.split_of_number)
             this.goodInfo.goodInfoDialog.formValue.split_of_number = response.data.data.goodInfo.split_of_number
 
+        
+
 
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
 
         this.goodInfo.goodInfoDialog.formValue.agent = '';
         this.goodInfo.goodInfoDialog.formValue.good_number = '';
         this.goodInfo.goodInfoDialog.formValue.register_number = '';
+        this.goodInfo.goodInfoDialog.formValue.register_number_name = '';
 
 
 

src/xt_pages/dialysis/PatientBox.vue

       // return nowYear - birthdayYear
     },
     getAge: function (val) {
-      console.log('1111111111222222',val);
       
       var thisLen = val.patient.id_card_no.length;
       var birth = "";

src/xt_pages/dialysis/bloodPresssWatch.vue

         </el-table-column>
 
 
+        <el-table-column label="KTV" align="center" width="120">
+           <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{ item.ktv }}
+                  </td>
+               </tr>
+
+            </template>
+        </el-table-column>
+
+
        <el-table-column label="血流量" align="center" width="120" v-if="isShow('血流量')">
            <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
               SchedualPatientsTable["sch_time"] = parseTime(response.data.data.schedule[i].schedule_date,"{y}-{m}-{d}");
               SchedualPatientsTable["mode_id"] = response.data.data.schedule[i].mode_id
                 
-              if(response.data.data.schedule[i].prescription.dialyzer_perfusion_apparatus !=""){
+              if(response.data.data.schedule[i].prescription!=null&&response.data.data.schedule[i].prescription.dialyzer_perfusion_apparatus !=""){
                 SchedualPatientsTable["dialysis_dialyszers_name"] = response.data.data.schedule[i].prescription.dialyzer_perfusion_apparatus 
               }
 
-              if(response.data.data.schedule[i].prescription.dialyzer_perfusion_apparatus ==""){
+              if(response.data.data.schedule[i].prescription!=null&&response.data.data.schedule[i].prescription.dialyzer_perfusion_apparatus ==""){
                 SchedualPatientsTable["dialysis_dialyszers_name"] = response.data.data.schedule[i].prescription.dialysis_dialyszers + response.data.data.schedule[i].prescription.dialysis_irrigation 
               }
              

src/xt_pages/dialysis/details/index.vue

                     <p :class="data.isSelected ? 'is-selected' : ''" style="text-align: center;" >
                       {{ data.day.split('-').slice(2).join('-') }}<br/>
                       <span v-for="(item,index) in orderList" :key="index" style="background: red;color: white;text-align: center;">
-                        <span v-if="data.day == item.order_date">
-                          {{ getModeId(item.mode_id) }}
-                          <span v-if="item.schedual_type_name ==1">上午</span>
-                          <span v-if="item.schedual_type_name ==2">下午</span>
-                          <span v-if="item.schedual_type_name ==3">晚上</span>
+                        <span  :class="[data.isSelected ? 'is-selected' : '',isFutureDate(data.day) ? 'future-date' : '']" >
+                          <span v-if="data.day == item.order_date">
+                            {{ getModeId(item.mode_id) }}
+                            <span v-if="item.schedual_type_name ==1">上午</span>
+                            <span v-if="item.schedual_type_name ==2">下午</span>
+                            <span v-if="item.schedual_type_name ==3">晚上</span>
+                          </span>
                         </span>
                       </span>
                     </p>
     this.websocketSend(unObj)
   },
   methods: {
+    isFutureDate(dateString) {
+      const today = new Date();
+      today.setHours(0, 0, 0, 0); // 清除时间部分，只比较日期
+      
+      const date = new Date(dateString);
+      return date > today;
+    },
     scrollToCurrentRow() {
       this.$nextTick(() => {
         const tableRef = this.activeName === 'first' ? 'tab' : 'tab1'
     }
 }
 
+.future-date {
+  color:#e6f7ff;
+}
+/* 如果需要背景色而不是文字颜色 */
+.future-date {
+  background-color: #409eff;
+}
+
 </style>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                     this.projects[i].project_team = this.projects[i].project.project_name
                     this.projects[i].advice_name = this.projects[i].project.project_name
                     this.projects[i].start_time = this.projects[i].start_time
-                    this.projects[i].single_dose = this.projects[i].single_dose
+                    this.projects[i].single_dose = this.projects[i].count
                     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
     getAge: function (val) {
 
       if (val.id_card_no) {
-        var thisLen = val.id_card_no.length
 
-        var birth = ''
+        var thisLen = val.id_card_no.length;
+        var birth = "";
         if (thisLen == 15) {
-          birth = '19' + val.id_card_no.substr(6, 6)
+          birth = "19" + val.id_card_no.substr(6, 6);
         } else {
-          birth = val.id_card_no.substr(6, 8)
+          birth = val.id_card_no.substr(6, 8);
         }
         var birthtwo =
           birth.substr(0, 4) +
-          '-' +
+          "-" +
           birth.substr(4, 2) +
-          '-' +
-          birth.substr(6, 2)
-        if (this.org_id != 10460 && this.org_id!=10751 && this.org_id == 0) {
-          var age = jsGetAge(birthtwo, '-')
-          return age
+          "-" +
+          birth.substr(6, 2);
+
+        var age = jsGetAge(birthtwo, "-");
+        if(age >0){
+          return age;
+        }else {
+           return val.age
         }
+    
+        // var thisLen = val.id_card_no.length
+
+        // var birth = ''
+        // if (thisLen == 15) {
+        //   birth = '19' + val.id_card_no.substr(6, 6)
+        // } else {
+        //   birth = val.id_card_no.substr(6, 8)
+        // }
+        // var birthtwo =
+        //   birth.substr(0, 4) +
+        //   '-' +
+        //   birth.substr(4, 2) +
+        //   '-' +
+        //   birth.substr(6, 2)
+        // if (this.org_id != 10460 && this.org_id!=10751) {
+        //   var age = jsGetAge(birthtwo, '-')
+        //   return age
+        // }
 
-        if (this.org_id == 10460) {
-          console.log("日期搜哦", this.schedule_date_one)
-          var strBirthdayArr = this.schedule_date_one.split("-")
-          console.log("strBirthdayArr", strBirthdayArr)
-          var yeaer = strBirthdayArr[0]
-          var month = strBirthdayArr[1]
-          var day = strBirthdayArr[2]
-          var age = jsGetAgeOne(birthtwo, '-', yeaer, month, day)
-          // console.log("agesssss",age)
-          return age
+        // if (this.org_id == 10460) {
+        //   console.log("日期搜哦", this.schedule_date_one)
+        //   var strBirthdayArr = this.schedule_date_one.split("-")
+        //   console.log("strBirthdayArr", strBirthdayArr)
+        //   var yeaer = strBirthdayArr[0]
+        //   var month = strBirthdayArr[1]
+        //   var day = strBirthdayArr[2]
+        //   var age = jsGetAgeOne(birthtwo, '-', yeaer, month, day)
+        //   // console.log("agesssss",age)
+        //   return age
 
-        }
+        // }
 
-        if(this.org_id ==10751 || this.org_id == 0){
+        // if(this.org_id == 10751){
            
-          return val.age
-        }
+        //   return val.age
+        // }
 
       }
     },
+    
     newAdviceGroupObject: function () {
       return Object.assign(
         {},

src/xt_pages/management/components/ManageForm.vue

             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="使用年限(年)" prop="user_year">
+            <el-form-item label="使用年限(年):" prop="user_year">
               <el-input style="width:135px" v-model="form.user_year"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="工作时长(h)" prop="work_time">
+            <el-form-item label="工作时长(h):" prop="work_time">
               <el-input style="width:135px" v-model="form.work_time"></el-input>
             </el-form-item>
           </el-col>
 
+          <el-col :span="8">
+            <el-form-item label="产地:" prop="work_time">
+              <el-input style="width:135px" v-model="form.home_address"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="配置:" prop="work_time">
+              <el-input style="width:135px" v-model="form.home_setting"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="类别:" prop="work_time">
+              <el-input style="width:135px" v-model="form.home_type"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="设备类别:" prop="work_time">
+              <el-input style="width:135px" v-model="form.home_big_type"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8">
             <el-form-item label="反渗模式:" v-show="reverseShow">
               <el-select style="width:135px" v-model="form.revers_mode">
         treat_type: [], // 治疗模式
         beds: "",
         zone_id:"",
+        home_address:"",
+        home_setting:"",
+        home_type:"",
+        home_big_type:"",
       },
       forms: {
         beds: ""
               this.form.user_year = "";
               this.form.work_time = "";
               this.form.unit_type = "";
+              this.form.home_address = ""
+              this.form.home_setting = ""
+              this.form.home_type = ""
+              this.form.home_big_type =""
               this.getAllSubregion();
               this.$emit("getAllMachineInfo");
               this.$forceUpdate();

src/xt_pages/management/home.vue

                                        <el-input style="width:150px" v-model="form.work_time" :disabled="disableThree"></el-input>
                                    </el-form-item>
                                 </el-col>
+                                <el-col :span="8">
+                                   <el-form-item label="产地:">
+                                       <el-input style="width:150px" v-model="form.home_address" :disabled="disableThree"></el-input>
+                                   </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                   <el-form-item label="配置:">
+                                       <el-input style="width:150px" v-model="form.home_setting" :disabled="disableThree"></el-input>
+                                   </el-form-item>
+                                </el-col>
                              </el-row>
+                             <el-row>
+                                <el-col :span="8">
+                                   <el-form-item label="类别:">
+                                       <el-input style="width:150px" v-model="form.home_type" :disabled="disableThree"></el-input>
+                                   </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                   <el-form-item label="设备类别:">
+                                       <el-input style="width:150px" v-model="form.home_big_type" :disabled="disableThree"></el-input>
+                                   </el-form-item>
+                                </el-col>
+                             </el-row>
+
+                            
+
                              <el-row>
                                  <el-form-item label="治疗模式:">
                                    <el-checkbox-group v-model="form.treat_mode" @change="handleCheckedCitiesChange">
                                          <el-input style="width:150px" v-model="form.work_time" :disabled="disableFour"></el-input>
                                      </el-form-item>
                                   </el-col>
+                                  
+                                <el-col :span="8">
+                                   <el-form-item label="产地:">
+                                       <el-input style="width:150px" v-model="form.home_address" :disabled="disableThree"></el-input>
+                                   </el-form-item>
+                                </el-col>
+
+                                <el-col :span="8">
+                                   <el-form-item label="产地:">
+                                       <el-input style="width:150px" v-model="form.home_setting" :disabled="disableThree"></el-input>
+                                   </el-form-item>
+                                </el-col>
+                           
                                  <el-col :span="8">
                                   <el-form-item label="反渗模式:">
                                       <el-select style="width:135px" v-model="form.revers_mode" :disabled="disableFour">
                                        <el-input style="width:150px" v-model="form.work_time" :disabled="disableFive"></el-input>
                                    </el-form-item>
                                 </el-col>
+                             </el-row>
+                             <el-row>
+                                <el-col :span="8">
+                                   <el-form-item label="产地:">
+                                       <el-input style="width:150px" v-model="form.home_address" :disabled="disableThree"></el-input>
+                                   </el-form-item>
+                                </el-col>
+                             </el-row>
+                             <el-row>
+                                <el-col :span="8">
+                                   <el-form-item label="产地:">
+                                       <el-input style="width:150px" v-model="form.home_setting" :disabled="disableThree"></el-input>
+                                   </el-form-item>
+                                </el-col>
                              </el-row>
                               <el-row>
                                <div class="but">
           beds: '',
           bed_numbers: '',
           zone_id:"",
+          home_address:"",
+          home_setting:"",
+          home_type:"",
+          home_big_type:"",
         },
         activeName: 'first',
         activeNameTwo: 'first',
             this.form.rubbish_reason = addmacher.rubbish_reason
             this.form.user_year = addmacher.user_year
             this.form.work_time = addmacher.work_time
+            this.form.home_address = addmacher.home_address
+            this.form.home_setting = addmacher.home_setting
+            this.form.home_type = addmacher.home_type
+            this.form.home_big_type = addmacher.home_big_type
 
             // eslint-disable-next-line eqeqeq
             if (addmacher.disinfection_mode == 0) {

src/xt_pages/outpatientTool/labelPrint.vue

                       </div>
                       <div style="margin-bottom:0px;">{{current_number}}</div>
                       <div style="display:flex;">
-                          <div style="font-size:15px;padding-left:20px;">{{current_project_name}}</div>
-                          <div style="font-size:15px;margin-left:20px;">{{current_name}}</div>
+                          <div style="font-size:18px;padding-left:20px;font-weight: bold">{{current_project_name}}</div>
+                          <div style="font-size:14px;margin-left:20px;font-weight: bold">{{current_name}}</div>
                       </div>
                   </div>
             </div>

src/xt_pages/role/admin.vue

           @click="toCheckPDFInformation">PDF验证</el-button> -->
 
 
-          <el-button
+          <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button>
+          @click="toAutoDiagnose">自动脚本</el-button> -->
 
         <!-- <el-button
           type="primary"

src/xt_pages/role/components/AdminInfoForm.vue

         </el-col>
       </el-row>
 
+      <el-row :span="24">
+        <el-col :span="8">
+          <el-form-item label="出生日期：">
+            <el-date-picker
+                    v-model="form.birth"
+                    type="date"
+                    placeholder="选择日期"
+                    :suffix-icon="'el-icon-menu'"
+                    @change="hadSelectBirth"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                  ></el-date-picker>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="执业注册地：">
+            <el-input v-model="form.work_address" style="width:180px;"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :span="24">
+        <el-col :span="8">
+          <el-form-item label="在该院开始执业时间：" :label-width="'200px'">
+            <el-date-picker
+                    v-model="form.work_start_time"
+                    type="date"
+                    placeholder="选择日期"
+                    :suffix-icon="'el-icon-menu'"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                  ></el-date-picker>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="在该院结束执业时间："  :label-width="'200px'">
+            <el-date-picker
+                    v-model="form.work_end_time"
+                    type="date"
+                    placeholder="选择日期"
+                    :suffix-icon="'el-icon-menu'"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                  ></el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <div v-show="show">
         <el-row :span="24">
           <el-col :span="8">
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="医药师职业证编码:">
+            <el-form-item label="医药师执业证编码:">
               <el-input v-model="form.doctor_code" style="width:170px;"></el-input>
             </el-form-item>
           </el-col>
         doctor_number: '',//医保医生编号
         outpatient_illnessCategory: '',//门诊大病类别
         is_active: '',//在职状态
-        active_status: ''//执业状态
+        active_status: '',//执业状态
+        birth:"",
+        work_address:"",
+        work_start_time:"",
+        work_end_time:"",
       },
       departMent: [],
       sexList: [
               this.form.active_status = ''
             }
 
+            this.form.work_address =  admin.work_address
+
+            this.form.work_end_time = this.getTime(admin.work_end_time) 
+
+            this.form.work_start_time = this.getTime(admin.work_start_time) 
+
+            this.form.birth = this.getTime(admin.birth) 
+
             var id = 0
             for (let i = 0; i < this.numberList.length; i++) {
               if (this.numberList[i].name == admin.outpatient_illness_category) {
               doctor_number: this.form.doctor_number,//医保医生编号
               outpatient_illnessCategory: name,//门诊大病类别
               is_active: this.form.is_active,//在职状态
-              active_status: this.form.active_status//执业状态
+              active_status: this.form.active_status,//执业状态
+              birth:this.form.birth,
+              work_address:this.form.work_address,
+              work_start_time:this.form.work_start_time,
+              work_end_time:this.form.work_end_time
 
             }
             console.log('params', params)
               doctor_number: this.form.doctor_number,//医保医生编号
               outpatient_illnessCategory: name,//门诊大病类别
               is_active: this.form.is_active,//在职状态
-              active_status: this.form.active_status//执业状态
+              active_status: this.form.active_status,//执业状态
+              work_address:this.form.work_address,
+              birth:this.form.birth,
+              work_start_time:this.form.work_start_time,
+              work_end_time:this.form.work_end_time
+
+
 
             }
             console.log('params2222222', params)

src/xt_pages/role/departManage.vue

                  {{scope.row.number}}
              </template>
          </el-table-column>
+         <el-table-column label="科室类型"  prop="ip" min-width="150" align="center">
+             <template slot-scope="scope">
+                 {{scope.row.department_type}}
+             </template>
+         </el-table-column>
+         <el-table-column label="负责人"  prop="ip" min-width="150" align="center">
+             <template slot-scope="scope">
+                 {{scope.row.lender}}
+             </template>
+         </el-table-column>
+         <el-table-column label="联系电话"  prop="ip" min-width="150" align="center">
+             <template slot-scope="scope">
+                 {{scope.row.phone}}
+             </template>
+         </el-table-column>
+         <el-table-column label="成立时间"  prop="ip" min-width="150" align="center">
+             <template slot-scope="scope">
+                 {{scope.row.start_time}}
+             </template>
+         </el-table-column>
         <el-table-column label="操作" width="160" align="center">
           <template slot-scope="scope">
             <el-tooltip
                   </el-form-item>
                  </el-col>
              </el-row>
+             <el-row :span="24" >
+                 <el-col :span="12">
+                   <el-form-item label="科室类型:">
+                      <el-input v-model="form.department_type"  style="width:200px"></el-input>
+                  </el-form-item>
+                 </el-col>
+             </el-row>
+             <el-row :span="24" >
+                 <el-col :span="12">
+                   <el-form-item label="负责人:">
+                      <el-input v-model="form.lender"  style="width:200px"></el-input>
+                  </el-form-item>
+                 </el-col>
+             </el-row>
+             <el-row :span="24" >
+                 <el-col :span="12">
+                   <el-form-item label="联系电话:">
+                      <el-input v-model="form.phone"  style="width:200px"></el-input>
+                  </el-form-item>
+                 </el-col>
+             </el-row>
+             <el-row :span="24" >
+                 <el-col :span="12">
+                   <el-form-item label="成立时间:">
+                      <el-input v-model="form.start_time"  style="width:200px"></el-input>
+                  </el-form-item>
+                 </el-col>
+             </el-row>
           </el-form>
         </span>
         <span slot="footer" class="dialog-footer">
                   </el-form-item>
                  </el-col>
              </el-row>
+             <el-row :span="24" >
+                 <el-col :span="12">
+                   <el-form-item label="科室类型:">
+                      <el-input v-model="form.department_type"  style="width:200px"></el-input>
+                  </el-form-item>
+                 </el-col>
+             </el-row>
+             <el-row :span="24" >
+                 <el-col :span="12">
+                   <el-form-item label="负责人:">
+                      <el-input v-model="form.lender"  style="width:200px"></el-input>
+                  </el-form-item>
+                 </el-col>
+             </el-row>
+             <el-row :span="24" >
+                 <el-col :span="12">
+                   <el-form-item label="联系电话:">
+                      <el-input v-model="form.phone"  style="width:200px"></el-input>
+                  </el-form-item>
+                 </el-col>
+             </el-row>
+             <el-row :span="24" >
+                 <el-col :span="12">
+                   <el-form-item label="成立时间:">
+                      <el-input v-model="form.start_time"  style="width:200px"></el-input>
+                  </el-form-item>
+                 </el-col>
+             </el-row>
           </el-form>
         </span>
         <span slot="footer" class="dialog-footer">
         id:0,
         name:"",
         number:"",
+        department_type:"",
+        lender:"",
+        phone:"",
+        start_time:""
       },
       limit:20,
       page:1,
          var params = {
             name:this.form.name,
             number:this.form.number,
+            department_type:this.form.department_type,
+            lender:this.form.lender,
+            phone:this.form.phone,
+            start_time:this.form.start_time,
          }
        this.$refs[formName].validate((valid)=>{
           SaveDepartment(params).then(response=>{
            this.form.id = departDetail.id
            this.form.name = departDetail.name
            this.form.number = departDetail.number
+           this.form.department_type = departDetail.department_type
+           this.form.lender = departDetail.lender
+           this.form.phone = departDetail.phone
+           this.form.start_time = departDetail.start_time
          }
       })
     },
             id:this.form.id,
             name:this.form.name,
             number:this.form.number,
+            department_type:this.form.department_type,
+            lender:this.form.lender,
+            phone:this.form.phone,
+            start_time:this.form.start_time,
          }
        this.$refs[formName].validate((valid)=>{
           UpdatedDepartment(params).then(response=>{

src/xt_pages/stock/Dialog/goodInfoDailog.vue

               <el-input v-model="form.register_number" style="width:180px"></el-input>
             </el-form-item>
 
+            <el-form-item label="注册证名称:" >
+              <el-input v-model="form.register_number_name" style="width:180px"></el-input>
+            </el-form-item>
+
             <el-form-item label="是否零用:">
 
               <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择" @change="changeUse">
           min_unit:"",
           total:"",
           register_number:"",
+          register_number_name:"",
           is_user:"2",
           number:"",
           is_warehouse:"1",
               bbx01:"",
               bby01:"",
               split_of_number:"",
+              register_number:"",
+              register_number_name:""
             }
           this.good_status = []
           for (let key in tempform) {
         form["default_count_unit"] = this.form.default_count_unit
         form["total"] = this.form.total
         form["register_number"] = this.form.register_number
+        form["register_number_name"] = this.form.register_number_name
         form["is_user"] = this.form.is_user
         form["number"] = this.form.number
         form["is_warehouse"] = this.form.is_warehouse

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877 && orgId!=10387 && orgId!=0  && orgId!=10697">
+        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877 && orgId!=10387 && orgId!=0  && orgId!=10697 && orgId!=10744&& orgId!=9478&& orgId!=10751">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
       </div> 
 
 
-      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877 || orgId == 0 || orgId ==10387 || orgId == 10697">
+      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877 || orgId == 0 || orgId ==10387 || orgId == 10697 || orgId == 10744 || orgId == 9478 || orgId == 10751">
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>

src/xt_pages/stock/stockOutOrderAdd.vue

       tempObj['register_number'] = ''
       tempObj['patient_id'] =0
       tempObj["class_type"] = ""
+      tempObj["dealer"] = ""
+      tempObj["manufacturer"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
     tempObj["product_date"] = ""
     tempObj["expiry_date"] = ""
     tempObj["count"] = ""
+    tempObj["dealer"] = ""
+    tempObj["manufacturer"] = ""
    
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();

src/xt_pages/user/Informed/Informedconsent.vue

                 </div>
 
                 <div v-if="template_id==30">
-                  <informef_Thrity></informef_Thrity>
+                  <informef_Thrity :patient_id="this.patientID" ref="childthrity"></informef_Thrity>
                 </div> 
 
                 <div v-if="template_id==31">
 
       }else if(row.value == 24){
 
+      }else if(row.value == 30){
+
       }
       console.log('11112',this.template_id);
     },

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

   <div class="anticoagulation-consent">
     <div class="toolbar">
       <el-button type="primary" size="small" @click="editContent">编辑内容</el-button>
-      <el-button type="success" size="small" @click="printDocument">打印文档</el-button>
-      <el-button size="small" @click="resetForm">重置表单</el-button>
+      <el-button type="success" size="small" @click="printDocument">打印</el-button>
     </div>
 
-    <div id="printable-content" class="document-container">
+    <!-- <div id="print_content"class="document-container">
       <h1 class="document-title">血液净化抗凝治疗知情同意书</h1>
 
-      <!-- 患者信息表格 -->
+     
       <table class="patient-info-table">
         <tr>
-          <td width="25%"><strong>患者姓名</strong>: {{ form.patientName || '_________________' }}</td>
-          <td width="25%"><strong>性别</strong>: {{ form.gender || '______' }}</td>
-          <td width="25%"><strong>年龄</strong>: {{ form.age || '______' }}</td>
-          <td width="25%"><strong>病案号</strong>: {{ form.medicalRecordNo || '_________________' }}</td>
+          <td width="25%"><strong>患者姓名</strong>:
+            {{ patient.name }}
+           </td>
+          <td width="25%"><strong>性别</strong>:
+           <span v-if="patient.gender ==1">男</span> 
+           <span v-if="patient.gender ==2">女</span> 
+           </td>
+          <td width="25%"><strong>年龄</strong>: 
+          {{ patient.age}}</td>
+          <td width="25%"><strong>病案号</strong>: {{ patient.admission_number }}</td>
         </tr>
       </table>
 
-      <!-- 富文本内容区域 -->
+     
       <div class="rich-text-content" v-html="formattedContent"></div>
+    </div> -->
+
+    <div id="print_content">
+          <div class="print_page_main_content">
+          <div class="content">
+            <div style="text-align: center;font-size: 20px;">{{ orgname }}</div>
+            <div style="text-align: center;font-size: 20px;">血液净化中心首次透析病人护理宣教单</div>
+            <h2 style="text-align: center;"></h2>
+            <table class="patient-info-table">
+                <tr>
+                  <td width="25%"><strong>患者姓名</strong>:
+                    {{ patient.name }}
+                  </td>
+                  <td width="25%"><strong>性别</strong>:
+                  <span v-if="patient.gender ==1">男</span> 
+                  <span v-if="patient.gender ==2">女</span> 
+                  </td>
+                  <td width="25%"><strong>年龄</strong>: 
+                  {{ patient.age}}</td>
+                  <td width="25%"><strong>病案号</strong>: {{ patient.admission_number }}</td>
+                </tr>
+            </table>
+            <div class="rich-text-content" v-html="formattedContent"></div>
+          </div>
+        </div>
     </div>
 
     <!-- 富文本编辑器弹窗 -->
 </template>
 
 <script>
-import { printJS } from 'print-js'
+
+import print from "print-js";
 import Editor from '@/components/Editor'
+import { getPatientDetailInformedconsent  } from '@/api/patient'
 export default {
+  patient_id: {
+    type: Number,
+   },
   name: 'AnticoagulationConsentForm',
   components: {
     Editor
   },
   data() {
     return {
+      patient:{},
       editorVisible: false,
       patientInfoVisible: false,
       editorContent: '',
     }
   },
   created() {
-    this.loadFormData()
+    this.orgname = this.$store.getters.xt_user.org.org_name;
+    
+    this.getlist()
+    this.org_id = this.$store.getters.xt_user.org.id
+    
   },
   methods: {
+    getlist(){
+        getPatientDetailInformedconsent(this.patient_id).then(response=>{
+          if(response.data.state == 1){
+            var patient =  response.data.data.patients
+            console.log("patinet----------------------------",patient)
+            this.patient =patient
+          }
+        })
+    },
     loadFormData() {
       getConsentForm().then(response => {
         if (response.data) {
       this.patientInfoVisible = false
     },
     printDocument() {
-      printJS({
-        printable: 'printable-content',
-        type: 'html',
-        documentTitle: '血液净化抗凝治疗知情同意书',
-        scanStyles: false,
-        style: `
-          @page { size: A4; margin: 1cm; }
-          body { font-family: "SimSun", "宋体", serif; font-size: 14px; line-height: 1.5; }
-          .document-title { text-align: center; font-size: 18px; font-weight: bold; margin-bottom: 20px; }
-          .patient-info-table { width: 100%; border-collapse: collapse; margin: 15px 0; }
-          .patient-info-table td { padding: 5px 0; }
-          .rich-text-content h3 { font-size: 16px; font-weight: bold; margin: 15px 0 10px 0; }
-          .rich-text-content h4 { font-size: 15px; font-weight: bold; margin: 12px 0 8px 0; }
-          .rich-text-content ul, .rich-text-content ol { margin: 10px 0 10px 20px; }
-          .rich-text-content li { margin-bottom: 5px; }
-          .rich-text-content p { margin: 8px 0; }
-          .signature-section { margin-top: 30px; }
-          .signature-row { margin-bottom: 20px; }
-          .signature-box { display: inline-block; margin-right: 40px; vertical-align: top; }
-          .note { font-style: italic; margin-bottom: 10px; }
-          .signature-line, .date-line, .relationship-line { 
-            display: inline-block; 
-            min-width: 150px; 
-            border-bottom: 1px solid #000; 
-          }
-          .date-line { min-width: 120px; }
-          .relationship-line { min-width: 80px; }
-        `
-      })
+
+      const style = '@media print {  .table tr td{border: 1px solid black;text-align: center;align-items: center;}}'
+          printJS({
+              printable: 'print_content',
+              type: 'html',
+              documentTitle: '  ',
+              style: style,
+              scanStyles: false
+          })
+      // printJS({
+      //   printable: 'printable-content',
+      //   type: 'html',
+      //   documentTitle: '血液净化抗凝治疗知情同意书',
+      //   scanStyles: false,
+      //   style: `
+      //     @page { size: A4; margin: 1cm; }
+      //     body { font-family: "SimSun", "宋体", serif; font-size: 14px; line-height: 1.5; }
+      //     .document-title { text-align: center; font-size: 18px; font-weight: bold; margin-bottom: 20px; }
+      //     .patient-info-table { width: 100%; border-collapse: collapse; margin: 15px 0; }
+      //     .patient-info-table td { padding: 5px 0; }
+      //     .rich-text-content h3 { font-size: 16px; font-weight: bold; margin: 15px 0 10px 0; }
+      //     .rich-text-content h4 { font-size: 15px; font-weight: bold; margin: 12px 0 8px 0; }
+      //     .rich-text-content ul, .rich-text-content ol { margin: 10px 0 10px 20px; }
+      //     .rich-text-content li { margin-bottom: 5px; }
+      //     .rich-text-content p { margin: 8px 0; }
+      //     .signature-section { margin-top: 30px; }
+      //     .signature-row { margin-bottom: 20px; }
+      //     .signature-box { display: inline-block; margin-right: 40px; vertical-align: top; }
+      //     .note { font-style: italic; margin-bottom: 10px; }
+      //     .signature-line, .date-line, .relationship-line { 
+      //       display: inline-block; 
+      //       min-width: 150px; 
+      //       border-bottom: 1px solid #000; 
+      //     }
+      //     .date-line { min-width: 120px; }
+      //     .relationship-line { min-width: 80px; }
+      //   `
+      // })
     },
     resetForm() {
       this.$confirm('确定要重置表单内容吗?', '提示', {
     padding: 0;
   }
 }
-</style>
+</style>
+
+<style lang="scss" scoped>
+
+*{
+  // margin: 0;
+  // padding: 0;
+  border: 0;
+}
+  .content{
+      p{
+        font-size: 16px;
+        font-family: '新宋体';
+        line-height: 22px;
+        // padding-left: 20px;
+        // margin-bottom: 5px;
+        text-align: justify;
+      }
+  }
+  .print_page_main_content {
+    background-color: white;
+    width: 100%;
+    padding: 0 0 0 0;
+    page-break-after: always;
+  }
+  .table tr{
+    page-break-inside:avoid
+  }
+  .table tr td{
+    border: 1px solid black;
+    // text-align: center;
+    // align-items: center;
+  }
+</style>

src/xt_pages/user/courseOfDisease_new.vue

         getInspectionByProjectId(params).then(response=>{
           if(response.data.state == 1){
             var inspection =  response.data.data.inspection
+            var referenceList = response.data.data.referenceList
+            console.log("referenctLit=====",referenceList)
             var inspection_str = i.project_name + "-"+"检验日期:"+this.getTime(i.inspect_date)+";"
             if(inspection!=null && inspection.length>0){
               for(let i=0;i<inspection.length;i++){
+                inspection[i].unit = ""
+               for(let j=0;j<referenceList.length;j++){
+                 if(inspection[i].item_id == referenceList[j].id){
+                    inspection[i].unit = referenceList[j].unit
+                 }
+               }
                 if(inspection[i].inspect_value!=""){
-                  inspection_str += inspection[i].item_name+":" + inspection[i].inspect_value+","
+                  inspection_str += inspection[i].item_name+ "("+inspection[i].unit+")"+":" + inspection[i].inspect_value+","
                 }
 
               }

src/xt_pages/workforce/components/editTableData.vue

                   <span v-if="scope.row.is_infectious != 2" >
                     {{scope.row.name  }}
                   </span>
-                  <!-- <span class="touxi_cishu"  @click="chishuclick(scope.row.name)">
-                    0/4
-                  </span> -->
+                  <span class="touxi_cishu"  @click="chishuclick(scope.row)">
+                    历史
+                  </span>
               </template>
               </el-table-column>
             </el-table>
       :modal-append-to-body='false'
       :close-on-click-modal="false">
       <div>
-        <div style="line-height: 40px;">
+        <!-- <div style="line-height: 40px;">
           透析频率：HD(每周2次)
-        </div>
+        </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('-')=='03-06'"
-                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('-')=='03-06'">上午 门诊</span>
-              </p>
-
-            </template>
-          </el-calendar>
+        <div @click="viewDayWork">
+          <el-calendar v-model="time_value">
+                <template
+                  slot="dateCell"
+                  slot-scope="{date, data}" >
+                    <p :class="data.isSelected ? 'is-selected' : ''" style="text-align: center;" >
+                      {{ data.day.split('-').slice(2).join('-') }}<br/>
+                      <span v-for="(item,index) in orderList" :key="index" style="background: red;color: white;text-align: center;">
+                        <span  :class="[data.isSelected ? 'is-selected' : '',isFutureDate(data.day) ? 'future-date' : '']" >
+                          <span v-if="data.day == item.order_date">
+                            {{ getModeId(item.mode_id) }}
+                            <span v-if="item.schedual_type_name ==1">上午</span>
+                            <span v-if="item.schedual_type_name ==2">下午</span>
+                            <span v-if="item.schedual_type_name ==3">晚上</span>
+                          </span>
+                        </span>
+                      </span>
+                    </p>
+              </template>
+            </el-calendar>
         </div>
       </div>
     </el-dialog>
   BatchSmartSch,
 
 } from "@/api/schedule_template/sch_template";
+import {getPatientDialysisRecordList} from '@/api/dialysis_record'
 import {
   CancelScheduleTwo,
   CancelSchedule,
 
   data() {
     return {
+      time_value:new Date(),
+      start_time:moment().startOf('months').format('YYYY-MM-DD'),
+      end_time:moment().endOf('months').format('YYYY-MM-DD'),
       schedulingTableVisible:true,//全屏
       tipDialogVisibleTwo:false,
       tipDialogVisibleThree:false,
       pageY:0,
       draggable:true,
       org_id:'',
+      patient_id:0,
+      orderList:[]
     };
   },
 
   watch: {
+    time_value:{
+      handler(newValue,oldValue){
+        // this.initData()
+        this.time_value = newValue
+        // this.getmonth(this.time_value)
+        this.start_time = moment(this.time_value).startOf('month').format('YYYY-MM-DD')
+        this.end_time = moment(this.time_value).endOf('month').format('YYYY-MM-DD')
+        // this.start_time =  moment().month(months).startOf('month').format('YYYY-MM-DD')
+        // this.end_time = moment().month(months).endOf('month').format('YYYY-MM-DD')
+        // console.log('rrrrr',this.start_time,this.end_time);
+        // this.end_time =   moment(oldValue).format('YYYY-MM-DD')
+      }
+    },
+    '$route.query.patient_id'(newVal) {
+       if (newVal) {
+        this.scrollToCurrentRow()
+      }
+    },
     week_type: function () {
       this.isShowOne = false;
       this.isShowTwo = false;
     },
   },
   methods: {
+    viewDayWork(val){
+
+      const starttime = moment(this.time_value).format('YYYY-MM-DD')
+      const len = (val.target.innerText).split(' ')
+    
+      if(val.target.innerText == '下个月'){
+        this.start_time = moment(this.time_value).startOf('month').format('YYYY-MM-DD')
+        this.end_time = moment(this.time_value).endOf('month').format('YYYY-MM-DD')
+       
+        this.getPatientDialysisRecordList()
+      }else if(val.target.innerText == '上个月'){
+        this.start_time = moment(this.time_value).startOf('month').format('YYYY-MM-DD')
+        this.end_time = moment(this.time_value).endOf('month').format('YYYY-MM-DD')
+        
+        this.getPatientDialysisRecordList()
+      }else if(val.target.innerText =='今天'){
+        this.start_time = moment(this.time_value).startOf('month').format('YYYY-MM-DD')
+        this.end_time = moment(this.time_value).endOf('month').format('YYYY-MM-DD')
+        
+        this.getPatientDialysisRecordList()
+      }else{
+        if(len.length>1){
+          var patient_id = this.patient_id
+          var start_time = this.timestamp(starttime)
+          this.$router.push({
+            path: "/dialysis/details",
+            query: { patient_id:patient_id , date: start_time}
+          });
+          this.history_click = false
+        }else{
+          this.time_value
+        }
 
+       }
+      },
+    timestamp(start_time) {
+      // 使用 Date 对象和它的 getTime 方法将日期字符串转换为时间戳
+      return new Date(start_time).getTime()/1000 - 28800;
+     },
+    getOrderTime(val){
+      // console.log('77778888',val,this.dialysis_date=uParseTime(val, "{y}-{m}-{d}"));
+      if (val < 0) {
+        return "";
+      }
+      if (val == "") {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
+      }
+    },
+    isFutureDate(dateString) {
+      const today = new Date();
+      today.setHours(0, 0, 0, 0); // 清除时间部分，只比较日期
+      
+      const date = new Date(dateString);
+      return date > today;
+    },
+    getModeId(val){
+      var name =""
+      if(val == 1){
+        name ="HD"
+      }
+      if(val == 2){
+        name ="HDF"
+      }
+      if(val == 3){
+        name ="HD+HP"
+      }
+      if(val == 4){
+        name ="HP"
+      }
+      if(val == 5){
+        name ="HF"
+      }
+      if(val == 6){
+        name ="SCUF"
+      }
+      if(val == 7){
+        name ="IUF"
+      }
+      if(val == 8){
+        name ="HFHD"
+      }
+      if(val == 9){
+        name ="HFHD+HP"
+      }
+      if(val == 10){
+        name ="HFD"
+      }
+      if(val == 11){
+        name ="HFR"
+      }
+      if(val == 12){
+        name ="HDF+HP"
+      }
+      if(val == 13){
+        name ="CRRT"
+      }
+      if(val == 14){
+        name ="腹水回输"
+      }
+      if(val == 19){
+        name ="IUF+HD"
+      }
+      if(val == 20){
+        name ="UF"
+      }
+      if(val == 21){
+        name ="HD+"
+      }
+      if(val == 22){
+        name ="血浆胆红素吸附+HDF"
+      }
+      if(val == 23){
+        name ="血浆胆红素吸附"
+      }
+      if(val == 24){
+        name ="I-HDF"
+      }
+      if(val == 25){
+        name ="HD高通"
+      }
+      if(val == 26){
+        name ="CVVH"
+      }
+      if(val == 27){
+        name ="CVVHD"
+      }
+      if(val == 28){
+        name ="CVVHDF"
+      }
+      if(val == 29){
+        name ="PE"
+      }
+      if(val == 30){
+        name ="血浆胆红素吸附+HP"
+      }
+      if(val == 31){
+        name ="HPD"
+      }
+      if(val == 32){
+        name ="HDP"
+      }
+      if(val == 33){
+        name ="HDP"
+      }
+      if(val == 33){
+        name ="HFD"
+      }
+      if(val == 34){
+        name ="HDF100"
+      }
+      if(val == 35){
+        name ="HDF600"
+      }
+      if(val == 36){
+        name ="HDF800"
+      }
+      if(val == 37){
+        name ="HDF1000"
+      }
+      return name
+    },
     // 关闭透析模式
     switchMode(flag){
       console.log(flag);
     },
     // 透析次数
     chishuclick(row){
-      this.cishu_dialogVisible=true
-      console.log('ddddddd',row);
-      this.Dialysis_patient=row
+      // this.cishu_dialogVisible=true
+      // console.log('ddddddd',row);
+      this.Dialysis_patient=row.name
+      this.patient_id = ""
+      this.patient_id  = row.id
+      this.getPatientDialysisRecordList(row.id)
+    },
+    getPatientDialysisRecordList(id){
+      var params= {
+        patient_id:id,
+        start_time:this.start_time,
+        end_time:this.end_time,
+      }
+      console.log('tttt',params);
+      getPatientDialysisRecordList(params).then(response=>{
+         if(response.data.state == 1){
+           var list  = response.data.data.list
+           this.cishu_dialogVisible =true
+           if(list!=null && list.length>0){
+             for(let i=0;i<list.length;i++){
+               list[i].order_date =""
+               if(this.org_id ==9538 || this.org_id ==10101 || this.org_id ==10353 ){
+                  list[i].order_date = this.getOrderTime(list[i].dialysis_date)
+                  list[i].schedual_type_name= list[i].schedual_type
+               }else{
+                 list[i].order_date = this.getOrderTime(list[i].schedule_date)
+                 list[i].schedual_type_name= list[i].schedule_type
+               }
+
+             }
+           }
+           console.log("list------",list)
+           this.orderList = []
+           this.orderList = list
+         }
+      })
     },
-
     changeSch(row) {
       let params = {
         zone_id: row.zone_id,
   right: 120px;
 }
 
+.Calendar{
+    color: #000 !important;
+    width: 100% !important;
+    max-width: 839px !important;
+    .wh_content_all{
+      background-color: #fff;
+      .wh_top_changge{
+        .wh_jiantou1{
+          border-top: 2px solid #000;
+          border-left: 2px solid #000;
+        }
+        .wh_content_li{
+          color: #000;
+        }
+        .wh_jiantou2{
+          border-top: 2px solid #000;
+          border-right: 2px solid #000;
+        }
+      }
+      .wh_content_item{
+        text-align: center;
+        color: #000 ;
+        height: 50px;
+        .wh_top_tag{
+          width: 100%;
+          height: 50px ;
+          line-height: 50px;
+          margin: 0;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          text-align: center
+        }
+        .wh_isToday{
+          border: 1px solid #409eff;
+          background: #409eff !important;
+          color: #fff;
+          border-radius: 0;
+        }
+        .wh_chose_day{
+          border: 1px solid #409eff;
+          background: #fff !important;
+          color: #409eff;
+          border-radius: 0;
+        }
+        .wh_item_date{
+          width: 100%;
+          height: 50px;
+          line-height: 50px;
+          margin: 0;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+        .wh_item_date:hover {
+            background: #fff;
+            cursor: pointer;
+        }
+      }
+    }
+}
+.future-date {
+  color:#e6f7ff;
+}
+/* 如果需要背景色而不是文字颜色 */
+.future-date {
+  background-color: #409eff;
+}
+
 </style>