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

src/xt_pages/qcd/officesControlAnalysis/time.vue

          }
          //第四季度
          if( this.modetype ==0 && this.quarterType == 3){
-             this.startime = moment().month(8).startOf('month').format("YYYY-MM-DD")
+             this.startime = moment().month(9).startOf('month').format("YYYY-MM-DD")
              this.endtime = moment().month(11).endOf('month').format("YYYY-MM-DD")
          }
          

src/xt_pages/qcd/workAnalysis/nurse.vue

         GetNurseWorkloadTableData(params)
           .then(rs => {
             var resp = rs.data
-
+            console.log("resp232323",resp)
             if (resp.state == 1) {
 
               let total_cure = 0

src/xt_pages/user/templateSummary.vue

               <el-form-item>
                 <span>选择检验检查时间:</span>
                 <div>
-                  <!-- <el-form-item
-                   label="时间:"
-                   prop="startYear"
-                   style="width:100%;"
-                 >
-                 <el-date-picker
-                    @change="changeYear"
-                    v-model="startYear"
-                    class="timePicker"
-                    type="month"
-                    placeholder=""
-                    format="yyyy-MM"
-                    value-format="yyyy-MM">
-	               </el-date-picker>
-                 </el-form-item> -->
-                 <el-form-item>
+                
+                 <el-form-item label="时间:">
+                   <el-radio-group style="padding: 10px;"  v-model="radio" @change="changeRadio">
+                      <el-radio :label="1">月份</el-radio>
+                      <el-radio :label="2">季度</el-radio>
+                    </el-radio-group>
+                 </el-form-item>
+                 <el-form-item v-show="showquarty">
                     <el-select v-model="quartype" placeholder="请选择" @change="changetype">
                       <el-option
                         v-for="item in quarterType"
                       </el-option>
                     </el-select>
                  </el-form-item>
+                 <el-form-item v-show="showtime">
+                   <el-date-picker
+                      @change="changeYear"
+                      v-model="startYear"
+                      class="timePicker"
+                      type="month"
+                      placeholder=""
+                      format="yyyy-MM"
+                      value-format="yyyy-MM">
+                    </el-date-picker>
+                 </el-form-item>
                  <!-- <el-form-item  label="月份:"
                    prop="startYear"
                    style="width:100%;">
         { id: 4, name: "第四季度"}
        ],
        quartype:1,
+       radio:1,
+       showtime:true,
+       showquarty:false,
       }
     },
     created() {
 
       },
       changeCurrentRecord(val){
-
+        this.tableData = []
         this.getInspectionDetai(val)
       },
       selectionChangeOne(val){
       },
       //获取大项数据来源
       getInspectionMajor(){
-          console.log("type23232232",this.quartype)
           var start_time = ""
           var end_time = ""
-          if(this.quartype == 1){
-             start_time =  moment().startOf('year').format('YYYY-MM-DD')
-             end_time = moment().month(2).endOf('month').format("YYYY-MM-DD")
-          }
-          if(this.quartype == 2){
-            start_time = moment().month(3).startOf('month').format("YYYY-MM-DD")   
-            end_time = moment().month(5).endOf('month').format("YYYY-MM-DD")
+          console.log("radio2332322332",this.radio)
+          if(this.radio == 1){
+            console.log("start_year",this.startYear)
+            console.log("endyaer",this.lastYear)
+            end_time = this.startYear
+            start_time = this.lastYear
           }
-          if(this.quartype == 3){
-            start_time = moment().month(6).startOf('month').format("YYYY-MM-DD")
-            end_time = moment().month(8).endOf('month').format("YYYY-MM-DD")
-          }
-          if(this.quartype == 4){
-             start_time = moment().month(8).startOf('month').format("YYYY-MM-DD")
-             end_time = moment().month(11).endOf('month').format("YYYY-MM-DD")
+          if(this.radio == 2){
+            if(this.quartype == 1){
+              start_time =  moment().startOf('year').format('YYYY-MM-DD')
+              end_time = moment().month(2).endOf('month').format("YYYY-MM-DD")
+            }
+            if(this.quartype == 2){
+              start_time = moment().month(3).startOf('month').format("YYYY-MM-DD")   
+              end_time = moment().month(5).endOf('month').format("YYYY-MM-DD")
+            }
+            if(this.quartype == 3){
+              start_time = moment().month(6).startOf('month').format("YYYY-MM-DD")
+              end_time = moment().month(8).endOf('month').format("YYYY-MM-DD")
+            }
+            if(this.quartype == 4){
+              start_time = moment().month(9).startOf('month').format("YYYY-MM-DD")
+              end_time = moment().month(11).endOf('month').format("YYYY-MM-DD")
+            }
           }
+         
+        
           console.log("start_time",start_time)
           console.log("end_time",end_time)
           var params = {
       },
       //获取小项的值
       getInspectionDetai(val){
+        console.log("val2332232",val)
         var params = {
           project_id:val.project_id,
           patient_id:val.patient_id,
         })
       },
       getTemplateSummaryList(){
+        
           var params = {
             patient_id:this.patient_id,
             start_time:this.start_time,
           })
           .catch(() => {
           })
+     },
+     changeRadio(val){
+       if(val == 1){
+         this.showtime = true
+         this.showquarty = false
+         this.getInspectionMajor()
+       }
+       if(val == 2){
+         this.showquarty = true
+         this.showtime = false
+         this.getInspectionMajor()
+       }
      }
 
     },

src/xt_pages/workforce/components/nextTableWeeks.vue

 <template>
   <div>
     <div class="cell clearfix" style="float: right">
+      <el-button
+        style="float: right"
+        size="small"
+        icon="el-icon-printer"
+        @click="signPrint()"
+        type="primary"
+       >标签打印
+      </el-button>
       <el-button
         style="float: right"
         size="small"
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
         <template slot-scope="scope">
           <span v-if="org_id!=9987" >
-             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">
-                <span v-if="org_id!=10131">{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
-                <span v-if="org_id ==10131">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span>
+             <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus!=''">
+                <span v-if="org_id!=10131">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
+                <span v-if="org_id==10131">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
+                <!-- <span v-if="org_id ==10131">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span> -->
               </span> 
-             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span> 
+             <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span> 
           </span>
-          {{scope.row.prescription.dialysis_dialyszers}}
-         <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
-          <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
+          {{scope.row.dialysissolution.dialysis_dialyszers}}
+         <span v-if="scope.row.dialysissolution.dialysis_dialyszers!='' && scope.row.dialysissolution.dialysis_irrigation!=''">/</span>
+          <span v-if="scope.row.dialysissolution.dialysis_irrigation!=''">{{scope.row.dialysissolution.dialysis_irrigation}}</span>
         </template>
       </el-table-column>
       <el-table-column label="抗凝剂(商品名称)" min-width="100" align="center">
         <template slot-scope="scope">
-          <span v-if="scope.row.prescription.anticoagulant === 1">无肝素</span>
-          <span v-if="scope.row.prescription.anticoagulant === 2">普通肝素</span>
-          <span v-if="scope.row.prescription.anticoagulant === 3" >低分子肝素</span>
-          <span v-if="scope.row.prescription.anticoagulant === 4">阿加曲班</span>
-          <span v-if="scope.row.prescription.anticoagulant === 5">枸橼酸钠</span>
-          <span v-if="scope.row.prescription.anticoagulant === 6">低分子肝素钙</span>
-          <span v-if="scope.row.prescription.anticoagulant === 7">低分子肝素钠</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 1">无肝素</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 2">普通肝素</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 3" >低分子肝素</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 4">阿加曲班</span>
+          <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.prescription.antioxidant_commodity_name!=''">
              (<span>{{scope.row.prescription.antioxidant_commodity_name}}</span>)
           </span>
         //   week_type:this.week_type,
         //   week_time:this.week_time,
         // }
-     
+      console.log("params",params)
       getNextScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
     changeZone(val){
       this.zone = val
       this.getNextScheduleWeekDay()
+    },
+    signPrint() {
+        var zone = this.zone
+        var newArr = []
+        for(let i=0;i<this.zoneList.length;i++){
+           newArr.push(this.zoneList[i].id)
+        }
+        var arr = newArr.join(",")
+        var str = ""
+        if(this.zone == 0){
+           str = arr  
+        }
+        if(zone != 0){
+          str = zone.join(",")
+        }
+        this.$router.push({
+          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
+        })
     }
   },
   components: {

src/xt_pages/workforce/components/tableWeeks.vue

           str = zone.join(",")
         }
         this.$router.push({
-          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status
+          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
         })
       }
       ,

src/xt_pages/workforce/next_remind_print.vue

                  <span v-if="org_id!=9987">
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> 
                         <span v-if="org_id!=10131">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
-                        <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span> 
-                         <!-- <span v-if="org_id==10131 || org_id==9671">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span> -->
+                        <!-- <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span>  -->
+                         <span v-if="org_id==10131 || org_id==9671">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
                      </span>
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
                   </span>
                   </span>
                 </td>
                 <td :width="td_1_width"  v-if="printObj.anticoagulant_zongliang == 1">
-                  <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 4">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
-                  <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.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
+                  <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>
                 </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>

src/xt_pages/workforce/remind_print.vue

 
                 </td>
                 <td :width="td_1_width" v-if="printObj.anticoagulant == 1">
-                  {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}
+                  {{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}
                   <span v-if="main_collection.prescription.antioxidant_commodity_name!=''">
                     (<span>{{main_collection.prescription.antioxidant_commodity_name}}</span>)
                   </span>

src/xt_pages/workforce/remind_print_setting.vue

             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
               <div class="signPrint">
                 <div>分区/床位号:{{main_collection.zone.name}}/{{main_collection.number.number}}</div> 
-                <div>姓名:{{main_collection.patient.name}}</div> 
+                <div>姓名:
+                  <span v-if="type ==1">{{main_collection.patient.name}} </span> 
+                  <span v-if="type ==2">{{main_collection.patient}} </span> 
+                </div> 
                 <div>抗凝剂: 
                   <span v-if="org_id == 10138">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
                   <span v-else >{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span>
 </template>
 
 <script>
-  import { getScheduleList,getPrintList } from '@/api/schedule'
+  import { getScheduleList,getPrintList,getNextScheduleWeekDay } from '@/api/schedule'
   import { parseTime } from '@/utils'
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
         now_time:0,
         zone:"",
         pre_status:0,
-        printObj:{}
+        printObj:{},
+        type:1,
       }
     },
     components: {
       BreadCrumb
     },
     created() {
+      console.log("type2323233223232",this.$route.query.type)  
+     this.type = this.$route.query.type
      this.getPrintList()
      this.org_id = this.$store.getters.xt_user.org.id
      this.currentDate = this.getCurrentDate()
    
-      this.modeOptions = this.$store.getters.treatment_mode
-      this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
-      this.week_type = this.$route.query.week_type
-      this.week_time  = this.$route.query.week_time
-      this.zone = this.$route.query.zone
-      this.pre_status = this.$route.query.prestatus
-     const params = {
+     this.modeOptions = this.$store.getters.treatment_mode
+     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
+    this.week_type = this.$route.query.week_type
+    this.week_time  = this.$route.query.week_time
+    this.zone = this.$route.query.zone
+    this.pre_status = this.$route.query.prestatus
+    
+    if(parseInt(this.$route.query.type) == 1){
+      const params = {
           week_type:this.week_type,
           week_time:this.week_time,
           zone:this.zone,
       var now_time = parseInt(this.week_type) * 86400 + this.start_time
       console.log("now",now_time)
       this.now_time = now_time
+    }
+    if(parseInt(this.$route.query.type) == 2){
+       this.getNextScheduleWeekDay()
+    }
+    
     },
     methods: {
       getAdvice:function(doctor_advice) {
            this.printObj = list
          }
       })
+     },
+    getNextScheduleWeekDay() {
+        const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
+        const end = moment().weekday(7).format('YYYY-MM-DD')
+        var zone = this.zone
+        // var newArr = []
+        // for(let i=0;i<this.zoneList.length;i++){
+        //    newArr.push(this.zoneList[i].id)
+        // }
+        // var arr = newArr.join(",")
+        // var str = ""
+        // if(this.zone == 0){
+        //    str = arr  
+        // }
+        // if(zone != 0){
+        //   str = zone.join(",")
+        // }
+        const params = {
+          start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+          end_time:moment().week(moment().week() + 1).endOf('week').unix(),
+          week_type:this.week_type,
+          week_time:this.week_time,
+          zone:this.zone,
+        }
+        // const params = {
+        //   start_time:1609603200,
+        //   end_time:1610208000,
+        //   week_type:this.week_type,
+        //   week_time:this.week_time,
+        // }
+      console.log("params",params)
+      getNextScheduleWeekDay(params).then(response => {
+        this.scheduleData = [];
+        if (response.data.state == 1) {
+          var scheduleData = response.data.data.schedule;
+      
+          for(let i=0;i<scheduleData.length;i++){
+              scheduleData[i].sort = scheduleData[i].number.sort
+          }
+            var arr =   scheduleData.sort(this.compare('sort'))
+            console.log("元旦快乐",arr)
+            this.scheduleData = arr
+          
+            // var newList = []
+            // for(let i=0;i<scheduleData.length;i++){
+            //   if(scheduleData.prescription.id > 0){
+            //      newList.push(scheduleData[i])
+            //   } 
+            // }
+            // var arr =   newList.sort(this.compare('sort'))
+            // console.log("元旦快乐",arr)
+            // this.scheduleData = arr 
+        } else {
+          this.$message.error("网络错误");
+          return false;
+        }
+      });
      }
     }
   }