数据

src/api/schedule.js

@@ -1,18 +1,15 @@
 import request from '@/utils/request'
 
-export function getWeekPanels(t,patitionId) {
-  
+export function getWeekPanels(t, patitionId) {
   return request({
-    url: '/api/schedule/weekpanel?data=' + t+"&patitionid="+patitionId,
+    url: '/api/schedule/weekpanel?data=' + t + '&patitionid=' + patitionId,
     method: 'get'
   })
 }
 
-
-export function getWeekPanelsOne(t,patitionId){
-  
+export function getWeekPanelsOne(t, patitionId) {
   return request({
-    url: '/api/schedule/weekpanelone?data=' + t+"&patitionid="+patitionId,
+    url: '/api/schedule/weekpanelone?data=' + t + '&patitionid=' + patitionId,
     method: 'get'
   })
 }
@@ -21,15 +18,15 @@ export function getSchedules(params) {
   return request({
     url: '/api/schedule/schedules',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-export function getSchedulesOne(params){
+export function getSchedulesOne(params) {
   return request({
     url: '/api/schedule/schedulesone',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
@@ -72,12 +69,12 @@ export function GetPatientSchedules(id) {
   })
 }
 
-export function GetWeekSchedulePrintInitData(date,type) {
+export function GetWeekSchedulePrintInitData(date, type) {
   return request({
     url: '/api/schedule/print/initdata',
     method: 'get',
     params: {
-      date: date,
+      date: date
     }
   })
 }
@@ -106,24 +103,21 @@ export function getScheduleWeekDay(params) {
   })
 }
 
-
-export function exportSchedule(params,date) {
+export function exportSchedule(params, date) {
   return request({
-    url: '/api/schedule/export?date='+date,
+    url: '/api/schedule/export?date=' + date,
     method: 'Post',
     data: params
   })
 }
 
-
 export function initDate() {
   return request({
     url: '/api/excel_date/init',
-    method: 'Get',
+    method: 'Get'
   })
 }
 
-
 export function exportScheduleTemplate(params) {
   return request({
     url: '/api/schedule_template/export',
@@ -132,110 +126,106 @@ export function exportScheduleTemplate(params) {
   })
 }
 
-
-export function getNextScheduleWeekDay(params){
-  
+export function getNextScheduleWeekDay(params) {
   return request({
-    url:"/api/schedule/getnextscheduleweekday",
-    method:"get",
-    params:params
+    url: '/api/schedule/getnextscheduleweekday',
+    method: 'get',
+    params: params
   })
 }
 
+export function getThreeWeekList(params) {
+  return request({
+    url: '/api/schedule/getthreeweeklist',
+    method: 'get',
+    params: params
+  })
+}
 
-export function getThreeWeekList(params){
-  
+export function getAllZones(params) {
   return request({
-    url:"/api/schedule/getthreeweeklist",
-    method:"get",
-    params:params
+    url: '/api/schedule/getallzones',
+    method: 'get',
+    params: params
   })
 }
 
-export function getAllZones(params){
-  
+export function copyPatientSchedule(params) {
   return request({
-    url:"/api/schedule/getallzones",
-    method:"get",
-    params:params
+    url: '/api/schedule/copypatientschedules',
+    method: 'Get',
+    params: params
   })
 }
 
-export function copyPatientSchedule(params){
+export function saveRemindPrint(params) {
   return request({
-    url:"/api/schedule/copypatientschedules",
-    method:"Get",
-    params:params
+    url: '/api/schedule/saveremindprint',
+    method: 'get',
+    params: params
   })
 }
 
-export function saveRemindPrint(params){
-   return request({
-     url:"/api/schedule/saveremindprint",
-     method:"get",
-     params:params
-   })
+export function getRemindPrintList(params) {
+  return request({
+    url: '/api/schedule/getremindprintlist',
+    method: 'get',
+    params: params
+  })
 }
 
-export function getRemindPrintList(params){
-   
+export function getScheduleList(params) {
   return request({
-    url:"/api/schedule/getremindprintlist",
-    method:"get",
-    params:params
+    url: '/api/schedule/getbloodschedulelist',
+    method: 'get',
+    params: params
   })
 }
 
-export function getScheduleList(params){
-  
+export function getPrintList(params) {
   return request({
-    url:"/api/schedule/getbloodschedulelist",
-    method:"get",
-    params:params,
+    url: '/api/schedule/getprintlist',
+    method: 'Get',
+    params: params
   })
 }
 
-export function getPrintList(params){
-   
+export function getAllZoneList(params) {
   return request({
-    url:"/api/schedule/getprintlist",
-    method:"Get",
-    params:params,
+    url: '/api/schedule/getallzonelist',
+    method: 'get',
+    params: params
   })
 }
 
-export function getAllZoneList(params){
-  
+export function getPatientSheduleCount(params) {
   return request({
-    url:"/api/schedule/getallzonelist",
-    method:"get",
-    params:params
+    url: '/api/schedule/getpatientschedulecount',
+    method: 'get',
+    params: params
   })
 }
 
-export function getPatientSheduleCount(params){
-   
+export function postScheduleTemplate(params) {
   return request({
-    url:"/api/schedule/getpatientschedulecount",
-    method:"get",
-    params:params
+    url: '/api/schedule/postscheduletemplate',
+    method: 'get',
+    params: params
   })
 }
 
-export function postScheduleTemplate(params){
-   
+export function getScheduleTemplate(params) {
   return request({
-    url:"/api/schedule/postscheduletemplate",
-    method:"get",
-    params:params
+    url: '/api/schedule/getscheduletemplate',
+    method: 'get',
+    params: params
   })
 }
 
-export function getScheduleTemplate(params){
-  
+export function getNextWeekPanels(params) {
   return request({
-    url:"/api/schedule/getscheduletemplate",
-    method:"get",
-    params:params,
+    url: '/api/schedule/getnextweekpanels',
+    method: 'get',
+    params: params
   })
-}
+}

src/xt_pages/user/templateSummary.vue

@@ -1574,7 +1574,7 @@
                  this.form.template_summary_id = list.template_summary_id
                }
 
-               this.projectIndate = list.inspect_date
+              //  this.projectIndate = list.inspect_date
                this.projectStr = list.project_id
            }
         })

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -167,6 +167,10 @@
           <span v-if="scope.row.dialysissolution.anticoagulant === 5">枸橼酸钠</span>
           <span v-if="scope.row.dialysissolution.anticoagulant === 6">低分子肝素钙</span>
           <span v-if="scope.row.dialysissolution.anticoagulant === 7">低分子肝素钠</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 8">伊诺肝素</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 9">达肝素</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 10">体外抗凝</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 11">那曲肝素</span>
          <span v-if="scope.row.prescription.antioxidant_commodity_name!=''">
              (<span>{{scope.row.prescription.antioxidant_commodity_name}}</span>)
           </span>
@@ -209,6 +213,26 @@
               ? scope.row.prescription.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 8">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+         <span v-if="scope.row.prescription.anticoagulant == 9">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 10">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 11">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
         </template>
       </el-table-column>
 

src/xt_pages/workforce/components/tableWeeks.vue

@@ -241,6 +241,11 @@
                     <span v-if="scope.row.dialysissolution.anticoagulant === 5">枸橼酸钠</span>
                     <span v-if="scope.row.dialysissolution.anticoagulant === 6">低分子肝素钙</span>
                     <span v-if="scope.row.dialysissolution.anticoagulant === 7">低分子肝素钠</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 8">伊诺肝素</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 9">达肝素</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 10">体外抗凝</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 11">那曲肝素</span>
+                       
                     <span v-if="scope.row.dialysissolution.antioxidant_commodity_name!=''">
              (<span>{{scope.row.prescription.antioxidant_commodity_name}}</span>)
           </span>
@@ -248,42 +253,41 @@
             </el-table-column>
             <el-table-column label="总量" min-width="100" align="center">
                 <template slot-scope="scope">
-          <span v-if="scope.row.prescription.anticoagulant == 1">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + 'mg'
+          <span v-if="scope.row.dialysissolution.anticoagulant == 1">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'mg'
               : ''
           }}</span>
-                    <span v-if="scope.row.prescription.anticoagulant == 2">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + 'iu'
+                    <span v-if="scope.row.dialysissolution.anticoagulant == 2">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'iu'
               : ''
           }}</span>
-                    <span v-if="scope.row.prescription.anticoagulant == 3">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + 'iu'
+                    <span v-if="scope.row.dialysissolution.anticoagulant == 3">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'iu'
               : ''
           }}</span>
-                    <span v-if="scope.row.prescription.anticoagulant == 4">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + 'mg'
+                    <span v-if="scope.row.dialysissolution.anticoagulant == 4">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'mg'
               : ''
           }}</span>
-                    <span v-if="scope.row.prescription.anticoagulant == 5">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + 'mg'
+                    <span v-if="scope.row.dialysissolution.anticoagulant == 5">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'mg'
               : ''
           }}</span>
-                    <span v-if="scope.row.prescription.anticoagulant == 6">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + 'iu'
+                    <span v-if="scope.row.dialysissolution.anticoagulant == 6">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'iu'
               : ''
           }}</span>
-                    <span v-if="scope.row.prescription.anticoagulant == 7">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + 'iu'
-              : ''
-          }}</span>
-
+            <span v-if="scope.row.dialysissolution.anticoagulant == 7">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
+            <span v-if="scope.row.dialysissolution.anticoagulant == 8">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
+            <span v-if="scope.row.dialysissolution.anticoagulant == 9">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
+            <span v-if="scope.row.dialysissolution.anticoagulant == 10">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
+             <span v-if="scope.row.dialysissolution.anticoagulant == 11">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
                 </template>
             </el-table-column>
 

src/xt_pages/workforce/next_remind_print.vue

@@ -88,9 +88,13 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 5">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 6">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 7">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                 </td>
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
-                  <span style="white-space: pre" v-if="main_collection.doctor_advice.length>0">{{getAdvice(main_collection.doctor_advice)}}</span>
+                  <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctor_advice)}}</span>
                   <span style="white-space: pre" v-if="main_collection.hisdoctoradviceinfo.length>0">{{getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
                 </td>
               </tr>

src/xt_pages/workforce/remind.vue

@@ -24,11 +24,12 @@
 </template>
 
 <script>
-import {getWeekPanels} from '@/api/schedule';
+import {getWeekPanels,getNextWeekPanels} from '@/api/schedule';
 import tableWeeks from './components/tableWeeks'
 import nextTableWeeks from './components/nextTableWeeks'
 import tablePush from './components/tablePush'
 import BreadCrumb from '../components/bread-crumb'
+const moment = require('moment')
 export default {
     name:'remind',
      data() {
@@ -69,10 +70,25 @@ export default {
       },
       changeActiveName(val){
         this.activeName = val
+      },
+      getNextWeekPanels(){
+        var parasms = {
+          start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+          end_time:moment().week(moment().week() + 1).endOf('week').unix(),
+        }
+        console.log("params222",parasms)
+       getNextWeekPanels(parasms).then(response=>{
+          if(response.data.state ==1){
+            var schedule =  response.data.data.schedule
+            console.log("schedule",schedule)
+            this.theWeek.nextWeek = schedule.length
+          }
+       })
       }
     },
     created(){
         this.getWeekPanels();
+        this.getNextWeekPanels()
     },
     watch:{
       activeName:function(val){

src/xt_pages/workforce/remind_print.vue

@@ -87,6 +87,10 @@
                   <span v-if="main_collection.prescription.anticoagulant == 5">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                   <span v-if="main_collection.prescription.anticoagulant == 8">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                    <span v-if="main_collection.prescription.anticoagulant == 9">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                     <span v-if="main_collection.prescription.anticoagulant == 10">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                      <span v-if="main_collection.prescription.anticoagulant == 11">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                 </td>
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctoradvice)}}</span>