新分支

src/api/doctorSchedule.js

@@ -180,4 +180,30 @@ export function DeleteStaffScheduleById(id,params){
     methods:"get",
     params:params
   })
+}
+
+export function saveStafScheduleRemark(params){
+  return request({
+    url:"/api/staff/savescheduleremark",
+    methods:"get",
+    params:params,
+  })
+}
+
+export function changeStaffRmark(params){
+
+  return request({
+    url:"/api/staff/changestaffremark",
+    methods:"Get",
+    params:params,
+  })
+}
+
+export function getStaffScheduleRemarkList(params){
+ 
+  return request({
+    url:"/api/staff/getstaffscheduleremarklist",
+    methods:"get",
+    params:params,
+  })
 }

src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue

@@ -156,7 +156,7 @@
                 <span v-if="record.dialysis_order.dialysis_strainer!='' && record.dialysis_order.dialysis_strainer!=0"> /{{ record.dialysis_order.dialysis_strainer ?  record.dialysis_order.dialysis_strainer : ""}}</span>
                 </div>
               </div>
-              
+
             </div>
             <!-- 治疗方式 -->
             <div class="row" style="display: flex;">
@@ -516,10 +516,10 @@
                   style="width: 100px; text-align: center"
                 >
                   <span v-if="record.assessment_before_dislysis.systolic_blood_pressure !='' &&  record.assessment_before_dislysis.diastolic_blood_pressure !=''">
-                      {{ record.assessment_before_dislysis.systolic_blood_pressure ? 
-                         record.assessment_before_dislysis.systolic_blood_pressure : ""}} 
+                      {{ record.assessment_before_dislysis.systolic_blood_pressure ?
+                         record.assessment_before_dislysis.systolic_blood_pressure : ""}}
                         /
-                      {{ record.assessment_before_dislysis.diastolic_blood_pressure ? 
+                      {{ record.assessment_before_dislysis.diastolic_blood_pressure ?
                          record.assessment_before_dislysis.diastolic_blood_pressure : ""}}
                   </span>
                   <span v-else>未测</span>
@@ -553,7 +553,7 @@
                 </div>
                 kg
               </div>
-              
+
             </div>
             <!-- 医嘱脱水量 -->
             <div class="row" style="display: flex;">
@@ -572,7 +572,7 @@
                 <div
                   class="under_line"
                   style="width: 80px; text-align: center"
-                > 
+                >
                 <span style="height: 30px;display: inline-block;"></span>
                   {{ record.prescription.dialysis_duration_hour?record.prescription.dialysis_duration_hour:'0'}} h
                   {{ record.prescription.dialysis_duration_minute?record.prescription.dialysis_duration_minute:'0' }}min
@@ -824,10 +824,10 @@
                       {{monitor_record.diastolic_blood_pressure ? monitor_record.diastolic_blood_pressure : "未测"}}
                     </span>
                     <span v-else>未测</span> -->
-                    {{monitor_record.monitor_systolic_blood_pressure_one ? monitor_record.monitor_systolic_blood_pressure_one : "未测"}} 
+                    {{monitor_record.monitor_systolic_blood_pressure_one ? monitor_record.monitor_systolic_blood_pressure_one : "未测"}}
                     <span v-if="monitor_record.monitor_systolic_blood_pressure_one!=''&&monitor_record.monitor_systolic_blood_pressure_one>0">/{{monitor_record.monitor_diastolic_blood_pressure_one ? monitor_record.monitor_diastolic_blood_pressure_one : "未测"}} </span>
                   </td>
-                  <td width="50">{{ monitor_record.pulse_frequency_one ? monitor_record.pulse_frequency_one : "未测" }}</td>
+                  <td width="50">{{ monitor_record.monitor_pulse_frequency_one ? monitor_record.monitor_pulse_frequency_one : "未测" }}</td>
                   <td width="50">{{monitor_record.arterial_pressure_one ? monitor_record.arterial_pressure_one: "/"}}</td>
                   <td width="50">{{monitor_record.venous_pressure_one ? monitor_record.venous_pressure_one : "/"}}</td>
                   <td width="50">{{monitor_record.transmembrane_pressure_one ? monitor_record.transmembrane_pressure_one : "/"}}</td>
@@ -845,7 +845,7 @@
                     </span>  -->
 
                     {{ monitor_record.ultrafiltration_rate_one?monitor_record.ultrafiltration_rate_one:"/" }}
-                    
+
                   </td>
                   <td width="50">
                     <!-- <span v-if="j == 0">
@@ -859,7 +859,7 @@
                     </span>  -->
 
                     {{ monitor_record.ultrafiltration_volume_one?monitor_record.ultrafiltration_volume_one:"/" }}
-                    
+
                   </td>
 
                   <td width="65">
@@ -874,7 +874,7 @@
                     </span>  -->
 
                     {{ monitor_record.heparin_one?monitor_record.heparin_one:"/" }}
-                    
+
                   </td>
                   <td width="200">
                     <template
@@ -963,7 +963,7 @@
               </div>
               <div class="inline_block" style="flex: 1">
                 核对人员：
-               
+
                 <div
                   class="under_line"
                   style="width: 80px; text-align: center"
@@ -1190,7 +1190,7 @@
                   {{ record.summer&&record.summer.dialysis_summary.length>0 ? record.summer.dialysis_summary : ""}}
                 </span>
               </div>
-             
+
             </div>
             <div style="height: 20px;text-align: right;padding-right:30%;">
               医生签名:

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -2323,11 +2323,17 @@
                           class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                          {{
+                          <!-- {{
                             record.assessment_after_dislysis &&
                             record.assessment_after_dislysis.weight_loss
                               ? record.assessment_after_dislysis.weight_loss
                               : "/"
+                          }} -->
+                          {{
+                            record.assessment_after_dislysis &&
+                            (record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after).toFixed(2)
+                              ?(record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after).toFixed(2)
+                              : "/"
                           }}
                         </div>
                         kg

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -670,10 +670,14 @@
           width="100"
         ></el-table-column>
 
-        <el-table-column label="透前血压(kg)" align="center" width="120" prop="pressure_name">
+        <el-table-column label="透前血压(mmHg)" align="center" width="130" prop="pressure_name">
 
         </el-table-column>
 
+        <el-table-column label="透后血压(mmHg)" align="center" width="130" prop="after_pressure_name">
+
+       </el-table-column>
+
         <el-table-column
           prop="dry_weight"
           label="干体重(kg)"
@@ -2472,6 +2476,11 @@ export default {
                }
               }
 
+              if (response.data.data.schedule[i].assessment_after_dislysis != null) {
+                SchedualPatientsTable["after_pressure_name"] =response.data.data.schedule[i].assessment_after_dislysis.systolic_blood_pressure+"/"+ response.data.data.schedule[i].assessment_after_dislysis.diastolic_blood_pressure;
+              }
+
+
 
               this.SchedualPatientsTableData.push(SchedualPatientsTable);
               // console.log("wode数据",(-100).toString())

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -40,7 +40,7 @@
         <li v-if="isShow('实际置换量')">
           <label>实际置换量 : </label>
           <span class="content">{{ actual_displacement }}</span>
-          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21">ml</span>
+          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 78 ">ml</span>
           <span class="unit" v-else>L</span>
         </li>
         <li v-if="isShow('压迫后内瘘震颤')">

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -75,7 +75,8 @@
         </el-table-column>
         <el-table-column  align="center"  width="100" label="透析机号">
          <template slot-scope="scope">
-             {{scope.row.device_number.zone.name}}  {{scope.row.device_number.number}}
+            <span v-if="org_id!=0&&org_id!=10702">{{scope.row.device_number.zone.name}} </span>  
+            {{scope.row.device_number.number}}
            </template>
         </el-table-column>
         <el-table-column  align="center"  width="80" label="姓名">
@@ -659,7 +660,15 @@
         getPatientDialysisSolutionGroupList(this.query).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
-
+             console.log("list================",list)
+             if(list!=null &&list.length>0){
+                for(let i=0;i<list.length;i++){
+                  list[i].sort = 0
+                  list[i].sort = list[i].device_number.sort
+                }
+      
+              }
+             list.sort(this.compare('sort'))
              var total = response.data.data.total
              this.total = total
              var goodType = response.data.data.goodType
@@ -2177,7 +2186,14 @@
           this.$message.success("更新成功!")
         }
       })
-    }
+    },
+    compare(p) { //这是比较函数
+        return function (m, n) {
+          var a = m[p];
+          var b = n[p];
+          return a - b; //升序
+        }
+    },
    }
   }
 </script>

src/xt_pages/dialysis/details/consumable/dialysisGoodPrint.vue

@@ -37,7 +37,10 @@
               <tbody>
                <tr v-for="(item,i) in tableData" :key="i">
                 <td>{{i+1}}</td>
-                <td> {{item.device_number.zone.name}} {{item.device_number.number}}</td>
+                <td>
+                  <span v-if="org_id!=0&&org_id!=10702"> {{item.device_number.zone.name}} </span>
+                   {{item.device_number.number}}
+                  </td>
                  <td>{{item.patient.name}}</td>
                 <td>{{item.patient.dialysis_no}}</td>
                 <td v-for="(it,index) in rowList" :key="index">
@@ -70,7 +73,9 @@
               <tbody>
                <tr v-for="(item,i) in tableData" :key="i">
                 <td>{{i+1}}</td>
-                <td> {{item.device_number.zone.name}} {{item.device_number.number}}</td>
+                <td> <span v-if="org_id!=0&&org_id!=10702">{{item.device_number.zone.name}} </span>
+                   {{item.device_number.number}}
+                  </td>
                  <td>{{item.patient.name}}</td>
                 <td>{{item.patient.dialysis_no}}</td>
                 <td v-for="(it,index) in typeList" :key="index">
@@ -128,12 +133,14 @@
         displace_liqui_part_option:[],
         blood_access_option:[],
         hemodialysisPipelinesOptions:[],
+        org_id:0
       }
     },
     components: {
       BreadCrumb
     },
     created() {
+      this.org_id = this.$store.getters.xt_user.org.id
        this.dialysate_formulation =  getDataConfig(  
             'hemodialysis',
             'dialysate_formulation'
@@ -165,7 +172,14 @@
       getPatientDialysisSolutionGroupList(params).then(response=>{
         if(response.data.state == 1){
             var list = response.data.data.list
-            
+            if(list!=null &&list.length>0){
+                for(let i=0;i<list.length;i++){
+                  list[i].sort = 0
+                  list[i].sort = list[i].device_number.sort
+                }
+      
+              }
+            list.sort(this.compare('sort'))
             var total = response.data.data.total
             this.total = total
             var goodType = response.data.data.goodType
@@ -621,6 +635,13 @@
       }
       return name
     },
+    compare(p) { //这是比较函数
+        return function (m, n) {
+          var a = m[p];
+          var b = n[p];
+          return a - b; //升序
+        }
+    },
     }
   }
 </script>

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -453,7 +453,7 @@
         <el-row :gutter="20"> -->
 
         <el-col :span="8" v-if="isShow('实际置换量')">
-          <el-form-item v-if="this.template_id == 20 || this.template_id == 21" label="实际置换量(ml): " :prop="isName('实际置换量')" :rules="isCheckmust('实际置换量')">
+          <el-form-item v-if="this.template_id == 20 || this.template_id == 21 || this.org_id ==10702" label="实际置换量(ml): " :prop="isName('实际置换量')" :rules="isCheckmust('实际置换量')">
             <el-input v-model="form.actual_displacement"></el-input>
           </el-form-item>
           <el-form-item v-else label="实际置换量(L): " :prop="isName('实际置换量')" :rules="isCheckmust('实际置换量')">

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1749,7 +1749,7 @@ export default {
           }
       }
 
-      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587 || this.$store.getters.xt_user.org.id == 10597 || this.$store.getters.xt_user.org.id == 10551 || this.$store.getters.xt_user.org.id == 10679 || this.$store.getters.xt_user.org.id == 10693 ||  this.$store.getters.xt_user.org.id == 10694){
+      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587 || this.$store.getters.xt_user.org.id == 10597 || this.$store.getters.xt_user.org.id == 10551 || this.$store.getters.xt_user.org.id == 10679 || this.$store.getters.xt_user.org.id == 10693 ||  this.$store.getters.xt_user.org.id == 10694 || this.$store.getters.xt_user.org.id == 10702){
         var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -2950,6 +2950,28 @@ mu
             var hours = date.getHours()
             var minites = date.getMinutes()
 
+            if (month < 10) {
+              month = '0' + month
+            }
+            if (day < 10) {
+              day = '0' + day
+            }
+            if (hours < 10) {
+              hours = '0' + hours
+            }
+            if (minites < 10) {
+              minites = '0' + minites
+            }
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+           }else if (this.$store.getters.xt_user.org.id == 10702){
+            var date = new Date()
+            var year = date.getFullYear()
+            var month = date.getMonth() + 1
+            var day = date.getDate()
+
+            var hours = date.getHours()
+            var minites = date.getMinutes()
+
             if (month < 10) {
               month = '0' + month
             }
@@ -5413,11 +5435,11 @@ mu
         if(this.$store.getters.xt_user.template_info.org_id==10702){
           if(this.predialysis!=undefined){
           if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
-            this.dialysisPrescription.target_ultrafiltration = this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight
+            this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
           }
           console.log("hahhahahahhah",this.dialysisPrescription.prescription_water)
           if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
-            this.dialysisPrescription.prescription_water = this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight
+            this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
           }
         }
         }

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -1522,13 +1522,13 @@
               >
             </el-form-item>
           </el-col>
-
+<!-- 
           <el-col :span="8" v-if="isShow('血流量')">
             <el-form-item label="血流量(ml/min)：" :prop="isName('血流量')"
               :rules="isCheckmust('血流量')">
               <el-input v-model="form.blood_flow_volume"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
 
           <el-col :span="8" v-if="isShow('动脉压1')">
             <el-form-item
@@ -3083,6 +3083,36 @@ export default {
         this.form.dehydration = "";
         this.form.heparin_amount = "";
         this.form.filter_pressure =""
+        this.form.ultrafiltration_rate_one = ""
+        this.form.heparin_one = ""
+        this.form.monitor_systolic_blood_pressure_one = ""
+        this.form.monitor_diastolic_blood_pressure_one = ""
+        this.form.monitor_pulse_frequency_one = ""
+        this.form.blood_flow_volume_one = "",
+        this.form.venous_pressure_one = ""
+        this.form.arterial_pressure_one = ""
+        this.form.transmembrane_pressure_one = ""
+        this.form.ultrafiltration_volume_one = ""
+        this.form.sodium_concentration_one =""
+        this.form.dialysate_temperature_one=""
+        this.form.replacement_rate_one  = ""
+        this.form.displacement_quantity_one = ""
+        this.form.ktv_one = ""
+        this.form.urr_one = ""
+        this.form.conductivity_one= ""
+        this.form.displacement_flow_quantity_one=""
+        this.form.blood_oxygen_saturation_one = ""
+        this.form.dialysate_flow_one  = ""
+        this.form.blood_sugar_one =""
+        this.form.monitor_temperature_one = ""
+        this.form.pulse_frequency_one = ""
+        this.form.blood_temperature_one = ""
+        this.form.urea_monitoring_one = ""
+        this.form.blood_thickness_one = ""
+        this.form.blood_monitor_one = ""
+        this.form.replacement_speed_one=""
+        this.form.dicarbonate_one  = ""
+        this.form.accumulated_blood_volume_one = ""
       } else {
         (this.form.id = monitor.id),
           // this.form.operate_date = monitor.operate_date

src/xt_pages/dialysis/details/index.vue

@@ -114,6 +114,15 @@
               height="500"
               border
               style="width: 100%">
+              <el-table-column
+                prop="date"
+                label="序号"
+                width="30"
+                >
+                <template slot-scope="scope"  text-align="center">
+                  {{ scope.$index +1 }}
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="date"
                 label="床号"
@@ -207,6 +216,15 @@
               height="500"
               border
               style="width: 100%">
+              <el-table-column
+                prop="date"
+                label="序号"
+                width="30"
+                >
+                <template slot-scope="scope"  text-align="center">
+                  {{ scope.$index +1 }}
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="date"
                 label="床号"
@@ -2544,7 +2562,7 @@ export default {
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571 || this.org_id ==10679){
+        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571 || this.org_id ==10679 || this.org_id==10702){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -2159,11 +2159,12 @@
                         class="under_line"
                         style="width: 60px; text-align: center"
                       >
-                        {{
+                        <!-- {{
                           afterdialysis.weight_loss
                             ? afterdialysis.weight_loss
                             : "/"
-                        }}
+                        }} -->
+                        {{(predialysis.weight_before - afterdialysis.weight_after).toFixed(2)}}
                       </div>
                       kg
                     </div>

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -140,10 +140,10 @@
 
                     /{{dialysisOrder.dialysis_strainer ? dialysisOrder.dialysis_strainer : "" }}
                 </span>
-              
+
               </div>
             </div>
-          
+
           </div>
           <!-- 治疗方式 -->
           <div class="row" style="display: flex;">
@@ -562,7 +562,7 @@
                   <span>{{ monitor.monitor_systolic_blood_pressure_one ? monitor.monitor_systolic_blood_pressure_one : "未测" }}</span>
                   <span v-if="monitor.monitor_diastolic_blood_pressure_one!=''&&monitor.monitor_diastolic_blood_pressure_one>0">/{{ monitor.monitor_diastolic_blood_pressure_one ? monitor.monitor_diastolic_blood_pressure_one : "未测" }}</span>
                 </td>
-                <td width="50">{{ monitor.pulse_frequency_one ? monitor.pulse_frequency_one : "未测" }}</td>
+                <td width="50">{{ monitor.monitor_pulse_frequency_one ? monitor.monitor_pulse_frequency_one : "未测" }}</td>
                 <td width="50">{{monitor.arterial_pressure_one ? monitor.arterial_pressure_one: "/"}}</td>
                 <td width="50">{{monitor.venous_pressure_one ? monitor.venous_pressure_one : "/"}}</td>
                 <td width="50">{{monitor.transmembrane_pressure_one ? monitor.transmembrane_pressure_one : "/"}}</td>

src/xt_pages/medicalScheduling/index.vue

@@ -221,7 +221,18 @@
                                 </div>
                             </template>
                         </el-table-column>
+
+                        <el-table-column prop="name" :label="'备注'" style="width:14%" align="center">
+                             <template slot-scope="scope">
+                              <div  @click="toDialog(scope.row)">
+                                  <el-input  placeholder="请输入内容" v-model="scope.row.remark"></el-input>
+                               </div>
+                            </template>
+                        </el-table-column>
+                      
                     </el-table>
+
+                    <div> 备注: <el-input type="textarea"  placeholder="请输入内容"v-model="remark" style="min-height:200px" @input="changeStaffRmark"></el-input></div>
                 </div>
                 <div class="classBox">
                     <div class="classTitle">班种</div>
@@ -393,13 +404,27 @@
                 <el-button type="primary" @click="exportList">确 定</el-button>
             </span>
         </el-dialog>     -->
+
+
+        <el-dialog
+            title="设置备注"
+            :visible.sync="dialogVisible"
+            width="40%">
+            <span>
+              <el-input v-model="content" type="textarea"></el-input>
+            </span>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="saveDialog">确 定</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
 <script>
 const moment = require('moment')
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { getDoctorList,getScheduleList,addSchedule,getStaffScheduleList,getNextWeekList,getScheduleByDoctorId,toSearchScheduleList,DeleteStaffSchedule,copyStaffSchedule,UpdateContinusSchedule,SaveNurseSort,SaveIsSchedule,DeleteStaffScheduleById } from '@/api/doctorSchedule'
+import { getDoctorList,getScheduleList,addSchedule,getStaffScheduleList,getNextWeekList,getScheduleByDoctorId,toSearchScheduleList,DeleteStaffSchedule,copyStaffSchedule,UpdateContinusSchedule,SaveNurseSort,SaveIsSchedule,DeleteStaffScheduleById,saveStafScheduleRemark,getStaffScheduleRemarkList,changeStaffRmark } from '@/api/doctorSchedule'
 import { constants } from 'crypto'
 export default {
     components:{
@@ -466,7 +491,11 @@ export default {
            exportDialogVisible:false,
            month_time:"",
            name:'',
-           column_lie:''
+           column_lie:'',
+           remark:"",
+           dialogVisible:false,
+           content:"",
+           staffObj:{}
         }
     },
     methods:{
@@ -927,7 +956,8 @@ export default {
                                 user_type:staffList[i].doctor_type,
                                 is_sort:staffList[i].is_sort,
                                 sort:staffList[i].sort,
-                                list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributesk,id:staffList[i].id}]
+                                list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributesk,id:staffList[i].id}],
+                                remark:staffList[i].remark
                             })
                             tempArr.push(staffList[i].user_name);
                         } else {
@@ -2103,7 +2133,61 @@ export default {
        },
        leavemouse(row, column, cell, event){
         this.name=''
-       }
+       },
+       toDialog(row){
+         this.dialogVisible = true
+         this.staffObj = row
+         this.content = ""
+         this.content = row.remark
+       },
+       saveDialog(){
+       
+           var data = {
+             admin_user_id:this.staffObj.admin_user_id,
+             start_time:this.getTimestamp(this.weekDayArr[0]),
+             end_time:this.getTimestamp(this.weekDayArr[6]),
+             content:this.content,
+           }
+           console.log("params",data)
+         saveStafScheduleRemark(data).then(response=>{
+            if(response.data.state == 1){
+              var msg = response.data.data.msg
+              this.getStaffScheduleList()
+              this.dialogVisible = false
+
+            }
+         })
+       },
+       changeStaffRmark(){
+         console.log("val000000000000000000",this.remark)
+           var params = {
+            content:this.remark,
+            start_time:this.getTimestamp(this.weekDayArr[0]),
+            end_time:this.getTimestamp(this.weekDayArr[6])
+           }
+         changeStaffRmark(params).then(response=>{
+           if(response.data.state == 1){
+             var msg = response.data.data.msg
+             this.getStaffScheduleRemarkList()
+           }
+         })
+       },
+       getStaffScheduleRemarkList(){
+        var params = {
+            start_time:this.getTimestamp(this.weekDayArr[0]),
+            end_time:this.getTimestamp(this.weekDayArr[6])
+           }
+           console.log("params=====",params)
+           getStaffScheduleRemarkList(params).then(response=>{
+              if(response.data.state==1){
+               var scheduleRemark =  response.data.data.scheduleRemark
+               console.log("scheduleRemark",scheduleRemark)
+
+               this.remark = scheduleRemark.remark
+               console.log("haaaaaaaaaaaaaaaaaaa",this.remark)
+              }
+           })
+       } 
     },
     created(){
         //获取医护人员
@@ -2111,6 +2195,8 @@ export default {
         //获取班种班种
         this.getScheduleList()
 
+       
+
         let year = new Date().getFullYear()
         let month = new Date().getMonth() + 1
         let date = new Date().getDate()
@@ -2118,6 +2204,8 @@ export default {
         this.todayDate=this.formatDate(new Date())
         this.setDate(new Date())
 
+
+
         for (var i = 0; i <= 9; i++) {
             this.setDate1(this.addDate(this.currentDate, 7))
         }
@@ -2141,7 +2229,8 @@ export default {
         }
       var now = moment().locale('zh-cn').format('YYYY-MM-DD 00:00:00')
       this.timeNow = this.getTimestamp(now)
-
+     
+      this.getStaffScheduleRemarkList()
 
     }
 }

src/xt_pages/medicalScheduling/medical_print.vue

@@ -33,6 +33,7 @@
                                     <td width="120">加班<br /></td>
                                     <td width="120">累计<br/>时数<br /></td>
                                     <td width="120">公休<br /></td>
+                                    <td width="120">备注<br /></td>
                                 </tr>
                             </thead>
                             <tbody>
@@ -49,9 +50,13 @@
                                     <td></td>
                                     <td></td>
                                     <td></td>
+                                    <td>{{ item.remark }}</td>
                                 </tr>
                             </tbody>
                         </table>
+                        <div style="margin-top: 20px;">
+                          备注:{{ remark }}
+                        </div>
                     </div>
                 </div>
             </div>
@@ -62,7 +67,7 @@
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import print from 'print-js'
-import { getDoctorList,getScheduleByDoctorId } from '@/api/doctorSchedule'
+import { getDoctorList,getScheduleByDoctorId,getStaffScheduleRemarkList } from '@/api/doctorSchedule'
 export default {
     components:{
         BreadCrumb
@@ -89,7 +94,8 @@ export default {
           typevalue:0,
           
           doctorTableData:[],
-          nurseTableData:[]
+          nurseTableData:[],
+          remark:""
         }
     },
     methods:{
@@ -350,7 +356,8 @@ export default {
                     user_type:staffList[i].doctor_type,
                     is_sort:staffList[i].is_sort,
                     sort:staffList[i].sort,
-                    list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes}]
+                    list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes}],
+                    remark: staffList[i].remark,
                   })
                   tempArr.push(staffList[i].user_name);
                 } else {
@@ -554,6 +561,21 @@ export default {
             return value2 - value1;
         }
       },
+      getStaffScheduleRemarkList(){
+          var params = {
+            start_time:this.start_time,
+            end_time:this.end_time,
+         }
+       
+        getStaffScheduleRemarkList(params).then(response=>{
+             if(response.data.state==1){
+               var scheduleRemark =  response.data.data.scheduleRemark
+              
+               this.remark = scheduleRemark.remark
+               
+              }
+           })
+       } 
     },
     created(){
       var starttime =  this.$route.query.starttime
@@ -565,6 +587,7 @@ export default {
       
       //获取该机构所有医护人员
       this.getDoctorList()
+      this.getStaffScheduleRemarkList()
     }
 }
 </script>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -195,7 +195,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100,1000,1500,3000,5000,8000,10000]"
+        :page-sizes="[10, 50, 100,1000,1500,3000,5000,8000,10000,12000,15000,20000]"
         :page-size="10"
         background
         style="margin-top:20px;float: right"
@@ -874,6 +874,8 @@ export default {
           this.tableOut[i].packing_price = this.tableOut[i].buy_price
         }else if(this.orgId == 10265){
           this.tableOut[i].total_price = (this.getMySelfCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10445){
+          this.tableOut[i].total_price = (this.getMySelfCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId == 10215){
           this.tableOut[i].total_price = (this.getMySelfCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId == 10210){
@@ -908,7 +910,7 @@ export default {
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
 
-        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402 || this.orgId==10138 || this.orgId==10278||this.orgId==10537||this.orgId==10610||this.orgId==0){
+        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402 || this.orgId==10138 || this.orgId==10278||this.orgId==10537||this.orgId==10610||this.orgId==0 || this.org_id==10445){
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))