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

src/api/schedule.js

     method:"get",
     params:params
   })
+}
+
+export function getScheduleList(params){
+  
+  return request({
+    url:"/api/schedule/getschedulelist",
+    method:"get",
+    params:params,
+  })
 }

src/xt_pages/dialysis/batch_print/batch_print_order_fifteen.vue

                                     <label-box showValue="住院" :isChecked="record.receive_assessment.condition == 1 ? true : false"></label-box>
                                 </td>
                                 <td style="padding-left:5px;width:25%;text-align:left;border-left:none;border-right:none;">其他</td>
-                                
+
                             </tr>
                         </table>
                         <table class="table-box" border="1" style="border:none;border-color:#000;border-collapse: collapse;">
                                     </span>
                                 </span>
                             <!-- </span> -->
-                            
-                            
+
+
                         </span>
                     </td>
                     <td>
                         <p style="height:20px;line-height:20px">电导率</p>
                         <p style="height:20px;line-height:20px">ms/cm</p>
                     </th>
-                    
+
                     <th style="min-width:60px">
                         <p style="height:20px;line-height:20px">温度</p>
                         <p style="height:20px;line-height:20px">℃</p>
                         </span>
                     </td>
 
-                    
+
                     </tr>
                 </table>
                 <table class="print-table" border="1">
                     </tr>
                     </tbody>
                 </table>
-                
+
                 <table class="print-table" border="1">
-                    
+
                 </table>
 
 
     this.precaution_arr = getDataConfig('hemodialysis', 'precaution')
   },
   mounted() {
-    console.log(this.records)
+    // console.log(this.records)
     this.loading = true
     var ids = this.$store.getters.temp_params.batch_print_dialysis_record_ids
     if (ids.length == 0) {

src/xt_pages/dialysis/details/acceptsAssessment.vue

           <span class="content">{{sickCondition}} </span>
         </li>
 
+
+       
+
         <li v-if="isShow('风险程度')">
           <label>风险程度:</label>
           <span class="content">{{ dangerLevel }}</span>
             this.record.psychological_assessment_other
           }}</span>
         </li>
-
+        
+       <li v-if="isShow('是否跌倒')">
+          <label>是否跌倒:</label>
+          <span class="content">
+            <span v-if="this.record.tumble == 1">是</span>
+            <span v-if="this.record.tumble == 2">否</span>
+          </span>
+        </li>
 
       </ul>
 

src/xt_pages/dialysis/details/assessmentAfter.vue

           <label>KT/V: </label>
           <span class="content" >{{ this.record.ktv ? this.record.ktv : ""  }}</span>
         </li>
+        <li v-if="isShow('意识')">
+          <label>意识: </label>
+          <span class="content" >{{ getConsciousness(this.record.consciousness)}}</span>
+        </li>
+        <li v-if="isShow('跌倒风险')">
+          <label>跌倒风险: </label>
+          <span class="content" >{{ getFallrisk(this.record.fallrisk)}}</span>
+        </li>
       </ul>
     </div>
     <div class="note">
         return ''
       }
       return this.record.in_advance_reason_other
-    }
+    },
+   
   },
   methods: {
     getInternal: function() {
         }
       }
       return false
+    },
+     getConsciousness:function(id){
+       var consciousnessList = getDataConfig("hemodialysis","consciousness")
+     
+       var name = ""
+       for(let i=0;i<consciousnessList.length;i++){
+         if(id == consciousnessList[i].id){
+           name= consciousnessList[i].name
+         }
+      }
+      return name
+    },
+    getFallrisk:function(id){
+      var fallriskList = getDataConfig("hemodialysis","fallrisk")
+      var name = ""
+      for(let i=0;i<fallriskList.length;i++){
+        if(id == fallriskList[i].id){
+           name = fallriskList[i].name
+        }
+      }
+      return name
     }
   }
 }

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

         </el-col>
         <el-col :span="8" v-if="isShow('透析相关高血压')">
             <el-form-item label="透析相关高血压：">
+        
              <el-select v-model="form.hypertenison">
+              <el-option :key="0" label="请选择" :value="0"></el-option>
               <el-option
                 v-for="item in option"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
               ></el-option>
-             </el-select>
+            </el-select>
             </el-form-item>
         </el-col>
          <el-col :span="8" v-if="isShow('透析相关低血压')">
             <el-form-item label="透析相关低血压">
              <el-select v-model="form.hypopiesia">
               <el-option
-                v-for="item in option"
+                v-for="item in optionOne"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
              </el-select>
             </el-form-item>
         </el-col>
+        <el-col :span="8" v-if="isShow('意识')">
+            <el-form-item label="意识">
+             <el-select v-model="form.consciousness">
+              <el-option
+                v-for="item in consciousnessList"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+             </el-select>
+            </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="isShow('跌倒风险')">
+            <el-form-item label="跌倒风险">
+             <el-select v-model="form.fallrisk">
+              <el-option
+                v-for="item in fallriskList"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+             </el-select>
+            </el-form-item>
+        </el-col>
         <el-col :span="24" v-if="isShow('KT/V')">
             <el-form-item label="KT/V：">
               <el-input type="textarea" :rows="4" v-model="form.ktv"></el-input>
       dialogCruorTitle: '凝血',
       sealing_fluid_special_name: '',
       option:[
-        {id:0,name:"请选择"},
+        {id:"1",name:"有"},
+        {id:"2",name:"无"},
+      ],
+       optionOne:[
         {id:"1",name:"有"},
         {id:"2",name:"无"},
       ],
         other_complication:'',
         ktv:"",
         urr:"",
+        hypertenison:"",
+        hypopiesia:"",
+        leave_office_method:"",
+        lapse:"",
+        consciousness:"",
+        fallrisk:"",
       },
       lapseList:[],
-      leaveOfficeMethod:[]
+      leaveOfficeMethod:[],
+      consciousnessList:[],
+      fallriskList:[]
     }
   },
   watch: {
       data["hypopiesia"] = parseInt(this.form.hypopiesia)
       data["leave_office_method"] = this.form.leave_office_method
       data["lapse"] = this.form.lapse
+      data["consciousness"] = this.form.consciousness
+      data["fallrisk"] = this.form.fallrisk
       console.log("Paramsquery",data)
       postAssessmentAfterDislysis(ParamsQuery, data)
         .then(response => {
     this.sealingFluidDisposeOptions = getDataConfig('hemodialysis', 'sealing_fluid_dispose')
     this.lapseList = getDataConfig('hemodialysis', 'lapse')
     this.leaveOfficeMethod = getDataConfig('hemodialysis','leave_office_method')
+    this.consciousnessList = getDataConfig("hemodialysis","consciousness")
+    this.fallriskList = getDataConfig("hemodialysis","fallrisk")
     this.internalFistulaTremorAcOptions = this.$store.getters.internal_fistula_tremor_ac
     this.patientGoseOptions = this.$store.getters.patient_gose
     this.observationContentOptions = this.$store.getters.observation_content
     this.template_id = this.$store.getters.xt_user.template_info.template_id
     this.channels = this.$store.getters.channels
+
     var date = this.$route.query && this.$route.query.date
     this.record_date = uParseTime(date, '{y}-{m}-{d}')
   },

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

           v-model="receiveTreatmentAsses.psychological_other"
         ></el-input>
       </el-form-item>
+        <el-form-item label="是否跌倒: " v-if="isShow('是否跌倒')">
+        <el-radio
+          v-model="receiveTreatmentAsses.tumble"
+          label="1"
+          >是</el-radio>
+        <el-radio
+          v-model="receiveTreatmentAsses.tumble"
+          label="2"
+          >否
+        </el-radio>
+      </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="handleCancle">取 消</el-button>
         precaution: "",
         precaution_other: "",
         admission_number: "",
-        diacrisis:""
+        diacrisis:"",
+        tumble:"",
       },
       precautionTwo: []
     };
       return false;
     },
     show(accepts) {
+    
       this.accepts = accepts;
       // console.log("accepts", accepts);
       var arr = [];

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

           if (this.lastPredialysisEvaluation.is_infect == 2) {
             this.lastPredialysisEvaluation.is_infect = "2"
           }
+          if(this.lastPredialysisEvaluation.period == 1){
+             this.lastPredialysisEvaluation.period = "1"
+          }
+          if(this.lastPredialysisEvaluation.period == 2){
+             this.lastPredialysisEvaluation.period = "2"
+          }
         }
 
 

src/xt_pages/workforce/components/tableWeeks.vue

         type="primary"
         >打印
       </el-button>
-
-      <!-- <el-button
-       style="float: right"
-       size="small"
-       icon="el-icon-printer"
-       @click="printActionSetting()"
-       type="primary">
-        打印设置
-      </el-button> -->
     </div>
 
     <div class="cell clearfix">
           </li>
         </ul>
       </div>
-    </div>
-    <div  class="cell clearfix">
-     <div  class="title"><span class="name">班 次</span> :</div>
+
+      <div  class="title"><span class="name">班 次</span> :</div>
       <div class="time">
         <ul class>
           <li
         </template>
       </el-table-column>
     </el-table>
-
-    <el-dialog
-      title="打印设置"
-      :visible.sync="dialogVisible"
-      width="30%"
-      >
-     <span>
-       <ul>
-         <li> 
-          <el-checkbox v-model="prescription_status">透析处方状态</el-checkbox>
-         </li>
-         <li>
-          <el-checkbox v-model="week">星期</el-checkbox>
-         </li>
-         <li>
-          <el-checkbox v-model="name">姓名</el-checkbox>
-         </li>
-         <li>
-          <el-checkbox v-model="zone">分区</el-checkbox>
-         </li>
-         <li>
-          <el-checkbox v-model="classes">班次</el-checkbox>
-         </li>
-         <li>
-          <el-checkbox v-model="number">机号</el-checkbox>
-         </li>
-         <li>
-          <el-checkbox v-model="mode">透析模式</el-checkbox>
-         </li>
-         <li>
-          <el-checkbox v-model="dialyzers">透析器</el-checkbox>
-         </li>
-         <li>
-          <el-checkbox v-model="perfusion_apparatus">灌流器</el-checkbox>
-         </li>
-         <li>
-          <el-checkbox v-model="anticoagulant">抗凝剂(商品名称)</el-checkbox>
-         </li>
-         <li>
-          <el-checkbox v-model="anticoagulant_zongliang">总量</el-checkbox>
-         </li>
-         <li>
-          <el-checkbox v-model="doctor_advice">长期医嘱</el-checkbox>
-         </li>
-       </ul>
-      
-     </span>
-     <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="saveRemindPrint">保 存</el-button>
-     </span>
-   </el-dialog>
-
-    
   </div>
 </template>
 
 <script>
-import { getSchedules, getScheduleWeekDay,saveRemindPrint,getRemindPrintList } from "@/api/schedule";
+import { getSchedules, getScheduleWeekDay } from "@/api/schedule";
 import WeekItem from "./WeekItem";
 
 export default {
   data() {
     return {
       weekArr: [
-        { id: 0, name: "全部" },
         { id: 1, name: "周一" },
         { id: 2, name: "周二" },
         { id: 3, name: "周三" },
       },
       scheduleData: [],
       modeOptions: null,
-      org_id:0,
-      dialogVisible:false,
-      prescription_status:false,
-      week:false,
-      name:false,
-      zone:false,
-      classes:false,
-      number:false,
-      mode:false,
-      dialyzers:false,
-      perfusion_apparatus:false,
-      anticoagulant:false,
-      anticoagulant_zongliang:false,
-      doctor_advice:false,
-      form:{
-        id:0,
-        prescription_status:"",
-        week:"",
-        name:"",
-        zone:"",
-        classes:"",
-        number:"",
-        mode:"",
-        dialyzers:"",
-        perfusion_apparatus:"",
-        anticoagulant:"",
-        anticoagulant_zongliang:"",
-        doctor_advice:"",
-      }
+      org_id:0
     };
   },
   watch: {
       }
      },
     getScheduleWeekDay() {
-     
-      const params = {
-        week_type:this.week_type,
-        week_time:this.week_time,
-       }
-      console.log("param22222",params)
+        const params = {
+          week_type:this.week_type,
+          week_time:this.week_time,
+        }
+
       getScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
         }
         return name;
       }
-    },
-    printActionSetting(){
-       this.getlist()
-       this.dialogVisible = true
-
-    },
-    saveRemindPrint(){
-       console.log("455555555",this.perfusion_apparatus)
-
-      if(this.perfusion_apparatus == true){
-         console.log("3333")
-          this.form.perfusion_apparatus = 1
-       }
-       if(this.perfusion_apparatus == false){
-          this.form.perfusion_apparatus = 2
-       }
-       if(this.prescription_status == true){
-         this.form.prescription_status = 1
-       }
-       if(this.prescription_status == false){
-         this.form.prescription_status = 2
-       }
-       if(this.week == true){
-          this.form.week = 1
-       }
-       if(this.week == false){
-          this.form.week = 2
-       }
-       if(this.name == true){
-         this.form.name = 1
-       }
-       if(this.name == false){
-          this.form.name = 2
-       }
-       if(this.zone == true){
-         this.form.zone = 1
-       }
-       if(this.zone == false){
-          this.form.zone = 2
-       }
-       if(this.classes == true){
-         this.form.classes = 1
-       }
-       if(this.classes == false){
-         this.form.classes = 2
-       }
-       if(this.number == true){
-          this.form.number = 1
-       }
-       if(this.number == false){
-         this.form.number = 2
-       }
-       if(this.mode == true){
-           this.form.mode = 1
-       }
-       if(this.mode == false){
-         this.form.mode = 2
-       }
-       if(this.dialyzers == true){
-          this.form.dialyzers = 1
-       }
-       if(this.dialyzers == false){
-          this.form.dialyzers = 2
-       }
-     
-       if(this.anticoagulant == true){
-          this.form.anticoagulant = 1
-       }
-       if(this.anticoagulant == false){
-         this.form.anticoagulant = 2
-       }
-       if(this.anticoagulant_zongliang == true){
-          this.form.anticoagulant_zongliang  = 1
-       }
-       if(this.anticoagulant_zongliang == false){
-          this.form.anticoagulant_zongliang = 2
-       }
-       if(this.doctor_advice == true){
-          this.form.doctor_advice =1
-       }
-       if(this.doctor_advice == false){
-          this.form.doctor_advice = 2
-       }
-       console.log("555555555",this.form.prescription_status)
-        var params = {
-          id:this.form.id,
-          prescription_status:this.form.prescription_status,
-          week:this.form.week,
-          name:this.form.name,
-          zone:this.form.zone,
-          classes:this.form.classes,
-          number:this.form.number,
-          mode:this.form.mode,
-          dialyzers:this.form.dialyzers,
-          perfusion_apparatus:this.form.perfusion_apparatus,
-          anticoagulant:this.form.anticoagulant,
-          anticoagulant_zongliang:this.form.anticoagulant_zongliang,
-          doctor_advice:this.form.doctor_advice,
-        }
-       console.log("params",params)
-      saveRemindPrint(params).then(response=>{
-          if(response.data.state == 1){
-             var settting = response.data.data.setting
-             this.$message.success("保存成功")
-             this.dialogVisible = false
-             this.getlist()
-          }
-      })
-    },
-    getlist(){
-      getRemindPrintList().then(response=>{
-         if(response.data.state == 1){
-            var list = response.data.data.list
-            console.log("list222332",list)
-            if(list.anticoagulant == 1){
-              console.log("进来22222")
-              this.anticoagulant = true
-            }
-            if(list.anticoagulant == 2){
-               this.anticoagulant = false
-            }
-            if(list.anticoagulant_zongliang == 1){
-              this.anticoagulant_zongliang = true
-            }
-            if(list.anticoagulant_zongliang == 2){
-               this.anticoagulant_zongliang = false 
-            }
-            if(list.classes == 1 ){
-                this.classes = true
-            }
-            if(list.classes == 2){
-                this.classes = false
-            }
-            if(list.dialyzers == 1){
-               this.dialyzers = true
-            }
-            if(list.dialyzers == 2){
-               this.dialyzers = false
-            }
-            if(list.doctor_advice == 1){
-               this.doctor_advice = true
-            }
-            if(list.doctor_advice == 2){
-               this.doctor_advice = false
-            }
-            if(list.name == 1){
-               this.name = true
-            }
-            if(list.name == 2){
-               this.name = false
-            }
-            if(list.number == 1){
-               this.number = true
-            }
-            if(list.number == 2){
-              this.number = false
-            }
-            if(list.perfusion_apparatus == 1){
-              this.perfusion_apparatus = true
-            }
-            if(list.perfusion_apparatus == 2){
-               this.perfusion_apparatus = false
-            }
-            if(list.prescription_status == 1){
-               this.prescription_status = true
-            }
-            if(list.prescription_status == 2){
-               this.prescription_status = false
-            }
-            if(list.week == 1){
-               this.week = true
-            } 
-            if(list.week == 2){
-               this.week = false
-            }
-            if(list.zone == 1){
-               this.zone = true
-            }
-            if(list.zone == 2){
-               this.zone = false
-            }
-            if(list.mode ==1){
-               this.mode = true
-            }
-            if(list.mode == 2){
-              this.mode = false
-            }
-            this.form.id = list.id
-         }
-      })
     }
   },
   components: {
   created() {
     this.modeOptions = this.$store.getters.treatment_mode;
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit;
+    console.log("抗凝机", this.anticoagulants_confit);
     this.week_type = new Date().getDay();
     if (this.week_type == 0) {
       this.week_type = 7;
     //   week_type: this.week_type
     // };
     this.getScheduleWeekDay();
+    console.log("org2222222",this.$store.getters.xt_user.org.id)
     this.org_id = this.$store.getters.xt_user.org.id
-    // this.getlist()
   }
 };
 </script>