新分支

src/api/patient.js

     method:"get",
     params:params,
   })
+}
+
+export function getExportList(params){
+  
+  return request({
+    url:"/api/patient/getexportlist",
+    metod:"get",
+    params:params,
+  })
 }

src/api/schedule.js

   })
 }
 
+export function getSchedulesThree(params){
+  
+  return request({
+    url:"/api/schedule/getschedulethreeone",
+    method:"Get",
+    params:params,
+  })
+}
+
 export function getSchedulePatients(params) {
   return request({
     url: '/api/schedule/patients',

src/router/modules/workforce.js

   //     noCache: true
   //   }
   // }
+  {
+    path: '/scheduleTablePrintSix',
+    component: () => import('@/xt_pages/workforce/scheduleTablePrintSix'),
+    name: 'scheduleTablePrintSix',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'scheduleTablePrintSix',
+      noCache: true
+    }
+  },
   ]
 }

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

             <span class="main_title"> &nbsp;
               透析参数
             </span>
-            <span  style="float:right;">打印日期: &nbsp;
+            <span  style="float:left;">打印日期: &nbsp;
                {{$route.query.schedule_date}}
             </span>
           </div>
                 <td width="100" v-if="dialysisSett.sealing_fluid_dispose == 1">封管液</td>
                 <td width="100"  v-if="dialysisSett.glucose==1">葡萄糖</td>
                 <td width="100"  v-if="dialysisSett.blood_flow_volume==1">血流量</td>
-                <td>封管液</td>
-                <td>促红</td>
+                <td v-if="org_id!=10587 && org_id!=0">封管液</td>
+                <td v-if="org_id!=10587 && org_id!=0">促红</td>
               </tr>
               </thead>
               <tbody>
                    <span>{{item.dialysis_solution.blood_flow_volume?item.dialysis_solution.blood_flow_volume:""}}</span> 
                 </td>
                 
-                <td>
+                <td v-if="org_id!=10587 && org_id!=0">
                   <span v-if="getBloodAccessOption(item.dialysis_solution.blood_access).indexOf('导管')!==-1">1</span>
                   <span v-else></span>
                 </td>
                 
                 
-                <td>
+                <td v-if="org_id!=10587&& org_id!=0">
                   {{ item.advice_spc }}
                 </td>
                </tr>

src/xt_pages/dialysis/details/index.vue

           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id ==10579 || this.org_id == 0){
+        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id == 0 || this.org_id == 10579){
+        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0

src/xt_pages/dialysis/details/indexs.vue

           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id ==10579 || this.org_id == 0){
+        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

                         style="width: 100px; text-align: center"
                       >
                         <span v-if="org_id == 10290 || org_id == 10318">{{
-                          lastafterdialysis.weight_after
+                          lastafterdialysis.weight_after?lastafterdialysis.weight_after:"/"
                         }}</span>
                         <span v-if="org_id != 10290 && org_id != 10318">{{
                           predialysis.weight_after_last_transparency

src/xt_pages/role/admin.vue

         >医药师登记</el-button>
 
 
-        <!-- <el-button
+        <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">加班</el-button> -->
+          @click="toJiaBan">加班</el-button>
        
 
          <!-- <el-button
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDrug">自动生成</el-button>
+          @click="toAutoDrug">自动生成</el-button> -->
 
 
           <el-button
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button> -->
+          @click="toAutoDiagnose">自动脚本</el-button>
      </div>
 
 

src/xt_pages/user/components/PatientDetail.vue

               </el-form-item>
              </el-col>
 
+             <el-col :span="8">
+                <el-form-item label="工作单位 : " prop="work">
+                  <el-input v-model="form.work" disabled></el-input>
+                </el-form-item>
+              </el-col>
+
              <el-col :span="24">
               <el-form-item label="病历号 : " prop="record_number">
                 <el-input
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="工作单位 : " prop="work">
-                  <el-input v-model="form.work" disabled></el-input>
-                </el-form-item>
-              </el-col>
+          
               <el-col :span="8">
                 <el-form-item label="单位地址 : " prop="unit_address">
                   <el-input v-model="form.unit_address" disabled></el-input>

src/xt_pages/user/components/PatientForm.vue

                 </el-checkbox-group>
               </el-form-item>
             </el-col>
+
+            <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item label="工作单位 : " prop="work">
+                  <el-input v-model="form.work"></el-input>
+                </el-form-item>
+            </el-col>
+
             
             <el-col :span="24">
               <el-form-item label="病历号 : " prop="record_number">
               </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-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
-                  <el-form-item label="工作单位 : " prop="work">
-                    <el-input v-model="form.work"></el-input>
-                  </el-form-item>
-                </el-col>
+                
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="单位地址 : " prop="unit_address">
                     <el-input v-model="form.unit_address"></el-input>

src/xt_pages/user/patients.vue

       
   
         <el-button type="primary" size="small" style="float:right" @click="toExport">导出</el-button>
+        <el-button type="primary" size="small" style="float:right" @click="toExportOne">导出2</el-button>
       </div>
       <div  class="cell clearfix">
 
 
 <script>
   import { fetchAllAdminUsers } from "@/api/doctor";
-  import { code, EditLapseto, fetchList, getMaxDialysisNo, OpenView, postExportPatients,GetRemind,getPatientAllagic } from '@/api/patient'
+  import { code, EditLapseto, fetchList, getMaxDialysisNo, OpenView, postExportPatients,GetRemind,getPatientAllagic,getExportList } from '@/api/patient'
   import { generateLog } from '@/api/config'
   import QRCode from 'qrcodejs2'
   import Vue from 'vue'
           patient_end_time:"",
           nurse:"0"
         },
-        adminUserOptions:[]
+        adminUserOptions:[],
+        scheduleList:[],
+        patientsList:[]
       }
     },
     created() {
       //获取
       this.GetRemindPatientList()
       this.fetchAllAdminUsers();
+      this.getExportList()
     },
 
     methods: {
+      getExportList(){
+        getExportList(this.listQuery).then(response=>{
+           if(response.data.state ==1){
+             this.scheduleList =  response.data.data.schedule
+             this.patientsList = response.data.data.patientsList
+           }
+        })
+      },
       fetchAllAdminUsers() {
         fetchAllAdminUsers().then((response) => {
           if (response.data.state === 1) {
         this.schedulType = scheduleType
         this.listQuery.schedul_type = scheduleType
         this.getList()
+        this.getExportList()
       },
       selectSystemType(systemType) {
         this.systemType = systemType
         this.listQuery.binding_state = systemType
         this.getList()
+        this.getExportList()
       },
       selectLapseTo(lapseto) {
         this.lapsetoType = lapseto
         this.listQuery.lapseto = lapseto
         this.getList()
+        this.getExportList()
       },
       selectSource(source) {
         this.sourceType = source
         this.listQuery.source = source
         this.getList()
+        this.getExportList()
       },
       selectPatientSource(source){
         this.patientSoureType = source
         this.listQuery.patientSoureType = source
         this.getList()
+        this.getExportList()
       },
       changeTimeOne(val) {
         var time = this.getTimestamp(val) - this.end_time
           this.listQuery.start_time = ''
         } else {
           this.getList()
+          this.getExportList()
           this.startTime = this.getTimestamp(val)
         }
       },
           this.listQuery.end_time = ''
         } else {
           this.getList()
+          this.getExportList()
           this.end_time = this.getTimestamp(val)
         }
       },
             console.log("wowowowo",this.tableData)
             this.pageTotal = this.tableData.length
             this.total = response.data.data.total
-
+          
           }
         })
       },
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]));
     },
+
+    toExportOne(){
+      import('@/vendor/Export2Excel').then(excel => {
+
+        console.log("hhhh323223",this.scheduleList)
+        for(let i=0;i<this.scheduleList.length;i++){
+          this.scheduleList[i].name = ""
+          this.scheduleList[i].wort_unit = ""
+            this.scheduleList[i].name = this.GetPatientName(this.scheduleList[i].patient_id)
+            this.scheduleList[i].wort_unit = this.GetPatientWorkUnit(this.scheduleList[i].patient_id)
+        }
+
+        const tHeader = ['姓名', '工作单位']
+        const filterVal = ['name', 'wort_unit']
+        console.log("table",this.scheduleList)
+
+        const data = this.formatJson(filterVal, this.scheduleList)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '今日透析记录'
+        })
+        this.downloadLoading = false
+     })
+    },
     tranAge(val) {
       if(val.birthday){
         var birth = uParseTime(val.birthday, '{y}-{m}-{d}');
           this.patientAllgicList = list
         }
       })
+    },
+    GetPatientName(id){
+       var name = ""
+       for(let i=0;i<this.patientsList.length;i++){
+          if(id == this.patientsList[i].id){
+             name = this.patientsList[i].name
+          }
+       }
+       return name
+    },
+    GetPatientWorkUnit(id){
+      console.log("HHAHAHAH",this.patientsList)
+      var work_unit =""
+      for(let i=0;i<this.patientsList.length;i++){
+          if(id == this.patientsList[i].id){
+            work_unit = this.patientsList[i].work_unit
+          }
+       }
+       return work_unit
     }
     }
   }

src/xt_pages/workforce/appointment.vue

       <div style="display:flex;align-items:center">
         <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction" v-if="activeName !='historyWeek'">打印排班</el-button>
         <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleActionOne" v-if="activeName == 'historyWeek'">打印排班</el-button>
+        <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleActionTwo">治疗签到</el-button>
         <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
         <!-- <el-button @click="printTable" type="primary" size="small">打印排班</el-button> -->
         <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
 
       this.$router.push({path:'/scheduleTablePrintThree?partition_id='+partition_id+"&weekTime="+nextTwoWeek+"&week_date="+week_date+"&start_time="+start_time+"&end_time="+end_time})
     },
+    printScheduleActionTwo:function(){
+      var date = new Date().getTime()
+      if(this.activeName == 'historyWeek'){
+        date = date - 14 * 24 * 60 * 60 * 1000
+      }else if (this.activeName == 'lastWeek') {
+        date = date - 7 * 24 * 60 * 60 * 1000
+      } else if (this.activeName == 'nextWeek') {
+        date = date + 7 * 24 * 60 * 60 * 1000
+      } else if (this.activeName == 'nextTwoWeek') {
+        date = date + 14 * 24 * 60 * 60 * 1000
+      }
+       this.$router.push({path: '/scheduleTablePrintSix?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date+"&schedule_type="+this.schedule_type})
+      
+    },
     isShow() {
       let isShow = false
       if (Object.keys(this.partitions).length != 0) {