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

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

@@ -21,13 +21,13 @@
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="穿刺护士"  v-if="isShowFiled('穿刺护士')">
+        <el-form-item label="穿刺者"  v-if="isShowFiled('穿刺者')">
           <el-select v-model="form.puncture_nurse_id" placeholder="请选择穿刺护士">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="冲管护士"  v-if="isShowFiled('冲管护士')">
-          <el-select v-model="form.washpipe_nurse" placeholder="请选择穿刺护士">
+          <el-select v-model="form.washpipe_nurse" placeholder="请选择冲管护士">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -17,8 +17,8 @@
         </li>
       </ul>
       <ul>
-        <li v-if="isShow('穿刺护士')">
-          <label>穿刺护士 : </label>
+        <li v-if="isShow('穿刺者')">
+          <label>穿刺者 : </label>
           <span class="content">{{ puncture_nurse }}</span>
         </li>
         <li v-if="isShow('冲管护士')">

src/xt_pages/medicalScheduling/class.vue

@@ -380,7 +380,6 @@ export default {
            getDoctorScheduleList(params).then(response=>{
               if(response.data.state == 1){
                  var schedules = response.data.data.schedules
-                  console.log("schedules",schedules)
                  for(let i=0;i<schedules.length;i++){
                     if(schedules[i].class_attributes == 1){
                         schedules[i].class_attributes ="出勤"
@@ -429,7 +428,6 @@ export default {
         getScheduleDetail(id).then(response=>{
            if(response.data.state == 1){
              var scheduleDetail = response.data.data.scheduleDetail
-             console.log("scheduledetail",scheduleDetail)
              this.form.id = scheduleDetail.id
              this.form.class_name = scheduleDetail.class_name
              this.form.class_attributes = scheduleDetail.class_attributes
@@ -546,9 +544,6 @@ export default {
         },
      changtime(){
          //计算时长
-        console.log("timeone",this.form.timeone_start)
-        console.log("timeonend",this.form.timeone_end)
-        console.log("timeonetype",this.form.timeone_type)
         var longtime = 0
         var timeone = 0
         var timetwo = 0
@@ -564,7 +559,7 @@ export default {
           var timeone =  this.timeDifference(this.form.timeone_start,oneHours)
          timeone = timeone
         }
-       console.log("时间选择1时长",this.timeStamp(timeone))
+     
                 
         //时间选择2的时间差
         if(this.form.timetwo_type == 1){
@@ -578,18 +573,12 @@ export default {
             var timetwo =  this.timeDifference(this.form.timetwo_start,oneHours)
             timetwo = timetwo
         }
-          console.log("timetwo",timetwo)
-          console.log("时间选择2时长",this,this.timeStamp(timetwo))
                   
         longtime = timeone + timetwo
-        console.log("longtime",longtime)
         this.form.work_time = this.timeStamp(longtime)
      },
      changtimeTwo(){
            //计算时长
-        console.log("timeone",this.form.timeone_start)
-        console.log("timeonend",this.form.timeone_end)
-        console.log("timeonetype",this.form.timeone_type)
         var longtime = 0
         var timeone = 0
         var timetwo = 0
@@ -605,7 +594,6 @@ export default {
           var timeone =  this.timeDifference(this.form.timeone_start,oneHours)
          timeone = timeone
         }
-       console.log("时间选择1时长",this.timeStamp(timeone))
                 
         //时间选择2的时间差
         if(this.form.timetwo_type == 1){
@@ -619,11 +607,8 @@ export default {
             var timetwo =  this.timeDifference(this.form.timetwo_start,oneHours)
             timetwo = timetwo
         }
-          console.log("timetwo",timetwo)
-          console.log("时间选择2时长",this,this.timeStamp(timetwo))
                   
         longtime = timeone + timetwo
-        console.log("longtime",longtime)
         this.form.work_time = this.timeStamp(longtime) 
      }
     },
@@ -631,16 +616,6 @@ export default {
         //获取班种列表
         this.getList()
     },
-    watch: {
-    //  监听对象数据变化
-    work_time: {
-      handler(newVal, oldVal) {
-        console.log(newVal)
-        console,log(oldVal)
-      },
-      deep: true  // 非常非常重要，这个是深度监听，默认是false。true的时候才能监听到对象的变化
-    }
-   }
 }
 </script>
 <style scoped>

src/xt_pages/medicalScheduling/index.vue

@@ -40,7 +40,7 @@
             </div>
             <div class="schedulingTable" style="display:flex;justify-content: space-between;">
                 <div style="width: 70%">
-                    <el-table :data="tableData" border :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" :row-style="{ color: '#303133' }"  @cell-click="clickThis">
+                    <el-table :data="tableData" border :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" :row-style="{ color: '#303133' }"  @cell-click="clickThis" :cell-style="tableCellStyle">
                         <el-table-column prop="name" label="医护姓名" style="width:16%" align="center">
                             <template slot-scope="scope">
                                  {{scope.row.user_name}}
@@ -450,7 +450,6 @@ export default {
             getStaffScheduleList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList =  response.data.data.staffList
-                   console.log("所有排班数据",staffList)
                     for(let i=0;i<staffList.length;i++){
                     if(staffList[i].schedule_week == 0){
                         staffList[i].class_index = 0
@@ -474,7 +473,6 @@ export default {
                         staffList[i].class_index = 6
                     }
                     }
-                    console.log("staffList--------",staffList)
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) === -1) {
@@ -501,7 +499,6 @@ export default {
                     
                       }else{
                         arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type})
-                        // console.log("arr",arr)
                       }
                     })
                     console.log("arr=======",arr)
@@ -626,7 +623,6 @@ export default {
                             // console.log("arr",arr)
                           }
                         })
-                        console.log("全部=======",arr)
                         arr.sort(this.compare('user_type'))
                         this.tableData = arr
                     }
@@ -675,8 +671,6 @@ export default {
         })
         },
         toSearch(){
-            console.log("医护人员姓名",this.keywords)
-            
             const params = {
             user_name: this.keywords,
             start_time:this.getTimestamp(this.weekDayArr[0]),
@@ -685,7 +679,6 @@ export default {
             toSearchScheduleList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList =  response.data.data.staffList
-                    console.log("stafflist",staffList)
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) === -1) {
@@ -729,7 +722,6 @@ export default {
             start_time:this.getTimestamp(this.weekDayArr[0]),
             end_time:this.getTimestamp(this.weekDayArr[6])
             }
-            console.log("params",params)
             this.$confirm(
             '是否要清除当周排班? <br>清除后,信息将无法恢复',
             '删除提示',
@@ -780,7 +772,6 @@ export default {
             UpdateContinusSchedule(params).then(response=>{
                 if(response.data.state == 1){
                 var schedule =  response.data.data.schedule
-                console.log("schedule",schedule)
                 this.$message.success("保存成功")
                 }
             })
@@ -798,8 +789,6 @@ export default {
             this.currentFirstDate1 = num + 1
         },
         submitAction(formName){
-            console.log("数据",this.typeOptions)
-            console.log("2222",this.timeOptions)
             var label = ""
             for(let i=0;i<this.timeOptions.length;i++){
                if(this.form.copyWeek == this.timeOptions[i].value){
@@ -808,9 +797,7 @@ export default {
             }
            var start = label.split('~')
            var copy_startime = this.getTimestamp(start[0])   
-           console.log("copy_startime",copy_startime)   
            var copy_endtime = this.getTimestamp(start[1]) 
-           console.log("copy_endtime",copy_endtime)
 
             const params = {
               start_time:this.getTimestamp(this.weekDayArr[0]),
@@ -818,13 +805,11 @@ export default {
               copy_startime:copy_startime,
               copy_endtime:copy_endtime,
             }
-            console.log("params",params)
            this.$refs[formName].validate(valid=>{
               if(valid){
                 copyStaffSchedule(params).then(response=>{
                    if(response.data.state == 1){
                      var msg = response.data.data.msg
-                     console.log("msg",msg)
                      this.$message.success("复制成功")
                      this.newVisible = false
                    }else{
@@ -841,6 +826,16 @@ export default {
                 return value2 - value1;
             }
         },
+       tableCellStyle (row, rowIndex, column) {
+         var week = (row.column.label).split('');
+         var weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]+week[12]
+        //  console.log("week",week)
+         console.log("weeks",weeks)
+         var weekdate =  this.getTimestamp(weeks)
+         if(weekdate  < this.timeNow){
+           return 'background-color:#e5e5e5;'
+          }
+       },
     },
     created(){
         //获取医护人员
@@ -877,9 +872,7 @@ export default {
             
         }
       var now = moment().locale('zh-cn').format('YYYY-MM-DD 00:00:00')
-      console.log('now',now)
       this.timeNow = this.getTimestamp(now)
-      console.log("timenow",this.timeNow)
       
     }
 }

src/xt_pages/medicalScheduling/medical_print.vue

@@ -87,7 +87,6 @@ export default {
       getDoctorList(){
         getDoctorList().then(response=>{
           var list =  response.data.data.list
-          console.log("医护列表",list)
           this.doctorlist = list
           this.getStaffScheduleList()
         })
@@ -101,7 +100,6 @@ export default {
          getStaffScheduleList(params).then(response=>{
             if(response.data.state == 1){
               var staffList = response.data.data.staffList
-              console.log("staffList",staffList)
 
               let tempArr = [], newArr = []
               for (let i = 0; i < staffList.length; i++) {
@@ -129,10 +127,10 @@ export default {
               
                 }else{
                   arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type})
-                  // console.log("arr",arr)
                 }
               })
               arr.sort(this.compare('user_type'))
+              console.log("表哥数据----------",arr)
               this.tableData = arr
               
             }
@@ -191,13 +189,10 @@ export default {
     },
     created(){
       var starttime =  this.$route.query.starttime
-      console.log("starttime",starttime)
       this.start_time = starttime
       var endtime =  this.$route.query.endtime
-      console.log("endtime",endtime)
       this.end_time = endtime
       this.weekArr = this.$route.query.weekArr.split(',')
-      console.log(22222222222,this.$route.query.weekArr.split(','))
       //获取该机构所有医护人员
       this.getDoctorList()
     }

src/xt_pages/user/components/PatientDetail.vue

@@ -633,6 +633,20 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="24">
+          <el-form-item label="" prop="sch_remark">
+            <!-- <textarea v-model="form.remark" class="textarea" disabled></textarea> -->
+            <el-input
+              type="textarea"
+              :rows="3"
+              v-model="form.sch_remark"
+              resize="none"
+              placeholder=""
+              readonly
+            ></el-input>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="24">
           <el-form-item label="慢性病 : " prop="diseases">
             <el-checkbox-group v-model="form.diseases">
@@ -1055,7 +1069,8 @@ const defaultForm = {
   first_treatment_date: "",
   dialysis_age: "",
   expense_kind: "",
-  contact_name: ""
+  contact_name: "",
+  sch_remark:"",
 };
 
 export default {
@@ -1334,6 +1349,8 @@ export default {
             this.form.contagions = response.data.data.contagions;
             this.form.diseases = response.data.data.diseases;
             this.form.remark = patietInfo.remark;
+            this.form.sch_remark = patietInfo.sch_remark;
+
             this.form.diagnose = patietInfo.diagnose;
 
             this.form.patient_complains = patietInfo.patient_complains;
@@ -1478,6 +1495,10 @@ export default {
               /\n/g,
               "<br/>"
             );
+            this.patientPrint.sch_remark = patietInfo.sch_remark.replace(
+              /\n/g,
+              "<br/>"
+            );
             this.patientPrint.diagnose = patietInfo.diagnose.replace(
               /\n/g,
               "<br/>"

src/xt_pages/user/components/PatientForm.vue

@@ -280,6 +280,22 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
+
+              <el-col :span="24">
+                <el-form-item
+                  label="备注 : "
+                  prop="sch_remark">
+                  <el-input
+                    type="textarea"
+                    :rows="3"
+                    v-model="form.sch_remark"
+                    resize="none"
+                    placeholder
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+
+
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''" v-show="showLapseto">
                 <el-form-item
                   label="治疗状态(转归) : "
@@ -716,6 +732,8 @@
               ></el-input>
             </el-form-item>
           </el-col>
+
+
           <!--<el-col :span="24">-->
           <!--<el-form-item label="传染病 : " prop="checkContagions">-->
           <!--<el-checkbox-group v-model="form.contagions">-->
@@ -949,6 +967,7 @@ const defaultForm = {
   contagions: [],
   diseases: [],
   remark: "",
+  sch_remark:"",
   diagnose: "",
   is_infectious: 1,
   age: "",
@@ -1661,6 +1680,8 @@ export default {
             this.form.contagions = response.data.data.contagions;
             this.form.diseases = response.data.data.diseases;
             this.form.remark = patietInfo.remark;
+            this.form.sch_remark = patietInfo.sch_remark;
+
             this.form.diagnose = patietInfo.diagnose;
 
             this.form.patient_complains = patietInfo.patient_complains;

src/xt_pages/workforce/components/tableData.vue

@@ -426,6 +426,13 @@
             </span>
           </template>
         </el-table-column>
+        <el-table-column
+          property="sch_remark"
+          label="备注"
+          min-width="200"
+          align="center"
+        >
+        </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button @click="closePatientPanel()">取 消</el-button>