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

src/api/advice.js

@@ -477,3 +477,14 @@ export function SaveEditAdvices(params) {
     params: params
   });
 }
+
+
+
+
+export function GetLastOrNextDoctorAdvice(params) {
+  return request({
+    url: "/api/doctoradvice/get",
+    method: "get",
+    params: params
+  });
+}

src/router/index.js

@@ -101,7 +101,7 @@ var _constant_router_map = [{
 var _asy_router_map = [
   patient,
   workforce,
-  // medicalScheduling,
+  medicalScheduling,
   weight_sign,
   dialysis,
   stock,

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

@@ -386,7 +386,7 @@
               <el-input v-model="nameForm.advice_name"></el-input>
             </el-form-item>
           </el-col>
-          
+
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -487,7 +487,7 @@
           </el-col>
         </el-row>
         <el-row>
-          
+
           <el-col :span="12">
             <el-form-item label="执行频率 :" prop="execution_frequency">
               <el-select
@@ -1295,6 +1295,8 @@ export default {
               }
               this.$set(item, "children", item.children);
             }
+            console.log("11122333")
+            console.log(item)
             this.allSelectedTemplate.unshift(item);
             adviceTemplate.DoctorAdviceTemplate[index].selection = false;
           }
@@ -1367,7 +1369,7 @@ export default {
             this.$set(item, "children", item.children);
           }
         }
-
+        console.log(this.groupForm.adviceNames)
         this.groupForm.adviceNames.push(item);
       }
       this.templateFormVisible = false;

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

@@ -779,15 +779,15 @@
     >
       <div style="font-size:0.6rem;padding-left:0.38rem;margin-top:0.2rem;">
         <span style="font-weight: bold;color: #409eff;">开始时间:</span>
-        <el-time-picker
-          format="HH:mm"
-          value-format="HH:mm"
+        <el-date-picker
+          type="datetime"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
+          placeholder="选择时间"
           v-model="start_time"
-          @change="changeTime"
-          :picker-options="{
-      selectableRange: '00:00:00 - 23:59:00'
-    }">
-        </el-time-picker>
+          style="width:100%;"
+        ></el-date-picker>
+
         <!--<span style="display: inline-block;border: 1px solid #ccc;padding: 10px 20px;border-radius: 5px;" @click="changeStartTime">{{ advice_start_time }}</span>-->
       </div>
       <el-checkbox-group v-model="checkedCities">
@@ -1541,23 +1541,15 @@
                 })
                 var date = new Date()
 
-                var hour =
-                  date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
-                var minute =
-                  date.getMinutes() < 10
-                    ? '0' + date.getMinutes()
-                    : date.getMinutes()
+                console.log(this.start_time)
 
                 const params = {
                   advices: results,
-                  advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                  advice_date: this.start_time.split(" ")[0],
                   advice_doctor: results[0].advice_doctor,
                   advice_type: results[0].advice_type,
                   parent_id: this.patient_id,
-                  start_time:
-                    uParseTime(this.$route.query.date, '{y}-{m}-{d}') +
-                    ' ' +
-                   this.advice_start_time,
+                  start_time:this.start_time,
                   remark: ''
                 }
                 CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(
@@ -1619,15 +1611,12 @@
 
                 const params = {
                   advices: results,
-                  advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                  advice_date: this.start_time.split(" ")[0],
                   advice_doctor: results[0].advice_doctor,
                   advice_type: results[0].advice_type,
                   parent_id: this.patient_id,
-                  start_time:
-                    uParseTime(this.$route.query.date, '{y}-{m}-{d}') +
-                    ' ' +
-                    this.advice_start_time,
-                  remark: ''
+                  start_time:this.start_time,
+                  remark: '',
                 }
                 CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(
                   rs => {
@@ -1760,17 +1749,33 @@
       },
       show(pre,schedual,last) {
 
+        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
+        }
+        if (day < 10) {
+          day = '0' + day
+        }
+        if (hours < 10) {
+          hours = '0' + hours
+        }
+        if (minites < 10) {
+          minites = '0' + minites
+        }
+
         if(schedual.schedule_type == 1){
-          this.start_time = new Date(2016, 9, 10, 7, 0,0)
-          this.advice_start_time = "07:00"
+          this.start_time = year +"-"+month +"-"+day +" " + "07:00"
         }else if(schedual.schedule_type == 2){
-          this.start_time = new Date(2016, 9, 10, 12, 0,0)
-          this.advice_start_time = "12:00"
-
+          this.start_time = year +"-"+month +"-"+day +" " + "12:00"
         }else if(schedual.schedule_type ==3){
-          this.start_time = new Date(2016, 9, 10, 18, 0,0)
-          this.advice_start_time = "18:00"
-
+          this.start_time = year +"-"+month +"-"+day +" " + "18:00"
         }
 
         if (pre.anticoagulant == 3) {

src/xt_pages/dialysis/details/index.vue

@@ -870,7 +870,7 @@ export default {
     getScheduleDetail: function() {
       this.loading = true
       var dateStr = parseTime(this.date, '{y}-{m}-{d}')
-     
+
       this.doctor_advices = []
       getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
         var resp = rs.data
@@ -896,10 +896,10 @@ export default {
             }
           }
           var doctor_advices = resp.data.doctor_advices // 临时医嘱
-       
+
           var double_check = resp.data.double_check // 双人核对
           var assessment_after_dislysis = resp.data.assessment_after_dislysis // 透后评估
-    
+
           var treatment_summary = resp.data.treatment_summary // 治疗小结
           var monitor_records = resp.data.monitor_records // 透析监测
           var dialysis_order = resp.data.dialysis_order // 透析记录
@@ -954,6 +954,29 @@ export default {
           this.headNurses = headNurses
           this.system_prescribe = system_prescribe
 
+
+
+
+          this.niprocart_info = []
+          this.jms_info = []
+          this.fistula_needle_set_info = []
+          this.fistula_needle_set_16_info = []
+          this.hemoperfusion_info = []
+          this.dialyser_sterilised_info = []
+
+          this.filtryzer_info = []
+          this.dialyzers_info = []
+          this.injector_info = []
+
+          this.bloodlines_info = []
+          this.tubingHemodialysis_info = []
+          this.safe_package_info = []
+          this.aliquid_info = []
+
+
+
+
+
           this.niprocart_info = niprocart_info
           this.jms_info = jms_info
           this.fistula_needle_set_info = fistula_needle_set_info

src/xt_pages/medicalScheduling/index.vue

@@ -196,7 +196,7 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                
+
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click="newVisible=false">取 消</el-button>
@@ -250,7 +250,7 @@
                           <el-table-column
                             align="center"
                             label="是否排班">
-                            <template slot-scope="scope">           
+                            <template slot-scope="scope">
                               <el-radio-group v-model="scope.row.is_sort" @change="changeRadio(scope.row)">
                                  <el-radio :label="1">是</el-radio>
                                  <el-radio :label="0">否</el-radio>
@@ -289,7 +289,7 @@
                                     <span v-if="scope.row.user_title == 10">副主任护师</span>
                                     <span v-if="scope.row.user_title == 11">主任护师</span>
                                     <span v-if="scope.row.user_title == 12">运营专员</span>
-                                    <span v-if="scope.row.user_title == 13">运营主管</span>  
+                                    <span v-if="scope.row.user_title == 13">运营主管</span>
                                 </template>
                              </el-table-column>
                                 <el-table-column
@@ -302,7 +302,7 @@
                                 <el-table-column
                                 align="center"
                                 label="是否排班">
-                                <template slot-scope="scope">           
+                                <template slot-scope="scope">
                                   <el-radio-group v-model="scope.row.is_sort" @change="changeRadio(scope.row)">
                                      <el-radio :label="1">是</el-radio>
                                      <el-radio :label="0">否</el-radio>
@@ -378,7 +378,7 @@ export default {
               copyWeek:"",
             },
            rules: {
-             copyWeek: [{ required: true, message: "请选择复制时间段", trigger: "blur" }],  
+             copyWeek: [{ required: true, message: "请选择复制时间段", trigger: "blur" }],
            },
            timeNow:0,
            arrZero:[],
@@ -472,7 +472,7 @@ export default {
                     }
                     this.schedulelist = schedulelist
                 }
-            }) 
+            })
         },
         hangdleClick(val,index,num){
         //  console.log("val",val)
@@ -541,7 +541,7 @@ export default {
             schedule_date:this.getTimestamp(this.schedule_date)
             }
             //  console.log("params",params)
-            
+
             addSchedule(params).then(response=>{
             if(response.data.state == 1){
                 var schedule = response.data.data.schedule
@@ -551,36 +551,36 @@ export default {
                 }
             })
         },
-        formatDate(date){      
-            var year = date.getFullYear()+'.'       
+        formatDate(date){
+            var year = date.getFullYear()+'.'
             var month = (date.getMonth()+1)+'.';
             var day = date.getDate();
             return year+month+day
-        }, 
-        formatDateTwo(date){      
-            var year = date.getFullYear()+'.'       
+        },
+        formatDateTwo(date){
+            var year = date.getFullYear()+'.'
             var month = (date.getMonth()+1)+'.';
             var day = date.getDate();
             return year+month+day
-        }, 
-        addDate(date,n){        
-            date.setDate(date.getDate()+n);        
+        },
+        addDate(date,n){
+            date.setDate(date.getDate()+n);
             return date;
-        },  
+        },
             //
-        setDate(date){           
+        setDate(date){
             var week = date.getDay()-1;
             date = this.addDate(date,week*-1);
             this.currentFirstDate = new Date(date);
             this.currentDate = new Date(date)
-            for(var i = 0;i<this.clen; i++){     
+            for(var i = 0;i<this.clen; i++){
                 this.weekDayArr.push(this.formatDate(i==0 ? date : this.addDate(date,1)))
-            }         
+            }
         },
-            //上一周 
+            //上一周
         lastclick(){
             this.weekDayArr=[]
-            this.setDate(this.addDate(this.currentFirstDate,-7));   
+            this.setDate(this.addDate(this.currentFirstDate,-7));
             if (this.weekNum == 1) {
                 let year = this.nowYear - 1
                 let month = 12
@@ -592,8 +592,8 @@ export default {
             this.getNextWeekList()
         },
             //下一周
-        nextclick(){ 
-            this.weekDayArr=[]                
+        nextclick(){
+            this.weekDayArr=[]
             this.setDate(this.addDate(this.currentFirstDate,7));
             this.weekNum = this.weekNum + 1
             if (this.weekNum == 53) {
@@ -607,16 +607,16 @@ export default {
         },
 
         getYearWeek(year,month,date){
-        /*  
-            dateNow是当前日期 
-            dateFirst是当年第一天  
-            dataNumber是当前日期是今年第多少天  
-            用dataNumber + 当前年的第一天的周差距的和在除以7就是本年第几周  
-        */      
+        /*
+            dateNow是当前日期
+            dateFirst是当年第一天
+            dataNumber是当前日期是今年第多少天
+            用dataNumber + 当前年的第一天的周差距的和在除以7就是本年第几周
+        */
         let dateNow = new Date(year, parseInt(month) - 1, date);
         let dateFirst = new Date(year, 0, 1);
         let dataNumber = Math.round((dateNow.valueOf() - dateFirst.valueOf()) / 86400000);
-        return Math.ceil((dataNumber + ((dateFirst.getDay() + 1) - 1)) / 7);        
+        return Math.ceil((dataNumber + ((dateFirst.getDay() + 1) - 1)) / 7);
         },
         getTimestamp(time) { //把时间日期转成时间戳
         return (new Date(time)).getTime() / 1000
@@ -636,7 +636,7 @@ export default {
             }
             getStaffScheduleList(params).then(response=>{
                 if(response.data.state == 1){
-                    var staffList =  response.data.data.staffList                
+                    var staffList =  response.data.data.staffList
                     // console.log("获取所有排班",staffList)
                     var sevenStr = ""
                     var oneStr = ""
@@ -652,18 +652,18 @@ export default {
                     this.arrFour = []
                     this.arrFive = []
                     this.arrSix = []
-                
+
                     for(let i=0;i<staffList.length;i++){
                     if(staffList[i].schedule_week == 0){
                         staffList[i].class_index = 0
                          var arr = []
-                        this.arrZero.push(staffList[i].class_name)             
+                        this.arrZero.push(staffList[i].class_name)
                         for(let i=0;i<this.arrZero.length;i++){
                            if(this.arrZero[i]!=''){
                               arr.push(this.arrZero[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -690,7 +690,7 @@ export default {
                               arr.push(this.arrOne[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -717,7 +717,7 @@ export default {
                               arr.push(this.arrTwo[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -744,7 +744,7 @@ export default {
                               arr.push(this.arrThree[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -771,7 +771,7 @@ export default {
                               arr.push(this.arrFour[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -799,7 +799,7 @@ export default {
                               arr.push(this.arrFive[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -826,7 +826,7 @@ export default {
                               arr.push(this.arrSix[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -869,13 +869,13 @@ export default {
                     this.doctorlist.sort(this.compare('admin_user_id'))
                     this.doctorlist.forEach((item, index) => {
                       if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
-                    
+
                       }else{
                         arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type})
                       }
                     })
                     arr.sort(this.compare('user_type'))
-                    
+
                     let arr2 = []
                     arr2.push({class_name:oneStr,schedule_week:1})
                     arr2.push({class_name:twoStr,schedule_week:2})
@@ -891,8 +891,8 @@ export default {
                     obj.list = arr2
                     arr.push(obj)
                     this.tableData = arr
-        
-                
+
+
                 }
             })
         },
@@ -909,12 +909,12 @@ export default {
                             }
                         })
                     }
-                    
+
                 }
                 })
                 return newClass
             }
-        
+
         },
         getClassAttributes(name,index){
             if(name != undefined){
@@ -928,19 +928,19 @@ export default {
                             }
                         })
                     }
-                    
+
                 }
                 })
                 return newClass
             }
-        
+
         },
 
-        unique(arr) { 
+        unique(arr) {
             const res = new Map();
             return arr.filter((arr) => !res.has(arr.admin_user_id) && res.set(arr.admin_user_id, 1))
         },
-        
+
         //获取上一周下一周的排班数据
         getNextWeekList(){
             const params = {
@@ -975,7 +975,7 @@ export default {
                               arr.push(this.arrZero[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -1002,7 +1002,7 @@ export default {
                               arr.push(this.arrOne[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -1029,7 +1029,7 @@ export default {
                               arr.push(this.arrTwo[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -1056,7 +1056,7 @@ export default {
                               arr.push(this.arrThree[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -1083,7 +1083,7 @@ export default {
                               arr.push(this.arrFour[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -1111,7 +1111,7 @@ export default {
                               arr.push(this.arrFive[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -1138,7 +1138,7 @@ export default {
                               arr.push(this.arrSix[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -1180,7 +1180,7 @@ export default {
                     this.doctorlist.sort(this.compare('admin_user_id'))
                     this.doctorlist.forEach((item, index) => {
                       if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
-                    
+
                       }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)
@@ -1210,13 +1210,13 @@ export default {
             const params = {
             start_time:this.getTimestamp(this.weekDayArr[0]),
             end_time:this.getTimestamp(this.weekDayArr[6]),
-            doctor_id:id 
+            doctor_id:id
             }
             getScheduleByDoctorId(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) {
@@ -1242,7 +1242,7 @@ export default {
                         this.doctorlist.sort(this.compare('admin_user_id'))
                         this.doctorlist.forEach((item, index) => {
                           if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
-                        
+
                           }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)
@@ -1263,7 +1263,7 @@ export default {
                         })
                         newDoctor.map((item, index) => {
                         if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
-                        
+
                           }else{
                             arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
                             // console.log("arr",arr)
@@ -1283,7 +1283,7 @@ export default {
                         })
                         newDoctor.map((item, index) => {
                         if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
-                        
+
                           }else{
                             arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
                             // console.log("arr",arr)
@@ -1331,7 +1331,7 @@ export default {
                         this.doctorlist.sort(this.compare('admin_user_id'))
                         this.doctorlist.forEach((item, index) => {
                           if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
-                        
+
                           }else{
                             arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
                             // console.log("arr",arr)
@@ -1382,7 +1382,7 @@ export default {
             //     }else{
             //     this.$message.error("排班已存在")
             //     }
-            // }) 
+            // })
         },
         toContinuous(){
             var is_status = 0
@@ -1422,8 +1422,8 @@ export default {
                }
             }
            var start = label.split('~')
-           var copy_startime = this.getTimestamp(start[0])   
-           var copy_endtime = this.getTimestamp(start[1]) 
+           var copy_startime = this.getTimestamp(start[0])
+           var copy_endtime = this.getTimestamp(start[1])
 
             const params = {
               start_time:this.getTimestamp(this.weekDayArr[0]),
@@ -1461,7 +1461,7 @@ export default {
             if (week.length == 14) {
                 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)
@@ -1478,31 +1478,31 @@ export default {
         changeSort(val){
           console.log('val',val)
             const params = {
-              sort:parseInt(val.sort), 
-              id:val.id, 
+              sort:parseInt(val.sort),
+              id:val.id,
             }
             console.log("params",params)
-          SaveNurseSort(params).then(response=>{
-             if(response.data.state == 1){
-               var role = response.data.data.role
-               this.$message.success("保存成功")
-               this.getDoctorList()
-             }
-          })
+          // SaveNurseSort(params).then(response=>{
+          //    if(response.data.state == 1){
+          //      var role = response.data.data.role
+          //      this.$message.success("保存成功")
+          //      this.getDoctorList()
+          //    }
+          // })
         },
        changeRadio(val){
           console.log("val",val)
            const params = {
               id:val.id,
-              is_sort:val.is_sort, 
+              is_sort:val.is_sort,
            }
-         SaveIsSchedule(params).then(response=>{
-            if(response.data.state == 1){
-              var role =  response.data.data.role
-              this.$message.success("保存成功")
-              this.getDoctorList()
-            }
-         })
+         // SaveIsSchedule(params).then(response=>{
+         //    if(response.data.state == 1){
+         //      var role =  response.data.data.role
+         //      this.$message.success("保存成功")
+         //      this.getDoctorList()
+         //    }
+         // })
        }
     },
     created(){
@@ -1530,19 +1530,19 @@ export default {
                 let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
                 this.timeOptions.push({value:i,label:stt})
             }else{
-                
+
                 newNum++
                 let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + newNum + ')'
-                this.typeOptions.push({value:i,label:str}) 
+                this.typeOptions.push({value:i,label:str})
                 let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
-                this.timeOptions.push({value:i,label:stt}) 
+                this.timeOptions.push({value:i,label:stt})
             }
-            
+
         }
       var now = moment().locale('zh-cn').format('YYYY-MM-DD 00:00:00')
       this.timeNow = this.getTimestamp(now)
-      
-      
+
+
     }
 }
 </script>
@@ -1567,7 +1567,7 @@ export default {
         background-color: rgb(245, 247, 250);
         color: rgb(96, 98, 102);
         font-weight:bold;
-        
+
     }
     .classMain{
         height: 400px;

src/xt_pages/medicalScheduling/schedulingStatistics.vue

@@ -67,7 +67,7 @@
                     :picker-options="pickerOptions">
                     </el-date-picker>
                 </div>
-                
+
             </div>
             <div class="tableTitle">统计图</div>
             <div class="cell clearfix" style="margin:0;">
@@ -123,7 +123,7 @@
 import echarts from "echarts";
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import LineChart from "../qcd/components/LineChart";
-import { getScheduleList,getScheduleListTotal }  from '@/api/doctorSchedule'
+import { getScheduleList }  from '@/api/doctorSchedule'
 export default {
     components:{
         BreadCrumb,
@@ -273,39 +273,39 @@ export default {
         this.weekNum = this.getYearWeek(year,month,date)
         this.todayDate=this.formatDate(new Date())
         this.setDate(new Date())
-      
+
 
       //获取所有排班种
       this.getScheduleList()
-  
-      //获取统计表的数据
-      this.getlist()
+
+      // 获取统计表的数据
+      // this.getlist()
     },
     methods:{
         toSearch(){},
-        formatDate(date){      
-            var year = date.getFullYear()+'.'       
+        formatDate(date){
+            var year = date.getFullYear()+'.'
             var month = (date.getMonth()+1)+'.';
             var day = date.getDate();
             return year+month+day
-        }, 
-        addDate(date,n){        
-            date.setDate(date.getDate()+n);        
+        },
+        addDate(date,n){
+            date.setDate(date.getDate()+n);
             return date;
-        },  
-        setDate(date){           
+        },
+        setDate(date){
             var week = date.getDay()-1;
             date = this.addDate(date,week*-1);
             this.currentFirstDate = new Date(date);
             this.currentDate = new Date(date)
-            for(var i = 0;i<this.clen; i++){     
+            for(var i = 0;i<this.clen; i++){
                 this.weekDayArr.push(this.formatDate(i==0 ? date : this.addDate(date,1)))
-            }         
+            }
         },
-        //上一周 
+        //上一周
         lastclick(){
             this.weekDayArr=[]
-            this.setDate(this.addDate(this.currentFirstDate,-7));   
+            this.setDate(this.addDate(this.currentFirstDate,-7));
             if (this.weekNum == 1) {
                 let year = this.nowYear - 1
                 let month = 12
@@ -316,8 +316,8 @@ export default {
             this.weekNum = this.weekNum - 1
         },
         //下一周
-        nextclick(){ 
-            this.weekDayArr=[]                
+        nextclick(){
+            this.weekDayArr=[]
             this.setDate(this.addDate(this.currentFirstDate,7));
             this.weekNum = this.weekNum + 1
             if (this.weekNum == 53) {
@@ -329,16 +329,16 @@ export default {
             }
         },
         getYearWeek(year,month,date){
-            /*  
-                dateNow是当前日期 
-                dateFirst是当年第一天  
-                dataNumber是当前日期是今年第多少天  
-                用dataNumber + 当前年的第一天的周差距的和在除以7就是本年第几周  
-            */      
+            /*
+                dateNow是当前日期
+                dateFirst是当年第一天
+                dataNumber是当前日期是今年第多少天
+                用dataNumber + 当前年的第一天的周差距的和在除以7就是本年第几周
+            */
             let dateNow = new Date(year, parseInt(month) - 1, date);
             let dateFirst = new Date(year, 0, 1);
             let dataNumber = Math.round((dateNow.valueOf() - dateFirst.valueOf()) / 86400000);
-            return Math.ceil((dataNumber + ((dateFirst.getDay() + 1) - 1)) / 7);        
+            return Math.ceil((dataNumber + ((dateFirst.getDay() + 1) - 1)) / 7);
             },
             getTimestamp(time) { //把时间日期转成时间戳
             return (new Date(time)).getTime() / 1000
@@ -354,10 +354,10 @@ export default {
             var month = nowDate.getMonth() + 1; // getMonth 方法返回 0-11，代表1-12月
             var endOfMonth = new Date(fullYear, month, 0).getDate(); // 获取本月最后一天
             let monthEndTime = this.getFullDate(cloneNowDate.setDate(endOfMonth))
-            
-            
+
+
             console.log('monthEndTime',this.getTimestamp(monthEndTime))
-            
+
         },
         getFullDate(targetDate) {
             var D, y, m, d;
@@ -386,7 +386,7 @@ export default {
                 var schedulelist = response.data.data.scheduleList
                 console.log("schedulelist",schedulelist)
                 this.scheduleList = schedulelist
-             } 
+             }
           })
         },
 

src/xt_pages/user/components/PatientDetail.vue

@@ -223,6 +223,19 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <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="8" style="height:59px;">
               <el-form-item
                 label="治疗状态(转归) : "
@@ -633,19 +646,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
-          <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">