数据

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -551,7 +551,7 @@ export default {
          }
          //第四季度
          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

@@ -394,7 +394,7 @@
         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

@@ -672,22 +672,14 @@
               <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"
@@ -697,6 +689,17 @@
                       </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%;">
@@ -956,6 +959,9 @@
         { id: 4, name: "第四季度"}
        ],
        quartype:1,
+       radio:1,
+       showtime:true,
+       showquarty:false,
       }
     },
     created() {
@@ -1185,25 +1191,35 @@
       },
       //获取大项数据来源
       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")
-          }
-          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")
+          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 == 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 = {
@@ -1407,6 +1423,7 @@
         })
       },
       getTemplateSummaryList(){
+        
           var params = {
             patient_id:this.patient_id,
             start_time:this.start_time,
@@ -1859,6 +1876,18 @@
           })
           .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

@@ -1,6 +1,14 @@
 <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"
@@ -611,6 +619,24 @@ export default {
     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
+        })
     }
   },
   components: {

src/xt_pages/workforce/remind_print.vue

@@ -74,7 +74,7 @@
 
                 </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>