新分支

src/xt_pages/dialysis/details/NavIgation.vue

       :prescription="prescription"
       :predialysis_evaluation="predialysis_evaluation"
       :dialysis_order="dialysis_order"
-    
+      :schedual="temp_schedual"
     ></assessment-after-dislysis>
   </div>
 </template>

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

         return { id: 0 }
       }
     },
+    schedual: {
+        type: Object
+    },
   },
   data() {
     return {
     submitForm(formName) {
       this.$refs[formName].validate((valid)=>{
         if(valid){
-
+          var dateOne = this.schedual.schedule_date
+          var schedule_date = uParseTime(dateOne, '{y}-{m}-{d}')      
+          var date = this.$route.query && this.$route.query.date 
+          this.record_date = date ? uParseTime(date, '{y}-{m}-{d}') :schedule_date
+          console.log("日期我哦我",this.record_date)
           this.loading = true
           const ParamsQuery = {}
 
              this.infoDialogVisible = false
            }
         })
-      }
+      },
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
   },
   created() {
     // console.log("this.form", this.form.consciousness);
     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 = date ? uParseTime(date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
+   
+    // this.record_date = date ? uParseTime(date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
+   
     if(this.$store.getters.xt_user.template_info.org_id == 0 ||  this.$store.getters.xt_user.template_info.org_id==9829 ||  this.$store.getters.xt_user.template_info.org_id==10469){
       this.form.pulse_frequency = 80
     }

src/xt_pages/role/admin.vue

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

src/xt_pages/user/components/PatientDetail.vue

               </el-form-item>
              </el-col>
 
+             <el-col :span="24">
+              <el-form-item label="主管护士 : " prop="record_number">
+                <el-select v-model="form.nurse" style="width:200px"   disabled>
+                <el-option
+                  v-for="(item,index) in adminUserOptions"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id"
+               
+                />
+              </el-select>
+              </el-form-item>
+             </el-col>
+
               <el-col :span="6">
               <el-form-item
                 label="本院前透析频率 : "
             // if (patietInfo.attending_doctor_id > 0) {
             //   this.form.doctor = patietInfo.attending_doctor_id;
             // }
-            // if (patietInfo.head_nurse_id > 0) {
-            //   this.form.nurse = patietInfo.head_nurse_id;
-            // }
+            if (patietInfo.head_nurse_id > 0) {
+              this.form.nurse = patietInfo.head_nurse_id;
+            }
             // if (patietInfo.registrars_id > 0) {
             //   this.form.registrars = patietInfo.registrars_id;
             // }

src/xt_pages/user/components/PatientForm.vue

               </el-form-item>
              </el-col>
 
+             <el-col :span="24">
+              <el-form-item label="主管护士 : " prop="record_number">
+                <el-select v-model="form.nurse" style="width:200px">
+                <el-option
+                  v-for="(item,index) in adminUserOptions"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+              </el-form-item>
+             </el-col>
+
             <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
               <el-form-item
                 label="本院前透析频率 : "
           </el-col>
 
          <el-col :span="6">
-          <el-form-item label="医生 : ">
+          <el-form-item label="主治医生 : ">
             <el-select v-model="form.doctor">
                 <el-option
                   v-for="(item,index) in adminUserOptions"
   troble_shoot:2,
   zb_patient_id:"",
   doctor:"",
+  nurse:"",
   patient_source:0,
   patient_start_time:"",
   patient_end_time:"",
         if (response.data.state === 1) {
           this.form.doctor = this.$store.getters.xt_user.user.id
           this.adminUserOptions = response.data.data.users;
+          
 
         }
       });
             this.form.user_sys_before_count = this.form.user_sys_before_count.toString();
             this.form.troble_shoot = parseInt(this.form.troble_shoot)
             this.form.doctor = parseInt(this.form.doctor)
+            this.form.nurse = parseInt(this.form.nurse)
             if(this.form.patient_source >0){
               this.form.patient_source = parseInt(this.form.patient_source)
             }else{
             this.form.age = parseInt(this.form.age);
             this.form.troble_shoot = parseInt(this.form.troble_shoot)
             this.form.doctor = parseInt(this.form.doctor)
+            this.form.nurse = parseInt(this.form.nurse)
             if(this.form.patient_source >0){
               this.form.patient_source = parseInt(this.form.patient_source)
             }else{
             // if (patietInfo.attending_doctor_id > 0) {
             //   this.form.doctor = patietInfo.attending_doctor_id;
             // }
-            // if (patietInfo.head_nurse_id > 0) {
-            //   this.form.nurse = patietInfo.head_nurse_id;
-            // }
+            if (patietInfo.head_nurse_id > 0) {
+              this.form.nurse = patietInfo.head_nurse_id;
+            }
             // if (patietInfo.registrars_id > 0) {
             //   this.form.registrars = patietInfo.registrars_id;
             // }

src/xt_pages/user/patients.vue

           </ul>
         </div>
       </div> -->
+      <div  class="cell clearfix">
+        <label class="title"><span class="name">主管护士</span> : </label>
+        <el-select v-model="form.nurse" style="width:200px">
+            <el-option
+              placeholder="主管护士"
+              v-for="(item,index) in adminUserOptions"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+              @change="changeNuseSearch"
+            
+            />
+        </el-select>
+      </div>
       <div class="cell clearfix">
         <label class="title"><span class="name">其它查询</span> : </label>
         <el-select
           >
           </el-option>
         </el-select>
+      
+  
         <el-button type="primary" size="small" style="float:right" @click="toExport">导出</el-button>
       </div>
+      <div  class="cell clearfix">
+
+      </div>
 
       <el-table
         ref="multipleTable"
 </template>
 
 <script>
+  import { fetchAllAdminUsers } from "@/api/doctor";
   import { code, EditLapseto, fetchList, getMaxDialysisNo, OpenView, postExportPatients,GetRemind,getPatientAllagic } from '@/api/patient'
   import { generateLog } from '@/api/config'
   import QRCode from 'qrcodejs2'
           isscheduling: '',
           isprescription: '',
           patientSoureType:'',
+          nurse:0,
         },
         multipleSelection: [],
         bindWechatDialog: false,
           patient_address:"",
           patient_start_time:"",
           patient_end_time:"",
-        }
+          nurse:"0"
+        },
+        adminUserOptions:[]
       }
     },
     created() {
       }
       //获取
       this.GetRemindPatientList()
+      this.fetchAllAdminUsers();
     },
 
     methods: {
+      fetchAllAdminUsers() {
+        fetchAllAdminUsers().then((response) => {
+          if (response.data.state === 1) {
+            var obj ={id:0,name:"全部"}
+            this.adminUserOptions.push(obj)
+            for(let i=0;i<response.data.data.users.length;i++){
+              this.adminUserOptions.push(response.data.data.users[i])
+            }
+          }
+        });
+      },
       putOnRecord:function(type,row){
         if(type == 1){
 
       changeOtherSearch() {
         this.getList()
       },
+      changeNuseSearch(){
+        this.getList()
+      },
       getList() {
          console.log("query23323223wo",this.listQuery)
         fetchList(this.listQuery).then(response => {